From 603748c737478cb35c75d48172f6753e47a592ed Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Tue, 23 Jan 2024 16:36:15 +0800
Subject: [PATCH] sumdoctor

---
 .../doctorCheck/PatientRegisterList.vue       |  2 +-
 src/components/report/CusOrgOCX.vue           | 18 +++----
 src/components/sumDoctorCheck/ButtonList.vue  | 18 ++++---
 src/components/sumDoctorCheck/SumSug.vue      | 50 +++++++++++++------
 4 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue
index 0d4b7ee..f27e94c 100644
--- a/src/components/doctorCheck/PatientRegisterList.vue
+++ b/src/components/doctorCheck/PatientRegisterList.vue
@@ -165,7 +165,7 @@
     <!--通用选单位、体检次数、分组的控件-->
     <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX"
       :close-on-click-modal="false" :append-to-body="true" width="800px" height="600px">
-      <CusOrgOCX :noCustomerOrg="true" :initDateType="'medicalStartDate'"/>
+      <CusOrgOCX :useCustomerOrg="false" :initDateType="'medicalStartDate'"/>
     </el-dialog>
 
   </div>
diff --git a/src/components/report/CusOrgOCX.vue b/src/components/report/CusOrgOCX.vue
index a8fd58e..ce55cf9 100644
--- a/src/components/report/CusOrgOCX.vue
+++ b/src/components/report/CusOrgOCX.vue
@@ -86,13 +86,13 @@ import { arrayExistObj } from "../../utlis/proFunc";
 import { getTreePids, getTreeAllChildIdsById } from "../../utlis/tree";
 export default {
   components: {},
-  props:["noCustomerOrg","initDateType"],
+  props:["useCustomerOrg","initDateType"],
   data() {
     return {
       preNodeId: '',  //上一次点击树节点
       curNodeId: '',  //本次点击树节点       
-      dateType: 'creationTime',
-      useCusOrg: true,   //是否使用单位
+      dateType: 'medicalStartDate',
+      useCusOrg: false,   //是否使用单位
       //体检单位，体检次数，日期类型，起止日期，分组
       dataCusOrgOCX: [{
         id: '',    //随机的ID，用于删除
@@ -100,7 +100,7 @@ export default {
         customerOrgName: '',         //企业名称，显示用
         customerOrgRegister: {},     //已选的体检次数
         customerOrgRegisterList: [], //当前单位的体检次数信息
-        dateType: 'creationTime',  // 登记日期：creationTime；体检日期：medicalStartDate；总检日期：summaryDate
+        dateType: 'medicalStartDate',  // 登记日期：creationTime；体检日期：medicalStartDate；总检日期：summaryDate
         startDate: '',
         endDate: '',
         customerOrgGroupIds: [],  //已选分组
@@ -115,13 +115,13 @@ export default {
   //创建组件后
   created() {
     this.dataCusOrgOCX = [];
-    if(this.noCustomerOrg){
-      this.useCusOrg = false
-      this.changeUseOrg(this.useCusOrg)
-    }
+    if(this.useCustomerOrg){
+      this.useCusOrg = true      
+    }        
     if(this.initDateType){
       this.dateType = this.initDateType
     }
+    this.changeUseOrg(this.useCusOrg)
   },
 
   //挂载组件完成
@@ -315,7 +315,7 @@ export default {
           customerOrgName: '',
           customerOrgRegister: {},     //已选的体检次数
           customerOrgRegisterList: [], //当前单位的体检次数信息
-          dateType: 'creationTime',  // 登记日期：creationTime；体检日期：medicalStartDate；总检日期：summaryDate
+          dateType: 'medicalStartDate',  // 登记日期：creationTime；体检日期：medicalStartDate；总检日期：summaryDate
           startDate: ldate,
           endDate: ldate,
           customerOrgGroupIds: [],  //已选的体检分组
diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue
index d29d4d1..e68050f 100644
--- a/src/components/sumDoctorCheck/ButtonList.vue
+++ b/src/components/sumDoctorCheck/ButtonList.vue
@@ -36,16 +36,20 @@
         <div class="listBtn">
             <el-button type="primary" class="btnClass" @click="intervene">干预措施</el-button>
         </div>
-        <!-- 体检人员列表
-        <el-dialog title="体检人员列表" :visible.sync="sumDoctorCheck.sumDoctorCheckDialogVisible" width="1000px">
-            <PatientRegisterList win="sumDoctorCheck" />
-        </el-dialog>
-         -->
+       
+
+        <div v-show="sumDoctorCheck.sumDoctorCheckDialogVisible" 
+          :style="`border-radius: 10px;border: 1px solid #000;background-color:#FFF; position: absolute;top:70px;right:10px;width:300px;height: ${window.pageHeight - 42 - 5 - 30}px;opacity:1;`">
+          
+          <PatientRegisterList win="sumDoctorCheck" :winAbsolute="true"/>
+          
+        </div>
+        <!-- 抽屉方式，遮罩层不能操作 
         <el-drawer title="体检人员列表" :visible.sync="sumDoctorCheck.sumDoctorCheckDialogVisible" direction="rtl" 
           :wrapperClosable="false" :modal="false" :size="300">
           <PatientRegisterList :win="sumDoctorCheck" :winAbsolute="false"/>
         </el-drawer>
-
+        -->
         <el-drawer title="诊断列表" :visible.sync="sumDoctorCheck.sumDiagnosisVisible" direction="ltr"  :size="300"
           :wrapperClosable="false">
           <SumDiagnosis :patientRegisterId="sumDoctorCheck.sumPREdit.id" />
@@ -87,7 +91,7 @@ export default {
     },
 
     computed: {
-        ...mapState(["dict", "patientRegister", "doctorCheck", "sumDoctorCheck"]),
+        ...mapState(["window","dict", "patientRegister", "doctorCheck", "sumDoctorCheck"]),
     },
 
     methods: {
diff --git a/src/components/sumDoctorCheck/SumSug.vue b/src/components/sumDoctorCheck/SumSug.vue
index 10f3881..cff8d03 100644
--- a/src/components/sumDoctorCheck/SumSug.vue
+++ b/src/components/sumDoctorCheck/SumSug.vue
@@ -3,21 +3,26 @@
     <div style="width:50%;">
       <el-table id="tableSummary" row-key="id" :data="sumDoctorCheck.summaryList" width="100%" 
         :height="window.pageHeight < 600 ? 210 : window.pageHeight - 390" border size="small">
+        <el-table-column type="index" width="20" align="center"/>
         <el-table-column prop="summaryTitle" label="综述">
           <template slot-scope="scope">
             <div>
               <el-input v-model="scope.row.summaryTitle" placeholder="请输入综述" disabled></el-input>
-              <el-table :id="scope.row.id" :row-key="scope.$index + scope.row.id" style="margin-left: 30px;"
-                :data="scope.row.details" border @row-click="rowClick" :show-header="false"
-                :row-style="{ height: '30px' }">
+              <el-table :id="scope.row.id" :row-key="scope.$index + scope.row.id" style="margin-left: 10px;"
+                :data="scope.row.details" border @row-click="rowClick" :show-header="false">
+                <el-table-column width="30">
+                  <template slot-scope="scope2">
+                    <div>{{ scope2.$index + 1 }}).</div>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="summaryContent" label="综述" min-width="200">
                   <template slot-scope="scope2">
-                    <el-input type="textarea" v-model="scope2.row.summaryContent" placeholder="请输入综述" style="width: 95%"
-                      :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"
-                      :autosize="{ minRows: 1, maxRows: 100 }">
+                    <el-input type="textarea" v-model="scope2.row.summaryContent" placeholder="请输入综述" 
+                      disabled :autosize="{ minRows: 1, maxRows: 100 }">
                     </el-input>
                   </template>
                 </el-table-column>
+                <el-table-column width="8" />
               </el-table>
             </div>
           </template>
@@ -27,7 +32,7 @@
     <div style="width:50%;">
       <el-table id="tableSuggestion" row-key="id" :data="sumDoctorCheck.suggestionList" width="100%"
         :height="window.pageHeight < 600 ? 210 : window.pageHeight - 390" border size="small">
-        <el-table-column type="index" width="30" style="vertical-align: top;">
+        <el-table-column type="index" width="20" align="center">
         </el-table-column>
         <el-table-column prop="suggestionTitle" label="建议">
           <template slot-scope="scope">
@@ -37,18 +42,18 @@
                   :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'">
                 </el-input>
 
-                <el-button type="success" icon="el-icon-plus" style="min-width: 30px;" @click="addSug(scope.$index)"
+                <el-button type="success" icon="el-icon-plus" style="min-width:23px;height:23px;padding:2px;" @click="addSug(scope.$index)"
                   :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"></el-button>
-                <el-button type="danger" icon="el-icon-delete" style="margin-left: 2px;min-width: 30px;" @click="delSugHead(scope.$index)"
+                <el-button type="danger" icon="el-icon-delete" style="margin-left: 2px;min-width:23px;height:23px;padding:2px;" @click="delSugHead(scope.$index)"
                   :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"></el-button>
               </div>  
               
-              <el-table :id="'sug' + scope.row.id" row-key="displayOrder" style="margin-left: 30px;"
+              <el-table :id="'sug' + scope.row.id" row-key="displayOrder" style="margin-left: 10px;"
                 :data="scope.row.details" border @row-click="rowClickSug" :show-header="false"
-                :row-style="{ height: '30px' }">
+                >
                 <el-table-column width="30">
                   <template slot-scope="scope2">
-                    <div>{{ scope2.$index + 1 }}</div>
+                    <div>{{ scope2.$index + 1 }}).</div>
                   </template>
                 </el-table-column>
                 <el-table-column prop="suggestionContent" label="建议" min-width="200">
@@ -59,9 +64,9 @@
                     </el-input>                                
                   </template>
                 </el-table-column>
-                <el-table-column prop="suggestionContent" label="操作" width="62">
+                <el-table-column prop="suggestionContent" label="操作" width="35">
                   <template slot-scope="scope2">                    
-                    <el-button type="danger" style="min-width:30px;" icon="el-icon-delete" @click="delSug(scope.row.details, scope2.$index)"
+                    <el-button type="danger" style="min-width:23px;height:23px;padding:2px;" icon="el-icon-delete" @click="delSug(scope.row.details, scope2.$index)"
                       :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"
                       size="small"></el-button>                      
                   </template>
@@ -321,5 +326,22 @@ export default {
 <style scoped>
 @import '../../assets/css/global_table.css';
 
+/* 设置单元格内内容顶对齐 */
+::v-deep .el-table__cell {
+  display: table-cell; /* 使单元格表现为表格单元 */
+  vertical-align: top; /* 顶对齐 el-table_2_column_2   el-table__cell */
+}
+::v-deep .el-textarea__inner {
+  min-height: 23px;
+  height: 23px;
+  line-height: 1.25;
+  padding: 1px 15px 1px 2px;
+}
+::v-deep .el-input__inner {
+  min-height: 23px;
+  height: 23px;
+  padding: 1px 15px 1px 2px;
+}
+
 </style>
   
\ No newline at end of file