From e1aeb653d656b3c3be05f06cac212f435cec07c3 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 25 七月 2025 15:55:36 +0800
Subject: [PATCH] Merge branch 'dev-3.4.2.5' of http://120.26.58.240:8888/r/12333GovernmentWeb into dev-3.4.2.5
---
src/views/Reward/RewardGrantRegister.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/Reward/RewardGrantRegister.vue b/src/views/Reward/RewardGrantRegister.vue
index d80a889..c4fa6d6 100644
--- a/src/views/Reward/RewardGrantRegister.vue
+++ b/src/views/Reward/RewardGrantRegister.vue
@@ -174,7 +174,7 @@
},
});
-function openMaterialFileDialog(row: API.GetParkBountyApplyListOutput) {
+function openMaterialFileDialog(row: API.ParkBountyApplyTransferDetailInfo) {
handleMaterialFileAdd({
list: FourStreamsMaterialUtils.initApplyRewardGrandFileList(row),
});
@@ -235,7 +235,7 @@
async function parkBountyApplyTransferReg() {
try {
let params: API.ParkBountyApplyTransferInput = {
- parkBountyApplyDetailId: id,
+ parkBountyApplyDetailId: editRegisterForm.parkBountyApplyDetailId,
transferToAmount: editRegisterForm.amount,
parkBountyApplyId: editRegisterForm.parkBountyApplyId,
transferToFileUrl: convertFormUrl2ApiBySeparator(editRegisterForm.fileUrl),
@@ -262,11 +262,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),
};
--
Gitblit v1.9.1