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/MaterialReviewAudit.vue | 106 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 92 insertions(+), 14 deletions(-)
diff --git a/src/views/MaterialReview/MaterialReviewAudit.vue b/src/views/MaterialReview/MaterialReviewAudit.vue
index 354f562..d7986e5 100644
--- a/src/views/MaterialReview/MaterialReviewAudit.vue
+++ b/src/views/MaterialReview/MaterialReviewAudit.vue
@@ -9,7 +9,14 @@
:extra-param-state="extraParamState"
:pro-table-props="proTableProps"
:reset="reset"
+ :open-dialog="openDialog"
></DeclareEnterpriseTableView>
+ <MateriaDetailDialog
+ v-bind="dialogProps"
+ :show-upload-btn="false"
+ :show-delete-btn="false"
+ :show-check-btn="false"
+ />
</ChunkCellV2>
<ChunkCell>
<ProForm :model="form" ref="formRef" label-width="120px">
@@ -69,21 +76,31 @@
UploadUserFile,
PageFormLayout,
useTable,
+ useFormDialog,
} from '@bole-core/components';
import {
- AuthTypeText,
+ EnterpriseTypeText,
BountyCheckStatusEnum,
BountyCheckStatusEnumTextForAudit,
} from '@/constants';
import ChunkCellV2 from '@/components/Layout/ChunkCellV2.vue';
import DetailView from '@/components/commonView/DetailView.vue';
import DeclareEnterpriseTableView from '@/components/commonView/DeclareEnterpriseTableView.vue';
+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 {
+ CustomerApplyFileTypeListItem,
+ EnterpriseApplyFileUtils,
+ FourStreamsMaterialUtils,
+} from '@/components/commonView/utils';
defineOptions({
name: 'MaterialReviewAudit',
@@ -99,10 +116,13 @@
parkTypeName: '',
applyMonth: '',
applySumAmount: 0,
- enterpriseTaxSubFileUrl: [] as UploadUserFile[],
- enterpriseOperateFileUrl: [] as UploadUserFile[],
- bountyAssignFileUlr: [] as UploadUserFile[],
- bountyCollectFileUrl: [] 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: '',
@@ -125,10 +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.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();
},
@@ -162,12 +195,10 @@
searchKeyWord: '',
},
columnsRenderProps: {
- authType: { type: 'enum', valueEnum: AuthTypeText },
+ authType: { type: 'enum', valueEnum: EnterpriseTypeText },
licenseUrl: {
- type: 'url',
+ type: 'urlV2',
formatter: (row: API.UserCertificationAuditListDto) => setOSSLink(row.licenseUrl),
- modal: true,
- showDownloadBtn: false,
},
},
}
@@ -210,6 +241,53 @@
}
} catch (error) {}
}
+
+const { dialogProps, handleAdd, editForm } = useFormDialog({
+ defaultFormParams: {
+ list: [] as CustomerApplyFileTypeListItem[],
+ companyId: '',
+ },
+});
+const { getIndustrialParkTypeNameById } = useIndustrialParkDropDownList();
+
+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>
<style lang="scss" scoped>
--
Gitblit v1.9.1