From 7a5c5250b66cc6faffbcac9e192073473c50f79f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 28 八月 2026 17:02:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/api/hrm/salary/calculation/index.ts | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/api/hrm/salary/calculation/index.ts b/src/api/hrm/salary/calculation/index.ts
index 1e129ab..76d4fdd 100644
--- a/src/api/hrm/salary/calculation/index.ts
+++ b/src/api/hrm/salary/calculation/index.ts
@@ -22,9 +22,12 @@
housingFundDeduction?: number;
taxDeduction?: number;
otherDeduction?: number;
+ leaveDeduction?: number;
actualSalary?: number;
workDays?: number;
overtimeHours?: number;
+ /** 鎺掔彮鎬诲伐鏃讹紙灏忔椂锛� */
+ totalWorkHours?: number;
status?: number;
statusName?: string;
remark?: string;
@@ -103,6 +106,16 @@
return requestClient.post('/hrm/salary/calculation/confirm', { ids });
}
+/** 鎾ら攢钖叕鏍哥畻纭 */
+export function revokeSalaryCalculation(ids: number[]) {
+ return requestClient.post('/hrm/salary/calculation/revoke', { ids });
+}
+
+/** 鍒犻櫎钖叕鏍哥畻璁板綍 */
+export function deleteSalaryCalculation(id: number) {
+ return requestClient.delete(`/hrm/salary/calculation/delete?id=${id}`);
+}
+
/** 瀵煎嚭钖叕鏍哥畻琛� */
export function exportSalaryCalculation(params: any) {
return requestClient.download('/hrm/salary/calculation/export-excel', { params });
--
Gitblit v1.9.3