diff --git a/src/api/relatedPersonnel/index.js b/src/api/relatedPersonnel/index.js deleted file mode 100644 index 249ab49..0000000 --- a/src/api/relatedPersonnel/index.js +++ /dev/null @@ -1,10 +0,0 @@ -import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; - -export const relatedPersonnelPersonnelList = declareRequest( - "relatedPersonnelLoading", - `Post > @/primeport/`, -); -export const relatedPersonnelApproval = declareRequest( - "relatedPersonnelLoading", - `Post > @/primeport/`, -); diff --git a/src/enumerate/namespace/index.js b/src/enumerate/namespace/index.js index c9798c9..cb717be 100644 --- a/src/enumerate/namespace/index.js +++ b/src/enumerate/namespace/index.js @@ -7,7 +7,6 @@ import { defineNamespace } from "@cqsjjb/jjb-dva-runtime"; export const NS_GLOBAL = defineNamespace("global"); export const NS_APPROVER_USER = defineNamespace("approverUser"); export const NS_FIRST_LEVEL_DOOR_INFO = defineNamespace("firstLevelDoorInfo"); -export const NS_RELATED_PERSONNEL = defineNamespace("relatedPersonnel"); export const NS_VEHICLE_AUDIT = defineNamespace("vehicleAudit"); export const NS_TEMPORARY_PERSONNEL = defineNamespace("temporaryPersonnel"); export const NS_TEMPORARY_VEHICLE = defineNamespace("temporaryVehicle"); diff --git a/src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/List/index.js b/src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/List/index.js index f083bec..071b88d 100644 --- a/src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/List/index.js +++ b/src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/List/index.js @@ -90,7 +90,7 @@ function List(props) { type="link" onClick={() => { setViewModalVisible(true); - setCurrentId(record.id); + setCurrentId(record.vehicleApplyId); }} > 查看 @@ -168,7 +168,7 @@ const ViewModalComponent = (props) => { const { loading: getFileLoading, getFile } = useGetFile(); const getData = async () => { - const { data } = await props["vehicleApplyInfo"]({ id: props.id }); + const { data } = await props["vehicleApplyInfo"]({ vehicleApplyId: props.id }); const drivingLicenseFile = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[601], eqForeignKey: data.drivingLicenseId, diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/List/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/List/index.js index b59e85a..0735c47 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/List/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/List/index.js @@ -1,5 +1,6 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button } from "antd"; +import { Button, Space } from "antd"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; @@ -35,15 +36,19 @@ function List(props) { /> ( - + + {props.permission("jgd-enclosed-personnel-apply-add") && ( + + )} + )} columns={[ { title: "姓名", dataIndex: "applyPersonUserName" }, @@ -71,14 +76,18 @@ function List(props) { width: 80, fixed: "right", render: (_, record) => ( - + + {props.permission("jgd-enclosed-personnel-apply-show") && ( + + )} + ), }, ]} @@ -88,4 +97,4 @@ function List(props) { ); } -export default Connect([NS_ENCLOSED_AREA_PERSONNEL_APPLY], true)(List); +export default Connect([NS_ENCLOSED_AREA_PERSONNEL_APPLY], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/PersonnelRecords/List/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/PersonnelRecords/List/index.js index ebb4eca..f52d00b 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/PersonnelRecords/List/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/PersonnelRecords/List/index.js @@ -1,3 +1,4 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Modal, Space } from "antd"; import { useState } from "react"; @@ -65,15 +66,17 @@ function List(props) { fixed: "right", render: (_, record) => ( - - {record.auditFlag === 3 && ( + {props.permission("jgd-enclosed-personnel-records-show") && ( + + )} + {(record.auditFlag === 3 && props.permission("jgd-enclosed-personnel-records-bh")) && (
( - + + {props.permission("jgd-enclosed-vehicle-apply-add") && ( + + )} + )} columns={[ { title: "车辆类型", dataIndex: "vehicleTypeName" }, @@ -81,14 +86,18 @@ function List(props) { width: 80, fixed: "right", render: (_, record) => ( - + + {props.permission("jgd-enclosed-vehicle-apply-show") && ( + + )} + ), }, ]} @@ -100,4 +109,4 @@ function List(props) { ); } -export default Connect([NS_ENCLOSED_AREA_VEHICLE_APPLY], true)(List); +export default Connect([NS_ENCLOSED_AREA_VEHICLE_APPLY], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/VehicleRecords/List/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/VehicleRecords/List/index.js index 67d708e..ac943c8 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/VehicleRecords/List/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/VehicleRecords/List/index.js @@ -1,3 +1,4 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Modal, Space } from "antd"; import { useState } from "react"; @@ -72,23 +73,27 @@ function List(props) { fixed: "right", render: (_, record) => ( - - + {props.permission("jgd-enclosed-vehicle-records-show") && ( + + )} + {props.permission("jgd-enclosed-vehicle-records-bh") && ( + + )} ), }, @@ -136,4 +141,4 @@ const ViewRejectReasonModal = (props) => { ); }; -export default Connect([NS_ENCLOSED_AREA_VEHICLE_APPLY], true)(List); +export default Connect([NS_ENCLOSED_AREA_VEHICLE_APPLY], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/EnclosedArea/AreaAndEntrance/EnclosedArea/List/index.js b/src/pages/Container/Supervision/EnclosedArea/AreaAndEntrance/EnclosedArea/List/index.js index 04cc1e2..4f4a444 100644 --- a/src/pages/Container/Supervision/EnclosedArea/AreaAndEntrance/EnclosedArea/List/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/AreaAndEntrance/EnclosedArea/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"; @@ -21,14 +22,16 @@ function List(props) { fixed: "right", render: (_, record) => ( - + {props.permission("jgd-feng-bi-qu-yu-guan-li-show") && ( + + )} ), }, @@ -39,4 +42,4 @@ function List(props) { ); } -export default Connect([NS_ENCLOSED_AREA], true)(List); +export default Connect([NS_ENCLOSED_AREA], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/EnclosedArea/AreaAndEntrance/EnclosedAreaDoor/List/index.js b/src/pages/Container/Supervision/EnclosedArea/AreaAndEntrance/EnclosedAreaDoor/List/index.js index 610a113..5456f53 100644 --- a/src/pages/Container/Supervision/EnclosedArea/AreaAndEntrance/EnclosedAreaDoor/List/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/AreaAndEntrance/EnclosedAreaDoor/List/index.js @@ -1,3 +1,4 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, message, Modal, Space } from "antd"; import { useEffect, useState } from "react"; @@ -65,7 +66,7 @@ function List(props) {
( - {props.entrance !== "enterprise" && ( + {(props.entrance !== "enterprise" && props.permission("jgd-enclosed-door-add")) && ( - {props.entrance !== "enterprise" && ( + {props.permission("jgd-enclosed-door-show") && ( + + )} + {(props.entrance !== "enterprise" && props.permission("jgd-enclosed-door-edit")) && ( )} - {props.entrance !== "enterprise" && ( + {(props.entrance !== "enterprise" && props.permission("jgd-enclosed-door-updstate")) && ( )} - - + {props.permission("jgd-enclosed-door-add-td") && ( + + )} + {props.permission("jgd-enclosed-door-add-vedio") && ( + + )} ), }, @@ -393,4 +400,4 @@ const ViewModalComponent = (props) => { const AddModal = Connect([NS_FIRST_LEVEL_DOOR_INFO, NS_ENCLOSED_AREA], true)(AddModalComponent); const ViewModal = Connect([NS_FIRST_LEVEL_DOOR_INFO], true)(ViewModalComponent); -export default Connect([NS_FIRST_LEVEL_DOOR_INFO], true)(List); +export default Connect([NS_FIRST_LEVEL_DOOR_INFO], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/List/index.js b/src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/List/index.js index 0f3ae81..2485880 100644 --- a/src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/List/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/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, Space } from "antd"; import { useEffect } from "react"; @@ -86,22 +87,26 @@ function List(props) { fixed: "right", render: (_, record) => ( - - + {props.permission("jgd-enclosed-area-stats-add-carinout") && ( + + )} + {props.permission("jgd-enclosed-area-stats-add-personinout") && ( + + )} ), }, @@ -112,4 +117,4 @@ function List(props) { ); } -export default Connect([NS_ENCLOSED_PERSONNEL_AND_VEHICLE_STATISTICS], true)(List); +export default Connect([NS_ENCLOSED_PERSONNEL_AND_VEHICLE_STATISTICS], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ApproverUser/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ApproverUser/index.js index ddbbba8..20195f1 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ApproverUser/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ApproverUser/index.js @@ -1,3 +1,4 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, message, Modal, Space } from "antd"; import { useEffect, useState } from "react"; @@ -47,13 +48,15 @@ function ApproverUser(props) {
( - + {props.permission("jgd-first-level-approver-add") && ( + + )} )} columns={[ @@ -79,22 +82,26 @@ function ApproverUser(props) { width: 120, render: (_, record) => ( - - + {props.permission("jgd-first-level-approver-edit") && ( + + )} + {props.permission("jgd-first-level-approver-del") && ( + + )} ), }, @@ -237,4 +244,4 @@ function AddModalComponent(props) { } const AddModal = Connect([NS_APPROVER_USER], true)(AddModalComponent); -export default Connect([NS_APPROVER_USER], true)(ApproverUser); +export default Connect([NS_APPROVER_USER], true)(Permission(ApproverUser)); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/List/index.js index 64e2b5f..a033c18 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/List/index.js @@ -1,3 +1,4 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, message, Modal, Space } from "antd"; import { useEffect, useState } from "react"; @@ -60,7 +61,15 @@ function List(props) {
( - + {props.permission("jgd-first-level-door-info-add") && ( + + )} )} columns={[ @@ -84,49 +93,59 @@ function List(props) { width: 300, render: (_, record) => ( - - - - - + {props.permission("jgd-first-level-door-info-show") && ( + + )} + {props.permission("jgd-first-level-door-info-edit") && ( + + )} + {props.permission("jgd-first-level-door-info-del") && ( + + )} + {props.permission("jgd-first-level-door-info-add-channel") && ( + + )} + {props.permission("jgd-first-level-door-info-add-camera") && ( + + )} ), }, @@ -312,4 +331,4 @@ function InfoModalComponent(props) { const AddModal = Connect([NS_FIRST_LEVEL_DOOR_INFO], true)(AddModalComponent); const InfoModal = Connect([NS_FIRST_LEVEL_DOOR_INFO], true)(InfoModalComponent); -export default Connect([NS_FIRST_LEVEL_DOOR_INFO], true)(List); +export default Connect([NS_FIRST_LEVEL_DOOR_INFO], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/List/index.js index 506ceef..1922947 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/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"; @@ -35,22 +36,26 @@ function List(props) { width: 200, render: (_, record) => ( - - + {props.permission("jgd-io-branch-pv-personinfo") && ( + + )} + {props.permission("jgd-io-branch-pv-pubinfo") && ( + + )} ), }, @@ -61,4 +66,4 @@ function List(props) { ); } -export default Connect([NS_BRANCH_PERSONNEL_AND_VEHICLES], true)(List); +export default Connect([NS_BRANCH_PERSONNEL_AND_VEHICLES], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/InspectDepartmentVehicles/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/InspectDepartmentVehicles/List/index.js index a767411..eda84a6 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/InspectDepartmentVehicles/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/InspectDepartmentVehicles/List/index.js @@ -1,3 +1,4 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Divider, message, Modal, Space } from "antd"; import { useState } from "react"; @@ -50,15 +51,17 @@ function List(props) {
( - + {props.permission("jgd-io-inspect-vehicle-add") && ( + + )} )} columns={[ @@ -72,41 +75,49 @@ function List(props) { fixed: "right", render: (_, record) => ( - - - - + {props.permission("jgd-io-inspect-vehicle-show") && ( + + )} + {props.permission("jgd-io-inspect-vehicle-edit") && ( + + )} + {props.permission("jgd-io-inspect-vehicle-del") && ( + + )} + {props.permission("jgd-io-inspect-vehicle-inout") && ( + + )} ), }, @@ -288,4 +299,4 @@ const ViewModalComponent = (props) => { const AddModal = Connect([NS_VEHICLE_APPLY], true)(AddModalComponent); const ViewModal = Connect([NS_VEHICLE_APPLY], true)(ViewModalComponent); -export default Connect([NS_VEHICLE_APPLY], true)(List); +export default Connect([NS_VEHICLE_APPLY], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/List/index.js index f50e29f..4c36c63 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/List/index.js @@ -1,3 +1,4 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, message, Modal, Space } from "antd"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; @@ -37,15 +38,17 @@ function List(props) {
( - + {props.permission("jgd-io-personal-vehicle-add") && ( + + )} )} columns={[ @@ -75,32 +78,38 @@ function List(props) { width: 350, render: (_, record) => ( - - - - {record.auditFlag === 3 && ( + props.history.push(`./vehicleRecords?id=${record.id}`); + }} + > + 车辆进出记录 + + )} + {props.permission("jgd-io-personal-vehicle-auditrecord") && ( + + )} + {props.permission("jgd-io-personal-vehicle-show") && ( + + )} + {(record.auditFlag === 3 && props.permission("jgd-io-personal-vehicle-reapply")) && ( )} - + {props.permission("jgd-io-personal-vehicle-del") && ( + + )} ), }, @@ -129,4 +140,4 @@ function List(props) { ); } -export default Connect([NS_VEHICLE_APPLY], true)(List); +export default Connect([NS_VEHICLE_APPLY], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PortBasedUnitsPersonnelAndVehicles/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PortBasedUnitsPersonnelAndVehicles/List/index.js index a476e0d..8387dce 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PortBasedUnitsPersonnelAndVehicles/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PortBasedUnitsPersonnelAndVehicles/List/index.js @@ -1,5 +1,6 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button } from "antd"; +import { Button, Space } from "antd"; import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; @@ -32,14 +33,18 @@ function List(props) { width: 150, fixed: "right", render: (_, record) => ( - + + {props.permission("jgd-io-port-unit-pv-show") && ( + + )} + ), }, ]} @@ -49,4 +54,4 @@ function List(props) { ); } -export default Connect([NS_BRANCH_PERSONNEL_AND_VEHICLES], true)(List); +export default Connect([NS_BRANCH_PERSONNEL_AND_VEHICLES], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StakeholderPersonnelAndVehicles/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StakeholderPersonnelAndVehicles/List/index.js index fad7bb1..978f7e1 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StakeholderPersonnelAndVehicles/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StakeholderPersonnelAndVehicles/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"; @@ -33,22 +34,26 @@ function List(props) { fixed: "right", render: (_, record) => ( - - + {props.permission("jgd-io-stk-pv-personlist") && ( + + )} + {props.permission("jgd-io-stk-pv-carlist") && ( + + )} ), }, @@ -59,4 +64,4 @@ function List(props) { ); } -export default Connect([NS_STAKEHOLDER_PERSONNEL_AND_VEHICLES], true)(List); +export default Connect([NS_STAKEHOLDER_PERSONNEL_AND_VEHICLES], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/List/index.js index a86c610..36afb39 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/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, useState } from "react"; @@ -99,32 +100,38 @@ function List(props) { fixed: "right", render: (_, record) => ( - - + )} + {props.permission("jgd-io-stock-pv-show") && ( + - + props.history.push(`./personnelRecords?id=${record.userId}`); + }} + > + 人员进出记录 + + )} + {props.permission("jgd-io-stock-pv-add") && ( + + )} ), }, @@ -227,4 +234,4 @@ const AuthorizationModalVisibleComponent = (props) => { const AuthorizationModalVisible = Connect([NS_STOCK_PERSONNEL_AND_VEHICLES], true)(AuthorizationModalVisibleComponent); -export default Connect([NS_STOCK_PERSONNEL_AND_VEHICLES], true)(List); +export default Connect([NS_STOCK_PERSONNEL_AND_VEHICLES], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockVehicles/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockVehicles/List/index.js index c6faa21..8ed9d01 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockVehicles/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockVehicles/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, Space } from "antd"; import { useEffect } from "react"; @@ -90,7 +91,7 @@ function List(props) {
( - {props.type !== "view" && ( + {(props.type !== "view" && props.permission("jgd-io-stock-unit-vehicle-add")) && ( )} - - {(props.type !== "view" && record.auditFlag === 3) && ( + props.history.push(`./vehicleRecords?id=${record.id}`); + }} + > + 车辆进出记录 + + )} + {(props.type !== "view" && record.auditFlag === 3 && props.permission("jgd-io-stock-unit-vehicle-edit")) && ( )} - + {props.permission("jgd-io-stock-unit-vehicle-show") && ( + + )} ), }, @@ -194,4 +199,4 @@ function List(props) { ); } -export default Connect([NS_VEHICLE_APPLY], true)(List); +export default Connect([NS_VEHICLE_APPLY], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/VehiclesViolation/VehicleBlacklist/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/VehiclesViolation/VehicleBlacklist/List/index.js index 34980d1..8387e81 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/VehiclesViolation/VehicleBlacklist/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/VehiclesViolation/VehicleBlacklist/List/index.js @@ -1,3 +1,4 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, message, Modal, Space } from "antd"; import { useEffect, useState } from "react"; @@ -58,15 +59,19 @@ function List(props) { />
( - + + {props.permission("jgd-io-blacklist-add") && ( + + )} + )} columns={[ { title: "车辆所属单位", dataIndex: "vehicleCorpName" }, @@ -81,24 +86,28 @@ function List(props) { fixed: "right", render: (_, record) => ( - - + {props.permission("jgd-io-blacklist-show") && ( + + )} + {props.permission("jgd-io-blacklist-del") && ( + + )} ), }, @@ -247,4 +256,4 @@ const ViewModalComponent = (props) => { const AddModal = Connect([NS_VEHICLE_BLACKLIST], true)(AddModalComponent); const ViewModal = Connect([NS_VEHICLE_BLACKLIST], true)(ViewModalComponent); -export default Connect([NS_VEHICLE_BLACKLIST], true)(List); +export default Connect([NS_VEHICLE_BLACKLIST], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/VehiclesViolation/VehiclesViolation/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/VehiclesViolation/VehiclesViolation/List/index.js index 6211901..b41894f 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/VehiclesViolation/VehiclesViolation/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/VehiclesViolation/VehiclesViolation/List/index.js @@ -1,5 +1,6 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button, message, Modal } from "antd"; +import { Button, message, Modal, Space } from "antd"; import { useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; @@ -43,15 +44,19 @@ function List(props) { />
( - + + {props.permission("jgd-che-liang-wei-gui-guan-li-add") && ( + + )} + )} columns={[ { title: "车辆所属单位", dataIndex: "vehicleCorpName" }, @@ -66,14 +71,18 @@ function List(props) { width: 120, fixed: "right", render: (_, record) => ( - + + {props.permission("jgd-che-liang-wei-gui-guan-li-show") && ( + + )} + ), }, ]} @@ -180,4 +189,4 @@ const AddModalComponent = (props) => { const AddModal = Connect([NS_VEHICLES_VIOLATION], true)(AddModalComponent); -export default Connect([NS_VEHICLES_VIOLATION], true)(List); +export default Connect([NS_VEHICLES_VIOLATION], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehicles/index.js b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehicles/index.js index 0add463..f7a791a 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehicles/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehicles/index.js @@ -1,3 +1,4 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Divider, message, Modal, Space, Spin } from "antd"; import { useEffect, useState } from "react"; @@ -16,6 +17,7 @@ import { NS_VEHICLE_AUDIT } from "~/enumerate/namespace"; function RelatedVehicles(props) { const [currentId, setCurrentId] = useState(""); + const [currentVehicleApplyId, setCurrentVehicleApplyId] = useState(""); const [reviewModalVisible, setReviewModalVisible] = useState(false); const [infoModalVisible, setInfoModalVisible] = useState(false); const [viewRejectReasonModalVisible, setViewRejectReasonModalVisible] = useState(false); @@ -63,27 +65,31 @@ function RelatedVehicles(props) { width: 150, render: (_, record) => ( - {(!props.isRecords && record.currentUserCanAudit === 1) && ( + {(!props.isRecords && record.currentUserCanAudit === 1 && props.permission("jgd-entry-stk-vehicle-approval-audit")) && ( )} - - {record.auditStatus === 3 && ( + {props.permission(props.viewBtn || "jgd-entry-stk-vehicle-approval-show") && ( + + )} + {(record.auditStatus === 3 && props.permission(props.viewReasonsRefusalBtn || "jgd-entry-stk-vehicle-approval-show-reasons-refusal")) && ( , ]} > - + ); } const ReviewModal = Connect([NS_VEHICLE_AUDIT], true)(ReviewModalComponent); const PublicInfoModal = Connect([NS_VEHICLE_AUDIT], true)(InfoModalComponent); -export default Connect([NS_VEHICLE_AUDIT], true)(RelatedVehicles); +export default Connect([NS_VEHICLE_AUDIT], true)(Permission(RelatedVehicles)); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehiclesRecords/index.js b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehiclesRecords/index.js index 3facfc8..626f1ed 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehiclesRecords/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehiclesRecords/index.js @@ -1,7 +1,7 @@ import RelatedVehiclesPage from "../RelatedVehicles"; function RelatedVehiclesRecords(props) { - return (); + return (); } export default RelatedVehiclesRecords; diff --git a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/ShareVehicles/index.js b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/ShareVehicles/index.js index 62ce180..7438222 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/ShareVehicles/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/ShareVehicles/index.js @@ -1,3 +1,4 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Divider, message, Modal, Space, Spin } from "antd"; import { useEffect, useState } from "react"; @@ -67,7 +68,7 @@ function ShareVehicles(props) { width: 100, render: (_, record) => ( - {(!props.isRecords && record.currentUserCanAudit === 1) && ( + {(!props.isRecords && record.currentUserCanAudit === 1 && props.permission("jgd-entry-share-vehicle-approval-audit")) && ( )} - + {props.permission(props.viewBtn || "jgd-entry-share-vehicle-approval-show") && ( + + )} ), }, @@ -195,7 +198,7 @@ function InfoModalComponent(props) { const [recordsList, setRecordsList] = useState([]); const getData = async () => { - const { data } = await props["vehicleAuditInfo"]({ id: props.id }); + const { data } = await props["vehicleAuditInfo"]({ vehicleApplyId: props.vehicleApplyId }); const changeAfter = data.changeAfter ? JSON.parse(data.changeAfter) : {}; const changeBefore = data.changeBefore ? JSON.parse(data.changeBefore) : {}; const changeAfterDrivingLicenseFile = await getFile({ @@ -410,4 +413,4 @@ function InfoModal(props) { const ReviewModal = Connect([NS_VEHICLE_AUDIT], true)(ReviewModalComponent); const PublicInfoModal = Connect([NS_VEHICLE_AUDIT], true)(InfoModalComponent); -export default Connect([NS_VEHICLE_AUDIT], true)(ShareVehicles); +export default Connect([NS_VEHICLE_AUDIT], true)(Permission(ShareVehicles)); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/ShareVehiclesRecords/index.js b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/ShareVehiclesRecords/index.js index a9f24aa..83c15b8 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/ShareVehiclesRecords/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/ShareVehiclesRecords/index.js @@ -1,7 +1,7 @@ import ShareVehiclesPage from "../ShareVehicles"; function ShareVehiclesRecords(props) { - return (); + return (); } export default ShareVehiclesRecords; diff --git a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/PersonnelApproval/RelatedPersonnel/index.js b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/PersonnelApproval/RelatedPersonnel/index.js index 3f8be97..4374686 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/PersonnelApproval/RelatedPersonnel/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/PersonnelApproval/RelatedPersonnel/index.js @@ -1,3 +1,4 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Divider, message, Modal, Space } from "antd"; import { useEffect, useState } from "react"; @@ -11,7 +12,7 @@ import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import useGetFile from "zy-react-library/hooks/useGetFile"; import useTable from "zy-react-library/hooks/useTable"; import { getLabelName } from "zy-react-library/utils"; -import { NS_RELATED_PERSONNEL, NS_TEMPORARY_PERSONNEL } from "~/enumerate/namespace"; +import { NS_TEMPORARY_PERSONNEL } from "~/enumerate/namespace"; const STATUS_ENUM = [ { bianma: "1", name: "审核中" }, @@ -68,7 +69,7 @@ function RelatedPersonnel(props) { width: 150, render: (_, record) => ( - {(!props.isRecords && record.currentUserCanAudit === 1) && ( + {(!props.isRecords && record.currentUserCanAudit === 1 && props.permission("jgd-entry-stk-personnel-approval-audit")) && ( )} - - {record.auditFlag === 3 && ( + {props.permission(props.viewBtn || "jgd-entry-stk-personnel-approval-show") && ( + + )} + {(record.auditFlag === 3 && props.permission(props.viewReasonsRefusalBtn || "jgd-entry-stk-personnel-approval-show-reasons-refusal")) && (
( - {!props.isRecords && ( + {(!props.isRecords && props.permission("jgd-entry-temp-personnel-add")) && ( - - {(!props.isRecords && record.currentUserCanAudit === 1) && ( + {props.permission(props.viewBtn || "jgd-entry-temp-personnel-show") && ( + + )} + {props.permission(props.auditInfoBtn || "jgd-entry-temp-personnel-audit-info") && ( + + )} + {(!props.isRecords && record.currentUserCanAudit === 1 && props.permission("jgd-entry-temp-personnel-audit")) && (
( - {!props.isRecords && ( + {(!props.isRecords && props.permission("jgd-entry-temp-vehicle-add")) && ( - - {(!props.isRecords && record.currentUserCanAudit === 1) && ( + {props.permission(props.viewBtn || "jgd-entry-temp-vehicle-show") && ( + + )} + {props.permission(props.auditInfoBtn || "jgd-entry-temp-vehicle-audit-info") && ( + + )} + {(!props.isRecords && record.currentUserCanAudit === 1 && props.permission("jgd-entry-temp-vehicle-audit")) && (