diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less index 4170ae45..8fec2dbd 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less @@ -41,6 +41,9 @@ //退差 .regressionWrapper { + height: calc(100vh - 47px); + overflow: auto; + .tdEllipsis { display: inline-block; width: 100%; diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js index f1efdf0c..2993e6fd 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js @@ -139,7 +139,7 @@ class RegEditDetial extends Component { case "social": const sociallist = _.map(socialData.dataSource, item => { if (item.insuranceId === record.insuranceId) { - return { ...item, [dataIndex]: String(value) }; + return { ...item, [dataIndex]: !_.isNil(value) ? String(value): "0" }; } return { ...item }; }); @@ -150,7 +150,7 @@ class RegEditDetial extends Component { case "fund": const fundlist = _.map(foundData.dataSource, item => { if (item.insuranceId === record.insuranceId) { - return { ...item, [dataIndex]: String(value) }; + return { ...item, [dataIndex]: !_.isNil(value) ? String(value): "0" }; } return { ...item }; }); @@ -161,7 +161,7 @@ class RegEditDetial extends Component { case "other": const otherlist = _.map(otherData.dataSource, item => { if (item.insuranceId === record.insuranceId) { - return { ...item, [dataIndex]: String(value) }; + return { ...item, [dataIndex]: !_.isNil(value) ? String(value): "0" }; } return { ...item }; });