From 4dd35380e9814ed48c1e198c0b26b9ad58279e24 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 11 Sep 2023 14:09:01 +0800
Subject: [PATCH] charge

---
 .../report/PatientRegisterListNobtn.vue       |  2 +-
 src/components/report/RegisterCheckStatus.vue |  2 +-
 src/views/charge/charge.vue                   |  4 +++-
 src/views/report/report.vue                   | 22 ++++---------------
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/src/components/report/PatientRegisterListNobtn.vue b/src/components/report/PatientRegisterListNobtn.vue
index bfe9d54..225b879 100644
--- a/src/components/report/PatientRegisterListNobtn.vue
+++ b/src/components/report/PatientRegisterListNobtn.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div @contextmenu.prevent="onContextmenu">
-      <el-table :data="patientRegister.prList" border :height="(window.pageHeight < 600) ? 260:(window.pageHeight - 340)" highlight-current-row
+      <el-table :data="patientRegister.prList" border :height="(window.pageHeight < 600) ? 220:(window.pageHeight - 380)" highlight-current-row
         @row-click="rowick" size="small" @selection-change="handleSelectionChange" @cell-contextmenu="onCellRightClick">
         <el-table-column type="selection" width="40"></el-table-column>
         <el-table-column prop="completeFlag" label="体检进度">
diff --git a/src/components/report/RegisterCheckStatus.vue b/src/components/report/RegisterCheckStatus.vue
index 8f26805..ee179a7 100644
--- a/src/components/report/RegisterCheckStatus.vue
+++ b/src/components/report/RegisterCheckStatus.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-table :data="doctorCheck.RegisterCheckList" border
-      :height="(window.pageHeight < 600) ? 260 : (window.pageHeight - 340)" size="small" highlight-current-row
+      :height="(window.pageHeight < 600) ? 220 : (window.pageHeight - 380)" size="small" highlight-current-row
       ref="doctorCheck.RegisterCheckList">
       <el-table-column prop="asbitemName" label="组合项目" width="120" />   
       <el-table-column prop="checkCompleteFlag" label="状态">
diff --git a/src/views/charge/charge.vue b/src/views/charge/charge.vue
index 2bfd221..45355c2 100644
--- a/src/views/charge/charge.vue
+++ b/src/views/charge/charge.vue
@@ -497,8 +497,10 @@ export default {
 
     // 获取个人充值卡
     getCardRegister(idNo) {
-      let body = { cardModeId: '0', idNo };
       this.cardRegister = [];
+
+      if(!idNo) return;
+      let body = { cardModeId: '0', idNo };      
       postapi(`/api/app/cardregister/getcardregisterlist`, body).then(res => {
         if (res.code != - 1) {
           this.cardRegister = res.data;
diff --git a/src/views/report/report.vue b/src/views/report/report.vue
index eec5864..4d4bc51 100644
--- a/src/views/report/report.vue
+++ b/src/views/report/report.vue
@@ -3,27 +3,13 @@
     <el-card>
       <div class="publiccss">体检报告</div>
       <div style="display: flex; margin-top: 20px">
-        <div
-          :style="
-            'display: block; width:' + (window.pageWidth - 120 - 70) + 'px;'
-          "
-        >
+        <div :style="'display: block; width:' + (window.pageWidth - 120 - 80) + 'px;'">
           <PatientRegisterQueryNobtn orgEnable="Y" />
           <div style="display: flex">
-            <div
-              :style="
-                'width:' + ((window.pageWidth - 120 - 70) * 3) / 4 + 'px;'
-              "
-            >
+            <div :style="'width:' + Math.floor((window.pageWidth - 120 - 80) * 3 / 4) + 'px;'">
               <PatientRegisterListNobtn />
             </div>
-            <div
-              :style="
-                'margin-left: 2px;width:' +
-                (window.pageWidth - 120 - 70 - 8) / 4 +
-                'px;'
-              "
-            >
+            <div :style="'margin-left: 2px;width:' + Math.floor((window.pageWidth - 120 - 80 - 8) / 4) + 'px;'">
               <RegisterCheckStatus />
             </div>
           </div>
@@ -71,7 +57,7 @@ export default {
   },
 
   //挂载完成
-  mounted() {},
+  mounted() { },
   computed: {
     ...mapState(["window", "dict", "patientRegister"]),
   },