From 6bb79ab685cb36e2945e01f65834af9e7149a24c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 20 Jun 2024 17:25:55 +0800
Subject: [PATCH]  hotfix/2.14.2.2406.02

---
 .../pages/ledgerPage/components/ledgerSalaryItemTable.js   | 5 +++--
 pc4mobx/hrmSalary/pages/salaryItem/index.js                | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
index 16db4771..838f44a0 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
@@ -153,10 +153,11 @@ class LedgerSalaryItemTable extends Component {
     const { salaryItemId } = record;
     const {
       hideDefault, roundingMode, pattern, valueType, defaultValue,
-      originFormulaContent, originSqlContent, formulaId
+      originFormulaContent, originSqlContent, formulaId, dataType
     } = request;
     this.handleChangeSalaryItem({
-      itemHide: hideDefault.toString(), defaultValue: toDecimal_n(defaultValue, parseInt(pattern)),
+      itemHide: hideDefault.toString(),
+      defaultValue: dataType === "number" ? toDecimal_n(defaultValue, parseInt(pattern)) : defaultValue,
       roundingMode, pattern, valueType,
       formulaContent: valueType.toString() === "2" ? originFormulaContent : originSqlContent,
       formulaId: ((valueType.toString() === "3" && (!originSqlContent || originSqlContent === " ")) || (valueType.toString() === "2" && (!originFormulaContent || originFormulaContent === " ")) || valueType.toString() === "1") ? "" : formulaId,
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js
index 7f55028d..09875add 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js
@@ -314,8 +314,11 @@ export default class SalaryItem extends React.Component {
         });
         return;
       }
-      const { pattern, defaultValue, ...extra } = payload;
-      saveItem({ ...extra, pattern, defaultValue: toDecimal_n(defaultValue, parseInt(pattern)) }, continueFlag)
+      const { pattern, defaultValue, dataType, ...extra } = payload;
+      saveItem({
+        ...extra, pattern, dataType,
+        defaultValue: dataType === "number" ? toDecimal_n(defaultValue, parseInt(pattern)) : defaultValue
+      }, continueFlag)
         .then(() => {
           getTableDatas({ ...this.state.searchParams }).then(res => {
             this.setState({