From be028017a461af4c9745c69c4df084d4c3e6b296 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 22 十月 2025 18:08:49 +0800
Subject: [PATCH] fix: bug
---
src/constants/task.ts | 11 ++
.eslintrc-auto-import.json | 4
src/services/api/typings.d.ts | 61 ++++++++++-
src/views/TaskManage/SelltementDetailInfo.vue | 117 +++++++++++++++++++++++
src/views/TaskManage/components/SelltementDetailView.vue | 78 ++++++--------
auto-imports.d.ts | 10 +
src/constants/apiEnum.ts | 16 +++
7 files changed, 245 insertions(+), 52 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 8d4b6fe..cac7914 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -56,6 +56,7 @@
"EnumEnterpriseWalletSignStatus": true,
"EnumEnterpriseWalletSignStatusText": true,
"EnumEnterpriseWalletTransactionType": true,
+ "EnumGetArrangeTaskUsersQueryApplyStatus": true,
"EnumGetEnterpriseEmployeesQuerySignContractStatus": true,
"EnumLogLevel": true,
"EnumLogLevelText": true,
@@ -99,11 +100,14 @@
"EnumTaskReleaseStatus": true,
"EnumTaskReleaseStatusText": true,
"EnumTaskSettlementAuditStatus": true,
+ "EnumTaskSettlementAuditStatusText": true,
"EnumTaskSettlementOrderStatus": true,
+ "EnumTaskSettlementOrderStatusText": true,
"EnumTaskSettlementStatus": true,
"EnumTaskSettlementStatusText": true,
"EnumTaskStatus": true,
"EnumTaskStatusText": true,
+ "EnumTaskUserApplyStatus": true,
"EnumTaskUserArrangeStatus": true,
"EnumTaskUserHireStatus": true,
"EnumTaskUserHireStatusText": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index b059429..5c546d4 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -59,6 +59,7 @@
const EnumEnterpriseWalletSignStatusText: typeof import('./src/constants/enterprise')['EnumEnterpriseWalletSignStatusText']
const EnumEnterpriseWalletTransactionStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletTransactionStatus']
const EnumEnterpriseWalletTransactionType: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletTransactionType']
+ const EnumGetArrangeTaskUsersQueryApplyStatus: typeof import('./src/constants/apiEnum')['EnumGetArrangeTaskUsersQueryApplyStatus']
const EnumGetEnterpriseEmployeesQuerySignContractStatus: typeof import('./src/constants/apiEnum')['EnumGetEnterpriseEmployeesQuerySignContractStatus']
const EnumLogLevel: typeof import('./src/constants/apiEnum')['EnumLogLevel']
const EnumLogLevelText: typeof import('./src/constants/logs')['EnumLogLevelText']
@@ -103,11 +104,14 @@
const EnumTaskReleaseStatus: typeof import('./src/constants/apiEnum')['EnumTaskReleaseStatus']
const EnumTaskReleaseStatusText: typeof import('./src/constants/task')['EnumTaskReleaseStatusText']
const EnumTaskSettlementAuditStatus: typeof import('./src/constants/apiEnum')['EnumTaskSettlementAuditStatus']
+ const EnumTaskSettlementAuditStatusText: typeof import('./src/constants/task')['EnumTaskSettlementAuditStatusText']
const EnumTaskSettlementOrderStatus: typeof import('./src/constants/apiEnum')['EnumTaskSettlementOrderStatus']
+ const EnumTaskSettlementOrderStatusText: typeof import('./src/constants/task')['EnumTaskSettlementOrderStatusText']
const EnumTaskSettlementStatus: typeof import('./src/constants/apiEnum')['EnumTaskSettlementStatus']
const EnumTaskSettlementStatusText: typeof import('./src/constants/task')['EnumTaskSettlementStatusText']
const EnumTaskStatus: typeof import('./src/constants/apiEnum')['EnumTaskStatus']
const EnumTaskStatusText: typeof import('./src/constants/task')['EnumTaskStatusText']
+ const EnumTaskUserApplyStatus: typeof import('./src/constants/apiEnum')['EnumTaskUserApplyStatus']
const EnumTaskUserArrangeStatus: typeof import('./src/constants/apiEnum')['EnumTaskUserArrangeStatus']
const EnumTaskUserHireStatus: typeof import('./src/constants/apiEnum')['EnumTaskUserHireStatus']
const EnumTaskUserHireStatusText: typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserHireStatusText']
@@ -315,7 +319,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, 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'
+ export type { EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumConsoleLogAccess, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetArrangeTaskUsersQueryApplyStatus, 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, EnumTaskUserApplyStatus, 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, EnumGetArrangeTaskUsersQueryApplyStatus, 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, EnumTaskUserApplyStatus, 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'
@@ -412,6 +416,7 @@
readonly EnumEnterpriseWalletSignStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletSignStatus']>
readonly EnumEnterpriseWalletSignStatusText: UnwrapRef<typeof import('./src/constants/enterprise')['EnumEnterpriseWalletSignStatusText']>
readonly EnumEnterpriseWalletTransactionType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletTransactionType']>
+ readonly EnumGetArrangeTaskUsersQueryApplyStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumGetArrangeTaskUsersQueryApplyStatus']>
readonly EnumGetEnterpriseEmployeesQuerySignContractStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumGetEnterpriseEmployeesQuerySignContractStatus']>
readonly EnumLogLevel: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumLogLevel']>
readonly EnumLogLevelText: UnwrapRef<typeof import('./src/constants/logs')['EnumLogLevelText']>
@@ -455,11 +460,14 @@
readonly EnumTaskReleaseStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskReleaseStatus']>
readonly EnumTaskReleaseStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskReleaseStatusText']>
readonly EnumTaskSettlementAuditStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskSettlementAuditStatus']>
+ readonly EnumTaskSettlementAuditStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskSettlementAuditStatusText']>
readonly EnumTaskSettlementOrderStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskSettlementOrderStatus']>
+ readonly EnumTaskSettlementOrderStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskSettlementOrderStatusText']>
readonly EnumTaskSettlementStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskSettlementStatus']>
readonly EnumTaskSettlementStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskSettlementStatusText']>
readonly EnumTaskStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskStatus']>
readonly EnumTaskStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskStatusText']>
+ readonly EnumTaskUserApplyStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserApplyStatus']>
readonly EnumTaskUserArrangeStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserArrangeStatus']>
readonly EnumTaskUserHireStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserHireStatus']>
readonly EnumTaskUserHireStatusText: UnwrapRef<typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserHireStatusText']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index 1c1c992..ead0641 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -202,6 +202,14 @@
}
/** 娌″啓娉ㄩ噴 */
+export enum EnumGetArrangeTaskUsersQueryApplyStatus {
+ /**鏈姤鍚� */
+ None = 10,
+ /**宸叉姤鍚� */
+ Completed = 20,
+}
+
+/** 娌″啓娉ㄩ噴 */
export enum EnumGetEnterpriseEmployeesQuerySignContractStatus {
/**鐏靛伐寰呯绾� */
UserWait = 10,
@@ -525,6 +533,14 @@
Complete = 20,
}
+/** 浠诲姟鐢ㄦ埛鎶ュ悕鐘舵�� */
+export enum EnumTaskUserApplyStatus {
+ /**鏈姤鍚� */
+ None = 10,
+ /**宸叉姤鍚� */
+ Completed = 20,
+}
+
/** 浠诲姟鐢ㄦ埛瀹夋帓鐘舵�� */
export enum EnumTaskUserArrangeStatus {
/**鏈畨鎺� */
diff --git a/src/constants/task.ts b/src/constants/task.ts
index 553cc62..0a2c6c9 100644
--- a/src/constants/task.ts
+++ b/src/constants/task.ts
@@ -128,3 +128,14 @@
[EnumTaskCheckReceiveMethod.CheckIn]: '浜哄伐绛惧埌',
[EnumTaskCheckReceiveMethod.Submit]: '鑷富鎻愪氦',
};
+
+export const EnumTaskSettlementOrderStatusText = {
+ [EnumTaskSettlementOrderStatus.Wait]: '寰呬笂浼�',
+ [EnumTaskSettlementOrderStatus.Completed]: '宸蹭笂浼�',
+};
+
+export const EnumTaskSettlementAuditStatusText = {
+ [EnumTaskSettlementAuditStatus.Wait]: '寰呭鏍�',
+ [EnumTaskSettlementAuditStatus.Pass]: '瀹℃牳閫氳繃',
+ [EnumTaskSettlementAuditStatus.Fail]: '椹冲洖',
+};
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index cdd979f..78ee6c3 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -559,8 +559,16 @@
interface EditTaskSettlementOrderRosterCommand {
/** 鍚嶅崟Id */
id?: string;
- /** 绱宸ユ椂 */
- totalWorkHours?: number;
+ /** 鏈嶅姟璐癸紙鍏冿級 */
+ serviceFee?: number;
+ /** 瓒呮椂锛堝皬鏃讹級 */
+ timeoutHours?: number;
+ /** 瓒呮椂璐圭敤锛堝厓锛� */
+ timeoutFee?: number;
+ /** 鍏朵粬璐圭敤锛堝厓锛� */
+ otherFee?: number;
+ /** 澶囨敞 */
+ remark?: string;
/** 缁撶畻閲戦 */
settlementAmount: number;
/** 瀹炲彂閲戦 */
@@ -819,6 +827,13 @@
Recharge = 10,
/**杞处 */
Transfer = 20,
+ }
+
+ enum EnumGetArrangeTaskUsersQueryApplyStatus {
+ /**鏈姤鍚� */
+ None = 10,
+ /**宸叉姤鍚� */
+ Completed = 20,
}
enum EnumGetEnterpriseEmployeesQuerySignContractStatus {
@@ -1116,6 +1131,13 @@
Wait = 10,
/**宸插畨鎺� */
Complete = 20,
+ }
+
+ enum EnumTaskUserApplyStatus {
+ /**鏈姤鍚� */
+ None = 10,
+ /**宸叉姤鍚� */
+ Completed = 20,
}
enum EnumTaskUserArrangeStatus {
@@ -3428,6 +3450,7 @@
/** 鍏抽敭瀛楋紙濮撳悕/韬唤璇�/鐢佃瘽锛� */
keywords?: string;
arrangeStatus?: EnumTaskUserArrangeStatus;
+ applyStatus?: EnumGetArrangeTaskUsersQueryApplyStatus;
pageModel?: PagedListQueryPageModel;
}
@@ -4914,6 +4937,7 @@
releaseStatus?: EnumTaskReleaseStatus;
recommendStatus?: EnumTaskRecommendStatus;
checkReceiveStatus?: EnumTaskCheckReceiveStatus;
+ applyStatus?: EnumTaskUserApplyStatus;
pageModel?: PagedListQueryPageModel;
}
@@ -5061,6 +5085,8 @@
}
interface GetPersonalHireTaskInfosQuery {
+ hireStatus?: EnumTaskUserHireStatus;
+ arrangeStatus?: EnumTaskUserArrangeStatus;
status?: GetPersonalHireTaskInfosQueryStatus;
pageModel?: PagedListQueryPageModel;
}
@@ -5140,6 +5166,8 @@
hireRefuseTaskCount?: number;
/** 浠诲姟涓� */
inProcessTaskCount?: number;
+ /** 宸插畨鎺� */
+ arrangeCompleteTaskCount?: number;
/** 浣欓 */
balance?: number;
/** 鎴戠殑鏀剁泭 */
@@ -5701,6 +5729,8 @@
interface GetSettlementTasksQuery {
/** 鍏抽敭瀛� */
keywords?: string;
+ /** 浠诲姟Id */
+ taskInfoId?: string;
paymentStatus?: GetSettlementTasksQueryPaymentStatus;
settlementOrderStatus?: EnumTaskSettlementOrderStatus;
settlementStatus?: EnumTaskSettlementStatus;
@@ -5835,14 +5865,22 @@
/** 鏄惁瀹炲悕 */
isReal?: boolean;
realMethod?: EnumUserRealMethod;
- /** 绱宸ユ椂 */
- totalWorkHours?: number;
/** 鎵�灞為摱琛� */
bank?: string;
/** 寮�鎴锋敮琛屽悕绉� */
bankBranch?: string;
/** 鏀舵璐︽埛 */
receiveAccount?: string;
+ /** 鏈嶅姟璐癸紙鍏冿級 */
+ serviceFee?: number;
+ /** 瓒呮椂锛堝皬鏃讹級 */
+ timeoutHours?: number;
+ /** 瓒呮椂璐圭敤锛堝厓锛� */
+ timeoutFee?: number;
+ /** 鍏朵粬璐圭敤锛堝厓锛� */
+ otherFee?: number;
+ /** 澶囨敞 */
+ remark?: string;
/** 缁撶畻閲戦 */
settlementAmount?: number;
/** 瀹炲彂閲戦 */
@@ -6100,6 +6138,7 @@
checkReceiveStatus?: EnumTaskCheckReceiveStatus;
/** 鏄惁鏀惰棌 */
isCollected?: boolean;
+ applyStatus?: EnumTaskUserApplyStatus;
pageModel?: PagedListQueryPageModel;
}
@@ -6703,18 +6742,26 @@
identity?: string;
/** 鎵嬫満鍙� */
contactPhoneNumber?: string;
- /** 绱宸ユ椂 */
- totalWorkHours?: number;
/** 鎵�灞為摱琛� */
bank?: string;
/** 鎵�灞炴敮琛� */
bankBranch?: string;
/** 鏀舵璐︽埛 */
receiveAccount?: string;
+ /** 鏈嶅姟璐癸紙鍏冿級 */
+ serviceFee?: number;
+ /** 瓒呮椂锛堝皬鏃讹級 */
+ timeoutHours?: number;
+ /** 瓒呮椂璐圭敤锛堝厓锛� */
+ timeoutFee?: number;
+ /** 鍏朵粬璐圭敤锛堝厓锛� */
+ otherFee?: number;
/** 缁撶畻閲戦 */
settlementAmount?: number;
/** 瀹炲彂閲戦 */
actualSettlementAmount?: number;
+ /** 澶囨敞 */
+ remark?: string;
}
interface InviteElectronSignCommand {
@@ -7360,7 +7407,7 @@
name: string;
billingMethod: EnumBillingMethod;
/** 鏈嶅姟璐� */
- serviceFee: number;
+ serviceFee?: number;
/** 鏍稿畾宸ユ椂 */
verifyWorkHours?: number;
/** 瓒呮椂鏈嶅姟璐� */
diff --git a/src/views/TaskManage/SelltementDetailInfo.vue b/src/views/TaskManage/SelltementDetailInfo.vue
new file mode 100644
index 0000000..3bee1f2
--- /dev/null
+++ b/src/views/TaskManage/SelltementDetailInfo.vue
@@ -0,0 +1,117 @@
+<template>
+ <LoadingLayout :loading="state.loading">
+ <AppContainer>
+ <ProTableV2 v-bind="proTableProps" :columns="column" :operationBtns="operationBtns">
+ </ProTableV2>
+ </AppContainer>
+ </LoadingLayout>
+</template>
+
+<script setup lang="ts">
+import { ProTableV2, LoadingLayout, AppContainer, useTable } from '@bole-core/components';
+import { ModelValueType } from 'element-plus';
+import * as taskUserServices from '@/services/api/taskUser';
+import { useQuery } from '@tanstack/vue-query';
+import { SettlementReceiveStatusText } from '@/constants';
+import { downloadFileByUrl, paginateList, setOSSLink } from '@/utils';
+
+defineOptions({
+ name: 'SelltementDetailInfo',
+});
+
+const operationBtnMap: Record<string, OperationBtnType> = {
+ 'settle-downloadBtn': {
+ emits: { onClick: (role) => handleDownload(role) },
+ extraProps: {
+ hide: (row: API.GetSettlementTaskUsersQueryResultItem) => !row.ereceiptDownloadOssUrl,
+ },
+ },
+};
+
+const { checkSubModuleItemShow, column, operationBtns } = useAccess({
+ operationBtnMap,
+});
+
+const route = useRoute();
+const id = route.params?.id as string;
+const BaseState = {
+ loading: true,
+ settlementTaskUsers: [] as API.GetSettlementTaskUsersQueryResultItem[],
+};
+
+const state = reactive({ ...BaseState });
+
+onMounted(async () => {
+ await getList();
+ state.loading = false;
+});
+
+const { isLoading, data, refetch } = useQuery({
+ queryKey: ['taskUserServices/getSettlementTaskUsers', id],
+ queryFn: async () => {
+ return await taskUserServices.getSettlementTaskUsers(
+ { id: id },
+ {
+ showLoading: false,
+ }
+ );
+ },
+ placeholderData: () => ({} as API.GetSettlementTaskUsersQueryResult),
+ onSuccess(res) {
+ state.settlementTaskUsers = res.data;
+ getList();
+ },
+ enabled: !!id,
+});
+
+const {
+ getDataSource: getList,
+ proTableProps,
+ paginationState,
+ extraParamState,
+ reset,
+} = useTable(
+ async ({ pageIndex, pageSize }, extraParamState) => {
+ try {
+ let list = [...state.settlementTaskUsers];
+
+ return Promise.resolve({
+ pageModel: {
+ rows: pageSize,
+ page: pageIndex,
+ totalCount: list.length,
+ },
+ data: paginateList(list, pageIndex, pageSize),
+ });
+ } catch (error) {
+ console.log('error: ', error);
+ }
+ },
+ {
+ defaultExtraParams: {
+ keywords: '',
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
+ },
+ queryKey: ['taskUserServices/getSettlementTaskUsers'],
+ columnsRenderProps: {
+ settlementTime: { type: 'date' },
+ createdTime: { type: 'date' },
+ settlementAmount: { type: 'money' },
+ actualSettlementAmount: { type: 'money' },
+ settlementReceiveStatus: { type: 'enum', valueEnum: SettlementReceiveStatusText },
+ serviceFee: { type: 'money' },
+ timeoutHours: {
+ formatter: (row: API.GetSettlementTaskUsersQueryResultItem) =>
+ row.timeoutHours ? `${row.timeoutHours}灏忔椂` : '',
+ },
+ timeoutFee: { type: 'money' },
+ otherFee: { type: 'money' },
+ },
+ }
+);
+
+function handleDownload(row: API.GetSettlementTaskUsersQueryResultItem) {
+ if (!row.ereceiptDownloadOssUrl) return;
+ downloadFileByUrl(setOSSLink(row.ereceiptDownloadOssUrl), '缁撶畻鍥炲崟');
+}
+</script>
diff --git a/src/views/TaskManage/components/SelltementDetailView.vue b/src/views/TaskManage/components/SelltementDetailView.vue
index 37d6c99..4813a9f 100644
--- a/src/views/TaskManage/components/SelltementDetailView.vue
+++ b/src/views/TaskManage/components/SelltementDetailView.vue
@@ -13,22 +13,17 @@
<script setup lang="ts">
import { ProTableV2, LoadingLayout, AppContainer, useTable } from '@bole-core/components';
-import { ModelValueType } from 'element-plus';
-import * as taskUserServices from '@/services/api/taskUser';
-import { useQuery } from '@tanstack/vue-query';
+import * as taskServices from '@/services/api/task';
import { SettlementReceiveStatusText } from '@/constants';
-import { downloadFileByUrl, paginateList, setOSSLink } from '@/utils';
+import { setOssFileName } from '@/utils';
defineOptions({
name: 'SelltementDetailView',
});
const operationBtnMap: Record<string, OperationBtnType> = {
- 'settle-downloadBtn': {
- emits: { onClick: (role) => handleDownload(role) },
- extraProps: {
- hide: (row: API.GetSettlementTaskUsersQueryResultItem) => !row.ereceiptDownloadOssUrl,
- },
+ 'settle-detailBtn': {
+ emits: { onClick: (role) => goDetail(role) },
},
};
@@ -43,7 +38,6 @@
const id = route.params?.id as string;
const BaseState = {
loading: true,
- settlementTaskUsers: [] as API.GetSettlementTaskUsersQueryResultItem[],
};
const state = reactive({ ...BaseState });
@@ -51,24 +45,6 @@
onMounted(async () => {
await getList();
state.loading = false;
-});
-
-const { isLoading, data, refetch } = useQuery({
- queryKey: ['taskUserServices/getSettlementTaskUsers', id],
- queryFn: async () => {
- return await taskUserServices.getSettlementTaskUsers(
- { taskInfoId: id },
- {
- showLoading: false,
- }
- );
- },
- placeholderData: () => ({} as API.GetSettlementTaskUsersQueryResult),
- onSuccess(res) {
- state.settlementTaskUsers = res.data;
- getList();
- },
- enabled: !!id,
});
const {
@@ -80,38 +56,52 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let list = [...state.settlementTaskUsers];
-
- return Promise.resolve({
+ let params: API.GetSettlementTasksQuery = {
pageModel: {
rows: pageSize,
page: pageIndex,
- totalCount: list.length,
+ orderInput: extraParamState.orderInput,
},
- data: paginateList(list, pageIndex, pageSize),
+ taskInfoId: id,
+ };
+ let res = await taskServices.getSettlementTasks(params, {
+ showLoading: !state.loading,
});
- } catch (error) {
- console.log('error: ', error);
- }
+ return res;
+ } catch (error) {}
},
{
defaultExtraParams: {
keywords: '',
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
- queryKey: ['taskUserServices/getSettlementTaskUsers'],
+ queryKey: ['taskServices/getSettlementTasks'],
columnsRenderProps: {
- settlementTime: { type: 'date' },
- createdTime: { type: 'date' },
- settlementAmount: { type: 'money' },
+ settlementOrderStatus: { type: 'enum', valueEnum: EnumTaskSettlementOrderStatusText },
+ settlementStatus: { type: 'enum', valueEnum: EnumTaskSettlementStatusText },
+ checkReceiveStatus: { type: 'enum', valueEnum: EnumTaskCheckReceiveStatusText },
+ auditStatus: { type: 'enum', valueEnum: EnumTaskSettlementAuditStatusText },
actualSettlementAmount: { type: 'money' },
- settlementReceiveStatus: { type: 'enum', valueEnum: SettlementReceiveStatusText },
+ settlementAmount: { type: 'money' },
+ settlementTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ createdTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ settlementOrderTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ settlementOrderName: {
+ formatter: (row: API.GetSettlementTasksQueryResultItem) =>
+ row.settlementOrderName && setOssFileName(row.settlementOrderName),
+ },
},
}
);
-function handleDownload(row: API.GetSettlementTaskUsersQueryResultItem) {
- if (!row.ereceiptDownloadOssUrl) return;
- downloadFileByUrl(setOSSLink(row.ereceiptDownloadOssUrl), '缁撶畻鍥炲崟');
+const router = useRouter();
+
+function goDetail(row: API.GetSettlementTasksQueryResultItem) {
+ router.push({
+ name: 'SelltementDetailInfo',
+ params: {
+ id: row.id ?? '',
+ },
+ });
}
</script>
--
Gitblit v1.9.1