feature/2.9.10.2312.02-社保档案个人和公司基数设置

This commit is contained in:
黎永顺 2023-12-14 09:54:27 +08:00
parent 670bbbbb75
commit 8c06171190
1 changed files with 9 additions and 3 deletions

View File

@ -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,
<BenefitBaseComponent dataSource={socialBase.items} value={payload} onChange={onExtraChange}
onSameChange={onSameChange} runStatuses={runStatuses}/>];
<BenefitBaseComponent dataSource={socialBase.items} dataSourceCom={socialBase.comItems} value={payload}
onChange={onExtraChange} onSameChange={onSameChange} runStatuses={runStatuses}/>];
} else if (cur.props.title === getLabel(543197, "公积金基础信息") && _.every(fundBase.items, o => o.items.length > 0)) {
return [...pre, cur,
<BenefitBaseComponent dataSource={fundBase.items} value={payload} onChange={onExtraChange}
@ -712,7 +712,13 @@ export const getWelfareSearchsForm = (form, condition, onChange = () => 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 <React.Fragment>
{
_.map(dataSource, item => {