From 1d922e2cd32532fc149fac86cd63e318431d22a4 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 05 九月 2025 14:39:33 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient

---
 src/views/ServiceChargeManage/ServiceChargeDetail.vue |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index d73de36..f10c238 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -186,7 +186,7 @@
     form.actualSettlementAmount = toThousand(data.actualSettlementAmount);
     form.code = data.code;
     form.settlementOrderName = setOssFileName(data.settlementOrderName);
-    form.settlementOrderTime = data.settlementOrderTime;
+    form.settlementOrderTime = data.settlementOrderTime ?? '';
   },
   enabled: !!id,
 });
@@ -264,9 +264,12 @@
     let params: API.SureTaskSettlementOrderCommand = {
       taskInfoId: id,
       settlementOrderUrl: url,
-      taskInfoUsers: proTableProps.value.tableData.map(
-        (x) => ({ ...x } as API.SureTaskSettlementOrderCommandUser)
-      ),
+      taskInfoUsers:
+        proTableProps.value.tableData?.length > 0
+          ? proTableProps.value.tableData.map(
+              (x) => ({ ...x } as API.SureTaskSettlementOrderCommandUser)
+            )
+          : [],
     };
     let res = await taskServices.sureTaskSettlementOrder(params);
     if (res) {

--
Gitblit v1.9.1