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/services/api/typings.d.ts | 149 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 146 insertions(+), 3 deletions(-)
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 1501d1e..b9f42a2 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -3,6 +3,28 @@
[key: string]: any;
}
+ interface AddEnterpriseEmployeeCommand {
+ /** 濮撳悕 */
+ name: string;
+ /** 韬唤璇佸彿 */
+ identity: string;
+ /** 鎵嬫満鍙� */
+ contactPhoneNumber: string;
+ gender?: EnumUserGender;
+ /** 骞撮緞 */
+ age?: number;
+ /** 韬唤璇佷汉鍍忛潰 */
+ identityImg?: string;
+ /** 韬唤璇佸浗寰介潰 */
+ identityBackImg?: string;
+ /** 鐢靛瓙鍚堝悓 */
+ contractUrl?: string;
+ /** 鍗忚璧峰鏃堕棿 */
+ contractBegin?: string;
+ /** 鍗忚缁堟鏃堕棿 */
+ contractEnd?: string;
+ }
+
interface AgainSureTaskSettlementOrderRosterCommand {
/** 鍚嶅崟Id */
id?: string;
@@ -200,6 +222,8 @@
interface APIgetMenusParams {
/** 鐢ㄦ埛绫诲瀷 */
userType?: EnumUserType;
+ /** 浼佷笟绫诲瀷 */
+ enterpriseType?: EnumEnterpriseType;
/** 瀹㈡埛绔被鍨� */
clientType?: EnumClientType;
/** 瑙掕壊Id */
@@ -646,6 +670,8 @@
}
interface EditEnterpriseEmployeeCommand {
+ /** Id */
+ id?: string;
/** 濮撳悕 */
name: string;
/** 韬唤璇佸彿 */
@@ -659,8 +685,12 @@
identityImg?: string;
/** 韬唤璇佸浗寰介潰 */
identityBackImg?: string;
- /** Id */
- id?: string;
+ /** 鐢靛瓙鍚堝悓 */
+ contractUrl?: string;
+ /** 鍗忚璧峰鏃堕棿 */
+ contractBegin?: string;
+ /** 鍗忚缁堟鏃堕棿 */
+ contractEnd?: string;
}
interface EditTaskSettlementOrderRosterCommand {
@@ -845,6 +875,13 @@
Face = 20,
}
+ enum EnumEnterpriseCooperationServiceFeeCollectType {
+ /**鎸夋瘮渚� */
+ Rate = 10,
+ /**鍗曚汉鍗曟 */
+ SingleTime = 20,
+ }
+
enum EnumEnterpriseCooperationSignStatus {
/**鏈绾� */
None = 10,
@@ -880,6 +917,13 @@
SMS = 10,
/**鐢靛瓙绛� */
ElectronSign = 20,
+ }
+
+ enum EnumEnterpriseEmployeeSource {
+ /**鍐呴儴 */
+ Internal = 10,
+ /**澶栭儴 */
+ External = 20,
}
enum EnumEnterpriseRealMethod {
@@ -1154,8 +1198,10 @@
UserServerEnterpriseEmployee = 23,
/**鐢靛瓙绛� */
ElectronSignServerElectronSign = 24,
- /**鐢靛瓙绛� */
+ /**鐭俊 */
ToolServerSms = 25,
+ /**灏忕▼搴� */
+ ToolServerWxmp = 26,
}
enum EnumResourceMethod {
@@ -1318,6 +1364,8 @@
Pass = 20,
/**宸茶阿缁� */
Refuse = 30,
+ /**宸插彇娑� */
+ Cancel = 40,
}
enum EnumTaskUserSignContractStatus {
@@ -3864,6 +3912,7 @@
}
interface GetArrangeTaskUsersQueryResult {
+ objectData?: GetArrangeTaskUsersQueryResultObjectData;
pageModel?: PagedListQueryResultPageModel;
/** 鏁版嵁 */
data?: GetArrangeTaskUsersQueryResultItem[];
@@ -3901,6 +3950,11 @@
/** 宸ヤ綔缁忛獙 */
workExperience?: string;
arrangeStatus?: EnumTaskUserArrangeStatus;
+ }
+
+ interface GetArrangeTaskUsersQueryResultObjectData {
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
}
interface GetBankOcrCommand {
@@ -4016,6 +4070,8 @@
interface GetCheckReceiveTaskQueryResultObjectData {
/** 渚涘簲鍟咺d */
supplierEnterpriseId?: string;
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
/** 闇�姹備汉鏁� */
needPeopleNumber?: number;
/** 浠诲姟鍚嶇О */
@@ -4074,6 +4130,8 @@
id?: string;
/** 渚涘簲鍟咺d */
supplierEnterpriseId?: string;
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
/** 闇�姹備汉鏁� */
needPeopleNumber?: number;
/** 浠诲姟鍚嶇О */
@@ -4112,6 +4170,8 @@
/** 鏈�杩戦獙鏀舵椂闂� */
lastCheckReceiveTime?: string;
checkedStatus?: EnumGetCheckReceiveTasksQueryResultItemCheckStatus;
+ /** 浜哄憳鏁伴噺 */
+ arrangeUserCount?: number;
}
interface GetCheckReceiveTaskUserSubmitCheckHistoriesQuery {
@@ -4161,6 +4221,8 @@
id?: string;
/** 浠诲姟浜哄憳Id */
taskInfoUserId?: string;
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
enterpriseEmployeeUser?: GetCheckReceiveTaskUserSubmitsQueryResultObjectDataEnterpriseEmployeeUser;
/** 楠屾敹鏃堕棿 */
date?: string;
@@ -4287,6 +4349,8 @@
addressName?: string;
/** 楠屾敹鏂瑰紡 */
checkReceiveMethods?: EnumTaskCheckReceiveMethod[];
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
}
interface GetCodeUrlQueryResult {
@@ -4832,6 +4896,10 @@
enterpriseSignContractTime?: string;
/** 鐢靛瓙鍚堝悓 */
contractUrl?: string;
+ /** 鍗忚璧峰鏃堕棿 */
+ contractBegin?: string;
+ /** 鍗忚缁堟鏃堕棿 */
+ contractEnd?: string;
userSignContractStatus?: EnumTaskUserSignContractStatus;
}
@@ -4842,13 +4910,22 @@
createdTimeStart?: string;
/** 鐧昏鏃堕棿-鏈�鏅氭椂闂� */
createdTimeEnd?: string;
+ /** 鐏靛伐绛剧害鏃堕棿-鏈�鏃╂椂闂� */
+ userSignContractTimeStart?: string;
+ /** 鐏靛伐绛剧害鏃堕棿-鏈�鏅氭椂闂� */
+ userSignContractTimeEnd?: string;
/** 绛剧害鏃堕棿-鏈�鏃╂椂闂� */
signContractTimeStart?: string;
/** 绛剧害鏃堕棿-鏈�鏅氭椂闂� */
signContractTimeEnd?: string;
hireStatus?: EnumTaskUserHireStatus;
+ /** 瀹炲悕鏃堕棿-鏈�鏃╂椂闂� */
+ userRealTimeStart?: string;
+ /** 瀹炲悕鏃堕棿-鏈�鏅氭椂闂� */
+ userRealTimeEnd?: string;
/** 鏄惁瀹炲悕 */
isReal?: boolean;
+ source?: EnumEnterpriseEmployeeSource;
userSignContractStatus?: EnumTaskUserSignContractStatus;
enterpriseSignContractStatus?: EnumTaskUserSignContractStatus;
signContractStatus?: EnumGetEnterpriseEmployeesQuerySignContractStatus;
@@ -4907,6 +4984,14 @@
enterpriseSignContractTime?: string;
/** 鐢靛瓙鍚堝悓 */
contractUrl?: string;
+ /** 鍗忚璧峰鏃堕棿 */
+ contractBegin?: string;
+ /** 鍗忚缁堟鏃堕棿 */
+ contractEnd?: string;
+ source?: EnumEnterpriseEmployeeSource;
+ /** 鏉ユ簮鍚嶇О */
+ sourceName?: string;
+ /** 鍒涘缓鏃堕棿 */
createdTime?: string;
}
@@ -5464,6 +5549,7 @@
/** 鏄惁閫夋嫨锛堢敤鎴疯鑹叉巿鏉冿級 */
isChecked?: boolean;
userType?: EnumUserType;
+ enterpriseType?: EnumEnterpriseType;
clientType?: EnumClientType;
/** 涓婄骇Id */
parentId?: string;
@@ -5688,6 +5774,11 @@
signStatus?: EnumEnterpriseCooperationSignStatus;
/** 鍚堜綔鍗忚 */
cooperationAgreementUrl?: string;
+ serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
+ /** 鏈嶅姟璐� */
+ serviceFeeRate?: number;
+ /** 鍙戠エ绋庣偣 */
+ invoiceTaxPointRate?: number;
/** 鐢ㄦ埛Id */
userId?: string;
/** 璐﹀彿 */
@@ -5723,6 +5814,11 @@
cityContent?: string;
cooperationStatus?: EnumEnterpriseCooperationStatus;
signStatus?: EnumEnterpriseCooperationSignStatus;
+ serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
+ /** 鏈嶅姟璐� */
+ serviceFeeRate?: number;
+ /** 鍙戠エ绋庣偣 */
+ invoiceTaxPointRate?: number;
}
interface GetPersonalApplyTaskInfosQuery {
@@ -6025,8 +6121,15 @@
enterpriseSignContractStatus?: EnumTaskUserSignContractStatus;
/** 浼佷笟绛剧害鏃堕棿 */
enterpriseSignContractTime?: string;
+ source?: EnumEnterpriseEmployeeSource;
+ /** 鏉ユ簮鍚嶇О */
+ sourceName?: string;
/** 鐢靛瓙鍚堝悓 */
contractUrl?: string;
+ /** 鍗忚璧峰鏃堕棿 */
+ contractBegin?: string;
+ /** 鍗忚缁堟鏃堕棿 */
+ contractEnd?: string;
}
interface GetPersonalUserInfosQuery {
@@ -6128,6 +6231,8 @@
type?: EnumUserWalletTransactionType;
/** 璁㈠崟鍙� */
code?: string;
+ /** 浠诲姟鍚嶇О */
+ taskName?: string;
/** 浼佷笟鍚嶇О */
enterpriseName?: string;
/** 缁撶畻鏃ユ湡 */
@@ -6423,6 +6528,8 @@
dataPower?: EnumRoleWebApiDataPower;
/** 澶囨敞 */
remark?: string;
+ /** 鐢ㄦ埛鏁� */
+ userCount?: number;
/** 鑿滃崟Id */
menuIds?: string[];
/** 璧勬簮 */
@@ -6461,6 +6568,8 @@
isDisabled?: boolean;
/** 鐢ㄦ埛鏁伴噺 */
userCount?: number;
+ /** 鏄惁鍏紑 */
+ isPublic?: boolean;
}
interface GetRoleUserInfosQueryResultItem {
@@ -6533,6 +6642,8 @@
interface GetSettlementTasksQueryResultItem {
/** 浠诲姟Id */
id?: string;
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
/** 鎵�灞炰换鍔� */
name?: string;
/** 浠诲姟鍗曞彿 */
@@ -6564,6 +6675,8 @@
auditStatus?: EnumTaskSettlementAuditStatus;
/** 鎿嶄綔浜� */
operator?: string;
+ /** 鍙戝崟浼佷笟鍚嶇О */
+ enterpriseName?: string;
}
interface GetSettlementTasksQueryResultObjectData {
@@ -6603,6 +6716,8 @@
checkReceiveEndDate?: string;
/** 浠诲姟鍚嶇О */
name?: string;
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
/** 浠诲姟鍗曞彿 */
code?: string;
billingMethod?: EnumBillingMethod;
@@ -6850,6 +6965,8 @@
id?: string;
/** 渚涘簲鍟咺d */
supplierEnterpriseId?: string;
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
/** 渚涘簲鍟� */
supplierEnterpriseName?: string;
/** 闇�姹備汉鏁� */
@@ -7007,6 +7124,8 @@
id?: string;
/** 渚涘簲鍟咺d */
supplierEnterpriseId?: string;
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
/** 渚涘簲鍟� */
supplierEnterpriseName?: string;
/** 渚涘簲鍟嗚处鍙� */
@@ -7117,6 +7236,7 @@
}
interface GetTaskUsersQueryResult {
+ objectData?: GetTaskUsersQueryResultObjectData;
pageModel?: PagedListQueryResultPageModel;
/** 鏁版嵁 */
data?: GetTaskUsersQueryResultItem[];
@@ -7156,6 +7276,11 @@
/** 宸ヤ綔缁忛獙 */
workExperience?: string;
hireStatus?: EnumTaskUserHireStatus;
+ }
+
+ interface GetTaskUsersQueryResultObjectData {
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
}
interface GetThreeResourceLogsQuery {
@@ -7563,6 +7688,10 @@
}
interface ImportEnterpriseEmployeesCommandResultError {
+ /** 鍗忚璧峰 */
+ contractBegin?: string;
+ /** 鍗忚缁堟 */
+ contractEnd?: string;
/** 閿欒淇℃伅 */
errorMessage?: string;
/** 濮撳悕 */
@@ -7922,6 +8051,12 @@
type RepairContractTemplateValuePointBy1202Command = Record<string, any>;
+ type RepairEnterpriseEmployee1302Command = Record<string, any>;
+
+ type RepairEnterpriseUser1302Command = Record<string, any>;
+
+ type RepairEnterpriseWalletTransaction1302Command = Record<string, any>;
+
type RepairTaskEstimatedServiceFee1301Command = Record<string, any>;
interface ResendResourceCommand {
@@ -8155,6 +8290,7 @@
interface SaveMenuCommand {
userType?: EnumUserType;
+ enterpriseType?: EnumEnterpriseType;
clientType?: EnumClientType;
/** 涓婄骇Id */
parentId?: string;
@@ -8288,6 +8424,11 @@
signStatus?: EnumEnterpriseCooperationSignStatus;
/** 鍚堜綔鍗忚 */
cooperationAgreementUrl?: string;
+ serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
+ /** 鏈嶅姟璐� */
+ serviceFeeRate?: number;
+ /** 鍙戠エ绋庣偣 */
+ invoiceTaxPointRate?: number;
/** 璐﹀彿 */
userName?: string;
/** 瀵嗙爜锛堥�夊～ 濉簡灏辨敼涓嶅～灏变笉鏀癸級 */
@@ -8669,6 +8810,8 @@
/** 浠诲姟浜哄憳Id */
id?: string;
hireStatus?: EnumTaskUserHireStatus;
+ /** 褰曠敤澶囨敞 */
+ hireRemark?: string;
}
enum SettlementReceiveStatus {
--
Gitblit v1.9.1