From e1aeb653d656b3c3be05f06cac212f435cec07c3 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 25 七月 2025 15:55:36 +0800
Subject: [PATCH] Merge branch 'dev-3.4.2.5' of http://120.26.58.240:8888/r/12333GovernmentWeb into dev-3.4.2.5
---
src/views/EnterpriseInfo/components/RewardGrantRecordView.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/views/EnterpriseInfo/components/RewardGrantRecordView.vue b/src/views/EnterpriseInfo/components/RewardGrantRecordView.vue
index 2f94db3..a5167f1 100644
--- a/src/views/EnterpriseInfo/components/RewardGrantRecordView.vue
+++ b/src/views/EnterpriseInfo/components/RewardGrantRecordView.vue
@@ -3,7 +3,7 @@
<AppContainer>
<ProTableV2 v-bind="proTableProps" :columns="column" :operationBtns="operationBtns">
</ProTableV2>
- <FourStreamsMaterialFileDialog
+ <FourStreamsMaterialFileDialogV2
v-bind="dialogMaterialFileProps"
:show-upload-btn="false"
:show-delete-btn="false"
@@ -26,8 +26,7 @@
} from '@bole-core/components';
import { OrderInputType } from '@bole-core/core';
import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
-import { IncomeStatusEnumText } from '@/constants';
-import { ApplyTransferFileBusinessTypeEnumText } from '@/components/commonView/types';
+import { ApplyTransferFileBusinessTypeEnumText } from '@/constants';
import { FourStreamsMaterialUtils } from '@/components/commonView/utils';
import { ApplyTransferMaterialFileTableItem } from '@/components/commonView/types';
@@ -59,12 +58,12 @@
{
id: '5',
enCode: 'transferToAmount',
- name: '骞冲彴鍏呭�奸噾棰�',
+ name: '骞冲彴鎷ㄤ粯閲戦',
},
{
id: '6',
enCode: 'settleTime',
- name: '骞冲彴鍏呭�兼棩鏈�',
+ name: '骞冲彴鎷ㄤ粯鏃ユ湡',
},
];
--
Gitblit v1.9.1