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/RewardApplyTradeCheck.vue | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/views/Reward/RewardApplyTradeCheck.vue b/src/views/Reward/RewardApplyTradeCheck.vue index 1ce39a1..75bc690 100644 --- a/src/views/Reward/RewardApplyTradeCheck.vue +++ b/src/views/Reward/RewardApplyTradeCheck.vue @@ -51,7 +51,7 @@ :operationBtns="operationBtns" > </ProTableV2> - <RewardApplyTradeCheckDialog v-bind="dialogProps"></RewardApplyTradeCheckDialog> + <RewardApplyTradeCheckDialog isApplyTrade v-bind="dialogProps"></RewardApplyTradeCheckDialog> </AppContainer> </LoadingLayout> </template> @@ -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 { RewardApplyTradeCheckColumns } from './constants'; import { useIndustrialParkDropDownList } from '@/hooks/industrialPark'; @@ -156,6 +157,8 @@ creationTimeBegin: format(extraParamState.creationTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'), creationTimeEnd: format(extraParamState.creationTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'), auditStatus: extraParamState.auditStatus, + selfAuditStatus: EnumParkBountyTradeDetailAuditStatus.Pass, + financeType: FinanceTypeEnum.PlatReward, }; let res = await parkBountyApplyServices.getParkBountyTradeDetailList(params, { showLoading: !state.loading, @@ -195,7 +198,7 @@ ? EnumParkBountyTradeDetailAuditStatus.Reject : EnumParkBountyTradeDetailAuditStatus.Pass, auditRemark: row.auditRemark, - payAuditFileUrl: convertApi2FormUrlOnlyOne(row.payAuditFileUrl), + payAuditFileUrl: convertApi2FormUrlObjectBySeparator(row.payAuditFileUrl), userName: row.userName, enterpriseName: row.enterpriseName, societyCreditCode: row.societyCreditCode, @@ -204,12 +207,19 @@ parkName: row.parkName, parkTypeName: row.parkTypeName, tradeAmount: row.tradeAmount, - remianAmount: row.remianAmount, + bountyAmount: row.bountyAmount, tradeTime: row.tradeTime, 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, }); } @@ -229,12 +239,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