From 589c4460bbe995b3a6f80cd6fab648dfa01aba53 Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Sat, 7 Feb 2026 10:14:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E9=97=AD=E5=8C=BA=E5=9F=9F=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=96=B9=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- router.md | 6 ++++ .../EnclosedArea/Apply/Personnel/Add/index.js | 7 +++++ .../Apply/Personnel/List/index.js | 7 +++++ .../Apply/Personnel/View/index.js | 7 +++++ .../EnclosedArea/Apply/Personnel/index.js | 5 ++++ .../Apply/PersonnelRecords/List/index.js | 7 +++++ .../Apply/PersonnelRecords/View/index.js | 7 +++++ .../Apply/PersonnelRecords/index.js | 5 ++++ .../EnclosedArea/Apply/Vehicle/Add/index.js | 7 +++++ .../EnclosedArea/Apply/Vehicle/List/index.js | 7 +++++ .../EnclosedArea/Apply/Vehicle/View/index.js | 7 +++++ .../EnclosedArea/Apply/Vehicle/index.js | 5 ++++ .../Apply/VehicleRecords/List/index.js | 7 +++++ .../Apply/VehicleRecords/View/index.js | 7 +++++ .../Apply/VehicleRecords/index.js | 5 ++++ .../Stakeholder/EnclosedArea/Apply/index.js | 5 ++++ .../Stakeholder/EnclosedArea/index.js | 5 ++++ .../EnclosedArea/Apply/Personnel/Add/index.js | 22 ++++++++++++-- .../Apply/Personnel/List/index.js | 1 + .../Apply/Personnel/View/index.js | 11 ++++++- .../List/index.js | 1 + .../View/index.js | 0 .../Apply/PersonnelRecords/index.js | 5 ++++ .../EnclosedArea/Apply/Vehicle/Add/index.js | 30 +++++++++++++++++-- .../EnclosedArea/Apply/Vehicle/List/index.js | 3 +- .../EnclosedArea/Apply/Vehicle/View/index.js | 25 +++++++++++----- .../Apply/VehicleRecords/List/index.js | 1 + .../Apply/VehicleRecords/View/index.js | 2 +- .../Apply/personnelRecords/index.js | 5 ---- .../List/index.js | 0 .../PersonnelEntryAndExitRecords/index.js | 0 .../VehicleEntryAndExitRecords/index.js | 0 .../PersonnelAndVehicleStatistics/index.js | 5 ++++ .../personnelAndVehicleStatistics/index.js | 5 ---- 34 files changed, 197 insertions(+), 25 deletions(-) create mode 100644 src/pages/Container/Stakeholder/EnclosedArea/Apply/Personnel/Add/index.js create mode 100644 src/pages/Container/Stakeholder/EnclosedArea/Apply/Personnel/List/index.js create mode 100644 src/pages/Container/Stakeholder/EnclosedArea/Apply/Personnel/View/index.js create mode 100644 src/pages/Container/Stakeholder/EnclosedArea/Apply/Personnel/index.js create mode 100644 src/pages/Container/Stakeholder/EnclosedArea/Apply/PersonnelRecords/List/index.js create mode 100644 src/pages/Container/Stakeholder/EnclosedArea/Apply/PersonnelRecords/View/index.js create mode 100644 src/pages/Container/Stakeholder/EnclosedArea/Apply/PersonnelRecords/index.js create mode 100644 src/pages/Container/Stakeholder/EnclosedArea/Apply/Vehicle/Add/index.js create mode 100644 src/pages/Container/Stakeholder/EnclosedArea/Apply/Vehicle/List/index.js create mode 100644 src/pages/Container/Stakeholder/EnclosedArea/Apply/Vehicle/View/index.js create mode 100644 src/pages/Container/Stakeholder/EnclosedArea/Apply/Vehicle/index.js create mode 100644 src/pages/Container/Stakeholder/EnclosedArea/Apply/VehicleRecords/List/index.js create mode 100644 src/pages/Container/Stakeholder/EnclosedArea/Apply/VehicleRecords/View/index.js create mode 100644 src/pages/Container/Stakeholder/EnclosedArea/Apply/VehicleRecords/index.js create mode 100644 src/pages/Container/Stakeholder/EnclosedArea/Apply/index.js create mode 100644 src/pages/Container/Stakeholder/EnclosedArea/index.js rename src/pages/Container/Supervision/EnclosedArea/Apply/{personnelRecords => PersonnelRecords}/List/index.js (97%) rename src/pages/Container/Supervision/EnclosedArea/Apply/{personnelRecords => PersonnelRecords}/View/index.js (100%) create mode 100644 src/pages/Container/Supervision/EnclosedArea/Apply/PersonnelRecords/index.js delete mode 100644 src/pages/Container/Supervision/EnclosedArea/Apply/personnelRecords/index.js rename src/pages/Container/Supervision/EnclosedArea/{personnelAndVehicleStatistics => PersonnelAndVehicleStatistics}/List/index.js (100%) rename src/pages/Container/Supervision/EnclosedArea/{personnelAndVehicleStatistics => PersonnelAndVehicleStatistics}/PersonnelEntryAndExitRecords/index.js (100%) rename src/pages/Container/Supervision/EnclosedArea/{personnelAndVehicleStatistics => PersonnelAndVehicleStatistics}/VehicleEntryAndExitRecords/index.js (100%) create mode 100644 src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/index.js delete mode 100644 src/pages/Container/Supervision/EnclosedArea/personnelAndVehicleStatistics/index.js diff --git a/router.md b/router.md index 3c5b943..72b21a7 100644 --- a/router.md +++ b/router.md @@ -59,6 +59,12 @@ - `/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` 封闭区域申请/车辆封闭区域申请记录 + ### H5端 - `/primeport/container/mobile/firstLevelDoor/personnelApplication/apply` 人员申请/申请 diff --git a/src/pages/Container/Stakeholder/EnclosedArea/Apply/Personnel/Add/index.js b/src/pages/Container/Stakeholder/EnclosedArea/Apply/Personnel/Add/index.js new file mode 100644 index 0000000..e0846b5 --- /dev/null +++ b/src/pages/Container/Stakeholder/EnclosedArea/Apply/Personnel/Add/index.js @@ -0,0 +1,7 @@ +import AddPage from "~/pages/Container/Supervision/EnclosedArea/Apply/Personnel/Add"; + +function Add(props) { + return (); +} + +export default Add; diff --git a/src/pages/Container/Stakeholder/EnclosedArea/Apply/Personnel/List/index.js b/src/pages/Container/Stakeholder/EnclosedArea/Apply/Personnel/List/index.js new file mode 100644 index 0000000..5ba64dd --- /dev/null +++ b/src/pages/Container/Stakeholder/EnclosedArea/Apply/Personnel/List/index.js @@ -0,0 +1,7 @@ +import ListPage from "~/pages/Container/Supervision/EnclosedArea/Apply/Personnel/List"; + +function List(props) { + return (); +} + +export default List; diff --git a/src/pages/Container/Stakeholder/EnclosedArea/Apply/Personnel/View/index.js b/src/pages/Container/Stakeholder/EnclosedArea/Apply/Personnel/View/index.js new file mode 100644 index 0000000..85332fa --- /dev/null +++ b/src/pages/Container/Stakeholder/EnclosedArea/Apply/Personnel/View/index.js @@ -0,0 +1,7 @@ +import ViewPage from "~/pages/Container/Supervision/EnclosedArea/Apply/Personnel/View"; + +function View(props) { + return (); +} + +export default View; diff --git a/src/pages/Container/Stakeholder/EnclosedArea/Apply/Personnel/index.js b/src/pages/Container/Stakeholder/EnclosedArea/Apply/Personnel/index.js new file mode 100644 index 0000000..1e0eca9 --- /dev/null +++ b/src/pages/Container/Stakeholder/EnclosedArea/Apply/Personnel/index.js @@ -0,0 +1,5 @@ +function Personnel(props) { + return props.children; +} + +export default Personnel; diff --git a/src/pages/Container/Stakeholder/EnclosedArea/Apply/PersonnelRecords/List/index.js b/src/pages/Container/Stakeholder/EnclosedArea/Apply/PersonnelRecords/List/index.js new file mode 100644 index 0000000..6e78c1f --- /dev/null +++ b/src/pages/Container/Stakeholder/EnclosedArea/Apply/PersonnelRecords/List/index.js @@ -0,0 +1,7 @@ +import ListPage from "~/pages/Container/Supervision/EnclosedArea/Apply/PersonnelRecords/List"; + +function List(props) { + return (); +} + +export default List; diff --git a/src/pages/Container/Stakeholder/EnclosedArea/Apply/PersonnelRecords/View/index.js b/src/pages/Container/Stakeholder/EnclosedArea/Apply/PersonnelRecords/View/index.js new file mode 100644 index 0000000..4fede23 --- /dev/null +++ b/src/pages/Container/Stakeholder/EnclosedArea/Apply/PersonnelRecords/View/index.js @@ -0,0 +1,7 @@ +import ViewPage from "~/pages/Container/Supervision/EnclosedArea/Apply/PersonnelRecords/View"; + +function View(props) { + return (); +} + +export default View; diff --git a/src/pages/Container/Stakeholder/EnclosedArea/Apply/PersonnelRecords/index.js b/src/pages/Container/Stakeholder/EnclosedArea/Apply/PersonnelRecords/index.js new file mode 100644 index 0000000..aa24ddb --- /dev/null +++ b/src/pages/Container/Stakeholder/EnclosedArea/Apply/PersonnelRecords/index.js @@ -0,0 +1,5 @@ +function PersonnelRecords(props) { + return props.children; +} + +export default PersonnelRecords; diff --git a/src/pages/Container/Stakeholder/EnclosedArea/Apply/Vehicle/Add/index.js b/src/pages/Container/Stakeholder/EnclosedArea/Apply/Vehicle/Add/index.js new file mode 100644 index 0000000..305a4f6 --- /dev/null +++ b/src/pages/Container/Stakeholder/EnclosedArea/Apply/Vehicle/Add/index.js @@ -0,0 +1,7 @@ +import AddPage from "~/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/Add"; + +function Add(props) { + return (); +} + +export default Add; diff --git a/src/pages/Container/Stakeholder/EnclosedArea/Apply/Vehicle/List/index.js b/src/pages/Container/Stakeholder/EnclosedArea/Apply/Vehicle/List/index.js new file mode 100644 index 0000000..3bbaa89 --- /dev/null +++ b/src/pages/Container/Stakeholder/EnclosedArea/Apply/Vehicle/List/index.js @@ -0,0 +1,7 @@ +import ListPage from "~/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/List"; + +function List(props) { + return (); +} + +export default List; diff --git a/src/pages/Container/Stakeholder/EnclosedArea/Apply/Vehicle/View/index.js b/src/pages/Container/Stakeholder/EnclosedArea/Apply/Vehicle/View/index.js new file mode 100644 index 0000000..6649337 --- /dev/null +++ b/src/pages/Container/Stakeholder/EnclosedArea/Apply/Vehicle/View/index.js @@ -0,0 +1,7 @@ +import ViewPage from "~/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/View"; + +function View(props) { + return (); +} + +export default View; diff --git a/src/pages/Container/Stakeholder/EnclosedArea/Apply/Vehicle/index.js b/src/pages/Container/Stakeholder/EnclosedArea/Apply/Vehicle/index.js new file mode 100644 index 0000000..7c12ef9 --- /dev/null +++ b/src/pages/Container/Stakeholder/EnclosedArea/Apply/Vehicle/index.js @@ -0,0 +1,5 @@ +function Vehicle(props) { + return props.children; +} + +export default Vehicle; diff --git a/src/pages/Container/Stakeholder/EnclosedArea/Apply/VehicleRecords/List/index.js b/src/pages/Container/Stakeholder/EnclosedArea/Apply/VehicleRecords/List/index.js new file mode 100644 index 0000000..c76f5ea --- /dev/null +++ b/src/pages/Container/Stakeholder/EnclosedArea/Apply/VehicleRecords/List/index.js @@ -0,0 +1,7 @@ +import ListPage from "~/pages/Container/Supervision/EnclosedArea/Apply/VehicleRecords/List"; + +function List(props) { + return (); +} + +export default List; diff --git a/src/pages/Container/Stakeholder/EnclosedArea/Apply/VehicleRecords/View/index.js b/src/pages/Container/Stakeholder/EnclosedArea/Apply/VehicleRecords/View/index.js new file mode 100644 index 0000000..9c421e3 --- /dev/null +++ b/src/pages/Container/Stakeholder/EnclosedArea/Apply/VehicleRecords/View/index.js @@ -0,0 +1,7 @@ +import ViewPage from "~/pages/Container/Supervision/EnclosedArea/Apply/VehicleRecords/View"; + +function View(props) { + return (); +} + +export default View; diff --git a/src/pages/Container/Stakeholder/EnclosedArea/Apply/VehicleRecords/index.js b/src/pages/Container/Stakeholder/EnclosedArea/Apply/VehicleRecords/index.js new file mode 100644 index 0000000..ea072ea --- /dev/null +++ b/src/pages/Container/Stakeholder/EnclosedArea/Apply/VehicleRecords/index.js @@ -0,0 +1,5 @@ +function VehicleRecords(props) { + return props.children; +} + +export default VehicleRecords; diff --git a/src/pages/Container/Stakeholder/EnclosedArea/Apply/index.js b/src/pages/Container/Stakeholder/EnclosedArea/Apply/index.js new file mode 100644 index 0000000..e006dfa --- /dev/null +++ b/src/pages/Container/Stakeholder/EnclosedArea/Apply/index.js @@ -0,0 +1,5 @@ +function Apply(props) { + return props.children; +} + +export default Apply; diff --git a/src/pages/Container/Stakeholder/EnclosedArea/index.js b/src/pages/Container/Stakeholder/EnclosedArea/index.js new file mode 100644 index 0000000..caaef56 --- /dev/null +++ b/src/pages/Container/Stakeholder/EnclosedArea/index.js @@ -0,0 +1,5 @@ +function EnclosedArea(props) { + return props.children; +} + +export default EnclosedArea; diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/Add/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/Add/index.js index 4254a8c..908557e 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/Add/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/Add/index.js @@ -45,6 +45,15 @@ function Add(props) { submitButtonText="提交申请" onFinish={onSubmit} options={[ + { + name: "todo0", + label: "项目", + tip: "如果无法找到相应的项目，请在“项目审核管理”栏目中查看，项目是否备案审核成功。", + span: 24, + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: [], + hidden: !(props.entrance === "stakeholder"), + }, { name: "todo1", label: "区域管辖单位", @@ -58,9 +67,18 @@ function Add(props) { /> ), }, - { name: "todo2", label: "封闭区域", render: () }, + { + name: "todo2", + label: "封闭区域", + render: (), + }, { name: "todo4", label: "审核人员", render: FORM_ITEM_RENDER_ENUM.SELECT, items: [] }, - { name: "todo5", label: "申请时间范围", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, + { + name: "todo5", + label: "申请时间范围", + render: FORM_ITEM_RENDER_ENUM.DATE_RANGE, + componentProps: { disabled: props.entrance === "stakeholder" }, + }, { label: "随行人员", span: 24, 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 960bf74..eca1124 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/List/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/List/index.js @@ -42,6 +42,7 @@ function List(props) { { title: "申请区域", dataIndex: "todo4" }, { title: "申请时间范围", dataIndex: "todo5", render: (_, record) => `${record.todo5} - ${record.todo6}` }, { title: "个人照片", dataIndex: "todo7", render: (_, record) => }, + { title: "所属项目", dataIndex: "todo9", hidden: !(props.entrance === "stakeholder") }, { title: "申请状态", dataIndex: "todo8" }, { title: "操作", diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/View/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/View/index.js index bf1c02e..5222713 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/View/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/View/index.js @@ -30,7 +30,16 @@ function View(props) { column={2} styles={{ label: { width: 200 } }} items={[ - { label: "所属企业", children: info.todo1 }, + ...( + props.entrance === "stakeholder" + ? [ + { label: "相关方名称", children: info.todo1 }, + { label: "所属项目", children: info.todo1 }, + ] + : [ + { label: "所属企业", children: info.todo1 }, + ] + ), { label: "姓名", children: info.todo2 }, { label: "部门", children: info.todo3 }, { label: "手机号", children: info.todo4 }, diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/personnelRecords/List/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/PersonnelRecords/List/index.js similarity index 97% rename from src/pages/Container/Supervision/EnclosedArea/Apply/personnelRecords/List/index.js rename to src/pages/Container/Supervision/EnclosedArea/Apply/PersonnelRecords/List/index.js index a6d8c4b..d14834b 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/personnelRecords/List/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/PersonnelRecords/List/index.js @@ -35,6 +35,7 @@ function List(props) { { title: "申请区域", dataIndex: "todo4" }, { title: "申请时间范围", dataIndex: "todo5", render: (_, record) => `${record.todo5} - ${record.todo6}` }, { title: "个人照片", dataIndex: "todo7", render: (_, record) => }, + { title: "所属项目", dataIndex: "todo9", hidden: !(props.entrance === "stakeholder") }, { title: "申请状态", dataIndex: "todo8" }, { title: "操作", diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/personnelRecords/View/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/PersonnelRecords/View/index.js similarity index 100% rename from src/pages/Container/Supervision/EnclosedArea/Apply/personnelRecords/View/index.js rename to src/pages/Container/Supervision/EnclosedArea/Apply/PersonnelRecords/View/index.js diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/PersonnelRecords/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/PersonnelRecords/index.js new file mode 100644 index 0000000..aa24ddb --- /dev/null +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/PersonnelRecords/index.js @@ -0,0 +1,5 @@ +function PersonnelRecords(props) { + return props.children; +} + +export default PersonnelRecords; diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/Add/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/Add/index.js index 4e4b503..10455cd 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/Add/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/Add/index.js @@ -57,6 +57,15 @@ function Add(props) { submitButtonText="提交申请" onFinish={onSubmit} options={[ + { + name: "todo0", + label: "项目", + tip: "如果无法找到相应的项目，请在“项目审核管理”栏目中查看，项目是否备案审核成功。", + span: 24, + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: [], + hidden: !(props.entrance === "stakeholder"), + }, { name: "todo1", label: "区域管辖单位", @@ -70,9 +79,18 @@ function Add(props) { /> ), }, - { name: "todo2", label: "封闭区域", render: () }, + { + name: "todo2", + label: "封闭区域", + render: (), + }, { name: "todo4", label: "审核人员", render: FORM_ITEM_RENDER_ENUM.SELECT, items: [] }, - { name: "todo5", label: "申请时间范围", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, + { + name: "todo5", + label: "申请时间范围", + render: FORM_ITEM_RENDER_ENUM.DATE_RANGE, + componentProps: { disabled: props.entrance === "stakeholder" }, + }, { name: "todo6", label: "车辆类型", @@ -86,6 +104,7 @@ function Add(props) { setVehicleList([]); }, }, + hidden: props.entrance === "stakeholder", }, ...(todo6 === 1 ? [ @@ -139,7 +158,12 @@ function Add(props) { }, ] : []), - ...(todo6 === 2 + ...(props.entrance === "stakeholder" + ? [ + { name: "todo92", label: "驾驶人员", render: FORM_ITEM_RENDER_ENUM.SELECT, items: [] }, + ] + : []), + ...(todo6 === 2 || props.entrance === "stakeholder" ? [ { name: "todo7", label: "车牌类型", render: () }, { name: "todo8", label: "车辆类型", render: () }, diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/List/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/List/index.js index c5bce74..5cf8e89 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/List/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/List/index.js @@ -38,13 +38,14 @@ function List(props) { columns={[ { title: "车辆类型", dataIndex: "todo1" }, { title: "驾驶人", dataIndex: "todo2" }, - { title: "职务", dataIndex: "todo3" }, + { title: "部门", dataIndex: "todo3" }, { title: "手机号", dataIndex: "todo4" }, { title: "申请区域", dataIndex: "todo5" }, { title: "申请时间范围", dataIndex: "todo6", render: (_, record) => `${record.todo6} - ${record.todo7}` }, { title: "申请原因", dataIndex: "todo7" }, { title: "车牌号", dataIndex: "todo8" }, { title: "车辆照片", dataIndex: "todo9", render: (_, record) => }, + { title: "所属项目", dataIndex: "todo9", hidden: !(props.entrance === "stakeholder") }, { title: "申请状态", dataIndex: "todo10" }, { title: "操作", diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/View/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/View/index.js index 6103a9d..0f33a34 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/View/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/View/index.js @@ -30,17 +30,28 @@ function View(props) { column={2} styles={{ label: { width: 200 } }} items={[ - { label: "所属企业", children: info.todo1 }, + ...( + props.entrance === "stakeholder" + ? [ + { label: "相关方名称", children: info.todo1 }, + { label: "所属项目", children: info.todo1 }, + ] + : [ + { label: "所属企业", children: info.todo1 }, + ] + ), { label: "姓名", children: info.todo2 }, - { label: "职务", children: info.todo3 }, + { label: "部门", children: info.todo3 }, { label: "手机号", children: info.todo4 }, { label: "申请区域", children: info.todo5 }, { label: "申请时间范围", children: `${info.todo6} - ${info.todo7}` }, - { label: "车辆类型", children: info.todo8 }, - { label: "车辆照片", children: () }, - { label: "行驶证照片", children: () }, - { label: "申请原因", children: info.todo11 }, - { label: "申请人员签字", children: () }, + { label: "车牌号", children: info.todo8 }, + { label: "车牌类型", children: info.todo9 }, + { label: "车辆类型", children: info.todo10 }, + { label: "车辆照片", children: () }, + { label: "行驶证照片", children: () }, + { label: "申请原因", children: info.todo13 }, + { label: "申请人员签字", children: () }, ]} /> {props.children} 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 bd2945f..c81c42b 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/VehicleRecords/List/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/VehicleRecords/List/index.js @@ -37,6 +37,7 @@ function List(props) { { title: "申请原因", dataIndex: "todo7" }, { title: "车牌号", dataIndex: "todo8" }, { title: "车辆照片", dataIndex: "todo9", render: (_, record) => }, + { title: "所属项目", dataIndex: "todo9", hidden: !(props.entrance === "stakeholder") }, { title: "申请状态", dataIndex: "todo10" }, { title: "操作", diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/VehicleRecords/View/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/VehicleRecords/View/index.js index 5ece514..02bf7d4 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/VehicleRecords/View/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/VehicleRecords/View/index.js @@ -4,7 +4,7 @@ import { useEffect, useState } from "react"; import Table from "zy-react-library/components/Table"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import { NS_ENCLOSED_AREA_VEHICLE_APPLY } from "~/enumerate/namespace"; -import ViewPage from "../../Personnel/View"; +import ViewPage from "../../Vehicle/View"; function View(props) { const [accessRecordsList, setAccessRecordsList] = useState([]); diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/personnelRecords/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/personnelRecords/index.js deleted file mode 100644 index 04e92b6..0000000 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/personnelRecords/index.js +++ /dev/null @@ -1,5 +0,0 @@ -function personnelRecords(props) { - return props.children; -} - -export default personnelRecords; diff --git a/src/pages/Container/Supervision/EnclosedArea/personnelAndVehicleStatistics/List/index.js b/src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/List/index.js similarity index 100% rename from src/pages/Container/Supervision/EnclosedArea/personnelAndVehicleStatistics/List/index.js rename to src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/List/index.js diff --git a/src/pages/Container/Supervision/EnclosedArea/personnelAndVehicleStatistics/PersonnelEntryAndExitRecords/index.js b/src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/PersonnelEntryAndExitRecords/index.js similarity index 100% rename from src/pages/Container/Supervision/EnclosedArea/personnelAndVehicleStatistics/PersonnelEntryAndExitRecords/index.js rename to src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/PersonnelEntryAndExitRecords/index.js diff --git a/src/pages/Container/Supervision/EnclosedArea/personnelAndVehicleStatistics/VehicleEntryAndExitRecords/index.js b/src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/VehicleEntryAndExitRecords/index.js similarity index 100% rename from src/pages/Container/Supervision/EnclosedArea/personnelAndVehicleStatistics/VehicleEntryAndExitRecords/index.js rename to src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/VehicleEntryAndExitRecords/index.js diff --git a/src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/index.js b/src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/index.js new file mode 100644 index 0000000..aeb9ffd --- /dev/null +++ b/src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/index.js @@ -0,0 +1,5 @@ +function PersonnelAndVehicleStatistics(props) { + return props.children; +} + +export default PersonnelAndVehicleStatistics; diff --git a/src/pages/Container/Supervision/EnclosedArea/personnelAndVehicleStatistics/index.js b/src/pages/Container/Supervision/EnclosedArea/personnelAndVehicleStatistics/index.js deleted file mode 100644 index 760a6cb..0000000 --- a/src/pages/Container/Supervision/EnclosedArea/personnelAndVehicleStatistics/index.js +++ /dev/null @@ -1,5 +0,0 @@ -function personnelAndVehicleStatistics(props) { - return props.children; -} - -export default personnelAndVehicleStatistics;