From 89f387786da0e4383cf06ee162526db54971f9cf Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 23 十月 2025 15:21:16 +0800
Subject: [PATCH] fix: s
---
src/views/Reward/RewardGrantRegister.vue | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/views/Reward/RewardGrantRegister.vue b/src/views/Reward/RewardGrantRegister.vue
index 0515dc7..bd2dfa9 100644
--- a/src/views/Reward/RewardGrantRegister.vue
+++ b/src/views/Reward/RewardGrantRegister.vue
@@ -27,8 +27,6 @@
v-bind="dialogMaterialFileProps"
:show-upload-btn="false"
:show-delete-btn="false"
- :show-check-btn="false"
- downloadBtnText="鏌ョ湅"
title="鏌ョ湅鍑瘉"
:BusinessTypeEnumText="TransferFileEnumInRewardGrandText"
/>
@@ -73,7 +71,7 @@
SettleStatusEnum,
TransferFileEnumInRewardGrandText,
} from '@/constants';
-import { useDeclareEnterpriseTable, rewardGrantRegisterColumns } from '@/hooks';
+import { useDeclareEnterpriseTable, useRewardGrantRegisterColumns } from '@/hooks';
import { TransferFileEnumInRewardGrandTableItem } from '@/components/commonView/types';
import RegisterGrantDialog from './components/RegisterGrantDialog.vue';
import BatchRegisterDialog from './components/BatchRegisterDialog.vue';
@@ -99,9 +97,13 @@
settleSumAmount: 0,
parkCollectFileList: [] as CustomerApplyFileTypeListItem[],
calculationFileList: [] as CustomerApplyFileTypeListItem[],
+ extraListFiles: [] as CustomerApplyFileTypeListItem[],
suportPlatRecharge: false,
+ suportFinance: false,
});
+
+const { rewardGrantRegisterColumns } = useRewardGrantRegisterColumns();
const { extraParamState, paginationState, getList, reset, proTableProps } =
useDeclareEnterpriseTable({
@@ -162,7 +164,11 @@
form.calculationFileList = EnterpriseApplyFileUtils.convertApiFileToParkCollectFileList(
data.collectCountListFiles
);
+ form.extraListFiles = EnterpriseApplyFileUtils.convertApiFileToExtraListFiles(
+ data.extraListFiles
+ );
form.suportPlatRecharge = data.suportPlatRecharge;
+ form.suportFinance = data.suportFinance;
getList();
},
@@ -194,6 +200,7 @@
amount: 0,
showSuportPlatRecharge: false,
showSuportFiscalRecharge: false,
+ // showSuportFinance: false,
},
});
@@ -202,7 +209,8 @@
incomeType: '' as any as IncomeTypeEnum,
fileUrl: [] as UploadUserFile[],
showSuportPlatRecharge: row.settleStatus === SettleStatusEnum.WaitForSettle,
- showSuportFiscalRecharge: row.financeStatus === FinanceStatusEnum.WaitForIncome,
+ showSuportFiscalRecharge:
+ form.suportFinance && row.financeStatus === FinanceStatusEnum.WaitForIncome,
parkBountyApplyId: row.parkBountyApplyId,
parkBountyApplyDetailId: row.parkBountyApplyDetailId,
amount: 0,
@@ -262,11 +270,11 @@
},
});
-async function handleImportParkBountyData(response: UploadUserFile) {
+async function handleImportParkBountyData() {
try {
let params: API.ImportBountyApplyDataInput = {
parkBountyApplyId: uploadFileForm.parkBountyApplyId,
- url: response.url,
+ url: uploadFileForm.url?.[0]?.path ?? '',
financeToFileUrl: convertFormUrl2ApiBySeparator(uploadFileForm.financeToFileUrl),
transferToFileUrl: convertFormUrl2ApiBySeparator(uploadFileForm.transferToFileUrl),
};
@@ -299,6 +307,7 @@
handleBatchRegisterAdd({
parkBountyApplyId: id,
showSuportPlatRecharge: form.suportPlatRecharge,
+ showSuportFiscalRecharge: form.suportFinance,
});
} catch (error) {}
}
@@ -313,9 +322,10 @@
parkBountyApplyDetailIds: [] as string[],
amount: 0,
companyList: [] as API.GetNotTransferCompanyNameListOutput[],
- incomeType: IncomeTypeEnum.Fiscal,
+ incomeType: '' as any as IncomeTypeEnum,
parkBountyApplyId: '',
showSuportPlatRecharge: false,
+ showSuportFiscalRecharge: false,
fileUrl: [] as UploadUserFile[],
},
--
Gitblit v1.9.1