From 8feaba218a5ce22e92214e4c9082faf59b25c885 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 20 十一月 2025 09:20:35 +0800
Subject: [PATCH] fix: bug

---
 src/views/Reward/FinancialApproval.vue |   66 ++++++++++++++++++++-------------
 1 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/src/views/Reward/FinancialApproval.vue b/src/views/Reward/FinancialApproval.vue
index 78ec38c..5438961 100644
--- a/src/views/Reward/FinancialApproval.vue
+++ b/src/views/Reward/FinancialApproval.vue
@@ -45,11 +45,7 @@
           </QueryFilterItem>
         </template>
       </ProTableQueryFilterBar>
-      <ProTableV2
-        v-bind="proTableProps"
-        :columns="FinancialApprovalColumns"
-        :operationBtns="operationBtns"
-      >
+      <ProTableV2 v-bind="proTableProps" :columns="column" :operationBtns="operationBtns">
       </ProTableV2>
       <RewardApplyTradeCheckDialog v-bind="dialogProps"></RewardApplyTradeCheckDialog>
     </AppContainer>
@@ -80,23 +76,20 @@
   EnumParkBountyTradeDetailAuditStatus,
   EnumParkBountyTradeDetailAuditStatusTag,
   EnumParkBountyTradeDetailAuditStatusText,
+  FinanceTypeEnum,
 } from '@/constants';
 import { ModelValueType } from 'element-plus';
 import RewardApplyTradeCheckDialog from './components/RewardApplyTradeCheckDialog.vue';
-import { convertApi2FormUrlOnlyOne, format } from '@/utils';
-import { FinancialApprovalColumns } from './constants';
+import { convertApi2FormUrlObjectBySeparator, convertApi2FormUrlOnlyOne, format } from '@/utils';
 import { useIndustrialParkDropDownList } from '@/hooks/industrialPark';
+import { useAccess } from '@/hooks';
 
 defineOptions({
   name: 'FinancialApproval',
 });
 
-const operationBtns = defineOperationBtns([
-  {
-    data: {
-      enCode: 'detailBtn',
-      name: '璇︽儏',
-    },
+const operationBtnMap: Record<string, OperationBtnType> = {
+  detailBtn: {
     emits: {
       onClick: (role) => openDialog(role, true),
     },
@@ -105,11 +98,7 @@
         row.financeAuditStatus === EnumParkBountyTradeDetailAuditStatus.Wait,
     },
   },
-  {
-    data: {
-      enCode: 'checkBtn',
-      name: '瀹℃壒',
-    },
+  checkBtn: {
     emits: {
       onClick: (row) => openDialog(row),
     },
@@ -118,7 +107,11 @@
         row.financeAuditStatus !== EnumParkBountyTradeDetailAuditStatus.Wait,
     },
   },
-]);
+};
+
+const { checkSubModuleItemShow, column, operationBtns } = useAccess({
+  operationBtnMap,
+});
 
 const BaseState = {
   loading: true,
@@ -156,6 +149,9 @@
         financeAuditStatus: extraParamState.financeAuditStatus,
         auditTimeBegin: format(extraParamState.creationTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
         auditTimeEnd: format(extraParamState.creationTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
+        auditStatus: EnumParkBountyTradeDetailAuditStatus.Pass,
+        selfAuditStatus: EnumParkBountyTradeDetailAuditStatus.Pass,
+        financeType: FinanceTypeEnum.PlatReward,
       };
       let res = await parkBountyApplyServices.getParkBountyTradeDetailList(params, {
         showLoading: !state.loading,
@@ -169,14 +165,15 @@
       enterpriseId: '',
       financeAuditStatus: '' as any as EnumParkBountyTradeDetailAuditStatus,
       creationTime: [] as unknown as ModelValueType,
-      orderInput: [{ property: 'tradeTime', order: OrderInputType.Desc }],
+      orderInput: [{ property: 'auditTime', order: OrderInputType.Desc }],
     },
     columnsRenderProps: {
       authType: { type: 'enum', valueEnum: EnterpriseTypeText },
       tradeTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+      auditTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
       financeAuditTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
       tradeAmount: { type: 'money' },
-      remianAmount: { type: 'money' },
+      bountyAmount: { type: 'money' },
       financeAuditStatus: {
         type: 'tag',
         valueEnum: EnumParkBountyTradeDetailAuditStatusText,
@@ -196,7 +193,7 @@
         : EnumParkBountyTradeDetailAuditStatus.Pass,
     auditRemark: row.financeAuditRemark,
     payAuditFileUrl: isCheck
-      ? convertApi2FormUrlOnlyOne(row.payAuditFileUrl)
+      ? convertApi2FormUrlObjectBySeparator(row.financeAuditFileUrl)
       : ([] as UploadUserFile[]),
     userName: row.userName,
     enterpriseName: row.enterpriseName,
@@ -206,12 +203,20 @@
     parkName: row.parkName,
     parkTypeName: row.parkTypeName,
     tradeAmount: row.tradeAmount,
-    remianAmount: row.remianAmount,
+    bountyAmount: row.bountyAmount,
     tradeTime: row.tradeTime,
-    auditTime: row.financeAuditTime,
+    auditTime: row.auditTime,
+    financeAuditTime: row.financeAuditTime,
     payRemark: row.payRemark,
-    payFileUrl: convertApi2FormUrlOnlyOne(row.payFileUrl),
+    payFileUrl: convertApi2FormUrlObjectBySeparator(row.payFileUrl),
     title: isCheck ? '璇︽儏' : '璐㈠姟瀹℃壒',
+    incomeCompanyName: row.incomeCompanyName,
+    insureBillNo: row.insureBillNo,
+    incomeBankAccount: row.incomeBankAccount,
+    incomeBankCardNumber: row.incomeBankCardNumber,
+    incomeBankName: row.incomeBankName,
+    creationTime: row.creationTime,
+    insurePeopleNum: row.insurePeopleNum ?? ('' as any as number),
   });
 }
 
@@ -231,12 +236,21 @@
     parkName: '',
     parkTypeName: '',
     tradeAmount: '' as any as number,
-    remianAmount: '' as any as number,
+    bountyAmount: '' as any as number,
     tradeTime: '',
     auditTime: '',
+    financeAuditTime: '',
     payRemark: '',
     payFileUrl: [] as UploadUserFile[],
     title: '',
+
+    incomeCompanyName: '',
+    insureBillNo: '',
+    incomeBankAccount: '',
+    incomeBankCardNumber: '',
+    incomeBankName: '',
+    creationTime: '',
+    insurePeopleNum: 0,
   },
 });
 

--
Gitblit v1.9.1