From 42faa74a693ee733b477d8f31910d684a057eb6b Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 07 三月 2025 14:34:19 +0800
Subject: [PATCH] 修改检验任务

---
 src/components/view/person-manage.vue |   39 ++++++++++++++++++++++++++++-----------
 1 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index e74603e..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>
@@ -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: {
@@ -329,6 +329,7 @@
             accept: '.png, .jpg, .jpeg, .gif',
             url: this.$api.deviceScope.uploadFile
           },
+          needSort: ['name', 'state'],
         },
         entityCopy: {},
         upIndex: 0,
@@ -354,7 +355,8 @@
         companiesList: [],
         currentCompaniesList: [],
         userSearch2: '',
-        searchEmployeeID: null
+        searchEmployeeID: null,
+        thirdPartyLoading:false
       }
     },
     // watch: {
@@ -370,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('鐢变簬鏈�変腑鍏蜂綋瑙掕壊锛屾柊澧炵敤鎴峰皢鎴愪负榛樿瑙掕壊')
@@ -504,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()
         })
       },
@@ -530,7 +547,7 @@
           }
           this.$message.success('娣诲姞鎴愬姛')
           this.addDia = false
-          this.selectTreeList()
+          this.selectTreeList(true)
           this.addLoad = false
           this.addOb.name = ''
         }).catch(e => {
@@ -598,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