From 45c05b89434bae91ecf4b6a903aa2949ef1d1f90 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Thu, 11 Apr 2024 20:52:17 +0800
Subject: [PATCH] dj2

---
 .../patientRegister/PatientRegisterEdit.vue       | 15 ++++++++++++++-
 .../patientRegister/PatientRegisterList.vue       |  7 +++----
 src/store/index.js                                |  6 +++---
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index a305f15..3a24de3 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -1789,7 +1789,7 @@ export default {
   watch: {
     //人员ID未切换换时 也可以强制刷新数据
     "dataTransOpts.refresh.patient_register.S": {
-      immediate: true,
+      // immediate: true,
       handler(newVal, oldVal) {
         console.log(`watch 人员登记 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`);
         this.initFormData(this.dataTransOpts.tableS.patient_register.id)
@@ -1816,6 +1816,19 @@ export default {
       }
     },
 
+    // 从体检人员登记列表 点登记，触发
+    // 清空查询条件
+    "dataTransOpts.plus.clearPatientRegisterQuery":{
+      immediate:true,
+      handler(newVal, oldVal) {
+        console.log('从体检人员登记列表 点登记，触发',newVal, oldVal)
+        if(newVal != oldVal){          
+          this.preCustomerOrgId = this.patientRegister.query.customerOrgId
+          console.log('this.preCustomerOrgId',this.preCustomerOrgId)
+        }
+      }
+    },
+
   },
 };
 </script>
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 55fa952..b97b34b 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -591,12 +591,11 @@ export default {
       // this.getPatientRegisterAbs();
 
       this.dataTransOpts.tableS.patient_register.id = ''
-      this.dialogWin.PatientRegisterEdit = true;
+      this.dialogWin.PatientRegisterEdit = true;    
+      this.dataTransOpts.plus.clearPatientRegisterQuery++ //触发清空人员登记界面的查询条件
       setTimeout(() => {
-        // 触发数据刷新
         this.dataTransOpts.refresh.patient_register.S++  //触发人员信息刷新
-        this.dataTransOpts.plus.clearPatientRegisterQuery++ //触发清空人员登记界面的查询条件             
-      }, 20);
+      }, 10);      
 
     },
 
diff --git a/src/store/index.js b/src/store/index.js
index 16d24d5..5b5ee3f 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -356,11 +356,11 @@ export default new Vuex.Store({
                 role_menu_info: [], // 角色对应的菜单
                 sum_diagnosis: [], // 总检诊断
             },
-            plus: {
-                clearPatientRegisterQuery: 0,   //清空人员登记界面查询条件
+            plus: {          
+                clearPatientRegisterQuery: 0,   //清空人员登记界面查询条件(重新赋值体检单位)
                 PatientRegisterEditGroupBatch: 0,  //刷新批量调整分组窗口
                 PatientRegisterEditItemBatch: 0,  //刷新批量调整项目窗口
-                PatientRegisterForChoose:0, // 体检人员查询窗口
+                PatientRegisterForChoose:0, // 体检人员查询窗口                
             }
 
         },