企业端一级口门

router.md

@@ -62,29 +62,39 @@
 
 ### 企业端
 #### 一级口门管理
-- 门禁审批人管理
+- 门禁审批人管理 ##
   `/primeport/container/enterprise/firstLevelDoor/approverUser`
-- 进港审批管理/人员审批管理/相关方人员进港审批
+- 进港审批管理/人员审批管理/相关方人员进港审批 ##
   `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/personnelApproval/relatedPersonnel`
-- 进港审批管理/长期车辆审批管理/车辆审批
+- 进港审批管理/人员审批管理/相关方人员进港审批记录 ##
+  `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/personnelApproval/relatedPersonnelRecords`
+- 进港审批管理/长期车辆审批管理/车辆审批 ##
   `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/longTermVehicleApproval/shareVehicles`
-- 进港审批管理/长期车辆审批管理/相关方车辆审批
+- 进港审批管理/长期车辆审批管理/车辆审批记录 ##
+  `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/longTermVehicleApproval/shareVehiclesRecords`
+- 进港审批管理/长期车辆审批管理/相关方车辆审批 ##
   `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/longTermVehicleApproval/relatedVehicles`
-- 进港审批管理/临时访客管理/临时人员管理
+- 进港审批管理/长期车辆审批管理/相关方车辆审批记录 ##
+  `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/longTermVehicleApproval/relatedVehiclesRecords`
+- 进港审批管理/临时访客管理/临时人员管理 ##
   `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryPersonnel/list`
-- 进港审批管理/临时访客管理/临时车辆管理
+- 进港审批管理/临时访客管理/临时人员管理记录 ##
+  `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryPersonnelRecords/list`
+- 进港审批管理/临时访客管理/临时车辆管理 ##
   `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicle/list`
-- 进出港信息管理/人员及车辆管理
+- 进港审批管理/临时访客管理/临时车辆管理记录 ##
+  `/primeport/container/enterprise/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicleRecords/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`
 
 #### 封闭区域管理

src/api/stockPersonnelAndVehicles/index.js

@@ -2,7 +2,7 @@ import { declareRequest } from "@cqsjjb/jjb-dva-runtime";
 
 export const stockPersonnelAndVehiclesList = declareRequest(
   "stockPersonnelAndVehiclesLoading",
-  `Post > @/primeport/personApply/personnelVehicleManagementList`,
+  `Get > /primeport/personApply/personnelVehicleManagementList`,
 );
 export const stockPersonnelAndVehiclesPersonnelRecordsList = declareRequest(
   "stockPersonnelAndVehiclesLoading",

src/pages/Container/Enterprise/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/Add/index.js

@@ -1,7 +1,7 @@
 import AddPage from "~/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/Add";
 
 function Add(props) {
-  return (<AddPage {...props} />);
+  return (<AddPage vehicleBelongType={3} {...props} />);
 }
 
 export default Add;

src/pages/Container/Enterprise/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/List/index.js

@@ -1,7 +1,7 @@
 import ListPage from "~/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/List";
 
 function List(props) {
-  return (<ListPage {...props} />);
+  return (<ListPage vehicleBelongType={3} {...props} />);
 }
 
 export default List;

src/pages/Container/Enterprise/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/View/index.js

@@ -1,7 +1,7 @@
 import ViewPage from "~/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/View";
 
 function View(props) {
-  return (<ViewPage {...props} />);
+  return (<ViewPage vehicleBelongType={3} {...props} />);
 }
 
 export default View;

src/pages/Container/Enterprise/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/List/index.js

@@ -1,7 +1,7 @@
 import ListPage from "~/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/List";
 
 function List(props) {
-  return (<ListPage {...props} />);
+  return (<ListPage personBelongType={2} {...props} />);
 }
 
 export default List;

src/pages/Container/Enterprise/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/VehicleManagement/Add/index.js

@@ -1,7 +1,7 @@
 import AddPage from "~/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/VehicleManagement/Add";
 
 function Add(props) {
-  return (<AddPage {...props} />);
+  return (<AddPage vehicleBelongType={3} {...props} />);
 }
 
 export default Add;

src/pages/Container/Enterprise/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/VehicleManagement/List/index.js

@@ -1,7 +1,7 @@
 import ListPage from "~/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/VehicleManagement/List";
 
 function List(props) {
-  return (<ListPage {...props} />);
+  return (<ListPage vehicleBelongType={3} {...props} />);
 }
 
 export default List;

src/pages/Container/Enterprise/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/VehicleManagement/View/index.js

@@ -1,7 +1,7 @@
 import ViewPage from "~/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/VehicleManagement/View";
 
 function View(props) {
-  return (<ViewPage {...props} />);
+  return (<ViewPage vehicleBelongType={3} {...props} />);
 }
 
 export default View;

src/pages/Container/Enterprise/FirstLevelDoor/ImportAndExportPortInfo/StockVehicles/Add/index.js

@@ -1,7 +1,7 @@
 import AddPage from "~/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockVehicles/Add";
 
 function Add(props) {
-  return (<AddPage {...props} />);
+  return (<AddPage vehicleBelongType={4} {...props} />);
 }
 
 export default Add;

src/pages/Container/Enterprise/FirstLevelDoor/ImportAndExportPortInfo/StockVehicles/List/index.js

@@ -1,7 +1,7 @@
 import ListPage from "~/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockVehicles/List";
 
 function List(props) {
-  return (<ListPage {...props} />);
+  return (<ListPage vehicleBelongType={4} {...props} />);
 }
 
 export default List;

src/pages/Container/Enterprise/FirstLevelDoor/ImportAndExportPortInfo/StockVehicles/View/index.js

@@ -1,7 +1,7 @@
 import ViewPage from "~/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockVehicles/View";
 
 function View(props) {
-  return (<ViewPage {...props} />);
+  return (<ViewPage vehicleBelongType={4} {...props} />);
 }
 
 export default View;

src/pages/Container/Enterprise/FirstLevelDoor/ImportAndExportPortInfo/VehiclesViolation/VehicleBlacklist/List/index.js

@@ -1,7 +1,7 @@
 import ListPage from "~/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/VehiclesViolation/VehicleBlacklist/List";
 
 function List(props) {
-  return (<ListPage platform="2" {...props} />);
+  return (<ListPage {...props} />);
 }
 
 export default List;

src/pages/Container/Enterprise/FirstLevelDoor/ImportAndExportPortInfo/VehiclesViolation/VehiclesViolation/List/index.js

@@ -1,7 +1,7 @@
 import ListPage from "~/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/VehiclesViolation/VehiclesViolation/List";
 
 function List(props) {
-  return (<ListPage platform="2" {...props} />);
+  return (<ListPage {...props} />);
 }
 
 export default List;

src/pages/Container/Enterprise/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehiclesRecords/index.js

@@ -0,0 +1,7 @@
+import RelatedVehiclesRecordsPage from "~/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehiclesRecords";
+
+function RelatedVehiclesRecords(props) {
+  return (<RelatedVehiclesRecordsPage {...props} />);
+}
+
+export default RelatedVehiclesRecords;

src/pages/Container/Enterprise/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/ShareVehicles/index.js

@@ -1,7 +1,7 @@
 import ShareVehiclesPage from "~/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/ShareVehicles";
 
 function ShareVehicles(props) {
-  return (<ShareVehiclesPage {...props} />);
+  return (<ShareVehiclesPage vehicleBelongTypeArr="3,4" {...props} />);
 }
 
 export default ShareVehicles;

src/pages/Container/Enterprise/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/ShareVehiclesRecords/index.js

@@ -0,0 +1,7 @@
+import ShareVehiclesRecordsPage from "~/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/ShareVehiclesRecords";
+
+function ShareVehiclesRecords(props) {
+  return (<ShareVehiclesRecordsPage vehicleBelongTypeArr="3,4" {...props} />);
+}
+
+export default ShareVehiclesRecords;

src/pages/Container/Enterprise/FirstLevelDoor/PortEntryApproval/PersonnelApproval/RelatedPersonnel/index.js

@@ -0,0 +1,7 @@
+import RelatedPersonnelPage from "~/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/PersonnelApproval/RelatedPersonnel";
+
+function RelatedPersonnel(props) {
+  return (<RelatedPersonnelPage {...props} />);
+}
+
+export default RelatedPersonnel;

src/pages/Container/Enterprise/FirstLevelDoor/PortEntryApproval/PersonnelApproval/RelatedPersonnelRecords/index.js

@@ -0,0 +1,7 @@
+import RelatedPersonnelRecordsPage from "~/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/PersonnelApproval/RelatedPersonnelRecords";
+
+function RelatedPersonnelRecords(props) {
+  return (<RelatedPersonnelRecordsPage {...props} />);
+}
+
+export default RelatedPersonnelRecords;

src/pages/Container/Enterprise/FirstLevelDoor/PortEntryApproval/PersonnelApproval/index.js

@@ -1,7 +1,5 @@
-import PersonnelApprovalPage from "~/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/PersonnelApproval/RelatedPersonnel";
-
 function PersonnelApproval(props) {
-  return (<PersonnelApprovalPage {...props} />);
+  return props.children;
 }
 
 export default PersonnelApproval;

src/pages/Container/Enterprise/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnelRecords/List/index.js

@@ -0,0 +1,7 @@
+import ListPage from "~/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnelRecords/List";
+
+function List(props) {
+  return (<ListPage {...props} />);
+}
+
+export default List;

src/pages/Container/Enterprise/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnelRecords/View/index.js

@@ -0,0 +1,7 @@
+import ViewPage from "~/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnelRecords/View";
+
+function View(props) {
+  return (<ViewPage {...props} />);
+}
+
+export default View;

src/pages/Container/Enterprise/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnelRecords/index.js

@@ -0,0 +1,5 @@
+function TemporaryPersonnelRecords(props) {
+  return props.children;
+}
+
+export default TemporaryPersonnelRecords;

src/pages/Container/Enterprise/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicle/View/index.js

@@ -1,7 +1,7 @@
 import ViewPage from "~/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicle/View";
 
-function List(props) {
+function View(props) {
   return (<ViewPage {...props} />);
 }
 
-export default List;
+export default View;

src/pages/Container/Enterprise/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicleRecords/List/index.js

@@ -0,0 +1,7 @@
+import ListPage from "~/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicleRecords/List";
+
+function List(props) {
+  return (<ListPage {...props} />);
+}
+
+export default List;

src/pages/Container/Enterprise/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicleRecords/View/index.js

@@ -0,0 +1,7 @@
+import ViewPage from "~/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicleRecords/View";
+
+function View(props) {
+  return (<ViewPage {...props} />);
+}
+
+export default View;

src/pages/Container/Enterprise/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicleRecords/index.js

@@ -0,0 +1,5 @@
+function TemporaryVehicleRecords(props) {
+  return props.children;
+}
+
+export default TemporaryVehicleRecords;

src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/Add/index.js

@@ -112,7 +112,7 @@ function Add(props) {
         { name: "vehicleCorpName", label: "车辆所属企业名称", onlyForLabel: true },
       ];
     }
-    else if (props.vehicleBelongType === 2) {
+    else if (props.vehicleBelongType === 2 || props.vehicleBelongType === 4) {
       return [
         {
           name: "vehicleBelongType",
@@ -127,7 +127,7 @@ function Add(props) {
         { name: "vehicleCorpName", label: "车辆所属企业名称", onlyForLabel: true },
       ];
     }
-    else if (props.vehicleBelongType === 1) {
+    else if (props.vehicleBelongType === 1 || props.vehicleBelongType === 3) {
       return [
         {
           name: "vehicleBelongType",

src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/List/index.js

@@ -15,7 +15,7 @@ const VEHICLE_APPROVAL_STATUS_ENUM = [
 
 function List(props) {
   const { tableProps, getData } = useTable(props["vehicleApplyList"], {
-    params: { vehicleBelongType: 1 },
+    params: { vehicleBelongType: props.vehicleBelongType || 1 },
   });
 
   const onDelete = (id) => {

src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/View/index.js

@@ -38,13 +38,13 @@ function View(props) {
     if (!props.vehicleBelongType) {
       return [{ label: "车辆所属人", children: info.employeeVehicleUserName, span: 24 }];
     }
-    else if (props.vehicleBelongType === 2) {
+    else if (props.vehicleBelongType === 2 || props.vehicleBelongType === 4) {
       return [
         { label: "车辆所属类型", children: getLabelName({ list: VEHICLE_TYPE_ENUM, status: info.vehicleBelongType }) },
         { label: "车辆所属部门", children: info.vehicleDepartmentName },
       ];
     }
-    else if (props.vehicleBelongType === 1) {
+    else if (props.vehicleBelongType === 1 || props.vehicleBelongType === 3) {
       return [
         { label: "车辆所属类型", children: getLabelName({ list: VEHICLE_TYPE_ENUM, status: info.vehicleBelongType }) },
         { label: "车辆所属部门", children: info.vehicleDepartmentName },

src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StakeholderPersonnelAndVehicles/Personnel/List/index.js

@@ -18,7 +18,7 @@ function List(props) {
   const [form] = Search.useForm();
   const { tableProps, getData } = useTable(props["stockPersonnelAndVehiclesList"], {
     form,
-    params: { corpId: query.query, personBelongType: 3 },
+    params: { corpId: query.query },
   });
 
   const onUpdateStatus = (record) => {

src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/List/index.js

@@ -141,6 +141,7 @@ function List(props) {
               setCurrentInfo("");
             }}
             info={currentInfo}
+            personBelongType={props.personBelongType}
             getData={getData}
           />
         )
@@ -165,7 +166,7 @@ const AuthorizationModalVisibleComponent = (props) => {
       userFaceUrl,
       userPhone,
       userCard,
-      personBelongType: 1,
+      personBelongType: props.personBelongType || 1,
       gateLevelAuthArea: JSON.stringify({ area: values.area }),
     });
     if (success) {

src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/VehicleManagement/List/index.js

@@ -22,7 +22,7 @@ function List(props) {
   const query = useGetUrlQuery();
   const { tableProps, getData } = useTable(props["vehicleApplyList"], {
     form,
-    params: { employeeVehicleUserId: query.id, vehicleBelongType: 1 },
+    params: { employeeVehicleUserId: query.id, vehicleBelongType: props.vehicleBelongType || 1 },
   });
 
   const onDelete = (record) => {

src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockVehicles/List/index.js

@@ -39,7 +39,7 @@ function List(props) {
 
   const { tableProps, getData } = useTable(props["vehicleApplyList"], {
     form,
-    params: () => ({ departmentId: urlState.departmentId, vehicleBelongType: 2, corpId: query.id }),
+    params: () => ({ departmentId: urlState.departmentId, vehicleBelongType: props.vehicleBelongType || 2, corpId: query.id }),
     manual: true,
   });
 

src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/ShareVehicles/index.js

@@ -25,7 +25,7 @@ function ShareVehicles(props) {
   const [form] = Search.useForm();
   const { tableProps, getData } = useTable(props["vehicleAuditList"], {
     form,
-    params: { vehicleBelongTypeArr: "1,2", processOrRecord: !props.isRecords ? 1 : 2 },
+    params: { vehicleBelongTypeArr: props.vehicleBelongTypeArr || "1,2", processOrRecord: !props.isRecords ? 1 : 2 },
   });
 
   return (