From 8f2468dc2a974040556fd0f49afb87df39401ff4 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 06 八月 2025 17:10:12 +0800
Subject: [PATCH] fix: 字典
---
src/services/api/index.ts | 4
src/hooks/dic.ts | 6
.eslintrc-auto-import.json | 2
src/services/api/typings.d.ts | 251 +++++++++++++++++++++++++++++++++++++++--
auto-imports.d.ts | 6
src/constants/apiEnum.ts | 14 ++
src/services/api/auth.ts | 15 ++
src/services/api/enterprise.ts | 42 +++++++
8 files changed, 321 insertions(+), 19 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index b865fdf..b05f1c8 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -23,11 +23,13 @@
"EnumMenuType": true,
"EnumMenuVisitLevel": true,
"EnumPagedListOrder": true,
+ "EnumRealAccess": true,
"EnumResourceController": true,
"EnumResourceMethod": true,
"EnumRoleWebApiDataPower": true,
"EnumRoleWebApiDataPowerText": true,
"EnumRoleWebApiDataPowerTextForFilter": true,
+ "EnumSmsAccess": true,
"EnumUserInfoStatus": true,
"EnumUserInfoStatusText": true,
"EnumUserType": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 6998adc..f4c6d32 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -29,11 +29,13 @@
const EnumMenuType: typeof import('./src/constants/apiEnum')['EnumMenuType']
const EnumMenuVisitLevel: typeof import('./src/constants/apiEnum')['EnumMenuVisitLevel']
const EnumPagedListOrder: typeof import('./src/constants/apiEnum')['EnumPagedListOrder']
+ const EnumRealAccess: typeof import('./src/constants/apiEnum')['EnumRealAccess']
const EnumResourceController: typeof import('./src/constants/apiEnum')['EnumResourceController']
const EnumResourceMethod: typeof import('./src/constants/apiEnum')['EnumResourceMethod']
const EnumRoleWebApiDataPower: typeof import('./src/constants/apiEnum')['EnumRoleWebApiDataPower']
const EnumRoleWebApiDataPowerText: typeof import('./src/constants/apiEnumText')['EnumRoleWebApiDataPowerText']
const EnumRoleWebApiDataPowerTextForFilter: typeof import('./src/constants/apiEnumText')['EnumRoleWebApiDataPowerTextForFilter']
+ const EnumSmsAccess: typeof import('./src/constants/apiEnum')['EnumSmsAccess']
const EnumUserInfoStatus: typeof import('./src/constants/apiEnum')['EnumUserInfoStatus']
const EnumUserInfoStatusText: typeof import('./src/constants/user')['EnumUserInfoStatusText']
const EnumUserType: typeof import('./src/constants/apiEnum')['EnumUserType']
@@ -190,7 +192,7 @@
export type { Component, Slot, Slots, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
import('vue')
// @ts-ignore
- export type { EnumClientType, EnumMenuType, EnumMenuVisitLevel, EnumPagedListOrder, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumUserInfoStatus, EnumUserType, EnumClientType, EnumMenuType, EnumMenuVisitLevel, EnumPagedListOrder, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumUserInfoStatus, EnumUserType } from './src/constants/apiEnum'
+ export type { EnumClientType, EnumMenuType, EnumMenuVisitLevel, EnumPagedListOrder, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSmsAccess, EnumUserInfoStatus, EnumUserType, EnumClientType, EnumMenuType, EnumMenuVisitLevel, EnumPagedListOrder, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSmsAccess, EnumUserInfoStatus, EnumUserType } from './src/constants/apiEnum'
import('./src/constants/apiEnum')
// @ts-ignore
export type { FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum, FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum } from './src/constants/cPerson'
@@ -248,11 +250,13 @@
readonly EnumMenuType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumMenuType']>
readonly EnumMenuVisitLevel: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumMenuVisitLevel']>
readonly EnumPagedListOrder: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumPagedListOrder']>
+ readonly EnumRealAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumRealAccess']>
readonly EnumResourceController: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumResourceController']>
readonly EnumResourceMethod: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumResourceMethod']>
readonly EnumRoleWebApiDataPower: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumRoleWebApiDataPower']>
readonly EnumRoleWebApiDataPowerText: UnwrapRef<typeof import('./src/constants/apiEnumText')['EnumRoleWebApiDataPowerText']>
readonly EnumRoleWebApiDataPowerTextForFilter: UnwrapRef<typeof import('./src/constants/apiEnumText')['EnumRoleWebApiDataPowerTextForFilter']>
+ readonly EnumSmsAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumSmsAccess']>
readonly EnumUserInfoStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserInfoStatus']>
readonly EnumUserInfoStatusText: UnwrapRef<typeof import('./src/constants/user')['EnumUserInfoStatusText']>
readonly EnumUserType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserType']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index 8069622..f1a06ac 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -41,6 +41,14 @@
Desc = 1,
}
+/** 瀹炲悕閫氶亾 */
+export enum EnumRealAccess {
+ /**涓婁笂绛� */
+ BestSign = 10,
+ /**鏀粯瀹濅俊浠荤 */
+ AlipaySign = 20,
+}
+
/** 璧勬簮鎺у埗鍣� */
export enum EnumResourceController {
/**鏁版嵁瀛楀吀 */
@@ -87,6 +95,12 @@
All = 999,
}
+/** 鐭俊閫氶亾 */
+export enum EnumSmsAccess {
+ /**闃块噷浜戠煭淇� */
+ AliyunSms = 10,
+}
+
/** 鐢ㄦ埛淇℃伅鐘舵�� */
export enum EnumUserInfoStatus {
/**姝ｅ父 */
diff --git a/src/hooks/dic.ts b/src/hooks/dic.ts
index 8935320..ee037f2 100644
--- a/src/hooks/dic.ts
+++ b/src/hooks/dic.ts
@@ -48,7 +48,7 @@
type UseDictionaryDataSelectOptions = {
categoryId?: MaybeRef<string>;
- categoryCode?: MaybeRef<string>;
+ categoryCode?: MaybeRef<CategoryCode>;
};
export function useDictionaryDataSelect({
@@ -56,7 +56,7 @@
categoryCode,
}: UseDictionaryDataSelectOptions) {
const { data: dictionaryDataList, refetch } = useQuery({
- queryKey: ['dictionaryServices/getDictionaryDataSelect'],
+ queryKey: ['dictionaryServices/getDictionaryDataSelect', categoryId, categoryCode],
queryFn: async () => {
let res = await dictionaryServices.getDictionaryDataSelect(
{
@@ -72,8 +72,6 @@
},
placeholderData: () =>
[] as API.SelectQueryResultOptionGuidGetDictionaryDataSelectQueryResultOption[],
-
- enabled: !!unref(categoryId) || !!unref(categoryCode),
});
function getDictionaryDataNameById(id: string) {
diff --git a/src/services/api/auth.ts b/src/services/api/auth.ts
index db28f67..543ccd0 100644
--- a/src/services/api/auth.ts
+++ b/src/services/api/auth.ts
@@ -19,6 +19,21 @@
});
}
+/** 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鑿滃崟璇︽儏 GET /api/user/auth/getCurrentLogierMenu */
+export async function getCurrentLogierMenu(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetCurrentLogierMenuParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetMenuQueryResult>('/api/user/auth/getCurrentLogierMenu', {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ });
+}
+
/** 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鑿滃崟 GET /api/user/auth/getCurrentLogierMenus */
export async function getCurrentLogierMenus(
// 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
diff --git a/src/services/api/enterprise.ts b/src/services/api/enterprise.ts
index 820738d..bfba64e 100644
--- a/src/services/api/enterprise.ts
+++ b/src/services/api/enterprise.ts
@@ -16,3 +16,45 @@
}
);
}
+
+/** 淇濆瓨浼佷笟 POST /api/user/enterprise/saveEnterprise */
+export async function saveEnterprise(body: API.SaveEnterpriseCommand, options?: API.RequestConfig) {
+ return request<string>('/api/user/enterprise/saveEnterprise', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 璁剧疆浼佷笟鐢靛瓙绛鹃厤缃� PUT /api/user/enterprise/setEnterpriseElectronSignSetting */
+export async function setEnterpriseElectronSignSetting(
+ body: API.SetEnterpriseElectronSignSettingCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/user/enterprise/setEnterpriseElectronSignSetting', {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 璁剧疆浼佷笟鐭俊閰嶇疆 PUT /api/user/enterprise/setEnterpriseSmsSetting */
+export async function setEnterpriseSmsSetting(
+ body: API.SetEnterpriseSmsSettingCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/user/enterprise/setEnterpriseSmsSetting', {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
diff --git a/src/services/api/index.ts b/src/services/api/index.ts
index c3af7d2..1f801d3 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -3,18 +3,18 @@
// API 鏇存柊鏃堕棿锛�
// API 鍞竴鏍囪瘑锛�
import * as auth from './auth';
-import * as enterprise from './enterprise';
import * as menu from './menu';
import * as dictionary from './dictionary';
import * as resource from './resource';
import * as role from './role';
import * as userInfo from './userInfo';
+import * as enterprise from './enterprise';
export default {
auth,
- enterprise,
menu,
dictionary,
resource,
role,
userInfo,
+ enterprise,
};
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index e1074e7..6dff9aa 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -8,6 +8,11 @@
request?: GetAliyunOSSAcsQuery;
}
+ interface APIgetCurrentLogierMenuParams {
+ /** Id */
+ id?: string;
+ }
+
interface APIgetCurrentLogierMenusParams {
/** 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鑿滃崟 */
request?: GetCurrentLogierMenusQuery;
@@ -86,6 +91,77 @@
ids: string[];
}
+ interface DictionaryCategory {
+ id?: string;
+ createdTime?: string;
+ updatedTime?: string;
+ /** 鎺掑簭 */
+ sort?: number;
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鍒涘缓鎿嶄綔浜� */
+ createdUserInfoId?: string;
+ /** 鏈�鍚庢洿鏂版搷浣滀汉 */
+ updatedUserInfoId?: string;
+ /** 鏄惁鍒犻櫎 */
+ isDeleted?: boolean;
+ /** 缂栧彿 */
+ code: string;
+ /** 鍚嶇О */
+ name: string;
+ /** 瀛楁鍚嶏紙閫楀彿闅斿紑锛� */
+ fieldNames?: string;
+ /** 澶囨敞 */
+ remark?: string;
+ }
+
+ interface DictionaryData {
+ id?: string;
+ createdTime?: string;
+ updatedTime?: string;
+ /** 鎺掑簭 */
+ sort?: number;
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鍒涘缓鎿嶄綔浜� */
+ createdUserInfoId?: string;
+ /** 鏈�鍚庢洿鏂版搷浣滀汉 */
+ updatedUserInfoId?: string;
+ /** 鏄惁鍒犻櫎 */
+ isDeleted?: boolean;
+ /** 绫诲埆Id */
+ categoryId?: string;
+ category?: DictionaryCategory;
+ /** 涓婄骇Id */
+ parentId?: string;
+ parent?: DictionaryData;
+ /** 涓嬬骇 */
+ children?: DictionaryData[];
+ /** 瀛楀吀璺緞 */
+ path?: string;
+ /** 缂栧彿 */
+ code?: string;
+ /** 鏄剧ず鍐呭 */
+ content: string;
+ /** 瀛楁1 */
+ field1?: string;
+ /** 瀛楁2 */
+ field2?: string;
+ /** 瀛楁3 */
+ field3?: string;
+ /** 瀛楁4 */
+ field4?: string;
+ /** 瀛楁5 */
+ field5?: string;
+ /** 鏄惁绂佺敤 */
+ isDisabled?: boolean;
+ }
+
+ interface DictionaryDataQueryResult {
+ /** 鍐呭 */
+ content?: string;
+ }
+
enum EnumClientType {
/**鐢佃剳缃戦〉 */
PcWeb = 10,
@@ -120,6 +196,13 @@
Asc = 0,
/**闄嶅簭 */
Desc = 1,
+ }
+
+ enum EnumRealAccess {
+ /**涓婁笂绛� */
+ BestSign = 10,
+ /**鏀粯瀹濅俊浠荤 */
+ AlipaySign = 20,
}
enum EnumResourceController {
@@ -163,6 +246,11 @@
CurrentEnterprise = 30,
/**鏌ヨ鎵�鏈� */
All = 999,
+ }
+
+ enum EnumSmsAccess {
+ /**闃块噷浜戠煭淇� */
+ AliyunSms = 10,
}
enum EnumUserInfoStatus {
@@ -368,6 +456,44 @@
timestamp?: number;
}
+ interface FriendlyResultListSelectQueryResultOptionGuidGetDictionaryCategorySelectQueryOption {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ /** 鏁版嵁 */
+ data?: SelectQueryResultOptionGuidGetDictionaryCategorySelectQueryOption[];
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultListSelectQueryResultOptionGuidGetDictionaryDataSelectQueryResultOption {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ /** 鏁版嵁 */
+ data?: SelectQueryResultOptionGuidGetDictionaryDataSelectQueryResultOption[];
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultPagedListQueryResultGetDictionaryCategoriesQueryResultItem {
/** 璺熻釜Id */
traceId?: string;
@@ -507,10 +633,14 @@
sort?: number;
}
+ type GetDictionaryCategorySelectQuery = Record<string, any>;
+
interface GetDictionaryDatasQuery {
pageModel?: PagedListQueryPageModel;
- /** 绫诲埆Id */
+ /** 绫诲埆Id锛圛d/缂栧彿浜岄�変竴锛� */
categoryId?: string;
+ /** 绫诲埆缂栧彿锛圛d/缂栧彿浜岄�変竴锛� */
+ categoryCode?: string;
/** 鍏抽敭瀛� */
keywords?: string;
}
@@ -520,6 +650,11 @@
id?: string;
/** 绫诲埆Id */
categoryId?: string;
+ /** 绫诲埆缂栧彿 */
+ categoryCode?: string;
+ /** 绫诲埆鍚嶇О */
+ categoryName?: string;
+ category?: GetDictionaryDatasQueryResultItemCategory;
/** 涓婄骇Id */
parentId?: string;
/** 缂栧彿 */
@@ -542,6 +677,13 @@
isDisabled?: boolean;
}
+ interface GetDictionaryDatasQueryResultItemCategory {
+ /** 绫诲埆缂栧彿 */
+ code?: string;
+ /** 鍚嶇О */
+ name?: string;
+ }
+
interface GetEnterprisesQuery {
pageModel?: PagedListQueryPageModel;
/** 鍏抽敭瀛� */
@@ -553,16 +695,25 @@
interface GetEnterprisesQueryResultItem {
/** Id */
id?: string;
- /** 浼佷笟鍏ㄧО */
- enterpriseName?: string;
- /** 娉曚汉濮撳悕 */
- legalPerson?: string;
- /** 缁熶竴绀句細淇＄敤浠ｇ爜 */
- societyCreditCode?: string;
/** 鑱旂郴浜� */
contacts?: string;
/** 鑱旂郴鐢佃瘽 */
contactNumber?: string;
+ /** 鎵�鍦ㄧ渷浠絀d */
+ provinceId?: string;
+ province?: DictionaryDataQueryResult;
+ /** 鎵�鍦ㄥ煄甯侷d */
+ cityId?: string;
+ city?: DictionaryDataQueryResult;
+ /** 鎵�灞炶涓欼d */
+ industryTypeId?: string;
+ industryType?: DictionaryDataQueryResult;
+ /** 鏄惁宸叉牎楠岄摱琛岃处鎴� */
+ isCheckedBankCard?: boolean;
+ realAccess?: EnumRealAccess;
+ smsAccess?: EnumSmsAccess;
+ /** 鏄惁宸查厤缃� */
+ isConfigured?: boolean;
}
interface GetMenuQueryResult {
@@ -891,6 +1042,7 @@
}
interface SaveDictionaryCategoryCommand {
+ /** Id */
id?: string;
/** 缂栧彿 */
code: string;
@@ -903,6 +1055,7 @@
}
interface SaveDictionaryDataCommand {
+ /** Id */
id?: string;
/** 绫诲埆Id */
categoryId?: string;
@@ -926,6 +1079,44 @@
sort?: number;
/** 鏄惁绂佺敤 */
isDisabled?: boolean;
+ }
+
+ interface SaveEnterpriseCommand {
+ /** Id */
+ id?: string;
+ enterpriseAuth: SaveEnterpriseCommandAuth;
+ /** 鎵�鍦ㄧ渷浠絀d */
+ provinceId?: string;
+ province?: DictionaryData;
+ /** 鎵�鍦ㄥ煄甯侷d */
+ cityId?: string;
+ city?: DictionaryData;
+ /** 鎵�灞炶涓欼d */
+ industryTypeId?: string;
+ industryType?: DictionaryData;
+ /** 涓昏惀涓氬姟 */
+ mainBusiness?: string;
+ /** 鑱旂郴浜� */
+ contacts?: string;
+ /** 鑱旂郴鐢佃瘽 */
+ contactPhoneNumber?: string;
+ /** 鑱旂郴閭 */
+ contactEmail?: string;
+ /** 璐﹀彿 */
+ userName?: string;
+ /** 瀵嗙爜 */
+ password?: string;
+ }
+
+ interface SaveEnterpriseCommandAuth {
+ /** 浼佷笟鍏ㄧО */
+ enterpriseName: string;
+ /** 缁熶竴绀句細淇＄敤浠ｇ爜 */
+ societyCreditCode: string;
+ /** 娉曚汉濮撳悕 */
+ legalPerson?: string;
+ /** 娉曚汉韬唤璇佸彿 */
+ legalIdentity?: string;
}
interface SaveMenuButtonCommand {
@@ -1069,11 +1260,48 @@
resources?: GetRoleQueryResultResource[];
}
+ interface SelectQueryResultOptionGuidGetDictionaryCategorySelectQueryOption {
+ /** 鍊� */
+ value?: string;
+ /** 鏍囩 */
+ label?: string;
+ /** 鏁版嵁 */
+ data?: any;
+ }
+
+ interface SelectQueryResultOptionGuidGetDictionaryDataSelectQueryResultOption {
+ /** 鍊� */
+ value?: string;
+ /** 鏍囩 */
+ label?: string;
+ /** 鏁版嵁 */
+ data?: any;
+ }
+
interface SetDictionaryDataIsDisabledCommand {
- /** Id */
ids?: string[];
- /** 鏄惁绂佺敤 */
+ /** 鏄惁宸茬鐢� */
isDisabled?: boolean;
+ }
+
+ interface SetEnterpriseElectronSignSettingCommand {
+ /** Id */
+ id?: string;
+ realAccess?: EnumRealAccess;
+ /** 瀹炲悕璐圭敤 */
+ realVerifyCost?: number;
+ /** 绛剧害璐圭敤 */
+ signCost?: number;
+ /** 涓�鍙ｄ环 */
+ mergeSignCost?: number;
+ }
+
+ interface SetEnterpriseSmsSettingCommand {
+ /** Id */
+ id?: string;
+ smsAccess?: EnumSmsAccess;
+ /** 鐭俊璐圭敤 */
+ smsCost?: number;
}
interface SetMenuSwitchCommand {
@@ -1087,9 +1315,8 @@
}
interface SetRoleIsDisabledCommand {
- /** Id */
- ids: string[];
- /** 鏄惁绂佺敤 */
+ ids?: string[];
+ /** 鏄惁宸茬鐢� */
isDisabled?: boolean;
}
--
Gitblit v1.9.1