From 53b0a0b7b5594e1e4ff6036703fa00af84c5ea9f Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 16 六月 2025 19:24:03 +0800
Subject: [PATCH] fix: bug
---
src/views/MaterialReview/MaterialReviewDetail.vue | 51 +++++++++++++++++++++++++++++++++------------------
1 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/src/views/MaterialReview/MaterialReviewDetail.vue b/src/views/MaterialReview/MaterialReviewDetail.vue
index b6d0263..3a27e09 100644
--- a/src/views/MaterialReview/MaterialReviewDetail.vue
+++ b/src/views/MaterialReview/MaterialReviewDetail.vue
@@ -25,6 +25,7 @@
:pro-table-props="proTableProps"
:reset="reset"
:open-dialog="openDialog"
+ :column="addRewardApplyStep3Columns"
></DeclareEnterpriseTableView>
<MateriaDetailDialog
v-bind="dialogProps"
@@ -67,6 +68,7 @@
BountyCheckStatusEnum,
BountyCheckStatusEnumText,
BountyCheckStatusEnumColor,
+ useAddRewardApplyStep3Columns,
} from '@/constants';
import { FourStreamsMaterialFileTableItem } from '@/components/commonView/types';
import {
@@ -89,15 +91,22 @@
parkTypeName: '',
applyMonth: '',
applySumAmount: 0,
- enterpriseTaxSubFileUrl: [] as UploadUserFile[],
- enterpriseOperateFileUrl: [] as UploadUserFile[],
- enterpriseRelateFileUrl: [] as UploadUserFile[],
+ // enterpriseTaxSubFileUrl: [] as UploadUserFile[],
+ // enterpriseOperateFileUrl: [] as UploadUserFile[],
+ // enterpriseRelateFileUrl: [] as UploadUserFile[],
+ // bountyAssignFileUlr: [] as UploadUserFile[],
+ // bountyCollectFileUrl: [] as UploadUserFile[],
parkCollectFileList: [] as CustomerApplyFileTypeListItem[],
- bountyAssignFileUlr: [] as UploadUserFile[],
- bountyCollectFileUrl: [] as UploadUserFile[],
+ calculationFileList: [] as CustomerApplyFileTypeListItem[],
outCheckStatus: '' as any as BountyCheckStatusEnum,
outCheckRemark: '',
+
+ suportEnterpriseUpload: false,
+});
+
+const { addRewardApplyStep3Columns } = useAddRewardApplyStep3Columns({
+ suportEnterpriseUpload: toRef(form, 'suportEnterpriseUpload'),
});
const tableRef = ref<InstanceType<typeof DeclareEnterpriseTableView>>();
@@ -121,20 +130,25 @@
form.applySumAmount = data.applySumAmount;
form.outCheckStatus = data.outCheckStatus;
form.outCheckRemark = data.outCheckRemark;
- 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.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
+ );
+
+ form.suportEnterpriseUpload = data.suportEnterpriseUpload;
getList();
},
@@ -169,6 +183,7 @@
},
columnsRenderProps: {
authType: { type: 'enum', valueEnum: EnterpriseTypeText },
+ applyAmount: { type: 'money' },
},
}
);
@@ -184,7 +199,7 @@
const queryClient = useQueryClient();
async function openDialog(row: API.ParkBountyApplyDetailInfo) {
try {
- const applyFiles = await queryClient.ensureQueryData({
+ const applyFilesRes = await queryClient.ensureQueryData({
queryKey: [
'enterpriseApplyFileServices/getCustomerUploadApplyFiles',
row.enterpriseId,
@@ -213,7 +228,7 @@
handleAdd({
list: EnterpriseApplyFileUtils.initParkCollectFileListApplyFiles(
applyUploadFiles,
- applyFiles,
+ applyFilesRes.items,
lastUploadEnterPactFile
),
companyId: row.enterpriseId,
--
Gitblit v1.9.1