From 41bedb2dfa045b6cfa03b69d295c09b0b5a8d8bb Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 02 十二月 2025 15:01:00 +0800
Subject: [PATCH] Merge branch 'master' into dev-1.3.0.4
---
src/constants/apiEnum.ts | 88 +++++++++++++++++++++++++++++++++-----------
1 files changed, 66 insertions(+), 22 deletions(-)
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index 4a29a7f..3fc61b0 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -101,6 +101,14 @@
Face = 20,
}
+/** 鏈嶅姟璐规敹鍙栨柟寮� */
+export enum EnumEnterpriseCooperationServiceFeeCollectType {
+ /**鎸夋瘮渚� */
+ Rate = 10,
+ /**鍗曚汉鍗曟 */
+ SingleTime = 20,
+}
+
/** 绛剧害鐘舵�� */
export enum EnumEnterpriseCooperationSignStatus {
/**鏈绾� */
@@ -117,6 +125,16 @@
Completed = 20,
}
+/** 鍚堜綔浼佷笟閽卞寘浜ゆ槗鐘舵�� */
+export enum EnumEnterpriseCooperationWalletTransactionStatus {
+ /**寰呯‘璁� */
+ WaitSure = 10,
+ /**宸插埌璐� */
+ Success = 20,
+ /**鏈埌璐� */
+ Fail = 30,
+}
+
/** 浼佷笟鐢ㄩ噺鎵h垂鐘舵�� */
export enum EnumEnterpriseCostStatus {
/**鎵h垂鎴愬姛 */
@@ -131,6 +149,14 @@
SMS = 10,
/**鐢靛瓙绛� */
ElectronSign = 20,
+}
+
+/** 鐏靛伐鏉ユ簮 */
+export enum EnumEnterpriseEmployeeSource {
+ /**鍐呴儴 */
+ Internal = 10,
+ /**澶栭儴 */
+ External = 20,
}
/** 浼佷笟瀹炲悕鏂瑰紡 */
@@ -391,42 +417,48 @@
CommonServerCodeUrls = 4,
/**鏂囦欢 */
CommonServerFileUtils = 5,
+ /**浜嬩欢 */
+ CommonServerEventUtils = 6,
/**鏂囧瓧璇嗗埆 */
- CommonServerOcrUtils = 6,
+ CommonServerOcrUtils = 7,
/**鏃ュ織璁板綍 */
- CommonServerLogRecords = 7,
+ CommonServerLogRecords = 8,
/**鍚屾鏁版嵁搴� */
- CommonServerSyncDatabase = 8,
+ CommonServerSyncDatabase = 9,
/**鐭俊宸ュ叿 */
- CommonServerSmsUtils = 9,
+ CommonServerSmsUtils = 10,
/**閰嶇疆 */
- CommonServerSettings = 10,
+ CommonServerSettings = 11,
/**鐢ㄦ埛璁よ瘉 */
- UserServerAuth = 11,
+ UserServerAuth = 12,
/**鐢ㄦ埛鑿滃崟 */
- UserServerMenu = 12,
+ UserServerMenu = 13,
/**鐢ㄦ埛璧勬簮 */
- UserServerResource = 13,
+ UserServerResource = 14,
/**鐢ㄦ埛瑙掕壊 */
- UserServerRole = 14,
+ UserServerRole = 15,
/**鐢ㄦ埛淇℃伅 */
- UserServerUser = 15,
+ UserServerUser = 16,
/**鐢ㄦ埛閽卞寘 */
- UserServerUserWallet = 16,
+ UserServerUserWallet = 17,
/**鐢靛瓙绛� */
- UserServerElectronSign = 17,
+ UserServerElectronSign = 18,
/**鐢ㄦ埛绠�鍘� */
- UserServerUserResume = 18,
+ UserServerUserResume = 19,
/**浼佷笟淇℃伅 */
- UserServerEnterprise = 19,
+ UserServerEnterprise = 20,
/**浼佷笟閽卞寘 */
- UserServerEnterpriseWallet = 20,
+ UserServerEnterpriseWallet = 21,
+ /**浼佷笟鍚堜綔閽卞寘 */
+ UserServerEnterpriseCooperationWallet = 22,
/**鐏靛伐淇℃伅 */
- UserServerEnterpriseEmployee = 21,
+ UserServerEnterpriseEmployee = 23,
/**鐢靛瓙绛� */
- ElectronSignServerElectronSign = 22,
- /**鐢靛瓙绛� */
- ToolServerSms = 23,
+ ElectronSignServerElectronSign = 24,
+ /**鐭俊 */
+ ToolServerSms = 25,
+ /**灏忕▼搴� */
+ ToolServerWxmp = 26,
}
/** 璧勬簮璇锋眰鏂瑰紡 */
@@ -607,6 +639,8 @@
Pass = 20,
/**宸茶阿缁� */
Refuse = 30,
+ /**宸插彇娑� */
+ Cancel = 40,
}
/** 浠诲姟鐢ㄦ埛绛剧害鐘舵�� */
@@ -637,9 +671,9 @@
WaitSubmit = 10,
/**寰呴獙鏀� */
WaitCheckReceive = 20,
- /**楠屾敹閫氳繃/宸茬鍒� */
+ /**楠屾敹閫氳繃 */
Success = 30,
- /**楠屾敹鏈�氳繃/鏈埌宀� */
+ /**楠屾敹鏈�氳繃 */
Fail = 40,
}
@@ -885,7 +919,7 @@
Completed = 20,
}
-/** 鍙戣柂鐘舵�� */
+/** 鍙戣柂鐘舵�侊紙鐢叉柟锛� */
export enum GetSettlementTasksQueryPaymentStatus {
/**寰呭鏍� */
WaitAudit = 10,
@@ -895,6 +929,16 @@
CompletedRelease = 30,
}
+/** 鍙戣柂鐘舵�侊紙渚涘簲鍟嗭級 */
+export enum GetSettlementTasksQuerySupplierPaymentStatus {
+ /**寰呯粨绠� */
+ WaitSettlement = 10,
+ /**宸茬粨绠� */
+ CompletedSettlement = 20,
+ /**宸插彂鏀� */
+ CompletedRelease = 30,
+}
+
/** 鎴戠殑鎶ュ悕鍒楄〃-璇︽儏-鎸夐挳绫诲瀷 */
export enum GetTaskInfoQueryResultApplyButton {
/**寰呯‘璁� */
--
Gitblit v1.9.1