From d075fceb05559dea329c940b6815c301607ee2c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 20 Oct 2023 14:41:42 +0800
Subject: [PATCH] hotfix/2.9.42310.01

---
 .../fieldManagement/components/fieldSlide.js  | 33 +++++++++++--------
 .../pages/salaryItem/salaryItemForm.js        |  7 +++-
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
index 9e10b3a6..ab02fe74 100644
--- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
+++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
@@ -306,20 +306,25 @@ class FieldSlide extends Component {
                 onChange={value => this.handleChangeFields("dataType", value)}
               />
             </WeaFormItem>
-            <WeaFormItem label="舍入规则" labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
-              <WeaSelect
-                value={roundingMode}
-                options={roundingModeOptions}
-                onChange={value => this.handleChangeFields("roundingMode", value)}
-              />
-            </WeaFormItem>
-            <WeaFormItem label="保留小数位" labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
-              <WeaSelect
-                value={pattern}
-                options={patternOptions}
-                onChange={value => this.handleChangeFields("pattern", value)}
-              />
-            </WeaFormItem>
+            {
+              dataType === "number" &&
+              <React.Fragment>
+                <WeaFormItem label="舍入规则" labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
+                  <WeaSelect
+                    value={roundingMode}
+                    options={roundingModeOptions}
+                    onChange={value => this.handleChangeFields("roundingMode", value)}
+                  />
+                </WeaFormItem>
+                <WeaFormItem label="保留小数位" labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
+                  <WeaSelect
+                    value={pattern}
+                    options={patternOptions}
+                    onChange={value => this.handleChangeFields("pattern", value)}
+                  />
+                </WeaFormItem>
+              </React.Fragment>
+            }
             <WeaFormItem label="显示顺序" labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
               <WeaInputNumber value={sortedIndex} precision={0}
                               onChange={value => this.handleChangeFields("sortedIndex", value)}/>
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
index bf80c8f8..4d102ebd 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
@@ -30,7 +30,7 @@ class SalaryItemForm extends Component {
   componentDidMount() {
     const { salaryItemFieldsList } = this.state;
     const { request, editable, record, isAdd = false, taxAgentAdminOption, isLedger = false } = this.props;
-    const { systemType = "", sharedType, valueType, useInEmployeeSalary } = request;
+    const { systemType = "", sharedType, valueType, useInEmployeeSalary, dataType } = request;
     this.setState({
       salaryItemFieldsList: _.map(salaryItemFieldsList, item => {
         const { key } = item;
@@ -43,6 +43,9 @@ class SalaryItemForm extends Component {
               viewAttr: (!isLedger && ((editable && record.canEdit) || isAdd)) ? 2 : 1,
               display: !isLedger
             };
+          case "pattern":
+          case "roundingMode":
+            return { ...item, display: dataType === "number" };
           case "sortedIndex":
             return { ...item };
           case "useInEmployeeSalary":
@@ -101,6 +104,8 @@ class SalaryItemForm extends Component {
       salaryItemFieldsList: _.map(salaryItemFieldsList, item => {
         if (key === "sharedType" && item.key === "taxAgentIds") {
           return { ...item, display: v === "1", viewAttr: 3 };
+        } else if (key === "dataType" && (item.key === "roundingMode" || item.key === "pattern")) {
+          return { ...item, display: v === "number" };
         } else if (key === "valueType" && (item.key === "originSqlContent" || item.key === "originFormulaContent")) {
           return {
             ...item,