From d32cd83674f9b0db0154e6228807e658539f8cd0 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 22 九月 2025 13:10:14 +0800
Subject: [PATCH] fix: bug
---
src/constants/task.ts | 7 ++
.eslintrc-auto-import.json | 2
src/services/api/typings.d.ts | 50 +++++++++++++---
src/views/TaskManage/components/SelltementDetailView.vue | 58 ++++++++++++++-----
auto-imports.d.ts | 6 +
src/constants/apiEnum.ts | 12 ++++
src/views/TaskManage/TaskManageDetail.vue | 4
src/services/api/enterpriseWallet.ts | 12 ++++
src/services/api/auth.ts | 2
9 files changed, 124 insertions(+), 29 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 47846f1..27c2f1d 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -153,6 +153,8 @@
"PropType": true,
"Ref": true,
"RoleClientType": true,
+ "SettlementReceiveStatus": true,
+ "SettlementReceiveStatusText": true,
"Slot": true,
"Slots": true,
"SubModuleKey": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 28bd8b0..a2503d3 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -145,6 +145,8 @@
const OssUser: typeof import('./src/constants/oss')['OssUser']
const OssUserSign: typeof import('./src/constants/oss')['OssUserSign']
const RoleClientType: typeof import('./src/constants/role')['RoleClientType']
+ const SettlementReceiveStatus: typeof import('./src/constants/apiEnum')['SettlementReceiveStatus']
+ const SettlementReceiveStatusText: typeof import('./src/constants/task')['SettlementReceiveStatusText']
const SubModuleKey: typeof import('./src/constants/module')['SubModuleKey']
const SubModuleTitle: typeof import('./src/constants/module')['SubModuleTitle']
const SubModuleType: typeof import('./src/constants/module')['SubModuleType']
@@ -266,7 +268,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, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton } from './src/constants/apiEnum'
+ export type { EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus } from './src/constants/apiEnum'
import('./src/constants/apiEnum')
// @ts-ignore
export type { FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum, FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum } from './src/constants/cPerson'
@@ -448,6 +450,8 @@
readonly OssUser: UnwrapRef<typeof import('./src/constants/oss')['OssUser']>
readonly OssUserSign: UnwrapRef<typeof import('./src/constants/oss')['OssUserSign']>
readonly RoleClientType: UnwrapRef<typeof import('./src/constants/role')['RoleClientType']>
+ readonly SettlementReceiveStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['SettlementReceiveStatus']>
+ readonly SettlementReceiveStatusText: UnwrapRef<typeof import('./src/constants/task')['SettlementReceiveStatusText']>
readonly SubModuleKey: UnwrapRef<typeof import('./src/constants/module')['SubModuleKey']>
readonly SubModuleTitle: UnwrapRef<typeof import('./src/constants/module')['SubModuleTitle']>
readonly SubModuleType: UnwrapRef<typeof import('./src/constants/module')['SubModuleType']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index 0688d08..df166c7 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -417,6 +417,10 @@
InProcess = 20,
/**宸茬粨绠� */
Completed = 30,
+ /**閮ㄥ垎缁撶畻 */
+ Part = 40,
+ /**缁撶畻澶辫触 */
+ Fail = 50,
}
/** 浠诲姟瀹夋帓鐘舵�� */
@@ -566,3 +570,11 @@
/**宸插畬鎴� */
Completed = 20,
}
+
+/** 缁撶畻鍒拌处鐘舵�� */
+export enum SettlementReceiveStatus {
+ /**宸插埌璐� */
+ Completed = 10,
+ /**宸查��娆� */
+ Refunded = 20,
+}
diff --git a/src/constants/task.ts b/src/constants/task.ts
index b5e3933..c2627ed 100644
--- a/src/constants/task.ts
+++ b/src/constants/task.ts
@@ -1,3 +1,5 @@
+import { SettlementReceiveStatus } from '@/constants/apiEnum';
+
export const EnumTaskStatusText = {
[EnumTaskStatus.Wait]: '寰呭畨鎺�',
[EnumTaskStatus.Complete]: '宸插畨鎺�',
@@ -98,6 +100,11 @@
[EnumTaskSettlementStatus.Completed]: '宸茬粨绠�',
};
+export const SettlementReceiveStatusText = {
+ [SettlementReceiveStatus.Completed]: '宸插埌璐�',
+ [SettlementReceiveStatus.Refunded]: '宸查��娆�',
+};
+
export const EnumTaskCheckReceiveStatusText = {
[EnumTaskCheckReceiveStatus.WaitSubmit]: '寰呴獙鏀�',
[EnumTaskCheckReceiveStatus.Completed]: '宸查獙鏀�',
diff --git a/src/services/api/auth.ts b/src/services/api/auth.ts
index 1a95129..29e4032 100644
--- a/src/services/api/auth.ts
+++ b/src/services/api/auth.ts
@@ -132,7 +132,7 @@
body: API.RegisterPersonalUserCommand,
options?: API.RequestConfig
) {
- return request<boolean>('/api/user/auth/registerPersonalUser', {
+ return request<API.LoginCommandCallback>('/api/user/auth/registerPersonalUser', {
method: 'POST',
headers: {
'Content-Type': 'application/json-patch+json',
diff --git a/src/services/api/enterpriseWallet.ts b/src/services/api/enterpriseWallet.ts
index f47a980..a71c0c5 100644
--- a/src/services/api/enterpriseWallet.ts
+++ b/src/services/api/enterpriseWallet.ts
@@ -310,3 +310,15 @@
}
);
}
+
+/** 娴嬭瘯闃块噷鏀粯 POST /api/user/enterpriseWallet/testAliPay */
+export async function testAliPay(body: API.TestAliPayCommand, options?: API.RequestConfig) {
+ return request<string>('/api/user/enterpriseWallet/testAliPay', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 8950cd5..77dee3d 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -209,6 +209,8 @@
interface APIgetSettlementTaskUsersParams {
/** 缁撶畻璁㈠崟Id */
id?: string;
+ /** 浠诲姟Id */
+ taskInfoId?: string;
}
interface APIgetTaskEnterpriseParams {
@@ -900,6 +902,10 @@
InProcess = 20,
/**宸茬粨绠� */
Completed = 30,
+ /**閮ㄥ垎缁撶畻 */
+ Part = 40,
+ /**缁撶畻澶辫触 */
+ Fail = 50,
}
enum EnumTaskStatus {
@@ -3286,6 +3292,7 @@
enterpriseSignContractTime?: string;
/** 鐢靛瓙鍚堝悓 */
contractUrl?: string;
+ createdTime?: string;
}
type GetEnterpriseLoginInfoQuery = Record<string, any>;
@@ -4147,6 +4154,13 @@
balance?: number;
/** 浼佷笟鍚嶇О */
enterpriseName?: string;
+ /** 浠诲姟鍚嶇О */
+ taskName?: string;
+ /** 缁撶畻鍗曞悕绉� */
+ settlementOrderName?: string;
+ settlementStatus?: EnumTaskSettlementStatus;
+ /** 缁撶畻鏃堕棿 */
+ settlementTime?: string;
/** 浠樻浜鸿处鎴� */
payerAccount?: string;
/** 浠樻浜哄悕绉� */
@@ -4391,6 +4405,7 @@
keywords?: string;
settlementOrderStatus?: EnumTaskSettlementOrderStatus;
settlementStatus?: EnumTaskSettlementStatus;
+ checkReceiveStatus?: EnumTaskCheckReceiveStatus;
/** 缁撶畻鏃堕棿-璧峰 */
settlementTimeBegin?: string;
/** 缁撶畻鏃堕棿-鎴 */
@@ -4470,7 +4485,6 @@
identity?: string;
/** 鎵嬫満鍙� */
contactPhoneNumber?: string;
- settlementStatus?: EnumTaskSettlementStatus;
/** 鎵�灞為摱琛� */
bank?: string;
/** 寮�鎴锋敮琛屽悕绉� */
@@ -4481,8 +4495,16 @@
settlementAmount?: number;
/** 瀹炲彂閲戦 */
actualSettlementAmount?: number;
+ settlementReceiveStatus?: SettlementReceiveStatus;
+ settlementStatus?: EnumTaskSettlementStatus;
/** 缁撶畻鏃堕棿 */
settlementTime?: string;
+ /** 缁撶畻娴佹按鍙� */
+ orderCode?: string;
+ /** 鍒涘缓鏃堕棿 */
+ createdTime?: string;
+ /** 鐢靛瓙鏀舵嵁涓嬭浇閾炬帴 */
+ ereceiptDownloadOssUrl?: string;
}
interface GetTaskEnterpriseQueryResult {
@@ -4687,6 +4709,7 @@
/** 鎺ㄨ崘鏃堕棿 */
recommendTime?: string;
hireStatus?: EnumTaskUserHireStatus;
+ settlementStatus?: EnumTaskSettlementStatus;
/** 鍙戝竷鏃堕棿 */
createdTime?: string;
}
@@ -5111,18 +5134,18 @@
name?: string;
/** 韬唤璇佸彿 */
identity?: string;
+ /** 鎵嬫満鍙� */
+ contactPhoneNumber?: string;
+ /** 鎵�灞為摱琛� */
+ bank?: string;
+ /** 鎵�灞炴敮琛� */
+ bankBranch?: string;
+ /** 鏀舵璐︽埛 */
+ receiveAccount?: string;
/** 缁撶畻閲戦 */
settlementAmount?: number;
/** 瀹炲彂閲戦 */
actualSettlementAmount?: number;
- /** 鏀舵璐︽埛 */
- receiveAccount?: string;
- /** 鎵�灞為摱琛� */
- bank?: string;
- /** 寮�鎴锋敮琛屽悕绉� */
- bankBranch?: string;
- /** 浠诲姟鍚嶇О */
- taskName?: string;
}
interface InviteElectronSignCommand {
@@ -5819,6 +5842,13 @@
hireStatus?: EnumTaskUserHireStatus;
}
+ enum SettlementReceiveStatus {
+ /**宸插埌璐� */
+ Completed = 10,
+ /**宸查��娆� */
+ Refunded = 20,
+ }
+
interface SetUserInfoRolesCommand {
/** 鐢ㄦ埛Id */
userInfoId?: string;
@@ -5985,6 +6015,8 @@
remark?: string;
}
+ type TestAliPayCommand = Record<string, any>;
+
interface UpdatePhoneNumberVerifyCodeCommand {
/** 鎵嬫満鍙风爜 */
phoneNumber: string;
diff --git a/src/views/TaskManage/TaskManageDetail.vue b/src/views/TaskManage/TaskManageDetail.vue
index 8861e94..3dd88d4 100644
--- a/src/views/TaskManage/TaskManageDetail.vue
+++ b/src/views/TaskManage/TaskManageDetail.vue
@@ -8,9 +8,9 @@
<ProTabPane lazy label="鎶ュ悕璇︽儏" name="sign">
<SignDetailView></SignDetailView>
</ProTabPane>
- <!-- <ProTabPane lazy label="缁撶畻璇︽儏" name="settle">
+ <ProTabPane lazy label="缁撶畻璇︽儏" name="settle">
<SelltementDetailView></SelltementDetailView>
- </ProTabPane> -->
+ </ProTabPane>
</ProTabs>
</AppContainer>
</LoadingLayout>
diff --git a/src/views/TaskManage/components/SelltementDetailView.vue b/src/views/TaskManage/components/SelltementDetailView.vue
index 81ff5d9..0033543 100644
--- a/src/views/TaskManage/components/SelltementDetailView.vue
+++ b/src/views/TaskManage/components/SelltementDetailView.vue
@@ -14,7 +14,10 @@
<script setup lang="ts">
import { ProTableV2, LoadingLayout, AppContainer, useTable } from '@bole-core/components';
import { ModelValueType } from 'element-plus';
-import * as enterpriseServices from '@/services/api/enterprise';
+import * as taskUserServices from '@/services/api/taskUser';
+import { useQuery } from '@tanstack/vue-query';
+import { SettlementReceiveStatusText } from '@/constants';
+import { paginateList } from '@/utils';
defineOptions({
name: 'SelltementDetailView',
@@ -31,9 +34,11 @@
const [settleColumns] = useGroupColumns(column, ['settle-']);
const [settleOperationBtns] = useGroupOperationBtns(operationBtns, ['settle-']);
-const router = useRouter();
+const route = useRoute();
+const id = route.params?.id as string;
const BaseState = {
loading: true,
+ settlementTaskUsers: [] as API.GetSettlementTaskUsersQueryResultItem[],
};
const state = reactive({ ...BaseState });
@@ -41,6 +46,24 @@
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 {
@@ -52,30 +75,33 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetEnterprisesQuery = {
+ let list = [...state.settlementTaskUsers];
+
+ return Promise.resolve({
pageModel: {
rows: pageSize,
page: pageIndex,
- orderInput: extraParamState.orderInput,
+ totalCount: list.length,
},
- // searchKeys: extraParamState.keyword,
- };
- let res = await enterpriseServices.getEnterprises(params, {
- showLoading: !state.loading,
+ data: paginateList(list, pageIndex, pageSize),
});
- return res;
- } catch (error) {}
+ } catch (error) {
+ console.log('error: ', error);
+ }
},
{
defaultExtraParams: {
- keyword: '',
- pageType: '' as any as number,
- status: '' as any as boolean,
- beginDate: [] as unknown as ModelValueType,
- endDate: [] as unknown as ModelValueType,
+ keywords: '',
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
- columnsRenderProps: {},
+ queryKey: ['taskUserServices/getSettlementTaskUsers'],
+ columnsRenderProps: {
+ settlementTime: { type: 'date' },
+ createdTime: { type: 'date' },
+ settlementAmount: { type: 'money' },
+ actualSettlementAmount: { type: 'money' },
+ settlementReceiveStatus: { type: 'enum', valueEnum: SettlementReceiveStatusText },
+ },
}
);
--
Gitblit v1.9.1