From 7aee3875c66cd0fa876fc852703f3b183131a964 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 7 Aug 2023 11:51:19 +0800
Subject: [PATCH] resize

---
 .../customerOrg/customerOrgEdit.vue           |  2 +-
 src/components/doctorCheck/ButtonList.vue     |  2 +-
 src/components/doctorCheck/CheckItemList.vue  |  6 +-
 src/components/doctorCheck/CheckSumSug.vue    |  8 +-
 .../doctorCheck/PatientRegisterBase.vue       | 83 ++++++++++---------
 .../doctorCheck/RegisterCheckEdit.vue         | 28 ++++---
 .../doctorCheck/RegisterCheckList.vue         |  7 +-
 src/views/customerOrg/customerOrg.vue         |  6 +-
 src/views/doctorCheck/doctorCheck.vue         | 55 +++++-------
 9 files changed, 96 insertions(+), 101 deletions(-)

diff --git a/src/components/customerOrg/customerOrgEdit.vue b/src/components/customerOrg/customerOrgEdit.vue
index d5864c8..231bfca 100644
--- a/src/components/customerOrg/customerOrgEdit.vue
+++ b/src/components/customerOrg/customerOrgEdit.vue
@@ -106,7 +106,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input type="textarea" v-model="customerOrg.customerOrgRd.remark" maxlength="100" show-word-limit />
+              <el-input v-model="customerOrg.customerOrgRd.remark" maxlength="100" show-word-limit />
             </el-form-item>
           </el-col>
         </el-row>        
diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue
index d4fdd5a..48b3c22 100644
--- a/src/components/doctorCheck/ButtonList.vue
+++ b/src/components/doctorCheck/ButtonList.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div style="margin-left: 10px;">
         <div class="listBtn">
             <el-button type="primary" class="btnClass" @click="prList">人员列表</el-button>
         </div>
diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue
index 343baa8..b204613 100644
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@@ -1,6 +1,8 @@
 <template>
   <div>
-    <el-table :data="doctorCheck.checkItemList" style="width: 100%" height="350" :row-style="{ height: '60px' }" border @row-click="rowClick">
+    <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)" 
+      :row-style="{ height: '60px' }" border @row-click="rowClick">
       <el-table-column prop="itemName" label="项目" width="180" />
       <el-table-column prop="result" label="结果" width="500">
         <template slot-scope="scope">
@@ -36,7 +38,7 @@ export default {
   mounted() { },
 
   computed: {
-    ...mapState(['dict', 'doctorCheck']),
+    ...mapState(['window','dict', 'doctorCheck']),
   },
 
   methods: {
diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue
index ad9da28..2108d3a 100644
--- a/src/components/doctorCheck/CheckSumSug.vue
+++ b/src/components/doctorCheck/CheckSumSug.vue
@@ -2,7 +2,8 @@
   <div style="display: flex;">
     <div style="width:50%;">
       <el-table id="tableSummary" row-key="id" :data="doctorCheck.checkSummaryList" :row-style="{ height: '60px' }"
-        width="100%" height="350" border @row-click="rowClick">
+        :height="window.pageHeight < 600 ? Math.floor((380 - 40)*2/5):Math.floor((window.pageHeight-220-40)*2/5)"
+        width="100%" border @row-click="rowClick">
         <el-table-column prop="summary" label="小结" width="460" >
           <template slot-scope="scope">
             <el-input type="textarea" v-model="scope.row.summary" 
@@ -14,7 +15,8 @@
     </div>
     <div style="width:50%;">
       <el-table id="tableSuggestion" row-key="id" :data="doctorCheck.checkSuggestionList" :row-style="{ height: '60px' }"
-        width="100%" height="350" border @row-click="rowClick">
+        :height="window.pageHeight < 600 ? Math.floor((380 - 40)*2/5):Math.floor((window.pageHeight-220-40)*2/5)"
+        width="100%" border @row-click="rowClick">
         <el-table-column prop="suggestion" label="建议" width="460" >
           <template slot-scope="scope">
             <el-input type="textarea" v-model="scope.row.suggestion" 
@@ -47,7 +49,7 @@ export default {
   },
 
   computed: {
-    ...mapState(['dict', 'doctorCheck']),
+    ...mapState(['window','dict', 'doctorCheck']),
   },
 
   methods: {
diff --git a/src/components/doctorCheck/PatientRegisterBase.vue b/src/components/doctorCheck/PatientRegisterBase.vue
index 8dea414..a914436 100644
--- a/src/components/doctorCheck/PatientRegisterBase.vue
+++ b/src/components/doctorCheck/PatientRegisterBase.vue
@@ -1,70 +1,70 @@
 <template>
   <div style="display: flex">
-    <div style="display: flex; flex-wrap: wrap; width: 100%;">
-      <div class="query">
-        <span>条码号</span>
-        <el-input placeholder="条码号" v-model="doctorCheck.prBase.patientRegisterNo" size="small" style="width: 120px;margin-left:10px"
+    <div style="display: flex; flex-wrap: wrap;height:70px; width: 100%;">
+      <div>
+        <span class="query">条码号</span>
+        <el-input placeholder="条码号" v-model="doctorCheck.prBase.patientRegisterNo" size="small" style="width: 140px;"
           clearable @input="onQueryByPatientRegisterNo" />
       </div>
-      <div class="query">
-        <span>档案号</span>
-        <el-input placeholder="档案号" v-model="doctorCheck.prBase.patientNo" size="small" style="width: 120px;margin-left:10px" clearable
+      <div>
+        <span class="query">档案号</span>
+        <el-input placeholder="档案号" v-model="doctorCheck.prBase.patientNo" size="small" style="width: 100px;" clearable
           @input="onQueryByPatientNo" />
       </div>
-      <div class="query">
-        <span>姓名</span>
-        <el-input placeholder="姓名" v-model="doctorCheck.prBase.patientName" size="small" style="width: 120px;margin-left:10px" disabled />
+      <div>
+        <span class="query">姓名</span>
+        <el-input placeholder="姓名" v-model="doctorCheck.prBase.patientName" size="small" style="width: 100px;" disabled />
       </div>
-      <div class="query">
-        <span>性别</span>
-        <el-select v-model="doctorCheck.prBase.sexId" style="width: 120px;margin-left:10px" size="small" disabled>
+      <div>
+        <span class="query">性别</span>
+        <el-select v-model="doctorCheck.prBase.sexId" style="width: 80px;" size="small" disabled>
           <el-option v-for="item in dict.sex" :key="item.id" :label="item.displayName" :value="item.id" />
         </el-select>
       </div>
-      <div class="query">
-        <span>体检次数</span>
-        <el-input v-model="doctorCheck.prBase.medicalTimes" size="small" style="width: 120px;margin-left:10px" disabled />
+      <div>
+        <span class="query">体检次数</span>
+        <el-input v-model="doctorCheck.prBase.medicalTimes" size="small" style="width: 40px;" disabled />
       </div>
-      <div class="query">
-        <span>婚姻</span>
-        <el-select v-model="doctorCheck.prBase.maritalStatusId" style="width: 120px;margin-left:10px" size="small" disabled>
+      <div>
+        <span class="query">婚姻</span>
+        <el-select v-model="doctorCheck.prBase.maritalStatusId" style="width: 80px;" size="small" disabled>
           <el-option v-for="item in dict.maritalStatus" :key="item.id" :label="item.displayName" :value="item.id" />
         </el-select>
       </div>
-      <div class="query">
-        <span>体检日期</span>
+      <div>
+        <span class="query">体检日期</span>
         <el-input :value="doctorCheck.prBase.creationTime ? lmoment(doctorCheck.prBase.creationTime, 'yyyy-MM-DD') : ''"
-          style="width: 120px;margin-left:10px" size="small" disabled></el-input>
+          style="width: 100px;" size="small" disabled></el-input>
       </div>
-      <div class="query">
-        <span>单位</span>
-        <el-input :value="doctorCheck.prBase.customerOrgParentName" style="width: 120px;margin-left:10px" size="small" disabled />
+      <div>
+        <span class="query">单位</span>
+        <el-input :value="doctorCheck.prBase.customerOrgParentName" style="width: 120px;" size="small" disabled />
       </div>
-      <div class="query">
-        <span>部门</span>
-        <el-input :value="doctorCheck.prBase.customerOrgName" style="width: 120px;margin-left:10px" size="small" disabled />
+      <div>
+        <span class="query">部门</span>
+        <el-input :value="doctorCheck.prBase.customerOrgName" style="width: 120px;" size="small" disabled />
       </div>
-      <div class="query">
-        <span>体检类别</span>
-        <el-select v-model="doctorCheck.prBase.medicalTypeId" disabled style="width: 120px;margin-left:10px" size="small">
+      <div>
+        <span class="query">体检类别</span>
+        <el-select v-model="doctorCheck.prBase.medicalTypeId" disabled style="width: 100px;" size="small">
           <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName" :value="item.id" />
         </el-select>
       </div>
-      <div class="query">
-        <span>人员类别</span>
-        <el-select v-model="doctorCheck.prBase.personnelTypeId" disabled style="width: 120px;margin-left:10px" size="small">
+      <div>
+        <span class="query">人员类别</span>
+        <el-select v-model="doctorCheck.prBase.personnelTypeId" disabled style="width: 100px;" size="small">
           <el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName" :value="item.id" />
         </el-select>
       </div>
-      <div class="query">
-        <span>民族</span>
-        <el-select v-model="doctorCheck.prBase.nationId" disabled style="width: 120px;margin-left:10px" size="small">
+      <div>
+        <span class="query">民族</span>
+        <el-select v-model="doctorCheck.prBase.nationId" disabled style="width: 100px;" size="small">
           <el-option v-for="item in dict.nation" :key="item.id" :label="item.displayName" :value="item.id" />
         </el-select>
       </div>
-      <div class="query">
-        <span>手机</span>
-        <el-input :value="doctorCheck.prBase.mobileTelephone" style="width: 120px;margin-left:10px" size="small" disabled />
+      <div>
+        <span class="query">手机</span>
+        <el-input :value="doctorCheck.prBase.mobileTelephone" style="width: 120px;" size="small" disabled />
       </div>
     </div>
   </div>
@@ -181,6 +181,7 @@ export default {
 <style scoped>
 .query {
   margin-left: 10px;
-  padding: 5px 5px;
+  margin-right: 2px;
+  padding: 1px 1px;
 }
 </style>
diff --git a/src/components/doctorCheck/RegisterCheckEdit.vue b/src/components/doctorCheck/RegisterCheckEdit.vue
index d4c2370..66df414 100644
--- a/src/components/doctorCheck/RegisterCheckEdit.vue
+++ b/src/components/doctorCheck/RegisterCheckEdit.vue
@@ -1,24 +1,24 @@
 <template>
   <div style="display: flex">
-    <div style="display: flex; flex-wrap: wrap; width: 100%">      
-      <div class="query">
-        <span>检查医生</span>
-        <el-input v-model="doctorCheck.RegisterCheckEdit.checkDoctorId" size="small" style="width: 110px" />
+    <div style="display: flex; flex-wrap: wrap;height:40px; width: 100%">      
+      <div>
+        <span class="query">检查医生</span>
+        <el-input v-model="doctorCheck.RegisterCheckEdit.checkDoctorId" size="small" style="width: 100px" />
       </div>
-      <div class="query">
-        <span>检查日期</span>
+      <div>
+        <span class="query">检查日期</span>
         <el-date-picker v-model="doctorCheck.RegisterCheckEdit.checkDate" type="date" style="width: 130px" size="small" />
       </div> 
-      <div class="query">
-        <span>操作者</span>
-        <el-input v-model="doctorCheck.RegisterCheckEdit.LastModifierId" size="small"  style="width: 110px" disabled/>
+      <div>
+        <span class="query">操作者</span>
+        <el-input v-model="doctorCheck.RegisterCheckEdit.LastModifierId" size="small"  style="width: 100px" disabled/>
       </div>
-      <div class="query">
-        <span>操作日期</span>
+      <div>
+        <span class="query">操作日期</span>
         <el-input :value="doctorCheck.RegisterCheckEdit.LastModificationTime ? lmoment(doctorCheck.RegisterCheckEdit.LastModificationTime, 'yyyy-MM-DD') :''" style="width: 120px" size="small" disabled></el-input>
       </div>
-      <div class="query">
-        <span>状态</span>
+      <div>
+        <span class="query">状态</span>
         <el-select v-model="doctorCheck.RegisterCheckEdit.completeFlag" style="width: 80px" size="small" disabled>
           <el-option v-for="item in dict.checkCompleteFlag" :key="item.id" :label="item.displayName" :value="item.id" />
         </el-select>
@@ -99,5 +99,7 @@ export default {
 <style scoped>
 .query {
   margin-left: 10px;
+  margin-right: 2px;
+  padding: 1px 1px;
 }
 </style>
diff --git a/src/components/doctorCheck/RegisterCheckList.vue b/src/components/doctorCheck/RegisterCheckList.vue
index dde125a..25a4a1d 100644
--- a/src/components/doctorCheck/RegisterCheckList.vue
+++ b/src/components/doctorCheck/RegisterCheckList.vue
@@ -1,9 +1,10 @@
 <template>
   <div>
-    <el-table :data="doctorCheck.RegisterCheckList" style="width: 100%" height="750" 
+    <el-table :data="doctorCheck.RegisterCheckList" style="width: 100%" 
+      :height="window.pageHeight < 600 ? 380:window.pageHeight-220" 
       border highlight-current-row
       :row-class-name="tableRowClassName" @row-click="rowClick">
-      <el-table-column prop="asbitemName" label="组合项目" width="180" />    
+      <el-table-column prop="asbitemName" label="组合项目" width="198" />    
     </el-table>
   </div>
 </template>
@@ -25,7 +26,7 @@ export default {
   mounted() {},
 
   computed:{
-      ...mapState(['dict','doctorCheck']),
+      ...mapState(['window','dict','doctorCheck']),
   },
 
   methods: {
diff --git a/src/views/customerOrg/customerOrg.vue b/src/views/customerOrg/customerOrg.vue
index 6511f3c..661d7de 100644
--- a/src/views/customerOrg/customerOrg.vue
+++ b/src/views/customerOrg/customerOrg.vue
@@ -66,8 +66,8 @@ export default {
   methods: {
     resize() {
       let headerHeight = Number(150);
-      let orgDetailHeight = Number(200);
-      let editHeight = Number(200);
+      let orgDetailHeight = Number(150);
+      let editHeight = Number(250);
       this.CustomerOrgTreeStyle = "overflow: scroll;border: 1px solid;width:200px; height:" + (this.window.pageHeight - headerHeight) + "px;";
       this.CustomerOrgRightStyle = "width:" + (this.window.pageWidth - 200 - 60) + "px; height:" + (this.window.pageHeight - headerHeight) + "px;";
 
@@ -81,7 +81,7 @@ export default {
       } else {
         this.customerOrg.orgDetailHeight = orgDetailHeight + Math.floor((this.window.pageHeight - 600) * 1 / 3);
         editHeight = this.window.pageHeight - headerHeight - this.customerOrg.orgDetailHeight - 50;
-        if (editHeight > 400) {
+        if (editHeight > 310) {
           this.customerOrg.orgEditStyle += "height:" + editHeight + "px;";
           this.customerOrg.orgDetailStyle += "height:" + this.customerOrg.orgDetailHeight + "px;";
         } else {
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index 159c812..3492dfc 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -1,35 +1,25 @@
 <template>
-    <div style="display: flex;">
-        <table width="100%">
-          <tr>
-            <td colspan="2" width="90%">
-                <PatientRegisterBase/>                
-            </td>
-            <td rowspan="4" width="10%">
-                <ButtonList/>
-            </td>
-          </tr>
-          <tr>
-            <td rowspan="3" width="15%" >
-                <RegisterCheckList/>
-            </td>
-            <td width="75%">
-                <CheckItemList/>
-            </td>
-          </tr>
-          <tr>
-            <td width="75%">
-                <CheckSumSug/>
-            </td>
-          </tr>
-          <tr>
-            <td width="75%">
-                <RegisterCheckEdit/>
-            </td>
-          </tr>
-        </table>
+  <div style="display: flex;">
+    <div :style="'width:' + (window.pageWidth - 120 - 70) + 'px;'">
+      <div>
+        <PatientRegisterBase/>
+      </div>
+      <div style="display: flex;">
+        <div style="width: 200px;">
+          <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>
+      </div>
     </div>
-  </template>
+    <div style="width:120px;">
+      <ButtonList/>
+    </div>    
+  </div>
+</template>
 <script>
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
@@ -66,7 +56,7 @@ export default {
   },  
 
   computed: {
-    ...mapState(["dict", "patientRegister", "customerOrg"]),
+    ...mapState(["window","dict", "patientRegister", "customerOrg"]),
   },
 
   methods: {    
@@ -212,8 +202,5 @@ export default {
 };
 </script>
 <style scoped>
-.box {
-  display: flex;
-}
 </style>
   
\ No newline at end of file