From 60107cb11e472d693de543e8ec422bfe8e31dbec Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 31 十月 2025 17:30:48 +0800
Subject: [PATCH] Merge branch 'master' into dev-3.4.2.10
---
src/views/MaterialReview/MaterialReviewDetail.vue | 63 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/src/views/MaterialReview/MaterialReviewDetail.vue b/src/views/MaterialReview/MaterialReviewDetail.vue
index 8a0f348..cfcbac6 100644
--- a/src/views/MaterialReview/MaterialReviewDetail.vue
+++ b/src/views/MaterialReview/MaterialReviewDetail.vue
@@ -5,16 +5,32 @@
<template #title>
<div class="page-form-layout-title">
鐢虫姤璇︽儏
- <span class="page-form-layout-title-item status">
- 瀹℃牳鐘舵��:<span :style="{ color: BountyCheckStatusEnumColor[form.outCheckStatus] }">{{
- BountyCheckStatusEnumText[form.outCheckStatus]
- }}</span>
- </span>
- <span class="page-form-layout-title-item remark">
- <TextOverTooltip v-if="form.outCheckStatus === BountyCheckStatusEnum.CheckReject">
- {{ `瀹℃牳鏈�氳繃鍘熷洜:${form.outCheckRemark ?? ''}` }}
- </TextOverTooltip>
- </span>
+ <template v-if="isReReview">
+ <span class="page-form-layout-title-item status">
+ 澶嶅鐘舵��:<span
+ :style="{ color: BountyCheckStatusEnumColor[form.outReCheckStatus] }"
+ >{{ BountyCheckStatusEnumText[form.outCheckStatus] }}</span
+ >
+ </span>
+ <span class="page-form-layout-title-item remark">
+ <TextOverTooltip v-if="form.outCheckStatus === BountyCheckStatusEnum.CheckReject">
+ {{ `澶嶅鏈�氳繃鍘熷洜:${form.outCheckRemark ?? ''}` }}
+ </TextOverTooltip>
+ </span>
+ </template>
+ <template v-else>
+ <span class="page-form-layout-title-item status">
+ 瀹℃牳鐘舵��:<span
+ :style="{ color: BountyCheckStatusEnumColor[form.outCheckStatus] }"
+ >{{ BountyCheckStatusEnumText[form.outCheckStatus] }}</span
+ >
+ </span>
+ <span class="page-form-layout-title-item remark">
+ <TextOverTooltip v-if="form.outCheckStatus === BountyCheckStatusEnum.CheckReject">
+ {{ `瀹℃牳鏈�氳繃鍘熷洜:${form.outCheckRemark ?? ''}` }}
+ </TextOverTooltip>
+ </span>
+ </template>
</div>
</template>
<DetailView :form="form">
@@ -31,7 +47,6 @@
v-bind="dialogProps"
:show-upload-btn="false"
:show-delete-btn="false"
- :show-check-btn="false"
/>
</ChunkCellV2>
</DetailView>
@@ -76,23 +91,35 @@
const route = useRoute();
const { closeViewPush } = useRouteView();
const id = route.params?.id as string;
+const type = route.query?.type as string;
+//鏄惁澶嶅
+const isReReview = type === 'reReview';
const form = reactive({
batchNo: '',
parkName: '',
parkTypeName: '',
applyMonth: '',
applySumAmount: 0,
+ financeSumAmount: 0,
+ settleSumAmount: 0,
parkCollectFileList: [] as CustomerApplyFileTypeListItem[],
calculationFileList: [] as CustomerApplyFileTypeListItem[],
+
+ extraListFiles: [] as CustomerApplyFileTypeListItem[],
outCheckStatus: '' as any as BountyCheckStatusEnum,
outCheckRemark: '',
- suportEnterpriseUpload: false,
+ outReCheckStatus: '' as any as BountyCheckStatusEnum,
+ outReCheckRemark: '',
+
+ suportPlatRecharge: false,
+ suportFinance: false,
});
const { addRewardApplyStep3Columns } = useAddRewardApplyStep3Columns({
- suportEnterpriseUpload: toRef(form, 'suportEnterpriseUpload'),
+ suportPlatRecharge: toRef(form, 'suportPlatRecharge'),
+ suportFinance: toRef(form, 'suportFinance'),
});
const { extraParamState, getList, reset, proTableProps, operationBtns, dialogProps } =
@@ -120,16 +147,24 @@
form.parkTypeName = data.parkTypeName;
form.applyMonth = data.applyMonth;
form.applySumAmount = data.applySumAmount;
+ form.financeSumAmount = data.financeSumAmount;
+ form.settleSumAmount = data.settleSumAmount;
form.outCheckStatus = data.outCheckStatus;
form.outCheckRemark = data.outCheckRemark;
+ form.outReCheckStatus = data.outReCheckStatus;
+ form.outReCheckRemark = data.outReCheckRemark;
form.parkCollectFileList = EnterpriseApplyFileUtils.convertApiFileToParkCollectFileList(
data.listFiles
);
form.calculationFileList = EnterpriseApplyFileUtils.convertApiFileToParkCollectFileList(
data.collectCountListFiles
);
+ form.extraListFiles = EnterpriseApplyFileUtils.convertApiFileToExtraListFiles(
+ data.extraListFiles
+ );
- form.suportEnterpriseUpload = data.suportEnterpriseUpload;
+ form.suportPlatRecharge = data.suportPlatRecharge;
+ form.suportFinance = data.suportFinance;
getList();
},
--
Gitblit v1.9.1