From 1c9958b4088f9f90d397c890e575c72ef80dea54 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 16 十月 2025 15:51:34 +0800
Subject: [PATCH] fix: bug
---
src/views/Reward/components/RewardApplyTradeCheckDialog.vue | 147 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 108 insertions(+), 39 deletions(-)
diff --git a/src/views/Reward/components/RewardApplyTradeCheckDialog.vue b/src/views/Reward/components/RewardApplyTradeCheckDialog.vue
index 42d82a7..59deac6 100644
--- a/src/views/Reward/components/RewardApplyTradeCheckDialog.vue
+++ b/src/views/Reward/components/RewardApplyTradeCheckDialog.vue
@@ -1,6 +1,19 @@
<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>
+ <el-button type="primary" link @click="handleApply">澶嶅埗</el-button>
+ </el-row>
+ </template>
+ </PortraitTableWithAttachment>
<ProForm
:model="form"
ref="dialogForm"
@@ -24,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>
@@ -34,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"
@@ -102,24 +125,24 @@
ProFormDatePicker,
UploadUserFile,
} from '@bole-core/components';
-import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
import { usePortraitTableWithAttachment } from '@/hooks';
-import { convertApi2FormUrl, convertApi2FormUrlOnlyOne } from '@/utils';
-import { useQuery } from '@tanstack/vue-query';
+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 });
@@ -138,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');
@@ -157,24 +188,36 @@
annexList: computed(() => form.value?.payFileUrl),
columns: [
{
- label: '寮�鎴疯处鍙�',
- key: 'userName',
- formatter: () => '1511 2001 2920 0156 069',
- },
- {
label: '杩涜处鍗曚綅',
- key: 'enterpriseName',
- formatter: () => '澶钩璐骇淇濋櫓鏈夐檺鍏徃鎶氬窞涓績鏀叕鍙�',
+ key: 'incomeCompanyName',
+ formatter: (row) =>
+ row.id === '52febfa5-1df6-23d6-21fd-3a1cfdef4222'
+ ? '涓浗澶у湴璐骇淇濋櫓鑲′唤鏈夐檺鍏徃娣卞湷鍒嗗叕鍙�'
+ : row.incomeCompanyName ?? '澶钩璐骇淇濋櫓鏈夐檺鍏徃鎶氬窞涓績鏀叕鍙�',
},
{
label: '寮�鎴峰悕绉�',
- key: 'societyCreditCode',
- formatter: () => '澶钩璐骇淇濋櫓鏈夐檺鍏徃鎶氬窞涓績鏀叕鍙�',
+ key: 'incomeBankAccount',
+ formatter: (row) =>
+ row.id === '52febfa5-1df6-23d6-21fd-3a1cfdef4222'
+ ? '涓浗澶у湴璐骇淇濋櫓鑲′唤鏈夐檺鍏徃娣卞湷鍒嗗叕鍙�'
+ : row.incomeBankAccount ?? '澶钩璐骇淇濋櫓鏈夐檺鍏徃鎶氬窞涓績鏀叕鍙�',
},
{
label: '寮�鎴烽摱琛�',
- key: 'contactPhone',
- formatter: () => '涓浗宸ュ晢閾惰鑲′唤鏈夐檺鍏徃鎶氬窞璧ｄ笢鏀',
+ key: 'incomeBankName',
+ formatter: (row) =>
+ row.id === '52febfa5-1df6-23d6-21fd-3a1cfdef4222'
+ ? '涓浗宸ュ晢閾惰鑲′唤鏈夐檺鍏徃娣卞湷鍠滃勾鏀'
+ : row.incomeBankName ?? '涓浗宸ュ晢閾惰鑲′唤鏈夐檺鍏徃鎶氬窞璧ｄ笢鏀',
+ },
+ {
+ label: '寮�鎴疯处鍙�',
+ key: 'incomeBankCardNumber',
+ formatter: (row) =>
+ row.id === '52febfa5-1df6-23d6-21fd-3a1cfdef4222'
+ ? StringUtils.insertSpaces('4000032419200171762')
+ : StringUtils.insertSpaces(row.incomeBankCardNumber ?? '1511200129200156069'),
},
// {
// label: '浼佷笟绫诲瀷',
@@ -190,23 +233,36 @@
// label: '鍥尯绫诲瀷',
// key: 'parkTypeName',
// },
- // {
- // label: '娑堣垂绫诲瀷',
- // key: 'payRemark',
- // },
{
- label: '鐢宠鍑鸿处閲戦',
+ label: '娑堣垂绫诲瀷',
+ key: 'payRemark',
+ },
+ {
+ label: '淇濆崟鍙�',
+ key: 'insureBillNo',
+ },
+ {
+ label: '鍑鸿处鐢宠鏃ユ湡',
+ key: 'tradeTime',
+ type: 'date',
+ },
+ props.isApplyTrade
+ ? {
+ label: '',
+ }
+ : {
+ label: '鍑鸿处瀹℃牳鏃ユ湡',
+ key: 'auditTime',
+ type: 'date',
+ },
+ {
+ label: '鍑鸿处閲戦',
key: 'tradeAmount',
type: 'money',
},
{
- label: '鐢宠鍑鸿处鏃堕棿',
- key: 'tradeTime',
- type: 'date',
- },
- {
label: '璧勯噾浣欓',
- key: 'remianAmount',
+ key: 'bountyAmount',
type: 'money',
},
],
@@ -233,4 +289,17 @@
}
});
}
+
+function handleApply() {
+ copyTextToClipboard(
+ `寮�鎴峰悕绉帮細${'澶钩璐骇淇濋櫓鏈夐檺鍏徃鎶氬窞涓績鏀叕鍙�'}\n寮�鎴烽摱琛岋細${'涓浗宸ュ晢閾惰鑲′唤鏈夐檺鍏徃鎶氬窞璧ｄ笢鏀'}\n寮�鎴疯处鍙凤細${'1511 2001 2920 0156 069'}`
+ );
+}
</script>
+<style lang="scss" scoped>
+@use '@/style/common.scss' as *;
+
+.portrait-table-with-attachment-title {
+ justify-content: space-between;
+}
+</style>
--
Gitblit v1.9.1