From cb9cd49627b65a4c0e137e08063271a8cefe1826 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 23 七月 2026 17:48:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
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 2aa50f5..17860e1 100644
--- a/src/views/hrm/salary/calculation/data.ts
+++ b/src/views/hrm/salary/calculation/data.ts
@@ -85,6 +85,7 @@
{ 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 },
@@ -92,9 +93,9 @@
field: 'status',
title: '鐘舵��',
width: 100,
- cellRender: {
- name: 'CellDict',
- props: { type: DICT_TYPE.HRM_SALARY_STATUS },
+ fixed: 'right',
+ slots: {
+ default: 'status',
},
},
{
@@ -123,8 +124,9 @@
{ title: '鍏Н閲戞墸娆�', dataIndex: 'housingFundDeduction', width: 110 },
{ title: '涓◣鎵ｆ', dataIndex: 'taxDeduction', width: 110 },
{ title: '鍏朵粬鎵ｆ', dataIndex: 'otherDeduction', width: 100 },
- { title: '瀹炲彂宸ヨ祫', dataIndex: 'actualSalary', width: 100, fixed: 'right' },
+ { title: '璇峰亣鎵ｆ', dataIndex: 'leaveDeduction', width: 110 },
{ title: '鍑哄嫟澶╂暟', dataIndex: 'workDays', width: 90 },
{ title: '鍔犵彮鏃堕暱', dataIndex: 'overtimeHours', width: 100 },
+ { title: '瀹炲彂宸ヨ祫', dataIndex: 'actualSalary', width: 100, fixed: 'right' },
];
}
--
Gitblit v1.9.3