From e22c1e1191ef01c43932f26bbbccafca4505d39e Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 28 十一月 2025 13:45:45 +0800
Subject: [PATCH] Merge branch 'master' into dev-dataBoard

---
 src/views/MaterialReview/MaterialReviewDetail.vue |   78 ++++++++++++++++++++++++++++++++-------
 1 files changed, 64 insertions(+), 14 deletions(-)

diff --git a/src/views/MaterialReview/MaterialReviewDetail.vue b/src/views/MaterialReview/MaterialReviewDetail.vue
index 8a0f348..a1a27c7 100644
--- a/src/views/MaterialReview/MaterialReviewDetail.vue
+++ b/src/views/MaterialReview/MaterialReviewDetail.vue
@@ -5,16 +5,38 @@
         <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.outReCheckStatus === BountyCheckStatusEnum.CheckReject">
+                  {{ `澶嶅鏈�氳繃鍘熷洜:${form.outReCheckRemark ?? ''}` }}
+                </TextOverTooltip>
+                <TextOverTooltip v-if="form.outReCheckStatus === BountyCheckStatusEnum.Redoed">
+                  {{ `鎾ゅ洖鍘熷洜:${form.reasonForWithdrawal ?? ''}` }}
+                </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>
+                <TextOverTooltip v-if="form.outCheckStatus === BountyCheckStatusEnum.Redoed">
+                  {{ `鎾ゅ洖鍘熷洜:${form.reasonForWithdrawal ?? ''}` }}
+                </TextOverTooltip>
+              </span>
+            </template>
           </div>
         </template>
         <DetailView :form="form">
@@ -31,7 +53,6 @@
               v-bind="dialogProps"
               :show-upload-btn="false"
               :show-delete-btn="false"
-              :show-check-btn="false"
             />
           </ChunkCellV2>
         </DetailView>
@@ -76,29 +97,46 @@
 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: '',
+  reasonForWithdrawal: '',
+
+  suportPlatRecharge: false,
+  suportFinance: false,
+
+  bountyTemplateId: '',
+  bountyTemplateName: '',
 });
 
 const { addRewardApplyStep3Columns } = useAddRewardApplyStep3Columns({
-  suportEnterpriseUpload: toRef(form, 'suportEnterpriseUpload'),
+  suportPlatRecharge: toRef(form, 'suportPlatRecharge'),
+  suportFinance: toRef(form, 'suportFinance'),
 });
 
 const { extraParamState, getList, reset, proTableProps, operationBtns, dialogProps } =
   useDeclareEnterpriseTable({
     id: ref(id),
     applyMonth: toRef(form, 'applyMonth'),
+    bountyTemplateId: toRef(form, 'bountyTemplateId'),
   });
 
 const tableRef = ref<InstanceType<typeof DeclareEnterpriseTableView>>();
@@ -120,16 +158,28 @@
     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;
+    form.reasonForWithdrawal = data.reasonForWithdrawal ?? '';
+
+    form.bountyTemplateId = data.bountyTemplateId ?? '';
+    form.bountyTemplateName = data.bountyTemplateName ?? '';
 
     getList();
   },

--
Gitblit v1.9.1