From 7ea19f75b3b1fc8c9af3840a470cb662b8f65d0d Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 15 五月 2025 13:59:11 +0800
Subject: [PATCH] fix: s
---
src/views/MaterialReview/MaterialReviewDetail.vue | 132 +++++++++++++++++++++++++++++++++++--------
1 files changed, 107 insertions(+), 25 deletions(-)
diff --git a/src/views/MaterialReview/MaterialReviewDetail.vue b/src/views/MaterialReview/MaterialReviewDetail.vue
index a309bdc..78258d5 100644
--- a/src/views/MaterialReview/MaterialReviewDetail.vue
+++ b/src/views/MaterialReview/MaterialReviewDetail.vue
@@ -10,11 +10,10 @@
BountyCheckStatusEnumText[form.outCheckStatus]
}}</span>
</span>
- <span
- v-if="form.outCheckStatus === BountyCheckStatusEnum.CheckReject"
- class="page-form-layout-title-item remark"
- >
- {{ `瀹℃牳鏈�氳繃鍘熷洜:${form.outCheckRemark ?? ''}` }}
+ <span class="page-form-layout-title-item remark">
+ <TextOverTooltip v-if="form.outCheckStatus === BountyCheckStatusEnum.CheckReject">
+ {{ `瀹℃牳鏈�氳繃鍘熷洜:${form.outCheckRemark ?? ''}` }}
+ </TextOverTooltip>
</span>
</div>
</template>
@@ -25,11 +24,18 @@
: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>
</DetailView>
<template #footer>
- <el-button @click="handleBack">鍏抽棴</el-button>
+ <el-button @click="handleBack" type="primary">纭</el-button>
</template>
</PageFormLayout>
</AppContainer>
@@ -43,21 +49,32 @@
UploadUserFile,
PageFormLayout,
useTable,
+ useFormDialog,
+ TextOverTooltip,
} from '@bole-core/components';
import ChunkCellV2 from '@/components/Layout/ChunkCellV2.vue';
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 {
- AuthTypeText,
+ EnterpriseTypeText,
BountyCheckStatusEnum,
BountyCheckStatusEnumText,
BountyCheckStatusEnumColor,
} from '@/constants';
+import { FourStreamsMaterialFileTableItem } from '@/components/commonView/types';
+import {
+ CustomerApplyFileTypeListItem,
+ EnterpriseApplyFileUtils,
+ FourStreamsMaterialUtils,
+} from '@/components/commonView/utils';
+import { useIndustrialParkDropDownList } from '@/hooks/industrialPark';
defineOptions({
name: 'MaterialReviewDetail',
@@ -72,10 +89,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[],
outCheckStatus: '' as any as BountyCheckStatusEnum,
outCheckRemark: '',
@@ -102,10 +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.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();
},
@@ -135,21 +168,70 @@
},
{
defaultExtraParams: {
- orderInput: [{ property: 'enterpriseId', order: OrderInputType.Desc }],
+ orderInput: [{ property: 'parkBountyApplyId', order: OrderInputType.Desc }],
searchKeyWord: '',
},
columnsRenderProps: {
- authType: { type: 'enum', valueEnum: AuthTypeText },
- licenseUrl: {
- type: 'url',
- formatter: (row: API.UserCertificationAuditListDto) => setOSSLink(row.licenseUrl),
- modal: true,
- showDownloadBtn: false,
- },
+ authType: { type: 'enum', valueEnum: EnterpriseTypeText },
},
}
);
+const { dialogProps, handleAdd, editForm } = useFormDialog({
+ defaultFormParams: {
+ 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,
+ });
+ },
+ });
+
+ 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() {
closeViewPush(route, {
name: 'MaterialReviewList',
--
Gitblit v1.9.1