From 1b7c1e5405bfb24c6f3161b489d58852bd82d014 Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Thu, 26 Mar 2026 17:30:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Apply/Personnel/List/index.js | 9 +++- .../Apply/PersonnelRecords/List/index.js | 9 +++- .../EnclosedArea/Apply/Vehicle/List/index.js | 9 +++- .../Apply/VehicleRecords/List/index.js | 9 +++- .../EnclosedArea/List/index.js | 7 ++- .../EnclosedAreaDoor/List/index.js | 13 +++++- .../List/index.js | 43 +++++++++++-------- .../List/index.js | 8 +++- .../LongTermPersonnelReview/List/index.js | 5 ++- .../List/index.js | 25 ++++++----- .../TemporaryPersonnelReview/List/index.js | 5 ++- .../List/index.js | 23 +++++----- .../LongTermVehicleReview/List/index.js | 5 ++- .../List/index.js | 25 ++++++----- .../TemporaryVehicleReview/List/index.js | 5 ++- .../List/index.js | 23 +++++----- .../FirstLevelDoor/ApproverUser/index.js | 9 +++- .../PersonalVehicle/List/index.js | 13 +++++- .../List/index.js | 8 +++- .../StockPersonnelAndVehicles/List/index.js | 10 ++++- .../StockVehicles/List/index.js | 12 +++++- .../VehicleBlacklist/List/index.js | 9 +++- .../VehiclesViolation/List/index.js | 8 +++- .../RelatedVehicles/index.js | 9 +++- .../RelatedVehiclesRecords/index.js | 8 +++- .../ShareVehicles/index.js | 9 +++- .../ShareVehiclesRecords/index.js | 8 +++- .../RelatedPersonnel/index.js | 9 +++- .../RelatedPersonnelRecords/index.js | 8 +++- .../TemporaryPersonnel/List/index.js | 10 ++++- .../TemporaryPersonnelRecords/List/index.js | 8 +++- .../TemporaryVehicle/List/index.js | 10 ++++- .../TemporaryVehicleRecords/List/index.js | 8 +++- .../Apply/Personnel/List/index.js | 4 +- .../Apply/PersonnelRecords/List/index.js | 4 +- .../EnclosedArea/Apply/Vehicle/List/index.js | 4 +- .../Apply/VehicleRecords/List/index.js | 4 +- .../EnclosedArea/List/index.js | 2 +- .../EnclosedAreaDoor/List/index.js | 12 +++--- .../List/index.js | 4 +- .../PersonalVehicle/List/index.js | 12 +++--- .../List/index.js | 4 +- .../StockPersonnelAndVehicles/List/index.js | 8 ++-- .../StockVehicles/List/index.js | 10 ++--- .../VehicleBlacklist/List/index.js | 27 ++++++------ .../VehiclesViolation/List/index.js | 4 +- .../RelatedVehicles/index.js | 2 +- .../RelatedVehiclesRecords/index.js | 9 +++- .../ShareVehicles/index.js | 2 +- .../ShareVehiclesRecords/index.js | 8 +++- .../RelatedPersonnelRecords/index.js | 9 +++- .../TemporaryPersonnel/List/index.js | 4 +- .../TemporaryPersonnelRecords/List/index.js | 9 +++- .../TemporaryVehicle/List/index.js | 4 +- .../TemporaryVehicleRecords/List/index.js | 9 +++- 55 files changed, 380 insertions(+), 154 deletions(-) diff --git a/src/pages/Container/Enterprise/EnclosedArea/Apply/Personnel/List/index.js b/src/pages/Container/Enterprise/EnclosedArea/Apply/Personnel/List/index.js index 5ba3114..6605063 100644 --- a/src/pages/Container/Enterprise/EnclosedArea/Apply/Personnel/List/index.js +++ b/src/pages/Container/Enterprise/EnclosedArea/Apply/Personnel/List/index.js @@ -1,7 +1,14 @@ import ListPage from "~/pages/Container/Supervision/EnclosedArea/Apply/Personnel/List"; function List(props) { - return (); + return ( + + ); } export default List; diff --git a/src/pages/Container/Enterprise/EnclosedArea/Apply/PersonnelRecords/List/index.js b/src/pages/Container/Enterprise/EnclosedArea/Apply/PersonnelRecords/List/index.js index 2936525..1ab9173 100644 --- a/src/pages/Container/Enterprise/EnclosedArea/Apply/PersonnelRecords/List/index.js +++ b/src/pages/Container/Enterprise/EnclosedArea/Apply/PersonnelRecords/List/index.js @@ -1,7 +1,14 @@ import ListPage from "~/pages/Container/Supervision/EnclosedArea/Apply/PersonnelRecords/List"; function List(props) { - return (); + return ( + + ); } export default List; diff --git a/src/pages/Container/Enterprise/EnclosedArea/Apply/Vehicle/List/index.js b/src/pages/Container/Enterprise/EnclosedArea/Apply/Vehicle/List/index.js index 399a5d8..a89f9be 100644 --- a/src/pages/Container/Enterprise/EnclosedArea/Apply/Vehicle/List/index.js +++ b/src/pages/Container/Enterprise/EnclosedArea/Apply/Vehicle/List/index.js @@ -1,7 +1,14 @@ import ListPage from "~/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/List"; function List(props) { - return (); + return ( + + ); } export default List; diff --git a/src/pages/Container/Enterprise/EnclosedArea/Apply/VehicleRecords/List/index.js b/src/pages/Container/Enterprise/EnclosedArea/Apply/VehicleRecords/List/index.js index 5271b08..670252f 100644 --- a/src/pages/Container/Enterprise/EnclosedArea/Apply/VehicleRecords/List/index.js +++ b/src/pages/Container/Enterprise/EnclosedArea/Apply/VehicleRecords/List/index.js @@ -1,7 +1,14 @@ import ListPage from "~/pages/Container/Supervision/EnclosedArea/Apply/VehicleRecords/List"; function List(props) { - return (); + return ( + + ); } export default List; diff --git a/src/pages/Container/Enterprise/EnclosedArea/AreaAndEntrance/EnclosedArea/List/index.js b/src/pages/Container/Enterprise/EnclosedArea/AreaAndEntrance/EnclosedArea/List/index.js index 85d1acd..30206b0 100644 --- a/src/pages/Container/Enterprise/EnclosedArea/AreaAndEntrance/EnclosedArea/List/index.js +++ b/src/pages/Container/Enterprise/EnclosedArea/AreaAndEntrance/EnclosedArea/List/index.js @@ -1,7 +1,12 @@ import ListPage from "~/pages/Container/Supervision/EnclosedArea/AreaAndEntrance/EnclosedArea/List"; function List(props) { - return (); + return ( + + ); } export default List; diff --git a/src/pages/Container/Enterprise/EnclosedArea/AreaAndEntrance/EnclosedAreaDoor/List/index.js b/src/pages/Container/Enterprise/EnclosedArea/AreaAndEntrance/EnclosedAreaDoor/List/index.js index cf9f933..7a3da02 100644 --- a/src/pages/Container/Enterprise/EnclosedArea/AreaAndEntrance/EnclosedAreaDoor/List/index.js +++ b/src/pages/Container/Enterprise/EnclosedArea/AreaAndEntrance/EnclosedAreaDoor/List/index.js @@ -1,7 +1,18 @@ import ListPage from "~/pages/Container/Supervision/EnclosedArea/AreaAndEntrance/EnclosedAreaDoor/List"; function List(props) { - return (); + return ( + + ); } export default List; diff --git a/src/pages/Container/Enterprise/EnclosedArea/EnterprisePersonnelPermissions/List/index.js b/src/pages/Container/Enterprise/EnclosedArea/EnterprisePersonnelPermissions/List/index.js index b611e3f..f0a18c1 100644 --- a/src/pages/Container/Enterprise/EnclosedArea/EnterprisePersonnelPermissions/List/index.js +++ b/src/pages/Container/Enterprise/EnclosedArea/EnterprisePersonnelPermissions/List/index.js @@ -1,4 +1,5 @@ import useUrlState from "@ahooksjs/use-url-state"; +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, message, Modal, Space } from "antd"; import { useEffect, useRef, useState } from "react"; @@ -47,7 +48,7 @@ function List(props) {
{ - const departmentId = event.at(-1).departmentId; + const departmentId = event.at(-1).id; setUrlState({ departmentId, backDepartmentIds: [...urlState.backDepartmentIds, urlState.departmentId], @@ -108,23 +109,27 @@ function List(props) { fixed: "right", render: (_, record) => ( - - + {props.permission("jgd-ent-permission-authorization-scope") && ( + + )} + {props.permission("jgd-ent-permission-personnel-records") && ( + + )} ), }, @@ -290,4 +295,4 @@ const AuthorizationScopeModalComponent = (props) => { const AuthorizationScopeModal = Connect([NS_ENCLOSED_ENTERPRISE_PERSONNEL_PERMISSIONS, NS_ENCLOSED_AREA], true)(AuthorizationScopeModalComponent); -export default Connect([NS_ENCLOSED_ENTERPRISE_PERSONNEL_PERMISSIONS], true)(List); +export default Connect([NS_ENCLOSED_ENTERPRISE_PERSONNEL_PERMISSIONS], true)(Permission(List)); diff --git a/src/pages/Container/Enterprise/EnclosedArea/PersonnelAndVehicleStatistics/List/index.js b/src/pages/Container/Enterprise/EnclosedArea/PersonnelAndVehicleStatistics/List/index.js index b07f95e..5eb0d4a 100644 --- a/src/pages/Container/Enterprise/EnclosedArea/PersonnelAndVehicleStatistics/List/index.js +++ b/src/pages/Container/Enterprise/EnclosedArea/PersonnelAndVehicleStatistics/List/index.js @@ -1,7 +1,13 @@ import ListPage from "~/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/List"; function List(props) { - return (); + return ( + + ); } export default List; diff --git a/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/LongTermPersonnelReview/List/index.js b/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/LongTermPersonnelReview/List/index.js index 00d5f1a..7313784 100644 --- a/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/LongTermPersonnelReview/List/index.js +++ b/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/LongTermPersonnelReview/List/index.js @@ -1,3 +1,4 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Space } from "antd"; import Page from "zy-react-library/components/Page"; @@ -58,7 +59,7 @@ function List(props) { fixed: "right", render: (_, record) => ( - {record.currentUserCanAudit === 1 && ( + {(record.currentUserCanAudit === 1 && props.permission("jgd-ent-long-personnel-review-review")) && ( - {record.auditFlag === 3 && ( + {props.permission("jgd-ent-long-personnel-records-show") && ( + + )} + {(record.auditFlag === 3 && props.permission("jgd-ent-long-personnel-records-refusal-reason")) && ( - {record.auditFlag === 3 && ( + {props.permission("jgd-ent-temp-visitor-records-show") && ( + + )} + {(record.auditFlag === 3 && props.permission("jgd-ent-temp-visitor-records-refusal-reason")) && ( - {record.auditFlag === 3 && ( + {props.permission("jgd-ent-long-vehicle-records-show") && ( + + )} + {(record.auditFlag === 3 && props.permission("jgd-ent-long-vehicle-records-refusal-reason")) && ( - {record.auditFlag === 3 && ( + {props.permission("jgd-ent-temp-vehicle-records-show") && ( + + )} + {(record.auditFlag === 3 && props.permission("jgd-ent-temp-vehicle-records-refusal-reason")) && (