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/components/RewardApplyTradeCheckDialog.vue | 96 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 67 insertions(+), 29 deletions(-) diff --git a/src/views/Reward/components/RewardApplyTradeCheckDialog.vue b/src/views/Reward/components/RewardApplyTradeCheckDialog.vue index 92e94dc..32eb56a 100644 --- a/src/views/Reward/components/RewardApplyTradeCheckDialog.vue +++ b/src/views/Reward/components/RewardApplyTradeCheckDialog.vue @@ -1,6 +1,12 @@ <template> - <ProDialog title="鍑鸿处瀹℃壒" v-model="visible" @close="onDialogClose" destroy-on-close draggable> - <PortraitTableWithAttachment v-bind="portraitTableWithAttachmentProps"> + <ProDialog + :title="form.title" + v-model="visible" + @close="onDialogClose" + destroy-on-close + draggable + > + <PortraitTableWithAttachment v-bind="portraitTableWithAttachmentProps" labelWidth="100px"> <template #title> <el-row class="portrait-table-with-attachment-title"> <el-text style="color: #333333">鎵撴淇℃伅</el-text> @@ -31,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> @@ -41,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" @@ -109,24 +125,24 @@ ProFormDatePicker, UploadUserFile, } from '@bole-core/components'; -import * as parkBountyApplyServices from '@/services/api/ParkBountyApply'; -import { copyTextToClipboard, usePortraitTableWithAttachment } from '@/hooks'; -import { convertApi2FormUrl, convertApi2FormUrlOnlyOne } from '@/utils'; -import { useQuery } from '@tanstack/vue-query'; +import { usePortraitTableWithAttachment } from '@/hooks'; +import { copyTextToClipboard, StringUtils } from '@/utils'; import { EnumParkBountyTradeDetailAuditStatus, EnumParkBountyTradeDetailAuditStatusTextForAdudit, EnterpriseType, - EnterpriseTypeText, } 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 }); @@ -145,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'); @@ -165,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: () => '涓浗宸ュ晢閾惰鑲′唤鏈夐檺鍏徃鎶氬窞璧d笢鏀', + key: 'incomeBankName', + formatter: (row) => row.incomeBankName ?? '涓浗宸ュ晢閾惰鑲′唤鏈夐檺鍏徃鎶氬窞璧d笢鏀', }, { label: '寮�鎴疯处鍙�', - key: 'userName', - formatter: () => '1511 2001 2920 0156 069', + key: 'incomeBankCardNumber', + formatter: (row) => + StringUtils.insertSpaces(row.incomeBankCardNumber ?? '1511200129200156069'), }, // { // label: '浼佷笟绫诲瀷', @@ -202,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', @@ -213,7 +251,7 @@ }, { label: '璧勯噾浣欓', - key: 'remianAmount', + key: 'bountyAmount', type: 'money', }, ], @@ -243,7 +281,7 @@ function handleApply() { copyTextToClipboard( - `寮�鎴峰悕绉帮細${form.value?.societyCreditCode}\n寮�鎴烽摱琛岋細${form.value?.contactPhone}\n寮�鎴疯处鍙凤細${form.value?.userName}` + `寮�鎴峰悕绉帮細${'澶钩璐骇淇濋櫓鏈夐檺鍏徃鎶氬窞涓績鏀叕鍙�'}\n寮�鎴烽摱琛岋細${'涓浗宸ュ晢閾惰鑲′唤鏈夐檺鍏徃鎶氬窞璧d笢鏀'}\n寮�鎴疯处鍙凤細${'1511 2001 2920 0156 069'}` ); } </script> -- Gitblit v1.9.1