From cdc75b766815547ec112bf8378bad29e060fc7a5 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 31 Dec 2024 15:04:09 +0800 Subject: [PATCH] release/2.18.2.2412.02 --- .../pages/ledgerPage/components/ledgerSalaryItemTable.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js index 45bb59c7..5b623e79 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js @@ -128,8 +128,10 @@ class LedgerSalaryItemTable extends Component { formulaContent, formulaId, name, hideDefault: _.isNil(hideDefault) ? "0" : hideDefault, valueType, roundingMode, pattern, - originFormulaContent, originSqlContent, - useInEmployeeSalary: !_.isNil(useInEmployeeSalary) ? useInEmployeeSalary : "0" + useInEmployeeSalary: !_.isNil(useInEmployeeSalary) ? useInEmployeeSalary : "0", + //不能改成其他空值 + originFormulaContent: (valueType.toString() === "2" && _.isNil(originFormulaContent)) ? formulaContent : "", + originSqlContent: (valueType.toString() === "3" && _.isNil(originSqlContent)) ? formulaContent : "" }, record, userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel })) @@ -289,7 +291,7 @@ class LedgerSalaryItemTable extends Component { render: (text, record) => { - this.handleChangeItem(value, record.id || record.key) + this.handleChangeItem(value, record.id || record.key); }} /> },