From d58e204d091034fccff97db8b4248c6cede7fb63 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 11 十一月 2025 15:21:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into dev-1.3.0.2
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 31a0442..2bc37d5 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -199,6 +199,8 @@
auditStatus: '' as any as EnumTaskSettlementAuditStatus,
timeoutServiceFee: 0,
+
+ supplierEnterpriseId: '',
});
const BaseState = {
@@ -234,6 +236,7 @@
form.settlementAccess = res?.detail?.settlementAccess;
form.auditStatus = res?.detail?.auditStatus;
form.timeoutServiceFee = res?.detail?.timeoutServiceFee ?? 0;
+ form.supplierEnterpriseId = res?.detail?.supplierEnterpriseId;
// form.settlementOrderName = setOssFileName(res?.detail?.settlementOrderName);
// form.settlementOrderTime = res?.detail?.settlementOrderTime ?? '';
}
@@ -430,14 +433,21 @@
}
function handleSubmit() {
+ let actualList = form.settlementTaskUsers.filter((x) => x.actualSettlementAmount > 0);
+ const actualSettlementAmount = actualList.reduce(
+ (pre, cur) => pre + cur.actualSettlementAmount,
+ 0
+ );
+ const settlementAmount = actualList.reduce((pre, cur) => pre + cur.settlementAmount, 0);
handleSettleEdit({
id: id,
name: form.name,
code: form.code,
- settlementUserCount: form.settlementTaskUsers.length,
- actualSettlementAmount: form.actualSettlementAmount,
- settlementAmount: form.settlementAmount,
+ settlementUserCount: actualList.length,
+ actualSettlementAmount: actualSettlementAmount,
+ settlementAmount: settlementAmount,
settlementAccess: form.settlementAccess,
+ supplierEnterpriseId: form.supplierEnterpriseId,
});
}
@@ -455,6 +465,7 @@
settlementAmount: 0,
actualSettlementAmount: 0,
settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+ supplierEnterpriseId: '',
},
});
--
Gitblit v1.9.1