From 732ddea9dbac6192a081fe407d21e8075ea0d32e Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期三, 06 八月 2025 18:26:29 +0800 Subject: [PATCH] feat: 更新框架 --- src/services/api/index.ts | 8 src/store/modules/permission.ts | 11 src/services/api/typings.d.ts | 290 +++++++++++++++++++++++++++++++- src/hooks/useAccess.ts | 4 src/services/api/dictionary.ts | 50 ++++ src/constants/apiEnum.ts | 14 + src/services/api/auth.ts | 15 + src/services/api/enterprise.ts | 93 ++++++++++ types/api.d.ts | 35 --- 9 files changed, 457 insertions(+), 63 deletions(-) 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 { /**姝e父 */ diff --git a/src/hooks/useAccess.ts b/src/hooks/useAccess.ts index 0c61411..fb68fca 100644 --- a/src/hooks/useAccess.ts +++ b/src/hooks/useAccess.ts @@ -8,7 +8,7 @@ } from '@bole-core/components'; import type { Ref, ComputedRef } from 'vue'; import { myClient } from '@/constants/query'; -import * as menuServices from '@/services/api/menu'; +import * as authServices from '@/services/api/auth'; type UseAccessOptions = { operationBtnMap?: Record<string, OperationBtnType>; @@ -33,7 +33,7 @@ return useBoleAccess({ queryKey: ['baseModuleServices/getCurrentSubModuleList', { moduleId }], service: async () => { - const res = await menuServices.getMenu( + const res = await authServices.getCurrentLogierMenu( { id: moduleId }, { showLoading: false, 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/dictionary.ts b/src/services/api/dictionary.ts index 26f00b9..22cee24 100644 --- a/src/services/api/dictionary.ts +++ b/src/services/api/dictionary.ts @@ -2,7 +2,7 @@ // @ts-ignore import { request } from '@/utils/request'; -/** 鍒犻櫎瀛楀吀绫诲埆 DELETE /api/main/dictionary/deleteDictionaryCategory */ +/** 鍒犻櫎鏁版嵁瀛楀吀绫诲埆 DELETE /api/main/dictionary/deleteDictionaryCategory */ export async function deleteDictionaryCategory( body: API.DeleteDictionaryCategoryCommand, options?: API.RequestConfig @@ -17,7 +17,7 @@ }); } -/** 鏌ヨ瀛楀吀绫诲埆鍒嗛〉鍒楄〃鏁版嵁 POST /api/main/dictionary/getDictionaryCategories */ +/** 鑾峰彇鏁版嵁瀛楀吀绫诲埆鍒嗛〉鍒楄〃鏁版嵁 POST /api/main/dictionary/getDictionaryCategories */ export async function getDictionaryCategories( body: API.GetDictionaryCategoriesQuery, options?: API.RequestConfig @@ -35,7 +35,27 @@ ); } -/** 鑾峰彇瀛楀吀鏁版嵁鍒嗛〉鍒楄〃 POST /api/main/dictionary/getDictionaryDatas */ +/** 鏌ヨ鏁版嵁瀛楀吀绫诲埆閫夋嫨鍣ㄦ暟鎹� GET /api/main/dictionary/getDictionaryCategorySelect */ +export async function getDictionaryCategorySelect( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetDictionaryCategorySelectParams, + options?: API.RequestConfig +) { + return request<API.SelectQueryResultOptionGuidGetDictionaryCategorySelectQueryOption[]>( + '/api/main/dictionary/getDictionaryCategorySelect', + { + method: 'GET', + params: { + ...params, + request: undefined, + ...params['request'], + }, + ...(options || {}), + } + ); +} + +/** 鑾峰彇鏁版嵁瀛楀吀鍒嗛〉鍒楄〃鏁版嵁 POST /api/main/dictionary/getDictionaryDatas */ export async function getDictionaryDatas( body: API.GetDictionaryDatasQuery, options?: API.RequestConfig @@ -53,7 +73,25 @@ ); } -/** 淇濆瓨瀛楀吀绫诲埆 POST /api/main/dictionary/saveDictionaryCategory */ +/** 鏌ヨ鏁版嵁瀛楀吀閫夋嫨鍣� GET /api/main/dictionary/getDictionaryDataSelect */ +export async function getDictionaryDataSelect( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetDictionaryDataSelectParams, + options?: API.RequestConfig +) { + return request<API.SelectQueryResultOptionGuidGetDictionaryDataSelectQueryResultOption[]>( + '/api/main/dictionary/getDictionaryDataSelect', + { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + } + ); +} + +/** 淇濆瓨鏁版嵁瀛楀吀绫诲埆 POST /api/main/dictionary/saveDictionaryCategory */ export async function saveDictionaryCategory( body: API.SaveDictionaryCategoryCommand, options?: API.RequestConfig @@ -68,7 +106,7 @@ }); } -/** 淇濆瓨瀛楀吀鏁版嵁 POST /api/main/dictionary/saveDictionaryData */ +/** 淇濆瓨鏁版嵁瀛楀吀 POST /api/main/dictionary/saveDictionaryData */ export async function saveDictionaryData( body: API.SaveDictionaryDataCommand, options?: API.RequestConfig @@ -83,7 +121,7 @@ }); } -/** 璁剧疆瀛楀吀鏁版嵁鏄惁绂佺敤 PUT /api/main/dictionary/setDictionaryDataIsDisabled */ +/** 璁剧疆鏁版嵁瀛楀吀鏄惁绂佺敤 PUT /api/main/dictionary/setDictionaryDataIsDisabled */ export async function setDictionaryDataIsDisabled( body: API.SetDictionaryDataIsDisabledCommand, options?: API.RequestConfig diff --git a/src/services/api/enterprise.ts b/src/services/api/enterprise.ts index 820738d..084e76e 100644 --- a/src/services/api/enterprise.ts +++ b/src/services/api/enterprise.ts @@ -2,6 +2,39 @@ // @ts-ignore import { request } from '@/utils/request'; +/** 鏌ヨ浼佷笟璇︽儏 GET /api/user/enterprise/getEnterprise */ +export async function getEnterprise( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetEnterpriseParams, + options?: API.RequestConfig +) { + return request<API.GetEnterpriseQueryResult>('/api/user/enterprise/getEnterprise', { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + }); +} + +/** 鏌ヨ浼佷笟鐢靛瓙绛鹃厤缃� GET /api/user/enterprise/getEnterpriseElectronSignSetting */ +export async function getEnterpriseElectronSignSetting( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetEnterpriseElectronSignSettingParams, + options?: API.RequestConfig +) { + return request<API.GetEnterpriseElectronSignSettingQueryResult>( + '/api/user/enterprise/getEnterpriseElectronSignSetting', + { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + } + ); +} + /** 鏌ヨ浼佷笟淇℃伅鍒嗛〉鍒楄〃鏁版嵁 POST /api/user/enterprise/getEnterprises */ export async function getEnterprises(body: API.GetEnterprisesQuery, options?: API.RequestConfig) { return request<API.PagedListQueryResultGetEnterprisesQueryResultItem>( @@ -16,3 +49,63 @@ } ); } + +/** 鏌ヨ浼佷笟鐭俊閰嶇疆 GET /api/user/enterprise/getEnterpriseSmsSetting */ +export async function getEnterpriseSmsSetting( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetEnterpriseSmsSettingParams, + options?: API.RequestConfig +) { + return request<API.GetEnterpriseSmsSettingQueryResult>( + '/api/user/enterprise/getEnterpriseSmsSetting', + { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + } + ); +} + +/** 淇濆瓨浼佷笟 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 7edc9e1..1f801d3 100644 --- a/src/services/api/index.ts +++ b/src/services/api/index.ts @@ -2,19 +2,19 @@ /* eslint-disable */ // API 鏇存柊鏃堕棿锛� // API 鍞竴鏍囪瘑锛� -import * as dictionary from './dictionary'; 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 { - dictionary, 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 52f8a9d..fb57219 100644 --- a/src/services/api/typings.d.ts +++ b/src/services/api/typings.d.ts @@ -8,9 +8,43 @@ request?: GetAliyunOSSAcsQuery; } + interface APIgetCurrentLogierMenuParams { + /** Id */ + id?: string; + } + interface APIgetCurrentLogierMenusParams { /** 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鑿滃崟 */ request?: GetCurrentLogierMenusQuery; + } + + interface APIgetDictionaryCategorySelectParams { + /** 鏌ヨ鏁版嵁瀛楀吀绫诲埆閫夋嫨鍣ㄦ暟鎹� */ + request?: GetDictionaryCategorySelectQuery; + } + + interface APIgetDictionaryDataSelectParams { + /** 绫诲埆Id锛圛d/缂栧彿浜岄�変竴锛� */ + categoryId?: string; + /** 绫诲埆缂栧彿锛圛d/缂栧彿浜岄�変竴锛� */ + categoryCode?: string; + /** 涓婄骇Id */ + parentId?: string; + } + + interface APIgetEnterpriseElectronSignSettingParams { + /** Id */ + id?: string; + } + + interface APIgetEnterpriseParams { + /** Id */ + id?: string; + } + + interface APIgetEnterpriseSmsSettingParams { + /** Id */ + id?: string; } interface APIgetMenuParams { @@ -108,6 +142,13 @@ Desc = 1, } + enum EnumRealAccess { + /**涓婁笂绛� */ + BestSign = 10, + /**鏀粯瀹濅俊浠荤 */ + AlipaySign = 20, + } + enum EnumResourceController { /**鏁版嵁瀛楀吀 */ Dictionary = 0, @@ -151,6 +192,11 @@ All = 999, } + enum EnumSmsAccess { + /**闃块噷浜戠煭淇� */ + AliyunSms = 10, + } + enum EnumUserInfoStatus { /**姝e父 */ Normal = 10, @@ -175,6 +221,60 @@ /** 閿欒鐮� */ errorCode?: string; data?: GetAliyunOSSAcsQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetEnterpriseElectronSignSettingQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetEnterpriseElectronSignSettingQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetEnterpriseQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetEnterpriseQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetEnterpriseSmsSettingQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetEnterpriseSmsSettingQueryResult; /** 鎵ц鎴愬姛 */ success?: boolean; /** 閿欒淇℃伅 */ @@ -354,6 +454,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; @@ -493,10 +631,14 @@ sort?: number; } + type GetDictionaryCategorySelectQuery = Record<string, any>; + interface GetDictionaryDatasQuery { pageModel?: PagedListQueryPageModel; - /** 绫诲埆Id */ + /** 绫诲埆Id锛圛d/缂栧彿浜岄�変竴锛� */ categoryId?: string; + /** 绫诲埆缂栧彿锛圛d/缂栧彿浜岄�変竴锛� */ + categoryCode?: string; /** 鍏抽敭瀛� */ keywords?: string; } @@ -506,6 +648,10 @@ id?: string; /** 绫诲埆Id */ categoryId?: string; + /** 绫诲埆缂栧彿 */ + categoryCode?: string; + /** 绫诲埆鍚嶇О */ + categoryName?: string; /** 涓婄骇Id */ parentId?: string; /** 缂栧彿 */ @@ -528,6 +674,55 @@ isDisabled?: boolean; } + interface GetEnterpriseElectronSignSettingQueryResult { + /** Id */ + id?: string; + realAccess?: EnumRealAccess; + /** 瀹炲悕璐圭敤 */ + realVerifyCost?: number; + /** 绛剧害璐圭敤 */ + signCost?: number; + /** 涓�鍙d环 */ + mergeSignCost?: number; + } + + interface GetEnterpriseQueryResult { + /** Id */ + id?: string; + /** 浼佷笟鍏ㄧО */ + enterpriseName?: string; + /** 缁熶竴绀句細淇$敤浠g爜 */ + societyCreditCode?: string; + /** 娉曚汉濮撳悕 */ + legalPerson?: string; + /** 娉曚汉韬唤璇佸彿 */ + legalIdentity?: string; + /** 鎵�鍦ㄧ渷浠� */ + provinceContent?: string; + /** 鎵�鍦ㄥ煄甯� */ + cityContent?: string; + /** 鎵�灞炶涓� */ + industryTypeContent?: string; + /** 涓昏惀涓氬姟 */ + mainBusiness?: string; + /** 鑱旂郴浜� */ + contacts?: string; + /** 鑱旂郴鐢佃瘽 */ + contactPhoneNumber?: string; + /** 鑱旂郴閭 */ + contactEmail?: string; + /** 璐﹀彿 */ + userName?: string; + } + + interface GetEnterpriseSmsSettingQueryResult { + /** Id */ + id?: string; + smsAccess?: EnumSmsAccess; + /** 鐭俊璐圭敤 */ + smsCost?: number; + } + interface GetEnterprisesQuery { pageModel?: PagedListQueryPageModel; /** 鍏抽敭瀛� */ @@ -545,10 +740,20 @@ legalPerson?: string; /** 缁熶竴绀句細淇$敤浠g爜 */ societyCreditCode?: string; + /** 鏄惁瀹炲悕 */ + isReal?: boolean; /** 鑱旂郴浜� */ contacts?: string; /** 鑱旂郴鐢佃瘽 */ - contactNumber?: string; + contactPhoneNumber?: string; + /** 鎵�鍦ㄧ渷浠� */ + provinceContent?: string; + /** 鎵�鍦ㄥ煄甯� */ + cityContent?: string; + /** 鎵�灞炶涓� */ + industryTypeContent?: string; + /** 鏄惁宸查厤缃� */ + isConfigured?: boolean; } interface GetMenuQueryResult { @@ -690,8 +895,6 @@ } interface GetOperationUserInfosQueryResultItemRole { - /** 鐢ㄦ埛Id */ - userInfoId?: string; /** 瑙掕壊Id */ id?: string; /** 鍚嶇О */ @@ -877,6 +1080,7 @@ } interface SaveDictionaryCategoryCommand { + /** Id */ id?: string; /** 缂栧彿 */ code: string; @@ -889,6 +1093,7 @@ } interface SaveDictionaryDataCommand { + /** Id */ id?: string; /** 绫诲埆Id */ categoryId?: string; @@ -912,6 +1117,37 @@ sort?: number; /** 鏄惁绂佺敤 */ isDisabled?: boolean; + } + + interface SaveEnterpriseCommand { + /** Id */ + id?: string; + /** 浼佷笟鍏ㄧО */ + enterpriseName: string; + /** 缁熶竴绀句細淇$敤浠g爜 */ + societyCreditCode: string; + /** 娉曚汉濮撳悕 */ + legalPerson?: string; + /** 娉曚汉韬唤璇佸彿 */ + legalIdentity?: string; + /** 鎵�鍦ㄧ渷浠絀d */ + provinceId?: string; + /** 鎵�鍦ㄥ煄甯侷d */ + cityId?: string; + /** 鎵�灞炶涓欼d */ + industryTypeId?: string; + /** 涓昏惀涓氬姟 */ + mainBusiness?: string; + /** 鑱旂郴浜� */ + contacts?: string; + /** 鑱旂郴鐢佃瘽 */ + contactPhoneNumber?: string; + /** 鑱旂郴閭 */ + contactEmail?: string; + /** 璐﹀彿 */ + userName?: string; + /** 瀵嗙爜 */ + password?: string; } interface SaveMenuButtonCommand { @@ -1055,11 +1291,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; + /** 涓�鍙d环 */ + mergeSignCost?: number; + } + + interface SetEnterpriseSmsSettingCommand { + /** Id */ + id?: string; + smsAccess?: EnumSmsAccess; + /** 鐭俊璐圭敤 */ + smsCost?: number; } interface SetMenuSwitchCommand { @@ -1073,9 +1346,8 @@ } interface SetRoleIsDisabledCommand { - /** Id */ - ids: string[]; - /** 鏄惁绂佺敤 */ + ids?: string[]; + /** 鏄惁宸茬鐢� */ isDisabled?: boolean; } diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts index 734facd..1901534 100644 --- a/src/store/modules/permission.ts +++ b/src/store/modules/permission.ts @@ -3,7 +3,7 @@ // import { RouteConfigs } from "@/layout/types"; import { constantRoutes, Route } from '@/router'; import { addAsyncRoutes, ascending } from '@/router/utils'; -import * as menuServices from '@/services/api/menu'; +import * as authServices from '@/services/api/auth'; import { myClient } from '@/constants/query'; export interface PermissonState { @@ -28,14 +28,11 @@ getModuleList() { return new Promise<Route[]>(async (resolve, reject) => { try { - const params: API.APIgetMenusParams = { - userType: AppLocalConfig.userType, - clientType: AppLocalConfig.clientType, - }; + const params: API.APIgetCurrentLogierMenusParams = {}; const res = await myClient.fetchQuery({ - queryKey: ['menuServices/getMenus', params], + queryKey: ['authServices/getCurrentLogierMenus', params], queryFn: () => { - return menuServices.getMenus(params, { + return authServices.getCurrentLogierMenus(params, { showLoading: false, }); }, diff --git a/types/api.d.ts b/types/api.d.ts index a095b00..5c800b8 100644 --- a/types/api.d.ts +++ b/types/api.d.ts @@ -13,39 +13,4 @@ mock?: boolean; customErrorHandler?: (error: any) => boolean; } - - interface ModuleButtonDto { - isEdit?: boolean; - } - - interface ModuleColumnDto { - isEdit?: boolean; - fixed?: boolean | 'left' | 'right'; - needTips?: boolean; - } - - interface CustomModuleColumnDto extends ModuleColumnDto { - id: string; - enCode: string; - name: string; - } - - interface DepartmentTree { - leaf?: boolean; - } - interface StationTree { - leaf?: boolean; - } - - interface RoleList { - //鏄惁鏄鎴风 - isClient?: boolean; - } - - interface AreaTreeNode extends AreaDto { - children?: AreaTreeNode[]; - } - interface GetSearchSettingList { - children?: GetSearchSettingList[]; - } } -- Gitblit v1.9.1