diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js index b7121112..fa7675d7 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js @@ -109,7 +109,7 @@ class LedgerSalaryItemTable extends Component { formulaContent: formulaContent ? formulaContent : data.formulaContent, originFormulaContent: originFormulaContent ? originFormulaContent : data.originFormulaContent, originSqlContent: originSqlContent ? originSqlContent : data.originSqlContent, - formulaId: formulaId ? formulaId : data.formulaId + formulaId: formulaId ? formulaId : data.formulaId, }, record, userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel })) @@ -151,11 +151,11 @@ class LedgerSalaryItemTable extends Component { }); const { salaryItemId } = record; const { - hideDefault, roundingMode, pattern, valueType, + hideDefault, roundingMode, pattern, valueType, defaultValue, originFormulaContent, originSqlContent, formulaId } = request; this.handleChangeSalaryItem({ - itemHide: hideDefault.toString(), + itemHide: hideDefault.toString(), 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/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js index 47d48a73..19913c32 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js @@ -133,11 +133,11 @@ class SalaryItemForm extends Component { return { ...item }; }) }, () => { - // if (key === "valueType" && !this.props.isLedger) { - // onChangeFieldsItem({ formulaContent: "", formulaId: 0, valueType: v }); - // } else { - onChangeFieldsItem({ [key]: (key === "useDefault" || key === "useInEmployeeSalary" || key === "hideDefault") ? Number(v) : v }); - // } + if (key === "dataType") { + onChangeFieldsItem({ [key]: v, defaultValue: "" }); + } else { + onChangeFieldsItem({ [key]: (key === "useDefault" || key === "useInEmployeeSalary" || key === "hideDefault") ? Number(v) : v }); + } }); };