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 ++--
src/views/hrm/salary/calculation/modules/form.vue | 2 +-
src/views/bpm/model/form/index.vue | 5 +++++
src/views/hrm/salary/calculation/index.vue | 2 +-
src/views/hrm/salary/tax-rate-config/data.ts | 18 ++++++++++++++++++
5 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/src/views/bpm/model/form/index.vue b/src/views/bpm/model/form/index.vue
index e76ccf9..3719f3e 100644
--- a/src/views/bpm/model/form/index.vue
+++ b/src/views/bpm/model/form/index.vue
@@ -366,6 +366,11 @@
/** 姝ラ鍒囨崲澶勭悊 */
async function handleStepClick(index: number) {
+ // 寰�鍥為��锛堢偣鍑绘洿闈犲墠鐨勬楠わ級涓嶅仛鏍￠獙锛岄伩鍏嶇敤鎴峰湪绗� 2 姝ャ�岃〃鍗曡璁°�嶆湭瀹屾垚鏃惰鍗′綇鏃犳硶杩斿洖
+ if (index < currentStep.value) {
+ currentStep.value = index;
+ return;
+ }
try {
if (index !== 0) {
await validateBasic();
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 },
diff --git a/src/views/hrm/salary/calculation/index.vue b/src/views/hrm/salary/calculation/index.vue
index 31d3883..71a2a75 100644
--- a/src/views/hrm/salary/calculation/index.vue
+++ b/src/views/hrm/salary/calculation/index.vue
@@ -304,7 +304,7 @@
'housingFundDeduction',
'taxDeduction',
'otherDeduction',
- 'leaveDeduction',
+ // leaveDeduction 鐢卞悗绔寜銆屽簲鍑�/瀹炲嚭澶╂暟 + 璇峰亣鍗曘�嶉噸绠楋紝涓嶅厑璁稿墠绔紪杈�
'workDays',
'actualDays',
'overtimeHours',
diff --git a/src/views/hrm/salary/calculation/modules/form.vue b/src/views/hrm/salary/calculation/modules/form.vue
index 96f4729..9c25823 100644
--- a/src/views/hrm/salary/calculation/modules/form.vue
+++ b/src/views/hrm/salary/calculation/modules/form.vue
@@ -33,7 +33,7 @@
{ key: 'housingFundDeduction', label: '鍏Н閲戞墸娆�' },
{ key: 'taxDeduction', label: '涓◣鎵ｆ' },
{ key: 'otherDeduction', label: '鍏朵粬鎵ｆ' },
- { key: 'leaveDeduction', label: '璇峰亣鎵ｆ' },
+ { key: 'leaveDeduction', label: '缂哄嫟鎵ｆ' },
];
/** 瀹炲彂宸ヨ祫锛堝疄鏃惰绠楋紝涓庡悗绔彛寰勪竴鑷达級 */
diff --git a/src/views/hrm/salary/tax-rate-config/data.ts b/src/views/hrm/salary/tax-rate-config/data.ts
index 2765700..c0002b6 100644
--- a/src/views/hrm/salary/tax-rate-config/data.ts
+++ b/src/views/hrm/salary/tax-rate-config/data.ts
@@ -29,6 +29,24 @@
rules: 'required',
},
{
+ fieldName: 'name',
+ label: '閰嶇疆鍚嶇О',
+ component: 'Input',
+ componentProps: {
+ placeholder: '涓嶅～鍒欒嚜鍔ㄧ敓鎴愶紙濡� 2026骞�11鏈堜釜绋庣◣鐜囪〃锛�',
+ },
+ },
+ {
+ fieldName: 'effectiveDate',
+ label: '鐢熸晥鏃ユ湡',
+ component: 'DatePicker',
+ componentProps: {
+ placeholder: '涓嶅～榛樿褰撴湀1鍙�',
+ valueFormat: 'YYYY-MM-DD',
+ style: { width: '100%' },
+ },
+ },
+ {
fieldName: 'minAmount',
label: '搴旂撼绋庢墍寰楅涓嬮檺',
component: 'InputNumber',
--
Gitblit v1.9.3