diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js index 641b282e..162a6af1 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js @@ -696,8 +696,8 @@ export const getWelfareSearchsForm = (form, condition, onChange = () => void (0) return _.reduce(group, (pre, cur) => { if (cur.props.title === getLabel(543194, "社保基础信息") && _.every(socialBase.items, o => o.items.length > 0)) { return [...pre, cur, - ]; + ]; } else if (cur.props.title === getLabel(543197, "公积金基础信息") && _.every(fundBase.items, o => o.items.length > 0)) { return [...pre, cur, void (0) }; const BenefitBaseComponent = (props) => { - const { dataSource, value, onChange, onSameChange, runStatuses } = props; + const { dataSource, dataSourceCom, value, onChange, onSameChange, runStatuses } = props; + const [comFields] = dataSourceCom || []; + const list = !_.isNil(comFields) ? _.map(dataSource, o => ({ + ...o, + items: [...o.items, ...comFields.items] + })) : dataSource; + console.log(list); return { _.map(dataSource, item => {