From 503dcbe9d248d7a6b759c1725d155b07de31d83a Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 28 七月 2025 14:59:15 +0800
Subject: [PATCH] fix: 奖励金审核
---
src/views/Reward/RewardApplyTradeCheck.vue | 10 +++++-----
src/views/Reward/components/RewardApplyTradeCheckDialog.vue | 19 +++++++++++--------
src/views/Reward/constants/columns.ts | 2 +-
src/views/Reward/FinancialApproval.vue | 14 ++++++++------
4 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/src/views/Reward/FinancialApproval.vue b/src/views/Reward/FinancialApproval.vue
index af7b6fe..bf256cd 100644
--- a/src/views/Reward/FinancialApproval.vue
+++ b/src/views/Reward/FinancialApproval.vue
@@ -83,7 +83,7 @@
} 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 +156,7 @@
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,
};
let res = await parkBountyApplyServices.getParkBountyTradeDetailList(params, {
showLoading: !state.loading,
@@ -169,11 +170,12 @@
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' },
bountyAmount: { type: 'money' },
@@ -196,7 +198,7 @@
: EnumParkBountyTradeDetailAuditStatus.Pass,
auditRemark: row.financeAuditRemark,
payAuditFileUrl: isCheck
- ? convertApi2FormUrlOnlyOne(row.payAuditFileUrl)
+ ? convertApi2FormUrlObjectBySeparator(row.payAuditFileUrl)
: ([] as UploadUserFile[]),
userName: row.userName,
enterpriseName: row.enterpriseName,
@@ -206,11 +208,11 @@
parkName: row.parkName,
parkTypeName: row.parkTypeName,
tradeAmount: row.tradeAmount,
- remianAmount: row.remianAmount,
+ bountyAmount: row.bountyAmount,
tradeTime: row.tradeTime,
auditTime: row.financeAuditTime,
payRemark: row.payRemark,
- payFileUrl: convertApi2FormUrlOnlyOne(row.payFileUrl),
+ payFileUrl: convertApi2FormUrlObjectBySeparator(row.payFileUrl),
title: isCheck ? '璇︽儏' : '璐㈠姟瀹℃壒',
});
}
@@ -231,7 +233,7 @@
parkName: '',
parkTypeName: '',
tradeAmount: '' as any as number,
- remianAmount: '' as any as number,
+ bountyAmount: '' as any as number,
tradeTime: '',
auditTime: '',
payRemark: '',
diff --git a/src/views/Reward/RewardApplyTradeCheck.vue b/src/views/Reward/RewardApplyTradeCheck.vue
index 1ce39a1..3bc5e5d 100644
--- a/src/views/Reward/RewardApplyTradeCheck.vue
+++ b/src/views/Reward/RewardApplyTradeCheck.vue
@@ -83,7 +83,7 @@
} 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';
@@ -195,7 +195,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,11 +204,11 @@
parkName: row.parkName,
parkTypeName: row.parkTypeName,
tradeAmount: row.tradeAmount,
- remianAmount: row.remianAmount,
+ bountyAmount: row.bountyAmount,
tradeTime: row.tradeTime,
auditTime: row.auditTime,
payRemark: row.payRemark,
- payFileUrl: convertApi2FormUrlOnlyOne(row.payFileUrl),
+ payFileUrl: convertApi2FormUrlObjectBySeparator(row.payFileUrl),
title: isCheck ? '璇︽儏' : '鍑鸿处瀹℃壒',
});
}
@@ -229,7 +229,7 @@
parkName: '',
parkTypeName: '',
tradeAmount: '' as any as number,
- remianAmount: '' as any as number,
+ bountyAmount: '' as any as number,
tradeTime: '',
auditTime: '',
payRemark: '',
diff --git a/src/views/Reward/components/RewardApplyTradeCheckDialog.vue b/src/views/Reward/components/RewardApplyTradeCheckDialog.vue
index 2f98da0..3bd8b9b 100644
--- a/src/views/Reward/components/RewardApplyTradeCheckDialog.vue
+++ b/src/views/Reward/components/RewardApplyTradeCheckDialog.vue
@@ -47,12 +47,15 @@
<ProFormItemV2
label="涓婁紶鍑瘉:"
prop="payAuditFileUrl"
- :check-rules="[
- {
- message: '璇蜂笂浼犲嚟璇�',
- type: 'upload',
- },
- ]"
+ :required="form.auditStatus === EnumParkBountyTradeDetailAuditStatus.Pass"
+ :check-rules="
+ form.auditStatus === EnumParkBountyTradeDetailAuditStatus.Pass && [
+ {
+ message: '璇蜂笂浼犲嚟璇�',
+ type: 'upload',
+ },
+ ]
+ "
>
<ProFormUpload
v-model:file-url="form.payAuditFileUrl"
@@ -148,7 +151,7 @@
parkName: string;
parkTypeName: string;
tradeAmount: number;
- remianAmount: number;
+ bountyAmount: number;
tradeTime: string;
auditTime: string;
payRemark: string;
@@ -216,7 +219,7 @@
},
{
label: '璧勯噾浣欓',
- key: 'remianAmount',
+ key: 'bountyAmount',
type: 'money',
},
],
diff --git a/src/views/Reward/constants/columns.ts b/src/views/Reward/constants/columns.ts
index b9d017c..c1e9ac2 100644
--- a/src/views/Reward/constants/columns.ts
+++ b/src/views/Reward/constants/columns.ts
@@ -146,7 +146,7 @@
},
{
id: '10',
- enCode: 'tradeTime',
+ enCode: 'auditTime',
name: '鍑鸿处瀹℃牳鏃ユ湡',
width: 180,
},
--
Gitblit v1.9.1