From 2ab2089cf9c320920715c85525f43553c81c85df Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期一, 26 十月 2026 14:14:40 +0800
Subject: [PATCH] feat(hrm): 薪酬核算新增岗位工资/工龄工资列；核算搜索的员工下拉支持模糊搜索
---
src/views/hrm/salary/calculation/data.ts | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/views/hrm/salary/calculation/data.ts b/src/views/hrm/salary/calculation/data.ts
index d52945d..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: '璇烽�夋嫨鍛樺伐锛堝彲杈撳叆濮撳悕鎼滅储锛�',
},
},
{
@@ -76,6 +80,8 @@
{ field: 'userName', title: '鍛樺伐濮撳悕', minWidth: 100 },
{ field: 'deptName', title: '閮ㄩ棬', minWidth: 120 },
{ 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' } },
@@ -116,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 },
--
Gitblit v1.9.3