From 6960b8cfb813b9f9c118d6fe1229bdd99f0b487e Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Mon, 2 Mar 2026 17:13:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E7=BA=A7=E9=A1=B9=E7=9B=AE=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=92=8C=E4=BA=8C=E7=BA=A7=E9=A1=B9=E7=9B=AE=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E9=80=89=E6=8B=A9=E3=80=90=E9=A1=B9=E7=9B=AE=E5=A4=87?= =?UTF-8?q?=E6=A1=88=E7=94=B3=E8=AF=B7=E3=80=91=E8=BF=87=E6=BB=A4=E6=8E=89?= =?UTF-8?q?=E7=A9=BA=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Qualification/Apply/Add/index.js | 2 +- .../ProjectFilingApplication/Add/index.js | 15 ++++++++++----- .../ProjectFilingApplicationTwo/Add/index.js | 15 ++++++++++----- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js index 6f96d11..9fe3c74 100644 --- a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js +++ b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js @@ -122,7 +122,7 @@ const StepOneComponent = (props) => { }; 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); }; diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js index 6af18c3..3a0820d 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js @@ -824,14 +824,19 @@ const StepTwoComponent = forwardRef((props, ref) => { } }; const handleChooseFilsSubmit = (selectedRows) => { - const enterList = projectFileList.filter(item => !item.detailId); - const formattedRows = selectedRows.map(row => ({ + const existingIds = projectFileList + .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, existingFlag: 1, })); // 合并到现有列表中 - setProjectFileList([...enterList, ...formattedRows]); + setProjectFileList(prev => [...prev, ...formattedRows]); setChooseFilsListModalOpen(false); }; @@ -1029,8 +1034,8 @@ const ChooseFilsComponent = (props) => { } }, [props.data]); const handleRowSelectionChange = (selectedRowKeys, selectedRows) => { - setSelectedRowKeys([...selectedRowKeys.filter(Boolean)]); - setSelectedRows([...selectedRows.filter(Boolean)]); + setSelectedRowKeys([...selectedRowKeys].filter(Boolean)); + setSelectedRows([...selectedRows].filter(Boolean)); }; return ( { } }; const handleChooseFilsSubmit = (selectedRows) => { - const enterList = projectFileList.filter(item => !item.detailId); - const formattedRows = selectedRows.map(row => ({ + const existingIds = projectFileList + .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, existingFlag: 1, })); // 合并到现有列表中 - setProjectFileList([...enterList, ...formattedRows]); + setProjectFileList(prev => [...prev, ...formattedRows]); setChooseFilsListModalOpen(false); }; @@ -763,8 +768,8 @@ const ChooseFilsComponent = (props) => { } }, [props.data]); const handleRowSelectionChange = (selectedRowKeys, selectedRows) => { - setSelectedRowKeys([...selectedRowKeys.filter(Boolean)]); - setSelectedRows([...selectedRows.filter(Boolean)]); + setSelectedRowKeys([...selectedRowKeys].filter(Boolean)); + setSelectedRows([...selectedRows].filter(Boolean)); }; return (