From bd20a385dd86cf32735578c4c140a0aebf758e45 Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期四, 15 五月 2025 17:15:07 +0800 Subject: [PATCH] fix: bug --- src/views/MaterialReview/MaterialReviewAudit.vue | 91 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 70 insertions(+), 21 deletions(-) diff --git a/src/views/MaterialReview/MaterialReviewAudit.vue b/src/views/MaterialReview/MaterialReviewAudit.vue index c4b4664..d7986e5 100644 --- a/src/views/MaterialReview/MaterialReviewAudit.vue +++ b/src/views/MaterialReview/MaterialReviewAudit.vue @@ -89,13 +89,18 @@ import MateriaDetailDialog from '@/components/commonView/MateriaDetailDialog.vue'; import { useQuery, useQueryClient } from '@tanstack/vue-query'; import * as parkBountyApplyServices from '@/services/api/ParkBountyApply'; -import { convertApi2FormUrlOnlyOne, setOSSLink } from '@/utils'; +import * as enterpriseApplyFileServices from '@/services/api/EnterpriseApplyFile'; +import { convertApi2FormUrlObjectBySeparator, setOSSLink } from '@/utils'; import { useGlobalEventContext, useRouteView } from '@/hooks'; import { FormInstance } from 'element-plus'; import { Message, OrderInputType } from '@bole-core/core'; import { FourStreamsMaterialFileTableItem } from '@/components/commonView/types'; import { useIndustrialParkDropDownList } from '@/hooks/industrialPark'; -import { FourStreamsMaterialUtils } from '@/components/commonView/utils'; +import { + CustomerApplyFileTypeListItem, + EnterpriseApplyFileUtils, + FourStreamsMaterialUtils, +} from '@/components/commonView/utils'; defineOptions({ name: 'MaterialReviewAudit', @@ -111,11 +116,13 @@ parkTypeName: '', applyMonth: '', applySumAmount: 0, - enterpriseTaxSubFileUrl: [] as UploadUserFile[], - enterpriseOperateFileUrl: [] as UploadUserFile[], - bountyAssignFileUlr: [] as UploadUserFile[], - bountyCollectFileUrl: [] as UploadUserFile[], - enterpriseRelateFileUrl: [] as UploadUserFile[], + // enterpriseTaxSubFileUrl: [] as UploadUserFile[], + // enterpriseOperateFileUrl: [] as UploadUserFile[], + // enterpriseRelateFileUrl: [] as UploadUserFile[], + // bountyAssignFileUlr: [] as UploadUserFile[], + // bountyCollectFileUrl: [] as UploadUserFile[], + parkCollectFileList: [] as CustomerApplyFileTypeListItem[], + calculationFileList: [] as CustomerApplyFileTypeListItem[], status: '' as any as BountyCheckStatusEnum, remark: '', @@ -138,11 +145,23 @@ form.parkTypeName = data.parkTypeName; form.applyMonth = data.applyMonth; form.applySumAmount = data.applySumAmount; - form.enterpriseTaxSubFileUrl = convertApi2FormUrlOnlyOne(data?.enterpriseTaxSubFileUrl); - form.enterpriseOperateFileUrl = convertApi2FormUrlOnlyOne(data?.enterpriseOperateFileUrl); - form.bountyAssignFileUlr = convertApi2FormUrlOnlyOne(data?.bountyAssignFileUlr); - form.bountyCollectFileUrl = convertApi2FormUrlOnlyOne(data?.bountyCollectFileUrl); - form.enterpriseRelateFileUrl = convertApi2FormUrlOnlyOne(data?.enterpriseRelateFileUrl); + // form.enterpriseTaxSubFileUrl = convertApi2FormUrlObjectBySeparator( + // data?.enterpriseTaxSubFileUrl + // ); + // form.enterpriseOperateFileUrl = convertApi2FormUrlObjectBySeparator( + // data?.enterpriseOperateFileUrl + // ); + // form.bountyAssignFileUlr = convertApi2FormUrlObjectBySeparator(data?.bountyAssignFileUlr); + // form.bountyCollectFileUrl = convertApi2FormUrlObjectBySeparator(data?.bountyCollectFileUrl); + // form.enterpriseRelateFileUrl = convertApi2FormUrlObjectBySeparator( + // data?.enterpriseRelateFileUrl + // ); + form.parkCollectFileList = EnterpriseApplyFileUtils.convertApiFileToParkCollectFileList( + data.listFiles + ); + form.calculationFileList = EnterpriseApplyFileUtils.convertApiFileToParkCollectFileList( + data.collectCountListFiles + ); getList(); }, @@ -225,19 +244,49 @@ const { dialogProps, handleAdd, editForm } = useFormDialog({ defaultFormParams: { - list: [] as FourStreamsMaterialFileTableItem[], + list: [] as CustomerApplyFileTypeListItem[], companyId: '', }, }); const { getIndustrialParkTypeNameById } = useIndustrialParkDropDownList(); -function openDialog(row: API.ParkBountyApplyDetailInfo) { - handleAdd({ - list: FourStreamsMaterialUtils.initFourStreamsMaterialFileList( - row, - getIndustrialParkTypeNameById(detail.value?.parkId) - ), - companyId: row.enterpriseId, - }); + +async function openDialog(row: API.ParkBountyApplyDetailInfo) { + try { + const applyFiles = await queryClient.ensureQueryData({ + queryKey: [ + 'enterpriseApplyFileServices/getCustomerUploadApplyFiles', + row.enterpriseId, + form.applyMonth, + ], + queryFn: async () => { + return await enterpriseApplyFileServices.getCustomerUploadApplyFiles({ + enterpriseId: row.enterpriseId, + withMonth: form.applyMonth, + }); + }, + }); + const lastUploadEnterPactFile = await queryClient.ensureQueryData({ + queryKey: ['enterpriseApplyFileServices/getCustomerUploadApplyFiles', row.enterpriseId], + queryFn: async () => { + return await parkBountyApplyServices.getEnterpriseLastUploadEnterPactFileNew({ + companyId: row.enterpriseId, + }); + }, + }); + + const applyUploadFiles = await parkBountyApplyServices.getEnterpriseParkApplyUploadFiles({ + companyId: row.enterpriseId, + parkBountyApplyId: id, + }); + handleAdd({ + list: EnterpriseApplyFileUtils.initParkCollectFileListApplyFiles( + applyUploadFiles, + applyFiles, + lastUploadEnterPactFile + ), + companyId: row.enterpriseId, + }); + } catch (error) {} } </script> -- Gitblit v1.9.1