From 0e5763b1b39de488adb3bcc856a2201f87597a08 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 23 十二月 2024 15:56:40 +0800
Subject: [PATCH] 人员测试联调

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

diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index 57075db..d38b0ae 100644
--- a/src/components/view/person-manage.vue
+++ b/src/components/view/person-manage.vue
@@ -130,7 +130,7 @@
         @node-collapse="nodeClose" v-loading="treeLoad" :expand-on-click-node="false" default-expand-all>
         <div class="custom-tree-node" slot-scope="{ node, data }">
           <el-row style="width: 100%;">
-            <el-col :span="21" :class="{sort:node.level>3}">
+            <el-col :span="21" :class="{sort:node.level>3}" style="text-align: left;">
               <span><i
                   :class="`node_i ${data.children != undefined&&data.children.length>0 ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
                 {{ data.name }}</span>
@@ -178,7 +178,7 @@
         </div>
       </div>
       <div class="table">
-        <ValueTable ref="ValueTable" :url="$api.user.selectUserList" :upUrl="$api.user.updateUser"
+        <ValueTable ref="ValueTable" :url="$api.user.selectUserList2" :upUrl="$api.user.updateUser"
           :componentData="componentData" :key="upIndex" />
       </div>
     </div>
@@ -289,7 +289,7 @@
             type: 'text',
             method: 'doDiy',
             field: ['roleName', '瑙掕壊=roleId', '瀵嗙爜=password',
-              '濮撳悕EN=nameEn', '骞撮緞=age', '閭=email', '鍗曚綅=company', '绛惧悕=pictureUrl', '涓汉鐓х墖=signatureUrl'
+              '濮撳悕EN=nameEn', '骞撮緞=age', '閭=email', '鍗曚綅=company', '绛惧悕=signatureUrl', '涓汉鐓х墖=pictureUrl'
             ]
           }],
           tagField: {
@@ -329,6 +329,7 @@
             accept: '.png, .jpg, .jpeg, .gif',
             url: this.$api.deviceScope.uploadFile
           },
+          needSort: ['name', 'state'],
         },
         entityCopy: {},
         upIndex: 0,
@@ -518,12 +519,14 @@
           })
         }).catch(e => {})
       },
-      selectTreeList() {
+      selectTreeList(e) {
         this.treeLoad = true
         this.$axios.get(this.$api.department.selectDepartment).then(res => {
           this.list = res.data
           this.treeLoad = false
-          this.componentData.entity.roleId = this.list[0].id;
+          if(!e){
+            this.componentData.entity.roleId = this.list[0].id;
+          }
           this.refreshTable()
         })
       },
@@ -544,7 +547,7 @@
           }
           this.$message.success('娣诲姞鎴愬姛')
           this.addDia = false
-          this.selectTreeList()
+          this.selectTreeList(true)
           this.addLoad = false
           this.addOb.name = ''
         }).catch(e => {
@@ -612,7 +615,7 @@
           this.$refs.personTable.clearSelection()
           this.addLoad = false
           this.userSearch2 = ''
-          this.selectTreeList()
+          this.selectTreeList(true)
         }).catch(e => {
           this.addLoad = false
         })

--
Gitblit v1.9.3