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 | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index c808dc8..f10c238 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -94,7 +94,11 @@
</ProTableV2>
<div class="chuck-add-or-edit-actions">
<el-button class="chuck-add-or-edit-actions" @click="handleBack">鍙栨秷</el-button>
- <el-button class="chuck-add-or-edit-actions" type="primary" @click="handleSubmit"
+ <el-button
+ v-if="!isDetail"
+ class="chuck-add-or-edit-actions"
+ type="primary"
+ @click="handleSubmit"
>纭</el-button
>
</div>
@@ -154,6 +158,8 @@
const id = (route.params.id as string) ?? '';
const url = (route.query.url as string) ?? '';
+const isDetail = computed(() => !url);
+
const form = reactive({
name: '',
settlementAmount: '',
@@ -180,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,
});
@@ -258,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