From 60107cb11e472d693de543e8ec422bfe8e31dbec Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 31 十月 2025 17:30:48 +0800
Subject: [PATCH] Merge branch 'master' into dev-3.4.2.10
---
src/views/Reward/components/BatchRegisterDialog.vue | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/views/Reward/components/BatchRegisterDialog.vue b/src/views/Reward/components/BatchRegisterDialog.vue
index a3f1014..8ed6086 100644
--- a/src/views/Reward/components/BatchRegisterDialog.vue
+++ b/src/views/Reward/components/BatchRegisterDialog.vue
@@ -22,7 +22,12 @@
/>
</div>
</ProFormItemV2>
- <ProFormItemV2 label="鐧昏绫诲瀷:" prop="incomeType" required>
+ <ProFormItemV2
+ label="鐧昏绫诲瀷:"
+ prop="incomeType"
+ required
+ :check-rules="[{ message: '璇烽�夋嫨鐧昏绫诲瀷' }]"
+ >
<ProFormRadio
v-model="form.incomeType"
:value-enum="incomeTypeEnum"
@@ -45,11 +50,11 @@
</ProFormItemV2>
<ProFormItemV2
label="涓婁紶鐧昏鍑瘉:"
- prop="certificateUrl"
+ prop="fileUrl"
:check-rules="[{ message: '璇蜂笂浼犵櫥璁板嚟璇�', type: 'upload' }]"
>
<ProFormUpload
- v-model:file-url="form.certificateUrl"
+ v-model:file-url="form.fileUrl"
:limitFileSize="50"
accept="doc,docx,pdf,xls,xlsx,jpg/jpeg,png"
></ProFormUpload>
@@ -102,15 +107,16 @@
incomeType: IncomeTypeEnum;
parkBountyApplyId: string;
showSuportPlatRecharge: boolean;
+ showSuportFiscalRecharge: boolean;
- certificateUrl: UploadUserFile[];
+ fileUrl: UploadUserFile[];
};
const form = defineModel<Form>('form');
const incomeTypeEnum = computed(() => {
return [
- {
+ form.value.showSuportFiscalRecharge && {
label: IncomeTypeEnumText[IncomeTypeEnum.Fiscal],
value: IncomeTypeEnum.Fiscal,
},
@@ -124,14 +130,18 @@
const deleteList = ref<string[]>([]);
watch(visible, (value, oldValue) => {
- if (value && !oldValue) {
+ if (value && !oldValue && !form.value.incomeType) {
getParkBountyApplyBatchFinanceEnterprise();
+ } else {
+ form.value.companyList = [];
+ form.value.parkBountyApplyDetailIds = [];
+ deleteList.value = [];
}
});
async function getParkBountyApplyBatchTransferEnterprise() {
try {
- let res = await parkBountyApplyServices.getParkBountyApplyBatchTransferEnterprise({
+ let res = await parkBountyApplyServices.getParkBountyApplyBatchTransferRegEnterprise({
parkBountyApplyId: form.value.parkBountyApplyId,
});
if (res) {
@@ -144,7 +154,7 @@
async function getParkBountyApplyBatchFinanceEnterprise() {
try {
- let res = await parkBountyApplyServices.getParkBountyApplyBatchFinanceEnterprise({
+ let res = await parkBountyApplyServices.getParkBountyApplyBatchFinanceRegEnterprise({
parkBountyApplyId: form.value.parkBountyApplyId,
});
if (res) {
--
Gitblit v1.9.1