From 638777ebe76495c7b05a3ffc2d77aaba02725a6e Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Wed, 25 Feb 2026 17:01:32 +0800 Subject: [PATCH] =?UTF-8?q?bug=EF=BC=9A147738=E3=80=8114565=E3=80=8114508?= =?UTF-8?q?=E3=80=8114443?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectReview/ProjectApproval/List/index.js | 3 ++- .../BranchCompany/Qualification/Apply/Add/index.js | 6 +++--- .../ProjectApproval/NoSubcontract/List/index.js | 1 + .../ProjectReview/ProjectApproval/NoSubmit/List/index.js | 1 + .../ProjectApproval/Subcontract/List/index.js | 1 + .../ProjectReview/ProjectApproval/Submit/List/index.js | 1 + .../ProjectApprovalTwo/Subcontract/List/index.js | 1 + .../ProjectApprovalTwo/Submit/List/index.js | 3 ++- .../ProjectReview/ProjectFilingInformation/List/index.js | 4 ++-- .../ProjectReview/ProjectFilingApplication/Add/index.js | 9 +++++---- .../ProjectFilingApplicationTwo/Add/index.js | 3 +-- .../ProjectApproval/NoSubcontract/List/index.js | 1 + .../ProjectApproval/Subcontract/List/index.js | 1 + .../ProjectReview/ProjectApprovalTwo/List/index.js | 1 + .../ProjectFilingInformation/UserChange/index.js | 3 +-- 15 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/pages/Container/BranchCompany/ProjectReview/ProjectApproval/List/index.js b/src/pages/Container/BranchCompany/ProjectReview/ProjectApproval/List/index.js index 284e5d0..b4d9545 100644 --- a/src/pages/Container/BranchCompany/ProjectReview/ProjectApproval/List/index.js +++ b/src/pages/Container/BranchCompany/ProjectReview/ProjectApproval/List/index.js @@ -34,7 +34,7 @@ function List(props) { { props.history.push(`./reView?id=${record.id}&projectStatusLast=7`); }} + disabled={record.projectStatus === 7 && record.currentUserCanAudit === 2} > {record.projectStatus === 7 ? "审核" : "查看"} diff --git a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js index 908067c..857602c 100644 --- a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js +++ b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js @@ -114,7 +114,7 @@ const StepOneComponent = (props) => { onGetLabel={(label) => { form.setFieldValue("qualificationsTypeName", label); }} - // onChange={async (value) => { + onChange={() => { // if (value === "wzgll") { // await getCorpInfoList(1); // } @@ -125,8 +125,8 @@ const StepOneComponent = (props) => { // form.setFieldValue("groupUnitName", ""); // form.setFieldValue("groupUnitDeptName", ""); // form.setFieldValue("groupUnitUserName", ""); - // form.setFieldValue("qualificationsId", ""); - // }} + form.setFieldValue("qualificationsId", ""); + }} /> ), }, diff --git a/src/pages/Container/Local/ProjectReview/ProjectApproval/NoSubcontract/List/index.js b/src/pages/Container/Local/ProjectReview/ProjectApproval/NoSubcontract/List/index.js index dc1f57c..7c4394c 100644 --- a/src/pages/Container/Local/ProjectReview/ProjectApproval/NoSubcontract/List/index.js +++ b/src/pages/Container/Local/ProjectReview/ProjectApproval/NoSubcontract/List/index.js @@ -80,6 +80,7 @@ function List(props) { onClick={() => { props.history.push(`./reView?id=${record.id}&projectStatusLast=${record.projectStatus}`); }} + disabled={record.currentUserCanAudit === 2} > 审核 diff --git a/src/pages/Container/Local/ProjectReview/ProjectApproval/NoSubmit/List/index.js b/src/pages/Container/Local/ProjectReview/ProjectApproval/NoSubmit/List/index.js index 70787a5..4eb5da7 100644 --- a/src/pages/Container/Local/ProjectReview/ProjectApproval/NoSubmit/List/index.js +++ b/src/pages/Container/Local/ProjectReview/ProjectApproval/NoSubmit/List/index.js @@ -61,6 +61,7 @@ function List(props) { onClick={() => { props.history.push(`./reView?id=${record.id}&projectStatusLast=2`); }} + disabled={record.projectStatus === 2 && record.currentUserCanAudit === 2} > {record.projectStatus === 2 ? "确认" : "查看"} diff --git a/src/pages/Container/Local/ProjectReview/ProjectApproval/Subcontract/List/index.js b/src/pages/Container/Local/ProjectReview/ProjectApproval/Subcontract/List/index.js index c471c4a..d3a88cb 100644 --- a/src/pages/Container/Local/ProjectReview/ProjectApproval/Subcontract/List/index.js +++ b/src/pages/Container/Local/ProjectReview/ProjectApproval/Subcontract/List/index.js @@ -80,6 +80,7 @@ function List(props) { onClick={() => { props.history.push(`./reView?id=${record.id}&projectStatusLast=${record.projectStatus}`); }} + disabled={record.currentUserCanAudit === 2} > 审核 diff --git a/src/pages/Container/Local/ProjectReview/ProjectApproval/Submit/List/index.js b/src/pages/Container/Local/ProjectReview/ProjectApproval/Submit/List/index.js index b785c91..27489c6 100644 --- a/src/pages/Container/Local/ProjectReview/ProjectApproval/Submit/List/index.js +++ b/src/pages/Container/Local/ProjectReview/ProjectApproval/Submit/List/index.js @@ -61,6 +61,7 @@ function List(props) { onClick={() => { props.history.push(`./reView?id=${record.id}&projectStatusLast=2`); }} + disabled={record.projectStatus === 2 && record.currentUserCanAudit === 2} > {record.projectStatus === 2 ? "确认" : "查看"} diff --git a/src/pages/Container/Local/ProjectReview/ProjectApprovalTwo/Subcontract/List/index.js b/src/pages/Container/Local/ProjectReview/ProjectApprovalTwo/Subcontract/List/index.js index 855a3c4..aa8837f 100644 --- a/src/pages/Container/Local/ProjectReview/ProjectApprovalTwo/Subcontract/List/index.js +++ b/src/pages/Container/Local/ProjectReview/ProjectApprovalTwo/Subcontract/List/index.js @@ -80,6 +80,7 @@ function List(props) { onClick={() => { props.history.push(`./reView?id=${record.id}&projectStatusLast=${record.projectStatus}`); }} + disabled={record.currentUserCanAudit === 2} > 审核 diff --git a/src/pages/Container/Local/ProjectReview/ProjectApprovalTwo/Submit/List/index.js b/src/pages/Container/Local/ProjectReview/ProjectApprovalTwo/Submit/List/index.js index 23067fd..1fa3251 100644 --- a/src/pages/Container/Local/ProjectReview/ProjectApprovalTwo/Submit/List/index.js +++ b/src/pages/Container/Local/ProjectReview/ProjectApprovalTwo/Submit/List/index.js @@ -24,7 +24,7 @@ function List(props) { { props.history.push(`./reView?id=${record.id}&projectStatusLast=2`); }} + disabled={record.projectStatus === 2 && record.currentUserCanAudit === 2} > {record.projectStatus === 2 ? "确认" : "查看"} diff --git a/src/pages/Container/Local/ProjectReview/ProjectFilingInformation/List/index.js b/src/pages/Container/Local/ProjectReview/ProjectFilingInformation/List/index.js index 5553991..10c338d 100644 --- a/src/pages/Container/Local/ProjectReview/ProjectFilingInformation/List/index.js +++ b/src/pages/Container/Local/ProjectReview/ProjectFilingInformation/List/index.js @@ -1,7 +1,7 @@ import ListView from "~/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/list"; function List(props) { - return (); -}; + return (); +} export default List; diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js index db0050f..ca9affa 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js @@ -594,8 +594,10 @@ const StepTwoComponent = (props) => { const [, setChooseFilsListModalData] = useState([]); const getData = async () => { for (let i = 0; i < projectFileList.length; i++) { - const files = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["148"], eqForeignKey: projectFileList[i].projectFileId }); - projectFileList[i].files = files; + if (projectFileList[i].projectFileId) { + const files = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["148"], eqForeignKey: projectFileList[i].projectFileId }); + projectFileList[i].files = files; + } } }; useEffect(() => { @@ -1042,7 +1044,7 @@ const UserSelectComponent = (props) => { return ( {
{ return ( {
{ props.history.push(`./reView?id=${record.id}&projectStatusLast=1`); }} + disabled={record.projectStatus === 1 && record.currentUserCanAudit === 2} > {record.projectStatus === 1 ? "审核" : "查看"} diff --git a/src/pages/Container/Supervision/ProjectReview/ProjectApproval/Subcontract/List/index.js b/src/pages/Container/Supervision/ProjectReview/ProjectApproval/Subcontract/List/index.js index 90a708b..eb0317b 100644 --- a/src/pages/Container/Supervision/ProjectReview/ProjectApproval/Subcontract/List/index.js +++ b/src/pages/Container/Supervision/ProjectReview/ProjectApproval/Subcontract/List/index.js @@ -72,6 +72,7 @@ function List(props) { onClick={() => { props.history.push(`./reView?id=${record.id}&projectStatusLast=1`); }} + disabled={record.projectStatus === 1 && record.currentUserCanAudit === 2} > {record.projectStatus === 1 ? "审核" : "查看"} diff --git a/src/pages/Container/Supervision/ProjectReview/ProjectApprovalTwo/List/index.js b/src/pages/Container/Supervision/ProjectReview/ProjectApprovalTwo/List/index.js index a10f367..73f0c18 100644 --- a/src/pages/Container/Supervision/ProjectReview/ProjectApprovalTwo/List/index.js +++ b/src/pages/Container/Supervision/ProjectReview/ProjectApprovalTwo/List/index.js @@ -70,6 +70,7 @@ function List(props) { onClick={() => { props.history.push(`./reView?id=${record.id}&projectStatusLast=1`); }} + disabled={record.projectStatus === 1 && record.currentUserCanAudit === 2} > {record.projectStatus === 1 ? "审核" : "查看"} diff --git a/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange/index.js b/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange/index.js index 7b2b562..0a07b31 100644 --- a/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange/index.js +++ b/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange/index.js @@ -275,7 +275,7 @@ const UserSelectComponent = (props) => { return ( {