fixed:部分bug修复

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

@@ -32,6 +32,9 @@ function Add(props) {
     if (query.resubmit) {
       delete data.id;
     }
+    if (data.groupUnitUser) {
+      data.groupUnitUser = data.groupUnitUser.split(",");
+    }
     setFormValues(data);
     form.setFieldsValue(data);
     setSpecialList(data.specialList);
@@ -112,9 +115,8 @@ const StepOneComponent = (props) => {
                 form.setFieldValue("qualificationsTypeName", label);
               }}
               onChange={async (value) => {
-                console.log(value);
                 if (value === "wzgll") {
-                  await getCorpInfoList(6);
+                  await getCorpInfoList(1);
                 }
                 form.setFieldValue("groupUnitName", "");
                 form.setFieldValue("groupUnitName", "");
@@ -328,6 +330,10 @@ const StepTwoComponent = (props) => {
       delete query.id;
     }
     const data = { ...props.formValues, qualificationsApplyDetailList: [...specialList] };
+    if (data.groupUnitUser.length !== 0) {
+      data.groupUnitUser = data.groupUnitUser.join(",");
+      data.groupUnitUserName = data.groupUnitUserName.join(",");
+    }
     const { success } = await props[!query.id ? "qualificationApplyAdd" : "qualificationApplyUpdate"]({
       ...data,
       id: query.id,

src/pages/Container/Local/Qualification/Review/List/index.js

@@ -87,7 +87,7 @@ function List(props) {
                   <Button
                     type="link"
                     onClick={() => {
-                      props.history.push(`./review?id=${record.id}`);
+                      props.history.push(`./review?id=${record.id}&qualificationsAuditId=${record.qualificationsAuditId}`);
                     }}
                   >
                     审核

src/pages/Container/Local/Qualification/Review/Review/index.js

@@ -39,8 +39,8 @@ function Review() {
           </>
         )}
       />
-      {rejectModalOpen && <RejectModal onCancel={() => setRejectModalOpen(false)} id={query.id} />}
+      {rejectModalOpen && <RejectModal onCancel={() => setRejectModalOpen(false)} id={query.id} qualificationsAuditId={query.qualificationsAuditId} />}
-      {passModalOpen && <PassModal onCancel={() => setPassModalOpen(false)} id={query.id} />}
+      {passModalOpen && <PassModal onCancel={() => setPassModalOpen(false)} id={query.id} qualificationsAuditId={query.qualificationsAuditId} />}
     </div>
   );
 }
@@ -48,7 +48,7 @@ function Review() {
 const RejectModalComponent = (props) => {
   const [form] = Form.useForm();
   const onSubmit = async (values) => {
-    const { success } = await props["qualificationReviewSubmit"]({ ...values, id: props.id, status: "300" });
+    const { success } = await props["qualificationReviewSubmit"]({ ...values, id: props.id, qualificationsAuditId: props.qualificationsAuditId, status: "300" });
     if (success) {
       message.success("驳回成功");
       props.onCancel();
@@ -86,7 +86,7 @@ const PassModalComponent = (props) => {
   const managerDept = Form.useWatch("managerDept", form);
 
   const onSubmit = async (values) => {
-    const { success } = await props["qualificationReviewSubmit"]({ ...values, id: props.id, status: "400" });
+    const { success } = await props["qualificationReviewSubmit"]({ ...values, id: props.id, qualificationsAuditId: props.qualificationsAuditId, status: "400" });
     if (success) {
       message.success("通过成功");
       props.onCancel();

src/pages/Container/Supervision/Qualification/Maintenance/Add/index.js

@@ -15,11 +15,12 @@ function Add(props) {
   const [form] = Form.useForm();
   const [corpTypeList, setCorpTypeList] = useState([2]);
   const managerDept = Form.useWatch("managerDept", form);
+  const shareDeptId = Form.useWatch("shareDeptId", form);
 
   const getData = async () => {
     const { data } = await props["qualificationMaintenanceInfo"]({ id: query.id });
     if (data.qualificationsTypeId === "wzgll") {
-      setCorpTypeList([6]);
+      setCorpTypeList([2, 6]);
     }
     form.setFieldsValue({
       ...data,
@@ -40,7 +41,7 @@ function Add(props) {
     });
     if (success) {
       message.success("操作成功");
-      // props.history.goBack();
+      props.history.goBack();
     }
   };
 
@@ -71,7 +72,7 @@ function Add(props) {
                 dictValue="qualificationsType"
                 onGetOption={(v) => {
                   if (v.dictValue === "wzgll") {
-                    setCorpTypeList([6]);
+                    setCorpTypeList([2, 6]);
                   }
                   else {
                     setCorpTypeList([2]);
@@ -105,7 +106,7 @@ function Add(props) {
           { name: "stakeholderLevelName", label: "资质等级", onlyForLabel: true, componentProps: { disabled: query.id } },
           {
             name: "managerDept",
-            label: "主管部门",
+            label: "审核部门",
             render: (
               <DepartmentSelectTree
                 disabled={query.id}
@@ -115,7 +116,6 @@ function Add(props) {
                   form.setFieldValue("managerDeptName", label);
                 }}
                 onChange={(_, __, extra) => {
-                  console.log(extra);
                   form.setFieldValue("managerUser", []);
                   form.setFieldValue("managerUserName", []);
                   form.setFieldValue("corpId", extra.triggerNode.props.corpinfoId);
@@ -125,15 +125,16 @@ function Add(props) {
               />
             ),
           },
-          { name: "managerDeptName", label: "主管部门名称", onlyForLabel: true },
+          { name: "managerDeptName", label: "审核部门名称", onlyForLabel: true },
           { name: "corpId", label: "主管部门所属公司", onlyForLabel: true },
-          { name: "managerCorpId", label: "主管部门所属公司", onlyForLabel: true },
+          { name: "managerCorpId", label: "审核部门所属公司", onlyForLabel: true },
-          { name: "managerCorpName", label: "主管部门所属公司名称", onlyForLabel: true },
+          { name: "managerCorpName", label: "审核部门所属公司名称", onlyForLabel: true },
           {
             name: "managerUser",
-            label: "选择审核人",
+            label: "审核人员",
             render: (
               <PersonnelSelect
+                disabled={query.id}
                 params={{ departmentId: managerDept }}
                 extraParams={{ noMain: 1 }}
                 mode="multiple"
@@ -144,6 +145,44 @@ function Add(props) {
             ),
           },
           { name: "managerUserName", label: "审核人名称", onlyForLabel: true },
+          {
+            name: "shareDeptId",
+            label: "股份主管部门",
+            required: false,
+            hidden: formValues => !(formValues.qualificationsTypeId === "wzgll"),
+            render: (
+              <DepartmentSelectTree
+                disabled={query.id}
+                searchType="company"
+                params={{ corpinfoTypeList: [2] }}
+                onGetLabel={(label) => {
+                  form.setFieldValue("shareDeptName", label);
+                }}
+                onChange={() => {
+                  form.setFieldValue("shareUserId", "");
+                  form.setFieldValue("shareUserName", "");
+                }}
+              />
+            ),
+          },
+          { name: "shareDeptName", label: "股份主管部门名称", onlyForLabel: true },
+          {
+            name: "shareUserId",
+            label: "主管人员",
+            required: false,
+            hidden: formValues => !(formValues.qualificationsTypeId === "wzgll"),
+            render: (
+              <PersonnelSelect
+                disabled={query.id}
+                params={{ departmentId: shareDeptId }}
+                extraParams={{ noMain: 1 }}
+                onGetLabel={(label) => {
+                  form.setFieldValue("shareUserName", label);
+                }}
+              />
+            ),
+          },
+          { name: "shareUserName", label: "主管人员名称", onlyForLabel: true },
           {
             name: "status",
             label: "是否启用",

src/pages/Container/Supervision/Qualification/Maintenance/List/index.js

@@ -63,7 +63,7 @@ function List(props) {
           { title: "资质类别", dataIndex: "qualificationsTypeName" },
           { title: "资质等级", dataIndex: "stakeholderLevelName" },
           { title: "审核单位", dataIndex: "managerCorpName" },
-          { title: "主管部门", dataIndex: "managerDeptName" },
+          { title: "审核人员", dataIndex: "managerUserName" },
           { title: "材料数量", dataIndex: "materialNum", render: (_, record) => record.details?.length || 0 },
           { title: "资质状态", dataIndex: "status", render: (_, record) => record.status === 0 ? "启用" : "禁用" },
           {