From c19f03bbbe232602bbf7cde343a2d4f58c31a5fd Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 27 五月 2024 13:40:57 +0800
Subject: [PATCH] 功能调整

---
 src/view/notice.vue                         |    2 +-
 src/components/view/a6-personnel-detail.vue |   12 +++++++++---
 src/components/view/person-manage.vue       |   25 ++++++++++++-------------
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/components/view/a6-personnel-detail.vue b/src/components/view/a6-personnel-detail.vue
index 03c27c1..16b4eb7 100644
--- a/src/components/view/a6-personnel-detail.vue
+++ b/src/components/view/a6-personnel-detail.vue
@@ -160,7 +160,7 @@
             <span class="required-span">* </span>鏋舵瀯鍚嶇О锛�
           </el-col>
           <el-col :span="16" :offset="1">
-            <el-input v-model="addOb.name" placeholder="璇疯緭鍏ユ灦鏋勫悕绉�" clearable size="small"></el-input>
+            <el-input v-model="addOb.name" placeholder="璇疯緭鍏ユ灦鏋勫悕绉�" clearable size="small" @keyup.enter.native="addStandardTree"></el-input>
           </el-col>
         </el-row>
       </div>
@@ -271,6 +271,7 @@
         	selectField: {},
           upUserDepardLimsIdPower: true
         },
+        currentCompaniesList: []
       }
     },
     mounted() {
@@ -304,11 +305,12 @@
         }
         this.selectTree = data2.replace(' - ', '')
         this.addOb.fatherId = val.id;
-        this.componentData.entity.departLimsId = val.id;
+        this.componentData.entity.departLimsId = val.id+',';
         this.refreshTable()
       },
       getNodeParent(val) {
         if (val.parent != null) {
+          this.currentCompaniesList[val.level-1] = val.data.id
           this.selectTree += ' - ' + val.label
           this.getNodeParent(val.parent)
         }
@@ -423,10 +425,14 @@
         selects.forEach(a=>{
           ids.push(a.id)
         })
+        let str = ''
+        this.currentCompaniesList.forEach(a=>{
+          str+=(a+',')
+        })
       	this.selectUserDia = false
         this.$axios.post(this.$api.user.upUserDepardLimsId,{
           ids: JSON.stringify(ids),
-          id: this.componentData.entity.departLimsId
+          id: str
         }).then(res=>{
           if (res.code === 201) {
             return
diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index acac893..5938846 100644
--- a/src/components/view/person-manage.vue
+++ b/src/components/view/person-manage.vue
@@ -524,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) {
@@ -600,7 +600,7 @@
         })
       },
       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, {
@@ -613,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;
       },
@@ -623,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,
@@ -661,7 +660,7 @@
           this.addLoad = false
           this.personList = []
           this.userSearch2 = ''
-          this.refresh()
+          this.selectTreeList()
         }).catch(e => {
           this.addthirdParty = false
           this.addLoad = false
diff --git a/src/view/notice.vue b/src/view/notice.vue
index 99f4985..bc84174 100644
--- a/src/view/notice.vue
+++ b/src/view/notice.vue
@@ -4,7 +4,7 @@
   title="娑堟伅閫氱煡"
   :visible.sync="drawer"
   :direction="direction"
-  :before-close="handleClose" style="height: 100vh;z-index: 9999999;">
+  :before-close="handleClose" style="height: 100vh;z-index: 9999999;" size="450px">
     <div class="head">
       <div class="head-search">
         <label>娑堟伅绫诲瀷锛�</label>

--
Gitblit v1.9.3