From 8bf28ea0550212ecf77a7c8a135bea36f89c742f Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期三, 28 十月 2026 09:46:48 +0800
Subject: [PATCH] feat(hrm): 薪酬核算新增全勤奖与实出天数；考勤记录支持按时间段导出
---
src/views/hrm/salary/calculation/data.ts | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/views/hrm/salary/calculation/data.ts b/src/views/hrm/salary/calculation/data.ts
index 2f8ce82..0c0667a 100644
--- a/src/views/hrm/salary/calculation/data.ts
+++ b/src/views/hrm/salary/calculation/data.ts
@@ -87,15 +87,16 @@
{ field: 'mealAllowance', title: '椁愯ˉ', width: 110, slots: { default: 'editableCell' } },
{ field: 'transportAllowance', title: '浜ら�氳ˉ璐�', width: 110, slots: { default: 'editableCell' } },
{ field: 'otherAllowance', title: '鍏朵粬琛ヨ创', width: 110, slots: { default: 'editableCell' } },
+ { field: 'fullAttendanceBonus', title: '鍏ㄥ嫟濂�', width: 110, slots: { default: 'editableCell' } },
{ field: 'socialSecurityDeduction', title: '绀句繚鎵ｆ', width: 120, slots: { default: 'editableCell' } },
{ field: 'housingFundDeduction', title: '鍏Н閲戞墸娆�', width: 120, slots: { default: 'editableCell' } },
{ field: 'taxDeduction', title: '涓◣鎵ｆ', width: 120, slots: { default: 'editableCell' } },
{ field: 'otherDeduction', title: '鍏朵粬鎵ｆ', width: 110, slots: { default: 'editableCell' } },
{ field: 'leaveDeduction', title: '璇峰亣鎵ｆ', width: 120, slots: { default: 'editableCell' } },
{ field: 'actualSalary', title: '瀹炲彂宸ヨ祫', width: 110, formatter: 'formatAmount2' },
- { field: 'workDays', title: '鍑哄嫟澶╂暟', width: 110, slots: { default: 'editableCell' } },
+ { field: 'workDays', title: '搴斿嚭澶╂暟', width: 110, slots: { default: 'editableCell' } },
+ { field: 'actualDays', title: '瀹炲嚭澶╂暟', width: 110, slots: { default: 'editableCell' } },
{ field: 'overtimeHours', title: '鍔犵彮鏃堕暱(h)', width: 120, slots: { default: 'editableCell' } },
- { field: 'totalWorkHours', title: '鎺掔彮宸ユ椂(h)', width: 110 },
{
field: 'status',
title: '鐘舵��',
@@ -129,14 +130,15 @@
{ title: '椁愯ˉ', dataIndex: 'mealAllowance', width: 100 },
{ title: '浜ら�氳ˉ璐�', dataIndex: 'transportAllowance', width: 100 },
{ title: '鍏朵粬琛ヨ创', dataIndex: 'otherAllowance', width: 100 },
+ { title: '鍏ㄥ嫟濂�', dataIndex: 'fullAttendanceBonus', width: 100 },
{ title: '绀句繚鎵ｆ', dataIndex: 'socialSecurityDeduction', width: 110 },
{ title: '鍏Н閲戞墸娆�', dataIndex: 'housingFundDeduction', width: 110 },
{ title: '涓◣鎵ｆ', dataIndex: 'taxDeduction', width: 110 },
{ title: '鍏朵粬鎵ｆ', dataIndex: 'otherDeduction', width: 100 },
{ title: '璇峰亣鎵ｆ', dataIndex: 'leaveDeduction', width: 110 },
- { title: '鍑哄嫟澶╂暟', dataIndex: 'workDays', width: 90 },
+ { title: '搴斿嚭澶╂暟', dataIndex: 'workDays', width: 90 },
+ { title: '瀹炲嚭澶╂暟', dataIndex: 'actualDays', width: 90 },
{ title: '鍔犵彮鏃堕暱', dataIndex: 'overtimeHours', width: 100 },
- { title: '鎺掔彮宸ユ椂(h)', dataIndex: 'totalWorkHours', width: 100 },
{ title: '瀹炲彂宸ヨ祫', dataIndex: 'actualSalary', width: 100, fixed: 'right' },
];
}
--
Gitblit v1.9.3