release/2.10.1.2401.01

bug修复
This commit is contained in:
黎永顺 2024-01-30 15:46:37 +08:00
parent cf9d8f41e0
commit ba49afb85d
2 changed files with 3 additions and 2 deletions

View File

@ -250,7 +250,8 @@ class LedgerSalaryItemTable extends Component {
render: (text, record) => {
const { salarySobId, salaryItemId } = record;
return <a
href={`/spa/hrmSalary/static/index.html#/main/hrmSalary/topologyView/${salarySobId}/${salaryItemId}`}
// href={`/spa/hrmSalary/static/index.html#/main/hrmSalary/topologyView/${salarySobId}/${salaryItemId}`}
href="javascript:void(0);"
target="_blank">{text}</a>;
}
},

View File

@ -161,7 +161,7 @@ class Index extends Component {
return {
baseForm: JSON.stringify({
...formData[welfareType], ..._.reduce(_.keys(formData[welfareType]), (pre, cur) => {
if (welfareData[cur]) return { ...pre, [cur]: welfareData[cur] };
if (welfareData[cur] || !_.isNil(welfareData[cur])) return { ...pre, [cur]: welfareData[cur] };
return { ...pre };
}, {}),
underTake: welfareData[`${underTakeType}UnderTake`]