From bc9c1ab46dc7fdd6936df480303e295a9cb110da Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 28 九月 2025 15:53:20 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient

---
 src/views/ServiceChargeManage/ServiceChargeDetail.vue |   57 ++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index dd0843d..5a7e3b8 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -134,7 +134,15 @@
 import EditAccountInfoDialog from './components/EditAccountInfoDialog.vue';
 import SettleDetailDialog from './components/SettleDetailDialog.vue';
 import { Message } from '@bole-core/core';
-import { downloadFile, paginateList, setOssFileName, toThousand } from '@/utils';
+import { SettlementReceiveStatusText } from '@/constants';
+import {
+  downloadFile,
+  downloadFileByUrl,
+  paginateList,
+  setOssFileName,
+  setOSSLink,
+  toThousand,
+} from '@/utils';
 import _ from 'lodash';
 
 defineOptions({
@@ -152,12 +160,14 @@
     emits: {
       onClick: (role) => openDialog(role),
     },
+    extraProps: {
+      hide: () => !isSettlement.value,
+    },
   },
 ]);
 const route = useRoute();
 const id = (route.params.id as string) ?? '';
 const settlement = (route.query.settlement as string) ?? '';
-
 const isSettlement = computed(() => !!settlement);
 
 const form = reactive({
@@ -178,7 +188,7 @@
 
 const state = reactive({ ...BaseState });
 
-const { isLoading } = useQuery({
+const { isLoading, refetch } = useQuery({
   queryKey: ['taskUserServices/getSettlementTaskUsers', id],
   queryFn: async () => {
     return await taskUserServices.getSettlementTaskUsers(
@@ -196,8 +206,8 @@
       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 ?? '';
+      // form.settlementOrderName = setOssFileName(res?.detail?.settlementOrderName);
+      // form.settlementOrderTime = res?.detail?.settlementOrderTime ?? '';
     }
     // if (res?.errors?.length > 0) {
     //   Message.tipMessage('瀛樺湪瀵煎叆閿欒鐨勬暟鎹紝鏄惁瀵煎嚭锛�').then(() => {
@@ -265,6 +275,7 @@
       settlementTime: { type: 'date' },
       settlementAmount: { type: 'money' },
       actualSettlementAmount: { type: 'money' },
+      settlementReceiveStatus: { type: 'enum', valueEnum: SettlementReceiveStatusText },
     },
   }
 );
@@ -277,7 +288,7 @@
     actualSettlementAmount: null as number,
     receiveAccount: '',
     bank: '',
-    bankBranch: '',
+    // bankBranch: '',
   },
 });
 
@@ -289,7 +300,7 @@
       actualSettlementAmount: row?.actualSettlementAmount ?? null,
       receiveAccount: row?.receiveAccount ?? '',
       bank: row?.bank ?? '',
-      bankBranch: row?.bankBranch ?? '',
+      // bankBranch: row?.bankBranch ?? '',
     });
   }
 }
@@ -302,11 +313,12 @@
       actualSettlementAmount: editForm.actualSettlementAmount,
       receiveAccount: editForm.receiveAccount,
       bank: editForm.bank,
-      bankBranch: editForm.bankBranch,
+      // bankBranch: editForm.bankBranch,
     };
     let res = await taskServices.editTaskSettlementOrderRoster(params);
     if (res) {
       Message.successMessage('鎿嶄綔鎴愬姛');
+      refetch();
       getList(paginationState.pageIndex);
     }
   } catch (error) {}
@@ -327,6 +339,7 @@
     let res = await taskServices.importTaskSettlementOrderRosters(params);
     if (res) {
       Message.successMessage('鎿嶄綔鎴愬姛');
+      refetch();
       getList(paginationState.pageIndex);
       if (res?.errors?.length > 0) {
         Message.tipMessage('瀛樺湪瀵煎叆閿欒鐨勬暟鎹紝鏄惁瀵煎嚭锛�').then(() => {
@@ -336,12 +349,12 @@
             workbookHeaderMap: {
               name: '濮撳悕',
               identity: '韬唤璇佸彿',
-              taskName: '浠诲姟鍚嶇О',
+              contactPhoneNumber: '鎵嬫満鍙�',
+              bank: '鎵�灞為摱琛�',
+              bankBranch: '鎵�灞炴敮琛�',
+              receiveAccount: '鏀舵璐︽埛',
               settlementAmount: '缁撶畻閲戦',
               actualSettlementAmount: '瀹炲彂閲戦',
-              receiveAccount: '鏀舵璐︽埛',
-              bank: '鎵�灞為摱琛�',
-              bankBranch: '寮�鎴锋敮琛屽悕绉�',
               errorMessage: '閿欒淇℃伅',
             },
           });
@@ -361,6 +374,7 @@
     code: form.code,
     settlementUserCount: form.settlementTaskUsers.length,
     actualSettlementAmount: form.actualSettlementAmount,
+    settlementAccess: '' as any as EnumEnterpriseWalletAccess,
   });
 }
 
@@ -376,6 +390,7 @@
     code: '',
     settlementUserCount: 0,
     actualSettlementAmount: 0,
+    settlementAccess: '' as any as EnumEnterpriseWalletAccess,
   },
 });
 
@@ -387,6 +402,7 @@
   try {
     let params: API.SureTaskSettlementCommand = {
       taskInfoId: id,
+      settlementAccess: settleEditForm.settlementAccess,
     };
     let res = await taskServices.sureTaskSettlement(params);
     if (res) {
@@ -399,22 +415,17 @@
 
 const handleExport = _.debounce(
   async () => {
-    // if (paginationState.total === 0) {
-    //   Message.warnMessage('娌℃湁鏁版嵁鍙互瀵煎嚭鍝');
-    //   return;
-    // }
+    if (paginationState.total === 0) {
+      Message.warnMessage('娌℃湁鏁版嵁鍙互瀵煎嚭鍝');
+      return;
+    }
     try {
       let params: API.ExportTaskSettlementOrderRostersCommand = {
         id: id,
       };
-      let res = await taskServices.exportTaskSettlementOrderRosters(params, {
-        responseType: 'blob',
-        getResponse: true,
-      });
+      let res = await taskServices.exportTaskSettlementOrderRosters(params);
       if (res) {
-        console.log('res: ', res);
-        //@ts-ignore
-        downloadFile(res?.data, `${form.name}-${form.code}`, 'xlsx');
+        downloadFileByUrl(setOSSLink(res), `${form.name}-${form.code}`);
       }
     } catch (error) {}
   },

--
Gitblit v1.9.1