From 42ff9c53a3db88eb0b311767d45452be27a5d544 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 23 九月 2025 14:32:42 +0800
Subject: [PATCH] feat: 结算
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 3 +
src/constants/task.ts | 5 +
.eslintrc-auto-import.json | 2
src/services/api/typings.d.ts | 61 ++++++++++++++++++--
src/views/ServiceChargeManage/components/SettleDetailDialog.vue | 23 ++++++-
auto-imports.d.ts | 6 +
src/constants/apiEnum.ts | 12 ++++
src/services/api/enterpriseWallet.ts | 12 ++++
src/services/api/user.ts | 17 +++++
9 files changed, 127 insertions(+), 14 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index f83ceeb..e4cdbec 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -33,6 +33,7 @@
"EnumEnterpriseRealMethod": true,
"EnumEnterpriseWalletAccess": true,
"EnumEnterpriseWalletAccessText": true,
+ "EnumEnterpriseWalletAccessTextForSettle": true,
"EnumEnterpriseWalletExpandindirectOrderFileType": true,
"EnumEnterpriseWalletExpandindirectOrderScene": true,
"EnumEnterpriseWalletExpandindirectOrderStatus": true,
@@ -86,6 +87,7 @@
"EnumTaskUserSignContractStatusTextForFilter": true,
"EnumTaskUserSubmitCheckReceiveStatus": true,
"EnumTaskUserSubmitCheckReceiveStatusText": true,
+ "EnumUserBankCardAccess": true,
"EnumUserGender": true,
"EnumUserGenderText": true,
"EnumUserGenderTextForEdit": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index e553ecc..b3f9724 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -36,6 +36,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/task')['EnumEnterpriseWalletAccessTextForSettle']
const EnumEnterpriseWalletExpandindirectOrderFileType: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderFileType']
const EnumEnterpriseWalletExpandindirectOrderScene: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderScene']
const EnumEnterpriseWalletExpandindirectOrderStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderStatus']
@@ -91,6 +92,7 @@
const EnumTaskUserSignContractStatusTextForFilter: typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusTextForFilter']
const EnumTaskUserSubmitCheckReceiveStatus: typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckReceiveStatus']
const EnumTaskUserSubmitCheckReceiveStatusText: typeof import('./src/constants/task')['EnumTaskUserSubmitCheckReceiveStatusText']
+ const EnumUserBankCardAccess: typeof import('./src/constants/apiEnum')['EnumUserBankCardAccess']
const EnumUserGender: typeof import('./src/constants/apiEnum')['EnumUserGender']
const EnumUserGenderText: typeof import('./src/constants/task')['EnumUserGenderText']
const EnumUserGenderTextForEdit: typeof import('./src/constants/task')['EnumUserGenderTextForEdit']
@@ -255,7 +257,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, 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'
+ 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, EnumUserBankCardAccess, 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, EnumUserBankCardAccess, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus } from './src/constants/apiEnum'
import('./src/constants/apiEnum')
// @ts-ignore
export type { CategoryCode, IdentityCodeEnum, EducationCodeEnum, CertificateTypeCodeEnum, WelfareCodeEnum } from './src/constants/dic'
@@ -320,6 +322,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/task')['EnumEnterpriseWalletAccessTextForSettle']>
readonly EnumEnterpriseWalletExpandindirectOrderFileType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderFileType']>
readonly EnumEnterpriseWalletExpandindirectOrderScene: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderScene']>
readonly EnumEnterpriseWalletExpandindirectOrderStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderStatus']>
@@ -373,6 +376,7 @@
readonly EnumTaskUserSignContractStatusTextForFilter: UnwrapRef<typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusTextForFilter']>
readonly EnumTaskUserSubmitCheckReceiveStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckReceiveStatus']>
readonly EnumTaskUserSubmitCheckReceiveStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskUserSubmitCheckReceiveStatusText']>
+ readonly EnumUserBankCardAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserBankCardAccess']>
readonly EnumUserGender: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserGender']>
readonly EnumUserGenderText: UnwrapRef<typeof import('./src/constants/task')['EnumUserGenderText']>
readonly EnumUserGenderTextForEdit: UnwrapRef<typeof import('./src/constants/task')['EnumUserGenderTextForEdit']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index df166c7..448f703 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -107,6 +107,8 @@
export enum EnumEnterpriseWalletAccess {
/**鏀粯瀹� */
Alipay = 10,
+ /**骞冲畨閾惰 */
+ PingAnPay = 20,
}
/** 浼佷笟閽卞寘浠h繘浠跺崟闄勪欢绫诲瀷 */
@@ -473,6 +475,16 @@
Fail = 40,
}
+/** 鐢ㄦ埛閾惰鍗¢�氶亾 */
+export enum EnumUserBankCardAccess {
+ /**閾惰鍗� */
+ Bank = 1,
+ /**鏀粯瀹� */
+ AliPay = 10,
+ /**寰俊 */
+ WeChatPay = 20,
+}
+
/** 鐢ㄦ埛鎬у埆 */
export enum EnumUserGender {
/**鐢� */
diff --git a/src/constants/task.ts b/src/constants/task.ts
index 58d0118..6468095 100644
--- a/src/constants/task.ts
+++ b/src/constants/task.ts
@@ -163,3 +163,8 @@
[EnumPersonalJobSeekingStatus.Whatever]: '闅忎究鐪嬬湅',
[EnumPersonalJobSeekingStatus.Not]: '鏆傛椂涓嶆壘浠诲姟',
};
+
+export const EnumEnterpriseWalletAccessTextForSettle = {
+ [EnumEnterpriseWalletAccess.Alipay]: '浼佷笟鏀粯瀹濈粨绠�',
+ [EnumEnterpriseWalletAccess.PingAnPay]: '骞冲畨閾惰缁撶畻',
+};
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 46326ce..4c9ca23 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -156,8 +156,8 @@
}
interface APIgetPersonalUserBankCardParams {
- /** 鏌ヨ涓汉鐢ㄦ埛閾惰鍗′俊鎭� */
- request?: GetPersonalUserBankCardQuery;
+ /** 閫氶亾 */
+ access?: EnumUserBankCardAccess;
}
interface APIgetPersonalUserElectronSignParams {
@@ -209,6 +209,8 @@
interface APIgetSettlementTaskUsersParams {
/** 缁撶畻璁㈠崟Id */
id?: string;
+ /** 浠诲姟Id */
+ taskInfoId?: string;
}
interface APIgetTaskEnterpriseParams {
@@ -616,6 +618,8 @@
enum EnumEnterpriseWalletAccess {
/**鏀粯瀹� */
Alipay = 10,
+ /**骞冲畨閾惰 */
+ PingAnPay = 20,
}
enum EnumEnterpriseWalletExpandindirectOrderFileType {
@@ -949,6 +953,15 @@
Success = 30,
/**楠屾敹鏈�氳繃 */
Fail = 40,
+ }
+
+ enum EnumUserBankCardAccess {
+ /**閾惰鍗� */
+ Bank = 1,
+ /**鏀粯瀹� */
+ AliPay = 10,
+ /**寰俊 */
+ WeChatPay = 20,
}
enum EnumUserGender {
@@ -3451,6 +3464,10 @@
/** 鍗忚澶辨晥鏃堕棿 */
invalidTime?: string;
signStatus?: EnumEnterpriseWalletSignStatus;
+ /** 鎵�灞為摱琛� */
+ bank?: string;
+ /** 鎵�灞炴敮琛� */
+ bankBranch?: string;
/** 鏀粯瀹濆鍚� */
name?: string;
/** 鏀粯瀹濈櫥褰曡处鍙� */
@@ -3467,6 +3484,8 @@
/** 闄勪欢 */
files?: GetEnterpriseWalletExpandindirectOrderQueryResultFile[];
expandindirectOrderStatus?: EnumEnterpriseWalletExpandindirectOrderStatus;
+ /** 浣欓 */
+ balance?: number;
}
interface GetEnterpriseWalletTransactionQueryResult {
@@ -3870,6 +3889,8 @@
avatar?: string;
/** 濮撳悕 */
name?: string;
+ /** 韬唤璇佸彿 */
+ identity?: string;
/** 鎵嬫満鍙� */
contactPhoneNumber?: string;
/** 鏄惁瀹炲悕 */
@@ -3886,12 +3907,12 @@
hireRefuseTaskCount?: number;
/** 浣欓 */
balance?: number;
+ /** 宸茬粦瀹氱殑閾惰鍗¢�氶亾 */
+ bankCardAAccesses?: EnumUserBankCardAccess[];
}
- type GetPersonalUserBankCardQuery = Record<string, any>;
-
interface GetPersonalUserBankCardQueryResult {
- access?: EnumEnterpriseWalletAccess;
+ access?: EnumUserBankCardAccess;
/** 閾惰鍗″彿 */
code?: string;
/** 鎵�灞為摱琛� */
@@ -4497,6 +4518,12 @@
settlementStatus?: EnumTaskSettlementStatus;
/** 缁撶畻鏃堕棿 */
settlementTime?: string;
+ /** 缁撶畻娴佹按鍙� */
+ orderCode?: string;
+ /** 鍒涘缓鏃堕棿 */
+ createdTime?: string;
+ /** 鐢靛瓙鏀舵嵁涓嬭浇閾炬帴 */
+ ereceiptDownloadOssUrl?: string;
}
interface GetTaskEnterpriseQueryResult {
@@ -4701,6 +4728,7 @@
/** 鎺ㄨ崘鏃堕棿 */
recommendTime?: string;
hireStatus?: EnumTaskUserHireStatus;
+ settlementStatus?: EnumTaskSettlementStatus;
/** 鍙戝竷鏃堕棿 */
createdTime?: string;
}
@@ -5163,6 +5191,14 @@
/** 浼佷笟Id */
enterpriseId?: string;
access?: EnumEnterpriseWalletAccess;
+ /** 鎵�灞為摱琛� */
+ bank?: string;
+ /** 鎵�灞炴敮琛� */
+ bankBranch?: string;
+ /** 濮撳悕 */
+ name?: string;
+ /** 璐﹀彿 */
+ identity?: string;
}
interface OpenEnterpriseWalletCommandResult {
@@ -5578,7 +5614,7 @@
}
interface SavePersonalUserBankCardCommand {
- access?: EnumEnterpriseWalletAccess;
+ access?: EnumUserBankCardAccess;
/** 閾惰鍗″彿 */
code?: string;
/** 鎵�灞為摱琛� */
@@ -5587,6 +5623,8 @@
bankBranch?: string;
/** 閾惰棰勭暀鎵嬫満鍙� */
phoneNumber?: string;
+ /** 楠岃瘉鐮� */
+ verifyCode?: string;
}
interface SaveRoleCommand {
@@ -5759,6 +5797,11 @@
identity: string;
}
+ interface SendSavePersonalUserBankCardVerifyCodeCommand {
+ /** 鎵嬫満鍙风爜 */
+ phoneNumber: string;
+ }
+
interface SetDictionaryDataIsDisabledCommand {
ids?: string[];
/** 鏄惁宸茬鐢� */
@@ -5879,6 +5922,7 @@
interface SureTaskSettlementCommand {
/** 浠诲姟Id */
taskInfoId?: string;
+ settlementAccess?: EnumEnterpriseWalletAccess;
}
type SyncDatabaseCommand = Record<string, any>;
@@ -6006,6 +6050,11 @@
remark?: string;
}
+ interface TestAliPayCommand {
+ code?: string;
+ freezeNo?: string;
+ }
+
interface UpdatePhoneNumberVerifyCodeCommand {
/** 鎵嬫満鍙风爜 */
phoneNumber: string;
diff --git a/src/services/api/user.ts b/src/services/api/user.ts
index d06c228..5af015b 100644
--- a/src/services/api/user.ts
+++ b/src/services/api/user.ts
@@ -30,8 +30,6 @@
method: 'GET',
params: {
...params,
- request: undefined,
- ...params['request'],
},
...(options || {}),
});
@@ -154,6 +152,21 @@
});
}
+/** 鍙戦�佺粦瀹氶摱琛屽崱鐭俊 POST /api/user/user/sendSavePersonalUserBankCardVerifyCode */
+export async function sendSavePersonalUserBankCardVerifyCode(
+ body: API.SendSavePersonalUserBankCardVerifyCodeCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/user/user/sendSavePersonalUserBankCardVerifyCode', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 璁剧疆鐢ㄦ埛淇℃伅瑙掕壊 PUT /api/user/user/setUserInfoRoles */
export async function setUserInfoRoles(
body: API.SetUserInfoRolesCommand,
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 9fbb7c8..5a7e3b8 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -374,6 +374,7 @@
code: form.code,
settlementUserCount: form.settlementTaskUsers.length,
actualSettlementAmount: form.actualSettlementAmount,
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
});
}
@@ -389,6 +390,7 @@
code: '',
settlementUserCount: 0,
actualSettlementAmount: 0,
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
},
});
@@ -400,6 +402,7 @@
try {
let params: API.SureTaskSettlementCommand = {
taskInfoId: id,
+ settlementAccess: settleEditForm.settlementAccess,
};
let res = await taskServices.sureTaskSettlement(params);
if (res) {
diff --git a/src/views/ServiceChargeManage/components/SettleDetailDialog.vue b/src/views/ServiceChargeManage/components/SettleDetailDialog.vue
index fa89b02..270f65c 100644
--- a/src/views/ServiceChargeManage/components/SettleDetailDialog.vue
+++ b/src/views/ServiceChargeManage/components/SettleDetailDialog.vue
@@ -7,19 +7,30 @@
draggable
:width="700"
>
- <ProForm :model="form" ref="dialogForm" label-width="120px" is-read>
- <ProFormItemV2 label="浠诲姟鍗曞彿锛�" prop="code">
+ <ProForm :model="form" ref="dialogForm" label-width="120px">
+ <ProFormItemV2 label="浠诲姟鍗曞彿锛�" prop="code" mode="read">
<ProFormSelect v-model="form.code" :valueEnum="[]"> </ProFormSelect>
</ProFormItemV2>
- <ProFormItemV2 label="浠诲姟鍚嶇О锛�" prop="name">
+ <ProFormItemV2 label="浠诲姟鍚嶇О锛�" prop="name" mode="read">
<ProFormText v-model.trim="form.name"></ProFormText>
</ProFormItemV2>
- <ProFormItemV2 label="缁撶畻浜烘暟锛�" prop="settlementUserCount">
+ <ProFormItemV2 label="缁撶畻浜烘暟锛�" prop="settlementUserCount" mode="read">
<ProFormInputNumber v-model="form.settlementUserCount" unit="浜�"> </ProFormInputNumber>
</ProFormItemV2>
- <ProFormItemV2 label="缁撶畻閲戦锛�" prop="actualSettlementAmount">
+ <ProFormItemV2 label="缁撶畻閲戦锛�" prop="actualSettlementAmount" mode="read">
<ProFormInputNumber v-model="form.actualSettlementAmount" unit="鍏�" format-value="money">
</ProFormInputNumber>
+ </ProFormItemV2>
+ <ProFormItemV2
+ label="缁撶畻鏂瑰紡锛�"
+ prop="settlementAccess"
+ :check-rules="[{ message: '璇烽�夋嫨缁撶畻鏂瑰紡' }]"
+ >
+ <ProFormSelect
+ v-model="form.settlementAccess"
+ :valueEnum="EnumEnterpriseWalletAccessTextForSettle"
+ >
+ </ProFormSelect>
</ProFormItemV2>
</ProForm>
<template #footer>
@@ -41,6 +52,7 @@
ProFormSelect,
ProFormInputNumber,
} from '@bole-core/components';
+import { EnumEnterpriseWalletAccess, EnumEnterpriseWalletAccessTextForSettle } from '@/constants';
defineOptions({
name: 'SettleDetailDialog',
@@ -53,6 +65,7 @@
code: string;
settlementUserCount: number;
actualSettlementAmount: number;
+ settlementAccess: EnumEnterpriseWalletAccess;
};
const visible = defineModel({ type: Boolean });
--
Gitblit v1.9.1