From 9b8c27edd8942f84da68c36d9292e14e5f93cc14 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 15 五月 2025 14:06:14 +0800
Subject: [PATCH] Merge branch 'dev-3.4.5' of http://120.26.58.240:8888/r/12333GovernmentWeb into dev-3.4.5
---
src/views/MaterialReview/MaterialReviewDetail.vue | 99 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 77 insertions(+), 22 deletions(-)
diff --git a/src/views/MaterialReview/MaterialReviewDetail.vue b/src/views/MaterialReview/MaterialReviewDetail.vue
index 0b7d6d5..78258d5 100644
--- a/src/views/MaterialReview/MaterialReviewDetail.vue
+++ b/src/views/MaterialReview/MaterialReviewDetail.vue
@@ -56,9 +56,10 @@
import DetailView from '@/components/commonView/DetailView.vue';
import MateriaDetailDialog from '@/components/commonView/MateriaDetailDialog.vue';
import DeclareEnterpriseTableView from '@/components/commonView/DeclareEnterpriseTableView.vue';
-import { useQuery } from '@tanstack/vue-query';
+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 { useRouteView } from '@/hooks';
import { OrderInputType } from '@bole-core/core';
import {
@@ -68,7 +69,11 @@
BountyCheckStatusEnumColor,
} from '@/constants';
import { FourStreamsMaterialFileTableItem } from '@/components/commonView/types';
-import { FourStreamsMaterialUtils } from '@/components/commonView/utils';
+import {
+ CustomerApplyFileTypeListItem,
+ EnterpriseApplyFileUtils,
+ FourStreamsMaterialUtils,
+} from '@/components/commonView/utils';
import { useIndustrialParkDropDownList } from '@/hooks/industrialPark';
defineOptions({
@@ -84,11 +89,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[],
outCheckStatus: '' as any as BountyCheckStatusEnum,
outCheckRemark: '',
@@ -115,11 +122,23 @@
form.applySumAmount = data.applySumAmount;
form.outCheckStatus = data.outCheckStatus;
form.outCheckRemark = data.outCheckRemark;
- 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();
},
@@ -160,21 +179,57 @@
const { dialogProps, handleAdd, editForm } = useFormDialog({
defaultFormParams: {
- list: [] as FourStreamsMaterialFileTableItem[],
+ list: [] as CustomerApplyFileTypeListItem[],
companyId: '',
},
});
const { getIndustrialParkTypeNameById } = useIndustrialParkDropDownList();
+const queryClient = useQueryClient();
+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,
+ });
+ },
+ });
-function openDialog(row: API.ParkBountyApplyDetailInfo) {
- handleAdd({
- list: FourStreamsMaterialUtils.initFourStreamsMaterialFileList(
- row,
- getIndustrialParkTypeNameById(detail.value?.parkId)
- ),
- 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) {}
+ // handleAdd({
+ // list: FourStreamsMaterialUtils.initFourStreamsMaterialFileList(
+ // row,
+ // getIndustrialParkTypeNameById(detail.value?.parkId)
+ // ),
+ // companyId: row.enterpriseId,
+ // });
}
function handleBack() {
--
Gitblit v1.9.1