diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js index 383747aa..b1271972 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js @@ -62,27 +62,28 @@ class RegEditDetial extends Component { otherComJson: {} }; _.forEach(socialData.dataSource, item => { + console.log(item) if (item.personalPaymentAmount) { - payload["socialPerJson"][item["insuranceId"]] = toDecimal_n(item.personalPaymentAmount, 2); + payload["socialPerJson"][item["insuranceId"]] = toDecimal_n(item.personalPaymentAmount, item.personalPaymentAmountValidNum || 2); } if (item.companyPaymentAmount) { - payload["socialComJson"][item["insuranceId"]] = toDecimal_n(item.companyPaymentAmount, 2); + payload["socialComJson"][item["insuranceId"]] = toDecimal_n(item.companyPaymentAmount, item.companyPaymentAmountValidNum || 2); } }); _.forEach(foundData.dataSource, item => { if (item.personalPaymentAmount) { - payload["fundPerJson"][item["insuranceId"]] = toDecimal_n(item.personalPaymentAmount, 2); + payload["fundPerJson"][item["insuranceId"]] = toDecimal_n(item.personalPaymentAmount, item.personalPaymentAmountValidNum || 2); } if (item.companyPaymentAmount) { - payload["fundComJson"][item["insuranceId"]] = toDecimal_n(item.companyPaymentAmount, 2); + payload["fundComJson"][item["insuranceId"]] = toDecimal_n(item.companyPaymentAmount, item.companyPaymentAmountValidNum || 2); } }); _.forEach(otherData.dataSource, item => { if (item.personalPaymentAmount) { - payload["otherPerJson"][item["insuranceId"]] = toDecimal_n(item.personalPaymentAmount, 2); + payload["otherPerJson"][item["insuranceId"]] = toDecimal_n(item.personalPaymentAmount, item.personalPaymentAmountValidNum || 2); } if (item.companyPaymentAmount) { - payload["otherComJson"][item["insuranceId"]] = toDecimal_n(item.companyPaymentAmount, 2); + payload["otherComJson"][item["insuranceId"]] = toDecimal_n(item.companyPaymentAmount, item.companyPaymentAmountValidNum || 2); } }); _.forEach(Object.keys(payload), item => { @@ -163,6 +164,7 @@ class RegEditDetial extends Component { const social = this.combinedData(socialSecurity, result); const fund = this.combinedData(accumulationFund, result); const other = this.combinedData(otherBenefits, result); + console.log(social) this.setState({ listMap: [ { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js index 7ed7e26d..3719461f 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js @@ -92,10 +92,10 @@ class SupplementarySlide extends Component { const key = child.insuranceId, valuePer = child[`${child.insuranceId}_per`], valueCom = child[`${child.insuranceId}_com`]; if (!child.perDisabled) { - _.assign(payload[`${item}PerString`], { [key]: toDecimal_n(valuePer, 2) || "0" }); + _.assign(payload[`${item}PerString`], { [key]: toDecimal_n(valuePer, parseFloat(child.perValidNum || 2)) || "0" }); } if (!child.comDisabled) { - _.assign(payload[`${item}ComString`], { [key]: toDecimal_n(valueCom, 2) || "0" }); + _.assign(payload[`${item}ComString`], { [key]: toDecimal_n(valueCom, parseFloat(child.comValidNum || 2)) || "0" }); } }); });