From 6fd420d0f3386047bad0113bf5714267aade2fd4 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 21 七月 2025 09:33:20 +0800
Subject: [PATCH] Merge branch 'master' into dev-3.4.2.5
---
src/views/MaterialReview/MaterialReviewDetail.vue | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/views/MaterialReview/MaterialReviewDetail.vue b/src/views/MaterialReview/MaterialReviewDetail.vue
index 78258d5..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 {
@@ -99,6 +101,12 @@
outCheckStatus: '' as any as BountyCheckStatusEnum,
outCheckRemark: '',
+
+ suportEnterpriseUpload: false,
+});
+
+const { addRewardApplyStep3Columns } = useAddRewardApplyStep3Columns({
+ suportEnterpriseUpload: toRef(form, 'suportEnterpriseUpload'),
});
const tableRef = ref<InstanceType<typeof DeclareEnterpriseTableView>>();
@@ -140,6 +148,8 @@
data.collectCountListFiles
);
+ form.suportEnterpriseUpload = data.suportEnterpriseUpload;
+
getList();
},
});
@@ -173,6 +183,7 @@
},
columnsRenderProps: {
authType: { type: 'enum', valueEnum: EnterpriseTypeText },
+ applyAmount: { type: 'money' },
},
}
);
@@ -188,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,
@@ -217,7 +228,7 @@
handleAdd({
list: EnterpriseApplyFileUtils.initParkCollectFileListApplyFiles(
applyUploadFiles,
- applyFiles,
+ applyFilesRes.items,
lastUploadEnterPactFile
),
companyId: row.enterpriseId,
--
Gitblit v1.9.1