一级项目申请和二级项目申请选择【项目备案申请】过滤掉空值
parent
292e48cd8b
commit
6960b8cfb8
|
|
@ -122,7 +122,7 @@ const StepOneComponent = (props) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const getCorpInfoList = async (type, exCludeSelf) => {
|
const getCorpInfoList = async (type, exCludeSelf) => {
|
||||||
const { data } = await props["corpInfoList"]({ pageIndex: 1, pageSize: 1000, eqType: type || 1, exCludeSelf: exCludeSelf || 1 });
|
const { data } = await props["corpInfoList"]({ pageIndex: 1, pageSize: 1000, eqType: type || 1, exCludeSelf: exCludeSelf ?? 1 });
|
||||||
setCorpInfoList(data);
|
setCorpInfoList(data);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -824,14 +824,19 @@ const StepTwoComponent = forwardRef((props, ref) => {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
const handleChooseFilsSubmit = (selectedRows) => {
|
const handleChooseFilsSubmit = (selectedRows) => {
|
||||||
const enterList = projectFileList.filter(item => !item.detailId);
|
const existingIds = projectFileList
|
||||||
const formattedRows = selectedRows.map(row => ({
|
.filter(item => item.detailId)
|
||||||
|
.map(item => item.detailId);
|
||||||
|
const newRows = selectedRows.filter(row =>
|
||||||
|
row.detailId && !existingIds.includes(row.detailId),
|
||||||
|
);
|
||||||
|
const formattedRows = newRows.map(row => ({
|
||||||
...row,
|
...row,
|
||||||
existingFlag: 1,
|
existingFlag: 1,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
// 合并到现有列表中
|
// 合并到现有列表中
|
||||||
setProjectFileList([...enterList, ...formattedRows]);
|
setProjectFileList(prev => [...prev, ...formattedRows]);
|
||||||
setChooseFilsListModalOpen(false);
|
setChooseFilsListModalOpen(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -1029,8 +1034,8 @@ const ChooseFilsComponent = (props) => {
|
||||||
}
|
}
|
||||||
}, [props.data]);
|
}, [props.data]);
|
||||||
const handleRowSelectionChange = (selectedRowKeys, selectedRows) => {
|
const handleRowSelectionChange = (selectedRowKeys, selectedRows) => {
|
||||||
setSelectedRowKeys([...selectedRowKeys.filter(Boolean)]);
|
setSelectedRowKeys([...selectedRowKeys].filter(Boolean));
|
||||||
setSelectedRows([...selectedRows.filter(Boolean)]);
|
setSelectedRows([...selectedRows].filter(Boolean));
|
||||||
};
|
};
|
||||||
return (
|
return (
|
||||||
<Modal
|
<Modal
|
||||||
|
|
|
||||||
|
|
@ -569,14 +569,19 @@ const StepTwoComponent = forwardRef((props, ref) => {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
const handleChooseFilsSubmit = (selectedRows) => {
|
const handleChooseFilsSubmit = (selectedRows) => {
|
||||||
const enterList = projectFileList.filter(item => !item.detailId);
|
const existingIds = projectFileList
|
||||||
const formattedRows = selectedRows.map(row => ({
|
.filter(item => item.detailId)
|
||||||
|
.map(item => item.detailId);
|
||||||
|
const newRows = selectedRows.filter(row =>
|
||||||
|
row.detailId && !existingIds.includes(row.detailId),
|
||||||
|
);
|
||||||
|
const formattedRows = newRows.map(row => ({
|
||||||
...row,
|
...row,
|
||||||
existingFlag: 1,
|
existingFlag: 1,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
// 合并到现有列表中
|
// 合并到现有列表中
|
||||||
setProjectFileList([...enterList, ...formattedRows]);
|
setProjectFileList(prev => [...prev, ...formattedRows]);
|
||||||
setChooseFilsListModalOpen(false);
|
setChooseFilsListModalOpen(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -763,8 +768,8 @@ const ChooseFilsComponent = (props) => {
|
||||||
}
|
}
|
||||||
}, [props.data]);
|
}, [props.data]);
|
||||||
const handleRowSelectionChange = (selectedRowKeys, selectedRows) => {
|
const handleRowSelectionChange = (selectedRowKeys, selectedRows) => {
|
||||||
setSelectedRowKeys([...selectedRowKeys.filter(Boolean)]);
|
setSelectedRowKeys([...selectedRowKeys].filter(Boolean));
|
||||||
setSelectedRows([...selectedRows.filter(Boolean)]);
|
setSelectedRows([...selectedRows].filter(Boolean));
|
||||||
};
|
};
|
||||||
return (
|
return (
|
||||||
<Modal
|
<Modal
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue