diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js index e88f17bf..c0ac86bc 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js @@ -357,14 +357,16 @@ class AdjustTable extends Component { onOk: () => { const { adjustToOptions, categoryTypeOptions, key, target, status, - originId, targetOptions: targetOption, + originId, targetOptions: targetOption, billMonth, ...extraParams } = record; const month = getQueryString("billMonth"); const paymentOrg = getQueryString("paymentOrganization"); const tmpObj = { ...extraParams, target }; for (let i in tmpObj) { - Object.assign(tmpObj,{[i]:tmpObj[i].toString()}) + if (tmpObj[i]) { + Object.assign(tmpObj, { [i]: tmpObj[i].toString() }); + } } const bool = _.every(Object.keys({ ...extraParams, target }), child => { return !!tmpObj[child]; diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js index 6229ca63..5651926e 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js @@ -29,7 +29,7 @@ class AdjustmentDefaultSlide extends Component { paymentOrganization: it.paymentOrganization, categoryType: it.categoryType, welfareType: it.welfareType, - target: it.target, + target: it.targetOptions[0].key, adjustTo: it.adjustTo, employeeId: it.employeeId };