From 9ee573586eeb1240ebd131baa1087bb41c76e776 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 31 十月 2025 15:29:36 +0800
Subject: [PATCH] fix: bug
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 26 +++++++++++++++++++++++++-
src/views/ServiceChargeManage/ServiceChargeManage.vue | 5 ++++-
src/views/ServiceChargeManage/components/SettleDetailDialog.vue | 4 +++-
src/views/ServiceChargeManage/components/SettlMethodDialog.vue | 4 +++-
4 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 5b47d38..31a0442 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -459,7 +459,31 @@
});
async function handleSettle() {
- sureTaskSettlementOrder();
+ auditTaskSettlement();
+}
+
+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();
+ }
+ } catch (error) {}
}
async function sureTaskSettlementOrder() {
diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index 43eb6b9..b70296a 100644
--- a/src/views/ServiceChargeManage/ServiceChargeManage.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -168,7 +168,10 @@
},
extraProps: {
hide: (role: API.GetSettlementTasksQueryResultItem) =>
- !(role.settlementStatus === EnumTaskSettlementStatus.Wait),
+ !(
+ role.settlementStatus === EnumTaskSettlementStatus.Wait &&
+ role.auditStatus !== EnumTaskSettlementAuditStatus.Pass
+ ),
},
},
// {
diff --git a/src/views/ServiceChargeManage/components/SettlMethodDialog.vue b/src/views/ServiceChargeManage/components/SettlMethodDialog.vue
index 1d11da0..f8c7166 100644
--- a/src/views/ServiceChargeManage/components/SettlMethodDialog.vue
+++ b/src/views/ServiceChargeManage/components/SettlMethodDialog.vue
@@ -41,7 +41,9 @@
settlementAccess: EnumEnterpriseWalletAccess;
};
-const { settlementAccessList } = useEnterpriseWalletAccessSelect();
+const { settlementAccessList } = useEnterpriseWalletAccessSelect({
+ supplierEnterpriseId: computed(() => ''),
+});
const visible = defineModel({ type: Boolean });
diff --git a/src/views/ServiceChargeManage/components/SettleDetailDialog.vue b/src/views/ServiceChargeManage/components/SettleDetailDialog.vue
index 2a1b0a9..b8d08db 100644
--- a/src/views/ServiceChargeManage/components/SettleDetailDialog.vue
+++ b/src/views/ServiceChargeManage/components/SettleDetailDialog.vue
@@ -71,7 +71,9 @@
settlementAccess: EnumEnterpriseWalletAccess;
};
-const { settlementAccessList } = useEnterpriseWalletAccessSelect();
+const { settlementAccessList } = useEnterpriseWalletAccessSelect({
+ supplierEnterpriseId: computed(() => ''),
+});
const visible = defineModel({ type: Boolean });
--
Gitblit v1.9.1