diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanCustomDialog/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanCustomDialog/index.js index bce632b6..d8f277d3 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanCustomDialog/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanCustomDialog/index.js @@ -48,7 +48,7 @@ class Index extends Component { const { programmeStore: { planCustomForm } } = props; planCustomForm.initFormFields(this.state.conditions); _.forEach(getConditionDomkeys(this.state.conditions), k => { - if (k === "paymentScope" && props.customId) { + if (k === "paymentScope" && props.customId && form[k]) { planCustomForm.updateFields({ [k]: { value: form[k].join(",") } }); } else { planCustomForm.updateFields({ [k]: { value: form[k] || "" } }); diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js index 0a1bf9c9..a70da52f 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js @@ -82,7 +82,7 @@ class Index extends Component { const { planDatas } = this.state; const payload = { insuranceScheme: { - ...planForm.getFormParams(), welfareTypeEnum, id, + ...planForm.getFormParams(), welfareType: welfareTypeEnum, id, paymentArea: planForm.getFormParams().paymentType }, insuranceSchemeDetailList: planDatas @@ -174,6 +174,7 @@ class Index extends Component { //先统一上下限值 let dataSource = _.reduce(planDatas, (pre, cur) => { const curData = _.find(datas, o => o.insuranceId === cur.insuranceId); + if (_.isEmpty(curData)) return [...pre, cur]; return [...pre, { ...cur, lowerLimit: curData.lowerLimit, upperLimit: curData.upperLimit }]; }, []); //再赋值修改值