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 | 14 ++++++++------
src/views/ServiceChargeManage/ServiceChargeManage.vue | 11 ++++++-----
src/views/ServiceChargeManage/components/SettleDetailDialog.vue | 7 ++++---
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index f10c238..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>
@@ -162,8 +164,8 @@
const form = reactive({
name: '',
- settlementAmount: '',
- actualSettlementAmount: '',
+ settlementAmount: 0,
+ actualSettlementAmount: 0,
code: '',
settlementOrderName: '',
settlementOrderTime: '',
@@ -182,8 +184,8 @@
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 ?? '';
diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index 8c76c8c..134f3d2 100644
--- a/src/views/ServiceChargeManage/ServiceChargeManage.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -303,7 +303,7 @@
name: '',
code: '',
settlementUserCount: 0,
- settlementAmount: 0,
+ actualSettlementAmount: 0,
},
});
@@ -326,13 +326,13 @@
name: row.name,
code: row.code,
settlementUserCount: row.settlementUserCount ?? 0,
- settlementAmount: row.settlementAmount ?? 0,
+ actualSettlementAmount: row.actualSettlementAmount ?? 0,
});
}
async function handleRecall(row: API.GetSettlementTasksQueryResultItem) {
try {
- Message.tipMessage('纭瑕佹挙鍥炲悧锛�');
+ await Message.tipMessage('纭瑕佹挙鍥炲悧锛�');
let params: API.RevokeTaskSettlementOrderCommand = {
taskInfoId: row.id,
};
@@ -353,8 +353,8 @@
}
}
-function goDetail(id: string, url?: string) {
- router.push({
+async function goDetail(id: string, url?: string) {
+ await router.push({
name: 'ServiceChargeDetail',
params: {
id: id,
@@ -363,6 +363,7 @@
url: url ? url : '',
},
});
+ editForm.settlementUrl = [] as UploadUserFile[];
}
function handleExport(val) {
diff --git a/src/views/ServiceChargeManage/components/SettleDetailDialog.vue b/src/views/ServiceChargeManage/components/SettleDetailDialog.vue
index 181b6bf..fa89b02 100644
--- a/src/views/ServiceChargeManage/components/SettleDetailDialog.vue
+++ b/src/views/ServiceChargeManage/components/SettleDetailDialog.vue
@@ -17,8 +17,9 @@
<ProFormItemV2 label="缁撶畻浜烘暟锛�" prop="settlementUserCount">
<ProFormInputNumber v-model="form.settlementUserCount" unit="浜�"> </ProFormInputNumber>
</ProFormItemV2>
- <ProFormItemV2 label="缁撶畻閲戦锛�" prop="settlementAmount">
- <ProFormInputNumber v-model="form.settlementAmount" unit="鍏�"> </ProFormInputNumber>
+ <ProFormItemV2 label="缁撶畻閲戦锛�" prop="actualSettlementAmount">
+ <ProFormInputNumber v-model="form.actualSettlementAmount" unit="鍏�" format-value="money">
+ </ProFormInputNumber>
</ProFormItemV2>
</ProForm>
<template #footer>
@@ -51,7 +52,7 @@
name: string;
code: string;
settlementUserCount: number;
- settlementAmount: number;
+ actualSettlementAmount: number;
};
const visible = defineModel({ type: Boolean });
--
Gitblit v1.9.1