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 | 93 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 88 insertions(+), 5 deletions(-)
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 113f2ac..b9f42a2 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -875,6 +875,13 @@
Face = 20,
}
+ enum EnumEnterpriseCooperationServiceFeeCollectType {
+ /**鎸夋瘮渚� */
+ Rate = 10,
+ /**鍗曚汉鍗曟 */
+ SingleTime = 20,
+ }
+
enum EnumEnterpriseCooperationSignStatus {
/**鏈绾� */
None = 10,
@@ -1191,8 +1198,10 @@
UserServerEnterpriseEmployee = 23,
/**鐢靛瓙绛� */
ElectronSignServerElectronSign = 24,
- /**鐢靛瓙绛� */
+ /**鐭俊 */
ToolServerSms = 25,
+ /**灏忕▼搴� */
+ ToolServerWxmp = 26,
}
enum EnumResourceMethod {
@@ -1355,6 +1364,8 @@
Pass = 20,
/**宸茶阿缁� */
Refuse = 30,
+ /**宸插彇娑� */
+ Cancel = 40,
}
enum EnumTaskUserSignContractStatus {
@@ -3901,6 +3912,7 @@
}
interface GetArrangeTaskUsersQueryResult {
+ objectData?: GetArrangeTaskUsersQueryResultObjectData;
pageModel?: PagedListQueryResultPageModel;
/** 鏁版嵁 */
data?: GetArrangeTaskUsersQueryResultItem[];
@@ -3938,6 +3950,11 @@
/** 宸ヤ綔缁忛獙 */
workExperience?: string;
arrangeStatus?: EnumTaskUserArrangeStatus;
+ }
+
+ interface GetArrangeTaskUsersQueryResultObjectData {
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
}
interface GetBankOcrCommand {
@@ -4053,6 +4070,8 @@
interface GetCheckReceiveTaskQueryResultObjectData {
/** 渚涘簲鍟咺d */
supplierEnterpriseId?: string;
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
/** 闇�姹備汉鏁� */
needPeopleNumber?: number;
/** 浠诲姟鍚嶇О */
@@ -4111,6 +4130,8 @@
id?: string;
/** 渚涘簲鍟咺d */
supplierEnterpriseId?: string;
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
/** 闇�姹備汉鏁� */
needPeopleNumber?: number;
/** 浠诲姟鍚嶇О */
@@ -4149,6 +4170,8 @@
/** 鏈�杩戦獙鏀舵椂闂� */
lastCheckReceiveTime?: string;
checkedStatus?: EnumGetCheckReceiveTasksQueryResultItemCheckStatus;
+ /** 浜哄憳鏁伴噺 */
+ arrangeUserCount?: number;
}
interface GetCheckReceiveTaskUserSubmitCheckHistoriesQuery {
@@ -4198,6 +4221,8 @@
id?: string;
/** 浠诲姟浜哄憳Id */
taskInfoUserId?: string;
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
enterpriseEmployeeUser?: GetCheckReceiveTaskUserSubmitsQueryResultObjectDataEnterpriseEmployeeUser;
/** 楠屾敹鏃堕棿 */
date?: string;
@@ -4324,6 +4349,8 @@
addressName?: string;
/** 楠屾敹鏂瑰紡 */
checkReceiveMethods?: EnumTaskCheckReceiveMethod[];
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
}
interface GetCodeUrlQueryResult {
@@ -4869,6 +4896,10 @@
enterpriseSignContractTime?: string;
/** 鐢靛瓙鍚堝悓 */
contractUrl?: string;
+ /** 鍗忚璧峰鏃堕棿 */
+ contractBegin?: string;
+ /** 鍗忚缁堟鏃堕棿 */
+ contractEnd?: string;
userSignContractStatus?: EnumTaskUserSignContractStatus;
}
@@ -4879,6 +4910,10 @@
createdTimeStart?: string;
/** 鐧昏鏃堕棿-鏈�鏅氭椂闂� */
createdTimeEnd?: string;
+ /** 鐏靛伐绛剧害鏃堕棿-鏈�鏃╂椂闂� */
+ userSignContractTimeStart?: string;
+ /** 鐏靛伐绛剧害鏃堕棿-鏈�鏅氭椂闂� */
+ userSignContractTimeEnd?: string;
/** 绛剧害鏃堕棿-鏈�鏃╂椂闂� */
signContractTimeStart?: string;
/** 绛剧害鏃堕棿-鏈�鏅氭椂闂� */
@@ -5739,6 +5774,11 @@
signStatus?: EnumEnterpriseCooperationSignStatus;
/** 鍚堜綔鍗忚 */
cooperationAgreementUrl?: string;
+ serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
+ /** 鏈嶅姟璐� */
+ serviceFeeRate?: number;
+ /** 鍙戠エ绋庣偣 */
+ invoiceTaxPointRate?: number;
/** 鐢ㄦ埛Id */
userId?: string;
/** 璐﹀彿 */
@@ -5774,6 +5814,11 @@
cityContent?: string;
cooperationStatus?: EnumEnterpriseCooperationStatus;
signStatus?: EnumEnterpriseCooperationSignStatus;
+ serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
+ /** 鏈嶅姟璐� */
+ serviceFeeRate?: number;
+ /** 鍙戠エ绋庣偣 */
+ invoiceTaxPointRate?: number;
}
interface GetPersonalApplyTaskInfosQuery {
@@ -6076,8 +6121,15 @@
enterpriseSignContractStatus?: EnumTaskUserSignContractStatus;
/** 浼佷笟绛剧害鏃堕棿 */
enterpriseSignContractTime?: string;
+ source?: EnumEnterpriseEmployeeSource;
+ /** 鏉ユ簮鍚嶇О */
+ sourceName?: string;
/** 鐢靛瓙鍚堝悓 */
contractUrl?: string;
+ /** 鍗忚璧峰鏃堕棿 */
+ contractBegin?: string;
+ /** 鍗忚缁堟鏃堕棿 */
+ contractEnd?: string;
}
interface GetPersonalUserInfosQuery {
@@ -6179,6 +6231,8 @@
type?: EnumUserWalletTransactionType;
/** 璁㈠崟鍙� */
code?: string;
+ /** 浠诲姟鍚嶇О */
+ taskName?: string;
/** 浼佷笟鍚嶇О */
enterpriseName?: string;
/** 缁撶畻鏃ユ湡 */
@@ -6514,6 +6568,8 @@
isDisabled?: boolean;
/** 鐢ㄦ埛鏁伴噺 */
userCount?: number;
+ /** 鏄惁鍏紑 */
+ isPublic?: boolean;
}
interface GetRoleUserInfosQueryResultItem {
@@ -6586,6 +6642,8 @@
interface GetSettlementTasksQueryResultItem {
/** 浠诲姟Id */
id?: string;
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
/** 鎵�灞炰换鍔� */
name?: string;
/** 浠诲姟鍗曞彿 */
@@ -6617,6 +6675,8 @@
auditStatus?: EnumTaskSettlementAuditStatus;
/** 鎿嶄綔浜� */
operator?: string;
+ /** 鍙戝崟浼佷笟鍚嶇О */
+ enterpriseName?: string;
}
interface GetSettlementTasksQueryResultObjectData {
@@ -6656,6 +6716,8 @@
checkReceiveEndDate?: string;
/** 浠诲姟鍚嶇О */
name?: string;
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
/** 浠诲姟鍗曞彿 */
code?: string;
billingMethod?: EnumBillingMethod;
@@ -6903,6 +6965,8 @@
id?: string;
/** 渚涘簲鍟咺d */
supplierEnterpriseId?: string;
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
/** 渚涘簲鍟� */
supplierEnterpriseName?: string;
/** 闇�姹備汉鏁� */
@@ -7060,6 +7124,8 @@
id?: string;
/** 渚涘簲鍟咺d */
supplierEnterpriseId?: string;
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
/** 渚涘簲鍟� */
supplierEnterpriseName?: string;
/** 渚涘簲鍟嗚处鍙� */
@@ -7170,6 +7236,7 @@
}
interface GetTaskUsersQueryResult {
+ objectData?: GetTaskUsersQueryResultObjectData;
pageModel?: PagedListQueryResultPageModel;
/** 鏁版嵁 */
data?: GetTaskUsersQueryResultItem[];
@@ -7209,6 +7276,11 @@
/** 宸ヤ綔缁忛獙 */
workExperience?: string;
hireStatus?: EnumTaskUserHireStatus;
+ }
+
+ interface GetTaskUsersQueryResultObjectData {
+ /** 鏄惁鍐呴儴浠诲姟 */
+ isInternal?: boolean;
}
interface GetThreeResourceLogsQuery {
@@ -7616,6 +7688,10 @@
}
interface ImportEnterpriseEmployeesCommandResultError {
+ /** 鍗忚璧峰 */
+ contractBegin?: string;
+ /** 鍗忚缁堟 */
+ contractEnd?: string;
/** 閿欒淇℃伅 */
errorMessage?: string;
/** 濮撳悕 */
@@ -7624,10 +7700,6 @@
contactPhoneNumber?: string;
/** 韬唤璇佸彿 */
identity?: string;
- /** 鍗忚璧峰鏃堕棿 */
- contractBegin?: string;
- /** 鍗忚缁堟鏃堕棿 */
- contractEnd?: string;
}
interface ImportTaskSettlementOrderRostersCommand {
@@ -7980,6 +8052,10 @@
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>;
@@ -8348,6 +8424,11 @@
signStatus?: EnumEnterpriseCooperationSignStatus;
/** 鍚堜綔鍗忚 */
cooperationAgreementUrl?: string;
+ serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
+ /** 鏈嶅姟璐� */
+ serviceFeeRate?: number;
+ /** 鍙戠エ绋庣偣 */
+ invoiceTaxPointRate?: number;
/** 璐﹀彿 */
userName?: string;
/** 瀵嗙爜锛堥�夊～ 濉簡灏辨敼涓嶅～灏变笉鏀癸級 */
@@ -8729,6 +8810,8 @@
/** 浠诲姟浜哄憳Id */
id?: string;
hireStatus?: EnumTaskUserHireStatus;
+ /** 褰曠敤澶囨敞 */
+ hireRemark?: string;
}
enum SettlementReceiveStatus {
--
Gitblit v1.9.1