From 852c9a7af36bcffb0c37cea6224c5391b5eac398 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 23 十月 2025 22:30:37 +0800
Subject: [PATCH] fix: bug

---
 src/views/ServiceChargeManage/ServiceChargeDetail.vue |   53 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 7889c48..21a8b34 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -1,6 +1,6 @@
 <template>
   <LoadingLayout :loading="isLoading">
-    <AppContainer>
+    <AppScrollContainer>
       <ChunkCell title="缁撶畻鍗曡鎯�">
         <ProForm :model="form" ref="formRef" label-width="120px" :is-read="true">
           <ProFormCol>
@@ -84,7 +84,7 @@
           :auto-height="false"
           ref="proTable"
           :tableProps="{
-            maxHeight: '250px',
+            maxHeight: '400px',
           }"
         >
         </ProTableV2>
@@ -93,7 +93,7 @@
           <el-button
             v-if="
               isSettlement &&
-              (!!form.auditStatus || form.auditStatus === EnumTaskSettlementAuditStatus.Fail)
+              (!form.auditStatus || form.auditStatus !== EnumTaskSettlementAuditStatus.Pass)
             "
             class="chuck-add-or-edit-actions"
             type="primary"
@@ -109,7 +109,7 @@
           >
         </div>
       </ChunkCell>
-    </AppContainer>
+    </AppScrollContainer>
     <EditAccountInfoDialog v-bind="dialogProps"></EditAccountInfoDialog>
     <SettleDetailDialog v-bind="dialogSettleProps" />
   </LoadingLayout>
@@ -118,6 +118,7 @@
 import {
   LoadingLayout,
   AppContainer,
+  AppScrollContainer,
   ChunkCell,
   ProForm,
   ProFormItemV2,
@@ -196,6 +197,8 @@
   isSettlement: isSettlement.value,
 
   auditStatus: '' as any as EnumTaskSettlementAuditStatus,
+
+  timeoutServiceFee: 0,
 });
 
 const BaseState = {
@@ -230,6 +233,7 @@
       form.code = res?.detail?.code;
       form.settlementAccess = res?.detail?.settlementAccess;
       form.auditStatus = res?.detail?.auditStatus;
+      form.timeoutServiceFee = res?.detail?.timeoutServiceFee ?? 0;
       // form.settlementOrderName = setOssFileName(res?.detail?.settlementOrderName);
       // form.settlementOrderTime = res?.detail?.settlementOrderTime ?? '';
     }
@@ -300,6 +304,13 @@
       settlementAmount: { type: 'money' },
       actualSettlementAmount: { type: 'money' },
       settlementReceiveStatus: { type: 'enum', valueEnum: SettlementReceiveStatusText },
+      serviceFee: { type: 'money' },
+      timeoutHours: {
+        formatter: (row: API.GetSettlementTaskUsersQueryResultItem) =>
+          row.timeoutHours ? `${row.timeoutHours}灏忔椂` : '',
+      },
+      timeoutFee: { type: 'money' },
+      otherFee: { type: 'money' },
     },
   }
 );
@@ -312,9 +323,15 @@
     actualSettlementAmount: null as number,
     receiveAccount: '',
     bank: '',
-    totalWorkHours: null as number,
+    // totalWorkHours: null as number,
     settlementAccess: form.settlementAccess,
     // bankBranch: '',
+    timeoutServiceFee: 0,
+    serviceFee: null as number,
+    timeoutHours: null as number,
+    timeoutFee: null as number,
+    otherFee: null as number,
+    remark: '',
   },
 });
 
@@ -326,23 +343,36 @@
       actualSettlementAmount: row?.actualSettlementAmount ?? null,
       receiveAccount: row?.receiveAccount ?? '',
       bank: row?.bank ?? '',
-      totalWorkHours: null as number,
+      // totalWorkHours: row?.totalWorkHours ?? null,
       settlementAccess: form.settlementAccess,
       // bankBranch: row?.bankBranch ?? '',
+      timeoutServiceFee: form.timeoutServiceFee,
+      serviceFee: row?.serviceFee ?? 0,
+      timeoutHours: row?.timeoutHours ?? null,
+      timeoutFee: row?.timeoutFee ?? null,
+      otherFee: row?.otherFee ?? null,
+      remark: row?.remark ?? '',
     });
   }
 }
 
 async function handleAddOrEdit() {
   try {
+    const settlementAmount =
+      (editForm.timeoutFee ?? 0) + (editForm.serviceFee ?? 0) + (editForm.otherFee ?? 0);
     let params: API.EditTaskSettlementOrderRosterCommand = {
       id: editForm.id,
-      settlementAmount: editForm.settlementAmount,
+      settlementAmount: settlementAmount,
       actualSettlementAmount: editForm.actualSettlementAmount,
       receiveAccount: editForm.receiveAccount,
       bank: editForm.bank,
-      totalWorkHours: editForm.totalWorkHours,
+      // totalWorkHours: editForm.totalWorkHours,
       // bankBranch: editForm.bankBranch,
+      serviceFee: editForm.serviceFee,
+      timeoutHours: editForm.timeoutHours,
+      timeoutFee: editForm.timeoutFee,
+      otherFee: editForm.otherFee,
+      remark: editForm.remark,
     };
     let res = await taskServices.editTaskSettlementOrderRoster(params);
     if (res) {
@@ -384,6 +414,7 @@
               bank: '鎵�灞為摱琛�',
               bankBranch: '鎵�灞炴敮琛�',
               receiveAccount: '鏀舵璐︽埛',
+              totalWorkHours: '绱宸ユ椂锛堝皬鏃讹級',
               settlementAmount: '缁撶畻閲戦',
               actualSettlementAmount: '瀹炲彂閲戦',
               errorMessage: '閿欒淇℃伅',
@@ -405,6 +436,7 @@
     code: form.code,
     settlementUserCount: form.settlementTaskUsers.length,
     actualSettlementAmount: form.actualSettlementAmount,
+    settlementAmount: form.settlementAmount,
     settlementAccess: form.settlementAccess,
   });
 }
@@ -420,6 +452,7 @@
     name: '',
     code: '',
     settlementUserCount: 0,
+    settlementAmount: 0,
     actualSettlementAmount: 0,
     settlementAccess: '' as any as EnumEnterpriseWalletAccess,
   },
@@ -485,6 +518,10 @@
     }
   }
 }
+
+.chuck-add-or-edit-actions {
+  margin-bottom: 20px;
+}
 </style>
 <style lang="scss">
 .text-over-tooltip-content {

--
Gitblit v1.9.1