From c9ef6542d3f61529635478801d5269561dbed1f5 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 11 十一月 2025 15:20:35 +0800
Subject: [PATCH] fix: bug
---
src/views/Permission/RoleManage.vue | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/views/Permission/RoleManage.vue b/src/views/Permission/RoleManage.vue
index ba103bb..96b9da7 100644
--- a/src/views/Permission/RoleManage.vue
+++ b/src/views/Permission/RoleManage.vue
@@ -19,6 +19,14 @@
@change="getList()"
/>
</QueryFilterItem>
+ <QueryFilterItem v-if="extraParamState.userType === EnumUserType.Enterprise">
+ <FieldRadio
+ v-model="extraParamState.enterpriseType"
+ :value-enum="EnumEnterpriseTypeText"
+ buttonStyle
+ @change="getList()"
+ />
+ </QueryFilterItem>
<QueryFilterItem>
<SearchInput
v-model="extraParamState.queryCondition"
@@ -65,7 +73,12 @@
import { useAccess, useAllRoleList } from '@/hooks';
import { Message } from '@bole-core/core';
import AddOrEditRoleDialog from './components/AddOrEditRoleDialog.vue';
-import { EnumClientTypeText, EnumUserTypeText } from '@/constants';
+import {
+ EnumClientTypeText,
+ EnumUserTypeText,
+ EnumEnterpriseTypeText,
+ EnumUserType,
+} from '@/constants';
import DialogAuthorizeV2 from './components/dialogAuthorizeV2.vue';
import * as roleServices from '@/services/api/role';
@@ -125,7 +138,11 @@
},
userType: extraParamState.userType,
clientType: extraParamState.clientType,
+ keywords: extraParamState.queryCondition,
};
+ if (extraParamState.userType === EnumUserType.Enterprise) {
+ params.enterpriseType = extraParamState.enterpriseType;
+ }
let res = await roleServices.getRoles(params, {
showLoading: !state.loading,
});
@@ -138,6 +155,7 @@
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
userType: EnumUserType.Operation,
clientType: EnumClientType.PcWeb,
+ enterpriseType: EnumEnterpriseType.Supplier,
},
queryKey: ['roleServices/getRoles'],
columnsRenderProps: {
@@ -158,9 +176,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) {}
}
@@ -175,6 +198,8 @@
clientType: EnumClientType.PcWeb,
dataRange: EnumRoleWebApiDataPower.All,
detail: null as API.GetRoleQueryResult,
+ minLevel: 1,
+ enterpriseType: '' as any as EnumEnterpriseType,
},
});
@@ -187,7 +212,11 @@
dataPower: editForm.dataRange,
userType: editForm.userType,
clientType: editForm.clientType,
+ minLevel: editForm.minLevel,
};
+ if (editForm.userType === EnumUserType.Enterprise) {
+ params.enterpriseType = editForm.enterpriseType;
+ }
if (isEdit) {
params = {
...editForm.detail,
@@ -256,7 +285,8 @@
} 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,
--
Gitblit v1.9.1