From 53b0a0b7b5594e1e4ff6036703fa00af84c5ea9f Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期一, 16 六月 2025 19:24:03 +0800 Subject: [PATCH] fix: bug --- src/views/Reward/RewardDeclareDetail.vue | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/views/Reward/RewardDeclareDetail.vue b/src/views/Reward/RewardDeclareDetail.vue index f975347..1bf9d08 100644 --- a/src/views/Reward/RewardDeclareDetail.vue +++ b/src/views/Reward/RewardDeclareDetail.vue @@ -10,6 +10,7 @@ :pro-table-props="proTableProps" :reset="reset" :open-dialog="openDialog" + :column="addRewardApplyStep3Columns" ></DeclareEnterpriseTableView> <MateriaDetailDialog v-bind="dialogProps" @@ -46,7 +47,7 @@ import { convertApi2FormUrlObjectBySeparator, setOSSLink } from '@/utils'; import { useRouteView } from '@/hooks'; import { OrderInputType } from '@bole-core/core'; -import { EnterpriseTypeText } from '@/constants'; +import { EnterpriseTypeText, useAddRewardApplyStep3Columns } from '@/constants'; import { FourStreamsMaterialFileTableItem } from '@/components/commonView/types'; import { useIndustrialParkDropDownList } from '@/hooks/industrialPark'; import { @@ -75,10 +76,15 @@ calculationFileList: [] as CustomerApplyFileTypeListItem[], // bountyAssignFileUlr: [] as UploadUserFile[], // bountyCollectFileUrl: [] as UploadUserFile[], + suportEnterpriseUpload: false, +}); + +const { addRewardApplyStep3Columns } = useAddRewardApplyStep3Columns({ + suportEnterpriseUpload: toRef(form, 'suportEnterpriseUpload'), }); const { data: detail, isLoading } = useQuery({ - queryKey: ['parkBountyApplyServices/getParkBountyApplyDetail', id], + queryKey: ['parkBountyApplyServices/getParkBountyApplyDetailBaseInfo', id], queryFn: async () => { return await parkBountyApplyServices.getParkBountyApplyDetailBaseInfo( { parkBountyApplyId: id }, @@ -87,7 +93,7 @@ } ); }, - placeholderData: () => ({} as API.OutCheckParkBountyApplyBaseInfo), + placeholderData: () => ({} as API.ParkBountyApplyBaseInfo), onSuccess(data) { form.batchNo = data.batchNo; form.parkName = data.parkName; @@ -111,6 +117,7 @@ // form.enterpriseRelateFileUrl = convertApi2FormUrlObjectBySeparator( // data?.enterpriseRelateFileUrl // ); + form.suportEnterpriseUpload = data.suportEnterpriseUpload; getList(); }, @@ -149,6 +156,7 @@ type: 'urlV2', formatter: (row: API.UserCertificationAuditListDto) => setOSSLink(row.licenseUrl), }, + applyAmount: { type: 'money' }, }, } ); @@ -164,7 +172,7 @@ const queryClient = useQueryClient(); async function openDialog(row: API.ParkBountyApplyDetailInfo) { try { - const applyFiles = await queryClient.ensureQueryData({ + const applyFilesRes = await queryClient.ensureQueryData({ queryKey: [ 'enterpriseApplyFileServices/getCustomerUploadApplyFiles', row.enterpriseId, @@ -193,7 +201,7 @@ handleAdd({ list: EnterpriseApplyFileUtils.initParkCollectFileListApplyFiles( applyUploadFiles, - applyFiles, + applyFilesRes.items, lastUploadEnterPactFile ), companyId: row.enterpriseId, -- Gitblit v1.9.1