From dbfe744e5136c1d5977b233a8f12ed0efccc4d3c Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期日, 19 十月 2025 20:01:44 +0800
Subject: [PATCH] feat: 1.2.0.1

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

diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 16b7790..c6b8b7e 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -91,11 +91,21 @@
         <div class="chuck-add-or-edit-actions">
           <el-button class="chuck-add-or-edit-actions" @click="handleBack">鍙栨秷</el-button>
           <el-button
-            v-if="isSettlement"
+            v-if="
+              isSettlement &&
+              (!form.auditStatus || form.auditStatus !== EnumTaskSettlementAuditStatus.Pass)
+            "
             class="chuck-add-or-edit-actions"
             type="primary"
             @click="handleSubmit()"
-            >缁撶畻</el-button
+            >缁撶畻鐢宠</el-button
+          >
+          <el-button
+            v-if="isSettlement && form.auditStatus === EnumTaskSettlementAuditStatus.Pass"
+            class="chuck-add-or-edit-actions"
+            type="primary"
+            @click="handleSubmit()"
+            >鎻愪氦缁撶畻</el-button
           >
         </div>
       </ChunkCell>
@@ -134,7 +144,7 @@
 import EditAccountInfoDialog from './components/EditAccountInfoDialog.vue';
 import SettleDetailDialog from './components/SettleDetailDialog.vue';
 import { Message } from '@bole-core/core';
-import { SettlementReceiveStatusText } from '@/constants';
+import { SettlementReceiveStatusText, EnumTaskSettlementAuditStatus } from '@/constants';
 import {
   downloadFile,
   downloadFileByUrl,
@@ -168,7 +178,7 @@
 const route = useRoute();
 const id = (route.params.id as string) ?? '';
 const settlement = (route.query.settlement as string) ?? '';
-const settlementAccess = route.query.settlementAccess ?? '';
+// const settlementAccess = route.query.settlementAccess ?? '';
 const isSettlement = computed(() => !!settlement);
 
 const form = reactive({
@@ -182,7 +192,10 @@
 
   settlementUrl: [] as UploadUserFile[],
 
-  settlementAccess: settlementAccess,
+  settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+  isSettlement: isSettlement.value,
+
+  auditStatus: '' as any as EnumTaskSettlementAuditStatus,
 });
 
 const BaseState = {
@@ -192,13 +205,16 @@
 const state = reactive({ ...BaseState });
 
 const { isLoading, refetch } = useQuery({
-  queryKey: ['taskUserServices/getSettlementTaskUsers', id, toRef(form, 'settlementAccess')],
+  queryKey: ['taskUserServices/getSettlementTaskUsers', id, toRef(form, 'isSettlement')],
   queryFn: async () => {
     let params: API.APIgetSettlementTaskUsersParams = {
       id: id,
     };
-    if (form.settlementAccess) {
-      params.settlementAccess = Number(form.settlementAccess);
+    // if (form.settlementAccess) {
+    //   params.settlementAccess = Number(form.settlementAccess);
+    // }
+    if (form.isSettlement) {
+      params.isImport = true;
     }
     return await taskUserServices.getSettlementTaskUsers(params, {
       showLoading: false,
@@ -212,6 +228,8 @@
       form.settlementAmount = res?.detail?.settlementAmount ?? 0;
       form.actualSettlementAmount = res?.detail?.actualSettlementAmount ?? 0;
       form.code = res?.detail?.code;
+      form.settlementAccess = res?.detail?.settlementAccess;
+      form.auditStatus = res?.detail?.auditStatus;
       // form.settlementOrderName = setOssFileName(res?.detail?.settlementOrderName);
       // form.settlementOrderTime = res?.detail?.settlementOrderTime ?? '';
     }
@@ -294,6 +312,8 @@
     actualSettlementAmount: null as number,
     receiveAccount: '',
     bank: '',
+    totalWorkHours: null as number,
+    settlementAccess: form.settlementAccess,
     // bankBranch: '',
   },
 });
@@ -306,6 +326,8 @@
       actualSettlementAmount: row?.actualSettlementAmount ?? null,
       receiveAccount: row?.receiveAccount ?? '',
       bank: row?.bank ?? '',
+      totalWorkHours: row?.totalWorkHours ?? null,
+      settlementAccess: form.settlementAccess,
       // bankBranch: row?.bankBranch ?? '',
     });
   }
@@ -319,12 +341,13 @@
       actualSettlementAmount: editForm.actualSettlementAmount,
       receiveAccount: editForm.receiveAccount,
       bank: editForm.bank,
+      totalWorkHours: editForm.totalWorkHours,
       // bankBranch: editForm.bankBranch,
     };
     let res = await taskServices.editTaskSettlementOrderRoster(params);
     if (res) {
       Message.successMessage('鎿嶄綔鎴愬姛');
-      form.settlementAccess = '';
+      form.isSettlement = false;
       refetch();
       getList(paginationState.pageIndex);
     }
@@ -346,7 +369,7 @@
     let res = await taskServices.importTaskSettlementOrderRosters(params);
     if (res) {
       Message.successMessage('鎿嶄綔鎴愬姛');
-      form.settlementAccess = '';
+      form.isSettlement = false;
       refetch();
       getList(paginationState.pageIndex);
       if (res?.errors?.length > 0) {
@@ -382,6 +405,7 @@
     code: form.code,
     settlementUserCount: form.settlementTaskUsers.length,
     actualSettlementAmount: form.actualSettlementAmount,
+    settlementAccess: form.settlementAccess,
   });
 }
 
@@ -397,6 +421,7 @@
     code: '',
     settlementUserCount: 0,
     actualSettlementAmount: 0,
+    settlementAccess: '' as any as EnumEnterpriseWalletAccess,
   },
 });
 

--
Gitblit v1.9.1