From a430dc39516a0d33f02ef902159b23a53b0c92ea Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 16 十月 2025 17:07:09 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/12333GovernmentWeb
---
src/views/Reward/FinancialApproval.vue | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/src/views/Reward/FinancialApproval.vue b/src/views/Reward/FinancialApproval.vue
index 78ec38c..93d7e26 100644
--- a/src/views/Reward/FinancialApproval.vue
+++ b/src/views/Reward/FinancialApproval.vue
@@ -80,10 +80,11 @@
EnumParkBountyTradeDetailAuditStatus,
EnumParkBountyTradeDetailAuditStatusTag,
EnumParkBountyTradeDetailAuditStatusText,
+ FinanceTypeEnum,
} from '@/constants';
import { ModelValueType } from 'element-plus';
import RewardApplyTradeCheckDialog from './components/RewardApplyTradeCheckDialog.vue';
-import { convertApi2FormUrlOnlyOne, format } from '@/utils';
+import { convertApi2FormUrlObjectBySeparator, convertApi2FormUrlOnlyOne, format } from '@/utils';
import { FinancialApprovalColumns } from './constants';
import { useIndustrialParkDropDownList } from '@/hooks/industrialPark';
@@ -156,6 +157,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 +173,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 +201,7 @@
: EnumParkBountyTradeDetailAuditStatus.Pass,
auditRemark: row.financeAuditRemark,
payAuditFileUrl: isCheck
- ? convertApi2FormUrlOnlyOne(row.payAuditFileUrl)
+ ? convertApi2FormUrlObjectBySeparator(row.financeAuditFileUrl)
: ([] as UploadUserFile[]),
userName: row.userName,
enterpriseName: row.enterpriseName,
@@ -206,12 +211,19 @@
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,
});
}
@@ -231,12 +243,20 @@
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: '',
},
});
--
Gitblit v1.9.1