bug:20583、20582

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

@@ -0,0 +1,9 @@
+import RejectRecordPage from "~/pages/Container/Stakeholder/Qualification/Apply/RejectRecord";
+
+function RejectRecord(props) {
+  return (
+    <RejectRecordPage {...props} />
+  );
+}
+
+export default RejectRecord;

src/pages/Container/BranchCompany/Qualification/ExpertProjectReviewRecord/List/index.js

@@ -1,14 +1,14 @@
 import { WarningOutlined } from "@ant-design/icons";
 import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
-import {Button, Descriptions, Form, Modal, Space, Tooltip} from "antd";
+import { Button, Descriptions, Form, Modal, Space, Tooltip } from "antd";
+import { useState } from "react";
 import Page from "zy-react-library/components/Page";
 import Search from "zy-react-library/components/Search";
 import DictionarySelect from "zy-react-library/components/Select/Dictionary";
 import Table from "zy-react-library/components/Table";
 import useTable from "zy-react-library/hooks/useTable";
-import {NS_QUALIFICATION_APPLY, NS_QUALIFICATION_RECORDS} from "~/enumerate/namespace";
+import { NS_QUALIFICATION_APPLY, NS_QUALIFICATION_RECORDS } from "~/enumerate/namespace";
-import {useState} from "react";
 
 function List(props) {
   const [form] = Form.useForm();
@@ -76,19 +76,19 @@ function List(props) {
                     title={
                       record.expireList
                         ? (
-                          <div style={{ width: "100%" }}>
+                            <div style={{ width: "100%" }}>
-                            {record.expireList.map((item, index) => (
+                              {record.expireList.map((item, index) => (
-                              <div key={index}>
+                                <div key={index}>
-                                {item.dataName}
+                                  {item.dataName}
-                                {" "}
+                                  {" "}
-                                已于
+                                  已于
-                                {item.qualificationsTermEnd}
+                                  {item.qualificationsTermEnd}
-                                {" "}
+                                  {" "}
-                                过期
+                                  过期
-                              </div>
+                                </div>
-                            ))}
+                              ))}
-                          </div>
+                            </div>
-                        )
+                          )
                         : "部分资料已过期"
                     }
                   >
@@ -124,8 +124,8 @@ function List(props) {
             render: (_, record) => (
               <Space>
                 {
-                  props.permission("fgs-bwtshjl-ck") &&
+                  props.permission("fgs-bwtshjl-ck")
-                  (
+                  && (
                     <Button
                       type="link"
                       onClick={() => {
@@ -136,15 +136,25 @@ function List(props) {
                     </Button>
                   )
                 }
+                {false && (
+                  <Button
+                    type="link"
+                    danger
+                    disabled={record.status !== 300}
+                    onClick={() => {
+                      onViewRejectReason(record.id);
+                    }}
+                  >
+                    查看驳回原因
+                  </Button>
+                )}
                 <Button
                   type="link"
-                  danger
-                  disabled={record.status !== 300}
                   onClick={() => {
-                    onViewRejectReason(record.id);
+                    props.history.push(`./rejectRecord?id=${record.id}`);
                   }}
                 >
-                  查看驳回原因
+                  驳回记录
                 </Button>
               </Space>
             ),
@@ -179,4 +189,4 @@ const RejectReason = (props) => {
     </Modal>
   );
 };
-export default Connect([NS_QUALIFICATION_RECORDS,NS_QUALIFICATION_APPLY], true)(Permission(List));
+export default Connect([NS_QUALIFICATION_RECORDS, NS_QUALIFICATION_APPLY], true)(Permission(List));

src/pages/Container/BranchCompany/Qualification/ExpertProjectReviewRecord/RejectRecord/index.js

@@ -0,0 +1,9 @@
+import RejectRecordPage from "~/pages/Container/Stakeholder/Qualification/Apply/RejectRecord";
+
+function RejectRecord(props) {
+  return (
+    <RejectRecordPage {...props} />
+  );
+}
+
+export default RejectRecord;

src/pages/Container/Stakeholder/Qualification/Apply/RejectRecord/index.js

@@ -1,4 +1,3 @@
-import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import Page from "zy-react-library/components/Page";
 import Table from "zy-react-library/components/Table";
@@ -6,7 +5,7 @@ import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import useTable from "zy-react-library/hooks/useTable";
 import { NS_QUALIFICATION_APPLY } from "~/enumerate/namespace";
 
-function List(props) {
+function RejectRecord(props) {
   const query = useGetUrlQuery();
 
   const { tableProps } = useTable(props["qualificationApplyRejectHistoryList"], {
@@ -41,4 +40,4 @@ function List(props) {
   );
 }
 
-export default Connect([NS_QUALIFICATION_APPLY], true)(Permission(List));
+export default Connect([NS_QUALIFICATION_APPLY], true)(RejectRecord);

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

@@ -1,14 +1,14 @@
 import { WarningOutlined } from "@ant-design/icons";
 import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
-import {Button, Descriptions, Form, Modal, Space, Tooltip} from "antd";
+import { Button, Descriptions, Form, Modal, Space, Tooltip } from "antd";
+import { useState } from "react";
 import Page from "zy-react-library/components/Page";
 import Search from "zy-react-library/components/Search";
 import DictionarySelect from "zy-react-library/components/Select/Dictionary";
 import Table from "zy-react-library/components/Table";
 import useTable from "zy-react-library/hooks/useTable";
-import {NS_QUALIFICATION_APPLY, NS_QUALIFICATION_RECORDS} from "~/enumerate/namespace";
+import { NS_QUALIFICATION_APPLY, NS_QUALIFICATION_RECORDS } from "~/enumerate/namespace";
-import {useState} from "react";
 
 function List(props) {
   const [form] = Form.useForm();
@@ -133,15 +133,25 @@ function List(props) {
                     查看
                   </Button>
                 )}
+                {false && (
+                  <Button
+                    type="link"
+                    danger
+                    disabled={record.status !== 300}
+                    onClick={() => {
+                      onViewRejectReason(record.id);
+                    }}
+                  >
+                    查看驳回原因
+                  </Button>
+                )}
                 <Button
                   type="link"
-                  danger
-                  disabled={record.status !== 300}
                   onClick={() => {
-                    onViewRejectReason(record.id);
+                    props.history.push(`./rejectRecord?id=${record.id}`);
                   }}
                 >
-                  查看驳回原因
+                  驳回记录
                 </Button>
               </Space>
             ),
@@ -178,4 +188,4 @@ const RejectReason = (props) => {
   );
 };
 
-export default Connect([NS_QUALIFICATION_RECORDS,NS_QUALIFICATION_APPLY], true)(Permission(List));
+export default Connect([NS_QUALIFICATION_RECORDS, NS_QUALIFICATION_APPLY], true)(Permission(List));

src/pages/Container/Supervision/Qualification/Records/RejectRecord/index.js

@@ -0,0 +1,9 @@
+import RejectRecordPage from "~/pages/Container/Stakeholder/Qualification/Apply/RejectRecord";
+
+function RejectRecord(props) {
+  return (
+    <RejectRecordPage {...props} />
+  );
+}
+
+export default RejectRecord;