From b86a3998be91ad1accffd2f50ba28bc78ef7d69d Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Tue, 2 Apr 2024 17:51:38 +0800
Subject: [PATCH] dj

---
 src/assets/css/global_button.css              | 23 +++++-
 src/components/doctorCheck/ButtonList.vue     |  6 +-
 .../doctorCheck/PatientRegisterList.vue       |  2 +-
 .../patientRegister/PatientRegisterEdit.vue   | 20 ++---
 .../patientRegister/PatientRegisterItem.vue   | 18 ++---
 src/components/sumDoctorCheck/ButtonList.vue  | 12 +--
 src/views/charge/charge.vue                   | 74 ++++++++-----------
 src/views/doctorCheck/doctorCheck.vue         |  4 +-
 8 files changed, 78 insertions(+), 81 deletions(-)

diff --git a/src/assets/css/global_button.css b/src/assets/css/global_button.css
index 1ff559b..522ac82 100644
--- a/src/assets/css/global_button.css
+++ b/src/assets/css/global_button.css
@@ -1,4 +1,4 @@
-.el-button {
+.el-buttonBak {
     background: #FFF;
     border: 1px solid #0B663D;
     /*原始 默认值 1px solid #DCDFE6; */
@@ -26,6 +26,20 @@
     border-radius: 4px;
     */
 }
+.el-button {
+    background: #396FFA;   
+    /*原始 默认值 1px solid #DCDFE6; */
+    color: #fff !important;
+    border: none;
+    /*原始 默认值 #606266 */
+    font-weight: 500;
+    /*原始 默认值 500 */
+    font-family: 'NotoSansSC-Medium';
+    /*原始 默认值 Arial */
+    padding: 10px 5px;
+    /*原始 默认值 12px 20px */
+    min-width: 60px;
+}
 
 .commonbutton {
     width: 100px;
@@ -49,9 +63,10 @@
     background-color: #0046FB;
 }
 
-.el-button.is-disabled:hover,
-.el-button.is-disabled:focus {
-    background-color: rgba(20, 96, 243, 0.4);
+.el-button:hover,
+.el-button:focus {   
+    border-color: #c6e2ff; 
+    background-color: #0046FB;
 }
 
 
diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue
index 2ad089b..4e74a2a 100644
--- a/src/components/doctorCheck/ButtonList.vue
+++ b/src/components/doctorCheck/ButtonList.vue
@@ -1,5 +1,5 @@
 <template>
-    <div style="margin-left: 5px;">
+    <div style="margin-left: 5px;z-index: 2001;">
         <div v-show="checkPagePriv(pagePriv.privs,'人员列表')" class="divBtnClass">
             <el-button type="primary" class="commonbutton" @click="prList">人员列表</el-button>
         </div>
@@ -109,8 +109,8 @@
                     prefix-icon="" size="small" style="width:150px;"/>
             </div>
             <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogVisibleSetStartDate = false">取 消</el-button>
-                <el-button type="primary" @click="btnSetStartDate">确 定</el-button>
+                <el-button class="commonbutton" @click="dialogVisibleSetStartDate = false">取 消</el-button>
+                <el-button class="commonbutton" type="primary" @click="btnSetStartDate">确 定</el-button>
             </span>
         </el-dialog>
 
diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue
index 4f47b95..40c320a 100644
--- a/src/components/doctorCheck/PatientRegisterList.vue
+++ b/src/components/doctorCheck/PatientRegisterList.vue
@@ -51,7 +51,7 @@
         </el-select>
       </div>
       <div class="query">
-        <el-button type="primary" @click="query" size="small" style="height:26px;padding: 5px 0 5px 0px;">查询</el-button>
+        <el-button class="commonbutton" type="primary" @click="query" size="small" style="width:60px;height:26px;padding: 5px 0 5px 0px;">查询</el-button>
       </div>
     </div>
 
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 8845122..2a5e29f 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -525,7 +525,8 @@ export default {
         photo: '', //照片
         patientId: "00000000-0000-0000-0000-000000000000", //档案号ID 选择了档案就传档案号，未选就传00000-0000...
         patientNo: "", //档案号
-        customerOrgId: ["00000000-0000-0000-0000-000000000000"], //单位编号 默认个人 
+        customerOrgId: ["00000000-0000-0000-0000-000000000001"], //单位编号 默认个人 
+        customerOrgRegisterId:"00000000-0000-0000-0000-000000000001", //默认单位体检次数
         customerOrgGroupId: null, //分组
         medicalPackageId: null, //套餐
         patientName: "", //姓名
@@ -567,7 +568,6 @@ export default {
         isNameHideBox: false, //隐藏姓名
         isPhoneFollowBox: false, //电话随访
         isLockBox: false, //是否锁住
-        customerOrgRegisterId: null,
         isMaxMedicalTimes: 'N',
         medicalStartDate: null
       }, //单位 记录 目前新增与更新是一致
@@ -829,17 +829,13 @@ export default {
 
         // 父单位被更改时，需要触发 修改 分组/套餐
         if (this.form.customerOrgParentId != customerOrgParentId) {
+          this.form.customerOrgGroupId = null
+          this.form.medicalPackageId = null
           if (customerOrgParentId == this.dict.personOrgId) {
-            this.form.customerOrgRegisterId = null
-            this.form.customerOrgGroupId = null
-            this.form.medicalPackageId = null
+            
             this.patientRegister.customerOrgGroup = []
           } else {
-            this.form.customerOrgRegisterId = null
-            this.form.customerOrgGroupId = null
-            this.form.medicalPackageId = null
-            //获取单位体检次数
-            // this.getCustomerOrgRegisterList(customerOrgParentId)
+            this.form.customerOrgRegisterId = null  
           }
 
           if (this.form.customerOrgParentId == this.dict.personOrgId) {
@@ -1295,9 +1291,9 @@ export default {
           this.prAsbOpraOpts.prAsbSave++  //触发组合项目保存
         } else {
           let body = this.madePrBody()
-          body.registerAsbitems = this.dataTransOpts.tableM.register_check_asbitem
+          body.registerCheckAsbitems = this.dataTransOpts.tableM.register_check_asbitem
           //id为空则新增
-          console.log(`/api/patientregister/createreturninfo`, body);
+          // console.log(`/api/patientregister/createreturninfo`, body);
           postapi(`/api/PatientRegister/CreatePatientRegister`, body)
             .then(res => {
               if (res.code == 1) {
diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue
index c9f4f04..7bcf4e7 100644
--- a/src/components/patientRegister/PatientRegisterItem.vue
+++ b/src/components/patientRegister/PatientRegisterItem.vue
@@ -391,7 +391,7 @@ export default {
 
       // 按住了ctrl 键
       if (this.window.ctrl) {   
-        console.log('this.window.ctrl',this.window.ctrl,this.prAsb)      
+        console.log('this.window.ctrl',this.window.ctrl,this.dataTransOpts.tableM.register_check_asbitem)      
          this.dataTransOpts.tableM.register_check_asbitem[row.index].choosed = true;
         this.PstartPoint = row.index;
         return        
@@ -630,7 +630,7 @@ export default {
 
       //勾选时不需要此操作  start
       if(oprType && oprType == 'all'){
-        absForDel = deepCopy(this.prAsb)
+        absForDel = deepCopy(this.dataTransOpts.tableM.register_check_asbitem)
       }else if(oprType && oprType == 'choosed'){
         absForDel = [] 
          this.dataTransOpts.tableM.register_check_asbitem.forEach(e =>{
@@ -652,7 +652,7 @@ export default {
         if (e.isCharge == 'Y' || (e.checkCompleteFlag && e.checkCompleteFlag != '0')) {
           chargeComplete += e.asbitemName + '，'   
         }else{
-          lfind = arrayExistObj(this.prAsb, 'asbitemId', e.asbitemId)
+          lfind = arrayExistObj(this.dataTransOpts.tableM.register_check_asbitem, 'asbitemId', e.asbitemId)
           if(lfind > -1){
             tempRd = Object.assign({}, this.dataTransOpts.tableM.register_check_asbitem.splice(lfind,1)[0])
             if(e.id) this.prAsbDels.push(tempRd)
@@ -692,7 +692,7 @@ export default {
       } else {
         this.asbItem = deepCopy(asbItemAll);
       }
-      arrayReduce(this.asbItem, this.prAsb, "id=asbitemId");
+      arrayReduce(this.asbItem, this.dataTransOpts.tableM.register_check_asbitem, "id=asbitemId");
     },
 
      
@@ -941,7 +941,7 @@ export default {
     changeAllDiscount() {
 
       if (!this.discount || this.discount == 0) return
-      if (!this.prAsb ||  this.dataTransOpts.tableM.register_check_asbitem.length == 0) return
+      if (!this.dataTransOpts.tableM.register_check_asbitem ||  this.dataTransOpts.tableM.register_check_asbitem.length == 0) return
 
        this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
         e.discount = this.discount
@@ -956,7 +956,7 @@ export default {
     changeTotal() {
 
       if (!this.total) return
-      if (!this.prAsb ||  this.dataTransOpts.tableM.register_check_asbitem.length == 0) return
+      if (!this.dataTransOpts.tableM.register_check_asbitem ||  this.dataTransOpts.tableM.register_check_asbitem.length == 0) return
 
       let sumChargeDetails = Number(0) //单个标准价折后价 合计总计 
       let qtyIsOneLast = 0   //数量为1的最后行项目，用于返写金额
@@ -971,7 +971,7 @@ export default {
         e.total = Math.round((e.standardPrice * this.discount * e.amount / 100) * 100)/100
         sumChargeDetails += Math.round((e.standardPrice * this.discount * e.amount / 100) * 100)/100
       });
-      console.log('this.prAsb',this.prAsb)
+      console.log('this.dataTransOpts.tableM.register_check_asbitem',this.dataTransOpts.tableM.register_check_asbitem)
 
       // console.log('this.total - sumChargeDetails', sumChargeDetails, this.total - sumChargeDetails)
       //平衡金额（按总价折扣后，再根据折扣合计 会出现金额差）
@@ -992,7 +992,7 @@ export default {
     //修改数量
     changeDiscount(index) {
       //console.log('index',index)
-      if (!this.prAsb ||  this.dataTransOpts.tableM.register_check_asbitem.length == 0) return
+      if (!this.dataTransOpts.tableM.register_check_asbitem ||  this.dataTransOpts.tableM.register_check_asbitem.length == 0) return
       if (! this.dataTransOpts.tableM.register_check_asbitem[index].discount) return
       //console.log( this.dataTransOpts.tableM.register_check_asbitem[index].chargePrice, this.dataTransOpts.tableM.register_check_asbitem[index].standardPrice)
        this.dataTransOpts.tableM.register_check_asbitem[index].chargePrice = Math.round( this.dataTransOpts.tableM.register_check_asbitem[index].standardPrice *  this.dataTransOpts.tableM.register_check_asbitem[index].discount)/100
@@ -1003,7 +1003,7 @@ export default {
     //修改单价
     changePrice(index) {
       //console.log('index',index)
-      if (!this.prAsb ||  this.dataTransOpts.tableM.register_check_asbitem.length == 0) return
+      if (!this.dataTransOpts.tableM.register_check_asbitem ||  this.dataTransOpts.tableM.register_check_asbitem.length == 0) return
       if (! this.dataTransOpts.tableM.register_check_asbitem[index].chargePrice) return
       //console.log( this.dataTransOpts.tableM.register_check_asbitem[index].chargePrice, this.dataTransOpts.tableM.register_check_asbitem[index].standardPrice)
        this.dataTransOpts.tableM.register_check_asbitem[index].discount = Math.round( this.dataTransOpts.tableM.register_check_asbitem[index].chargePrice * 10000 /  this.dataTransOpts.tableM.register_check_asbitem[index].standardPrice)/100
diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue
index a4d7ff7..16d7750 100644
--- a/src/components/sumDoctorCheck/ButtonList.vue
+++ b/src/components/sumDoctorCheck/ButtonList.vue
@@ -7,13 +7,13 @@
             <el-button type="primary" class="commonbutton" @click="toDoctorCheck">医生诊台</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs,'保存')" class="listBtn">
-            <el-button type="primary" class="commonbutton" @click="save">保存</el-button>
+            <el-button type="primary" class="commonbutton" @click="btnSave">保存</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs,'修改')" class="listBtn">
-            <el-button type="primary" class="commonbutton" @click="edit">修改</el-button>
+            <el-button type="primary" class="commonbutton" @click="btnEdit">修改</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs,'取消总检')" class="listBtn">
-            <el-button type="primary" class="commonbutton" @click="del">取消总检</el-button>
+            <el-button type="primary" class="commonbutton" @click="btnDel">取消总检</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs,'审核')" class="listBtn">
             <el-button type="primary" class="commonbutton" @click="audit">审核</el-button>
@@ -160,7 +160,7 @@ export default {
         },
 
         //保存数据
-        save() {
+        btnSave() {
             let ret = this.optGrant('save')
             if (ret) {
                 this.$message.warning(ret);                
@@ -178,7 +178,7 @@ export default {
         },
 
         //修改结果
-        edit() {
+        btnEdit() {
             let ret = this.optGrant('edit')
             if (ret) {
                 this.$message.warning(ret);                
@@ -188,7 +188,7 @@ export default {
         },
 
         //取消结果
-        del() {
+        btnDel() {
             let ret = this.optGrant('del')
             if (ret) {
                 this.$message.warning(ret);                
diff --git a/src/views/charge/charge.vue b/src/views/charge/charge.vue
index 8a637d2..faa65ba 100644
--- a/src/views/charge/charge.vue
+++ b/src/views/charge/charge.vue
@@ -8,10 +8,7 @@
         <!-- 查询条件 与列表  -->
         <div :style="`display: block;width: ${Math.floor(bodyWidth * 3 / 5)}px;`">
           <!-- 查询条件 -->
-          <div style="height: 60px;    padding: 10px;
-    border-radius: 8px;
-    background-color: #fff;
-    margin-bottom: 10px;">
+          <div style="height: 60px;padding: 10px;border-radius: 8px;background-color: #fff;margin-bottom: 10px;">
             <div style="display:flex;">
               <div>
                 <span>登记日期：</span>
@@ -33,15 +30,13 @@
               </el-radio-group>
               <div v-if="query.chargeFlag != 'N'" style="margin-left:20px;">
                 <span>发票号</span>
-                <el-input placeholder="发票/收据号" v-model="query.invoiceNo" size="small" style="margin-left: 3px; width: 100px;" clearable
-                  @change="Query('invoiceNo')" />
+                <el-input placeholder="发票/收据号" v-model="query.invoiceNo" size="small"
+                  style="margin-left: 3px; width: 100px;" clearable @change="Query('invoiceNo')" />
               </div>
             </div>
           </div>
           <!-- 列表 -->
-          <div style="padding: 15px;
-    border-radius: 8px;
-    background-color: #fff;">
+          <div style="padding: 15px;border-radius: 8px;background-color: #fff;">
             <el-table :data="patientList" border highlight-current-row ref="patientList" :height="tableListHeight"
               @row-click="rowClick" size="small">
               <!--  
@@ -83,82 +78,74 @@
         <!-- 收费操作  -->
         <div :style="`display: block;margin-left:10px;width: ${Math.floor(bodyWidth * 2 / 5)}px;`">
           <!-- 查询信息  -->
-          <div style="height: 40px;    background-color: #fff;
-    border-radius: 8px;
-    margin-bottom: 10px;">
+          <div style="height: 40px;    background-color: #fff;border-radius: 8px;margin-bottom: 10px;">
             <div style="display: flex; flex-wrap: wrap;height:40px; width: 100%;align-items: center;">
               <div class="query">
                 <span>条码号</span>
-                <el-input placeholder="条码号" v-model="query.patientRegisterNo" size="small" style="margin-left: 3px; width: 120px;" clearable
-                  @change="Query('patientRegisterNo')" />
+                <el-input placeholder="条码号" v-model="query.patientRegisterNo" size="small"
+                  style="margin-left: 3px; width: 120px;" clearable @change="Query('patientRegisterNo')" />
               </div>
               <div class="query">
                 <span>档案号</span>
-                <el-input placeholder="档案号" v-model="query.patientNo" size="small" style="margin-left: 3px; width: 80px;" clearable
-                  @change="Query('patientNo')" />
+                <el-input placeholder="档案号" v-model="query.patientNo" size="small" style="margin-left: 3px; width: 80px;"
+                  clearable @change="Query('patientNo')" />
               </div>
               <div class="query">
                 <span>姓名</span>
-                <el-input placeholder="姓名" v-model="query.patientName" size="small" style="margin-left: 3px; width: 70px;" disabled
-                  @change="Query" />
+                <el-input placeholder="姓名" v-model="query.patientName" size="small" style="margin-left: 3px; width: 70px;"
+                  disabled @change="Query" />
               </div>
             </div>
           </div>
           <!-- 收费信息  -->
           <div>
             <!-- charge  -->
-            <div style="padding: 10px;
-    margin-bottom: 7px;
-    background-color: rgb(255, 255, 255);
-    border-radius: 8px;">
+            <div style="padding: 10px;margin-bottom: 7px;background-color: rgb(255, 255, 255);border-radius: 8px;">
               <el-form ref="form" :model="form" label-width="80px" :rules="rules" size="medium"
-                :disabled="query.chargeFlag != 'N'" >
+                :disabled="query.chargeFlag != 'N'">
                 <el-row>
                   <el-col :span="12">
                     <el-form-item label="发票号" prop="invoiceNo">
-                      <el-input v-model="form.invoiceNo" size="small"/>
+                      <el-input v-model="form.invoiceNo" size="small" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="开票抬头" prop="invoiceOrgName">
-                      <el-input v-model="form.invoiceOrgName" size="small"/>
+                      <el-input v-model="form.invoiceOrgName" size="small" />
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row>
                   <el-col :span="12">
                     <el-form-item label="折扣" prop="discount">
-                      <el-input v-model="form.discount" @input="discountToDetails" size="small"/>
+                      <el-input v-model="form.discount" @input="discountToDetails" size="small" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="应收金额" prop="total">
-                      <el-input v-model="form.total" @input="totalToDetails" size="small"/>
+                      <el-input v-model="form.total" @input="totalToDetails" size="small" />
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row v-if="query.chargeFlag == 'N'">
                   <el-col :span="12">
                     <el-form-item label="预收金额" prop="preTotal">
-                      <el-input v-model="form.preTotal" disabled size="small"/>
+                      <el-input v-model="form.preTotal" disabled size="small" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="找零" prop="balance">
-                      <el-input v-model="form.balance" disabled size="small"/>
+                      <el-input v-model="form.balance" disabled size="small" />
                     </el-form-item>
                   </el-col>
                 </el-row>
               </el-form>
             </div>
             <!-- charge_pay  -->
-            <div style="padding: 10px;
-    background-color: #fff;
-        margin-bottom: 7px;
-    border-radius: 8px;">
+            <div style="padding: 10px;background-color: #fff;margin-bottom: 7px;border-radius: 8px;">
               <div style="margin-top:5px;font-size:10px;">{{ query.chargeFlag == 'B' ? '退' : '收' }}费方式：</div>
               <el-table :data="chargePays" border highlight-current-row size="small"
-                :height="Math.floor((tableListHeight - 155)/2)">
+                :height="Math.floor((tableListHeight - 155) / 2)">
                 <el-table-column prop="payModeId" :label="(query.chargeFlag == 'B' ? '退' : '收') + '费方式'" width="180">
                   <template slot-scope="scope">
                     <div>{{ dddw(dict.payMode, "id", scope.row.payModeId, "displayName") }}</div>
@@ -181,15 +168,12 @@
               </el-table>
             </div>
             <!-- asbitem  -->
-            <div style="    padding: 10px;
-    background-color: rgb(255, 255, 255);
-    border-radius: 8px;
-">
+            <div style="padding: 10px;background-color: rgb(255, 255, 255);border-radius: 8px;">
               <div style="margin-top:5px; font-size:10px;">{{ query.chargeFlag == 'N' ? '待收' : (query.chargeFlag == 'Y' ?
                 '已收' : '已退') }}费项目：</div>
               <el-table :data="asbItemsForFee" border highlight-current-row
-                :height="Math.floor((tableListHeight - 150)/2)" size="small"
-                @selection-change="handleSelectionChange" ref="asbItemsForFeeTable">
+                :height="Math.floor((tableListHeight - 150) / 2)" size="small" @selection-change="handleSelectionChange"
+                ref="asbItemsForFeeTable">
                 <el-table-column type="selection" align="center" v-if="query.chargeFlag == 'N'" />
                 <el-table-column label="组合项目" width="120" prop="asbitemName" />
                 <el-table-column label="标准价格" prop="standardPrice" width="80" align="center" />
@@ -361,7 +345,7 @@ export default {
 
     tableListHeight() {
       let tempH = this.window.pageHeight < 600 ? 600 : this.window.pageHeight
-      return tempH - 175-40
+      return tempH - 175 - 40
     },
 
     bodyWidth() {
@@ -1223,7 +1207,7 @@ export default {
 
 .query {
   margin-left: 5px;
-    font-size: 14px;
+  font-size: 14px;
   color: #232748;
   font-weight: 400;
   font-family: "NotoSansSC-Regular";
@@ -1242,7 +1226,9 @@ export default {
 .btnClass {
   width: 100px;
 }
-:deep .el-form-item--mini.el-form-item, .el-form-item--small.el-form-item {
-    margin-bottom: 10px;
+
+:deep .el-form-item--mini.el-form-item,
+.el-form-item--small.el-form-item {
+  margin-bottom: 10px;
 }
 </style>
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index 22c1a7d..a372010 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -5,9 +5,9 @@
         <div class="contenttitle">
           体检 /<span class="contenttitleBold">检查医生诊台</span>
         </div>  
-        <div style="position: absolute;top:50px;right:10px;z-index: 2000;">
+        <div style="position: absolute;margin-right:115px; top:50px;right:10px;z-index: 2;">
           <el-image
-            style="margin-right:115px; width: 112px; height: 120px;"
+            style="width: 112px; height: 120px;"
             :src="peoplePhoto"
             >
             <div slot="placeholder" class="image-slot">