diff --git a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js index 34df10d7..12615aac 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js @@ -233,6 +233,7 @@ export default class CustomSalaryItemSlide extends React.Component { formulaId={formulaId} visible={formalModalVisible} valueType={valueType} + dataType={dataType} onSaveFormal={data => { this.handleSaveFormal(data); }} diff --git a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js index f2d1e100..3ddf0cad 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js @@ -185,8 +185,8 @@ export default class FormalFormModal extends React.Component { description: "备注", module: "salary", useFor: "salaryitem", - returnType: "number", - validateType: "number", + returnType: this.props.dataType, + validateType: this.props.dataType, extendParam: JSON.stringify(this.state.extendParam), formula: this.state.value, parameters: this.parameters,