From e3e1a34d49ba62dc81166a16ed3d877b356d51a8 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 21 十月 2025 14:59:17 +0800
Subject: [PATCH] fix: bug

---
 src/views/ServiceChargeManage/ServiceChargeDetail.vue |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 745a64d..5dd6476 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,
@@ -330,7 +327,7 @@
       actualSettlementAmount: row?.actualSettlementAmount ?? null,
       receiveAccount: row?.receiveAccount ?? '',
       bank: row?.bank ?? '',
-      totalWorkHours: null as number,
+      totalWorkHours: row?.totalWorkHours ?? null,
       settlementAccess: form.settlementAccess,
       // bankBranch: row?.bankBranch ?? '',
     });
@@ -388,6 +385,7 @@
               bank: '鎵�灞為摱琛�',
               bankBranch: '鎵�灞炴敮琛�',
               receiveAccount: '鏀舵璐︽埛',
+              totalWorkHours: '绱宸ユ椂锛堝皬鏃讹級',
               settlementAmount: '缁撶畻閲戦',
               actualSettlementAmount: '瀹炲彂閲戦',
               errorMessage: '閿欒淇℃伅',
@@ -409,6 +407,7 @@
     code: form.code,
     settlementUserCount: form.settlementTaskUsers.length,
     actualSettlementAmount: form.actualSettlementAmount,
+    settlementAccess: form.settlementAccess,
   });
 }
 
@@ -424,6 +423,7 @@
     code: '',
     settlementUserCount: 0,
     actualSettlementAmount: 0,
+    settlementAccess: '' as any as EnumEnterpriseWalletAccess,
   },
 });
 
@@ -487,6 +487,10 @@
     }
   }
 }
+
+.chuck-add-or-edit-actions {
+  margin-bottom: 20px;
+}
 </style>
 <style lang="scss">
 .text-over-tooltip-content {

--
Gitblit v1.9.1