From d8bb0e96fbbb763c623255629d623e7308ef5dee Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 22 五月 2024 16:15:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/person-manage.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index 3e2f59d..43f52d3 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>
@@ -477,7 +477,7 @@
if (power[i].menuMethod == 'delDepartment') {
delStandardTree = true
}
- if (power[i].menuMethod == 'addPersonUser') {
+ if (power[i].menuMethod == 'selectCompaniesList') {
addUserPower = true
}
}
@@ -630,11 +630,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 +652,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