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

hotfix/2.14.2.240默认值

This commit is contained in:
黎永顺 2024-06-18 10:44:48 +08:00
parent 40fe79c0e5
commit 7221d910ca
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,7 +109,7 @@ class LedgerSalaryItemTable extends Component {
formulaContent: formulaContent ? formulaContent : data.formulaContent, formulaContent: formulaContent ? formulaContent : data.formulaContent,
originFormulaContent: originFormulaContent ? originFormulaContent : data.originFormulaContent, originFormulaContent: originFormulaContent ? originFormulaContent : data.originFormulaContent,
originSqlContent: originSqlContent ? originSqlContent : data.originSqlContent, originSqlContent: originSqlContent ? originSqlContent : data.originSqlContent,
formulaId: formulaId ? formulaId : data.formulaId formulaId: formulaId ? formulaId : data.formulaId,
}, },
record, record,
userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel })) userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel }))
@ -151,11 +151,11 @@ class LedgerSalaryItemTable extends Component {
}); });
const { salaryItemId } = record; const { salaryItemId } = record;
const { const {
hideDefault, roundingMode, pattern, valueType, hideDefault, roundingMode, pattern, valueType, defaultValue,
originFormulaContent, originSqlContent, formulaId originFormulaContent, originSqlContent, formulaId
} = request; } = request;
this.handleChangeSalaryItem({ this.handleChangeSalaryItem({
itemHide: hideDefault.toString(), itemHide: hideDefault.toString(), defaultValue,
roundingMode, pattern, valueType, roundingMode, pattern, valueType,
formulaContent: valueType.toString() === "2" ? originFormulaContent : originSqlContent, formulaContent: valueType.toString() === "2" ? originFormulaContent : originSqlContent,
formulaId: ((valueType.toString() === "3" && (!originSqlContent || originSqlContent === " ")) || (valueType.toString() === "2" && (!originFormulaContent || originFormulaContent === " ")) || valueType.toString() === "1") ? "" : formulaId, formulaId: ((valueType.toString() === "3" && (!originSqlContent || originSqlContent === " ")) || (valueType.toString() === "2" && (!originFormulaContent || originFormulaContent === " ")) || valueType.toString() === "1") ? "" : formulaId,

10
pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
View File

@ -133,11 +133,11 @@ class SalaryItemForm extends Component {
return { ...item }; return { ...item };
}) })
}, () => { }, () => {
// if (key === "valueType" && !this.props.isLedger) { if (key === "dataType") {
// onChangeFieldsItem({ formulaContent: "", formulaId: 0, valueType: v }); onChangeFieldsItem({ [key]: v, defaultValue: "" });
// } else { } else {
onChangeFieldsItem({ [key]: (key === "useDefault" || key === "useInEmployeeSalary" || key === "hideDefault") ? Number(v) : v }); onChangeFieldsItem({ [key]: (key === "useDefault" || key === "useInEmployeeSalary" || key === "hideDefault") ? Number(v) : v });
// } }
}); });
}; };