From cbcc6a8eecfc19e93da08500dcc898efdabf7836 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 22 十月 2025 18:38:45 +0800
Subject: [PATCH] fix: s

---
 src/views/ServiceChargeManage/ServiceChargeDetail.vue |   62 +++++++++++++++++++++++--------
 1 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 2046563..440afdb 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,36 +84,32 @@
           :auto-height="false"
           ref="proTable"
           :tableProps="{
-            maxHeight: '250px',
+            maxHeight: '400px',
           }"
         >
         </ProTableV2>
         <div class="chuck-add-or-edit-actions">
           <el-button class="chuck-add-or-edit-actions" @click="handleBack">鍙栨秷</el-button>
           <el-button
-            v-if="form.auditStatus === EnumTaskSettlementAuditStatus.Wait"
+            v-if="
+              isSettlement &&
+              (!form.auditStatus || form.auditStatus !== EnumTaskSettlementAuditStatus.Pass)
+            "
             class="chuck-add-or-edit-actions"
             type="primary"
             @click="handleSubmit()"
             >缁撶畻鐢宠</el-button
           >
           <el-button
-            v-if="form.auditStatus === EnumTaskSettlementAuditStatus.Pass"
+            v-if="isSettlement && form.auditStatus === EnumTaskSettlementAuditStatus.Pass"
             class="chuck-add-or-edit-actions"
             type="primary"
             @click="handleSubmit()"
             >鎻愪氦缁撶畻</el-button
           >
-          <el-button
-            v-if="isSettlement"
-            class="chuck-add-or-edit-actions"
-            type="primary"
-            @click="handleSubmit()"
-            >缁撶畻</el-button
-          >
         </div>
       </ChunkCell>
-    </AppContainer>
+    </AppScrollContainer>
     <EditAccountInfoDialog v-bind="dialogProps"></EditAccountInfoDialog>
     <SettleDetailDialog v-bind="dialogSettleProps" />
   </LoadingLayout>
@@ -122,6 +118,7 @@
 import {
   LoadingLayout,
   AppContainer,
+  AppScrollContainer,
   ChunkCell,
   ProForm,
   ProFormItemV2,
@@ -200,6 +197,8 @@
   isSettlement: isSettlement.value,
 
   auditStatus: '' as any as EnumTaskSettlementAuditStatus,
+
+  timeoutServiceFee: 0,
 });
 
 const BaseState = {
@@ -234,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 ?? '';
     }
@@ -304,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' },
     },
   }
 );
@@ -316,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: '',
   },
 });
 
@@ -330,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) {
@@ -489,6 +515,10 @@
     }
   }
 }
+
+.chuck-add-or-edit-actions {
+  margin-bottom: 20px;
+}
 </style>
 <style lang="scss">
 .text-over-tooltip-content {

--
Gitblit v1.9.1