From 196c31f1f040c315de09a6808fc9cd63c63f9950 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 23 五月 2024 18:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/person-manage.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index 3e2f59d..69e4eaa 100644
--- a/src/components/view/person-manage.vue
+++ b/src/components/view/person-manage.vue
@@ -175,7 +175,7 @@
<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
</div>
<div class="search_thing" style="display: flex;justify-content: right;margin-right: 10px;">
- <el-button size="small" type="primary" @click="openthirdParty" v-if="selectCompaniesList">鑾峰彇涓夋柟浜哄憳</el-button>
+ <el-button size="small" type="primary" @click="openthirdParty" v-if="addUserPower">鑾峰彇涓夋柟浜哄憳</el-button>
<el-button size="small" type="primary" @click="opeaAdd" v-if="addPower">鏂板鐢ㄦ埛</el-button>
</div>
</div>
@@ -289,7 +289,8 @@
font: '缂栬緫',
type: 'text',
method: 'doDiy',
- field: ['createUserName', 'updateUserName', 'roleName', '瑙掕壊=roleId', '瀵嗙爜=password']
+ field: ['createUserName', 'updateUserName', 'roleName', '瑙掕壊=roleId', '瀵嗙爜=password',
+ '濮撳悕EN=nameEn','骞撮緞=age','閭=email','鍗曚綅=company','绛惧悕=pictureUrl','鏈汉鐓�=signatureUrl']
}],
tagField: {
state: {
@@ -477,7 +478,7 @@
if (power[i].menuMethod == 'delDepartment') {
delStandardTree = true
}
- if (power[i].menuMethod == 'addPersonUser') {
+ if (power[i].menuMethod == 'selectCompaniesList') {
addUserPower = true
}
}
@@ -630,11 +631,11 @@
}
let arr = []
this.currentCompaniesList.forEach(b=>{
- this.companiesList.forEach(a=>{
+ /* this.companiesList.forEach(a=>{
if(a.companyId===b){
console.log(a)
}
- })
+ }) */
let obj = this.companiesList.find(a=>a.companyId==b)
arr.push(obj)
})
@@ -652,10 +653,13 @@
return
}
this.$message.success('鎿嶄綔鎴愬姛')
- this.refresh()
this.multipleSelection = []
this.$refs.personTable.clearSelection()
this.addthirdParty = false
+ this.addLoad = false
+ this.personList = []
+ this.userSearch2 = ''
+ this.refresh()
}).catch(e => {
this.addthirdParty = false
this.addLoad = false
--
Gitblit v1.9.3