From 8ee9ee55a7a88da7512d8753cdb983de01668dca Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Mon, 16 Mar 2026 15:55:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=BA=BA=E5=91=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=81=E4=B8=B4=E6=97=B6=E8=BD=A6=E8=BE=86=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- router.md | 222 +++++++--- src/api/temporaryPersonnel/index.js | 8 +- src/api/temporaryVehicle/index.js | 14 +- .../PersonalVehicle/Add/index.js | 2 +- .../VehiclesViolation/List/index.js | 2 +- .../RelatedVehicles/index.js | 98 ++--- .../RelatedVehiclesRecords/index.js | 7 + .../ShareVehicles/index.js | 404 ++++++++++-------- .../ShareVehiclesRecords/index.js | 7 + .../RelatedPersonnel/index.js | 20 +- .../RelatedPersonnelRecords/index.js | 7 + .../TemporaryPersonnel/Add/index.js | 96 ++++- .../TemporaryPersonnel/List/index.js | 193 +++++---- .../TemporaryPersonnel/View/index.js | 35 +- .../TemporaryPersonnelRecords/List/index.js | 6 + .../TemporaryPersonnelRecords/View/index.js | 6 + .../TemporaryPersonnelRecords/index.js | 5 + .../TemporaryVehicle/Add/index.js | 113 +++-- .../TemporaryVehicle/List/index.js | 230 +++++----- .../TemporaryVehicle/View/index.js | 52 ++- .../TemporaryVehicleRecords/List/index.js | 6 + .../TemporaryVehicleRecords/View/index.js | 6 + .../TemporaryVehicleRecords/index.js | 5 + 24 files changed, 950 insertions(+), 596 deletions(-) create mode 100644 src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehiclesRecords/index.js create mode 100644 src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/ShareVehiclesRecords/index.js create mode 100644 src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/PersonnelApproval/RelatedPersonnelRecords/index.js create mode 100644 src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnelRecords/List/index.js create mode 100644 src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnelRecords/View/index.js create mode 100644 src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnelRecords/index.js create mode 100644 src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicleRecords/List/index.js create mode 100644 src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicleRecords/View/index.js create mode 100644 src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicleRecords/index.js diff --git a/package.json b/package.json index 7c9e2a4..9cf651c 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-signature-canvas": "^1.1.0-alpha.2", - "zy-react-library": "^1.2.5" + "zy-react-library": "^1.2.6" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/router.md b/router.md index a422d70..2085e7d 100644 --- a/router.md +++ b/router.md @@ -1,89 +1,169 @@ ### 监管端 #### 一级口门管理 -- `/primeport/container/supervision/firstLevelDoor/approverUser` 门禁审批人管理 -- `/primeport/container/supervision/firstLevelDoor/basicInfo/firstLevelDoorInfo/list` 基本信息管理/一级口门信息管理 -- `/primeport/container/supervision/firstLevelDoor/portEntryApproval/personnelApproval/relatedPersonnel` 进港审批管理/人员审批管理/相关方人员进港审批 -- `/primeport/container/supervision/firstLevelDoor/portEntryApproval/longTermVehicleApproval/shareVehicles` 进港审批管理/长期车辆审批管理/股份车辆审批 -- `/primeport/container/supervision/firstLevelDoor/portEntryApproval/longTermVehicleApproval/relatedVehicles` 进港审批管理/长期车辆审批管理/相关方车辆审批 -- `/primeport/container/supervision/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryPersonnel/list` 进港审批管理/临时访客管理/临时人员管理 -- `/primeport/container/supervision/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicle/list` 进港审批管理/临时访客管理/临时车辆管理 -- `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/stockPersonnelAndVehicles/list` 进出港信息管理/股份人员及车辆管理 -- `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/personalVehicle/list` 进出港信息管理/个人车辆管理 -- `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/stockVehicles/list` 进出港信息管理/股份单位车辆管理 -- `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/branchPersonnelAndVehicles/list` 进出港信息管理/分公司人员及车辆管理 -- `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/stakeholderPersonnelAndVehicles/list` 进出港信息管理/相关方人员及车辆管理 -- `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/portBasedUnitsPersonnelAndVehicles/list` 进出港信息管理/驻港单位人员及车辆管理 -- `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/inspectDepartmentVehicles/list` 进出港信息管理/检查部门车辆管理 -- `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/vehiclesViolation/vehiclesViolation/list` 进出港信息管理/车辆违规管理/车辆违规管理 -- `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/vehiclesViolation/vehicleBlacklist/list` 进出港信息管理/车辆违规管理/车辆黑名单管理 +- 门禁审批人管理 # + `/primeport/container/supervision/firstLevelDoor/approverUser` +- 基本信息管理/一级口门信息管理 # + `/primeport/container/supervision/firstLevelDoor/basicInfo/firstLevelDoorInfo/list` +- 进港审批管理/人员审批管理/相关方人员进港审批 # + `/primeport/container/supervision/firstLevelDoor/portEntryApproval/personnelApproval/relatedPersonnel` +- 进港审批管理/人员审批管理/相关方人员进港审批记录 + `/primeport/container/supervision/firstLevelDoor/portEntryApproval/personnelApproval/relatedPersonnelRecords` +- 进港审批管理/长期车辆审批管理/股份车辆审批 # + `/primeport/container/supervision/firstLevelDoor/portEntryApproval/longTermVehicleApproval/shareVehicles` +- 进港审批管理/长期车辆审批管理/股份车辆审批记录 # + `/primeport/container/supervision/firstLevelDoor/portEntryApproval/longTermVehicleApproval/shareVehiclesRecords` +- 进港审批管理/长期车辆审批管理/相关方车辆审批 # + `/primeport/container/supervision/firstLevelDoor/portEntryApproval/longTermVehicleApproval/relatedVehicles` +- 进港审批管理/长期车辆审批管理/相关方车辆审批记录 # + `/primeport/container/supervision/firstLevelDoor/portEntryApproval/longTermVehicleApproval/relatedVehiclesRecords` +- 进港审批管理/临时访客管理/临时人员管理 # + `/primeport/container/supervision/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryPersonnel/list` +- 进港审批管理/临时访客管理/临时人员管理记录 # + `/primeport/container/supervision/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryPersonnelRecords/list` +- 进港审批管理/临时访客管理/临时车辆管理 # + `/primeport/container/supervision/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicle/list` +- 进港审批管理/临时访客管理/临时车辆管理记录 # + `/primeport/container/supervision/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicleRecords/list` +- 进出港信息管理/股份人员及车辆管理 + `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/stockPersonnelAndVehicles/list` +- 进出港信息管理/个人车辆管理 # + `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/personalVehicle/list` +- 进出港信息管理/股份单位车辆管理 # + `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/stockVehicles/list` +- 进出港信息管理/分公司人员及车辆管理 + `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/branchPersonnelAndVehicles/list` +- 进出港信息管理/相关方人员及车辆管理 + `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/stakeholderPersonnelAndVehicles/list` +- 进出港信息管理/驻港单位人员及车辆管理 + `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/portBasedUnitsPersonnelAndVehicles/list` +- 进出港信息管理/检查部门车辆管理 + `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/inspectDepartmentVehicles/list` +- 进出港信息管理/车辆违规管理/车辆违规管理 # + `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/vehiclesViolation/vehiclesViolation/list` +- 进出港信息管理/车辆违规管理/车辆黑名单管理 # + `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/vehiclesViolation/vehicleBlacklist/list` #### 封闭区域管理 -- `/primeport/container/supervision/enclosedArea/areaAndEntrance/enclosedArea/list` 封闭区域管理/封闭区域管理 -- `/primeport/container/supervision/enclosedArea/areaAndEntrance/enclosedAreaDoor/list` 封闭区域管理/封闭区域口门管理 -- `/primeport/container/supervision/enclosedArea/apply/personnel/list` 封闭区域申请/人员封闭区域申请 -- `/primeport/container/supervision/enclosedArea/apply/vehicle/list` 封闭区域申请/车辆封闭区域申请 -- `/primeport/container/supervision/enclosedArea/apply/personnelRecords/list` 封闭区域申请/人员封闭区域申请记录 -- `/primeport/container/supervision/enclosedArea/apply/vehicleRecords/list` 封闭区域申请/车辆封闭区域申请记录 -- `/primeport/container/supervision/enclosedArea/personnelAndVehicleStatistics/list` 区域人员及车辆统计 +- 封闭区域管理/封闭区域管理 + `/primeport/container/supervision/enclosedArea/areaAndEntrance/enclosedArea/list` +- 封闭区域管理/封闭区域口门管理 + `/primeport/container/supervision/enclosedArea/areaAndEntrance/enclosedAreaDoor/list` +- 封闭区域申请/人员封闭区域申请 + `/primeport/container/supervision/enclosedArea/apply/personnel/list` +- 封闭区域申请/车辆封闭区域申请 + `/primeport/container/supervision/enclosedArea/apply/vehicle/list` +- 封闭区域申请/人员封闭区域申请记录 + `/primeport/container/supervision/enclosedArea/apply/personnelRecords/list` +- 封闭区域申请/车辆封闭区域申请记录 + `/primeport/container/supervision/enclosedArea/apply/vehicleRecords/list` +- 区域人员及车辆统计 + `/primeport/container/supervision/enclosedArea/personnelAndVehicleStatistics/list` ### 企业端 #### 一级口门管理 -- `/primeport/container/enterprise/firstLevelDoor/approverUser` 门禁审批人管理 -- `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/personnelApproval/relatedPersonnel` 进港审批管理/人员审批管理/相关方人员进港审批 -- `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/longTermVehicleApproval/shareVehicles` 进港审批管理/长期车辆审批管理/车辆审批 -- `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/longTermVehicleApproval/relatedVehicles` 进港审批管理/长期车辆审批管理/相关方车辆审批 -- `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryPersonnel/list` 进港审批管理/临时访客管理/临时人员管理 -- `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicle/list` 进港审批管理/临时访客管理/临时车辆管理 -- `/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/stockPersonnelAndVehicles/list` 进出港信息管理/人员及车辆管理 -- `/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/personalVehicle/list` 进出港信息管理/个人车辆管理 -- `/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/stockVehicles/list` 进出港信息管理/单位车辆管理 -- `/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/stakeholderPersonnelAndVehicles/list` 进出港信息管理/相关方人员及车辆管理 -- `/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/vehiclesViolation/vehiclesViolation/list` 进出港信息管理/车辆违规管理/车辆违规管理 -- `/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/vehiclesViolation/vehicleBlacklist/list` 进出港信息管理/车辆违规管理/车辆黑名单管理 +- 门禁审批人管理 + `/primeport/container/enterprise/firstLevelDoor/approverUser` +- 进港审批管理/人员审批管理/相关方人员进港审批 + `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/personnelApproval/relatedPersonnel` +- 进港审批管理/长期车辆审批管理/车辆审批 + `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/longTermVehicleApproval/shareVehicles` +- 进港审批管理/长期车辆审批管理/相关方车辆审批 + `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/longTermVehicleApproval/relatedVehicles` +- 进港审批管理/临时访客管理/临时人员管理 + `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryPersonnel/list` +- 进港审批管理/临时访客管理/临时车辆管理 + `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicle/list` +- 进出港信息管理/人员及车辆管理 + `/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/stockPersonnelAndVehicles/list` +- 进出港信息管理/个人车辆管理 + `/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/personalVehicle/list` +- 进出港信息管理/单位车辆管理 + `/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/stockVehicles/list` +- 进出港信息管理/相关方人员及车辆管理 + `/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/stakeholderPersonnelAndVehicles/list` +- 进出港信息管理/车辆违规管理/车辆违规管理 + `/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/vehiclesViolation/vehiclesViolation/list` +- 进出港信息管理/车辆违规管理/车辆黑名单管理 + `/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/vehiclesViolation/vehicleBlacklist/list` #### 封闭区域管理 -- `/primeport/container/enterprise/enclosedArea/areaAndEntrance/enclosedArea/list` 封闭区域管理/封闭区域管理 -- `/primeport/container/enterprise/enclosedArea/areaAndEntrance/enclosedAreaDoor/list` 封闭区域管理/封闭区域口门管理 -- `/primeport/container/enterprise/enclosedArea/apply/personnel/list` 封闭区域申请/人员封闭区域申请 -- `/primeport/container/enterprise/enclosedArea/apply/vehicle/list` 封闭区域申请/车辆封闭区域申请 -- `/primeport/container/enterprise/enclosedArea/apply/personnelRecords/list` 封闭区域申请/人员封闭区域申请记录 -- `/primeport/container/enterprise/enclosedArea/apply/vehicleRecords/list` 封闭区域申请/车辆封闭区域申请记录 -- `/primeport/container/enterprise/enclosedArea/personnelAndVehicleStatistics/list` 区域人员及车辆统计 -- `/primeport/container/enterprise/enclosedArea/enterprisePersonnelPermissions/list` 企业人员权限 -- `/primeport/container/enterprise/enclosedArea/personnelReview/longTermPersonnelReview/list` 人员审核/长期人员审核 -- `/primeport/container/enterprise/enclosedArea/personnelReview/temporaryPersonnelReview/list` 人员审核/临时人员审核 -- `/primeport/container/enterprise/enclosedArea/personnelReview/longTermPersonnelReviewRecords/list` 人员审核/长期人员审核记录 -- `/primeport/container/enterprise/enclosedArea/personnelReview/temporaryPersonnelReviewRecords/list` 人员审核/临时访客人员记录 -- `/primeport/container/enterprise/enclosedArea/vehicleReview/longTermVehicleReview/list` 车辆审核/长期车辆审核 -- `/primeport/container/enterprise/enclosedArea/vehicleReview/temporaryVehicleReview/list` 车辆审核/临时车辆审核 -- `/primeport/container/enterprise/enclosedArea/vehicleReview/longTermVehicleReviewRecords/list` 车辆审核/长期车辆审核记录 -- `/primeport/container/enterprise/enclosedArea/vehicleReview/temporaryVehicleReviewRecords/list` 车辆审核/临时车辆审核记录 +- 封闭区域管理/封闭区域管理 + `/primeport/container/enterprise/enclosedArea/areaAndEntrance/enclosedArea/list` +- 封闭区域管理/封闭区域口门管理 + `/primeport/container/enterprise/enclosedArea/areaAndEntrance/enclosedAreaDoor/list` +- 封闭区域申请/人员封闭区域申请 + `/primeport/container/enterprise/enclosedArea/apply/personnel/list` +- 封闭区域申请/车辆封闭区域申请 + `/primeport/container/enterprise/enclosedArea/apply/vehicle/list` +- 封闭区域申请/人员封闭区域申请记录 + `/primeport/container/enterprise/enclosedArea/apply/personnelRecords/list` +- 封闭区域申请/车辆封闭区域申请记录 + `/primeport/container/enterprise/enclosedArea/apply/vehicleRecords/list` +- 区域人员及车辆统计 + `/primeport/container/enterprise/enclosedArea/personnelAndVehicleStatistics/list` +- 企业人员权限 + `/primeport/container/enterprise/enclosedArea/enterprisePersonnelPermissions/list` +- 人员审核/长期人员审核 + `/primeport/container/enterprise/enclosedArea/personnelReview/longTermPersonnelReview/list` +- 人员审核/临时人员审核 + `/primeport/container/enterprise/enclosedArea/personnelReview/temporaryPersonnelReview/list` +- 人员审核/长期人员审核记录 + `/primeport/container/enterprise/enclosedArea/personnelReview/longTermPersonnelReviewRecords/list` +- 人员审核/临时访客人员记录 + `/primeport/container/enterprise/enclosedArea/personnelReview/temporaryPersonnelReviewRecords/list` +- 车辆审核/长期车辆审核 + `/primeport/container/enterprise/enclosedArea/vehicleReview/longTermVehicleReview/list` +- 车辆审核/临时车辆审核 + `/primeport/container/enterprise/enclosedArea/vehicleReview/temporaryVehicleReview/list` +- 车辆审核/长期车辆审核记录 + `/primeport/container/enterprise/enclosedArea/vehicleReview/longTermVehicleReviewRecords/list` +- 车辆审核/临时车辆审核记录 + `/primeport/container/enterprise/enclosedArea/vehicleReview/temporaryVehicleReviewRecords/list` ### 相关方端 #### 一级口门管理 -- `/primeport/container/stakeholder/firstLevelDoor/approverUser` 门禁审批人管理 -- `/primeport/container/stakeholder/firstLevelDoor/portEntryApproval/longTermVehicleApproval/shareVehicles` 进港审批管理/长期车辆审批管理/车辆审批 -- `/primeport/container/stakeholder/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryPersonnel/list` 进港审批管理/临时访客管理/临时人员管理 -- `/primeport/container/stakeholder/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicle/list` 进港审批管理/临时访客管理/临时车辆管理 -- `/primeport/container/stakeholder/firstLevelDoor/importAndExportPortInfo/stockPersonnelAndVehicles/list` 进出港信息管理/人员及车辆管理 -- `/primeport/container/stakeholder/firstLevelDoor/importAndExportPortInfo/personalVehicle/list` 进出港信息管理/个人车辆管理 -- `/primeport/container/stakeholder/firstLevelDoor/importAndExportPortInfo/vehiclesViolation/vehiclesViolation/list` 进出港信息管理/车辆违规管理/车辆违规管理 -- `/primeport/container/stakeholder/firstLevelDoor/importAndExportPortInfo/vehiclesViolation/vehicleBlacklist/list` 进出港信息管理/车辆违规管理/车辆黑名单管理 -- `/primeport/container/stakeholder/firstLevelDoor/personnelPermissionRecords/list` 人员权限记录 -- `/primeport/container/stakeholder/firstLevelDoor/personnelApplication/list` 人员申请 -- `/primeport/container/stakeholder/firstLevelDoor/vehicleApplication/list` 车辆申请 -- `/primeport/container/stakeholder/firstLevelDoor/personnelApplicationRecords/list` 人员申请记录 -- `/primeport/container/stakeholder/firstLevelDoor/vehicleApplicationRecords/list` 车辆申请记录 +- 门禁审批人管理 + `/primeport/container/stakeholder/firstLevelDoor/approverUser` +- 进港审批管理/长期车辆审批管理/车辆审批 + `/primeport/container/stakeholder/firstLevelDoor/portEntryApproval/longTermVehicleApproval/shareVehicles` +- 进港审批管理/临时访客管理/临时人员管理 + `/primeport/container/stakeholder/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryPersonnel/list` +- 进港审批管理/临时访客管理/临时车辆管理 + `/primeport/container/stakeholder/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicle/list` +- 进出港信息管理/人员及车辆管理 + `/primeport/container/stakeholder/firstLevelDoor/importAndExportPortInfo/stockPersonnelAndVehicles/list` +- 进出港信息管理/个人车辆管理 + `/primeport/container/stakeholder/firstLevelDoor/importAndExportPortInfo/personalVehicle/list` +- 进出港信息管理/车辆违规管理/车辆违规管理 + `/primeport/container/stakeholder/firstLevelDoor/importAndExportPortInfo/vehiclesViolation/vehiclesViolation/list` +- 进出港信息管理/车辆违规管理/车辆黑名单管理 + `/primeport/container/stakeholder/firstLevelDoor/importAndExportPortInfo/vehiclesViolation/vehicleBlacklist/list` +- 人员权限记录 + `/primeport/container/stakeholder/firstLevelDoor/personnelPermissionRecords/list` +- 人员申请 + `/primeport/container/stakeholder/firstLevelDoor/personnelApplication/list` +- 车辆申请 + `/primeport/container/stakeholder/firstLevelDoor/vehicleApplication/list` +- 人员申请记录 + `/primeport/container/stakeholder/firstLevelDoor/personnelApplicationRecords/list` +- 车辆申请记录 + `/primeport/container/stakeholder/firstLevelDoor/vehicleApplicationRecords/list` #### 封闭区域管理 -- `/primeport/container/stakeholder/enclosedArea/apply/personnel/list` 封闭区域申请/人员封闭区域申请 -- `/primeport/container/stakeholder/enclosedArea/apply/vehicle/list` 封闭区域申请/车辆封闭区域申请 -- `/primeport/container/stakeholder/enclosedArea/apply/personnelRecords/list` 封闭区域申请/人员封闭区域申请记录 -- `/primeport/container/stakeholder/enclosedArea/apply/vehicleRecords/list` 封闭区域申请/车辆封闭区域申请记录 +- 封闭区域申请/人员封闭区域申请 + `/primeport/container/stakeholder/enclosedArea/apply/personnel/list` +- 封闭区域申请/车辆封闭区域申请 + `/primeport/container/stakeholder/enclosedArea/apply/vehicle/list` +- 封闭区域申请/人员封闭区域申请记录 + `/primeport/container/stakeholder/enclosedArea/apply/personnelRecords/list` +- 封闭区域申请/车辆封闭区域申请记录 + `/primeport/container/stakeholder/enclosedArea/apply/vehicleRecords/list` -### H5端 -- `/primeport/container/mobile/firstLevelDoor/personnelApplication/apply` 人员申请/申请 -- `/primeport/container/mobile/firstLevelDoor/personnelApplication/applyList` 人员申请/申请记录 +### H5 端 +- 人员申请/申请 + `/primeport/container/mobile/firstLevelDoor/personnelApplication/apply` +- 人员申请/申请记录 + `/primeport/container/mobile/firstLevelDoor/personnelApplication/applyList` diff --git a/src/api/temporaryPersonnel/index.js b/src/api/temporaryPersonnel/index.js index d868c82..20e9b5a 100644 --- a/src/api/temporaryPersonnel/index.js +++ b/src/api/temporaryPersonnel/index.js @@ -2,19 +2,19 @@ import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; export const temporaryPersonnelList = declareRequest( "temporaryPersonnelLoading", - `Post > @/primeport/`, + `Post > @/primeport/personApply/xgfPersonAuditList`, ); export const temporaryPersonnelAdd = declareRequest( "temporaryPersonnelLoading", - `Post > @/primeport/`, + `Post > @/primeport/vehicleApply/saveTemporaryVisitors`, ); export const temporaryPersonnelInfo = declareRequest( "temporaryPersonnelLoading", - `Post > @/primeport/`, + `Post > @/primeport/personApply/xgfPersonApplyInfoById`, ); export const temporaryPersonnelReview = declareRequest( "temporaryPersonnelLoading", - `Post > @/primeport/`, + `Post > @/primeport/personApply/xgfPersonAudit`, ); export const temporaryPersonnelReviewList = declareRequest( "temporaryPersonnelLoading", diff --git a/src/api/temporaryVehicle/index.js b/src/api/temporaryVehicle/index.js index 8998072..9e71e3c 100644 --- a/src/api/temporaryVehicle/index.js +++ b/src/api/temporaryVehicle/index.js @@ -1,20 +1,8 @@ import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; -export const temporaryVehicleList = declareRequest( - "temporaryVehicleLoading", - `Post > @/primeport/`, -); export const temporaryVehicleAdd = declareRequest( "temporaryVehicleLoading", - `Post > @/primeport/`, -); -export const temporaryVehicleInfo = declareRequest( - "temporaryVehicleLoading", - `Post > @/primeport/`, -); -export const temporaryVehicleReview = declareRequest( - "temporaryVehicleLoading", - `Post > @/primeport/`, + `Post > @/primeport/vehicleApply/saveTemporaryVisitors`, ); export const temporaryVehicleReviewList = declareRequest( "temporaryVehicleLoading", diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/Add/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/Add/index.js index a45cf54..51fb0f4 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/Add/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/Add/index.js @@ -223,7 +223,7 @@ function Add(props) { label: "审批人", render: FORM_ITEM_RENDER_ENUM.SELECT, items: approvalUserListAll, - itemsField: { labelKey: "userName", valueKey: "userId" }, + itemsField: { labelKey: item => `${item.userName}（${item.corpName}）（${item.deptName}）`, valueKey: "userId" }, span: 24, componentProps: { onChange: (value) => { 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 3578a0b..de4ae18 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 @@ -126,7 +126,7 @@ const AddModalComponent = (props) => { const { id: illegalImagesId } = await uploadFile({ single: false, files: values.illegalImages, - params: { foreignKey: "", type: UPLOAD_FILE_TYPE_ENUM[607] }, + params: { type: UPLOAD_FILE_TYPE_ENUM[607] }, }); const { success } = await props["vehiclesViolationAdd"]({ ...values, illegalImagesId }); if (success) { 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 783e5e5..8c97e0a 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehicles/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehicles/index.js @@ -1,5 +1,5 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button, Descriptions, Divider, message, Modal, Space } from "antd"; +import { Button, Descriptions, Divider, message, Modal, Space, Spin } from "antd"; import { useEffect, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import Page from "zy-react-library/components/Page"; @@ -19,11 +19,12 @@ function RelatedVehicles(props) { const [reviewModalVisible, setReviewModalVisible] = useState(false); const [infoModalVisible, setInfoModalVisible] = useState(false); const [viewRejectReasonModalVisible, setViewRejectReasonModalVisible] = useState(false); + const [remarks, setRemarks] = useState(""); const [form] = Search.useForm(); const { tableProps, getData } = useTable(props["vehicleAuditList"], { form, - params: { vehicleBelongTypeArr: "5" }, + params: { vehicleBelongTypeArr: "5", processOrRecord: !props.isRecords ? 1 : 2 }, }); return ( @@ -62,15 +63,17 @@ function RelatedVehicles(props) { width: 150, render: (_, record) => ( - + {(!props.isRecords && record.currentUserCanAudit === 1) && ( + + )} + + {(!props.isRecords && record.currentUserCanAudit === 1) && ( + + )} + + ), }, ]} @@ -89,13 +103,95 @@ function ShareVehicles(props) { /> ) } + { + infoModalVisible && ( + { + setInfoModalVisible(false); + }} + width={600} + footer={[ + , + ]} + loading={props.vehicleAudit.vehicleAuditLoading} + > + + + ) + } ); } function ReviewModalComponent(props) { const [form] = FormBuilder.useForm(); - const { loading: getFileLoading, getFile } = useGetFile(); + + const onSubmit = async (values) => { + const { success } = await props["vehicleAuditApproval"]({ + ...values, + id: props.id, + }); + if (success) { + message.success("操作成功"); + props.onCancel(); + props.getData(); + } + }; + + return ( + + + + !(formValues.auditStatus === "3"), + }, + ]} + /> + + + ); +} + +function InfoModalComponent(props) { + const { getFile } = useGetFile(); const [changeAfter, setChangeAfter] = useState({}); const [changeBefore, setChangeBefore] = useState({}); @@ -139,57 +235,36 @@ function ReviewModalComponent(props) { getRecordsList(); }, []); - const onSubmit = async (values) => { - const { success } = await props["vehicleAuditApproval"]({ - ...values, - id: props.id, - }); - if (success) { - message.success("操作成功"); - props.onCancel(); - props.getData(); - } - }; - return ( - - - 申请信息 - { - batchState === 1 - ? ( - item.value)?.join("、") }, - { label: "访问开始时间", children: changeAfter.visitStartTime }, - { label: "访问结束时间", children: changeAfter.visitEndTime }, - { label: "行驶证照片", children: () }, - { label: "车辆照片", children: () }, - { label: "审批人", children: changeAfter.auditUserName }, - ]} - /> - ) - : ( -
- - - + +
+ + + + + + + + + + + + + + + + + + + {changeBefore.vehicleBelongType === 1 && ( - - - + + + - - - - - - - - - - - - - {changeBefore.vehicleBelongType === 1 && ( - - - - - - )} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
名称变更前变更后
车辆所属类型{getLabelName({ list: VEHICLE_TYPE_ENUM, status: changeBefore.vehicleBelongType })}{getLabelName({ list: VEHICLE_TYPE_ENUM, status: changeAfter.vehicleBelongType })}
车辆所属部门{changeBefore.vehicleDepartmentName}{changeAfter.vehicleDepartmentName}
名称变更前变更后车辆归属人{changeBefore.employeeVehicleUserName}{changeAfter.employeeVehicleUserName}
车辆所属类型{getLabelName({ list: VEHICLE_TYPE_ENUM, status: changeBefore.vehicleBelongType })}{getLabelName({ list: VEHICLE_TYPE_ENUM, status: changeAfter.vehicleBelongType })}
车辆所属部门{changeBefore.vehicleDepartmentName}{changeAfter.vehicleDepartmentName}
车辆归属人{changeBefore.employeeVehicleUserName}{changeAfter.employeeVehicleUserName}
车牌号{changeBefore.licenceNo}{changeAfter.licenceNo}
车牌类型{changeBefore.licenceTypeName}{changeAfter.licenceTypeName}
车辆类型{changeBefore.vehicleTypeName}{changeAfter.vehicleTypeName}
访问港区范围{JSON.parse(changeBefore.gateLevelAuthArea)?.area?.map(item => item.value)?.join("、")}{JSON.parse(changeAfter.gateLevelAuthArea)?.area?.map(item => item.value)?.join("、")}
访问开始时间{changeBefore.visitStartTime}{changeAfter.visitStartTime}
访问结束时间{changeBefore.visitEndTime}{changeAfter.visitEndTime}
行驶证照片
车辆照片
审批人{changeBefore.auditUserName}{changeAfter.auditUserName}
-
- ) - } - 审批信息 - {recordsList.map((record, index) => ( - - ))} - !(formValues.auditStatus === "3"), - }, + )} + + 车牌号 + {changeBefore.licenceNo} + {changeAfter.licenceNo} + + + 车牌类型 + {changeBefore.licenceTypeName} + {changeAfter.licenceTypeName} + + + 车辆类型 + {changeBefore.vehicleTypeName} + {changeAfter.vehicleTypeName} + + + 访问港区范围 + {JSON.parse(changeBefore.gateLevelAuthArea)?.area?.map(item => item.value)?.join("、")} + {JSON.parse(changeAfter.gateLevelAuthArea)?.area?.map(item => item.value)?.join("、")} + + + 访问开始时间 + {changeBefore.visitStartTime} + {changeAfter.visitStartTime} + + + 访问结束时间 + {changeBefore.visitEndTime} + {changeAfter.visitEndTime} + + + 行驶证照片 + + + + + 车辆照片 + + + + + 审批人 + {changeBefore.auditUserName} + {changeAfter.auditUserName} + + + + + ) + } + 审批信息 + {recordsList.map((record, index) => ( + - - + ))} + ); } const ReviewModal = Connect([NS_VEHICLE_AUDIT], true)(ReviewModalComponent); +const InfoModal = Connect([NS_VEHICLE_AUDIT], true)(InfoModalComponent); export default Connect([NS_VEHICLE_AUDIT], true)(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 new file mode 100644 index 0000000..a9f24aa --- /dev/null +++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/ShareVehiclesRecords/index.js @@ -0,0 +1,7 @@ +import ShareVehiclesPage from "../ShareVehicles"; + +function ShareVehiclesRecords(props) { + 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 d2cf7af..5a72350 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/PersonnelApproval/RelatedPersonnel/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/PersonnelApproval/RelatedPersonnel/index.js @@ -45,15 +45,17 @@ function RelatedPersonnel(props) { width: 150, render: (_, record) => ( - + {!props.isRecords && ( + + )}