From 54730803f81ce8dd028196ba332b3fc43be3f2fa Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Fri, 8 Sep 2023 17:57:10 +0800
Subject: [PATCH] sum

---
 src/components/doctorCheck/CheckItemList.vue  |  4 ++--
 src/components/doctorCheck/CheckSumSug.vue    | 12 ++++++------
 .../doctorCheck/RegisterCheckList.vue         |  2 +-
 .../sumDoctorCheck/CheckDetails.vue           |  2 +-
 src/components/sumDoctorCheck/SumHistory.vue  |  2 +-
 src/components/sumDoctorCheck/SumItems.vue    |  8 ++++----
 .../sumDoctorCheck/SumItemsType.vue           |  4 ++--
 src/components/sumDoctorCheck/SumSug.vue      |  4 ++--
 src/views/doctorCheck/doctorCheck.vue         |  8 ++++----
 src/views/doctorCheck/sumDoctorCheck.vue      | 19 +++++++------------
 10 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue
index 3a07ea4..3d2ef6e 100644
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-table :data="doctorCheck.checkItemList" style="width: 100%" :height="window.pageHeight < 600
-        ? Math.floor(((380 - 40) * 3) / 5)
-        : Math.floor(((window.pageHeight - 220 - 40) * 3) / 5)
+        ? Math.floor(((420 - 40) * 3) / 5)
+        : Math.floor(((window.pageHeight - 260 - 40) * 3) / 5)
       " :row-style="{ height: '30px' }" border @row-click="rowClick">
       <el-table-column prop="itemName" label="项目" width="180" />
       <el-table-column prop="result" label="结果" width="500">
diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue
index 9e3f1cf..22b8cc2 100644
--- a/src/components/doctorCheck/CheckSumSug.vue
+++ b/src/components/doctorCheck/CheckSumSug.vue
@@ -1,10 +1,10 @@
 <template>
   <div style="display: flex;">
-    <div :style="'width:'+Math.floor((window.pageWidth - 200 - 120 - 70)/2) + 'px;'">
+    <div :style="'width:'+Math.floor((window.pageWidth - 210 - 120 - 80)/2) + 'px;'">
       <el-table id="tableSummary" row-key="id" :data="doctorCheck.checkSummaryList" :row-style="{ height: '30px' }"
-        :height="window.pageHeight < 600 ? Math.floor((380 - 40)*2/5):Math.floor((window.pageHeight-220-40)*2/5)"
+        :height="window.pageHeight < 600 ? Math.floor((380 - 80)*2/5):Math.floor((window.pageHeight-220-80)*2/5)"
         width="100%" border @row-click="rowClick">
-        <el-table-column prop="summary" label="小结" :width="Math.floor((window.pageWidth - 200 - 124 - 70)/2)" >
+        <el-table-column prop="summary" label="小结" :width="Math.floor((window.pageWidth - 210 - 124 - 80)/2)" >
           <template slot-scope="scope">
             <el-input type="textarea" v-model="scope.row.summary" :autosize="{ minRows: 1, maxRows: 100 }"
             :disabled="doctorCheck.RegisterCheckEdit.completeFlag=='1' || doctorCheck.RegisterCheckEdit.completeFlag=='2'" placeholder="请输入小结">
@@ -13,11 +13,11 @@
         </el-table-column>      
       </el-table>
     </div>
-    <div :style="'margin-left:2px;width:'+Math.floor((window.pageWidth - 200 - 120 - 70)/2) + 'px;'">
+    <div :style="'margin-left:2px;width:'+Math.floor((window.pageWidth - 210 - 120 - 80)/2) + 'px;'">
       <el-table id="tableSuggestion" row-key="id" :data="doctorCheck.checkSuggestionList" :row-style="{ height: '30px' }"
-        :height="window.pageHeight < 600 ? Math.floor((380 - 40)*2/5):Math.floor((window.pageHeight-220-40)*2/5)"
+        :height="window.pageHeight < 600 ? Math.floor((380 - 80)*2/5):Math.floor((window.pageHeight-220-80)*2/5)"
         width="100%" border @row-click="rowClick">
-        <el-table-column prop="suggestion" label="建议" :width="Math.floor((window.pageWidth - 200 - 124 - 70)/2)" >
+        <el-table-column prop="suggestion" label="建议" :width="Math.floor((window.pageWidth - 210 - 124 - 80)/2)" >
           <template slot-scope="scope">
             <el-input type="textarea" v-model="scope.row.suggestion" :autosize="{ minRows: 1, maxRows: 100 }"
             :disabled="doctorCheck.RegisterCheckEdit.completeFlag=='1' || doctorCheck.RegisterCheckEdit.completeFlag=='2'" placeholder="请输入建议">
diff --git a/src/components/doctorCheck/RegisterCheckList.vue b/src/components/doctorCheck/RegisterCheckList.vue
index 7d09d39..18deda8 100644
--- a/src/components/doctorCheck/RegisterCheckList.vue
+++ b/src/components/doctorCheck/RegisterCheckList.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-table :data="doctorCheck.RegisterCheckList" style="width: 100%" 
-      :height="window.pageHeight < 600 ? 380:window.pageHeight-220" 
+      :height="window.pageHeight < 600 ? 340:window.pageHeight-260" 
       border highlight-current-row
       :row-class-name="tableRowClassName" @row-click="rowClick">
       <el-table-column prop="asbitemName" label="组合项目" width="198" />    
diff --git a/src/components/sumDoctorCheck/CheckDetails.vue b/src/components/sumDoctorCheck/CheckDetails.vue
index e2ee21f..546f956 100644
--- a/src/components/sumDoctorCheck/CheckDetails.vue
+++ b/src/components/sumDoctorCheck/CheckDetails.vue
@@ -1,5 +1,5 @@
 <template>  
-  <div :style="'overflow: scroll;width:100%;height:'+(window.pageHeight < 600 ? 340:window.pageHeight-260)+'px;'">
+  <div :style="'overflow: scroll;width:100%;height:'+(window.pageHeight < 600 ? 300:window.pageHeight-300)+'px;'">
     <table width="1000" >   
       <tbody v-for="(item,index) of tableData" :key="index">  
         <tr height="30"><td style="text-align: center;font-weight: bolder;">{{item.itemTypeName}}</td></tr>
diff --git a/src/components/sumDoctorCheck/SumHistory.vue b/src/components/sumDoctorCheck/SumHistory.vue
index 7aab96c..eccfb62 100644
--- a/src/components/sumDoctorCheck/SumHistory.vue
+++ b/src/components/sumDoctorCheck/SumHistory.vue
@@ -1,5 +1,5 @@
 <template>  
-  <div :style="'overflow: scroll;width:100%;height:'+(window.pageHeight < 600 ? 340:window.pageHeight-260)+'px;'">
+  <div :style="'overflow: scroll;width:100%;height:'+(window.pageHeight < 600 ? 300:window.pageHeight-300)+'px;'">
     <table width="800">   
       <tbody v-for="(item,index) of tableData" :key="index">
         <tr height="40">
diff --git a/src/components/sumDoctorCheck/SumItems.vue b/src/components/sumDoctorCheck/SumItems.vue
index 99be771..87af5dc 100644
--- a/src/components/sumDoctorCheck/SumItems.vue
+++ b/src/components/sumDoctorCheck/SumItems.vue
@@ -2,15 +2,15 @@
   <div style="display: flex;width:100%;">  
     <div style="width:180;">
       <el-table :data="RegisterCheckList" width="180" 
-        :height="window.pageHeight < 600 ? 340:window.pageHeight-260"
+        :height="window.pageHeight < 600 ? 300:window.pageHeight-300"
         border highlight-current-row
         :row-style="{ height: '40px' }" :row-class-name="tableRowClassName" @row-click="rowClick">
         <el-table-column prop="asbitemName" label="组合项目" width="180" />
       </el-table>
     </div>
-    <div :style="'width:' + (window.pageWidth - 330 - 70) + 'px;'">
-      <el-table :data="tableData" :width="(window.pageWidth - 330 - 70)" 
-        :height="window.pageHeight < 600 ? 340:window.pageHeight-260"
+    <div :style="'width:' + (window.pageWidth - 330 - 80) + 'px;'">
+      <el-table :data="tableData" :width="(window.pageWidth - 330 - 80)" 
+        :height="window.pageHeight < 600 ? 300:window.pageHeight-300"
         border :row-style="{ height: '40px' }">
         <el-table-column prop="itemName" label="项目" width="150" />
         <el-table-column prop="unitName" label="单位" width="90" />
diff --git a/src/components/sumDoctorCheck/SumItemsType.vue b/src/components/sumDoctorCheck/SumItemsType.vue
index 17ec6c5..2d495ad 100644
--- a/src/components/sumDoctorCheck/SumItemsType.vue
+++ b/src/components/sumDoctorCheck/SumItemsType.vue
@@ -1,7 +1,7 @@
 <template>
-  <div :style="'width:100%;height:'+(window.pageHeight < 600 ? 340:window.pageHeight-260)+'px;'">
+  <div :style="'width:100%;height:'+(window.pageHeight < 600 ? 300:window.pageHeight-300)+'px;'">
     <el-table :data="tableData" width="1000px" 
-      :height="window.pageHeight < 600 ? 340:window.pageHeight-260" 
+      :height="window.pageHeight < 600 ? 300:window.pageHeight-300" 
       border :row-style="{ height: '40px' }" >
       <el-table-column prop="itemTypeName" label="项目" width="180"/>
       <el-table-column v-for="(item,index) of tableCols" :label="item" :prop="item" :key="index" width="200">
diff --git a/src/components/sumDoctorCheck/SumSug.vue b/src/components/sumDoctorCheck/SumSug.vue
index 70076e6..7e08275 100644
--- a/src/components/sumDoctorCheck/SumSug.vue
+++ b/src/components/sumDoctorCheck/SumSug.vue
@@ -2,7 +2,7 @@
   <div style="display: flex;">
     <div style="width:50%;">
       <el-table id="tableSummary" row-key="id" :data="sumDoctorCheck.summaryList" width="100%"
-        :height="window.pageHeight < 600 ? 200 : window.pageHeight - 400" border :row-style="{ height: '60px' }">
+        :height="window.pageHeight < 600 ? 160 : window.pageHeight - 440" border :row-style="{ height: '60px' }">
         <el-table-column prop="summaryTitle" label="综述">
           <template slot-scope="scope">
             <div>
@@ -26,7 +26,7 @@
     </div>
     <div style="width:50%;">
       <el-table id="tableSuggestion" row-key="id" :data="sumDoctorCheck.suggestionList" width="100%"
-        :height="window.pageHeight < 600 ? 200 : window.pageHeight - 400" border :row-style="{ height: '60px' }">
+        :height="window.pageHeight < 600 ? 160 : window.pageHeight - 440" border :row-style="{ height: '60px' }">
         <el-table-column type="index" width="30" style="vertical-align: top;">
         </el-table-column>
         <el-table-column prop="suggestionTitle" label="建议">
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index c5f2928..effafa5 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -3,7 +3,7 @@
     <el-card style="display: block; ">
       <div class="publiccss">体检医生诊台</div>
       <div style="display: flex;">
-        <div :style="'width:' + (window.pageWidth - 120 - 70) + 'px;'">
+        <div :style="'width:' + (window.pageWidth - 120 - 80) + 'px;'">
           <div>
             <PatientRegisterBase/>
           </div>
@@ -12,9 +12,9 @@
               <RegisterCheckList/>
             </div>
             <div>
-              <div :style="'margin-left: 2px;width:' + (window.pageWidth - 200 - 120 - 70) + 'px;'"><CheckItemList/></div>
-              <div :style="'margin-top: 2px;margin-left: 2px;width:' + (window.pageWidth - 200 - 120 - 70) + 'px;'"><CheckSumSug/></div>
-              <div :style="'margin-top: 2px;width:' + (window.pageWidth - 200 - 120 - 70) + 'px;'"><RegisterCheckEdit/></div>
+              <div :style="'margin-left: 2px;width:' + (window.pageWidth - 210 - 120 - 80) + 'px;'"><CheckItemList/></div>
+              <div :style="'margin-top: 2px;margin-left: 2px;width:' + (window.pageWidth - 210 - 120 - 80) + 'px;'"><CheckSumSug/></div>
+              <div :style="'margin-top: 2px;width:' + (window.pageWidth - 210 - 120 - 80) + 'px;'"><RegisterCheckEdit/></div>
             </div>
           </div>
         </div>
diff --git a/src/views/doctorCheck/sumDoctorCheck.vue b/src/views/doctorCheck/sumDoctorCheck.vue
index 53588b9..3a515ea 100644
--- a/src/views/doctorCheck/sumDoctorCheck.vue
+++ b/src/views/doctorCheck/sumDoctorCheck.vue
@@ -3,25 +3,20 @@
     <el-card style="display: block">
       <div class="publiccss">总检医生诊台</div>
       <div style="display: flex">
-        <div :style="'width:' + (window.pageWidth - 120 - 70) + 'px;'">
+        <div :style="'width:' + (window.pageWidth - 120 - 80) + 'px;'">
           <div>
             <PatientRegisterBase />
           </div>
-          <div
-            :style="
-              'height:' +
-              (window.pageHeight < 600 ? 380 : window.pageHeight - 220) +
-              'px;'
-            "
-          >
+          <div :style="'height:' +
+            (window.pageHeight < 600 ? 340 : window.pageHeight - 260) +
+            'px;'
+            ">
             <el-tabs style="margin-left: 10px" v-model="tabChoosed">
               <el-tab-pane label="综述建议" name="1">
                 <div>
                   <SumSug />
                   <SumPREdit />
-                  <SumAsbItemStatus
-                    :patientRegisterId="sumDoctorCheck.sumPREdit.id"
-                  />
+                  <SumAsbItemStatus :patientRegisterId="sumDoctorCheck.sumPREdit.id" />
                 </div>
               </el-tab-pane>
               <el-tab-pane label="明细结果" name="2">
@@ -79,7 +74,7 @@ export default {
     };
   },
 
-  created() {},
+  created() { },
 
   //挂载完成
   mounted() {