From 4eabe190353876fd57106d13a5510fc5e5167cec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 21 May 2024 15:58:28 +0800
Subject: [PATCH] hotfix/2.14.2.2405.02

---
 pc4mobx/hrmSalary/pages/salaryItem/columns.js        | 7 +++++++
 pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/pc4mobx/hrmSalary/pages/salaryItem/columns.js b/pc4mobx/hrmSalary/pages/salaryItem/columns.js
index d03e1dfc..281fa6ec 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/columns.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/columns.js
@@ -128,6 +128,13 @@ export const salaryItemFields = [
     viewAttr: 2,
     tip: ""
   },
+  {
+    key: "defaultValue",
+    label: "默认值",
+    type: "INPUT",
+    viewAttr: 2,
+    tip: ""
+  },
   {
     key: "formulaContent",
     label: "公式",
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
index 564c2ef8..c510a622 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
@@ -84,6 +84,12 @@ class SalaryItemForm extends Component {
               ...item,
               viewAttr: (useInEmployeeSalary.toString() === "0" && ((isLedger && record.canEdit) || (editable && record.canEdit) || isAdd)) ? 2 : 1
             };
+          case "defaultValue":
+            return {
+              ...item,
+              display: valueType && valueType.toString() === "1",
+              viewAttr: (isLedger && record.canEdit) || (editable && record.canEdit) || isAdd ? 2 : 1
+            };
           case "formulaContent":
             return {
               ...item,