From 9216a1404ec75bf1427e58990bf1871ab48439bb Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 22 十月 2025 23:11:30 +0800
Subject: [PATCH] fix: bug
---
apps/bMiniApp/src/subpackages/payrollManage/payrollChange/InnerPage.vue | 75 ++++++++++++++++++++++++-------------
1 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/payrollManage/payrollChange/InnerPage.vue b/apps/bMiniApp/src/subpackages/payrollManage/payrollChange/InnerPage.vue
index aef693c..f431f7a 100644
--- a/apps/bMiniApp/src/subpackages/payrollManage/payrollChange/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/payrollManage/payrollChange/InnerPage.vue
@@ -142,8 +142,15 @@
});
const settlementAmount = computed(
- () => Number(form.timeoutFee ?? 0) + Number(form.serviceFee ?? 0) + Number(form.otherFee ?? 0)
+ () =>
+ getFeeValue(Number(form.timeoutFee ?? 0)) +
+ getFeeValue(Number(form.serviceFee ?? 0)) +
+ getFeeValue(Number(form.otherFee ?? 0))
);
+
+function getFeeValue(val: number) {
+ return val || 0;
+}
const rules = reactive<FormRules>({
code: [
@@ -175,31 +182,47 @@
const eventChannel = useEventChannel();
async function confirm() {
- try {
- let params: API.EditTaskSettlementOrderRosterCommand = {
- id: orderRosterId,
- settlementAmount: settlementAmount.value,
- actualSettlementAmount: form.actualSettlementAmount,
- receiveAccount: form.receiveAccount,
- bank: form.bank,
- // totalWorkHours: editForm.totalWorkHours,
- // bankBranch: editForm.bankBranch,
- serviceFee: form.serviceFee,
- timeoutHours: form.timeoutHours,
- timeoutFee: form.timeoutFee,
- otherFee: form.otherFee,
- remark: form.remark,
- };
- let res = await taskServices.editTaskSettlementOrderRoster(params);
- if (res) {
- Message.success('淇敼鎴愬姛', {
- onClosed() {
- goBack();
- },
- });
- eventChannel.emit('update');
- }
- } catch (error) {}
+ let params: API.EditTaskSettlementOrderRosterCommand = {
+ id: orderRosterId,
+ settlementAmount: settlementAmount.value,
+ actualSettlementAmount: form.actualSettlementAmount,
+ receiveAccount: form.receiveAccount,
+ bank: form.bank,
+ // totalWorkHours: editForm.totalWorkHours,
+ // bankBranch: editForm.bankBranch,
+ serviceFee: form.serviceFee,
+ timeoutHours: form.timeoutHours,
+ timeoutFee: form.timeoutFee,
+ otherFee: form.otherFee,
+ remark: form.remark,
+ };
+ // try {
+ // let params: API.EditTaskSettlementOrderRosterCommand = {
+ // id: orderRosterId,
+ // settlementAmount: settlementAmount.value,
+ // actualSettlementAmount: form.actualSettlementAmount,
+ // receiveAccount: form.receiveAccount,
+ // bank: form.bank,
+ // // totalWorkHours: editForm.totalWorkHours,
+ // // bankBranch: editForm.bankBranch,
+ // serviceFee: form.serviceFee,
+ // timeoutHours: form.timeoutHours,
+ // timeoutFee: form.timeoutFee,
+ // otherFee: form.otherFee,
+ // remark: form.remark,
+ // };
+ // let res = await taskServices.editTaskSettlementOrderRoster(params);
+ // if (res) {
+ // Message.success('淇敼鎴愬姛', {
+ // onClosed() {
+ // goBack();
+ // },
+ // });
+ // eventChannel.emit('update');
+ // }
+ // } catch (error) {}
+ goBack();
+ eventChannel.emit('update', params);
}
</script>
--
Gitblit v1.9.1