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)}
/>
-
- this.handleChangeFields("roundingMode", value)}
- />
-
-
- this.handleChangeFields("pattern", value)}
- />
-
+ {
+ dataType === "number" &&
+
+
+ this.handleChangeFields("roundingMode", value)}
+ />
+
+
+ this.handleChangeFields("pattern", 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,