From fe6639183bba5330cfa55a45b36ca599db700cc0 Mon Sep 17 00:00:00 2001
From: dearLin <1261008090@qq.com>
Date: Thu, 15 Jan 2026 11:34:36 +0800
Subject: [PATCH] =?UTF-8?q?fixed:=E9=83=A8=E5=88=86bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Qualification/Apply/Add/index.js          |  4 +-
 .../Qualification/Review/List/index.js        |  2 +-
 .../Qualification/Review/Review/index.js      |  6 +-
 .../Qualification/Review/Review/index.js      | 60 ++++++++++++-------
 .../Qualification/Review/List/index.js        |  2 +-
 .../Qualification/Review/Review/index.js      |  8 +--
 6 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js
index 4f9227b..2350431 100644
--- a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js
+++ b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js
@@ -330,9 +330,9 @@ const StepTwoComponent = (props) => {
       delete query.id;
     }
     const data = { ...props.formValues, qualificationsApplyDetailList: [...specialList] };
-    if (data.groupUnitUser.length !== 0) {
+    if (data.groupUnitUser && data.groupUnitUser.length !== 0) {
       data.groupUnitUser = data.groupUnitUser.join(",");
-      data.groupUnitUserName = data.groupUnitUserName.join(",");
+      data.groupUnitUserName = data.groupUnitUserName?.join(",");
     }
     const { success } = await props[!query.id ? "qualificationApplyAdd" : "qualificationApplyUpdate"]({
       ...data,
diff --git a/src/pages/Container/BranchCompany/Qualification/Review/List/index.js b/src/pages/Container/BranchCompany/Qualification/Review/List/index.js
index d9a0d2a..646707f 100644
--- a/src/pages/Container/BranchCompany/Qualification/Review/List/index.js
+++ b/src/pages/Container/BranchCompany/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}`);
                     }}
                   >
                     审核
diff --git a/src/pages/Container/BranchCompany/Qualification/Review/Review/index.js b/src/pages/Container/BranchCompany/Qualification/Review/Review/index.js
index c9c469b..c230522 100644
--- a/src/pages/Container/BranchCompany/Qualification/Review/Review/index.js
+++ b/src/pages/Container/BranchCompany/Qualification/Review/Review/index.js
@@ -15,7 +15,7 @@ function Review(props) {
   const onSubmit = async () => {
     const { success } = await props["qualificationReviewSubmit"]({ id: query.id, status: "400" });
     if (success) {
-      message.success("已提交至股份公司主管部门审核");
+      message.success("已提交审核");
       props.onCancel();
       window.history.back();
     }
@@ -45,7 +45,7 @@ function Review(props) {
           </>
         )}
       />
-      {rejectModalOpen && <RejectModal onCancel={() => setRejectModalOpen(false)} id={query.id} />}
+      {rejectModalOpen && <RejectModal onCancel={() => setRejectModalOpen(false)} id={query.id} qualificationsAuditId={query.qualificationsAuditId} />}
     </div>
   );
 }
@@ -53,7 +53,7 @@ function Review(props) {
 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();
diff --git a/src/pages/Container/Local/Qualification/Review/Review/index.js b/src/pages/Container/Local/Qualification/Review/Review/index.js
index 4ca28e8..0983d0b 100644
--- a/src/pages/Container/Local/Qualification/Review/Review/index.js
+++ b/src/pages/Container/Local/Qualification/Review/Review/index.js
@@ -2,17 +2,24 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Form, message, Modal } from "antd";
 import { useState } from "react";
 import FormBuilder from "zy-react-library/components/FormBuilder";
-import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj";
-import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
+import { validatorEndTime } from "zy-react-library/utils";
 import { NS_QUALIFICATION_REVIEW } from "~/enumerate/namespace";
 import ViewInfo from "../../ViewInfo";
 
-function Review() {
+function Review(props) {
   const query = useGetUrlQuery();
   const [rejectModalOpen, setRejectModalOpen] = useState(false);
   const [passModalOpen, setPassModalOpen] = useState(false);
+  // const onSubmit = async () => {
+  //   const { success } = await props["qualificationReviewSubmit"]({ id: query.id, qualificationsAuditId: query.qualificationsAuditId, status: "400" });
+  //   if (success) {
+  //     message.success("提交成功");
+  //     // props.onCancel();
+  //     window.history.back();
+  //   }
+  // };
   return (
     <div>
       <ViewInfo
@@ -21,7 +28,8 @@ function Review() {
           <>
             <Button
               type="primary"
-              onClick={() => {
+              onClick={async () => {
+                // await onSubmit();
                 setPassModalOpen(true);
               }}
             >
@@ -83,7 +91,7 @@ const RejectModalComponent = (props) => {
 
 const PassModalComponent = (props) => {
   const [form] = Form.useForm();
-  const managerDept = Form.useWatch("managerDept", form);
+  // const managerDept = Form.useWatch("managerDept", form);
 
   const onSubmit = async (values) => {
     const { success } = await props["qualificationReviewSubmit"]({ ...values, id: props.id, qualificationsAuditId: props.qualificationsAuditId, status: "400" });
@@ -106,34 +114,40 @@ const PassModalComponent = (props) => {
     >
       <FormBuilder
         form={form}
-        labelCol={{ span: 10 }}
+        values={{ isLongTerm: 1 }}
+        labelCol={{ span: 12 }}
         showActionButtons={false}
         onFinish={onSubmit}
         loading={props.qualificationReview.userQualificationLoading}
-        span={24}
         options={[
           {
-            name: "managerDept",
-            label: "主管部门",
-            render: (
-              <DepartmentSelectTree
-                onGetLabel={label => form.setFieldValue("managerDeptName", label)}
-                onChange={() => {
-                  form.setFieldValue("managerUser", "");
-                  form.setFieldValue("managerUserName", "");
-                }}
-              />
-            ),
+            name: "isLongTerm",
+            label: "供应商时效属性",
+            span: 24,
+            render: FORM_ITEM_RENDER_ENUM.RADIO,
+            items: [{ bianma: 1, name: "长期" }, { bianma: 0, name: "短期" }],
           },
-          { name: "managerDeptName", label: "主管部门名称", onlyForLabel: true },
           {
-            name: "managerUser",
-            label: "负责人",
-            render: (<PersonnelSelect params={{ departmentId: managerDept }} onGetLabel={label => form.setFieldValue("managerUserName", label)} />),
+            name: "periodTermStart",
+            label: "有效开始时间",
+            render: FORM_ITEM_RENDER_ENUM.DATE,
+            dependencies: ["isLongTerm"],
+            hidden: formValues => !(formValues.isLongTerm === 0),
+          },
+          {
+            name: "periodTermEnd",
+            label: "有效结束时间",
+            render: FORM_ITEM_RENDER_ENUM.DATE,
+            dependencies: ["isLongTerm"],
+            hidden: formValues => !(formValues.isLongTerm === 0),
+            rules: [validatorEndTime(form.getFieldValue("periodTermStart"))],
           },
-          { name: "managerUserName", label: "负责人名称", onlyForLabel: true },
         ]}
       />
+      <div style={{ color: "red" }}>
+        <div>长期相关方系统每年对资质进行自动复审结果，短期相关方在时间范围内无需复审，超过时间后，需要重新进行资质准入审核。</div>
+        <div>长期相关方每年1月1日重置审核状态，5月1日前完成审核操作，若超出审核时间，则需要重新审核。</div>
+      </div>
     </Modal>
   );
 };
diff --git a/src/pages/Container/Supervision/Qualification/Review/List/index.js b/src/pages/Container/Supervision/Qualification/Review/List/index.js
index 48bcab3..52dd97f 100644
--- a/src/pages/Container/Supervision/Qualification/Review/List/index.js
+++ b/src/pages/Container/Supervision/Qualification/Review/List/index.js
@@ -92,7 +92,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}`);
                     }}
                   >
                     审核
diff --git a/src/pages/Container/Supervision/Qualification/Review/Review/index.js b/src/pages/Container/Supervision/Qualification/Review/Review/index.js
index f3dff4d..ff27d9b 100644
--- a/src/pages/Container/Supervision/Qualification/Review/Review/index.js
+++ b/src/pages/Container/Supervision/Qualification/Review/Review/index.js
@@ -16,7 +16,7 @@ function Review(props) {
   const [passModalOpen, setPassModalOpen] = useState(false);
 
   const onSubmit = async () => {
-    const { success } = await props["qualificationReviewSubmit"]({ id: query.id, status: "400" });
+    const { success } = await props["qualificationReviewSubmit"]({ id: query.id, qualificationsAuditId: query.qualificationsAuditId, status: "400" });
     if (success) {
       message.success("已完成审核");
       window.history.back();
@@ -55,8 +55,8 @@ function Review(props) {
           </>
         )}
       />
-      {rejectModalOpen && <RejectModal onCancel={() => setRejectModalOpen(false)} id={query.id} />}
-      {passModalOpen && <PassModal onCancel={() => setPassModalOpen(false)} id={query.id} />}
+      {rejectModalOpen && <RejectModal onCancel={() => setRejectModalOpen(false)} id={query.id} qualificationsAuditId={query.qualificationsAuditId} />}
+      {passModalOpen && <PassModal onCancel={() => setPassModalOpen(false)} id={query.id} qualificationsAuditId={query.qualificationsAuditId} />}
     </div>
   );
 }
@@ -64,7 +64,7 @@ function Review(props) {
 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();