From cbcc6a8eecfc19e93da08500dcc898efdabf7836 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 22 十月 2025 18:38:45 +0800
Subject: [PATCH] fix: s
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index bd8b274..440afdb 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -197,6 +197,8 @@
isSettlement: isSettlement.value,
auditStatus: '' as any as EnumTaskSettlementAuditStatus,
+
+ timeoutServiceFee: 0,
});
const BaseState = {
@@ -231,6 +233,7 @@
form.code = res?.detail?.code;
form.settlementAccess = res?.detail?.settlementAccess;
form.auditStatus = res?.detail?.auditStatus;
+ form.timeoutServiceFee = res?.detail?.timeoutServiceFee ?? 0;
// form.settlementOrderName = setOssFileName(res?.detail?.settlementOrderName);
// form.settlementOrderTime = res?.detail?.settlementOrderTime ?? '';
}
@@ -301,6 +304,13 @@
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' },
},
}
);
@@ -313,9 +323,15 @@
actualSettlementAmount: null as number,
receiveAccount: '',
bank: '',
- totalWorkHours: null as number,
+ // totalWorkHours: null as number,
settlementAccess: form.settlementAccess,
// bankBranch: '',
+ timeoutServiceFee: 0,
+ serviceFee: null as number,
+ timeoutHours: null as number,
+ timeoutFee: null as number,
+ otherFee: null as number,
+ remark: '',
},
});
@@ -327,23 +343,36 @@
actualSettlementAmount: row?.actualSettlementAmount ?? null,
receiveAccount: row?.receiveAccount ?? '',
bank: row?.bank ?? '',
- totalWorkHours: row?.totalWorkHours ?? null,
+ // totalWorkHours: row?.totalWorkHours ?? null,
settlementAccess: form.settlementAccess,
// bankBranch: row?.bankBranch ?? '',
+ timeoutServiceFee: form.timeoutServiceFee,
+ serviceFee: row?.serviceFee ?? 0,
+ timeoutHours: row?.timeoutHours ?? null,
+ timeoutFee: row?.timeoutFee ?? null,
+ otherFee: row?.otherFee ?? null,
+ remark: row?.remark ?? '',
});
}
}
async function handleAddOrEdit() {
try {
+ const settlementAmount =
+ (editForm.timeoutFee ?? 0) + (editForm.serviceFee ?? 0) + (editForm.otherFee ?? 0);
let params: API.EditTaskSettlementOrderRosterCommand = {
id: editForm.id,
- settlementAmount: editForm.settlementAmount,
+ settlementAmount: settlementAmount,
actualSettlementAmount: editForm.actualSettlementAmount,
receiveAccount: editForm.receiveAccount,
bank: editForm.bank,
- totalWorkHours: editForm.totalWorkHours,
+ // totalWorkHours: editForm.totalWorkHours,
// bankBranch: editForm.bankBranch,
+ serviceFee: editForm.serviceFee,
+ timeoutHours: editForm.timeoutHours,
+ timeoutFee: editForm.timeoutFee,
+ otherFee: editForm.otherFee,
+ remark: editForm.remark,
};
let res = await taskServices.editTaskSettlementOrderRoster(params);
if (res) {
--
Gitblit v1.9.1