From 5b90c8ecbcb40195ef8fe14ed4b032a580370cda Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 28 十一月 2025 10:36:28 +0800
Subject: [PATCH] Merge branch 'dev-1.3.0.2' into dev-1.3.0.3
---
apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue
index 522a51b..17e323d 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="handleConfirm">纭</nut-button>
+ <nut-button type="primary" @click="dialogVisible = false">纭</nut-button>
</div>
</div>
</nut-popup>
@@ -147,8 +147,7 @@
import { Message, setOSSLink } from '@12333/utils';
import dayjs from 'dayjs';
import { goBack } from '@/utils';
-import { useCheckReceiveTaskUserSubmit } from '@12333/hooks';
-import { useSettlementAmount } from '../hooks';
+import { useCheckReceiveTaskUserSubmit, useSettlementAmount } from '@12333/hooks';
defineOptions({
name: 'InnerPage',
@@ -193,12 +192,12 @@
let params: API.CheckReceiveTaskCommand = {
id: detail.value?.id,
checkReceiveStatus: EnumTaskUserSubmitCheckReceiveStatus.Success,
- // serviceFee: form.serviceFee,
- // timeoutHours: form.timeoutHours,
- // timeoutFee: form.timeoutFee,
- // otherFee: form.otherFee,
- // remark: form.remark,
- // settlementAmount: settlementAmount.value,
+ serviceFee: form.serviceFee,
+ timeoutHours: form.timeoutHours,
+ timeoutFee: form.timeoutFee,
+ otherFee: form.otherFee,
+ remark: form.remark,
+ settlementAmount: settlementAmount.value,
};
let res = await taskCheckReceiveServices.checkReceiveTask(params);
if (res) {
--
Gitblit v1.9.1