From 422287e5e64d33ae13139b6252b24c11ad1c80d2 Mon Sep 17 00:00:00 2001
From: LiuJiaNan <15703339975@163.com>
Date: Thu, 18 Dec 2025 14:31:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E9=92=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 .../Inspection/Acceptance/List/index.js       | 21 +++++++++--------
 .../Inspection/Assign/List/index.js           | 21 +++++++++--------
 .../Inspection/Defense/List/index.js          | 23 +++++++++++--------
 .../Inspection/Inspected/List/index.js        | 23 +++++++++++--------
 .../Inspection/Inspection/List/index.js       |  9 ++++----
 .../Inspection/Inspector/List/index.js        | 23 +++++++++++--------
 .../Inspection/Records/List/index.js          |  9 ++++----
 .../BranchCompany/Plan/Execute/List/index.js  |  5 ++--
 .../Plan/Management/List/index.js             |  9 ++++----
 .../Inspection/Acceptance/List/index.js       |  2 +-
 .../Inspection/Defense/List/index.js          |  2 +-
 .../Inspection/Inspection/List/index.js       |  2 +-
 .../Inspection/Inspector/List/index.js        |  2 +-
 .../Inspection/Records/List/index.js          |  2 +-
 .../Supervision/Plan/Execute/List/index.js    |  2 +-
 .../Supervision/Plan/Management/List/index.js |  2 +-
 17 files changed, 89 insertions(+), 70 deletions(-)

diff --git a/package.json b/package.json
index b75f40d..861bdd6 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-to-print": "^3.2.0",
-    "zy-react-library": "^1.0.167"
+    "zy-react-library": "^1.0.169"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^5.4.1",
diff --git a/src/pages/Container/BranchCompany/Inspection/Acceptance/List/index.js b/src/pages/Container/BranchCompany/Inspection/Acceptance/List/index.js
index 7a41a30..fa211ed 100644
--- a/src/pages/Container/BranchCompany/Inspection/Acceptance/List/index.js
+++ b/src/pages/Container/BranchCompany/Inspection/Acceptance/List/index.js
@@ -1,3 +1,4 @@
+import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Form, Space } from "antd";
 import Search from "zy-react-library/components/Search";
@@ -66,14 +67,16 @@ function List(props) {
                 >
                   查看
                 </Button>
-                <Button
-                  type="link"
-                  onClick={() => {
-                    props.history.push(`./hiddenList?id=${record.id}&inspectionId=${record.inspectionId}`);
-                  }}
-                >
-                  验收
-                </Button>
+                {props.permission(props.acceptPermissionKey || "inspection-qy-check-accept-edit") && (
+                  <Button
+                    type="link"
+                    onClick={() => {
+                      props.history.push(`./hiddenList?id=${record.id}&inspectionId=${record.inspectionId}`);
+                    }}
+                  >
+                    验收
+                  </Button>
+                )}
               </Space>
             ),
           },
@@ -84,4 +87,4 @@ function List(props) {
   );
 }
 
-export default Connect([NS_INSPECTION], true)(List);
+export default Connect([NS_INSPECTION], true)(Permission(List));
diff --git a/src/pages/Container/BranchCompany/Inspection/Assign/List/index.js b/src/pages/Container/BranchCompany/Inspection/Assign/List/index.js
index 826073c..d395bd1 100644
--- a/src/pages/Container/BranchCompany/Inspection/Assign/List/index.js
+++ b/src/pages/Container/BranchCompany/Inspection/Assign/List/index.js
@@ -1,3 +1,4 @@
+import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Form, Space } from "antd";
 import Search from "zy-react-library/components/Search";
@@ -66,14 +67,16 @@ function List(props) {
                 >
                   查看
                 </Button>
-                <Button
-                  type="link"
-                  onClick={() => {
-                    props.history.push(`./hiddenList?id=${record.id}&inspectionId=${record.inspectionId}`);
-                  }}
-                >
-                  指派
-                </Button>
+                {props.permission("inspection-qy-check-assign-edit") && (
+                  <Button
+                    type="link"
+                    onClick={() => {
+                      props.history.push(`./hiddenList?id=${record.id}&inspectionId=${record.inspectionId}`);
+                    }}
+                  >
+                    指派
+                  </Button>
+                )}
               </Space>
             ),
           },
@@ -84,4 +87,4 @@ function List(props) {
   );
 }
 
-export default Connect([NS_INSPECTION], true)(List);
+export default Connect([NS_INSPECTION], true)(Permission(List));
diff --git a/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js b/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js
index 9d82870..47fd9fb 100644
--- a/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js
+++ b/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js
@@ -1,3 +1,4 @@
+import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Form, Image, message, Modal, Space } from "antd";
 import { useEffect, useState } from "react";
@@ -78,15 +79,17 @@ function List(props) {
                 >
                   查看
                 </Button>
-                <Button
-                  type="link"
-                  onClick={() => {
-                    setDefenseHandlingModalOpen(true);
-                    setCurrentId(record.id);
-                  }}
-                >
-                  申辩处理
-                </Button>
+                {props.permission(props.defensePermissionKey || "inspection-qy-check-plead-edit") && (
+                  <Button
+                    type="link"
+                    onClick={() => {
+                      setDefenseHandlingModalOpen(true);
+                      setCurrentId(record.id);
+                    }}
+                  >
+                    申辩处理
+                  </Button>
+                )}
                 <Button
                   type="link"
                   onClick={() => {
@@ -279,4 +282,4 @@ function DefenseRecordModalComponent(props) {
 
 const DefenseHandlingModal = Connect([NS_INSPECTION], true)(DefenseHandlingModalComponent);
 const DefenseRecordModal = Connect([NS_INSPECTION], true)(DefenseRecordModalComponent);
-export default Connect([NS_INSPECTION], true)(List);
+export default Connect([NS_INSPECTION], true)(Permission(List));
diff --git a/src/pages/Container/BranchCompany/Inspection/Inspected/List/index.js b/src/pages/Container/BranchCompany/Inspection/Inspected/List/index.js
index 8d71a71..59ef63c 100644
--- a/src/pages/Container/BranchCompany/Inspection/Inspected/List/index.js
+++ b/src/pages/Container/BranchCompany/Inspection/Inspected/List/index.js
@@ -1,3 +1,4 @@
+import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Form, message, Modal, Space } from "antd";
 import { useState } from "react";
@@ -74,15 +75,17 @@ function List(props) {
                 >
                   查看
                 </Button>
-                <Button
-                  type="link"
-                  onClick={() => {
-                    setConfirmModalOpen(true);
-                    setCurrentId(record.inspectionId);
-                  }}
-                >
-                  确认
-                </Button>
+                {props.permission("inspection-qy-check-confirm-edit") && (
+                  <Button
+                    type="link"
+                    onClick={() => {
+                      setConfirmModalOpen(true);
+                      setCurrentId(record.inspectionId);
+                    }}
+                  >
+                    确认
+                  </Button>
+                )}
               </Space>
             ),
           },
@@ -188,4 +191,4 @@ function ConfirmModalComponent(props) {
 }
 
 const ConfirmModal = Connect([NS_INSPECTION], true)(ConfirmModalComponent);
-export default Connect([NS_INSPECTION], true)(List);
+export default Connect([NS_INSPECTION], true)(Permission(List));
diff --git a/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js b/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js
index 49e8346..0efd05c 100644
--- a/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js
+++ b/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js
@@ -1,5 +1,6 @@
-import { Connect } from "@cqsjjb/jjb-dva-runtime";
+import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 
+import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Form, Space } from "antd";
 import { useState } from "react";
 import AddIcon from "zy-react-library/components/Icon/AddIcon";
@@ -56,7 +57,7 @@ function List(props) {
       <Table
         toolBarRender={() => (
           <Space>
-            {query.edit !== "0" && (
+            {props.permission(props.addPermissionKey || "inspection-qy-check-add") && query.edit !== "0" && (
               <Button
                 type="primary"
                 icon={<AddIcon />}
@@ -91,7 +92,7 @@ function List(props) {
             width: 200,
             render: (_, record) => (
               <Space>
-                {(record.status === -1 || record.status === 600) && (
+                {(props.permission(props.updatePermissionKey || "inspection-qy-check-edit") && (record.status === -1 || record.status === 600)) && (
                   <Button
                     type="link"
                     onClick={() => {
@@ -143,4 +144,4 @@ function List(props) {
   );
 }
 
-export default Connect([NS_INSPECTION], true)(List);
+export default Connect([NS_INSPECTION], true)(Permission(List));
diff --git a/src/pages/Container/BranchCompany/Inspection/Inspector/List/index.js b/src/pages/Container/BranchCompany/Inspection/Inspector/List/index.js
index 8e8ec7e..00cb96f 100644
--- a/src/pages/Container/BranchCompany/Inspection/Inspector/List/index.js
+++ b/src/pages/Container/BranchCompany/Inspection/Inspector/List/index.js
@@ -1,3 +1,4 @@
+import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Form, message, Modal, Space } from "antd";
 import { useState } from "react";
@@ -73,15 +74,17 @@ function List(props) {
                 >
                   查看
                 </Button>
-                <Button
-                  type="link"
-                  onClick={() => {
-                    setVerifyModalOpen(true);
-                    setCurrentId(record.id);
-                  }}
-                >
-                  核实
-                </Button>
+                {props.permission(props.verifyPermissionKey || "inspection-qy-check-verify-edit") && (
+                  <Button
+                    type="link"
+                    onClick={() => {
+                      setVerifyModalOpen(true);
+                      setCurrentId(record.id);
+                    }}
+                  >
+                    核实
+                  </Button>
+                )}
               </Space>
             ),
           },
@@ -174,4 +177,4 @@ function VerifyModalComponent(props) {
 }
 
 const VerifyModal = Connect([NS_INSPECTION], true)(VerifyModalComponent);
-export default Connect([NS_INSPECTION], true)(List);
+export default Connect([NS_INSPECTION], true)(Permission(List));
diff --git a/src/pages/Container/BranchCompany/Inspection/Records/List/index.js b/src/pages/Container/BranchCompany/Inspection/Records/List/index.js
index f0b320e..496579c 100644
--- a/src/pages/Container/BranchCompany/Inspection/Records/List/index.js
+++ b/src/pages/Container/BranchCompany/Inspection/Records/List/index.js
@@ -1,5 +1,6 @@
-import { Connect } from "@cqsjjb/jjb-dva-runtime";
+import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 
+import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Form, message, Modal, Space, Spin } from "antd";
 import { useEffect, useState } from "react";
 import ExportIcon from "zy-react-library/components/Icon/ExportIcon";
@@ -138,7 +139,7 @@ function List(props) {
         )}
         toolBarRender={() => (
           <Space>
-            {query.entrance !== "statistics" && (
+            {(props.permission(props.exportPermissionKey || "inspection-qy-list-dc") && query.entrance !== "statistics") && (
               <Button
                 type="primary"
                 icon={<ExportIcon />}
@@ -193,7 +194,7 @@ function List(props) {
                 >
                   查看
                 </Button>
-                {query.entrance !== "statistics" && (
+                {(props.permission(props.deletePermissionKey || "inspection-qy-list-del") && query.entrance !== "statistics") && (
                   <Button
                     type="link"
                     danger
@@ -223,4 +224,4 @@ function List(props) {
   );
 }
 
-export default Connect([NS_INSPECTION], true)(List);
+export default Connect([NS_INSPECTION], true)(Permission(List));
diff --git a/src/pages/Container/BranchCompany/Plan/Execute/List/index.js b/src/pages/Container/BranchCompany/Plan/Execute/List/index.js
index 25a027f..867c47d 100644
--- a/src/pages/Container/BranchCompany/Plan/Execute/List/index.js
+++ b/src/pages/Container/BranchCompany/Plan/Execute/List/index.js
@@ -1,3 +1,4 @@
+import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Form, Modal, Space } from "antd";
 import dayjs from "dayjs";
@@ -90,7 +91,7 @@ function List(props) {
                 && (currentTime.isBefore(planEndTime, "day") || currentTime.isSame(planEndTime, "day"));
               return (
                 <Space>
-                  {isInProgress && (
+                  {(props.permission(props.addPermissionKey || "inspection-qy-plan-execute-add") && isInProgress) && (
                     <Button
                       type="link"
                       onClick={() => {
@@ -173,4 +174,4 @@ const PlanExecutionPersonnelModalComponent = (props) => {
 };
 
 const PlanExecutionPersonnelModal = Connect([NS_PLAN], true)(PlanExecutionPersonnelModalComponent);
-export default Connect([NS_PLAN], true)(List);
+export default Connect([NS_PLAN], true)(Permission(List));
diff --git a/src/pages/Container/BranchCompany/Plan/Management/List/index.js b/src/pages/Container/BranchCompany/Plan/Management/List/index.js
index 29fd3df..4fb2760 100644
--- a/src/pages/Container/BranchCompany/Plan/Management/List/index.js
+++ b/src/pages/Container/BranchCompany/Plan/Management/List/index.js
@@ -1,3 +1,4 @@
+import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Form, message, Modal, Space } from "antd";
 import dayjs from "dayjs";
@@ -66,7 +67,7 @@ function List(props) {
       <Table
         toolBarRender={() => (
           <>
-            {query.entrance !== "statistics" && (
+            {(props.permission(props.addPermissionKey || "inspection-qy-plan-list-add") && query.entrance !== "statistics") && (
               <Button
                 type="primary"
                 icon={<AddIcon />}
@@ -154,7 +155,7 @@ function List(props) {
                     查看
                   </Button>
                   {
-                    (isBeforeStart && query.entrance !== "statistics") && (
+                    (props.permission(props.updatePermissionKey || "inspection-qy-plan-list-edit") && isBeforeStart && query.entrance !== "statistics") && (
                       <Button
                         type="link"
                         onClick={() => {
@@ -167,7 +168,7 @@ function List(props) {
                     )
                   }
                   {
-                    (isBeforeStart && query.entrance !== "statistics") && (
+                    (props.permission(props.deletePermissionKey || "inspection-qy-plan-list-del") && isBeforeStart && query.entrance !== "statistics") && (
                       <Button
                         type="link"
                         danger
@@ -399,4 +400,4 @@ const ViewModal = (props) => {
 };
 
 const AddModal = Connect([NS_PLAN], true)(AddModalComponent);
-export default Connect([NS_PLAN], true)(List);
+export default Connect([NS_PLAN], true)(Permission(List));
diff --git a/src/pages/Container/Supervision/Inspection/Acceptance/List/index.js b/src/pages/Container/Supervision/Inspection/Acceptance/List/index.js
index e0cdd77..4aca892 100644
--- a/src/pages/Container/Supervision/Inspection/Acceptance/List/index.js
+++ b/src/pages/Container/Supervision/Inspection/Acceptance/List/index.js
@@ -1,7 +1,7 @@
 import AcceptanceList from "~/pages/Container/BranchCompany/Inspection/Acceptance/List";
 
 function List(props) {
-  return <AcceptanceList searchType="all" {...props} />;
+  return <AcceptanceList acceptPermissionKey="inspection-jg-check-accept-edit" searchType="all" {...props} />;
 }
 
 export default List;
diff --git a/src/pages/Container/Supervision/Inspection/Defense/List/index.js b/src/pages/Container/Supervision/Inspection/Defense/List/index.js
index a024995..5abbd53 100644
--- a/src/pages/Container/Supervision/Inspection/Defense/List/index.js
+++ b/src/pages/Container/Supervision/Inspection/Defense/List/index.js
@@ -1,7 +1,7 @@
 import DefenseList from "~/pages/Container/BranchCompany/Inspection/Defense/List";
 
 function List(props) {
-  return <DefenseList searchType="all" {...props} />;
+  return <DefenseList defensePermissionKey="inspection-jg-check-plead-edit" searchType="all" {...props} />;
 }
 
 export default List;
diff --git a/src/pages/Container/Supervision/Inspection/Inspection/List/index.js b/src/pages/Container/Supervision/Inspection/Inspection/List/index.js
index 480c282..c955a6e 100644
--- a/src/pages/Container/Supervision/Inspection/Inspection/List/index.js
+++ b/src/pages/Container/Supervision/Inspection/Inspection/List/index.js
@@ -1,7 +1,7 @@
 import InspectionList from "~/pages/Container/BranchCompany/Inspection/Inspection/List";
 
 function List(props) {
-  return <InspectionList searchType="all" {...props} />;
+  return <InspectionList addPermissionKey="inspection-jg-check-add" updatePermissionKey="inspection-jg-check-edit" searchType="all" {...props} />;
 }
 
 export default List;
diff --git a/src/pages/Container/Supervision/Inspection/Inspector/List/index.js b/src/pages/Container/Supervision/Inspection/Inspector/List/index.js
index 58f2d49..b061548 100644
--- a/src/pages/Container/Supervision/Inspection/Inspector/List/index.js
+++ b/src/pages/Container/Supervision/Inspection/Inspector/List/index.js
@@ -1,7 +1,7 @@
 import InspectorList from "~/pages/Container/BranchCompany/Inspection/Inspector/List";
 
 function List(props) {
-  return <InspectorList searchType="all" {...props} />;
+  return <InspectorList verifyPermissionKey="inspection-jg-check-verify-edit" searchType="all" {...props} />;
 }
 
 export default List;
diff --git a/src/pages/Container/Supervision/Inspection/Records/List/index.js b/src/pages/Container/Supervision/Inspection/Records/List/index.js
index 89d3999..df95023 100644
--- a/src/pages/Container/Supervision/Inspection/Records/List/index.js
+++ b/src/pages/Container/Supervision/Inspection/Records/List/index.js
@@ -1,7 +1,7 @@
 import RecordsList from "~/pages/Container/BranchCompany/Inspection/Records/List";
 
 function List(props) {
-  return <RecordsList searchType="all" {...props} />;
+  return <RecordsList searchType="all" deletePermissionKey="inspection-jg-list-del" exportPermissionKey="inspection-jg-list-dc" {...props} />;
 }
 
 export default List;
diff --git a/src/pages/Container/Supervision/Plan/Execute/List/index.js b/src/pages/Container/Supervision/Plan/Execute/List/index.js
index cb21afe..b9fd316 100644
--- a/src/pages/Container/Supervision/Plan/Execute/List/index.js
+++ b/src/pages/Container/Supervision/Plan/Execute/List/index.js
@@ -1,7 +1,7 @@
 import ExecuteList from "~/pages/Container/BranchCompany/Plan/Execute/List";
 
 function List(props) {
-  return <ExecuteList {...props} />;
+  return <ExecuteList addPermissionKey="inspection-jg-plan-execute-add" {...props} />;
 }
 
 export default List;
diff --git a/src/pages/Container/Supervision/Plan/Management/List/index.js b/src/pages/Container/Supervision/Plan/Management/List/index.js
index 903b49a..7fb2f7b 100644
--- a/src/pages/Container/Supervision/Plan/Management/List/index.js
+++ b/src/pages/Container/Supervision/Plan/Management/List/index.js
@@ -1,7 +1,7 @@
 import ManagementList from "~/pages/Container/BranchCompany/Plan/Management/List";
 
 function List(props) {
-  return <ManagementList supervision="1" {...props} />;
+  return <ManagementList supervision="1" addPermissionKey="inspection-jg-plan-list-add" updatePermissionKey="inspection-jg-plan-list-edit" deletePermissionKey="inspection-jg-plan-list-del" {...props} />;
 }
 
 export default List;