From 9769914f3023cfa2b69b1ee79b9ea4f6cf73d5f2 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 5 Feb 2024 17:23:56 +0800
Subject: [PATCH] doctor

---
 src/components/doctorCheck/ButtonList.vue     |  5 ++---
 src/components/doctorCheck/CheckSumSug.vue    | 22 ++++++++++++++-----
 .../doctorCheck/PatientRegisterBase.vue       |  9 +++-----
 .../doctorCheck/PatientRegisterList.vue       |  2 +-
 .../doctorCheck/RegisterCheckList.vue         | 10 ++++++---
 src/components/sumDoctorCheck/ButtonList.vue  |  2 +-
 src/views/doctorCheck/doctorCheck.vue         |  2 +-
 7 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue
index 14333d6..61f7a9f 100644
--- a/src/components/doctorCheck/ButtonList.vue
+++ b/src/components/doctorCheck/ButtonList.vue
@@ -68,7 +68,7 @@
         
 
         <div v-show="doctorCheck.doctorCheckDialogVisible" 
-          :style="`z-index:30001;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;`">
+          :style="`z-index:2;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="doctorCheck" :winAbsolute="true"/>
           
@@ -83,7 +83,7 @@
 
 
         <!-- 体检人员登记 -->
-        <el-dialog style="z-index:30001;"
+        <el-dialog 
             :title="doctorCheck.prBase.id ? '体检人员--编辑' : '体检人员--新增'"
             :visible.sync="dialogVisible"
             :close-on-click-modal="false"
@@ -277,7 +277,6 @@ export default {
             if(this.medicalStartDate){
                 //this.formData = Object.assign({},this.formInitData,{medicalStartDate:moment(this.medicalStartDate).format('yyyy-MM-DD')}) 
                 this.doctorCheck.prBase.id = ''
-                this.doctorCheck.              
                 this.dialogVisible = true
                 this.patientRegister.photo = ''
                 setTimeout(() =>{
diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue
index 2d569e3..0da2744 100644
--- a/src/components/doctorCheck/CheckSumSug.vue
+++ b/src/components/doctorCheck/CheckSumSug.vue
@@ -66,7 +66,7 @@ import Sortable from "sortablejs";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 export default {
   components: {},
-  props:["isCheckPicture","optGrant","addSummary","btnMakeDiagnosis","save","audit","unAudit","btnLineUp"],
+  props:["registerCheckId","isCheckPicture","optGrant","addSummary","btnMakeDiagnosis","save","audit","unAudit","btnLineUp"],
   data() {
     return {
 
@@ -82,7 +82,7 @@ export default {
   },
 
   computed: {
-    ...mapState(['window','dict', 'doctorCheck']),
+    ...mapState(['window','dataTransOpts','dict', 'doctorCheck']),
 
     //小结宽度
     sumWidth(){
@@ -215,11 +215,21 @@ export default {
   //监听事件
   watch: {
     //检查项目切换
-    "doctorCheck.RegisterCheckId"(newVal, oldVal) {
-      console.log("watch doctorCheck.RegisterCheckId newVal：", newVal, " oldVal：", oldVal);      
-      this.checkSummaryList(newVal)
-      this.checkSuggestionList(newVal)      
+    // "doctorCheck.RegisterCheckId"(newVal, oldVal) {
+    //   console.log("watch doctorCheck.RegisterCheckId newVal：", newVal, " oldVal：", oldVal);      
+    //   this.checkSummaryList(newVal)
+    //   this.checkSuggestionList(newVal)      
+    // },
+    //检查项目未切换换时 也可以强制刷新数据
+    "dataTransOpts.refresh.register_check_item":{
+      immediate:true,
+      handler(newVal, oldVal) {
+        console.log(`watch 小结 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.registerCheckId}`);        
+        this.checkSummaryList(this.registerCheckId)
+        this.checkSuggestionList(this.registerCheckId) 
+      }
     },
+
   },
 };
 </script>
diff --git a/src/components/doctorCheck/PatientRegisterBase.vue b/src/components/doctorCheck/PatientRegisterBase.vue
index 5fc1d27..b0c3802 100644
--- a/src/components/doctorCheck/PatientRegisterBase.vue
+++ b/src/components/doctorCheck/PatientRegisterBase.vue
@@ -3,18 +3,15 @@
     <div style="display: flex; flex-wrap: wrap;height:70px; width: 100%;">
       <div>
         <span class="query">条码号</span>
-        <el-input placeholder="条码号" v-model="prBase.patientRegisterNo" size="small" style="width: 140px;" class="test"
-          clearable @change="onQueryByPatientRegisterNo" />
+        <el-input placeholder="条码号" v-model="prBase.patientRegisterNo" size="small" style="width: 140px;" clearable />
       </div>
       <div>
         <span class="query">档案号</span>
-        <el-input placeholder="档案号" v-model="prBase.patientNo" size="small" style="width: 100px;" clearable
-          @change="onQueryByPatientNo" />
+        <el-input placeholder="档案号" v-model="prBase.patientNo" size="small" style="width: 100px;" clearable/>
       </div>
       <div>
         <span class="query">姓名</span>
-        <el-input placeholder="姓名" v-model="prBase.patientName" size="small" style="width: 100px;" 
-          @change="getlistinfilterByName" />
+        <el-input placeholder="姓名" v-model="prBase.patientName" size="small" style="width: 100px;" clearable/>
       </div>
       <div>
         <span class="query">性别</span>
diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue
index 966964a..d8b1ce1 100644
--- a/src/components/doctorCheck/PatientRegisterList.vue
+++ b/src/components/doctorCheck/PatientRegisterList.vue
@@ -163,7 +163,7 @@
     </el-table>    
 
     <!--通用选单位、体检次数、分组的控件-->
-    <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX"
+    <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX" 
       :close-on-click-modal="false" :append-to-body="true" width="800px" height="600px">
       <CusOrgOCX :useCustomerOrg="false" :initDateType="'medicalStartDate'"/>
     </el-dialog>
diff --git a/src/components/doctorCheck/RegisterCheckList.vue b/src/components/doctorCheck/RegisterCheckList.vue
index 7e84be4..b8d2530 100644
--- a/src/components/doctorCheck/RegisterCheckList.vue
+++ b/src/components/doctorCheck/RegisterCheckList.vue
@@ -8,13 +8,13 @@
       <el-table-column prop="asbitemName" label="组合项目" width="198">
         <template slot-scope="scope">
             <div>
-              <el-tooltip class="item" effect="dark" content="未检" placement="top">
+              <el-tooltip class="item" effect="dark" content="未检" placement="left">
                 <i v-show="scope.row.completeFlag == '0'" class="el-icon-circle-plus" style="font-size: 18px;color: red;"></i>
               </el-tooltip>
-              <el-tooltip class="item" effect="dark" content="已检" placement="top">
+              <el-tooltip class="item" effect="dark" content="已检" placement="left">
                 <i v-show="scope.row.completeFlag == '1'" class="el-icon-success" style="font-size: 18px;color: green;"></i>
               </el-tooltip>
-              <el-tooltip class="item" effect="dark" content="弃检" placement="top">
+              <el-tooltip class="item" effect="dark" content="弃检" placement="left">
                 <i v-show="scope.row.completeFlag == '2'" class="el-icon-remove" style="font-size: 18px;"></i>
               </el-tooltip>
               {{scope.row.asbitemName}}
@@ -85,6 +85,10 @@ export default {
             //查询出来 默认显示第1条记录明细、小结等
             if(res.data.length > 0) {
               this.doctorCheck.RegisterCheckId = res.data[0].id
+              this.dataTransOpts.table.register_check.id = res.data[0].id
+              setTimeout(() => { // 不管值是否改变，点击就强制刷新
+                this.dataTransOpts.refresh.register_check_item++
+              }, 100);
               // this.doctorCheck.RegisterCheckEdit = res.data[0]
 
               this.$refs['doctorCheck_RegisterCheckList'].setCurrentRow(res.data[0])
diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue
index edaf967..d14dffa 100644
--- a/src/components/sumDoctorCheck/ButtonList.vue
+++ b/src/components/sumDoctorCheck/ButtonList.vue
@@ -41,7 +41,7 @@
        
 
         <div v-show="sumDoctorCheck.sumDoctorCheckDialogVisible" 
-          :style="`z-index:30001;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;`">
+          :style="`z-index:2;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"/>
           
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index 76ce807..42700f0 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -52,7 +52,7 @@
                 <CheckPicture />
               </div>
               <div :style="'margin-top: 2px;margin-left: 2px;width:' + (window.pageWidth - 200 - 110 - 45 - 2) + 'px;'">
-                <CheckSumSug :isCheckPicture="isCheckPicture" :optGrant="optGrant" :addSummary="addSummary" :btnMakeDiagnosis="btnMakeDiagnosis" :save="save" :audit="audit" :unAudit="unAudit" :btnLineUp="btnLineUp"/>
+                <CheckSumSug :registerCheckId="dataTransOpts.table.register_check.id" :isCheckPicture="isCheckPicture" :optGrant="optGrant" :addSummary="addSummary" :btnMakeDiagnosis="btnMakeDiagnosis" :save="save" :audit="audit" :unAudit="unAudit" :btnLineUp="btnLineUp"/>
               </div>
               <div :style="'margin-top: 2px;width:' + (window.pageWidth - 200 - 110 - 45 - 2) + 'px;'">
                 <RegisterCheckEdit :registerCheckId="dataTransOpts.table.register_check.id"/>