From 7cd315319f67d2bb3274384ea2d76150958c8bcd Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 03 十一月 2023 10:19:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/system/user.vue | 79 +++++++++++++++++++++++++--------------
1 files changed, 50 insertions(+), 29 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index f780dd8..bbd3232 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -35,56 +35,57 @@
@refresh-change="refreshChange"
@on-load="onLoad">
<template slot="menuLeft">
- <el-button v-if="permission.user_delete"
+ <el-button v-if="permissionList.delBtn"
icon="el-icon-delete"
plain
size="small"
type="danger"
@click="handleDelete">鍒� 闄�
</el-button>
- <el-button v-if="permission.user_role"
+ <el-button v-if="permissionList.roleBtn"
icon="el-icon-user"
plain
size="small"
type="info"
@click="handleGrant">瑙掕壊閰嶇疆
</el-button>
- <el-button v-if="permission.user_reset"
+ <el-button v-if="permissionList.resetBtn"
icon="el-icon-refresh"
plain
size="small"
type="info"
@click="handleReset">瀵嗙爜閲嶇疆
</el-button>
- <el-button size="small"
- v-if="userInfo.role_name.includes('admin')"
+ <el-button v-if="permissionList.pwdStrategyBtn"
+ size="small"
type="success"
icon="el-icon-setting"
@click="handlepass">
閰嶇疆瀵嗙爜绛栫暐
</el-button>
- <el-button v-if="userInfo.role_name.includes('admin')"
+ <el-button v-if="permissionList.unsealBtn"
icon="el-icon-coordinate"
plain
size="small"
type="info"
@click="handleLock">璐﹀彿瑙ｅ皝
</el-button>
- <el-button v-if="userInfo.role_name.includes('admin')"
+ <el-button v-if="permissionList.importBtn"
icon="el-icon-upload2"
plain
size="small"
type="success"
@click="handleImport">瀵煎叆
</el-button>
- <el-button v-if="userInfo.role_name.includes('admin')"
+ <el-button v-if="permissionList.exportBtn"
icon="el-icon-download"
plain
size="small"
type="warning"
@click="handleExport">瀵煎嚭
</el-button>
- <el-button size="small"
+ <el-button v-if="permissionList.deactEnBtn"
+ size="small"
type="warning"
icon="el-icon-setting"
@click="updateUserStatus">
@@ -288,7 +289,12 @@
border: true,
index: true,
selection: true,
+ /* 涓嬮潰杩欎笁涓睘鎬ч粯璁よ缃负true锛�
+ 瀹為檯鏍规嵁permissionList涓鐓х殑灞炴�ц繘琛屾帶鍒剁殑 */
viewBtn: true,
+ editBtn: true,
+ delBtn: true,
+ addBtn: true,
dialogType: 'drawer',
dialogClickModal: false,
highlightCurrentRow: true, //琛岄�変腑鏃堕珮浜�
@@ -557,7 +563,7 @@
trigger: "click"
}]
},
- {
+ /*{
label: "鎵�灞炲矖浣�",
prop: "postId",
type: "tree",
@@ -572,7 +578,7 @@
message: "璇烽�夋嫨鎵�灞炲矖浣�",
trigger: "click"
}],
- },
+ },*/
]
},
]
@@ -715,7 +721,7 @@
'form.tenantId'() {
if (this.form.tenantId !== '' && this.initFlag) {
this.initData(this.form.tenantId);
- console.log('this.form.tenantId',this.form.tenantId)
+ // console.log('this.form.tenantId',this.form.tenantId)
}
},
'excelForm.isCovered'() {
@@ -727,22 +733,37 @@
},
computed: {
...mapGetters(["userInfo", "permission"]),
+ /** 鎸夐挳鏄剧ず闅愯棌鎺у埗 */
permissionList() {
return {
- addBtn: this.vaildData(this.permission.user_add, false),
- viewBtn: this.vaildData(this.permission.user_view, false),
- delBtn: this.vaildData(this.permission.user_delete, false),
- editBtn: this.vaildData(this.permission.user_edit, false)
+ addBtn: this.vaildData(this.permission.user.user_add, false),
+ viewBtn: this.vaildData(this.permission.user.user_view, false),
+ delBtn: this.vaildData(this.permission.user.user_delete, false),
+ editBtn: this.vaildData(this.permission.user.user_edit, false),
+ deactEnBtn: this.vaildData(this.permission.user.user_deact_en,false),
+ exportBtn: this.vaildData(this.permission.user.user_export,false),
+ pwdStrategyBtn: this.vaildData(this.permission.user.user_pwd_strategy,false),
+ importBtn: this.vaildData(this.permission.user.user_import,false),
+ resetBtn: this.vaildData(this.permission.user.user_reset,false),
+ roleBtn: this.vaildData(this.permission.user.user_role,false),
+ unsealBtn: this.vaildData(this.permission.user.user_unseal,false),
};
},
- platformPermissionList() {
- return {
- addBtn: false,
- viewBtn: false,
- delBtn: false,
- editBtn: this.vaildData(this.permission.user_edit, false)
- };
- },
+ // platformPermissionList() {
+ // return {
+ // addBtn: this.vaildData(this.permission.user.user_add, false),
+ // viewBtn: this.vaildData(this.permission.user.user_view, false),
+ // delBtn: this.vaildData(this.permission.user.user_delete, false),
+ // editBtn: this.vaildData(this.permission.user.user_edit, false),
+ // deactEnBtn: this.vaildData(this.permission.user.user_deact_en,false),
+ // exportBtn: this.vaildData(this.permission.user.user_export,false),
+ // pwdStrategyBtn: this.vaildData(this.permission.user.user_pwd_strategy,false),
+ // importBtn: this.vaildData(this.permission.user.user_import,false),
+ // resetBtn: this.vaildData(this.permission.user.user_reset,false),
+ // roleBtn: this.vaildData(this.permission.user.user_role,false),
+ // unsealBtn: this.vaildData(this.permission.user.user_unseal,false),
+ // };
+ // },
ids() {
let ids = [];
this.selectionList.forEach(ele => {
@@ -794,7 +815,7 @@
let userIds = func.joinedString(list,"id");
let status = list[0].userStatus == 1 ? true:false;
let msg = status ? "纭畾灏嗛�夋嫨璐﹀彿鍚敤":"纭畾灏嗛�夋嫨璐﹀彿鍋滅敤"+"锛�";
- console.log(msg);
+ // console.log(msg);
this.$confirm(msg, {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
@@ -874,8 +895,8 @@
});
},
nodeClick(data) {
- console.log(data)
- console.log(this.form.tenantId)
+ // console.log(data)
+ // console.log(this.form.tenantId)
this.treeDeptId = data.id;
this.page.currentPage = 1;
this.onLoad(this.page);
@@ -910,8 +931,8 @@
rowSave(row, done, loading) {
row.deptId = row.deptId.join(",");
row.roleId = row.roleId.join(",");
- row.postId = row.postId.join(",");
- console.log('3',row)
+ //row.postId = row.postId.join(",");
+ // console.log('3',row)
add(row).then(() => {
this.initFlag = false;
this.onLoad(this.page);
--
Gitblit v1.9.3