From dcc8b0f4845cf633daa885fec45d2c140ec5f584 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期二, 03 十一月 2026 19:41:02 +0800
Subject: [PATCH] fix(hrm/bpm): 个税表单补必填字段、流程模型返回上一步不再卡住、核算缺勤扣款只读
---
src/views/hrm/salary/calculation/data.ts | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/hrm/salary/calculation/data.ts b/src/views/hrm/salary/calculation/data.ts
index 0c0667a..6bcc0be 100644
--- a/src/views/hrm/salary/calculation/data.ts
+++ b/src/views/hrm/salary/calculation/data.ts
@@ -92,7 +92,7 @@
{ 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: 'leaveDeduction', title: '缂哄嫟鎵ｆ', width: 120 },
{ field: 'actualSalary', title: '瀹炲彂宸ヨ祫', width: 110, formatter: 'formatAmount2' },
{ field: 'workDays', title: '搴斿嚭澶╂暟', width: 110, slots: { default: 'editableCell' } },
{ field: 'actualDays', title: '瀹炲嚭澶╂暟', width: 110, slots: { default: 'editableCell' } },
@@ -135,7 +135,7 @@
{ title: '鍏Н閲戞墸娆�', dataIndex: 'housingFundDeduction', width: 110 },
{ title: '涓◣鎵ｆ', dataIndex: 'taxDeduction', width: 110 },
{ title: '鍏朵粬鎵ｆ', dataIndex: 'otherDeduction', width: 100 },
- { title: '璇峰亣鎵ｆ', dataIndex: 'leaveDeduction', width: 110 },
+ { title: '缂哄嫟鎵ｆ', dataIndex: 'leaveDeduction', width: 110 },
{ title: '搴斿嚭澶╂暟', dataIndex: 'workDays', width: 90 },
{ title: '瀹炲嚭澶╂暟', dataIndex: 'actualDays', width: 90 },
{ title: '鍔犵彮鏃堕暱', dataIndex: 'overtimeHours', width: 100 },
--
Gitblit v1.9.3