From 793b61420652e2b24e4c62eae0ab713f69f6cd1b Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 28 十一月 2025 14:38:18 +0800
Subject: [PATCH] fix: s
---
apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue | 3 ++-
packages/hooks/payrollChange.ts | 44 ++++++++++++++++++++++++++++++++++++++------
apps/underTakeMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue | 3 ++-
3 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue
index 17e323d..5aebb55 100644
--- a/apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue
@@ -131,7 +131,7 @@
</nut-form>
<div class="payroll-form-footer">
<nut-button @click="handleCancel">鍙栨秷</nut-button>
- <nut-button type="primary" @click="dialogVisible = false">纭</nut-button>
+ <nut-button type="primary" @click="recordForm">纭</nut-button>
</div>
</div>
</nut-popup>
@@ -172,6 +172,7 @@
handleCancel,
openDialog,
handleConfirm,
+ recordForm,
onTimeoutHoursChange,
} = useSettlementAmount({
taskInfoUserId: id,
diff --git a/apps/underTakeMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue b/apps/underTakeMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue
index 17e323d..5aebb55 100644
--- a/apps/underTakeMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue
+++ b/apps/underTakeMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue
@@ -131,7 +131,7 @@
</nut-form>
<div class="payroll-form-footer">
<nut-button @click="handleCancel">鍙栨秷</nut-button>
- <nut-button type="primary" @click="dialogVisible = false">纭</nut-button>
+ <nut-button type="primary" @click="recordForm">纭</nut-button>
</div>
</div>
</nut-popup>
@@ -172,6 +172,7 @@
handleCancel,
openDialog,
handleConfirm,
+ recordForm,
onTimeoutHoursChange,
} = useSettlementAmount({
taskInfoUserId: id,
diff --git a/packages/hooks/payrollChange.ts b/packages/hooks/payrollChange.ts
index e9e276b..ecc0f76 100644
--- a/packages/hooks/payrollChange.ts
+++ b/packages/hooks/payrollChange.ts
@@ -21,6 +21,17 @@
}: UseSettlementAmountOptions) {
const dialogVisible = ref(false);
+ const preForm = reactive({
+ /**鏄惁璁板綍杩� */
+ isRecord: false,
+ serviceFee: 0,
+ timeoutHours: 0,
+ timeoutFee: 0,
+ otherFee: 0,
+ remark: '',
+ timeoutServiceFee: 0,
+ });
+
const form = reactive({
serviceFee: 0,
timeoutHours: 0,
@@ -48,12 +59,21 @@
let res = await calcTaskCheckReceive(checkInTime);
if (res) {
dialogVisible.value = true;
- form.serviceFee = res.serviceFee ?? 0;
- form.timeoutHours = res.timeoutHours ?? 0;
- form.otherFee = 0;
- form.timeoutFee = 0;
- form.remark = '';
- form.timeoutServiceFee = unref(timeoutServiceFee) ?? 0;
+ if (preForm.isRecord) {
+ form.serviceFee = preForm.serviceFee;
+ form.timeoutHours = preForm.timeoutHours;
+ form.otherFee = preForm.otherFee;
+ form.timeoutFee = preForm.timeoutFee;
+ form.remark = preForm.remark;
+ form.timeoutServiceFee = preForm.timeoutServiceFee;
+ } else {
+ form.serviceFee = res.serviceFee ?? 0;
+ form.timeoutHours = res.timeoutHours ?? 0;
+ form.otherFee = 0;
+ form.timeoutFee = 0;
+ form.remark = '';
+ form.timeoutServiceFee = unref(timeoutServiceFee) ?? 0;
+ }
}
}
@@ -69,6 +89,17 @@
}
function handleCancel() {
+ dialogVisible.value = false;
+ }
+
+ function recordForm() {
+ preForm.serviceFee = form.serviceFee;
+ preForm.timeoutHours = form.timeoutHours;
+ preForm.otherFee = form.otherFee;
+ preForm.timeoutFee = form.timeoutFee;
+ preForm.remark = form.remark;
+ preForm.timeoutServiceFee = form.timeoutServiceFee;
+ preForm.isRecord = true;
dialogVisible.value = false;
}
@@ -109,5 +140,6 @@
openDialog,
handleConfirm,
onTimeoutHoursChange,
+ recordForm,
};
}
--
Gitblit v1.9.1