From 611dd8268e40caa4d97e8954b85b5adaaef99afa Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 17:45:58 +0800
Subject: [PATCH] feat(hrm): 考勤规则支持地图定位打卡
---
src/views/hrm/salary/calculation/data.ts | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/src/views/hrm/salary/calculation/data.ts b/src/views/hrm/salary/calculation/data.ts
index 17860e1..2f8ce82 100644
--- a/src/views/hrm/salary/calculation/data.ts
+++ b/src/views/hrm/salary/calculation/data.ts
@@ -34,7 +34,11 @@
labelField: 'name',
valueField: 'id',
allowClear: true,
- placeholder: '璇烽�夋嫨鍛樺伐',
+ showSearch: true,
+ // 鏀寔鎸夊鍚嶆ā绯婃悳绱紱涔熷彲杈撳叆鍛樺伐缂栧彿鍖归厤
+ filterOption: (input: string, option: any) =>
+ `${option?.label ?? ''}`.toLowerCase().includes(input.toLowerCase()),
+ placeholder: '璇烽�夋嫨鍛樺伐锛堝彲杈撳叆濮撳悕鎼滅储锛�',
},
},
{
@@ -75,20 +79,23 @@
{ field: 'period', title: '鏍哥畻鍛ㄦ湡', width: 100 },
{ field: 'userName', title: '鍛樺伐濮撳悕', minWidth: 100 },
{ field: 'deptName', title: '閮ㄩ棬', minWidth: 120 },
- { field: 'baseSalary', title: '鍩烘湰宸ヨ祫', width: 100, formatter: 'formatAmount2' },
- { field: 'performanceSalary', title: '缁╂晥宸ヨ祫', width: 100, formatter: 'formatAmount2' },
- { field: 'overtimePay', title: '鍔犵彮璐�', width: 100, formatter: 'formatAmount2' },
- { field: 'mealAllowance', title: '椁愯ˉ', width: 80, formatter: 'formatAmount2' },
- { field: 'transportAllowance', title: '浜ら�氳ˉ璐�', width: 80, formatter: 'formatAmount2' },
- { field: 'otherAllowance', title: '鍏朵粬琛ヨ创', width: 80, formatter: 'formatAmount2' },
- { field: 'socialSecurityDeduction', title: '绀句繚鎵ｆ', width: 100, formatter: 'formatAmount2' },
- { field: 'housingFundDeduction', title: '鍏Н閲戞墸娆�', width: 100, formatter: 'formatAmount2' },
- { field: 'taxDeduction', title: '涓◣鎵ｆ', width: 100, formatter: 'formatAmount2' },
- { field: 'otherDeduction', title: '鍏朵粬鎵ｆ', width: 80, formatter: 'formatAmount2' },
- { field: 'leaveDeduction', title: '璇峰亣鎵ｆ', width: 100, formatter: 'formatAmount2' },
- { field: 'actualSalary', title: '瀹炲彂宸ヨ祫', width: 100, formatter: 'formatAmount2' },
- { field: 'workDays', title: '鍑哄嫟澶╂暟', width: 80 },
- { field: 'overtimeHours', title: '鍔犵彮鏃堕暱(h)', width: 100 },
+ { field: 'baseSalary', title: '鍩烘湰宸ヨ祫', width: 120, slots: { default: 'editableCell' } },
+ { field: 'postSalary', title: '宀椾綅宸ヨ祫', width: 110, slots: { default: 'editableCell' } },
+ { field: 'senioritySalary', title: '宸ラ緞宸ヨ祫', width: 110, slots: { default: 'editableCell' } },
+ { field: 'performanceSalary', title: '缁╂晥宸ヨ祫', width: 120, slots: { default: 'editableCell' } },
+ { field: 'overtimePay', title: '鍔犵彮璐�', width: 120, slots: { default: 'editableCell' } },
+ { 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: '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: 'overtimeHours', title: '鍔犵彮鏃堕暱(h)', width: 120, slots: { default: 'editableCell' } },
+ { field: 'totalWorkHours', title: '鎺掔彮宸ユ椂(h)', width: 110 },
{
field: 'status',
title: '鐘舵��',
@@ -100,7 +107,7 @@
},
{
title: '鎿嶄綔',
- width: 120,
+ width: 220,
fixed: 'right',
slots: {
default: 'actions',
@@ -115,6 +122,8 @@
{ title: '鍛樺伐濮撳悕', dataIndex: 'userName', width: 100, fixed: 'left' },
{ title: '閮ㄩ棬', dataIndex: 'deptName', width: 120 },
{ title: '鍩烘湰宸ヨ祫', dataIndex: 'baseSalary', width: 110 },
+ { title: '宀椾綅宸ヨ祫', dataIndex: 'postSalary', width: 110 },
+ { title: '宸ラ緞宸ヨ祫', dataIndex: 'senioritySalary', width: 110 },
{ title: '缁╂晥宸ヨ祫', dataIndex: 'performanceSalary', width: 110 },
{ title: '鍔犵彮璐�', dataIndex: 'overtimePay', width: 110 },
{ title: '椁愯ˉ', dataIndex: 'mealAllowance', width: 100 },
@@ -127,6 +136,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