From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/system/role/index.vue | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/system/role/index.vue b/Source/plt-web/plt-web-ui/src/views/system/role/index.vue
index cc5ca1e..2cc1f1b 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/role/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/role/index.vue
@@ -26,11 +26,6 @@
<icon-show :name="permissionList.delBtn.source"></icon-show>
鍒犻櫎
</el-button>
- <el-button v-if="permissionList.assignMembersBtn" class="button-custom-icon" plain size="small" type="primary"
- @click="assignMembersHandler">
- <icon-show :name="permissionList.assignMembersBtn.source"></icon-show>
- 鍒嗛厤鎴愬憳
- </el-button>
<el-button v-if="permissionList.statisticsBtn" class="button-custom-icon" plain size="small" type="primary"
@click="statisticsHandler">
<icon-show :name="permissionList.statisticsBtn.source"></icon-show>
@@ -48,6 +43,15 @@
</template>
<template slot="menu" slot-scope="{ row, index }">
+ <el-button
+ v-if="permissionList.assignMembersBtn"
+ size="small"
+ type="text"
+ @click="assignMembersHandler(row, index)"
+ >
+ <icon-show :name="permissionList.assignMembersBtn.source"></icon-show>
+ 鍒嗛厤鎴愬憳
+ </el-button>
<el-button
v-if="permissionList.editBtn"
size="small"
@@ -188,7 +192,7 @@
delBtn: this.vaildData(this.permission[this.$route.query.id].DELETE, false),
editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
exportBtn: this.vaildData(this.permission[this.$route.query.id].EXPORT, false),
- assignMembersBtn: this.vaildData(this.permission[this.$route.query.id].FREEZE, false),
+ assignMembersBtn: this.vaildData(this.permission[this.$route.query.id].ASSIGN, false),
importRoleBtn: this.vaildData(this.permission[this.$route.query.id].IMPORT, false),
statisticsBtn: this.vaildData(this.permission[this.$route.query.id].DISCARD, false),
};
@@ -341,19 +345,19 @@
},
// 鍒嗛厤鎴愬憳
- assignMembersHandler() {
- if (this.selectList.length <= 0) {
- this.$message.warning('璇烽�夋嫨瑙掕壊杩涜鎴愬憳鍒嗛厤锛�');
- return;
- }
-
- if (this.selectList.length > 1) {
- this.$message.warning('涓�娆″彧鑳藉涓�涓鑹茶繘琛屽垎閰嶆垚鍛樻搷浣滐紒');
- return;
- }
+ assignMembersHandler(row,index) {
+ // if (this.selectList.length <= 0) {
+ // this.$message.warning('璇烽�夋嫨瑙掕壊杩涜鎴愬憳鍒嗛厤锛�');
+ // return;
+ // }
+ //
+ // if (this.selectList.length > 1) {
+ // this.$message.warning('涓�娆″彧鑳藉涓�涓鑹茶繘琛屽垎閰嶆垚鍛樻搷浣滐紒');
+ // return;
+ // }
Promise.all([
- listUserUnInRoleOid({pkRole: this.selectList[0].oid}),
- listUserByRoleOid({pkRole: this.selectList[0].oid})
+ listUserUnInRoleOid({pkRole: row.oid}),
+ listUserByRoleOid({pkRole: row.oid})
]).then(([unInRoleRes, byRoleRes]) => {
this.leftRoleData = [];
this.rightRoleData = [];
--
Gitblit v1.9.3