From 172fb97fa79d08a5fb23f5330676a4ed2c776a68 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 09 九月 2025 15:20:08 +0800
Subject: [PATCH] fix: bug

---
 src/views/ServiceChargeManage/ServiceChargeDetail.vue |   94 ++++++++++++++++++++++++++++++-----------------
 1 files changed, 60 insertions(+), 34 deletions(-)

diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index c808dc8..3770baa 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <LoadingLayout :loading="isLoading">
+  <LoadingLayout :loading="state.loading">
     <AppContainer>
       <ChunkCell title="缁撶畻鍗曡鎯�">
         <ProForm :model="form" ref="formRef" label-width="120px" :is-read="true">
@@ -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>
@@ -88,13 +90,17 @@
           :auto-height="false"
           ref="proTable"
           :tableProps="{
-            maxHeight: '400px',
+            maxHeight: '250px',
           }"
         >
         </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,36 +160,49 @@
 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: '',
 });
 
-const { isLoading } = useQuery({
-  queryKey: ['taskServices/getSettlementTask', id],
-  queryFn: async () => {
-    return await taskServices.getSettlementTask(
-      { id: id },
-      {
-        showLoading: false,
-      }
-    );
-  },
-  placeholderData: () => ({} as API.GetSettlementTaskQueryResult),
-  onSuccess(data) {
-    form.name = data.name;
-    form.settlementAmount = toThousand(data.settlementAmount);
-    form.actualSettlementAmount = toThousand(data.actualSettlementAmount);
-    form.code = data.code;
-    form.settlementOrderName = setOssFileName(data.settlementOrderName);
-    form.settlementOrderTime = data.settlementOrderTime;
-  },
-  enabled: !!id,
+const BaseState = {
+  loading: true,
+};
+
+const state = reactive({ ...BaseState });
+
+onMounted(async () => {
+  await getList();
+  state.loading = false;
 });
+
+// const { isLoading } = useQuery({
+//   queryKey: ['taskServices/getSettlementTask', id],
+//   queryFn: async () => {
+//     return await taskServices.getSettlementTask(
+//       { id: id },
+//       {
+//         showLoading: false,
+//       }
+//     );
+//   },
+//   placeholderData: () => ({} as API.GetSettlementTaskQueryResult),
+//   onSuccess(data) {
+//     form.name = data.name;
+//     form.settlementAmount = data.settlementAmount ?? 0;
+//     form.actualSettlementAmount = data.actualSettlementAmount ?? 0;
+//     form.code = data.code;
+//     form.settlementOrderName = setOssFileName(data.settlementOrderName);
+//     form.settlementOrderTime = data.settlementOrderTime ?? '';
+//   },
+//   enabled: !!id,
+// });
 
 const {
   getDataSource: getList,
@@ -207,6 +226,14 @@
             item.identity.includes(extraParamState.keywords)
           );
         });
+      }
+      if (res?.detail) {
+        form.name = res?.detail?.name;
+        form.settlementAmount = res?.detail?.settlementAmount ?? 0;
+        form.actualSettlementAmount = res?.detail?.actualSettlementAmount ?? 0;
+        form.code = res?.detail?.code;
+        form.settlementOrderName = setOssFileName(res?.detail?.settlementOrderName);
+        form.settlementOrderTime = res?.detail?.settlementOrderTime ?? '';
       }
       return Promise.resolve({
         pageModel: {
@@ -258,9 +285,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) {
@@ -276,10 +306,6 @@
     name: 'ServiceChargeManageList',
   });
 }
-
-onMounted(() => {
-  getList();
-});
 </script>
 
 <style lang="scss" scoped>

--
Gitblit v1.9.1