From 018ecf62b8a0365cb70b88d24a18b09e012ca909 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 16 九月 2025 14:54:07 +0800
Subject: [PATCH] Merge branch 'dev-v1.1' of http://120.26.58.240:8888/r/flexJobAdmin into dev-v1.1
---
src/services/api/typings.d.ts | 239 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 175 insertions(+), 64 deletions(-)
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 5ededb6..64d7946 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -207,10 +207,8 @@
}
interface APIgetSettlementTaskUsersParams {
- /** 浠诲姟Id */
- taskInfoId?: string;
- /** 缁撶畻鍗曞湴鍧� */
- settlementOrderUrl?: string;
+ /** 缁撶畻璁㈠崟Id */
+ id?: string;
}
interface APIgetTaskEnterpriseParams {
@@ -226,6 +224,17 @@
interface APIgetTaskSelectParams {
/** 鍏抽敭瀛� */
keywords?: string;
+ }
+
+ interface APIgetTaskSettlementDatesParams {
+ /** 浠诲姟寮�濮嬫椂闂� */
+ beginTime?: string;
+ /** 浠诲姟缁撴潫鏃堕棿 */
+ endTime?: string;
+ /** 缁撶畻鏂瑰紡 */
+ settlementCycle?: EnumSettlementCycle;
+ /** 缁撶畻鏃ユ湡 */
+ settlementDate?: number;
}
interface APIgetTaskUserHireStatusParams {
@@ -429,6 +438,21 @@
identityBackImg?: string;
/** Id */
id?: string;
+ }
+
+ interface EditTaskSettlementOrderRosterCommand {
+ /** 鍚嶅崟Id */
+ id?: string;
+ /** 缁撶畻閲戦 */
+ settlementAmount: number;
+ /** 瀹炲彂閲戦 */
+ actualSettlementAmount: number;
+ /** 鏀舵璐︽埛 */
+ receiveAccount: string;
+ /** 鎵�灞為摱琛� */
+ bank: string;
+ /** 寮�鎴锋敮琛屽悕绉� */
+ bankBranch?: string;
}
interface ElectronSignCallbackCommand {
@@ -653,6 +677,15 @@
Recharge = 10,
/**杞处 */
Transfer = 20,
+ }
+
+ enum EnumGetEnterpriseEmployeesQuerySignContractStatus {
+ /**鐏靛伐寰呯绾� */
+ UserWait = 10,
+ /**浼佷笟寰呯绾� */
+ EnterpriseWait = 20,
+ /**宸茬绾� */
+ Pass = 30,
}
enum EnumMenuType {
@@ -970,6 +1003,11 @@
interface ExportTaskCheckReceiveTaskUsersCommand {
/** 浠诲姟Id */
+ id?: string;
+ }
+
+ interface ExportTaskSettlementOrderRostersCommand {
+ /** 缁撶畻璁㈠崟Id */
id?: string;
}
@@ -2055,6 +2093,24 @@
timestamp?: number;
}
+ interface FriendlyResultImportTaskSettlementOrderRostersCommandResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: ImportTaskSettlementOrderRostersCommandResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultInt32 {
/** 璺熻釜Id */
traceId?: string;
@@ -2064,6 +2120,25 @@
errorCode?: string;
/** 鏁版嵁 */
data?: number;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultListDateTime {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ /** 鏁版嵁 */
+ data?: string[];
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -3139,6 +3214,7 @@
isReal?: boolean;
userSignContractStatus?: EnumTaskUserSignContractStatus;
enterpriseSignContractStatus?: EnumTaskUserSignContractStatus;
+ signContractStatus?: EnumGetEnterpriseEmployeesQuerySignContractStatus;
pageModel?: PagedListQueryPageModel;
}
@@ -4226,6 +4302,10 @@
keywords?: string;
settlementOrderStatus?: EnumTaskSettlementOrderStatus;
settlementStatus?: EnumTaskSettlementStatus;
+ /** 缁撶畻鏃堕棿-璧峰 */
+ settlementTimeBegin?: string;
+ /** 缁撶畻鏃堕棿-鎴 */
+ settlementTimeEnd?: string;
pageModel?: PagedListQueryPageModel;
}
@@ -4237,6 +4317,40 @@
interface GetSettlementTasksQueryResultItem {
/** 浠诲姟Id */
+ id?: string;
+ /** 鎵�灞炰换鍔� */
+ name?: string;
+ /** 浠诲姟鍗曞彿 */
+ code?: string;
+ checkReceiveStatus?: EnumTaskCheckReceiveStatus;
+ settlementOrderStatus?: EnumTaskSettlementOrderStatus;
+ /** 缁撶畻鍗曞悕绉� */
+ settlementOrderName?: string;
+ /** 涓婁紶鏃堕棿 */
+ settlementOrderTime?: string;
+ /** 瀹炲彂閲戦 */
+ actualSettlementAmount?: number;
+ /** 缁撶畻閲戦 */
+ settlementAmount?: number;
+ settlementStatus?: EnumTaskSettlementStatus;
+ /** 鍒涘缓鏃堕棿 */
+ createdTime?: string;
+ /** 缁撶畻鏃堕棿 */
+ settlementTime?: string;
+ /** 澶囨敞 */
+ settlementRemark?: string;
+ /** 缁撶畻浜烘暟 */
+ settlementUserCount?: number;
+ }
+
+ interface GetSettlementTaskUsersQueryResult {
+ detail?: GetSettlementTaskUsersQueryResultDetail;
+ /** 缁撶畻鍚嶅崟 */
+ data?: GetSettlementTaskUsersQueryResultItem[];
+ }
+
+ interface GetSettlementTaskUsersQueryResultDetail {
+ /** 缁撶畻璁㈠崟Id */
id?: string;
/** 浠诲姟鍚嶇О */
name?: string;
@@ -4256,41 +4370,10 @@
settlementTime?: string;
/** 澶囨敞 */
settlementRemark?: string;
- /** 缁撶畻浜烘暟 */
- settlementUserCount?: number;
- }
-
- interface GetSettlementTaskUsersQueryResult {
- detail?: GetSettlementTaskQueryResult;
- /** 缁撶畻鍚嶅崟 */
- data?: GetSettlementTaskUsersQueryResultItem[];
- /** 閿欒淇℃伅 */
- errors?: GetSettlementTaskUsersQueryResultError[];
- }
-
- interface GetSettlementTaskUsersQueryResultError {
- /** 閿欒淇℃伅 */
- errorMessage?: string;
- /** 濮撳悕 */
- name?: string;
- /** 韬唤璇佸彿 */
- identity?: string;
- /** 缁撶畻閲戦 */
- settlementAmount?: number;
- /** 瀹炲彂閲戦 */
- actualSettlementAmount?: number;
- /** 鏀舵璐︽埛 */
- receiveAccount?: string;
- /** 鎵�灞為摱琛� */
- bank?: string;
- /** 寮�鎴锋敮琛屽悕绉� */
- bankBranch?: string;
- /** 浠诲姟鍚嶇О */
- taskName?: string;
}
interface GetSettlementTaskUsersQueryResultItem {
- /** 浠诲姟鐢ㄦ埛Id */
+ /** 缁撶畻鍚嶅崟Id */
id?: string;
/** 濮撳悕 */
name?: string;
@@ -4298,7 +4381,6 @@
identity?: string;
/** 鎵嬫満鍙� */
contactPhoneNumber?: string;
- checkReceiveStatus?: EnumTaskCheckReceiveStatus;
settlementStatus?: EnumTaskSettlementStatus;
/** 鎵�灞為摱琛� */
bank?: string;
@@ -4358,6 +4440,8 @@
/** 鏈嶅姟璐� */
serviceFee?: number;
settlementCycle?: EnumSettlementCycle;
+ /** 缁撶畻鏃ユ湡 */
+ settlementDate?: number;
/** 绂忓埄 */
benefits?: GetTaskInfoQueryResultBenefit[];
/** 骞撮緞鑼冨洿鏈�灏� */
@@ -4510,7 +4594,6 @@
endTime?: string;
releaseStatus?: EnumTaskReleaseStatus;
checkReceiveStatus?: EnumTaskCheckReceiveStatus;
- settlementStatus?: EnumTaskSettlementStatus;
recommendStatus?: EnumTaskRecommendStatus;
/** 鎺ㄨ崘鏃堕棿 */
recommendTime?: string;
@@ -4899,6 +4982,58 @@
contactPhoneNumber?: string;
/** 韬唤璇佸彿 */
identity?: string;
+ }
+
+ interface ImportTaskSettlementOrderRostersCommand {
+ /** 缁撶畻璁㈠崟Id */
+ id?: string;
+ /** 瀵煎叆鏂囦欢鍦板潃 */
+ url: string;
+ }
+
+ interface ImportTaskSettlementOrderRostersCommandResult {
+ /** Id */
+ id?: string;
+ /** 浠诲姟鍚嶇О */
+ name?: string;
+ /** 浠诲姟鍗曞彿 */
+ code?: string;
+ settlementOrderStatus?: EnumTaskSettlementOrderStatus;
+ /** 缁撶畻鍗曞悕绉� */
+ settlementOrderName?: string;
+ /** 涓婁紶鏃堕棿 */
+ settlementOrderTime?: string;
+ /** 瀹炲彂閲戦 */
+ actualSettlementAmount?: number;
+ /** 缁撶畻閲戦 */
+ settlementAmount?: number;
+ settlementStatus?: EnumTaskSettlementStatus;
+ /** 缁撶畻鏃堕棿 */
+ settlementTime?: string;
+ /** 澶囨敞 */
+ settlementRemark?: string;
+ errors?: ImportTaskSettlementOrderRostersCommandResultError[];
+ }
+
+ interface ImportTaskSettlementOrderRostersCommandResultError {
+ /** 閿欒淇℃伅 */
+ errorMessage?: string;
+ /** 濮撳悕 */
+ name?: string;
+ /** 韬唤璇佸彿 */
+ identity?: string;
+ /** 缁撶畻閲戦 */
+ settlementAmount?: number;
+ /** 瀹炲彂閲戦 */
+ actualSettlementAmount?: number;
+ /** 鏀舵璐︽埛 */
+ receiveAccount?: string;
+ /** 鎵�灞為摱琛� */
+ bank?: string;
+ /** 寮�鎴锋敮琛屽悕绉� */
+ bankBranch?: string;
+ /** 浠诲姟鍚嶇О */
+ taskName?: string;
}
interface InviteElectronSignCommand {
@@ -5376,6 +5511,8 @@
/** 鏈嶅姟璐� */
serviceFee: number;
settlementCycle: EnumSettlementCycle;
+ /** 缁撶畻鏃ユ湡 */
+ settlementDate: number;
/** 绂忓埄缂栧彿 */
benefits?: string[];
/** 骞撮緞鑼冨洿鏈�灏� */
@@ -5632,32 +5769,6 @@
interface SureTaskSettlementCommand {
/** 浠诲姟Id */
taskInfoId?: string;
- }
-
- interface SureTaskSettlementOrderCommand {
- /** 浠诲姟Id */
- taskInfoId?: string;
- /** 缁撶畻鍗曞湴鍧� */
- settlementOrderUrl?: string;
- /** 缁撶畻鍚嶅崟 */
- taskInfoUsers?: SureTaskSettlementOrderCommandUser[];
- }
-
- interface SureTaskSettlementOrderCommandUser {
- /** 浠诲姟鐢ㄦ埛Id */
- id?: string;
- /** 濮撳悕 */
- name?: string;
- /** 鎵�灞為摱琛� */
- bank?: string;
- /** 寮�鎴锋敮琛屽悕绉� */
- bankBranch?: string;
- /** 鏀舵璐︽埛 */
- receiveAccount: string;
- /** 缁撶畻閲戦 */
- settlementAmount: number;
- /** 瀹炲彂閲戦 */
- actualSettlementAmount: number;
}
type SyncDatabaseCommand = Record<string, any>;
--
Gitblit v1.9.1