From be45332264a4baa48f1f4375be907b9c89c75132 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 31 十月 2025 14:10:51 +0800
Subject: [PATCH] fix: bug
---
src/views/Permission/RoleManage.vue | 67 +++++++++++++++++++--------------
1 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/src/views/Permission/RoleManage.vue b/src/views/Permission/RoleManage.vue
index 5143ab0..3f3f2c4 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,
},
},
};
@@ -124,6 +125,7 @@
},
userType: extraParamState.userType,
clientType: extraParamState.clientType,
+ keywords: extraParamState.queryCondition,
};
let res = await roleServices.getRoles(params, {
showLoading: !state.loading,
@@ -157,9 +159,14 @@
clientType: row.clientType,
dataRange: row.dataPower,
detail: detail,
+ minLevel: row.minLevel,
+ enterpriseType: row.enterpriseType,
});
} else {
- handleAdd();
+ handleAdd({
+ userType: extraParamState.userType,
+ clientType: extraParamState.clientType,
+ });
}
} catch (error) {}
}
@@ -174,6 +181,8 @@
clientType: EnumClientType.PcWeb,
dataRange: EnumRoleWebApiDataPower.All,
detail: null as API.GetRoleQueryResult,
+ minLevel: 1,
+ enterpriseType: '' as any as EnumEnterpriseType,
},
});
@@ -186,6 +195,8 @@
dataPower: editForm.dataRange,
userType: editForm.userType,
clientType: editForm.clientType,
+ minLevel: editForm.minLevel,
+ enterpriseType: editForm.enterpriseType,
};
if (isEdit) {
params = {
@@ -217,17 +228,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) {}
}
@@ -256,21 +266,22 @@
} catch (error) {}
}
-async function handleAuthorize(selectedMenuIds: string[], resourceIds: string[]) {
+async function handleAuthorize(selectedMenuIds: string[]) {
+ console.log('selectedMenuIds: ', selectedMenuIds);
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