qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

release/2.18.2.2412.02

This commit is contained in:
lys 2024-12-31 15:04:09 +08:00
parent 2d659768ac
commit cdc75b7668
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
View File

@ -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) => <WeaCheckbox
value={text ? String(text) : !text ? "0" : "1"}
onChange={value => {
this.handleChangeItem(value, record.id || record.key)
this.handleChangeItem(value, record.id || record.key);
}}
/>
},