From 8fad5b05aa4d6d4a46b3bc04f2ab9614be73ba99 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 23 九月 2025 17:19:06 +0800
Subject: [PATCH] fix: bug
---
.eslintrc-auto-import.json | 1
src/services/api/typings.d.ts | 48 ++++++++++++++++
src/views/ServiceChargeManage/components/SettleDetailDialog.vue | 14 +++-
auto-imports.d.ts | 2
src/constants/apiEnum.ts | 2
src/hooks/settlement.ts | 22 +++++++
src/services/api/enterpriseWallet.ts | 20 ++++++
src/services/api/user.ts | 15 +++++
8 files changed, 120 insertions(+), 4 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index e4cdbec..c015401 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -229,6 +229,7 @@
"useCssVars": true,
"useDictionaryDataSelect": true,
"useEnterpriseContractTemplateSelect": true,
+ "useEnterpriseWalletAccessSelect": true,
"useGetDictionaryCategorySelect": true,
"useGlobalEventContext": true,
"useGlobalEventProvide": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index b3f9724..aa83e70 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -217,6 +217,7 @@
const useCssVars: typeof import('vue')['useCssVars']
const useDictionaryDataSelect: typeof import('./src/hooks/dic')['useDictionaryDataSelect']
const useEnterpriseContractTemplateSelect: typeof import('./src/hooks/sign')['useEnterpriseContractTemplateSelect']
+ const useEnterpriseWalletAccessSelect: typeof import('./src/hooks/settlement')['useEnterpriseWalletAccessSelect']
const useGetDictionaryCategorySelect: typeof import('./src/hooks/dic')['useGetDictionaryCategorySelect']
const useGlobalEventContext: typeof import('./src/hooks/useEvent')['useGlobalEventContext']
const useGlobalEventProvide: typeof import('./src/hooks/useEvent')['useGlobalEventProvide']
@@ -496,6 +497,7 @@
readonly useCssVars: UnwrapRef<typeof import('vue')['useCssVars']>
readonly useDictionaryDataSelect: UnwrapRef<typeof import('./src/hooks/dic')['useDictionaryDataSelect']>
readonly useEnterpriseContractTemplateSelect: UnwrapRef<typeof import('./src/hooks/sign')['useEnterpriseContractTemplateSelect']>
+ readonly useEnterpriseWalletAccessSelect: UnwrapRef<typeof import('./src/hooks/settlement')['useEnterpriseWalletAccessSelect']>
readonly useGetDictionaryCategorySelect: UnwrapRef<typeof import('./src/hooks/dic')['useGetDictionaryCategorySelect']>
readonly useGlobalEventContext: UnwrapRef<typeof import('./src/hooks/useEvent')['useGlobalEventContext']>
readonly useGlobalEventProvide: UnwrapRef<typeof import('./src/hooks/useEvent')['useGlobalEventProvide']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index 448f703..3407d01 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -109,6 +109,8 @@
Alipay = 10,
/**骞冲畨閾惰 */
PingAnPay = 20,
+ /**寰俊 */
+ WeChatPay = 30,
}
/** 浼佷笟閽卞寘浠ｈ繘浠跺崟闄勪欢绫诲瀷 */
diff --git a/src/hooks/settlement.ts b/src/hooks/settlement.ts
index afc6f9c..4417b29 100644
--- a/src/hooks/settlement.ts
+++ b/src/hooks/settlement.ts
@@ -1,5 +1,6 @@
import { useQuery, useQueryClient } from '@tanstack/vue-query';
import * as taskServices from '@/services/api/task';
+import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
export function useTaskSelect() {
const queryClient = useQueryClient();
@@ -21,3 +22,24 @@
return { taskSelect };
}
+
+export function useEnterpriseWalletAccessSelect() {
+ const queryClient = useQueryClient();
+
+ const { data } = useQuery({
+ queryKey: ['enterpriseWalletServices/getEnterpriseWalletAccessSelect'],
+ queryFn: () => {
+ return enterpriseWalletServices.getEnterpriseWalletAccessSelect(
+ {},
+ {
+ showLoading: false,
+ }
+ );
+ },
+ placeholderData: () => [] as API.SelectOptionGuidGetEnterpriseWalletAccessSelectQueryOption[],
+ });
+
+ const enterpriseWalletAccessSelect = computed(() => data.value?.map((x) => x.data));
+
+ return { enterpriseWalletAccessSelect };
+}
diff --git a/src/services/api/enterpriseWallet.ts b/src/services/api/enterpriseWallet.ts
index a71c0c5..dc65418 100644
--- a/src/services/api/enterpriseWallet.ts
+++ b/src/services/api/enterpriseWallet.ts
@@ -239,6 +239,26 @@
);
}
+/** 鏌ヨ宸茬绾︿紒涓氶挶鍖呴�氶亾閫夋嫨鍣ㄦ暟鎹� GET /api/user/enterpriseWallet/getEnterpriseWalletAccessSelect */
+export async function getEnterpriseWalletAccessSelect(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetEnterpriseWalletAccessSelectParams,
+ options?: API.RequestConfig
+) {
+ return request<API.SelectOptionGuidGetEnterpriseWalletAccessSelectQueryOption[]>(
+ '/api/user/enterpriseWallet/getEnterpriseWalletAccessSelect',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ request: undefined,
+ ...params['request'],
+ },
+ ...(options || {}),
+ }
+ );
+}
+
/** 鏌ヨ鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠ｈ繘浠跺崟璇︽儏 GET /api/user/enterpriseWallet/getEnterpriseWalletExpandindirectOrder */
export async function getEnterpriseWalletExpandindirectOrder(
// 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 4c9ca23..bf4b442 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -112,6 +112,11 @@
id?: string;
}
+ interface APIgetEnterpriseWalletAccessSelectParams {
+ /** 鏌ヨ宸茬绾︿紒涓氶挶鍖呴�氶亾閫夋嫨鍣ㄦ暟鎹� */
+ request?: GetEnterpriseWalletAccessSelectQuery;
+ }
+
interface APIgetEnterpriseWalletExpandindirectOrderParams {
/** 浼佷笟Id */
enterpriseId?: string;
@@ -412,6 +417,10 @@
ids: string[];
}
+ interface DeletePersonalUserBankCardCommand {
+ access?: EnumUserBankCardAccess;
+ }
+
interface DeleteRoleCommand {
ids: string[];
}
@@ -620,6 +629,8 @@
Alipay = 10,
/**骞冲畨閾惰 */
PingAnPay = 20,
+ /**寰俊 */
+ WeChatPay = 30,
}
enum EnumEnterpriseWalletExpandindirectOrderFileType {
@@ -2374,6 +2385,25 @@
timestamp?: number;
}
+ interface FriendlyResultListSelectOptionGuidGetEnterpriseWalletAccessSelectQueryOption {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ /** 鏁版嵁 */
+ data?: SelectOptionGuidGetEnterpriseWalletAccessSelectQueryOption[];
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultListSelectOptionGuidGetTaskSelectQueryOption {
/** 璺熻釜Id */
traceId?: string;
@@ -3404,6 +3434,14 @@
industryTypeContent?: string;
/** 鏄惁宸查厤缃� */
isConfigured?: boolean;
+ }
+
+ type GetEnterpriseWalletAccessSelectQuery = Record<string, any>;
+
+ interface GetEnterpriseWalletAccessSelectQueryOption {
+ /** Id */
+ id?: string;
+ access?: EnumEnterpriseWalletAccess;
}
interface GetEnterpriseWalletExpandindirectOrderQueryResult {
@@ -4498,6 +4536,8 @@
interface GetSettlementTaskUsersQueryResultItem {
/** 缁撶畻鍚嶅崟Id */
id?: string;
+ /** 鐢ㄦ埛淇℃伅Id */
+ userId?: string;
/** 濮撳悕 */
name?: string;
/** 韬唤璇佸彿 */
@@ -5760,6 +5800,14 @@
data?: GetEnterpriseContractTemplateSelectQueryOption;
}
+ interface SelectOptionGuidGetEnterpriseWalletAccessSelectQueryOption {
+ /** 鍊� */
+ value?: string;
+ /** 鏍囩 */
+ label?: string;
+ data?: GetEnterpriseWalletAccessSelectQueryOption;
+ }
+
interface SelectOptionGuidGetTaskSelectQueryOption {
/** 鍊� */
value?: string;
diff --git a/src/services/api/user.ts b/src/services/api/user.ts
index 5af015b..10561c9 100644
--- a/src/services/api/user.ts
+++ b/src/services/api/user.ts
@@ -2,6 +2,21 @@
// @ts-ignore
import { request } from '@/utils/request';
+/** 鍒犻櫎鐢ㄦ埛閾惰鍗′俊鎭� DELETE /api/user/user/deletePersonalUserBankCard */
+export async function deletePersonalUserBankCard(
+ body: API.DeletePersonalUserBankCardCommand,
+ options?: API.RequestConfig
+) {
+ return request<number>('/api/user/user/deletePersonalUserBankCard', {
+ method: 'DELETE',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 鏌ヨ杩愯惀绔敤鎴峰垎椤靛垪琛ㄦ暟鎹� POST /api/user/user/getOperationUserInfos */
export async function getOperationUserInfos(
body: API.GetOperationUserInfosQuery,
diff --git a/src/views/ServiceChargeManage/components/SettleDetailDialog.vue b/src/views/ServiceChargeManage/components/SettleDetailDialog.vue
index 270f65c..11a012b 100644
--- a/src/views/ServiceChargeManage/components/SettleDetailDialog.vue
+++ b/src/views/ServiceChargeManage/components/SettleDetailDialog.vue
@@ -26,10 +26,7 @@
prop="settlementAccess"
:check-rules="[{ message: '璇烽�夋嫨缁撶畻鏂瑰紡' }]"
>
- <ProFormSelect
- v-model="form.settlementAccess"
- :valueEnum="EnumEnterpriseWalletAccessTextForSettle"
- >
+ <ProFormSelect v-model="form.settlementAccess" :valueEnum="settlementAccessList">
</ProFormSelect>
</ProFormItemV2>
</ProForm>
@@ -68,6 +65,15 @@
settlementAccess: EnumEnterpriseWalletAccess;
};
+const { enterpriseWalletAccessSelect } = useEnterpriseWalletAccessSelect();
+
+const settlementAccessList = computed(() => {
+ return enterpriseWalletAccessSelect.value.map((x) => ({
+ label: EnumEnterpriseWalletAccessTextForSettle[x.access],
+ value: x.access,
+ }));
+});
+
const visible = defineModel({ type: Boolean });
const form = defineModel<Form>('form');
--
Gitblit v1.9.1