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/constants/fourStreams.ts |   81 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 73 insertions(+), 8 deletions(-)

diff --git a/src/constants/fourStreams.ts b/src/constants/fourStreams.ts
index e59f920..59a436b 100644
--- a/src/constants/fourStreams.ts
+++ b/src/constants/fourStreams.ts
@@ -1,3 +1,5 @@
+import { defineColumns } from '@bole-core/components';
+
 export enum FourStreamsMaterialFileBusinessTypeEnum {
   /** 鍥尯鍏ラ┗鍗忚 */
   ParkEnterPactUrl = 10,
@@ -39,15 +41,15 @@
 } as const;
 
 export enum ApplyTransferFileBusinessTypeEnum {
-  /** 鎷ㄤ粯鍑瘉*/
+  /** 璐㈡斂鎷ㄤ粯鍑瘉*/
   FinanceToFileUrl = 100,
-  /** 鍏呭�煎嚟璇�*/
+  /** 骞冲彴鎷ㄤ粯鍑瘉*/
   TransferToFileUrl = 110,
 }
 
 export const ApplyTransferFileBusinessTypeEnumText = {
-  [ApplyTransferFileBusinessTypeEnum.FinanceToFileUrl]: '鎷ㄤ粯鍑瘉',
-  [ApplyTransferFileBusinessTypeEnum.TransferToFileUrl]: '鍏呭�煎嚟璇�',
+  [ApplyTransferFileBusinessTypeEnum.FinanceToFileUrl]: '璐㈡斂鎷ㄤ粯鍑瘉',
+  [ApplyTransferFileBusinessTypeEnum.TransferToFileUrl]: '骞冲彴鎷ㄤ粯鍑瘉',
 };
 
 export const ApplyTransferFileBusinessTypeEnumKey = {
@@ -56,18 +58,81 @@
 } as const;
 
 export enum TransferFileEnumInRewardGrand {
-  /** 鎷ㄤ粯鍑瘉*/
+  /** 璐㈡斂鎷ㄤ粯鍑瘉*/
   FinanceFileUrl = 200,
-  /** 鍏呭�煎嚟璇�*/
+  /** 骞冲彴鎷ㄤ粯鍑瘉*/
   SettleFileUrl = 210,
 }
 
 export const TransferFileEnumInRewardGrandText = {
-  [TransferFileEnumInRewardGrand.FinanceFileUrl]: '鎷ㄤ粯鍑瘉',
-  [TransferFileEnumInRewardGrand.SettleFileUrl]: '鍏呭�煎嚟璇�',
+  [TransferFileEnumInRewardGrand.FinanceFileUrl]: '璐㈡斂鎷ㄤ粯鍑瘉',
+  [TransferFileEnumInRewardGrand.SettleFileUrl]: '骞冲彴鎷ㄤ粯鍑瘉',
 };
 
 export const TransferFileEnumInRewardGrandKey = {
   [TransferFileEnumInRewardGrand.FinanceFileUrl]: 'financeFileUrl',
   [TransferFileEnumInRewardGrand.SettleFileUrl]: 'settleFileUrl',
 } as const;
+
+export const BaseDeclareEnterpriseTableViewColumns = defineColumns([
+  {
+    id: '1',
+    enCode: 'userName',
+    name: '甯愬彿',
+  },
+  {
+    id: '2',
+    enCode: 'enterpriseName',
+    name: '浼佷笟鍚嶇О',
+  },
+  {
+    id: '3',
+    enCode: 'societyCreditCode',
+    name: '淇＄敤浠ｇ爜',
+  },
+  {
+    id: '4',
+    enCode: 'contactPhone',
+    name: '鐢佃瘽',
+  },
+  {
+    id: '5',
+    enCode: 'authType',
+    name: '浼佷笟绫诲瀷',
+  },
+  {
+    id: '6',
+    enCode: 'licenseUrl',
+    name: '钀ヤ笟鎵х収',
+  },
+  {
+    id: '7',
+    enCode: 'bankAccountInfo',
+    name: '鍩烘湰鎴蜂俊鎭�',
+  },
+]);
+
+type UseAddRewardApplyStep3ColumnsOptions = {
+  suportEnterpriseUpload: Ref<boolean>;
+  baseColumns?: API.ModuleColumnDto[];
+};
+
+export function useAddRewardApplyStep3Columns({
+  suportEnterpriseUpload,
+  baseColumns = BaseDeclareEnterpriseTableViewColumns,
+}: UseAddRewardApplyStep3ColumnsOptions) {
+  const addRewardApplyStep3Columns = computed(() =>
+    defineColumns(
+      [
+        ...baseColumns,
+        suportEnterpriseUpload.value && {
+          id: '9',
+          enCode: 'applyAmount',
+          name: '鐢虫姤閲戦',
+        },
+      ].filter(Boolean)
+    )
+  );
+
+  return { addRewardApplyStep3Columns };
+}

--
Gitblit v1.9.1