From bbb03cdda32f043ffb033b916abe964ba29315d0 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 14 十一月 2025 13:22:13 +0800
Subject: [PATCH] fix: bug
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 65b0c3f..9b41992 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -96,21 +96,21 @@
</ProTableV2>
<div class="chuck-add-or-edit-actions">
<el-button class="chuck-add-or-edit-actions" @click="handleBack">鍙栨秷</el-button>
- <!-- <el-button
+ <el-button
v-if="
isSettlement &&
(!form.auditStatus || form.auditStatus !== EnumTaskSettlementAuditStatus.Pass)
"
class="chuck-add-or-edit-actions"
type="primary"
- @click="handleSubmit()"
- >缁撶畻鐢宠</el-button
- > -->
+ @click="handleSubmit('confirm')"
+ >缁撶畻纭</el-button
+ >
<el-button
- v-if="isSettlement"
+ v-if="isSettlement && form.auditStatus === EnumTaskSettlementAuditStatus.Pass"
class="chuck-add-or-edit-actions"
type="primary"
- @click="handleSubmit()"
+ @click="handleSubmit('submit')"
>鎻愪氦缁撶畻</el-button
>
</div>
@@ -177,7 +177,11 @@
},
extraProps: {
hide: (row: API.GetSettlementTaskUsersQueryResultItem) =>
- row.settlementReceiveStatus !== SettlementReceiveStatus.Refunded,
+ !(
+ (row.settlementReceiveStatus === SettlementReceiveStatus.Refunded &&
+ form.auditStatus === EnumTaskSettlementAuditStatus.Pass) ||
+ form.auditStatus === EnumTaskSettlementAuditStatus.Wait
+ ),
},
},
reSettleBtn: {
@@ -461,7 +465,7 @@
}
}
-function handleSubmit() {
+function handleSubmit(submitStatus: string) {
let actualList = form.settlementTaskUsers.filter((x) => x.actualSettlementAmount > 0);
const actualSettlementAmount = actualList.reduce(
(pre, cur) => pre + cur.actualSettlementAmount,
@@ -472,6 +476,7 @@
id: id,
name: form.name,
code: form.code,
+ submitStatus: submitStatus,
settlementUserCount: actualList.length,
actualSettlementAmount: actualSettlementAmount,
settlementAmount: settlementAmount,
@@ -489,6 +494,7 @@
id: '',
name: '',
code: '',
+ submitStatus: '',
settlementUserCount: 0,
settlementAmount: 0,
actualSettlementAmount: 0,
@@ -497,7 +503,37 @@
});
async function handleSettle() {
- sureTaskSettlementOrder();
+ if (settleEditForm.submitStatus === 'confirm') {
+ auditTaskSettlement();
+ }
+ if (settleEditForm.submitStatus === 'submit') {
+ sureTaskSettlementOrder();
+ }
+}
+
+async function auditTaskSettlement() {
+ try {
+ let params: API.AuditTaskSettlementCommand = {
+ id: id,
+ auditStatus: EnumTaskSettlementAuditStatus.Pass,
+ rosters: form.settlementTaskUsers.map((item) => ({
+ id: item.id,
+ serviceFee: item.serviceFee,
+ timeoutHours: item.timeoutHours,
+ timeoutFee: item.timeoutFee,
+ otherFee: item.otherFee,
+ remark: item.remark,
+ settlementAmount: item.settlementAmount,
+ })),
+ };
+ let res = await taskServices.auditTaskSettlement(params);
+ if (res) {
+ Message.successMessage('鎿嶄綔鎴愬姛');
+ // eventContext.emit('sureTaskSettlementOrder');
+ // handleBack();
+ refetch();
+ }
+ } catch (error) {}
}
async function sureTaskSettlementOrder() {
--
Gitblit v1.9.1