From e39a46f97bd95687c882f81bb373e50db25d4286 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 16 五月 2024 18:03:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/person-manage.vue | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index 2859d05..3e2f59d 100644
--- a/src/components/view/person-manage.vue
+++ b/src/components/view/person-manage.vue
@@ -174,8 +174,8 @@
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
</div>
- <div class="search_thing">
- <el-button size="small" type="primary" @click="openthirdParty">鑾峰彇涓夋柟浜哄憳</el-button>
+ <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="opeaAdd" v-if="addPower">鏂板鐢ㄦ埛</el-button>
</div>
</div>
@@ -184,7 +184,7 @@
:componentData="componentData" :key="upIndex" />
</div>
</div>
- <el-dialog title="鏋舵瀯鏂板" :visible.sync="addDia0" width="400px">
+ <el-dialog title="鏋舵瀯鏂板" :visible.sync="addDia" width="400px">
<div class="body">
<el-row style="line-height: 50px;">
<el-col :span="6" style="text-align: right;">
@@ -196,7 +196,7 @@
</el-row>
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="addDia0 = false">鍙� 娑�</el-button>
+ <el-button @click="addDia = false">鍙� 娑�</el-button>
<el-button type="primary" @click="addStandardTree" :loading="addLoad">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -204,7 +204,7 @@
<div class="body">
<el-row>
<el-col :span="9" style="height: 70vh;overflow: hidden;">
- <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="search2" size="small" style="width: 90%;padding: 0 5% 10px 5%;"
+ <el-input placeholder="杈撳叆鍏抽敭瀛楁悳绱�" v-model="search2" size="small" style="width: 90%;padding: 0 5% 10px 5%;"
clearable @blur="searchFilter2" @clear="searchFilter2" @keyup.enter.native="searchFilter2()">
</el-input>
<el-tree :data="datathirdParty" node-key="id" :props="defaultProps" @node-click="nodeClick2"
@@ -344,6 +344,7 @@
upIndex: 0,
addDia: false,
addPower: true,
+ addUserPower: true,
delStandardTree: true,
addDia0: false,
addOb: {
@@ -464,6 +465,7 @@
let power = JSON.parse(sessionStorage.getItem('power'))
let up = false
let add = false
+ let addUserPower = false
let delStandardTree = false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'updateUser') {
@@ -475,12 +477,16 @@
if (power[i].menuMethod == 'delDepartment') {
delStandardTree = true
}
+ if (power[i].menuMethod == 'addPersonUser') {
+ addUserPower = true
+ }
}
if (!up) {
this.componentData.do.splice(0, 1)
}
this.delStandardTree = delStandardTree
this.addPower = add
+ this.addUserPower = addUserPower
},
handleAdd() {
if (this.addOb.fatherId||this.addOb.name=='鍏ㄩ儴') {
--
Gitblit v1.9.3