diff --git a/package.json b/package.json index 89ecba0..449138e 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.2.32" + "zy-react-library": "^1.3.14" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/pages/Container/Supervision/PerformanceEvaluation/List/index.js b/src/pages/Container/Supervision/PerformanceEvaluation/List/index.js index 05b8b31..5dd27dc 100644 --- a/src/pages/Container/Supervision/PerformanceEvaluation/List/index.js +++ b/src/pages/Container/Supervision/PerformanceEvaluation/List/index.js @@ -1,3 +1,4 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button } from "antd"; import Page from "zy-react-library/components/Page"; @@ -7,7 +8,6 @@ import useTable from "zy-react-library/hooks/useTable"; import { getLabelName } from "zy-react-library/utils"; import { EVALUATION_TYPE_ENUM } from "~/enumerate/constant"; import { NS_PERFORMANCE_EVALUATION } from "~/enumerate/namespace"; -import {Permission} from "@cqsjjb/jjb-common-decorator/permission"; function List(props) { const [form] = Search.useForm(); diff --git a/src/pages/Container/Supervision/PersonnelEvaluation/UserExchangeList/index.js b/src/pages/Container/Supervision/PersonnelEvaluation/UserExchangeList/index.js index 9c5a0b6..9dee22f 100644 --- a/src/pages/Container/Supervision/PersonnelEvaluation/UserExchangeList/index.js +++ b/src/pages/Container/Supervision/PersonnelEvaluation/UserExchangeList/index.js @@ -154,7 +154,7 @@ function UserExchangeList(props) { fixed: "right", render: (_, record) => ( - {(props.entrance === "enterprise" || props.permission("qyd-rykpgl-exchange-info")) && ( + {(!props.entrance || props.permission("qyd-rykpgl-exchange-info")) && ( )} - {(props.entrance === "enterprise" || props.permission("qyd-rykpgl-eval-record")) && ( + {(!props.entrance || props.permission("qyd-rykpgl-eval-record")) && (