From 650a84730f4418ebbcdc58bbadd4d56f5dd3c8fd Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 07 八月 2025 14:01:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin
---
src/views/Permission/RoleManage.vue | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/views/Permission/RoleManage.vue b/src/views/Permission/RoleManage.vue
index 5143ab0..ba103bb 100644
--- a/src/views/Permission/RoleManage.vue
+++ b/src/views/Permission/RoleManage.vue
@@ -80,14 +80,15 @@
// member: { emits: { onClick: (role) => openMemberDialog(role) } },
disabledBtn: {
emits: { onClick: (role) => roleEnableOrForbid(role) },
+ props: { type: 'danger' },
extraProps: {
- hide: (row) => row.isLocked,
+ hide: (row) => row.isDisabled,
},
},
enableBtn: {
emits: { onClick: (role) => roleEnableOrForbid(role) },
extraProps: {
- hide: (row) => !row.isLocked,
+ hide: (row) => !row.isDisabled,
},
},
};
@@ -217,17 +218,16 @@
async function roleEnableOrForbid(row: API.GetRolesQueryResultItem) {
try {
- // await Message.tipMessage(`鏄惁${!row.isEnable ? '鍚敤' : '绂佺敤'}瑙掕壊`);
- // let res = await userServices.roleEnableOrForbid({
- // id: row.id,
- // isEnable: !row.isEnable,
- // });
- // if (res) {
- // Message.successMessage('鎿嶄綔鎴愬姛');
- // getList(paginationState.pageIndex);
- // refetch({ type: 'inactive' });
- // return !!res;
- // }
+ await Message.tipMessage(`鏄惁${row.isDisabled ? '鍚敤' : '绂佺敤'}瑙掕壊`);
+ let res = await roleServices.setRoleIsDisabled({
+ ids: [row.id],
+ isDisabled: !row.isDisabled,
+ });
+ if (res) {
+ Message.successMessage('鎿嶄綔鎴愬姛');
+ getList(paginationState.pageIndex);
+ return !!res;
+ }
} catch (error) {}
}
@@ -258,19 +258,19 @@
async function handleAuthorize(selectedMenuIds: string[], resourceIds: string[]) {
try {
- // let params: API.SaveRoleCommand = {
- // ...authorizeForm.detail,
- // menuIds: selectedMenuIds,
- // resources: resourceIds.map((x) => ({
- // resourceId: x,
- // dataPower: EnumRoleWebApiDataPower.All,
- // })),
- // };
- // let res = await roleServices.saveRole(params);
- // if (res) {
- // Message.successMessage('鎿嶄綔鎴愬姛');
- // getList(paginationState.pageIndex);
- // }
+ let params: API.SaveRoleCommand = {
+ ...authorizeForm.detail,
+ menuIds: selectedMenuIds,
+ // resources: resourceIds.map((x) => ({
+ // resourceId: x,
+ // dataPower: EnumRoleWebApiDataPower.All,
+ // })),
+ };
+ let res = await roleServices.saveRole(params);
+ if (res) {
+ Message.successMessage('鎿嶄綔鎴愬姛');
+ getList(paginationState.pageIndex);
+ }
} catch (error) {}
}
--
Gitblit v1.9.1