bug：14770、14750、14738、14641、14517

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",

src/components/ViewProjectReviewUserModal/index.js

@@ -65,7 +65,7 @@ const ViewProjectReviewUserModal = (props) => {
         <Search
           labelCol={{ span: 8 }}
           options={[
-            { name: "likeUserName", label: "姓名" },
+            // { name: "likeUserName", label: "姓名" },
             { name: "eqType", label: "证书类型", render: (<DictionarySelect dictValue="zslx" />) },
           ]}
           form={form}

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", "");
               }}

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: (
-            <div style={{ fontSize: 12, color: "red", whiteSpace: "nowrap", marginTop: "-8px", marginBottom: "16px", marginLeft: "112px" }}>
+            <div style={{ fontSize: 12, color: "red", whiteSpace: "nowrap", marginBottom: "16px", marginLeft: "112px" }}>
               如果选择项目类别或等级没有您相应的选项时，请在"资质准入管理"中查看是否持有对应类别或等级的相关资质。
             </div>
           ),
@@ -365,8 +368,9 @@ const StepOneComponent = (props) => {
         },
         {
           span: 24,
+          customizeRender: true,
           render: (
-            <div style={{ fontSize: 12, color: "red", whiteSpace: "nowrap", marginTop: "-8px", marginBottom: "16px", marginLeft: "112px" }}>
+            <div style={{ fontSize: 12, color: "red", whiteSpace: "nowrap", marginBottom: "16px", marginLeft: "112px" }}>
               本次项目是否属于港股分公司发包项目，如是，请选择"是"
             </div>
           ),
@@ -479,10 +483,11 @@ const StepOneComponent = (props) => {
             ]),
         {
           render: (
-            <div style={{ fontSize: 12, color: "red", whiteSpace: "nowrap", marginTop: "-8px", marginBottom: "16px", marginLeft: "112px" }}>
+            <div style={{ fontSize: 12, color: "red", whiteSpace: "nowrap", marginBottom: "16px", marginLeft: "112px" }}>
               本信息涉及后续项目资料审核，请如实填写。
             </div>
           ),
+          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) => {
                     <Button
                       type="link"
                       onClick={() => handleEdit(index)}
+                      disabled={record.existingFlag === 1}
                     >
                       修改
                     </Button>
@@ -1029,9 +1036,8 @@ const UserSelectComponent = (props) => {
         });
       }
     }
-
+    setSelectedRowKeys([...selectedRowKeys.filter(Boolean)]);
-    setSelectedRowKeys([...selectedRowKeys]);
+    setSelectedRows([...selectedRows.filter(Boolean)]);
-    setSelectedRows([...selectedRows]);
   };
   return (
     <Modal

src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/Add/index.js

@@ -95,6 +95,7 @@ function Add(props) {
             usercontentAddCmdList={usercontentAddCmdList}
             setUsercontentAddCmdList={setUsercontentAddCmdList}
             setQualificationsTypeId={setQualificationsTypeId}
+            setProjectFileAddCmdList={setProjectFileAddCmdList}
           />
         )}
       {currentStep === 2
@@ -200,7 +201,7 @@ const StepOneComponent = (props) => {
   }, [props.formValues]);
   return (
     <FormBuilder
-      labelCol={{ span: 5 }}
+      labelCol={{ span: 6 }}
       form={form}
       span={8}
       loading={props.qualificationStatistics.qualificationStatisticsLoading}
@@ -276,6 +277,7 @@ const StepOneComponent = (props) => {
           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: (
             <DepartmentSelectTree
@@ -336,7 +337,6 @@ const StepOneComponent = (props) => {
         {
           name: "approvalUserIds",
           label: "集团公司人员审核",
-          labelCol: { span: 6 },
           render: (
             <PersonnelSelect
               params={{ departmentId: approvalDeptId }}
@@ -350,6 +350,7 @@ const StepOneComponent = (props) => {
           name: "projectFiles",
           label: "安全管理协议",
           span: 24,
+          labelCol: { span: 2 },
           render: (
             <Upload
               fileType="image"
@@ -426,6 +427,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]);
@@ -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) => {
                     <Button
                       type="link"
                       onClick={() => handleEdit(index)}
+                      disabled={record.existingFlag === 1}
                     >
                       修改
                     </Button>
@@ -832,8 +840,8 @@ const UsercontentComponent = (props) => {
       }
     }
 
-    setSelectedRowKeys([...selectedRowKeys]);
+    setSelectedRowKeys([...selectedRowKeys.filter(Boolean)]);
-    setSelectedRows([...selectedRows]);
+    setSelectedRows([...selectedRows.filter(Boolean)]);
   };
   return (
     <Modal

src/pages/Container/Supervision/ProjectReview/ProjectApproval/Subcontract/List/index.js

@@ -52,6 +52,7 @@ function List(props) {
           { title: "项目名称", dataIndex: "projectName" },
           { title: "股份主管部门", dataIndex: "manageDeptName" },
           { title: "项目类别", dataIndex: "qualificationsTypeName" },
+          { title: "二级项目数", dataIndex: "secondLevelTotal", render: (_, record) => record.secondLevelTotal || 0 },
           { title: "是否存在分包", dataIndex: "subcontractFlag", render: (_, record) => record.subcontractFlag === 1 ? "是" : "否" },
           { title: "项目属地单位", dataIndex: "companyName" },
           {