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) { > 查看 - + {props.permission(props.acceptPermissionKey || "inspection-qy-check-accept-edit") && ( + + )} ), }, @@ -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) { > 查看 - + {props.permission("inspection-qy-check-assign-edit") && ( + + )} ), }, @@ -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) { > 查看 - + {props.permission(props.defensePermissionKey || "inspection-qy-check-plead-edit") && ( + + )} - + {props.permission("inspection-qy-check-confirm-edit") && ( + + )} ), }, @@ -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) { ( - {query.edit !== "0" && ( + {props.permission(props.addPermissionKey || "inspection-qy-check-add") && query.edit !== "0" && ( - + {props.permission(props.verifyPermissionKey || "inspection-qy-check-verify-edit") && ( + + )} ), }, @@ -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={() => ( - {query.entrance !== "statistics" && ( + {(props.permission(props.exportPermissionKey || "inspection-qy-list-dc") && query.entrance !== "statistics") && ( - {query.entrance !== "statistics" && ( + {(props.permission(props.deletePermissionKey || "inspection-qy-list-del") && query.entrance !== "statistics") && (
( <> - {query.entrance !== "statistics" && ( + {(props.permission(props.addPermissionKey || "inspection-qy-plan-list-add") && query.entrance !== "statistics") && ( { - (isBeforeStart && query.entrance !== "statistics") && ( + (props.permission(props.updatePermissionKey || "inspection-qy-plan-list-edit") && isBeforeStart && query.entrance !== "statistics") && (