From b56e609f59a8de73a54212f00febee228b0fb66a Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期五, 23 十月 2026 10:18:39 +0800
Subject: [PATCH] feat(hrm): 考勤规则表单/列表支持生效日期区间
---
src/views/hrm/salary/calculation/data.ts | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/views/hrm/salary/calculation/data.ts b/src/views/hrm/salary/calculation/data.ts
index 17860e1..c02d031 100644
--- a/src/views/hrm/salary/calculation/data.ts
+++ b/src/views/hrm/salary/calculation/data.ts
@@ -89,6 +89,7 @@
{ field: 'actualSalary', title: '瀹炲彂宸ヨ祫', width: 100, formatter: 'formatAmount2' },
{ field: 'workDays', title: '鍑哄嫟澶╂暟', width: 80 },
{ field: 'overtimeHours', title: '鍔犵彮鏃堕暱(h)', width: 100 },
+ { field: 'totalWorkHours', title: '鎺掔彮宸ユ椂(h)', width: 100 },
{
field: 'status',
title: '鐘舵��',
@@ -100,7 +101,7 @@
},
{
title: '鎿嶄綔',
- width: 120,
+ width: 220,
fixed: 'right',
slots: {
default: 'actions',
@@ -127,6 +128,7 @@
{ title: '璇峰亣鎵ｆ', dataIndex: 'leaveDeduction', width: 110 },
{ title: '鍑哄嫟澶╂暟', dataIndex: 'workDays', width: 90 },
{ title: '鍔犵彮鏃堕暱', dataIndex: 'overtimeHours', width: 100 },
+ { title: '鎺掔彮宸ユ椂(h)', dataIndex: 'totalWorkHours', width: 100 },
{ title: '瀹炲彂宸ヨ祫', dataIndex: 'actualSalary', width: 100, fixed: 'right' },
];
}
--
Gitblit v1.9.3