From 64d26aba0eea7d6f4d6a339b0d2c8cc2e875e823 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 28 十一月 2025 17:14:12 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/12333GovernmentWeb
---
src/views/MaterialReview/MaterialReviewDetail.vue | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/views/MaterialReview/MaterialReviewDetail.vue b/src/views/MaterialReview/MaterialReviewDetail.vue
index cfcbac6..a1a27c7 100644
--- a/src/views/MaterialReview/MaterialReviewDetail.vue
+++ b/src/views/MaterialReview/MaterialReviewDetail.vue
@@ -13,8 +13,11 @@
>
</span>
<span class="page-form-layout-title-item remark">
- <TextOverTooltip v-if="form.outCheckStatus === BountyCheckStatusEnum.CheckReject">
- {{ `澶嶅鏈�氳繃鍘熷洜:${form.outCheckRemark ?? ''}` }}
+ <TextOverTooltip v-if="form.outReCheckStatus === BountyCheckStatusEnum.CheckReject">
+ {{ `澶嶅鏈�氳繃鍘熷洜:${form.outReCheckRemark ?? ''}` }}
+ </TextOverTooltip>
+ <TextOverTooltip v-if="form.outReCheckStatus === BountyCheckStatusEnum.Redoed">
+ {{ `鎾ゅ洖鍘熷洜:${form.reasonForWithdrawal ?? ''}` }}
</TextOverTooltip>
</span>
</template>
@@ -28,6 +31,9 @@
<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>
@@ -112,9 +118,13 @@
outReCheckStatus: '' as any as BountyCheckStatusEnum,
outReCheckRemark: '',
+ reasonForWithdrawal: '',
suportPlatRecharge: false,
suportFinance: false,
+
+ bountyTemplateId: '',
+ bountyTemplateName: '',
});
const { addRewardApplyStep3Columns } = useAddRewardApplyStep3Columns({
@@ -126,6 +136,7 @@
useDeclareEnterpriseTable({
id: ref(id),
applyMonth: toRef(form, 'applyMonth'),
+ bountyTemplateId: toRef(form, 'bountyTemplateId'),
});
const tableRef = ref<InstanceType<typeof DeclareEnterpriseTableView>>();
@@ -165,6 +176,10 @@
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