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 | 23 ++++++++++-
src/views/Permission/components/AddOrEditRoleDialog.vue | 13 +++++-
src/services/api/index.ts | 8 ++--
src/constants/apiEnumText.ts | 12 +++++
src/services/api/typings.d.ts | 14 +++++++
src/views/System/ModuleManage.vue | 37 +++++++++++++-----
auto-imports.d.ts | 4 +-
src/constants/enterprise.ts | 5 --
8 files changed, 89 insertions(+), 27 deletions(-)
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 7abd6ec..e82b271 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -52,7 +52,7 @@
const EnumEnterpriseCostType: typeof import('./src/constants/apiEnum')['EnumEnterpriseCostType']
const EnumEnterpriseRealMethod: typeof import('./src/constants/apiEnum')['EnumEnterpriseRealMethod']
const EnumEnterpriseType: typeof import('./src/constants/apiEnum')['EnumEnterpriseType']
- const EnumEnterpriseTypeText: typeof import('./src/constants/enterprise')['EnumEnterpriseTypeText']
+ const EnumEnterpriseTypeText: typeof import('./src/constants/apiEnumText')['EnumEnterpriseTypeText']
const EnumEnterpriseWalletAccess: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletAccess']
const EnumEnterpriseWalletAccessText: typeof import('./src/constants/enterpriseWallet')['EnumEnterpriseWalletAccessText']
const EnumEnterpriseWalletAccessTextForSettle: typeof import('./src/constants/enterpriseWallet')['EnumEnterpriseWalletAccessTextForSettle']
@@ -421,7 +421,7 @@
readonly EnumEnterpriseCostType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseCostType']>
readonly EnumEnterpriseRealMethod: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseRealMethod']>
readonly EnumEnterpriseType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseType']>
- readonly EnumEnterpriseTypeText: UnwrapRef<typeof import('./src/constants/enterprise')['EnumEnterpriseTypeText']>
+ readonly EnumEnterpriseTypeText: UnwrapRef<typeof import('./src/constants/apiEnumText')['EnumEnterpriseTypeText']>
readonly EnumEnterpriseWalletAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletAccess']>
readonly EnumEnterpriseWalletAccessText: UnwrapRef<typeof import('./src/constants/enterpriseWallet')['EnumEnterpriseWalletAccessText']>
readonly EnumEnterpriseWalletAccessTextForSettle: UnwrapRef<typeof import('./src/constants/enterpriseWallet')['EnumEnterpriseWalletAccessTextForSettle']>
diff --git a/src/constants/apiEnumText.ts b/src/constants/apiEnumText.ts
index 47bb79e..5b15635 100644
--- a/src/constants/apiEnumText.ts
+++ b/src/constants/apiEnumText.ts
@@ -1,4 +1,9 @@
-import { EnumClientType, EnumUserType, EnumRoleWebApiDataPower } from './apiEnum';
+import {
+ EnumClientType,
+ EnumUserType,
+ EnumRoleWebApiDataPower,
+ EnumEnterpriseType,
+} from './apiEnum';
export const EnumClientTypeText = {
[EnumClientType.PcWeb]: '鐢佃剳缃戦〉',
@@ -11,6 +16,11 @@
[EnumUserType.Operation]: '杩愯惀',
};
+export const EnumEnterpriseTypeText = {
+ [EnumEnterpriseType.Supplier]: '鎵挎徑',
+ [EnumEnterpriseType.PartyA]: '鐢叉柟',
+};
+
export const EnumRoleWebApiDataPowerText = {
[EnumRoleWebApiDataPower.Custom]: '鑷畾涔�',
[EnumRoleWebApiDataPower.Creator]: '涓汉鏁版嵁',
diff --git a/src/constants/enterprise.ts b/src/constants/enterprise.ts
index 3d83d06..be49de0 100644
--- a/src/constants/enterprise.ts
+++ b/src/constants/enterprise.ts
@@ -124,8 +124,3 @@
[EnumEnterpriseWalletExpandindirectOrderStatus.DISUSE]: '宸插簾寮�',
[EnumEnterpriseWalletExpandindirectOrderStatus.REVOKED]: '宸叉挙閿�',
};
-
-export const EnumEnterpriseTypeText = {
- [EnumEnterpriseType.Supplier]: '鎵挎徑',
- [EnumEnterpriseType.PartyA]: '鐢叉柟',
-};
diff --git a/src/services/api/index.ts b/src/services/api/index.ts
index 6987f77..b5aa93e 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -9,14 +9,15 @@
import * as task from './task';
import * as enterpriseWallet from './enterpriseWallet';
import * as ocrUtils from './ocrUtils';
+import * as electronSign from './electronSign';
import * as resource from './resource';
import * as logRecords from './logRecords';
import * as dictionary from './dictionary';
import * as taskCheckReceive from './taskCheckReceive';
-import * as electronSign from './electronSign';
import * as userResume from './userResume';
import * as auth from './auth';
import * as taskUser from './taskUser';
+import * as eventUtils from './eventUtils';
import * as enterpriseCooperationWallet from './enterpriseCooperationWallet';
import * as codeUrl from './codeUrl';
import * as syncDatabase from './syncDatabase';
@@ -25,7 +26,6 @@
import * as userWallet from './userWallet';
import * as fileUtils from './fileUtils';
import * as settings from './settings';
-import * as eventUtils from './eventUtils';
export default {
enterprise,
enterpriseEmployee,
@@ -34,14 +34,15 @@
task,
enterpriseWallet,
ocrUtils,
+ electronSign,
resource,
logRecords,
dictionary,
taskCheckReceive,
- electronSign,
userResume,
auth,
taskUser,
+ eventUtils,
enterpriseCooperationWallet,
codeUrl,
syncDatabase,
@@ -50,5 +51,4 @@
userWallet,
fileUtils,
settings,
- eventUtils,
};
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 7f4985b..6366118 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -200,6 +200,8 @@
interface APIgetMenusParams {
/** 鐢ㄦ埛绫诲瀷 */
userType?: EnumUserType;
+ /** 浼佷笟绫诲瀷 */
+ enterpriseType?: EnumEnterpriseType;
/** 瀹㈡埛绔被鍨� */
clientType?: EnumClientType;
/** 瑙掕壊Id */
@@ -4002,6 +4004,8 @@
checkOutTime?: string;
checkHistoryType?: EnumTaskUserSubmitCheckHistoryType;
/** 鎿嶄綔浜� */
+ checkOperator?: string;
+ /** 鎿嶄綔浜� */
operator?: string;
/** 鏈�杩戞彁浜ゆ椂闂� */
lastSubmitTime?: string;
@@ -4157,6 +4161,8 @@
interface GetCheckReceiveTaskUserSubmitQueryResult {
/** 鎻愪氦Id */
id?: string;
+ /** 浠诲姟浜哄憳Id */
+ taskInfoUserId?: string;
enterpriseEmployeeUser?: GetCheckReceiveTaskUserSubmitsQueryResultObjectDataEnterpriseEmployeeUser;
/** 楠屾敹鏃堕棿 */
date?: string;
@@ -4175,6 +4181,8 @@
/** 浜哄伐绛惧嚭鏃堕棿 */
checkOutTime?: string;
checkHistoryType?: EnumTaskUserSubmitCheckHistoryType;
+ /** 鎿嶄綔浜� */
+ checkOperator?: string;
/** 鎿嶄綔浜� */
operator?: string;
/** 楠屾敹鐓х墖 */
@@ -4229,6 +4237,8 @@
/** 浜哄伐绛惧嚭鏃堕棿 */
checkOutTime?: string;
checkHistoryType?: EnumTaskUserSubmitCheckHistoryType;
+ /** 鎿嶄綔浜� */
+ checkOperator?: string;
/** 鎿嶄綔浜� */
operator?: string;
/** 鎻愪氦鏃堕棿 */
@@ -5456,6 +5466,7 @@
/** 鏄惁閫夋嫨锛堢敤鎴疯鑹叉巿鏉冿級 */
isChecked?: boolean;
userType?: EnumUserType;
+ enterpriseType?: EnumEnterpriseType;
clientType?: EnumClientType;
/** 涓婄骇Id */
parentId?: string;
@@ -6415,6 +6426,8 @@
dataPower?: EnumRoleWebApiDataPower;
/** 澶囨敞 */
remark?: string;
+ /** 鐢ㄦ埛鏁� */
+ userCount?: number;
/** 鑿滃崟Id */
menuIds?: string[];
/** 璧勬簮 */
@@ -8147,6 +8160,7 @@
interface SaveMenuCommand {
userType?: EnumUserType;
+ enterpriseType?: EnumEnterpriseType;
clientType?: EnumClientType;
/** 涓婄骇Id */
parentId?: string;
diff --git a/src/views/Permission/RoleManage.vue b/src/views/Permission/RoleManage.vue
index 3f3f2c4..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';
@@ -127,6 +140,9 @@
clientType: extraParamState.clientType,
keywords: extraParamState.queryCondition,
};
+ if (extraParamState.userType === EnumUserType.Enterprise) {
+ params.enterpriseType = extraParamState.enterpriseType;
+ }
let res = await roleServices.getRoles(params, {
showLoading: !state.loading,
});
@@ -139,6 +155,7 @@
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
userType: EnumUserType.Operation,
clientType: EnumClientType.PcWeb,
+ enterpriseType: EnumEnterpriseType.Supplier,
},
queryKey: ['roleServices/getRoles'],
columnsRenderProps: {
@@ -196,8 +213,10 @@
userType: editForm.userType,
clientType: editForm.clientType,
minLevel: editForm.minLevel,
- enterpriseType: editForm.enterpriseType,
};
+ if (editForm.userType === EnumUserType.Enterprise) {
+ params.enterpriseType = editForm.enterpriseType;
+ }
if (isEdit) {
params = {
...editForm.detail,
diff --git a/src/views/Permission/components/AddOrEditRoleDialog.vue b/src/views/Permission/components/AddOrEditRoleDialog.vue
index 6fa3983..f54ce8b 100644
--- a/src/views/Permission/components/AddOrEditRoleDialog.vue
+++ b/src/views/Permission/components/AddOrEditRoleDialog.vue
@@ -18,7 +18,11 @@
:controls="false"
></ProFormInputNumber>
</ProFormItemV2>
- <ProFormItemV2 label="浼佷笟绫诲瀷" prop="enterpriseType">
+ <ProFormItemV2
+ label="浼佷笟绫诲瀷"
+ prop="enterpriseType"
+ v-if="form.userType === EnumUserType.Enterprise"
+ >
<ProFormRadio
v-model="form.enterpriseType"
:value-enum="EnumEnterpriseTypeText"
@@ -61,7 +65,11 @@
ProFormTextArea,
ProFormInputNumber,
} from '@bole-core/components';
-import { EnumRoleWebApiDataPowerTextForFilter, EnumEnterpriseTypeText } from '@/constants';
+import {
+ EnumRoleWebApiDataPowerTextForFilter,
+ EnumEnterpriseTypeText,
+ EnumUserType,
+} from '@/constants';
defineOptions({
name: 'AddOrEditRoleDialog',
@@ -77,6 +85,7 @@
dataRange: EnumRoleWebApiDataPower;
minLevel: number;
enterpriseType: EnumEnterpriseType;
+ userType: EnumUserType;
};
};
diff --git a/src/views/System/ModuleManage.vue b/src/views/System/ModuleManage.vue
index b55268a..145fbf4 100644
--- a/src/views/System/ModuleManage.vue
+++ b/src/views/System/ModuleManage.vue
@@ -19,6 +19,14 @@
@change="getAllModule()"
/>
</QueryFilterItem>
+ <QueryFilterItem v-if="state.userType === EnumUserType.Enterprise">
+ <FieldRadio
+ v-model="state.enterpriseType"
+ :value-enum="EnumEnterpriseTypeText"
+ buttonStyle
+ @change="getAllModule()"
+ />
+ </QueryFilterItem>
<div class="query-filter-list-item">
<SearchInput
v-model="state.searchValue"
@@ -124,6 +132,8 @@
EnumMenuType,
EnumClientTypeText,
EnumUserTypeText,
+ EnumEnterpriseTypeText,
+ EnumUserType,
} from '@/constants';
import SubModuleEditDrawer from './components/SubModuleEditDrawer.vue';
import AddOrEditModuleDialog from './components/AddOrEditModuleDialog.vue';
@@ -205,6 +215,7 @@
group: 'default',
userType: EnumUserType.Operation,
clientType: EnumClientType.PcWeb,
+ enterpriseType: EnumEnterpriseType.Supplier,
};
const state = reactive({ ...BaseState });
const moduleTreeStore = ref<TreeStore<TreeModuleDtoGroupDto>>();
@@ -248,15 +259,16 @@
});
async function getAllModule() {
try {
- let res = await menuServices.getMenus(
- {
- userType: state.userType,
- clientType: state.clientType,
- },
- {
- showLoading: false,
- }
- );
+ let params: API.APIgetMenusParams = {
+ userType: state.userType,
+ clientType: state.clientType,
+ };
+ if (state.userType === EnumUserType.Enterprise) {
+ params.enterpriseType = state.enterpriseType;
+ }
+ let res = await menuServices.getMenus(params, {
+ showLoading: false,
+ });
const treeStore = ModuleUtils.convertToModuleGroup(flattenTree(res));
moduleTreeStore.value = treeStore;
originModuleTree.value = [...treeStore.data];
@@ -397,6 +409,7 @@
let params: API.SaveMenuCommand = {
userType: state.userType,
clientType: state.clientType,
+ enterpriseType: state.enterpriseType,
code: editForm.enCode,
name: editForm.name,
type: editForm.isMenu ? EnumMenuType.Menu : EnumMenuType.Page,
@@ -529,7 +542,7 @@
name: subModule.name,
group: state.group,
// location: 'string',
- width: subModule.width.toString(),
+ width: !!subModule.width ? subModule.width.toString() : undefined,
sort: subModule.sortCode,
};
if (subModule.id) {
@@ -549,7 +562,9 @@
getBaseModuleGetAllSubModule(currentDrawerModule.value, drawerState.type);
Message.successMessage('淇濆瓨鎴愬姛');
}
- } catch (error) {}
+ } catch (error) {
+ console.log('error: ', error);
+ }
}
async function handelBatchSaveColumn() {
try {
--
Gitblit v1.9.1