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

@@ -2,13 +2,13 @@ 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 { 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 {useState} from "react";
 
 function List(props) {
   const [form] = Form.useForm();
@@ -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,6 +136,7 @@ function List(props) {
                     </Button>
                   )
                 }
+                {false && (
                   <Button
                     type="link"
                     danger
@@ -146,6 +147,15 @@ function List(props) {
                   >
                     查看驳回原因
                   </Button>
+                )}
+                <Button
+                  type="link"
+                  onClick={() => {
+                    props.history.push(`./rejectRecord?id=${record.id}`);
+                  }}
+                >
+                  驳回记录
+                </Button>
               </Space>
             ),
           },

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

@@ -2,13 +2,13 @@ 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 { 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 {useState} from "react";
 
 function List(props) {
   const [form] = Form.useForm();
@@ -133,6 +133,7 @@ function List(props) {
                     查看
                   </Button>
                 )}
+                {false && (
                   <Button
                     type="link"
                     danger
@@ -143,6 +144,15 @@ function List(props) {
                   >
                     查看驳回原因
                   </Button>
+                )}
+                <Button
+                  type="link"
+                  onClick={() => {
+                    props.history.push(`./rejectRecord?id=${record.id}`);
+                  }}
+                >
+                  驳回记录
+                </Button>
               </Space>
             ),
           },

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;