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 |   65 ++++++++++++++++++++------------
 src/services/api/typings.d.ts                         |    3 +
 2 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 9923d34..9b6c5a9 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -4232,6 +4232,7 @@
   }
 
   interface GetSettlementTaskUsersQueryResult {
+    detail?: GetSettlementTaskQueryResult;
     /** 缁撶畻鍚嶅崟 */
     data?: GetSettlementTaskUsersQueryResultItem[];
     /** 閿欒淇℃伅 */
@@ -5475,6 +5476,8 @@
   interface SendInviteElectronSignSmsCommand {
     /** Id */
     ids?: string[];
+    /** 鍚堝悓妯℃澘Id */
+    contractTemplateId?: string;
   }
 
   interface SendLoginOrRegisterVerifyCodeCommand {
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 9ce53c0..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">
@@ -171,27 +171,38 @@
   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 = data.settlementAmount ?? 0;
-    form.actualSettlementAmount = data.actualSettlementAmount ?? 0;
-    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,
@@ -215,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: {
@@ -287,10 +306,6 @@
     name: 'ServiceChargeManageList',
   });
 }
-
-onMounted(() => {
-  getList();
-});
 </script>
 
 <style lang="scss" scoped>

--
Gitblit v1.9.1