From 1d839bd0fca331b565deb640bbec0c85e3711791 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 05 九月 2025 16:03:01 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index c808dc8..d316f43 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -34,12 +34,14 @@
<ProFormCol>
<ProFormColItem :span="8">
<ProFormItemV2 label="缁撶畻閲戦:" prop="settlementAmount">
- <ProFormText v-model="form.settlementAmount"> </ProFormText>
+ <ProFormInputNumber v-model="form.settlementAmount" format-value="money">
+ </ProFormInputNumber>
</ProFormItemV2>
</ProFormColItem>
<ProFormColItem :span="8">
<ProFormItemV2 label="瀹炲彂閲戦:" prop="actualSettlementAmount">
- <ProFormText v-model="form.actualSettlementAmount"> </ProFormText>
+ <ProFormInputNumber v-model="form.actualSettlementAmount" format-value="money">
+ </ProFormInputNumber>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -94,7 +96,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,10 +160,12 @@
const id = (route.params.id as string) ?? '';
const url = (route.query.url as string) ?? '';
+const isDetail = computed(() => !url);
+
const form = reactive({
name: '',
- settlementAmount: '',
- actualSettlementAmount: '',
+ settlementAmount: 0,
+ actualSettlementAmount: 0,
code: '',
settlementOrderName: '',
settlementOrderTime: '',
@@ -176,11 +184,11 @@
placeholderData: () => ({} as API.GetSettlementTaskQueryResult),
onSuccess(data) {
form.name = data.name;
- form.settlementAmount = toThousand(data.settlementAmount);
- form.actualSettlementAmount = toThousand(data.actualSettlementAmount);
+ form.settlementAmount = data.settlementAmount ?? 0;
+ form.actualSettlementAmount = data.actualSettlementAmount ?? 0;
form.code = data.code;
form.settlementOrderName = setOssFileName(data.settlementOrderName);
- form.settlementOrderTime = data.settlementOrderTime;
+ form.settlementOrderTime = data.settlementOrderTime ?? '';
},
enabled: !!id,
});
@@ -258,9 +266,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