From 2a8c9a116fc114e37ce743288ff3422571c529b5 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期日, 19 十月 2025 17:25:13 +0800
Subject: [PATCH] feat: 1.2.0.1
---
src/views/TaskManage/components/TaskDetailView.vue | 14 ++++
.eslintrc-auto-import.json | 2
src/services/api/typings.d.ts | 64 +++++++++++++++++++-
auto-imports.d.ts | 6 +
src/constants/apiEnum.ts | 10 +++
src/constants/enterpriseWallet.ts | 6 ++
src/services/api/enterpriseWallet.ts | 27 +++++----
7 files changed, 111 insertions(+), 18 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index d8fbbaa..8d4b6fe 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -47,6 +47,7 @@
"EnumEnterpriseRealMethod": true,
"EnumEnterpriseWalletAccess": true,
"EnumEnterpriseWalletAccessText": true,
+ "EnumEnterpriseWalletAccessTextForSettle": true,
"EnumEnterpriseWalletExpandindirectOrderFileType": true,
"EnumEnterpriseWalletExpandindirectOrderScene": true,
"EnumEnterpriseWalletExpandindirectOrderSceneText": true,
@@ -165,6 +166,7 @@
"GenderText": true,
"GetPersonalApplyTaskInfosQueryStatus": true,
"GetPersonalHireTaskInfosQueryStatus": true,
+ "GetSettlementTasksQueryPaymentStatus": true,
"GetTaskInfoQueryResultApplyButton": true,
"GetTaskInfoQueryResultHireButton": true,
"GlobalEvent": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index c111719..b059429 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -49,6 +49,7 @@
const EnumEnterpriseRealMethod: typeof import('./src/constants/apiEnum')['EnumEnterpriseRealMethod']
const EnumEnterpriseWalletAccess: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletAccess']
const EnumEnterpriseWalletAccessText: typeof import('./src/constants/enterpriseWallet')['EnumEnterpriseWalletAccessText']
+ const EnumEnterpriseWalletAccessTextForSettle: typeof import('./src/constants/enterpriseWallet')['EnumEnterpriseWalletAccessTextForSettle']
const EnumEnterpriseWalletExpandindirectOrderFileType: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderFileType']
const EnumEnterpriseWalletExpandindirectOrderScene: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderScene']
const EnumEnterpriseWalletExpandindirectOrderSceneText: typeof import('./src/constants/enterpriseWallet')['EnumEnterpriseWalletExpandindirectOrderSceneText']
@@ -166,6 +167,7 @@
const GenderText: typeof import('./src/constants/enum')['GenderText']
const GetPersonalApplyTaskInfosQueryStatus: typeof import('./src/constants/apiEnum')['GetPersonalApplyTaskInfosQueryStatus']
const GetPersonalHireTaskInfosQueryStatus: typeof import('./src/constants/apiEnum')['GetPersonalHireTaskInfosQueryStatus']
+ const GetSettlementTasksQueryPaymentStatus: typeof import('./src/constants/apiEnum')['GetSettlementTasksQueryPaymentStatus']
const GetTaskInfoQueryResultApplyButton: typeof import('./src/constants/apiEnum')['GetTaskInfoQueryResultApplyButton']
const GetTaskInfoQueryResultHireButton: typeof import('./src/constants/apiEnum')['GetTaskInfoQueryResultHireButton']
const IdentityCodeEnum: typeof import('./src/constants/dic')['IdentityCodeEnum']
@@ -313,7 +315,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 { EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumConsoleLogAccess, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, EnumTaskCheckReceiveMethod, EnumTaskCheckReceiveStatus, EnumTaskPaymentMethod, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementAuditStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckHistoryType, EnumTaskUserSubmitCheckReceiveStatus, EnumUserBankCardAccess, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, EnumWeChatPayApplymentBankAccountType, EnumWeChatPayApplymentCertType, EnumWeChatPayApplymentContactType, EnumWeChatPayApplymentFinanceType, EnumWeChatPayApplymentIdDocType, EnumWeChatPayApplymentIdHolderType, EnumWeChatPayApplymentSalesScenesType, EnumWeChatPayApplymentState, EnumWeChatPayApplymentSubjectType, EnumWeChatPaySettlementModifyVerifyResult, EnumWeChatPaySettlementVerifyResult, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumConsoleLogAccess, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, EnumTaskCheckReceiveMethod, EnumTaskCheckReceiveStatus, EnumTaskPaymentMethod, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementAuditStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckHistoryType, EnumTaskUserSubmitCheckReceiveStatus, EnumUserBankCardAccess, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, EnumWeChatPayApplymentBankAccountType, EnumWeChatPayApplymentCertType, EnumWeChatPayApplymentContactType, EnumWeChatPayApplymentFinanceType, EnumWeChatPayApplymentIdDocType, EnumWeChatPayApplymentIdHolderType, EnumWeChatPayApplymentSalesScenesType, EnumWeChatPayApplymentState, EnumWeChatPayApplymentSubjectType, EnumWeChatPaySettlementModifyVerifyResult, EnumWeChatPaySettlementVerifyResult, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus } from './src/constants/apiEnum'
+ export type { EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumConsoleLogAccess, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, EnumTaskCheckReceiveMethod, EnumTaskCheckReceiveStatus, EnumTaskPaymentMethod, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementAuditStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckHistoryType, EnumTaskUserSubmitCheckReceiveStatus, EnumUserBankCardAccess, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, EnumWeChatPayApplymentBankAccountType, EnumWeChatPayApplymentCertType, EnumWeChatPayApplymentContactType, EnumWeChatPayApplymentFinanceType, EnumWeChatPayApplymentIdDocType, EnumWeChatPayApplymentIdHolderType, EnumWeChatPayApplymentSalesScenesType, EnumWeChatPayApplymentState, EnumWeChatPayApplymentSubjectType, EnumWeChatPaySettlementModifyVerifyResult, EnumWeChatPaySettlementVerifyResult, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetSettlementTasksQueryPaymentStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumConsoleLogAccess, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumLogLevel, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsStatus, EnumTaskCheckReceiveMethod, EnumTaskCheckReceiveStatus, EnumTaskPaymentMethod, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementAuditStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckHistoryType, EnumTaskUserSubmitCheckReceiveStatus, EnumUserBankCardAccess, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, EnumWeChatPayApplymentBankAccountType, EnumWeChatPayApplymentCertType, EnumWeChatPayApplymentContactType, EnumWeChatPayApplymentFinanceType, EnumWeChatPayApplymentIdDocType, EnumWeChatPayApplymentIdHolderType, EnumWeChatPayApplymentSalesScenesType, EnumWeChatPayApplymentState, EnumWeChatPayApplymentSubjectType, EnumWeChatPaySettlementModifyVerifyResult, EnumWeChatPaySettlementVerifyResult, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetSettlementTasksQueryPaymentStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus } from './src/constants/apiEnum'
import('./src/constants/apiEnum')
// @ts-ignore
export type { FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum, FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum } from './src/constants/cPerson'
@@ -401,6 +403,7 @@
readonly EnumEnterpriseRealMethod: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseRealMethod']>
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']>
readonly EnumEnterpriseWalletExpandindirectOrderFileType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderFileType']>
readonly EnumEnterpriseWalletExpandindirectOrderScene: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderScene']>
readonly EnumEnterpriseWalletExpandindirectOrderSceneText: UnwrapRef<typeof import('./src/constants/enterpriseWallet')['EnumEnterpriseWalletExpandindirectOrderSceneText']>
@@ -515,6 +518,7 @@
readonly GenderText: UnwrapRef<typeof import('./src/constants/enum')['GenderText']>
readonly GetPersonalApplyTaskInfosQueryStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['GetPersonalApplyTaskInfosQueryStatus']>
readonly GetPersonalHireTaskInfosQueryStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['GetPersonalHireTaskInfosQueryStatus']>
+ readonly GetSettlementTasksQueryPaymentStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['GetSettlementTasksQueryPaymentStatus']>
readonly GetTaskInfoQueryResultApplyButton: UnwrapRef<typeof import('./src/constants/apiEnum')['GetTaskInfoQueryResultApplyButton']>
readonly GetTaskInfoQueryResultHireButton: UnwrapRef<typeof import('./src/constants/apiEnum')['GetTaskInfoQueryResultHireButton']>
readonly IdentityCodeEnum: UnwrapRef<typeof import('./src/constants/dic')['IdentityCodeEnum']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index 3d11edb..1c1c992 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -819,6 +819,16 @@
Completed = 20,
}
+/** 鍙戣柂鐘舵�� */
+export enum GetSettlementTasksQueryPaymentStatus {
+ /**寰呭鏍� */
+ WaitAudit = 10,
+ /**宸插鏍� */
+ CompletedAudit = 20,
+ /**宸插彂鏀� */
+ CompletedRelease = 30,
+}
+
/** 鎴戠殑鎶ュ悕鍒楄〃-璇︽儏-鎸夐挳绫诲瀷 */
export enum GetTaskInfoQueryResultApplyButton {
/**寰呯‘璁� */
diff --git a/src/constants/enterpriseWallet.ts b/src/constants/enterpriseWallet.ts
index c21eef1..c0917ac 100644
--- a/src/constants/enterpriseWallet.ts
+++ b/src/constants/enterpriseWallet.ts
@@ -109,3 +109,9 @@
[EnumEnterpriseWalletAccess.PingAnPay]: '閾惰',
[EnumEnterpriseWalletAccess.WeChatPay]: '寰俊',
};
+
+export const EnumEnterpriseWalletAccessTextForSettle = {
+ [EnumEnterpriseWalletAccess.Alipay]: '浼佷笟鏀粯瀹濈粨绠�',
+ [EnumEnterpriseWalletAccess.PingAnPay]: '骞冲畨閾惰缁撶畻',
+ [EnumEnterpriseWalletAccess.WeChatPay]: '寰俊缁撶畻',
+};
diff --git a/src/services/api/enterpriseWallet.ts b/src/services/api/enterpriseWallet.ts
index 3ad6a31..b146c99 100644
--- a/src/services/api/enterpriseWallet.ts
+++ b/src/services/api/enterpriseWallet.ts
@@ -195,6 +195,21 @@
});
}
+/** 瀵煎嚭浼佷笟浣欓璇︽儏 POST /api/user/enterpriseWallet/exportEnterpriseBalanceDetails */
+export async function exportEnterpriseBalanceDetails(
+ body: API.ExportEnterpriseBalanceDetailsCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/user/enterpriseWallet/exportEnterpriseBalanceDetails', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 鏀粯瀹濋�氱煡鍥炰紶 GET /api/user/enterpriseWallet/getAlipayNotify */
export async function getAlipayNotify(
body: API.GetAlipayNotifyCommand,
@@ -493,18 +508,6 @@
...(options || {}),
}
);
-}
-
-/** 娴嬭瘯寰俊鏀粯 POST /api/user/enterpriseWallet/testWeChatPay */
-export async function testWeChatPay(body: API.TestWeChatPayCommand, options?: API.RequestConfig) {
- return request<boolean>('/api/user/enterpriseWallet/testWeChatPay', {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json-patch+json',
- },
- data: body,
- ...(options || {}),
- });
}
/** 淇敼浼佷笟寰俊鏀粯閽卞寘缁撶畻璐︽埛 POST /api/user/enterpriseWallet/updateEnterpriseWeChatPayWalletBankAccountInfo */
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index f63e3b7..b417c8a 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -241,8 +241,10 @@
interface APIgetSettlementTaskUsersParams {
/** 缁撶畻璁㈠崟Id */
id?: string;
- /** 缁撶畻閫氶亾 */
- settlementAccess?: EnumEnterpriseWalletAccess;
+ /** 鏄惁瀵煎叆鐢ㄦ埛 */
+ isImport?: boolean;
+ /** 鎿嶄綔浠ょ墝 */
+ operatorToken?: string;
}
interface APIgetTaskEnterpriseParams {
@@ -1333,6 +1335,15 @@
VERIFY_FAIL = 1,
/**楠岃瘉涓紝鍟嗘埛鍙彂璧锋彁鐜板皾璇� */
VERIFYING = 2,
+ }
+
+ interface ExportEnterpriseBalanceDetailsCommand {
+ /** 浼佷笟閽卞寘Id */
+ enterpriseWalletId?: string;
+ /** 鍒涘缓鏃堕棿-璧峰 */
+ createdTimeStart?: string;
+ /** 鍒涘缓鏃堕棿-鎴 */
+ createdTimeEnd?: string;
}
interface ExportTaskCheckReceiveTaskUsersCommand {
@@ -3494,6 +3505,7 @@
applyEndTime?: string;
checkReceiveMethod?: EnumTaskCheckReceiveMethod;
paymentMethod?: EnumTaskPaymentMethod;
+ settlementAccess?: EnumEnterpriseWalletAccess;
/** 浠诲姟鎻忚堪 */
description?: string;
/** 浠诲姟鍦扮偣鍚嶇О */
@@ -3546,6 +3558,7 @@
applyEndTime?: string;
checkReceiveMethod?: EnumTaskCheckReceiveMethod;
paymentMethod?: EnumTaskPaymentMethod;
+ settlementAccess?: EnumEnterpriseWalletAccess;
/** 浠诲姟鎻忚堪 */
description?: string;
/** 浠诲姟鍦扮偣鍚嶇О */
@@ -4922,6 +4935,7 @@
applyEndTime?: string;
checkReceiveMethod?: EnumTaskCheckReceiveMethod;
paymentMethod?: EnumTaskPaymentMethod;
+ settlementAccess?: EnumEnterpriseWalletAccess;
/** 浠诲姟鎻忚堪 */
description?: string;
billingMethod?: EnumBillingMethod;
@@ -4971,6 +4985,7 @@
applyEndTime?: string;
checkReceiveMethod?: EnumTaskCheckReceiveMethod;
paymentMethod?: EnumTaskPaymentMethod;
+ settlementAccess?: EnumEnterpriseWalletAccess;
/** 浠诲姟鎻忚堪 */
description?: string;
billingMethod?: EnumBillingMethod;
@@ -5013,6 +5028,7 @@
applyEndTime?: string;
checkReceiveMethod?: EnumTaskCheckReceiveMethod;
paymentMethod?: EnumTaskPaymentMethod;
+ settlementAccess?: EnumEnterpriseWalletAccess;
/** 浠诲姟鎻忚堪 */
description?: string;
billingMethod?: EnumBillingMethod;
@@ -5619,6 +5635,7 @@
interface GetSettlementTasksQuery {
/** 鍏抽敭瀛� */
keywords?: string;
+ paymentStatus?: GetSettlementTasksQueryPaymentStatus;
settlementOrderStatus?: EnumTaskSettlementOrderStatus;
settlementStatus?: EnumTaskSettlementStatus;
checkReceiveStatus?: EnumTaskCheckReceiveStatus;
@@ -5629,7 +5646,17 @@
pageModel?: PagedListQueryPageModel;
}
+ enum GetSettlementTasksQueryPaymentStatus {
+ /**寰呭鏍� */
+ WaitAudit = 10,
+ /**宸插鏍� */
+ CompletedAudit = 20,
+ /**宸插彂鏀� */
+ CompletedRelease = 30,
+ }
+
interface GetSettlementTasksQueryResult {
+ objectData?: GetSettlementTasksQueryResultObjectData;
pageModel?: PagedListQueryResultPageModel;
/** 鏁版嵁 */
data?: GetSettlementTasksQueryResultItem[];
@@ -5661,6 +5688,16 @@
settlementRemark?: string;
/** 缁撶畻浜烘暟 */
settlementUserCount?: number;
+ auditStatus?: EnumTaskSettlementAuditStatus;
+ }
+
+ interface GetSettlementTasksQueryResultObjectData {
+ /** 寰呭鏍� */
+ waitAuditCount?: number;
+ /** 宸插鏍� */
+ completedAuditCount?: number;
+ /** 宸插彂鏀� */
+ completedReleaseCount?: number;
}
interface GetSettlementTaskUsersQueryResult {
@@ -5687,6 +5724,7 @@
verifyWorkHours?: number;
/** 瓒呮椂鏈嶅姟璐� */
timeoutServiceFee?: number;
+ settlementAccess?: EnumEnterpriseWalletAccess;
settlementOrderStatus?: EnumTaskSettlementOrderStatus;
/** 缁撶畻鍗曞悕绉� */
settlementOrderName?: string;
@@ -5699,6 +5737,13 @@
settlementStatus?: EnumTaskSettlementStatus;
/** 缁撶畻鏃堕棿 */
settlementTime?: string;
+ auditStatus?: EnumTaskSettlementAuditStatus;
+ /** 瀹℃牳澶囨敞 */
+ auditRemark?: string;
+ /** 瀹℃牳鏃堕棿 */
+ auditTime?: string;
+ /** 瀹℃牳鎿嶄綔浜� */
+ auditOperator?: string;
/** 澶囨敞 */
settlementRemark?: string;
}
@@ -5710,12 +5755,20 @@
taskInfoUserId?: string;
/** 鐢ㄦ埛淇℃伅Id */
userId?: string;
+ /** 澶村儚 */
+ avatar?: string;
/** 濮撳悕 */
name?: string;
/** 韬唤璇佸彿 */
identity?: string;
/** 鎵嬫満鍙� */
contactPhoneNumber?: string;
+ gender?: EnumUserGender;
+ /** 骞撮緞 */
+ age?: number;
+ /** 鏄惁瀹炲悕 */
+ isReal?: boolean;
+ realMethod?: EnumUserRealMethod;
/** 绱宸ユ椂 */
totalWorkHours?: number;
/** 鎵�灞為摱琛� */
@@ -5910,6 +5963,7 @@
applyEndTime?: string;
checkReceiveMethod?: EnumTaskCheckReceiveMethod;
paymentMethod?: EnumTaskPaymentMethod;
+ settlementAccess?: EnumEnterpriseWalletAccess;
/** 浠诲姟鎻忚堪 */
description?: string;
/** 鍒涘缓鏃堕棿 */
@@ -6043,6 +6097,7 @@
applyEndTime?: string;
checkReceiveMethod?: EnumTaskCheckReceiveMethod;
paymentMethod?: EnumTaskPaymentMethod;
+ settlementAccess?: EnumEnterpriseWalletAccess;
/** 浠诲姟鎻忚堪 */
description?: string;
releaseStatus?: EnumTaskReleaseStatus;
@@ -7255,7 +7310,7 @@
/** 浠诲姟鍦扮偣鍚嶇О */
addressName: string;
/** 浠诲姟鍦扮偣璇︾粏鍦板潃 */
- addressDetail: string;
+ addressDetail?: string;
/** 缁忓害 */
longitude?: number;
/** 绾害 */
@@ -7270,6 +7325,7 @@
applyEndTime?: string;
checkReceiveMethod?: EnumTaskCheckReceiveMethod;
paymentMethod?: EnumTaskPaymentMethod;
+ settlementAccess?: EnumEnterpriseWalletAccess;
/** 浠诲姟鎻忚堪 */
description?: string;
/** Id */
@@ -7743,8 +7799,6 @@
/** 澶囨敞 */
remark?: string;
}
-
- type TestWeChatPayCommand = Record<string, any>;
interface UpdateEnterpriseWeChatPayWalletBankAccountInfoCommand {
/** 浼佷笟Id */
diff --git a/src/views/TaskManage/components/TaskDetailView.vue b/src/views/TaskManage/components/TaskDetailView.vue
index 09b7d97..53baa3f 100644
--- a/src/views/TaskManage/components/TaskDetailView.vue
+++ b/src/views/TaskManage/components/TaskDetailView.vue
@@ -215,6 +215,17 @@
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
+ <ProFormItemV2
+ label="缁撶畻鏂瑰紡:"
+ prop="settlementAccess"
+ :check-rules="[{ message: '璇烽�夋嫨缁撶畻鏂瑰紡' }]"
+ >
+ <ProFormSelect
+ v-model="form.settlementAccess"
+ :value-enum="EnumEnterpriseWalletAccessTextForSettle"
+ placeholder="璇烽�夋嫨缁撶畻鏂瑰紡"
+ ></ProFormSelect>
+ </ProFormItemV2>
</ProForm>
<template #footer>
<el-button @click="handleBack">鍏抽棴</el-button>
@@ -254,6 +265,7 @@
EnumSettlementCycleDateMonthArray,
EnumSettlementCycleDateWeekArray,
EnumTaskCheckReceiveMethodText,
+ EnumEnterpriseWalletAccessTextForSettle,
} from '@/constants';
import { ModelValueType } from 'element-plus';
import { format } from '@/utils';
@@ -302,6 +314,7 @@
description: '',
checkReceiveMethod: '' as any as EnumTaskCheckReceiveMethod,
applyTime: [] as unknown as ModelValueType,
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
});
const { isLoading } = useQuery({
@@ -349,6 +362,7 @@
format(data.applyBeginTime, 'YYYY-MM-DD 00:00:00'),
format(data.applyEndTime, 'YYYY-MM-DD 23:59:59'),
];
+ form.settlementAccess = data.settlementAccess;
},
enabled: computed(() => !!id),
});
--
Gitblit v1.9.1