Merge remote-tracking branch 'origin/master'

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

@@ -247,10 +247,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);
               }}
@@ -317,6 +315,8 @@ const StepOneComponent = (props) => {
                 recommendDeptName: "",
                 recommendUserIds: [],
                 recommendUserNames: "",
+                manageCorpId: "",
+                manageCorpName: "",
                 manageDeptId: "",
                 manageDeptName: "",
                 manageUserIds: [],
@@ -334,7 +334,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/ProjectFilingApplicationTwo/Add/index.js

@@ -220,6 +220,7 @@ const StepOneComponent = (props) => {
             <PersonnelSelect
               isNeedCorpInfoId={true}
               params={{ corpinfoId: props.userInfo?.corpinfoId || "" }}
+              extraParams={{ noMain: 1, flowFlag: 0 }}
               isNeedDepartmentId={false}
               onGetLabel={(label) => {
                 form.setFieldValue("userName", label);