fixed:完善项目申请的时候，存入的审批人企业id不对

src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js

@@ -366,7 +366,6 @@ const StepTwoComponent = (props) => {
               options={false}
               disabledResizer={true}
               columns={[
-                { title: "材料名称", dataIndex: "dataName" },
                 { title: "材料名称", dataIndex: "dataName" },
                 { title: "上传时间", dataIndex: "uploadedTime", render: (_, record) => record.uploadedTime || "-" },
                 {

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

@@ -246,10 +246,8 @@ const StepOneComponent = (props) => {
             <PersonnelSelect
               isNeedCorpInfoId={true}
               params={{ corpinfoId: props.userInfo?.corpinfoId || "" }}
+              extraParams={{ noMain: 1, flowFlag: 0 }}
               isNeedDepartmentId={false}
-              extraParams={{
-                noMain: 1,
-              }}
               onGetLabel={(label) => {
                 form.setFieldValue("userName", label);
               }}
@@ -316,6 +314,8 @@ const StepOneComponent = (props) => {
                 recommendDeptName: "",
                 recommendUserIds: [],
                 recommendUserNames: "",
+                manageCorpId: "",
+                manageCorpName: "",
                 manageDeptId: "",
                 manageDeptName: "",
                 manageUserIds: [],
@@ -333,7 +333,7 @@ const StepOneComponent = (props) => {
             </div>
           ),
         },
-        { name: "qualificationsTypeName", label: "项目类别名称", onlyForLabel: true },
+        // { name: "qualificationsTypeName", label: "项目类别名称", onlyForLabel: true },
         { name: "subcontractFlag", label: "是否存在分包项目", span: 24, render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }] },
         {
           name: "isLocalCompany",
@@ -434,11 +434,16 @@ const StepOneComponent = (props) => {
                 label: "选择主管部门",
                 render: FORM_ITEM_RENDER_ENUM.SELECT,
                 items: deptList,
-                itemsField: { valueKey: "deptId", labelKey: "deptName" },
+                itemsField: { valueKey: "deptId", labelKey: (item) => {
+                  return `${item.deptName}(${item.corpName})`;
+                } },
                 componentProps: {
                   onChange: (event) => {
-                    const label = deptList.find(item => item.deptId === event)?.deptName;
-                    form.setFieldValue("manageDeptName", label);
+                    const label2 = deptList.find(item => item.deptId === event);
+                    // const label = deptList.find(item => item.deptId === event)?.deptName;
+                    form.setFieldValue("manageDeptName", label2.deptName);
+                    form.setFieldValue("manageCorpId", label2.corpId);
+                    form.setFieldValue("manageCorpName", label2.corpName);
                     form.setFieldsValue({
                       manageUserIds: [],
                       recommendUserNames: "",

src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/List/index.js

@@ -43,7 +43,7 @@ function List(props) {
           },
           { name: "eqSubcontractFlag", label: "是否存在分包", render: FORM_ITEM_RENDER_ENUM.SELECT, items: [{ name: "是", bianma: "1" }, { name: "否", bianma: "0" }] },
           {
-            name: "",
+            name: "eqProjectStatus",
             label: "项目审核状态",
             render: FORM_ITEM_RENDER_ENUM.SELECT,
             items: PROJECT_STATUS_MAP,

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

@@ -16,11 +16,11 @@ import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
 import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
 import useDeleteFile from "zy-react-library/hooks/useDeleteFile";
 import useGetFile from "zy-react-library/hooks/useGetFile";
-import useGetUserInfo from "zy-react-library/hooks/useGetUserInfo";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
+import useGetUserInfo from "zy-react-library/hooks/useGetUserInfo";
 import useTable from "zy-react-library/hooks/useTable";
 import useUploadFile from "zy-react-library/hooks/useUploadFile";
-import { getLabelName,validatorEndTime } from "zy-react-library/utils";
+import { getLabelName, validatorEndTime } from "zy-react-library/utils";
 import ViewProjectReviewUserModal from "~/components/ViewProjectReviewUserModal";
 import { NS_QUALIFICATION_STATISTICS } from "~/enumerate/namespace";
 
@@ -214,10 +214,13 @@ const StepOneComponent = (props) => {
         { label: "项目基础信息", render: FORM_ITEM_RENDER_ENUM.DIVIDER },
         { name: "projectName", label: "项目名称" },
         {
-          name: "userId", label: "项目负责人", render: (
+          name: "userId",
+          label: "项目负责人",
+          render: (
             <PersonnelSelect
               isNeedCorpInfoId={true}
               params={{ corpinfoId: props.userInfo?.corpinfoId || "" }}
+              extraParams={{ noMain: 1, flowFlag: 0 }}
               isNeedDepartmentId={false}
               onGetLabel={(label) => {
                 form.setFieldValue("userName", label);
@@ -245,7 +248,8 @@ const StepOneComponent = (props) => {
                 }
               }}
             />
-          ), componentProps: {
+          ),
+          componentProps: {
             onChange: (userId) => {
               if (!userId) {
                 // 如果清空了项目负责人，从项目人员列表中移除
@@ -255,7 +259,7 @@ const StepOneComponent = (props) => {
                 props.setUsercontentAddCmdList(newUserList);
               }
             },
-          }
+          },
         },
         { name: "userName", label: "项目负责人", onlyForLabel: true },
         { name: "initiationTime", label: "立项时间", render: FORM_ITEM_RENDER_ENUM.DATE },
@@ -269,7 +273,10 @@ const StepOneComponent = (props) => {
         { name: "specialFlag", label: "是否包含特殊作业", labelCol: { span: 8 }, render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }] },
         { label: "项目审核信息", render: FORM_ITEM_RENDER_ENUM.DIVIDER },
         {
-          name: "qualificationsTypeId", label: "项目类别", span: 24, wrapperCol: { span: 5 },
+          name: "qualificationsTypeId",
+          label: "项目类别",
+          span: 24,
+          wrapperCol: { span: 5 },
           items: qualificationsTypeList,
           render: FORM_ITEM_RENDER_ENUM.SELECT,
           itemsField: { valueKey: "qualificationsTypeId", labelKey: "qualificationsTypeName" },
@@ -281,7 +288,7 @@ const StepOneComponent = (props) => {
                 status: event,
                 idKey: "qualificationsTypeId",
                 nameKey: "qualificationsTypeName",
-              }))
+              }));
             },
           },
         },
@@ -340,7 +347,10 @@ const StepOneComponent = (props) => {
         },
         { name: "approvalUserNames", label: "集团公司人员审核名称", onlyForLabel: true },
         {
-          name: "projectFiles", label: "安全管理协议", span: 24, render: (
+          name: "projectFiles",
+          label: "安全管理协议",
+          span: 24,
+          render: (
             <Upload
               fileType="image"
               maxCount={5}
@@ -350,7 +360,7 @@ const StepOneComponent = (props) => {
                 form.setFieldValue("deleteProjectFileAddCmdList", [...(form.getFieldValue("deleteProjectFileAddCmdList") || []), file]);
               }}
             />
-          )
+          ),
         },
         { name: "deleteProjectFileAddCmdList", label: "删除的安全管理协议", onlyForLabel: true },
         { name: "agreementFileUuid", label: "安全协议uuid", onlyForLabel: true },

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

@@ -42,7 +42,7 @@ function List(props) {
             render: (<DictionarySelect dictValue="qualificationsType" />),
           },
           {
-            name: "",
+            name: "eqProjectStatus",
             label: "项目审核状态",
             render: FORM_ITEM_RENDER_ENUM.SELECT,
             items: PROJECT_STATUS_MAP,