From 38e6f27a8082e1173e3c02a33da5da39b6c6872c Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 31 七月 2024 13:33:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/view/person-manage.vue |   50 ++++++++++++++++++++------------------------------
 1 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index 780fe23..8c0e23c 100644
--- a/src/components/view/person-manage.vue
+++ b/src/components/view/person-manage.vue
@@ -199,9 +199,9 @@
       </span>
     </el-dialog>
     <el-dialog title="鑾峰彇浜轰簨绯荤粺浜哄憳淇℃伅" :visible.sync="addthirdParty" width="70%">
-      <div class="body">
+      <div class="body" v-loading="thirdPartyLoading">
         <el-row>
-          <el-col :span="8" style="height: 70vh;overflow: hidden;">
+          <el-col :span="8" style="height: 70vh;overflow: hidden;" v-if="companiesList.length!=1">
             <el-input placeholder="杈撳叆鍏抽敭瀛楁悳绱�" v-model="search2" size="small" style="width: 90%;padding: 0 5% 10px 5%;"
               clearable @clear="searchFilter2" @keyup.enter.native="searchFilter2()">
             </el-input>
@@ -210,7 +210,7 @@
               highlight-current>
             </el-tree>
           </el-col>
-          <el-col :span="16" style="height: 70vh;padding-left: 8px;">
+          <el-col :span="companiesList.length==1?24:16" style="height: 70vh;padding-left: 8px;">
             <div class="search_thing" style="width: 100%;margin-bottom: 10px;justify-content: right;">
               <div class="search_label" style="width: 200px;">鍛樺伐鍙�/鍛樺伐濮撳悕锛�</div>
               <div class="search_input" style="width: 250px;">
@@ -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: {
@@ -322,25 +322,14 @@
             },
             company: {select: []}
           },
-          /* cascaderField:{
-            departId:{
-              tree:[]
-            },
-            // 瀛楁閰嶇疆
-            props:{
-              value:'id',
-              label:'name',
-              checkStrictly: true
-            }
-          }, */
           requiredAdd: ['account', 'name', 'state', 'roleId', 'password', 'nameEn', 'phone'],
           requiredUp: ['account', 'name', 'state', 'roleId', 'nameEn', 'phone'],
-          // disabledUp:['departId'],
           addUpload: ['pictureUrl', 'signatureUrl'],
           addUploadConfig: {
             accept: '.png, .jpg, .jpeg, .gif',
             url: this.$api.deviceScope.uploadFile
           },
+          needSort: ['name', 'state'],
         },
         entityCopy: {},
         upIndex: 0,
@@ -360,14 +349,14 @@
         addLoad: false,
         personList: [],
         personListCopy: [],
-        treeLoad: false,
         personLoad: false,
         search2: '',
         multipleSelection: [],
         companiesList: [],
         currentCompaniesList: [],
         userSearch2: '',
-        searchEmployeeID: null
+        searchEmployeeID: null,
+        thirdPartyLoading:false
       }
     },
     // watch: {
@@ -383,8 +372,21 @@
     methods: {
       openthirdParty() {
         this.addthirdParty = true;
+        this.thirdPartyLoading = true;
         this.$axios.get(this.$api.companies.selectCompaniesList).then(res => {
           this.companiesList = this.HaveJson(res.data);
+          if(this.companiesList.length ==1){
+            this.$axios.post(this.$api.companies.selectSimpleList, {
+              companyId: this.companiesList[0].companyId
+            }).then(res => {
+              this.thirdPartyLoading = false;
+              this.personListCopy = JSON.parse(JSON.stringify(res.data))
+              this.personList = res.data
+              this.$refs.personTable.doLayout()
+            })
+          }else{
+            this.thirdPartyLoading = false;
+          }
           this.datathirdParty = this.tranListToTreeData(res.data, "ROOT");
         })
         if(this.componentData.entity.roleId > 10000)this.$message.warning('鐢变簬鏈�変腑鍏蜂綋瑙掕壊锛屾柊澧炵敤鎴峰皢鎴愪负榛樿瑙掕壊')
@@ -425,12 +427,6 @@
       opeaAdd() {
         this.$refs.ValueTable.openAddDia(this.$api.user.addUser);
         this.$refs['ValueTable'].upData.departId = this.selectTree
-      },
-      selectTreeList() {
-        /* this.$axios.get(this.$api.department.selectDepartment).then(res => {
-          this.componentData.cascaderField.departId.tree = this.handleTree(res.data[0].children)
-				}) */
-        this.$refs.ValueTable.selectList()
       },
       handleTree(arr) {
         arr.forEach(a => {
@@ -508,12 +504,6 @@
       },
       nodeClose(data, node, el) {
         $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')
-      },
-      getNodeParent(val) {
-        if (val.parent != null) {
-          this.selectTree += ' - ' + val.label
-          this.getNodeParent(val.parent)
-        }
       },
       remove(node, data) {
         this.$confirm("鏄惁鍒犻櫎璇ュ眰绾�", "鎻愮ず", {

--
Gitblit v1.9.3