From a7dc7b230fcc6abc6ee5a7bfadb90789b03d2ca8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 07 九月 2026 16:45:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/api/hrm/leave/index.ts | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/api/hrm/leave/index.ts b/src/api/hrm/leave/index.ts
index 981d7ff..ee16a80 100644
--- a/src/api/hrm/leave/index.ts
+++ b/src/api/hrm/leave/index.ts
@@ -1,24 +1,32 @@
import type { PageParam, PageResult } from '#/packages/effects/request/src';
import { requestClient } from '#/api/request';
+import type { SystemStorageApi } from '#/api/system/storage';
export namespace HrmLeaveApi {
/** 璇峰亣鐢宠 */
export interface Leave {
id?: number;
- employeeId?: number;
- employeeName?: string;
+ userId?: number;
+ userName?: string;
deptName?: string;
leaveType?: number;
startTime?: string;
endTime?: string;
duration?: number;
reason?: string;
- fileUrl?: string;
+ blobIds?: number[];
+ attachmentList?: SystemStorageApi.StorageBlob[];
status?: number;
processInstanceId?: string;
remark?: string;
createTime?: string;
+ }
+
+ /** 瀹℃壒娴佺▼ */
+ export interface ApproveProcess {
+ key: string;
+ name: string;
}
}
@@ -51,8 +59,10 @@
}
/** 鎻愪氦璇峰亣鐢宠锛堝彂璧峰鎵癸級 */
-export function submitLeave(id: number) {
- return requestClient.post(`/hrm/leave/submit?id=${id}`);
+export function submitLeave(id: number, processDefinitionKey: string) {
+ return requestClient.post('/hrm/leave/submit', null, {
+ params: { id, processDefinitionKey },
+ });
}
/** 鎾ら攢璇峰亣鐢宠 */
@@ -62,5 +72,7 @@
/** 鑾峰彇鍙敤娴佺▼瀹氫箟鍒楄〃 */
export function getLeaveApproveProcessDefinitionList() {
- return requestClient.get<any[]>('/hrm/leave/approve-process-definition-list');
+ return requestClient.get<HrmLeaveApi.ApproveProcess[]>(
+ '/hrm/leave/approve-process-definition-list',
+ );
}
\ No newline at end of file
--
Gitblit v1.9.3