From 27f846dc2415f9a962c09e45b5447ad0f9106e2b Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 16 十月 2025 17:07:03 +0800
Subject: [PATCH] fix: s
---
src/views/Reward/components/RewardApplyTradeCheckDialog.vue | 79 ++++++++++++++++++++++++++++-----------
1 files changed, 57 insertions(+), 22 deletions(-)
diff --git a/src/views/Reward/components/RewardApplyTradeCheckDialog.vue b/src/views/Reward/components/RewardApplyTradeCheckDialog.vue
index 2f98da0..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>
@@ -47,12 +54,15 @@
<ProFormItemV2
label="涓婁紶鍑瘉:"
prop="payAuditFileUrl"
- :check-rules="[
- {
- message: '璇蜂笂浼犲嚟璇�',
- type: 'upload',
- },
- ]"
+ :required="!isApplyTrade"
+ :check-rules="
+ !isApplyTrade && [
+ {
+ message: '璇蜂笂浼犲嚟璇�',
+ type: 'upload',
+ },
+ ]
+ "
>
<ProFormUpload
v-model:file-url="form.payAuditFileUrl"
@@ -116,7 +126,7 @@
UploadUserFile,
} from '@bole-core/components';
import { usePortraitTableWithAttachment } from '@/hooks';
-import { copyTextToClipboard } from '@/utils';
+import { copyTextToClipboard, StringUtils } from '@/utils';
import {
EnumParkBountyTradeDetailAuditStatus,
EnumParkBountyTradeDetailAuditStatusTextForAdudit,
@@ -124,12 +134,15 @@
} from '@/constants';
defineOptions({
- name: 'WithdrawalApprovalAuditDialog',
+ name: 'RewardApplyTradeCheckDialog',
});
-// type Props = {};
+type Props = {
+ //true 鍑鸿处瀹℃壒 false 璐㈠姟瀹℃壒
+ isApplyTrade?: boolean;
+};
-// const props = withDefaults(defineProps<Props>(), {});
+const props = withDefaults(defineProps<Props>(), {});
const visible = defineModel({ type: Boolean });
@@ -148,11 +161,19 @@
parkName: string;
parkTypeName: string;
tradeAmount: number;
- remianAmount: number;
+ bountyAmount: number;
tradeTime: string;
auditTime: string;
+ financeAuditTime: string;
payRemark: string;
payFileUrl: UploadUserFile[];
+
+ incomeCompanyName: string;
+ insureBillNo: string;
+ incomeBankAccount: string;
+ incomeBankCardNumber: string;
+ incomeBankName: string;
+ creationTime: string;
};
const form = defineModel<Form>('form');
@@ -168,23 +189,24 @@
columns: [
{
label: '杩涜处鍗曚綅',
- key: 'enterpriseName',
- formatter: () => '澶钩璐骇淇濋櫓鏈夐檺鍏徃鎶氬窞涓績鏀叕鍙�',
+ key: 'incomeCompanyName',
+ formatter: (row) => row.incomeCompanyName ?? '澶钩璐骇淇濋櫓鏈夐檺鍏徃鎶氬窞涓績鏀叕鍙�',
},
{
label: '寮�鎴峰悕绉�',
- key: 'societyCreditCode',
- formatter: () => '澶钩璐骇淇濋櫓鏈夐檺鍏徃鎶氬窞涓績鏀叕鍙�',
+ key: 'incomeBankAccount',
+ formatter: (row) => row.incomeBankAccount ?? '澶钩璐骇淇濋櫓鏈夐檺鍏徃鎶氬窞涓績鏀叕鍙�',
},
{
label: '寮�鎴烽摱琛�',
- key: 'contactPhone',
- formatter: () => '涓浗宸ュ晢閾惰鑲′唤鏈夐檺鍏徃鎶氬窞璧ｄ笢鏀',
+ key: 'incomeBankName',
+ formatter: (row) => row.incomeBankName ?? '涓浗宸ュ晢閾惰鑲′唤鏈夐檺鍏徃鎶氬窞璧ｄ笢鏀',
},
{
label: '寮�鎴疯处鍙�',
- key: 'userName',
- formatter: () => '1511 2001 2920 0156 069',
+ key: 'incomeBankCardNumber',
+ formatter: (row) =>
+ StringUtils.insertSpaces(row.incomeBankCardNumber ?? '1511200129200156069'),
},
// {
// label: '浼佷笟绫诲瀷',
@@ -205,10 +227,23 @@
key: 'payRemark',
},
{
- label: '鍑鸿处瀹℃牳鏃ユ湡',
+ label: '淇濆崟鍙�',
+ key: 'insureBillNo',
+ },
+ {
+ label: '鍑鸿处鐢宠鏃ユ湡',
key: 'tradeTime',
type: 'date',
},
+ props.isApplyTrade
+ ? {
+ label: '',
+ }
+ : {
+ label: '鍑鸿处瀹℃牳鏃ユ湡',
+ key: 'auditTime',
+ type: 'date',
+ },
{
label: '鍑鸿处閲戦',
key: 'tradeAmount',
@@ -216,7 +251,7 @@
},
{
label: '璧勯噾浣欓',
- key: 'remianAmount',
+ key: 'bountyAmount',
type: 'money',
},
],
--
Gitblit v1.9.1