From 134c0a239af27e002c168c0642c0a55775f61319 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 11 Sep 2023 09:56:54 +0800
Subject: [PATCH] seo

---
 .../PatientRegisterRecoverList.vue            |  6 +--
 .../PatientRegisterRefuseList.vue             |  4 +-
 src/views/charge/charge.vue                   | 10 ++--
 .../customerOrg/patientRegisterRecover.vue    | 51 +++++++------------
 src/views/customerOrg/patientRegisterSign.vue |  2 +-
 5 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/src/components/patientRegister/PatientRegisterRecoverList.vue b/src/components/patientRegister/PatientRegisterRecoverList.vue
index c85e5b5..9744d5e 100644
--- a/src/components/patientRegister/PatientRegisterRecoverList.vue
+++ b/src/components/patientRegister/PatientRegisterRecoverList.vue
@@ -1,9 +1,9 @@
 <template>
-  <div style="display: flex">
+  <div style="display: flex;margin-left: 5px;">
 
-    <div :style="'width:' + (window.pageWidth - 200 - 120 - 70) + 'px;'">
+    <div :style="'width:' + (window.pageWidth - 5 - 200 - 120 - 80 ) + 'px;'">
       <el-table :data="dataList" border width="100%" 
-        :height="window.pageHeight < 600 ? 350:window.pageHeight-250" 
+        :height="window.pageHeight < 600 ? 310:window.pageHeight-290" 
         row-key="id" size="small"
         highlight-current-row ref="dataList"
         @selection-change="handleSelectionChange">
diff --git a/src/components/patientRegister/PatientRegisterRefuseList.vue b/src/components/patientRegister/PatientRegisterRefuseList.vue
index bb7d8cc..be93b18 100644
--- a/src/components/patientRegister/PatientRegisterRefuseList.vue
+++ b/src/components/patientRegister/PatientRegisterRefuseList.vue
@@ -2,7 +2,7 @@
   <div style="display: flex">
     <div :style="'width:' + Math.floor((window.pageWidth - 120 - 86)/2) + 'px;'">
       <el-table :data="dataList" border 
-        :height="window.pageHeight < 600 ? 350:window.pageHeight-250"
+        :height="window.pageHeight < 600 ? 310:window.pageHeight-290"
         row-key="id" size="small" highlight-current-row ref="dataList"
         @row-click="rowClick">
         <el-table-column type="index" width="50" label="序号" />
@@ -129,7 +129,7 @@
         </div>
       </div>
       <el-table :data="doctorCheck.RegisterCheckList"  
-        :height="window.pageHeight < 600 ? 310:window.pageHeight-290"
+        :height="window.pageHeight < 600 ? 270:window.pageHeight-330"
         border highlight-current-row
         size="small" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="40" />
diff --git a/src/views/charge/charge.vue b/src/views/charge/charge.vue
index 728bec6..2bfd221 100644
--- a/src/views/charge/charge.vue
+++ b/src/views/charge/charge.vue
@@ -35,7 +35,7 @@
           <!-- 列表 -->
           <div class="prListDivClass">
             <el-table :data="patientList" border highlight-current-row
-              :height="(window.pageHeight > 600 ? (window.pageHeight - 230) : 350)" @row-click="rowClick" size="small">
+              :height="(window.pageHeight > 600 ? (window.pageHeight - 270) : 310)" @row-click="rowClick" size="small">
               <!--  
                 <el-table-column prop="patientRegisterId" label="体检记录ID" />
               -->
@@ -142,7 +142,7 @@
             <div>
               <div style="margin-top:5px;font-size:10px;">{{ query.chargeFlag == 'B' ? '退' : '收' }}费方式：</div>
               <el-table :data="chargePays" border highlight-current-row size="small"
-                :height="window.pageHeight > 600 ? (window.pageHeight - 230 - 146) / 2 : 112">
+                :height="window.pageHeight > 600 ? (window.pageHeight - 270 - 146) / 2 : 92">
                 <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>
@@ -169,7 +169,7 @@
               <div style="margin-top:5px; font-size:10px;">{{ query.chargeFlag == 'N' ? '待收' : (query.chargeFlag == 'Y' ?
                 '已收' : '已退') }}费项目：</div>
               <el-table :data="asbItemsForFee" border highlight-current-row
-                :height="window.pageHeight > 600 ? (window.pageHeight - 230 - 146) / 2 : 112" size="small"
+                :height="window.pageHeight > 600 ? (window.pageHeight - 270 - 146) / 2 : 92" 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" />
@@ -1099,7 +1099,7 @@ input[type="number"]::-webkit-outer-spin-button {
 .queryDivClass {
   display: block;
   width: v-bind("(window.pageWidth > 600 ? (window.pageWidth - 120 - 80) / 2 : 200) + 'px'");
-  height: v-bind("(window.pageHeight > 600 ? (window.pageHeight - 150) : 450) + 'px'");
+  height: v-bind("(window.pageHeight > 600 ? (window.pageHeight - 190) : 410) + 'px'");
 }
 
 .query {
@@ -1107,7 +1107,7 @@ input[type="number"]::-webkit-outer-spin-button {
 }
 
 .prListDivClass {
-  height: v-bind("(window.pageHeight > 600 ? (window.pageHeight - 250) : 350) + 'px'");
+  height: v-bind("(window.pageHeight > 600 ? (window.pageHeight - 290) : 310) + 'px'");
 }
 
 .btnDivClass {
diff --git a/src/views/customerOrg/patientRegisterRecover.vue b/src/views/customerOrg/patientRegisterRecover.vue
index 5a2067a..3fbcd23 100644
--- a/src/views/customerOrg/patientRegisterRecover.vue
+++ b/src/views/customerOrg/patientRegisterRecover.vue
@@ -1,13 +1,22 @@
 <template>
   <div>
     <el-card>
-      <div class="publiccss">回收表格查询</div>
+      <div class="publiccss">体检表回收</div>
       <div style="display: flex;margin-top:20px">
         <!-- 单位树组件 -->
-        <div :style="CustomerOrgTreeStyle">
+        <div :style="'overflow: scroll;border: 1px solid;width:200px; height:' +
+          (window.pageHeight < 600 ? 410 : window.pageHeight - 190) +
+          'px;'
+          ">
           <CustomerOrgTreeAll />
         </div>
-        <div :style="CustomerOrgRightStyle">
+        <div :style="'display:block;width:' +
+          (window.pageWidth - 200 - 80) +
+          'px;height:' +
+          (window.pageHeight < 600 ? 410 : window.pageHeight - 190) +
+          'px;' +
+          (window.pageHeight < 600 ? 'overflow-y: scroll;' : '')
+          ">
           <!-- 查询条件  -->
           <PatientRegisterQuery />
 
@@ -36,13 +45,13 @@ export default {
   data() {
     return {
       tabChoosed: "1",
-      CustomerOrgTreeStyle:'',
-      CustomerOrgRightStyle:'',
+      CustomerOrgTreeStyle: '',
+      CustomerOrgRightStyle: '',
     };
   },
 
   created() {
-    this.resize();
+
   },
 
   //挂载完成
@@ -51,24 +60,12 @@ export default {
   },
 
   computed: {
-    ...mapState(["window","dict", "patientRegister", "customerOrg"]),
+    ...mapState(["window", "dict", "patientRegister", "customerOrg"]),
   },
 
   methods: {
     ...mapActions(["getCustomerOrgGroup"]),
 
-    resize() {
-      //console.log(this.window.pageHeight,this.window.pageWidth)
-      let headerHeight = Number(150);
-
-      this.CustomerOrgTreeStyle = "overflow: scroll;border: 1px solid;width:200px; height:" + (this.window.pageHeight - headerHeight) + "px;";
-      this.CustomerOrgRightStyle = "margin-left: 10px;width:" + (this.window.pageWidth - 200 - 60) + "px; height:" + (this.window.pageHeight - headerHeight) + "px;";
-  
-      if (this.window.pageHeight < 600) {
-        this.CustomerOrgTreeStyle = "overflow: scroll;border: 1px solid;width:200px; height:" + (600 - headerHeight) + "px;"; 
-      }
-    },
-
     //数据初始化
     dictInit() {
       //性别（仅档案用）
@@ -83,7 +80,7 @@ export default {
         if (res.code == 1) {
           this.dict.forSex = res.data;
         }
-      });      
+      });
 
       //体检中心
       getapi("/api/app/organization-units/organization-unit-by-is-peis").then(
@@ -133,8 +130,8 @@ export default {
       getapi("/api/app/nation/in-filter").then((res) => {
         if (res.code == 1) {
           // this.dict.nation = res.data.items;
-           this.dict.nation = res.data;
-          console.log(res,'名族');
+          this.dict.nation = res.data;
+          console.log(res, '名族');
         }
       });
 
@@ -199,16 +196,6 @@ export default {
       }
     },
 
-    "window.pageHeight"(newVal, oldVal) {
-      if (newVal != oldVal) {
-        this.resize();
-      }
-    },
-    "window.pageWidth"(newVal, oldVal) {
-      if (newVal != oldVal) {
-        this.resize();
-      }
-    },
   },
 };
 </script>
diff --git a/src/views/customerOrg/patientRegisterSign.vue b/src/views/customerOrg/patientRegisterSign.vue
index 9d8fbaa..f6e5c56 100644
--- a/src/views/customerOrg/patientRegisterSign.vue
+++ b/src/views/customerOrg/patientRegisterSign.vue
@@ -4,7 +4,7 @@
       <div class="publiccss">体检人员签到</div>
       <div style="display: flex">
         <!-- 单位树组件 -->
-        <div style="'overflow: scroll;border: 1px solid;width:200px; height:' +
+        <div :style="'overflow: scroll;border: 1px solid;width:200px; height:' +
           (window.pageHeight < 600 ? 410 : window.pageHeight - 190) +
           'px;'
           ">