From 72ba293c1dfc0f4c7e0c9a3ca59c67e28904ce88 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 11 九月 2025 15:21:37 +0800
Subject: [PATCH] fix: bug

---
 src/utils/enterpriseWallet.ts                             |   19 ++
 src/views/EnterpriseManage/components/ConfigureDialog.vue |  100 ++++++++--
 .eslintrc-auto-import.json                                |    4 
 src/services/api/typings.d.ts                             |  191 +++++++++++++++++---
 src/constants/enterpriseWallet.ts                         |   13 +
 src/services/api/enterpriseWallet.ts                      |   15 -
 .env.development                                          |    1 
 src/utils/index.ts                                        |    1 
 auto-imports.d.ts                                         |    9 
 src/constants/apiEnum.ts                                  |   44 ++--
 src/constants/index.ts                                    |    1 
 src/views/EnterpriseManage/EnterpriseManageList.vue       |   52 +++++
 src/services/api/user.ts                                  |   36 ++++
 13 files changed, 386 insertions(+), 100 deletions(-)

diff --git a/.env.development b/.env.development
index fe15bed..92982fd 100644
--- a/.env.development
+++ b/.env.development
@@ -12,6 +12,7 @@
 
 # 寮�鍙戠幆澧冨悗绔湴鍧�
 VITE_PROXY_DOMAIN_REAL = "http://localhost:53780/"
+# VITE_PROXY_DOMAIN_REAL = "https://testfj.81812333.com/"
 # VITE_PROXY_DOMAIN_REAL = "https://lgdapi.81812333.com"
 
 
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 8db6b7f..c0a3e08 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -44,11 +44,11 @@
     "EnumEnterpriseWalletAccess": true,
     "EnumEnterpriseWalletExpandindirectOrderFileType": true,
     "EnumEnterpriseWalletExpandindirectOrderScene": true,
+    "EnumEnterpriseWalletExpandindirectOrderSceneText": true,
     "EnumEnterpriseWalletExpandindirectOrderStatus": true,
     "EnumEnterpriseWalletExpandindirectOrderStatusText": true,
     "EnumEnterpriseWalletSignStatus": true,
     "EnumEnterpriseWalletSignStatusText": true,
-    "EnumEnterpriseWalletTransactionStatus": true,
     "EnumEnterpriseWalletTransactionType": true,
     "EnumMenuType": true,
     "EnumMenuVisitLevel": true,
@@ -95,6 +95,8 @@
     "EnumUserStatus": true,
     "EnumUserType": true,
     "EnumUserTypeText": true,
+    "EnumUserWalletTransactionType": true,
+    "EnumWalletTransactionStatus": true,
     "ExtractDefaultPropTypes": true,
     "ExtractPropTypes": true,
     "ExtractPublicPropTypes": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 7318f0d..96e0f36 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -46,6 +46,7 @@
   const EnumEnterpriseWalletAccess: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletAccess']
   const EnumEnterpriseWalletExpandindirectOrderFileType: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderFileType']
   const EnumEnterpriseWalletExpandindirectOrderScene: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderScene']
+  const EnumEnterpriseWalletExpandindirectOrderSceneText: typeof import('./src/constants/enterpriseWallet')['EnumEnterpriseWalletExpandindirectOrderSceneText']
   const EnumEnterpriseWalletExpandindirectOrderStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderStatus']
   const EnumEnterpriseWalletExpandindirectOrderStatusText: typeof import('./src/constants/enterprise')['EnumEnterpriseWalletExpandindirectOrderStatusText']
   const EnumEnterpriseWalletSignStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletSignStatus']
@@ -97,6 +98,8 @@
   const EnumUserStatus: typeof import('./src/constants/apiEnum')['EnumUserStatus']
   const EnumUserType: typeof import('./src/constants/apiEnum')['EnumUserType']
   const EnumUserTypeText: typeof import('./src/constants/apiEnumText')['EnumUserTypeText']
+  const EnumUserWalletTransactionType: typeof import('./src/constants/apiEnum')['EnumUserWalletTransactionType']
+  const EnumWalletTransactionStatus: typeof import('./src/constants/apiEnum')['EnumWalletTransactionStatus']
   const FastButtonMap: typeof import('./src/constants/module')['FastButtonMap']
   const FastColumnList: typeof import('./src/constants/module')['FastColumnList']
   const FastDataButtonList: typeof import('./src/constants/module')['FastDataButtonList']
@@ -254,7 +257,7 @@
   export type { Component, Slot, Slots, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
   import('vue')
   // @ts-ignore
-  export type { EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionStatus, EnumEnterpriseWalletTransactionType, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionStatus, EnumEnterpriseWalletTransactionType, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton } from './src/constants/apiEnum'
+  export type { EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton } from './src/constants/apiEnum'
   import('./src/constants/apiEnum')
   // @ts-ignore
   export type { FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum, FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum } from './src/constants/cPerson'
@@ -339,11 +342,11 @@
     readonly EnumEnterpriseWalletAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletAccess']>
     readonly EnumEnterpriseWalletExpandindirectOrderFileType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderFileType']>
     readonly EnumEnterpriseWalletExpandindirectOrderScene: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderScene']>
+    readonly EnumEnterpriseWalletExpandindirectOrderSceneText: UnwrapRef<typeof import('./src/constants/enterpriseWallet')['EnumEnterpriseWalletExpandindirectOrderSceneText']>
     readonly EnumEnterpriseWalletExpandindirectOrderStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderStatus']>
     readonly EnumEnterpriseWalletExpandindirectOrderStatusText: UnwrapRef<typeof import('./src/constants/enterprise')['EnumEnterpriseWalletExpandindirectOrderStatusText']>
     readonly EnumEnterpriseWalletSignStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletSignStatus']>
     readonly EnumEnterpriseWalletSignStatusText: UnwrapRef<typeof import('./src/constants/enterprise')['EnumEnterpriseWalletSignStatusText']>
-    readonly EnumEnterpriseWalletTransactionStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletTransactionStatus']>
     readonly EnumEnterpriseWalletTransactionType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletTransactionType']>
     readonly EnumMenuType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumMenuType']>
     readonly EnumMenuVisitLevel: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumMenuVisitLevel']>
@@ -390,6 +393,8 @@
     readonly EnumUserStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserStatus']>
     readonly EnumUserType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserType']>
     readonly EnumUserTypeText: UnwrapRef<typeof import('./src/constants/apiEnumText')['EnumUserTypeText']>
+    readonly EnumUserWalletTransactionType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserWalletTransactionType']>
+    readonly EnumWalletTransactionStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumWalletTransactionStatus']>
     readonly FastButtonMap: UnwrapRef<typeof import('./src/constants/module')['FastButtonMap']>
     readonly FastColumnList: UnwrapRef<typeof import('./src/constants/module')['FastColumnList']>
     readonly FastDataButtonList: UnwrapRef<typeof import('./src/constants/module')['FastDataButtonList']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index efed8bd..f9a35bd 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -167,22 +167,6 @@
   Stop = 999,
 }
 
-/** 浼佷笟閽卞寘浜ゆ槗鐘舵�� */
-export enum EnumEnterpriseWalletTransactionStatus {
-  /**寰呮彁浜� */
-  WaitSubmit = 1,
-  /**寰呮敮浠� */
-  WaitPay = 10,
-  /**澶勭悊涓� */
-  Dealing = 20,
-  /**鎴愬姛 */
-  Success = 30,
-  /**閫�绁� */
-  Refund = 40,
-  /**澶辫触 */
-  Fail = 50,
-}
-
 /** 浼佷笟閽卞寘浜ゆ槗绫诲瀷 */
 export enum EnumEnterpriseWalletTransactionType {
   /**鍏呭�� */
@@ -275,9 +259,9 @@
 export enum EnumPersonalUserRealStatus {
   /**鏈疄鍚� */
   UnReal = 0,
-  /**鏍￠獙涓� */
+  /**璁よ瘉涓� */
   Checking = 10,
-  /**瀹炲悕澶辫触 */
+  /**璁よ瘉澶辫触 */
   Fail = 99,
   /**宸插疄鍚� */
   Real = 100,
@@ -511,6 +495,30 @@
   Operation = 100,
 }
 
+/** 鐢ㄦ埛閽卞寘鏀舵敮绫诲瀷 */
+export enum EnumUserWalletTransactionType {
+  /**鏀跺叆 */
+  Income = 10,
+  /**鎻愮幇 */
+  Withdraw = 20,
+}
+
+/** 閽卞寘浜ゆ槗鐘舵�� */
+export enum EnumWalletTransactionStatus {
+  /**寰呮彁浜� */
+  WaitSubmit = 1,
+  /**寰呮敮浠� */
+  WaitPay = 10,
+  /**澶勭悊涓� */
+  Dealing = 20,
+  /**鎴愬姛 */
+  Success = 30,
+  /**閫�绁� */
+  Refund = 40,
+  /**澶辫触 */
+  Fail = 50,
+}
+
 /** 鎴戠殑鎶ュ悕鍒嗛〉鍒楄〃-鐘舵�� */
 export enum GetPersonalApplyTaskInfosQueryStatus {
   /**寰呯‘璁� */
diff --git a/src/constants/enterpriseWallet.ts b/src/constants/enterpriseWallet.ts
new file mode 100644
index 0000000..bb4247c
--- /dev/null
+++ b/src/constants/enterpriseWallet.ts
@@ -0,0 +1,13 @@
+import { EnumEnterpriseWalletExpandindirectOrderScene } from './apiEnum';
+
+export const EnumEnterpriseWalletExpandindirectOrderSceneText = {
+  [EnumEnterpriseWalletExpandindirectOrderScene.XIANJIN_YINGXIAO]: '鐜伴噾钀ラ攢',
+  [EnumEnterpriseWalletExpandindirectOrderScene.XINGZHENG_BUTIE]: '琛屾斂琛ヨ创',
+  [EnumEnterpriseWalletExpandindirectOrderScene.BAOXIAN_LIPEI]: '淇濋櫓鐞嗚禂',
+  [EnumEnterpriseWalletExpandindirectOrderScene.YONGJIN_BAOCHOU]: '浣ｉ噾鎶ラ叕',
+  [EnumEnterpriseWalletExpandindirectOrderScene.QIYE_PEIFU]: '浼佷笟璧斾粯',
+  [EnumEnterpriseWalletExpandindirectOrderScene.CAIGOU_HUOKUAN]: '閲囪喘璐ф',
+  [EnumEnterpriseWalletExpandindirectOrderScene.ERSHOU_HUISHOU]: '浜屾墜鍥炴敹',
+  [EnumEnterpriseWalletExpandindirectOrderScene.GONGYI_BUZHU]: '鍏泭琛ュ姪',
+  [EnumEnterpriseWalletExpandindirectOrderScene.ZHUANZHANG_QITA]: '鍏朵粬鍦烘櫙',
+};
diff --git a/src/constants/index.ts b/src/constants/index.ts
index 3e0e9fc..f578bc8 100644
--- a/src/constants/index.ts
+++ b/src/constants/index.ts
@@ -19,3 +19,4 @@
 export * from './task';
 export * from './enterpriseEmployee';
 export * from './electronSign';
+export * from './enterpriseWallet';
diff --git a/src/services/api/enterpriseWallet.ts b/src/services/api/enterpriseWallet.ts
index b03ba6d..f47a980 100644
--- a/src/services/api/enterpriseWallet.ts
+++ b/src/services/api/enterpriseWallet.ts
@@ -310,18 +310,3 @@
     }
   );
 }
-
-/** 浼佷笟閽卞寘杞处 POST /api/user/enterpriseWallet/transferEnterpriseWallet */
-export async function transferEnterpriseWallet(
-  body: API.TransferEnterpriseWalletCommand,
-  options?: API.RequestConfig
-) {
-  return request<string>('/api/user/enterpriseWallet/transferEnterpriseWallet', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json-patch+json',
-    },
-    data: body,
-    ...(options || {}),
-  });
-}
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index eab48c6..daeb4ad 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -170,6 +170,11 @@
     request?: GetPersonalUserRealResultQuery;
   }
 
+  interface APIgetPersonalUserTransactionParams {
+    /** 鏀舵敮Id */
+    id?: string;
+  }
+
   interface APIgetResourceFieldsParams {
     /** Id */
     id?: string;
@@ -641,21 +646,6 @@
     Stop = 999,
   }
 
-  enum EnumEnterpriseWalletTransactionStatus {
-    /**寰呮彁浜� */
-    WaitSubmit = 1,
-    /**寰呮敮浠� */
-    WaitPay = 10,
-    /**澶勭悊涓� */
-    Dealing = 20,
-    /**鎴愬姛 */
-    Success = 30,
-    /**閫�绁� */
-    Refund = 40,
-    /**澶辫触 */
-    Fail = 50,
-  }
-
   enum EnumEnterpriseWalletTransactionType {
     /**鍏呭�� */
     Recharge = 10,
@@ -738,9 +728,9 @@
   enum EnumPersonalUserRealStatus {
     /**鏈疄鍚� */
     UnReal = 0,
-    /**鏍￠獙涓� */
+    /**璁よ瘉涓� */
     Checking = 10,
-    /**瀹炲悕澶辫触 */
+    /**璁よ瘉澶辫触 */
     Fail = 99,
     /**宸插疄鍚� */
     Real = 100,
@@ -952,6 +942,28 @@
     Enterprise = 20,
     /**杩愯惀 */
     Operation = 100,
+  }
+
+  enum EnumUserWalletTransactionType {
+    /**鏀跺叆 */
+    Income = 10,
+    /**鎻愮幇 */
+    Withdraw = 20,
+  }
+
+  enum EnumWalletTransactionStatus {
+    /**寰呮彁浜� */
+    WaitSubmit = 1,
+    /**寰呮敮浠� */
+    WaitPay = 10,
+    /**澶勭悊涓� */
+    Dealing = 20,
+    /**鎴愬姛 */
+    Success = 30,
+    /**閫�绁� */
+    Refund = 40,
+    /**澶辫触 */
+    Fail = 50,
   }
 
   interface ExportTaskCheckReceiveTaskUsersCommand {
@@ -1634,6 +1646,42 @@
     /** 閿欒鐮� */
     errorCode?: string;
     data?: GetPersonalUserRealResultQueryResult;
+    /** 鎵ц鎴愬姛 */
+    success?: boolean;
+    /** 閿欒淇℃伅 */
+    msg?: any;
+    /** 闄勫姞鏁版嵁 */
+    extras?: any;
+    /** 鏃堕棿鎴� */
+    timestamp?: number;
+  }
+
+  interface FriendlyResultGetPersonalUserTransactionQueryResult {
+    /** 璺熻釜Id */
+    traceId?: string;
+    /** 鐘舵�佺爜 */
+    code?: number;
+    /** 閿欒鐮� */
+    errorCode?: string;
+    data?: GetPersonalUserTransactionQueryResult;
+    /** 鎵ц鎴愬姛 */
+    success?: boolean;
+    /** 閿欒淇℃伅 */
+    msg?: any;
+    /** 闄勫姞鏁版嵁 */
+    extras?: any;
+    /** 鏃堕棿鎴� */
+    timestamp?: number;
+  }
+
+  interface FriendlyResultGetPersonalUserTransactionsQueryResult {
+    /** 璺熻釜Id */
+    traceId?: string;
+    /** 鐘舵�佺爜 */
+    code?: number;
+    /** 閿欒鐮� */
+    errorCode?: string;
+    data?: GetPersonalUserTransactionsQueryResult;
     /** 鎵ц鎴愬姛 */
     success?: boolean;
     /** 閿欒淇℃伅 */
@@ -3288,10 +3336,6 @@
     /** 閽卞寘Id */
     id?: string;
     access?: EnumEnterpriseWalletAccess;
-    /** 璐﹀彿 */
-    account?: string;
-    /** 鍟嗘埛Id */
-    merchantId?: string;
     /** 鍗忚鍙� */
     code?: string;
     /** 閫氶亾鍗忚鍙� */
@@ -3303,6 +3347,21 @@
     /** 鍗忚澶辨晥鏃堕棿 */
     invalidTime?: string;
     signStatus?: EnumEnterpriseWalletSignStatus;
+    /** 鏀粯瀹濆鍚� */
+    name?: string;
+    /** 鏀粯瀹濈櫥褰曡处鍙� */
+    identity?: string;
+    scene?: EnumEnterpriseWalletExpandindirectOrderScene;
+    /** 杞处鍦烘櫙璇存槑 */
+    sceneDirections?: string;
+    orderStatus?: EnumEnterpriseWalletExpandindirectOrderStatus;
+    /** 杩涗欢鍗曚换鍔″畬缁撴椂闂� */
+    taskFinishTime?: string;
+    /** 杩涗欢鍗曞鏍镐笉閫氳繃鍘熷洜 */
+    riskReviewRemark?: string;
+    sitesInfo?: GetEnterpriseWalletExpandindirectOrderQueryResultSites;
+    /** 闄勪欢 */
+    files?: GetEnterpriseWalletExpandindirectOrderQueryResultFile[];
     expandindirectOrderStatus?: EnumEnterpriseWalletExpandindirectOrderStatus;
   }
 
@@ -3318,7 +3377,7 @@
     remark?: string;
     /** 璁㈠崟鏀粯鏃堕棿 */
     transDate?: string;
-    transactionStatus?: EnumEnterpriseWalletTransactionStatus;
+    transactionStatus?: EnumWalletTransactionStatus;
   }
 
   interface GetExceptionLogsQuery {
@@ -3711,6 +3770,9 @@
     contactPhoneNumber?: string;
     /** 鏄惁瀹炲悕 */
     isReal?: boolean;
+    realStatus?: EnumPersonalUserRealStatus;
+    /** 瀹炲悕澶辫触娑堟伅 */
+    realFailMessage?: string;
     realMethod?: EnumUserRealMethod;
     /** 鎴戠殑鎶ュ悕 */
     taskCount?: number;
@@ -3718,6 +3780,8 @@
     hirePassTaskCount?: number;
     /** 宸插彇娑� */
     hireRefuseTaskCount?: number;
+    /** 浣欓 */
+    balance?: number;
   }
 
   type GetPersonalUserBankCardQuery = Record<string, any>;
@@ -3901,6 +3965,74 @@
     realFailMessage?: string;
     /** 浜鸿劯瀹炲悕璁よ瘉鍦板潃 */
     faceRealUrl?: string;
+  }
+
+  interface GetPersonalUserTransactionQueryResult {
+    /** 鏀舵敮Id */
+    id?: string;
+    type?: EnumUserWalletTransactionType;
+    /** 璁㈠崟鍙� */
+    code?: string;
+    /** 浼佷笟鍚嶇О */
+    enterpriseName?: string;
+    /** 缁撶畻鏃ユ湡 */
+    settlementTime?: string;
+    /** 缁撶畻閲戦 */
+    settlementAmount?: number;
+    /** 瀹炲彂閲戦/鎻愮幇閲戦 */
+    amount?: number;
+    /** 鏀舵浜哄鍚� */
+    receiveName?: string;
+    /** 鏀舵璐︽埛 */
+    receiveAccount?: string;
+    /** 鏈嶅姟璐� */
+    serviceFee?: number;
+    /** 瀹為檯鍒拌处 */
+    actualAmount?: number;
+    /** 棰勮鍒拌处鏃堕棿 */
+    arrivalTimeEnd?: string;
+    /** 璁㈠崟鏀粯鏃堕棿 */
+    transDate?: string;
+    /** 鍒涘缓鏃堕棿 */
+    createdTime?: string;
+    /** 澶辫触鍘熷洜 */
+    failReason?: string;
+  }
+
+  interface GetPersonalUserTransactionsQuery {
+    /** 鍒涘缓鏃堕棿-璧峰 */
+    createdTimeStart?: string;
+    /** 鍒涘缓鏃堕棿-鎴 */
+    createdTimeEnd?: string;
+    type?: EnumUserWalletTransactionType;
+    pageModel?: PagedListQueryPageModel;
+  }
+
+  interface GetPersonalUserTransactionsQueryResult {
+    objectData?: GetPersonalUserTransactionsQueryResultObjectData;
+    pageModel?: PagedListQueryResultPageModel;
+    /** 鏁版嵁 */
+    data?: GetPersonalUserTransactionsQueryResultItem[];
+  }
+
+  interface GetPersonalUserTransactionsQueryResultItem {
+    /** 鏀舵敮Id */
+    id?: string;
+    /** 鏍囬 */
+    title?: string;
+    /** 鍒涘缓鏃堕棿 */
+    createdTime?: string;
+    /** 閲戦 */
+    amount?: number;
+    /** 浣欓 */
+    balance?: number;
+  }
+
+  interface GetPersonalUserTransactionsQueryResultObjectData {
+    /** 鎬绘敹鍏� */
+    sumIncome?: number;
+    /** 鎬绘彁鐜� */
+    sumWithdraw?: number;
   }
 
   interface GetResourceFieldsQueryResultItem {
@@ -4124,6 +4256,7 @@
   }
 
   interface GetSettlementTaskUsersQueryResult {
+    detail?: GetSettlementTaskQueryResult;
     /** 缁撶畻鍚嶅崟 */
     data?: GetSettlementTaskUsersQueryResultItem[];
     /** 閿欒淇℃伅 */
@@ -4787,10 +4920,6 @@
     /** 浼佷笟Id */
     enterpriseId?: string;
     access?: EnumEnterpriseWalletAccess;
-    /** 璐﹀彿 */
-    account?: string;
-    /** 鍟嗘埛Id */
-    merchantId?: string;
   }
 
   interface OpenEnterpriseWalletCommandResult {
@@ -5367,6 +5496,8 @@
   interface SendInviteElectronSignSmsCommand {
     /** Id */
     ids?: string[];
+    /** 鍚堝悓妯℃澘Id */
+    contractTemplateId?: string;
   }
 
   interface SendLoginOrRegisterVerifyCodeCommand {
@@ -5646,14 +5777,6 @@
     industrialParkIds?: string[];
     status?: EnumUserStatus;
     /** 澶囨敞 */
-    remark?: string;
-  }
-
-  interface TransferEnterpriseWalletCommand {
-    access?: EnumEnterpriseWalletAccess;
-    /** 閲戦 */
-    amount?: number;
-    /** 鍏呭�煎娉� */
     remark?: string;
   }
 
diff --git a/src/services/api/user.ts b/src/services/api/user.ts
index 99c7719..5ea222a 100644
--- a/src/services/api/user.ts
+++ b/src/services/api/user.ts
@@ -70,6 +70,42 @@
   );
 }
 
+/** 鏌ヨ涓汉鐢ㄦ埛鏀舵敮鏄庣粏璇︽儏 GET /api/user/user/getPersonalUserTransaction */
+export async function getPersonalUserTransaction(
+  // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+  params: API.APIgetPersonalUserTransactionParams,
+  options?: API.RequestConfig
+) {
+  return request<API.GetPersonalUserTransactionQueryResult>(
+    '/api/user/user/getPersonalUserTransaction',
+    {
+      method: 'GET',
+      params: {
+        ...params,
+      },
+      ...(options || {}),
+    }
+  );
+}
+
+/** 鏌ヨ涓汉鐢ㄦ埛鏀舵敮鏄庣粏鍒嗛〉鍒楄〃鏁版嵁 POST /api/user/user/getPersonalUserTransactions */
+export async function getPersonalUserTransactions(
+  body: API.GetPersonalUserTransactionsQuery,
+  options?: API.RequestConfig
+) {
+  return request<API.GetPersonalUserTransactionsQueryResult>(
+    '/api/user/user/getPersonalUserTransactions',
+    {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json-patch+json',
+      },
+      data: body,
+      ...(options || {}),
+    }
+  );
+}
+
 /** 鏌ヨ鐢ㄦ埛瑙掕壊鍒楄〃 GET /api/user/user/getUserInfoRoles */
 export async function getUserInfoRoles(
   // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
diff --git a/src/utils/enterpriseWallet.ts b/src/utils/enterpriseWallet.ts
new file mode 100644
index 0000000..6687afd
--- /dev/null
+++ b/src/utils/enterpriseWallet.ts
@@ -0,0 +1,19 @@
+import { UploadUserFile } from '@bole-core/components';
+import { convertApi2FormUrl } from './common';
+
+export function convertWalletFilesToApi(
+  files: UploadUserFile[],
+  type: EnumEnterpriseWalletExpandindirectOrderFileType
+) {
+  return files.map(
+    (item) =>
+      ({ file: item.path, type: type } as API.EnterpriseWalletExpandindirectCreateCommandFile)
+  );
+}
+
+export function convertWalletApiToFiles(
+  files: API.GetEnterpriseWalletExpandindirectOrderQueryResultFile[],
+  type: EnumEnterpriseWalletExpandindirectOrderFileType
+) {
+  return files.filter((item) => item.type === type).map((item) => convertApi2FormUrl(item.file));
+}
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 2b00eb1..eb4da96 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -5,3 +5,4 @@
 export * from './module';
 export * from './theme';
 export * from './validator';
+export * from './enterpriseWallet';
diff --git a/src/views/EnterpriseManage/EnterpriseManageList.vue b/src/views/EnterpriseManage/EnterpriseManageList.vue
index 44861a9..3e21988 100644
--- a/src/views/EnterpriseManage/EnterpriseManageList.vue
+++ b/src/views/EnterpriseManage/EnterpriseManageList.vue
@@ -60,6 +60,7 @@
 import { Message } from '@bole-core/core';
 import * as enterpriseServices from '@/services/api/enterprise';
 import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
+import { convertWalletApiToFiles, convertWalletFilesToApi } from '@/utils';
 
 defineOptions({
   name: 'EnterpriseManageList',
@@ -172,12 +173,22 @@
         ),
         smsAccess: smsSetting.smsAccess,
         smsCost: smsSetting.smsCost,
-        alipayAccount: alipayWallet.account,
-        alipayMerchantId: alipayWallet.merchantId,
+        alipayAccount: alipayWallet.identity,
+        alipayMerchantId: alipayWallet.code,
         signStatus: alipayWallet.signStatus,
         expandindirectOrderStatus: alipayWallet.expandindirectOrderStatus,
 
-        url: [] as UploadUserFile[],
+        name: alipayWallet.name,
+        scene: alipayWallet.scene || EnumEnterpriseWalletExpandindirectOrderScene.YONGJIN_BAOCHOU,
+        sceneDirections: alipayWallet.sceneDirections,
+        sceneFiles: convertWalletApiToFiles(
+          alipayWallet.files,
+          EnumEnterpriseWalletExpandindirectOrderFileType.Scene
+        ),
+        sceneQualificationFiles: convertWalletApiToFiles(
+          alipayWallet.files,
+          EnumEnterpriseWalletExpandindirectOrderFileType.SceneQualification
+        ),
       });
     } else {
       handleAdd({
@@ -200,7 +211,13 @@
     signStatus: '' as any as EnumEnterpriseWalletSignStatus,
     expandindirectOrderStatus: '' as any as EnumEnterpriseWalletExpandindirectOrderStatus,
 
-    url: [] as UploadUserFile[],
+    name: '',
+    scene: '' as any as EnumEnterpriseWalletExpandindirectOrderScene,
+    sceneDirections: '',
+    /**杞处鍦烘櫙鎴浘 */
+    sceneFiles: [] as UploadUserFile[],
+    /**鍟嗘埛琛屼笟璧勮川鍥剧墖鎴栧崗璁枃鏈� */
+    sceneQualificationFiles: [] as UploadUserFile[],
   },
 });
 
@@ -216,6 +233,9 @@
     if (editForm.enterpriseConfigureType === EnterpriseConfigureType.ShortMessage) {
       res = await createOrEditFlexEnterpriseMessageSetting();
     }
+    if (editForm.enterpriseConfigureType === EnterpriseConfigureType.AliPay) {
+      res = await enterpriseWalletExpandindirectCreate();
+    }
     if (res) {
       Message.successMessage('鎿嶄綔鎴愬姛');
       getList(paginationState.pageIndex);
@@ -224,6 +244,30 @@
   } catch (error) {}
 }
 
+async function enterpriseWalletExpandindirectCreate() {
+  try {
+    let params: API.EnterpriseWalletExpandindirectCreateCommand = {
+      enterpriseId: editForm.id,
+      identity: editForm.alipayAccount,
+      name: editForm.name,
+      scene: editForm.scene,
+      sceneDirections: editForm.sceneDirections,
+      sitesInfo: null,
+      files: [
+        ...convertWalletFilesToApi(
+          editForm.sceneFiles,
+          EnumEnterpriseWalletExpandindirectOrderFileType.Scene
+        ),
+        ...convertWalletFilesToApi(
+          editForm.sceneQualificationFiles,
+          EnumEnterpriseWalletExpandindirectOrderFileType.SceneQualification
+        ),
+      ],
+    };
+    return await enterpriseWalletServices.enterpriseWalletExpandindirectCreate(params);
+  } catch (error) {}
+}
+
 // async function createOrEditFlexEnterpriseBankSetting() {
 //   try {
 //     let params: API.CreateOrEditFlexEnterpriseBankInput = {
diff --git a/src/views/EnterpriseManage/components/ConfigureDialog.vue b/src/views/EnterpriseManage/components/ConfigureDialog.vue
index c7bf12b..ac7195d 100644
--- a/src/views/EnterpriseManage/components/ConfigureDialog.vue
+++ b/src/views/EnterpriseManage/components/ConfigureDialog.vue
@@ -49,35 +49,66 @@
           <div style="display: flex; width: 100%">
             <ProFormText v-model.trim="form.alipayAccount" placeholder="璇疯緭鍏ユ敮浠樺疂璐﹀彿">
             </ProFormText>
-            <el-button
-              style="margin-left: 10px"
-              type="primary"
-              link
-              @click="handleOpenEnterpriseWallet"
+            <el-button style="margin-left: 10px" type="primary" link @click="openEnterpriseWallet"
               >鑾峰彇绛剧害閾炬帴</el-button
             >
           </div>
+        </ProFormItemV2>
+        <ProFormItemV2
+          label="鏀粯瀹濆鍚�:"
+          prop="name"
+          :checkRules="[{ message: '璇疯緭鍏ユ敮浠樺疂濮撳悕' }]"
+        >
+          <ProFormText v-model.trim="form.name" placeholder="璇疯緭鍏ユ敮浠樺疂濮撳悕" />
         </ProFormItemV2>
         <ProFormItemV2
           label="鍟嗘埛ID:"
           prop="alipayMerchantId"
           :checkRules="[{ message: '璇疯緭鍏ュ晢鎴稩D' }]"
         >
-          <ProFormText v-model.trim="form.alipayMerchantId" placeholder="璇疯緭鍏ュ晢鎴稩D" />
+          <ProFormText v-model.trim="form.alipayMerchantId" placeholder="璇疯緭鍏ュ晢鎴稩D" disabled />
+        </ProFormItemV2>
+        <ProFormItemV2 label="涓氬姟鍦烘櫙:" prop="scene" :checkRules="[{ message: '璇烽�夋嫨涓氬姟鍦烘櫙' }]">
+          <ProFormSelect
+            v-model="form.scene"
+            :valueEnum="EnumEnterpriseWalletExpandindirectOrderSceneText"
+            placeholder="璇烽�夋嫨涓氬姟鍦烘櫙"
+          >
+          </ProFormSelect>
         </ProFormItemV2>
         <ProFormItemV2
-          label="鍥剧墖:"
-          prop="url"
-          :check-rules="[{ type: 'upload', message: '璇蜂笂浼犲浘鐗�' }]"
+          label="鍦烘櫙鎻忚堪:"
+          prop="sceneDirections"
+          :checkRules="[{ message: '璇疯緭鍏ュ満鏅弿杩�' }]"
         >
-          <ProFormImageUpload v-model:file-url="form.url" :limitFileCount="1"></ProFormImageUpload>
+          <ProFormText
+            v-model.trim="form.sceneDirections"
+            placeholder="璋�/閫氳繃浠�涔堝獟浠嬶紙APP/web/灏忕▼搴�)/涓昏涓鸿皝鎻愪緵浠�涔堟湇鍔�/鐢ㄤ簬鍦ㄤ粈涔堝満鏅粰浠�涔堜汉缇よ浆璐�"
+          />
         </ProFormItemV2>
         <ProFormItemV2
-          label="鍥剧墖:"
-          prop="url"
-          :check-rules="[{ type: 'upload', message: '璇蜂笂浼犲浘鐗�' }]"
+          label="杞处鍦烘櫙鎴浘:"
+          prop="sceneFiles"
+          :check-rules="[{ type: 'upload', message: '璇蜂笂浼犺浆璐﹀満鏅埅鍥�' }]"
         >
-          <ProFormImageUpload v-model:file-url="form.url" :limitFileCount="1"></ProFormImageUpload>
+          <ProFormUpload
+            v-model:file-url="form.sceneFiles"
+            :limit="5"
+            :limitFileSize="10"
+            accept="png,jpg,jpeg,pdf"
+          ></ProFormUpload>
+        </ProFormItemV2>
+        <ProFormItemV2
+          label="璧勮川鏂囦欢:"
+          prop="sceneQualificationFiles"
+          :check-rules="[{ type: 'upload', message: '璇蜂笂浼犺祫璐ㄦ枃浠�' }]"
+        >
+          <ProFormUpload
+            v-model:file-url="form.sceneQualificationFiles"
+            :limit="5"
+            :limitFileSize="10"
+            accept="png,jpg,jpeg,pdf"
+          ></ProFormUpload>
         </ProFormItemV2>
         <ProFormItemV2 label="绛剧害鐘舵��:" prop="signStatus" required>
           <span>{{ EnumEnterpriseWalletSignStatusText[form.signStatus] }}</span>
@@ -155,6 +186,7 @@
   useFormDialog,
   UploadUserFile,
   ProFormImageUpload,
+  ProFormUpload,
 } from '@bole-core/components';
 import { BoleRegExp } from '@bole-core/core';
 import {
@@ -166,6 +198,7 @@
   EnumElectronSignAccess,
   EnumEnterpriseWalletSignStatusText,
   EnumEnterpriseWalletExpandindirectOrderStatusText,
+  EnumEnterpriseWalletExpandindirectOrderSceneText,
 } from '@/constants';
 import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
 import AlipayWalletOpen from './AlipayWalletOpen.vue';
@@ -190,7 +223,13 @@
   signStatus: EnumEnterpriseWalletSignStatus;
   expandindirectOrderStatus: EnumEnterpriseWalletExpandindirectOrderStatus;
 
-  url: UploadUserFile[];
+  name: string;
+  scene: EnumEnterpriseWalletExpandindirectOrderScene;
+  sceneDirections: string;
+  /**杞处鍦烘櫙鎴浘 */
+  sceneFiles: UploadUserFile[];
+  /**鍟嗘埛琛屼笟璧勮川鍥剧墖鎴栧崗璁枃鏈� */
+  sceneQualificationFiles: UploadUserFile[];
 };
 
 const form = defineModel<Form>('form');
@@ -218,6 +257,17 @@
   } catch (error) {}
 }
 
+async function getEnterpriseWalletExpandindirectOrder() {
+  try {
+    let res = await enterpriseWalletServices.getEnterpriseWalletExpandindirectOrder({
+      enterpriseId: form.value.id,
+    });
+    if (res) {
+      form.value.expandindirectOrderStatus = res.orderStatus;
+    }
+  } catch (error) {}
+}
+
 function onDialogClose() {
   if (!dialogForm.value) return;
   dialogForm.value.resetFields();
@@ -240,23 +290,21 @@
   },
 });
 
-async function handleOpenEnterpriseWallet() {
-  try {
-    if (!dialogForm.value) return;
-    const valid = await dialogForm.value.validateField(['alipayAccount', 'alipayMerchantId']);
-    if (valid) {
-      openEnterpriseWallet();
-    }
-  } catch (error) {}
-}
+// async function handleOpenEnterpriseWallet() {
+//   try {
+//     if (!dialogForm.value) return;
+//     const valid = await dialogForm.value.validateField(['alipayAccount', 'alipayMerchantId']);
+//     if (valid) {
+//       openEnterpriseWallet();
+//     }
+//   } catch (error) {}
+// }
 
 async function openEnterpriseWallet() {
   try {
     let params: API.OpenEnterpriseWalletCommand = {
       access: EnumEnterpriseWalletAccess.Alipay,
       enterpriseId: form.value.id,
-      account: form.value.alipayAccount,
-      merchantId: form.value.alipayMerchantId,
     };
     let res = await enterpriseWalletServices.openEnterpriseWallet(params);
     if (res) {

--
Gitblit v1.9.1