From e1aeb653d656b3c3be05f06cac212f435cec07c3 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 25 七月 2025 15:55:36 +0800
Subject: [PATCH] Merge branch 'dev-3.4.2.5' of http://120.26.58.240:8888/r/12333GovernmentWeb into dev-3.4.2.5
---
src/views/MaterialReview/MaterialReviewAudit.vue | 140 +++++++++-------------------------------------
1 files changed, 29 insertions(+), 111 deletions(-)
diff --git a/src/views/MaterialReview/MaterialReviewAudit.vue b/src/views/MaterialReview/MaterialReviewAudit.vue
index e5b1d4b..6c5eb87 100644
--- a/src/views/MaterialReview/MaterialReviewAudit.vue
+++ b/src/views/MaterialReview/MaterialReviewAudit.vue
@@ -1,7 +1,7 @@
<template>
<LoadingLayout>
<AppContainer>
- <PageFormLayout title="鏉愭枡瀹℃牳">
+ <PageFormLayout title="鐢虫姤瀹℃牳">
<DetailView :form="form" :has-form="true">
<ChunkCellV2 title="鐢虫姤浼佷笟鍚嶅崟" class="chunk-cell-table">
<DeclareEnterpriseTableView
@@ -9,7 +9,8 @@
:extra-param-state="extraParamState"
:pro-table-props="proTableProps"
:reset="reset"
- :open-dialog="openDialog"
+ :column="addRewardApplyStep3Columns"
+ :operationBtns="operationBtns"
></DeclareEnterpriseTableView>
<MateriaDetailDialog
v-bind="dialogProps"
@@ -73,15 +74,12 @@
ProFormTextArea,
ProFormRadio,
LoadingLayout,
- UploadUserFile,
PageFormLayout,
- useTable,
- useFormDialog,
} from '@bole-core/components';
import {
- EnterpriseTypeText,
BountyCheckStatusEnum,
BountyCheckStatusEnumTextForAudit,
+ useAddRewardApplyStep3Columns,
} from '@/constants';
import ChunkCellV2 from '@/components/Layout/ChunkCellV2.vue';
import DetailView from '@/components/commonView/DetailView.vue';
@@ -89,17 +87,13 @@
import MateriaDetailDialog from '@/components/commonView/MateriaDetailDialog.vue';
import { useQuery, useQueryClient } from '@tanstack/vue-query';
import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
-import * as enterpriseApplyFileServices from '@/services/api/EnterpriseApplyFile';
-import { convertApi2FormUrlObjectBySeparator, setOSSLink } from '@/utils';
-import { useGlobalEventContext, useRouteView } from '@/hooks';
+import { useDeclareEnterpriseTable, useGlobalEventContext, useRouteView } from '@/hooks';
import { FormInstance } from 'element-plus';
-import { Message, OrderInputType } from '@bole-core/core';
-import { FourStreamsMaterialFileTableItem } from '@/components/commonView/types';
+import { Message } from '@bole-core/core';
import { useIndustrialParkDropDownList } from '@/hooks/industrialPark';
import {
CustomerApplyFileTypeListItem,
EnterpriseApplyFileUtils,
- FourStreamsMaterialUtils,
} from '@/components/commonView/utils';
defineOptions({
@@ -116,16 +110,26 @@
parkTypeName: '',
applyMonth: '',
applySumAmount: 0,
- enterpriseTaxSubFileUrl: [] as UploadUserFile[],
- enterpriseOperateFileUrl: [] as UploadUserFile[],
- enterpriseRelateFileUrl: [] as UploadUserFile[],
+ financeSumAmount: 0,
+ settleSumAmount: 0,
parkCollectFileList: [] as CustomerApplyFileTypeListItem[],
- bountyAssignFileUlr: [] as UploadUserFile[],
- bountyCollectFileUrl: [] as UploadUserFile[],
+ calculationFileList: [] as CustomerApplyFileTypeListItem[],
status: '' as any as BountyCheckStatusEnum,
remark: '',
+
+ suportPlatRecharge: false,
});
+
+const { addRewardApplyStep3Columns } = useAddRewardApplyStep3Columns({
+ suportPlatRecharge: toRef(form, 'suportPlatRecharge'),
+});
+
+const { extraParamState, getList, reset, proTableProps, operationBtns, dialogProps } =
+ useDeclareEnterpriseTable({
+ id: ref(id),
+ applyMonth: toRef(form, 'applyMonth'),
+ });
const { data: detail, isLoading } = useQuery({
queryKey: ['parkBountyApplyServices/getOutCheckParkBountyApplyDetailBaseInfo', id],
@@ -137,68 +141,27 @@
}
);
},
- placeholderData: () => ({} as API.ParkBountyApplyBaseInfo),
+ placeholderData: () => ({} as API.OutCheckParkBountyApplyBaseInfo),
onSuccess(data) {
form.batchNo = data.batchNo;
form.parkName = data.parkName;
form.parkTypeName = data.parkTypeName;
form.applyMonth = data.applyMonth;
form.applySumAmount = data.applySumAmount;
- 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.financeSumAmount = data.financeSumAmount;
+ form.settleSumAmount = data.settleSumAmount;
form.parkCollectFileList = EnterpriseApplyFileUtils.convertApiFileToParkCollectFileList(
data.listFiles
);
+ form.calculationFileList = EnterpriseApplyFileUtils.convertApiFileToParkCollectFileList(
+ data.collectCountListFiles
+ );
+
+ form.suportPlatRecharge = data.suportPlatRecharge;
getList();
},
});
-
-const {
- getDataSource: getList,
- proTableProps,
- paginationState,
- extraParamState,
- reset,
-} = useTable(
- async ({ pageIndex, pageSize }, extraParamState) => {
- try {
- let params: API.GetParkBountyApplyInfoInput = {
- pageModel: {
- rows: pageSize,
- page: pageIndex,
- orderInput: extraParamState.orderInput,
- },
- searchKeyWord: extraParamState.searchKeyWord,
- parkBountyApplyId: id,
- };
- let res = await parkBountyApplyServices.getOutCheckParkBountyApplyDetailList(params);
- return res;
- } catch (error) {}
- },
- {
- defaultExtraParams: {
- orderInput: [{ property: 'enterpriseId', order: OrderInputType.Desc }],
- searchKeyWord: '',
- },
- columnsRenderProps: {
- authType: { type: 'enum', valueEnum: EnterpriseTypeText },
- licenseUrl: {
- type: 'urlV2',
- formatter: (row: API.UserCertificationAuditListDto) => setOSSLink(row.licenseUrl),
- },
- },
- }
-);
function handleBack() {
closeViewPush(route, {
@@ -238,52 +201,7 @@
} 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