From 7aa9193744b277e19793c86d2c48275faec0f080 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Tue, 9 Apr 2024 17:32:47 +0800
Subject: [PATCH] dj

---
 .../patientRegister/PatientRegisterEdit.vue          | 12 +++++++++++-
 src/views/charge/charge.vue                          | 12 ++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 1137baf..5556868 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -389,6 +389,11 @@
         <div v-show="checkPagePriv(pagePriv.privs, '收费')" class="btn">
           <el-button type="success" class="commonbutton" @click="toCharge(form.patientRegisterNo)">收费</el-button>
         </div>
+        <!-- 
+        <div class="btn">
+          <el-button type="success" class="commonbutton" @click="btnTest">test</el-button>
+        </div>
+        -->
       </div>
     </div>
 
@@ -682,6 +687,9 @@ export default {
     ...mapActions(['getPatientRegisterAbs']),
     dddw, moment, checkPagePriv,
 
+    btnTest(){
+      console.log('form',this.form)
+    },
     //数据初始化
     dictInit() {
       //性别（仅档案用）
@@ -802,7 +810,8 @@ export default {
       } else {
         // let res = await getapi(`/api/app/patient-register/${patientRegisterId}`)
         let res = await postapi(`/api/app/patientregister/getinfoorpatient?PatientRegisterId=${patientRegisterId}`)
-        this.form = res.data
+        // this.form = res.data  这种方式，会造成 checkbox 值变化不响应，故取消
+        objCopy(res.data,this.form)  
       }
       this.initBox();
       this.getPeoplePhoto(this.form.photo)
@@ -1177,6 +1186,7 @@ export default {
       } else {
         this.form[type] = 'N';
       }
+      console.log('Box-type',this.form[type + 'Box'],this.form[type])
     },
 
     initBox() {
diff --git a/src/views/charge/charge.vue b/src/views/charge/charge.vue
index faa65ba..e63d587 100644
--- a/src/views/charge/charge.vue
+++ b/src/views/charge/charge.vue
@@ -36,7 +36,7 @@
             </div>
           </div>
           <!-- 列表 -->
-          <div style="padding: 15px;border-radius: 8px;background-color: #fff;">
+          <div style="padding: 10px;border-radius: 8px;background-color: #fff;">
             <el-table :data="patientList" border highlight-current-row ref="patientList" :height="tableListHeight"
               @row-click="rowClick" size="small">
               <!--  
@@ -143,7 +143,7 @@
             </div>
             <!-- charge_pay  -->
             <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>
+              <div style="font-size:10px;">{{ query.chargeFlag == 'B' ? '退' : '收' }}费方式：</div>
               <el-table :data="chargePays" border highlight-current-row size="small"
                 :height="Math.floor((tableListHeight - 155) / 2)">
                 <el-table-column prop="payModeId" :label="(query.chargeFlag == 'B' ? '退' : '收') + '费方式'" width="180">
@@ -169,10 +169,10 @@
             </div>
             <!-- asbitem  -->
             <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 style="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"
+                :height="Math.floor((tableListHeight - 155) / 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" />
@@ -345,12 +345,12 @@ export default {
 
     tableListHeight() {
       let tempH = this.window.pageHeight < 600 ? 600 : this.window.pageHeight
-      return tempH - 175 - 40
+      return tempH - 175 - 30
     },
 
     bodyWidth() {
       let tempW = this.window.pageWidth < 600 ? 600 : this.window.pageWidth
-      return tempW - 110 - 20
+      return tempW - 110 - 25
     }
   },