From 7b48aef3fa923377c57b9b0bca18dfef21e562d1 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 15 十月 2025 17:35:06 +0800
Subject: [PATCH] fix: s
---
src/views/Reward/RewardApplyTradeCheck.vue | 2 ++
src/views/Reward/components/RewardApplyTradeCheckDialog.vue | 12 ++++++++++--
src/views/Reward/FinancialApproval.vue | 4 +++-
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/views/Reward/FinancialApproval.vue b/src/views/Reward/FinancialApproval.vue
index ff9a75e..160765c 100644
--- a/src/views/Reward/FinancialApproval.vue
+++ b/src/views/Reward/FinancialApproval.vue
@@ -212,7 +212,8 @@
tradeAmount: row.tradeAmount,
bountyAmount: row.bountyAmount,
tradeTime: row.tradeTime,
- auditTime: row.financeAuditTime,
+ auditTime: row.auditTime,
+ financeAuditTime: row.financeAuditTime,
payRemark: row.payRemark,
payFileUrl: convertApi2FormUrlObjectBySeparator(row.payFileUrl),
title: isCheck ? '璇︽儏' : '璐㈠姟瀹℃壒',
@@ -244,6 +245,7 @@
bountyAmount: '' as any as number,
tradeTime: '',
auditTime: '',
+ financeAuditTime: '',
payRemark: '',
payFileUrl: [] as UploadUserFile[],
title: '',
diff --git a/src/views/Reward/RewardApplyTradeCheck.vue b/src/views/Reward/RewardApplyTradeCheck.vue
index c03ac87..a5a887d 100644
--- a/src/views/Reward/RewardApplyTradeCheck.vue
+++ b/src/views/Reward/RewardApplyTradeCheck.vue
@@ -209,6 +209,7 @@
bountyAmount: row.bountyAmount,
tradeTime: row.tradeTime,
auditTime: row.auditTime,
+ financeAuditTime: row.financeAuditTime,
payRemark: row.payRemark,
payFileUrl: convertApi2FormUrlObjectBySeparator(row.payFileUrl),
title: isCheck ? '璇︽儏' : '鍑鸿处瀹℃壒',
@@ -240,6 +241,7 @@
bountyAmount: '' as any as number,
tradeTime: '',
auditTime: '',
+ financeAuditTime: '',
payRemark: '',
payFileUrl: [] as UploadUserFile[],
title: '',
diff --git a/src/views/Reward/components/RewardApplyTradeCheckDialog.vue b/src/views/Reward/components/RewardApplyTradeCheckDialog.vue
index 590b36e..32eb56a 100644
--- a/src/views/Reward/components/RewardApplyTradeCheckDialog.vue
+++ b/src/views/Reward/components/RewardApplyTradeCheckDialog.vue
@@ -37,8 +37,15 @@
</ProFormCol>
<ProFormCol v-if="form.isCheck">
<ProFormColItem :span="12">
- <ProFormItemV2 label="瀹℃牳鏃ユ湡:" prop="auditTime">
+ <ProFormItemV2 label="瀹℃牳鏃ユ湡:" prop="auditTime" v-if="isApplyTrade">
<ProFormDatePicker v-model="form.auditTime" type="date" format="YYYY-MM-DD HH:mm" />
+ </ProFormItemV2>
+ <ProFormItemV2 label="瀹℃牳鏃ユ湡:" prop="financeAuditTime" v-else>
+ <ProFormDatePicker
+ v-model="form.financeAuditTime"
+ type="date"
+ format="YYYY-MM-DD HH:mm"
+ />
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -157,6 +164,7 @@
bountyAmount: number;
tradeTime: string;
auditTime: string;
+ financeAuditTime: string;
payRemark: string;
payFileUrl: UploadUserFile[];
@@ -224,7 +232,7 @@
},
{
label: '鍑鸿处鐢宠鏃ユ湡',
- key: 'creationTime',
+ key: 'tradeTime',
type: 'date',
},
props.isApplyTrade
--
Gitblit v1.9.1