From 755ef54c21351c2f7882060b0e4a4cfeb8539cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 28 Dec 2022 11:40:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=B7=AE=E4=BF=9D=E5=AD=98=E9=BB=98?= =?UTF-8?q?=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standingBookDetail/components/adjustTable.js | 6 ++++-- .../standingBookDetail/components/adjustmentDefaultSlide.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) 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 };