From 0e19229f2b9a28c078d7d9b02f605b5445bcc2bf Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 16 Oct 2023 15:02:43 +0800
Subject: [PATCH] dj seo

---
 .../patientRegister/PatientRegisterEdit.vue   | 30 +++++++++++--------
 .../patientRegister/PatientRegisterItem.vue   | 19 +++++++-----
 .../patientRegister/PatientRegisterList.vue   |  8 ++---
 3 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 70e78d2..fcc8768 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -619,7 +619,7 @@
 </template>
 <script>
 import moment from "moment";
-import { mapState } from "vuex";
+import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import mm from "../../utlis/mm";
 
@@ -743,10 +743,10 @@ export default {
 
   //挂载完成
   mounted() {
-    objCopy(this.formInitData, this.form);
-    this.initBox();
-    this.getCustomerOrgRegisterList()
-    this.getPeoplePhoto(this.patientRegister.photo)
+    // objCopy(this.formInitData, this.form);
+    // this.initBox();
+    // this.getCustomerOrgRegisterList()
+    // this.getPeoplePhoto(this.patientRegister.photo)
   },
 
   computed: {
@@ -754,7 +754,7 @@ export default {
 
   },
   methods: {
-
+    ...mapActions(['getPatientRegisterAbs']),
     //快速查找个人数据
     quickQuery(type) {
       let url1 = '/api/app/patientregister/getpatientregisterorpatient'
@@ -807,6 +807,7 @@ export default {
             objCopy(res.data, this.form)
             this.patientRegister.patientRegisterId = res.data.id
             this.patientRegister.photo = res.data.photo
+            this.getPatientRegisterAbs(res.data.id)
           }else if(res.code == 0){
             this.$message.info("未找到相关信息")
           } 
@@ -824,6 +825,7 @@ export default {
               objCopy(res.data.items[0], this.form)
               this.patientRegister.patientRegisterId = res.data.items[0].id
               this.patientRegister.photo = res.data.items[0].photo
+              this.getPatientRegisterAbs(res.data.items[0].id)
             }else{
               //显示列表，供选择
               this.patientRegisters = res.data.items
@@ -864,12 +866,14 @@ export default {
         let res = await getapi(`/api/app/customer-org/parent/${this.form.customerOrgId}`);
         let res1 = await getapi(`/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${res.data}`);
         this.customerOrgRegisterList = arrayFilter(res1.data, 'isComplete', 'N')
-        //要把已完成体检的次数去掉
-        if (this.customerOrgRegisterList.length > 0) {
-          this.form.customerOrgRegisterId = this.customerOrgRegisterList[this.customerOrgRegisterList.length - 1].id
-          //this.changeCustomerOrgGroupId()
-          this.changeMedicalTimes()
-        }
+        
+        //要把已完成体检的次数去掉 (查询时不能触发保存)
+        // if (this.customerOrgRegisterList.length > 0) {
+        //   this.form.customerOrgRegisterId = this.customerOrgRegisterList[this.customerOrgRegisterList.length - 1].id
+        //   //this.changeCustomerOrgGroupId()
+        //   this.changeMedicalTimes()
+        // }
+
       } catch (error) {
         console.log(error)
       }
@@ -993,6 +997,7 @@ export default {
       this.patientRegister.patientRegisterId = this.registerChoosed.id
       this.patientRegister.photo = this.registerChoosed.photo
       this.registerVisible = false
+      this.getPatientRegisterAbs(this.registerChoosed.id)
     },
     
 
@@ -1443,6 +1448,7 @@ export default {
         console.log('this.editTimes', this.editTimes)
         objCopy(this.formInitData, this.form);
         this.initBox();
+        this.getPeoplePhoto(this.patientRegister.photo)
         //console.log('this.form',this.form)
       }
     },
diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue
index 33e232c..7823a22 100644
--- a/src/components/patientRegister/PatientRegisterItem.vue
+++ b/src/components/patientRegister/PatientRegisterItem.vue
@@ -192,9 +192,11 @@ export default {
   },
 
   mounted() { 
-    if(this.patientRegisterForm.id){
-      this.getPatientRegisterAbs(this.patientRegisterForm.id)
-    }
+    // if(this.patientRegisterForm.id){
+    //   this.getPatientRegisterAbs(this.patientRegisterForm.id)
+    // }else{
+    //   this.getPatientRegisterAbs()
+    // }
   },
 
   methods: {
@@ -992,11 +994,12 @@ export default {
       }
     },
 
-    "patientRegisterForm.id"(newVal, oldVal) {
-      if (newVal && newVal != oldVal) {
-        this.getPatientRegisterAbs(newVal)
-      }
-    },
+    // 在人员列表处已 getPatientRegisterAbs ，此处无需再监听
+    // "patientRegisterForm.id"(newVal, oldVal) {
+    //   if (newVal && newVal != oldVal) {
+    //     this.getPatientRegisterAbs(newVal)
+    //   }
+    // },
 
     //按钮更新支付方式
     "payTypeFlag"(newVal, oldVal) {
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 3593929..7d9db94 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -129,7 +129,7 @@
         >
       </div>
       <div class="listBtn">
-        <el-button type="" class="btnClass commonbutton" @click="edit"
+        <el-button type="" class="btnClass commonbutton" @click="btnEdit"
           >编辑</el-button
         >
       </div>
@@ -809,14 +809,14 @@ export default {
       this.getPatientRegisterAbs();
     },
 
-    edit() {
+    btnEdit() {
       if (!this.patientRegister.patientRegisterRd.id) {
         alert("请选择要操作的记录");
         return;
       }
       //this.patientRegister.patientRegisterTimes++;
-      this.getPatientRegisterAbs(this.patientRegister.patientRegisterRd.id);
-      this.formInitData = { ...this.patientRegister.patientRegisterRd };
+      //this.getPatientRegisterAbs(this.patientRegister.patientRegisterRd.id); 
+      this.formInitData = deepCopy(this.patientRegister.patientRegisterRd);
       this.dialogVisible = true;
       this.editTimes++; //触发表单窗口，数据更新
     },