From 1344317356b0407f4aff867865ba72248871ac1f Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 14:16:17 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before

---
 src/components/view/person-manage.vue |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index 69e4eaa..5938846 100644
--- a/src/components/view/person-manage.vue
+++ b/src/components/view/person-manage.vue
@@ -289,7 +289,7 @@
             font: '缂栬緫',
             type: 'text',
             method: 'doDiy',
-            field: ['createUserName', 'updateUserName', 'roleName', '瑙掕壊=roleId', '瀵嗙爜=password',
+            field: ['roleName', '瑙掕壊=roleId', '瀵嗙爜=password',
             '濮撳悕EN=nameEn','骞撮緞=age','閭=email','鍗曚綅=company','绛惧悕=pictureUrl','鏈汉鐓�=signatureUrl']
           }],
           tagField: {
@@ -490,8 +490,10 @@
         this.addUserPower = addUserPower
       },
       handleAdd() {
+        console.log(`output->this.addOb.fatherId`,this.addOb.fatherId)
+        console.log(`output->this.addOb.name`,this.addOb.name)
         if (this.addOb.fatherId||this.addOb.name=='鍏ㄩ儴') {
-          this.addDia0 = true;
+          this.addDia = true;
         } else {
           this.$message.error('璇烽�夋嫨涓�涓灦鏋勫眰绾�')
         }
@@ -522,7 +524,7 @@
         }
         this.selectTree = data2.replace(' - ', '')
         this.addOb.fatherId = val.id;
-        this.componentData.entity.departId = val.id;
+        this.componentData.entity.departId = val.id + ',';
         this.refreshTable()
       },
       nodeOpen(data, node, el) {
@@ -587,18 +589,18 @@
             return
           }
           this.$message.success('娣诲姞鎴愬姛')
-          this.addDia0 = false
+          this.addDia = false
           this.selectTreeList()
           this.addLoad = false
           this.addOb.name = ''
           this.addOb.fatherId = ''
         }).catch(e => {
-          this.addDia0 = false
+          this.addDia = false
           this.addLoad = false
         })
       },
       nodeClick2(ob, node, el) {
-        this.currentCompaniesList[node.level-1] = ob.id
+        this.getNodeParent(node)
         if (ob.id !== 'SC21') {
           this.personLoad = true
           this.$axios.post(this.$api.companies.selectSimpleList, {
@@ -611,6 +613,12 @@
           })
         }
       },
+      getNodeParent(val){
+        this.currentCompaniesList[val.level-1] = val.data.id
+        if(val.parent!=null){
+          this.getNodeParent(val.parent)
+        }
+      },
       handleSelectionChange(val) {
         this.multipleSelection = val;
       },
@@ -621,24 +629,17 @@
         if(this.currentCompaniesList.length === 0){
           return this.$message.error('璇烽�夋嫨缁勭粐')
         }
-        for (let index = this.currentCompaniesList.length-1; index >1; index--) {
+        /* for (let index = this.currentCompaniesList.length-1; index >1; index--) {
           let obj = this.multipleSelection.find(a=>a.companyId==this.currentCompaniesList[index])
           if(!obj){
             this.currentCompaniesList.splice(index,1)
-          }else{
-            return
           }
-        }
+        } */
         let arr = []
         this.currentCompaniesList.forEach(b=>{
-          /* this.companiesList.forEach(a=>{
-            if(a.companyId===b){
-              console.log(a)
-            }
-          }) */
           let obj = this.companiesList.find(a=>a.companyId==b)
           arr.push(obj)
-          })
+        })
         this.addLoad = true
         this.$axios.post(this.$api.companies.addPersonUser, {
           company: arr,
@@ -659,7 +660,7 @@
           this.addLoad = false
           this.personList = []
           this.userSearch2 = ''
-          this.refresh()
+          this.selectTreeList()
         }).catch(e => {
           this.addthirdParty = false
           this.addLoad = false

--
Gitblit v1.9.3