From 662d81b064d6d2f744dd6c795f463f3ab75efb47 Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Tue, 24 Feb 2026 15:27:04 +0800 Subject: [PATCH] =?UTF-8?q?bug=EF=BC=9A14770=E3=80=8114750=E3=80=8114738?= =?UTF-8?q?=E3=80=8114641=E3=80=8114517?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- .../ViewProjectReviewUserModal/index.js | 2 +- .../Qualification/Apply/Add/index.js | 4 +++- .../ProjectFilingApplication/Add/index.js | 22 ++++++++++++------- .../ProjectFilingApplicationTwo/Add/index.js | 20 ++++++++++++----- .../ProjectApproval/Subcontract/List/index.js | 1 + 6 files changed, 34 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index e0693c9..dd7403a 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "lodash-es": "^4.17.21", "react": "^18.2.0", "react-dom": "^18.2.0", - "zy-react-library": "^1.1.46" + "zy-react-library": "^1.1.51" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/components/ViewProjectReviewUserModal/index.js b/src/components/ViewProjectReviewUserModal/index.js index 343a242..5e8a71f 100644 --- a/src/components/ViewProjectReviewUserModal/index.js +++ b/src/components/ViewProjectReviewUserModal/index.js @@ -65,7 +65,7 @@ const ViewProjectReviewUserModal = (props) => { ) }, ]} form={form} diff --git a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js index cac5ec6..908067c 100644 --- a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js +++ b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js @@ -139,9 +139,11 @@ const StepOneComponent = (props) => { dictValue="stakeholderLevel" onGetLabel={label => form.setFieldValue("stakeholderLevelName", label)} onChange={() => { - form.setFieldValue("groupUnitName", ""); form.setFieldValue("groupUnitId", ""); + form.setFieldValue("groupUnitName", ""); + form.setFieldValue("groupUnitDept", ""); form.setFieldValue("groupUnitDeptName", ""); + form.setFieldValue("groupUnitUser", []); form.setFieldValue("groupUnitUserName", ""); form.setFieldValue("qualificationsId", ""); }} diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js index 0db8745..db0050f 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js @@ -98,6 +98,7 @@ function Add(props) { usercontentAddCmdList={usercontentAddCmdList} setUsercontentAddCmdList={setUsercontentAddCmdList} setQualificationsTypeId={setQualificationsTypeId} + setProjectFileAddCmdList={setProjectFileAddCmdList} /> )} {currentStep === 2 @@ -323,14 +324,16 @@ const StepOneComponent = (props) => { manageUserIds: [], manageUserNames: "", }); + props.setProjectFileAddCmdList([]); }, }, }, { name: "qualificationsTypeName", label: "项目类别名称", onlyForLabel: true }, { span: 24, + customizeRender: true, render: ( -
+
如果选择项目类别或等级没有您相应的选项时，请在"资质准入管理"中查看是否持有对应类别或等级的相关资质。
), @@ -365,8 +368,9 @@ const StepOneComponent = (props) => { }, { span: 24, + customizeRender: true, render: ( -
+
本次项目是否属于港股分公司发包项目，如是，请选择"是"
), @@ -479,10 +483,11 @@ const StepOneComponent = (props) => { ]), { render: ( -
+
本信息涉及后续项目资料审核，请如实填写。
), + customizeRender: true, span: 24, }, { @@ -616,6 +621,7 @@ const StepTwoComponent = (props) => { startValidityPeriod: values.startValidityPeriod, endValidityPeriod: values.endValidityPeriod, createTime: dayjs().format("YYYY-MM-DD hh:mm:ss"), + existingFlag: 2, }; if (values.type === "add") { setProjectFileList(prev => [...prev, newItem]); @@ -678,11 +684,10 @@ const StepTwoComponent = (props) => { message.error(`请新增项目相关资料`); return; } - if (uploadFileModalData.length === 0) { + if (projectFileList.length === 0) { message.error(`请新增项目相关资料`); return; } - if (usercontentList.length === 0) { message.error(`请新增项目人员`); return; @@ -733,6 +738,7 @@ const StepTwoComponent = (props) => { ); const formattedRows = newRows.map(row => ({ ...row, + existingFlag: 1, })); // 合并到现有列表中 @@ -792,6 +798,7 @@ const StepTwoComponent = (props) => { @@ -1029,9 +1036,8 @@ const UserSelectComponent = (props) => { }); } } - - setSelectedRowKeys([...selectedRowKeys]); - setSelectedRows([...selectedRows]); + setSelectedRowKeys([...selectedRowKeys.filter(Boolean)]); + setSelectedRows([...selectedRows.filter(Boolean)]); }; return ( )} {currentStep === 2 @@ -200,7 +201,7 @@ const StepOneComponent = (props) => { }, [props.formValues]); return ( { name: "qualificationsTypeId", label: "项目类别", span: 24, + labelCol: { span: 2 }, wrapperCol: { span: 5 }, items: qualificationsTypeList, render: FORM_ITEM_RENDER_ENUM.SELECT, @@ -289,6 +291,7 @@ const StepOneComponent = (props) => { idKey: "qualificationsTypeId", nameKey: "qualificationsTypeName", })); + props.setProjectFileAddCmdList([]); }, }, }, @@ -296,7 +299,6 @@ const StepOneComponent = (props) => { { name: "approvalCorpId", label: "集团公司审核", - labelCol: { span: 5 }, items: corpInfoList, render: FORM_ITEM_RENDER_ENUM.SELECT, itemsField: { valueKey: "id", labelKey: "corpName" }, @@ -316,7 +318,6 @@ const StepOneComponent = (props) => { { name: "approvalCorpName", label: "集团公司审核名称", onlyForLabel: true }, { name: "approvalDeptId", - labelCol: { span: 6 }, label: "集团公司部门审核", render: ( { { name: "approvalUserIds", label: "集团公司人员审核", - labelCol: { span: 6 }, render: ( { name: "projectFiles", label: "安全管理协议", span: 24, + labelCol: { span: 2 }, render: ( { startValidityPeriod: values.startValidityPeriod, endValidityPeriod: values.endValidityPeriod, createTime: dayjs().format("YYYY-MM-DD hh:mm:ss"), + existingFlag: 2, }; if (values.type === "add") { setProjectFileList(prev => [...prev, newItem]); @@ -488,6 +490,10 @@ const StepTwoComponent = (props) => { message.error(`请新增项目相关资料`); return; } + if (projectFileList.length === 0) { + message.error(`请新增项目相关资料`); + return; + } if (usercontentList.length === 0) { message.error(`请新增项目人员`); return; @@ -538,6 +544,7 @@ const StepTwoComponent = (props) => { ); const formattedRows = newRows.map(row => ({ ...row, + existingFlag: 1, })); // 合并到现有列表中 @@ -596,6 +603,7 @@ const StepTwoComponent = (props) => { @@ -832,8 +840,8 @@ const UsercontentComponent = (props) => { } } - setSelectedRowKeys([...selectedRowKeys]); - setSelectedRows([...selectedRows]); + setSelectedRowKeys([...selectedRowKeys.filter(Boolean)]); + setSelectedRows([...selectedRows.filter(Boolean)]); }; return ( record.secondLevelTotal || 0 }, { title: "是否存在分包", dataIndex: "subcontractFlag", render: (_, record) => record.subcontractFlag === 1 ? "是" : "否" }, { title: "项目属地单位", dataIndex: "companyName" }, {