From b156fc465e4f0ed09181f5f08823187127865e02 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Wed, 11 Oct 2023 16:15:07 +0800
Subject: [PATCH] org

---
 src/components/customerOrg/ContactPerson.vue   | 10 +++++++---
 src/components/customerOrg/customerOrgTree.vue | 15 ++++++++++++---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/components/customerOrg/ContactPerson.vue b/src/components/customerOrg/ContactPerson.vue
index b8d33fa..b75653b 100644
--- a/src/components/customerOrg/ContactPerson.vue
+++ b/src/components/customerOrg/ContactPerson.vue
@@ -262,7 +262,11 @@ export default {
         this.customerOrg.contactMethodList.splice(index, 1);
         this.submit('form');
       }).catch((err) => {
-        console.log(`deletapi:/api/app/contact-person/${this.personId}`,err);
+        if(err == 'cancel'){
+          this.$message.info("已取消删除");
+        }else{
+          this.$message.error("操作失败，原因：" + err);
+        }        
       });
       
     },
@@ -297,7 +301,7 @@ export default {
                     contactPersonId: this.personId,
                   });
                 });
-                return postapi("/api/app/contact-method/many", contactMethod);
+                if(contactMethod.length > 0) return postapi("/api/app/contact-method/many", contactMethod);
               })
               .then((res) => {
                 //console.log('api/app/contact-method/many')
@@ -320,7 +324,7 @@ export default {
                     contactPersonId: this.personId,
                   });
                 });
-                return postapi("/api/app/contact-method/many", contactMethod);
+                if(contactMethod.length > 0) return postapi("/api/app/contact-method/many", contactMethod);
               })
               .then((res) => {
                 //console.log('api/app/contact-method/many')
diff --git a/src/components/customerOrg/customerOrgTree.vue b/src/components/customerOrg/customerOrgTree.vue
index 7dec6a4..7a8d922 100644
--- a/src/components/customerOrg/customerOrgTree.vue
+++ b/src/components/customerOrg/customerOrgTree.vue
@@ -1,10 +1,12 @@
 <template>
-  <el-tree :data="customerOrg.customerOrgTree" :props="customerOrg.treeprops" @node-click="treeclick" />
+  <el-tree :data="customerOrg.customerOrgTree" :props="customerOrg.treeprops" @node-click="treeclick" highlight-current/>
 </template>
 <script>
 import { mapState, mapMutations } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { tcdate, deepCopy } from "../../utlis/proFunc";
+import { getTreePids} from "../../utlis/tree";
+
 export default {
   components: {},
   data() {
@@ -105,10 +107,17 @@ export default {
     //this.$message.success(data.id + " 查询单位详情、体检次数、联系人等信息 " + data.displayName);//   api/app/customer-org/3a0c0439-a5ca-8a63-b2b9-e0eb24cb58b1
     this.customerOrg.customerOrgId = data.id;
     this.getCustomerOrgRd(data.id);
+
     //只有单位才有体检次数登记，部门无
-    if(!data.parentId){
-      this.getCustomerOrgRegisterList(data.id);
+    let firstId = data.id //一级单位ID
+    if(data.parentId){
+      let pids = getTreePids(this.customerOrg.customerOrgTree,"treeChildren", 'parentId', 'id', data.id)
+      console.log('pids',pids)
+      firstId = pids[pids.length - 2]
     }
+    this.getCustomerOrgRegisterList(firstId);
+
+    //联系人
     this.getContactPersonList(data.id);
   },
 },