diff --git a/router.md b/router.md index b1cca54..213228d 100644 --- a/router.md +++ b/router.md @@ -30,17 +30,17 @@ `/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` #### 封闭区域管理 diff --git a/src/api/branchPersonnelAndVehicles/index.js b/src/api/branchPersonnelAndVehicles/index.js index ac48354..901c2e1 100644 --- a/src/api/branchPersonnelAndVehicles/index.js +++ b/src/api/branchPersonnelAndVehicles/index.js @@ -2,13 +2,5 @@ import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; export const branchPersonnelAndVehiclesList = declareRequest( "branchPersonnelAndVehiclesLoading", - `Post > @/primeport/`, -); -export const branchPersonnelAndVehiclesPersonnelAndVehicleList = declareRequest( - "branchPersonnelAndVehiclesLoading", - `Post > @/primeport/`, -); -export const branchPersonnelAndVehiclesVehicleManagementList = declareRequest( - "branchPersonnelAndVehiclesLoading", - `Post > @/primeport/`, + `Get > /primeport/vehicleApply/fgsCount`, ); diff --git a/src/api/inspectDepartmentVehicles/index.js b/src/api/inspectDepartmentVehicles/index.js deleted file mode 100644 index 7e99424..0000000 --- a/src/api/inspectDepartmentVehicles/index.js +++ /dev/null @@ -1,22 +0,0 @@ -import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; - -export const inspectDepartmentVehiclesList = declareRequest( - "inspectDepartmentVehiclesLoading", - `Post > @/primeport/`, -); -export const inspectDepartmentVehiclesDelete = declareRequest( - "inspectDepartmentVehiclesLoading", - `Post > @/primeport/`, -); -export const inspectDepartmentVehiclesInfo = declareRequest( - "inspectDepartmentVehiclesLoading", - `Post > @/primeport/`, -); -export const inspectDepartmentVehiclesAdd = declareRequest( - "inspectDepartmentVehiclesLoading", - `Post > @/primeport/`, -); -export const inspectDepartmentVehiclesUpdate = declareRequest( - "inspectDepartmentVehiclesLoading", - `Post > @/primeport/`, -); diff --git a/src/api/portBasedUnitsPersonnelAndVehicles/index.js b/src/api/portBasedUnitsPersonnelAndVehicles/index.js deleted file mode 100644 index c905f8f..0000000 --- a/src/api/portBasedUnitsPersonnelAndVehicles/index.js +++ /dev/null @@ -1,10 +0,0 @@ -import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; - -export const portBasedUnitsPersonnelAndVehiclesList = declareRequest( - "portBasedUnitsPersonnelAndVehiclesLoading", - `Post > @/primeport/`, -); -export const portBasedUnitsPersonnelAndVehiclesPersonnelAndVehicleList = declareRequest( - "portBasedUnitsPersonnelAndVehiclesLoading", - `Post > @/primeport/`, -); diff --git a/src/api/stakeholderPersonnelAndVehicles/index.js b/src/api/stakeholderPersonnelAndVehicles/index.js index 9c37b56..a02af85 100644 --- a/src/api/stakeholderPersonnelAndVehicles/index.js +++ b/src/api/stakeholderPersonnelAndVehicles/index.js @@ -2,21 +2,5 @@ import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; export const stakeholderPersonnelAndVehiclesList = declareRequest( "stakeholderPersonnelAndVehiclesLoading", - `Post > @/primeport/`, -); -export const stakeholderPersonnelAndVehiclesPersonnelList = declareRequest( - "stakeholderPersonnelAndVehiclesLoading", - `Post > @/primeport/`, -); -export const stakeholderPersonnelAndVehiclesPersonnelUpdateStatus = declareRequest( - "stakeholderPersonnelAndVehiclesLoading", - `Post > @/primeport/`, -); -export const stakeholderPersonnelAndVehiclesVehicleList = declareRequest( - "stakeholderPersonnelAndVehiclesLoading", - `Post > @/primeport/`, -); -export const stakeholderPersonnelAndVehiclesVehicleUpdateStatus = declareRequest( - "stakeholderPersonnelAndVehiclesLoading", - `Post > @/primeport/`, + `Get > /primeport/personApply/xgfPersonnelVehicleManagementList`, ); diff --git a/src/api/vehicleApply/index.js b/src/api/vehicleApply/index.js index df79ff3..dc39838 100644 --- a/src/api/vehicleApply/index.js +++ b/src/api/vehicleApply/index.js @@ -28,3 +28,11 @@ export const vehicleApplyRecordsList = declareRequest( "vehicleApplyLoading", `Post > @/primeport/`, ); +export const inspectDepartmentVehiclesAdd = declareRequest( + "vehicleApplyLoading", + `Post > @/primeport/vehicleApply/inspectCarSave`, +); +export const inspectDepartmentVehiclesUpdate = declareRequest( + "vehicleApplyLoading", + `Put > @/primeport/vehicleApply/inspectCarEdit`, +); diff --git a/src/enumerate/namespace/index.js b/src/enumerate/namespace/index.js index 201b40e..2158e19 100644 --- a/src/enumerate/namespace/index.js +++ b/src/enumerate/namespace/index.js @@ -15,8 +15,6 @@ export const NS_STOCK_PERSONNEL_AND_VEHICLES = defineNamespace("stockPersonnelAn export const NS_VEHICLE_APPLY = defineNamespace("vehicleApply"); export const NS_BRANCH_PERSONNEL_AND_VEHICLES = defineNamespace("branchPersonnelAndVehicles"); export const NS_STAKEHOLDER_PERSONNEL_AND_VEHICLES = defineNamespace("stakeholderPersonnelAndVehicles"); -export const NS_PORT_BASED_UNITS_PERSONNEL_AND_VEHICLES = defineNamespace("portBasedUnitsPersonnelAndVehicles"); -export const NS_INSPECT_DEPARTMENT_VEHICLES = defineNamespace("inspectDepartmentVehicles"); export const NS_VEHICLES_VIOLATION = defineNamespace("vehiclesViolation"); export const NS_VEHICLE_BLACKLIST = defineNamespace("vehicleBlacklist"); export const NS_PERSONNEL_PERMISSION_RECORDS = defineNamespace("personnelPermissionRecords"); 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 2d00843..506ceef 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/List/index.js @@ -10,6 +10,7 @@ function List(props) { const [form] = Search.useForm(); const { tableProps, getData } = useTable(props["branchPersonnelAndVehiclesList"], { form, + params: { corpType: 1 }, }); return ( @@ -19,15 +20,15 @@ function List(props) { labelCol={{ span: 4 }} onFinish={getData} options={[ - { name: "todo1", label: "企业名称" }, + { name: "corpName", label: "企业名称" }, ]} /> { - props.history.push(`./personnelAndVehicle/list?id=${record.id}`); + props.history.push(`./personnelAndVehicle/list?id=${record.corpId}`); }} > 人员及车辆详情 - + ), }, diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/PersonnelAndVehicle/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/PersonnelAndVehicle/List/index.js index 1d4b20d..333625b 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/PersonnelAndVehicle/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/PersonnelAndVehicle/List/index.js @@ -6,14 +6,14 @@ import Table from "zy-react-library/components/Table"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useTable from "zy-react-library/hooks/useTable"; -import { NS_BRANCH_PERSONNEL_AND_VEHICLES } from "~/enumerate/namespace"; +import { NS_STOCK_PERSONNEL_AND_VEHICLES } from "~/enumerate/namespace"; function List(props) { const query = useGetUrlQuery(); const [form] = Search.useForm(); - const { tableProps, getData } = useTable(props["branchPersonnelAndVehiclesPersonnelAndVehicleList"], { + const { tableProps, getData } = useTable(props["stockPersonnelAndVehiclesList"], { form, - params: { id: query.id }, + params: { corpId: query.id }, }); return ( @@ -22,19 +22,19 @@ function List(props) { form={form} onFinish={getData} options={[ - { name: "todo1", label: "姓名" }, + { name: "name", label: "姓名" }, { name: "todo2", label: "进出港时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, ]} />
) }, - { name: "todo4", label: "访问开始时间", render: FORM_ITEM_RENDER_ENUM.DATE }, - { name: "todo5", label: "访问结束时间", render: FORM_ITEM_RENDER_ENUM.DATE }, + { name: "gateLevelAuthArea", label: "访问港区范围", render: () }, + { name: "visitStartTime", label: "访问开始时间", render: FORM_ITEM_RENDER_ENUM.DATE }, + { name: "visitEndTime", label: "访问结束时间", render: FORM_ITEM_RENDER_ENUM.DATE }, ]} />
record.gateLevelAuthArea && JSON.parse(record.gateLevelAuthArea).area.map(item => item.value).join("、"), + }, + { title: "访问起始时间", dataIndex: "visitStartTime" }, + { title: "访问结束时间", dataIndex: "visitEndTime" }, { title: "当前在港状态", dataIndex: "todo8" }, { title: "操作", @@ -86,4 +90,4 @@ function List(props) { ); } -export default Connect([NS_BRANCH_PERSONNEL_AND_VEHICLES], true)(List); +export default Connect([NS_VEHICLE_APPLY], true)(List); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/PersonnelAndVehicle/VehicleManagement/View/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/PersonnelAndVehicle/VehicleManagement/View/index.js index 9b74d78..d65b400 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/PersonnelAndVehicle/VehicleManagement/View/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/PersonnelAndVehicle/VehicleManagement/View/index.js @@ -1,7 +1,7 @@ import ViewPage from "~/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/VehicleManagement/View"; function View(props) { - return (); + return (); } export default View; diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/UnitVehicle/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/UnitVehicle/List/index.js new file mode 100644 index 0000000..e17692b --- /dev/null +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/UnitVehicle/List/index.js @@ -0,0 +1,7 @@ +import ListPage from "~/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockVehicles/List"; + +function List(props) { + return ; +} + +export default List; diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/UnitVehicle/VehicleRecords/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/UnitVehicle/VehicleRecords/index.js new file mode 100644 index 0000000..b228db1 --- /dev/null +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/UnitVehicle/VehicleRecords/index.js @@ -0,0 +1,7 @@ +import VehicleRecordsPage from "~/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockVehicles/VehicleRecords"; + +function VehicleRecords(props) { + return ; +} + +export default VehicleRecords; diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/UnitVehicle/View/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/UnitVehicle/View/index.js new file mode 100644 index 0000000..773348f --- /dev/null +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/UnitVehicle/View/index.js @@ -0,0 +1,7 @@ +import ViewPage from "~/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockVehicles/View"; + +function View(props) { + return ; +} + +export default View; diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/UnitVehicle/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/UnitVehicle/index.js new file mode 100644 index 0000000..a2bd5e3 --- /dev/null +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/BranchPersonnelAndVehicles/UnitVehicle/index.js @@ -0,0 +1,5 @@ +function UnitVehicle(props) { + return props.children; +} + +export default UnitVehicle; 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 2bddbbf..a767411 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/InspectDepartmentVehicles/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/InspectDepartmentVehicles/List/index.js @@ -1,6 +1,6 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Divider, message, Modal, Space } from "antd"; -import { useEffect, useState } from "react"; +import { useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; import Page from "zy-react-library/components/Page"; @@ -10,16 +10,17 @@ import Table from "zy-react-library/components/Table"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useTable from "zy-react-library/hooks/useTable"; import { LICENSE_PLATE_NUMBER } from "zy-react-library/regular"; -import { NS_INSPECT_DEPARTMENT_VEHICLES } from "~/enumerate/namespace"; +import { NS_VEHICLE_APPLY } from "~/enumerate/namespace"; function List(props) { - const [currentId, setCurrentId] = useState(""); + const [currentInfo, setCurrentInfo] = useState(""); const [addModalVisible, setAddModalVisible] = useState(false); const [viewModalVisible, setViewModalVisible] = useState(false); const [form] = Search.useForm(); - const { tableProps, getData } = useTable(props["inspectDepartmentVehiclesList"], { + const { tableProps, getData } = useTable(props["vehicleApplyList"], { form, + params: { vehicleBelongType: 7 }, }); const onDelete = (id) => { @@ -27,7 +28,7 @@ function List(props) { title: "删除确认", content: "确定要删除吗？", onOk: async () => { - const { success } = await props["inspectDepartmentVehiclesDelete"]({ id }); + const { success } = await props["vehicleApplyDelete"]({ id }); if (success) { message.success("删除成功"); getData(); @@ -40,8 +41,8 @@ function List(props) { )} columns={[ - { title: "名称", dataIndex: "todo1" }, - { title: "车牌号", dataIndex: "todo2" }, - { title: "车牌类型", dataIndex: "todo3" }, - { title: "车辆类型", dataIndex: "todo4" }, + { title: "名称", dataIndex: "remarks" }, + { title: "车牌号", dataIndex: "licenceNo" }, + { title: "车牌类型", dataIndex: "licenceTypeName" }, + { title: "车辆类型", dataIndex: "vehicleTypeName" }, { title: "操作", - width: 200, + width: 250, fixed: "right", render: (_, record) => ( @@ -75,7 +76,7 @@ function List(props) { type="link" onClick={() => { setViewModalVisible(true); - setCurrentId(record.id); + setCurrentInfo(record); }} > 查看 @@ -84,7 +85,7 @@ function List(props) { type="link" onClick={() => { setAddModalVisible(true); - setCurrentId(record.id); + setCurrentInfo(record); }} > 编辑 @@ -115,11 +116,11 @@ function List(props) { { addModalVisible && ( { setAddModalVisible(false); - setCurrentId(""); + setCurrentInfo({}); }} /> ) @@ -127,10 +128,10 @@ function List(props) { { viewModalVisible && ( { setViewModalVisible(false); - setCurrentId(""); + setCurrentInfo({}); }} /> ) @@ -140,23 +141,29 @@ function List(props) { } const AddModalComponent = (props) => { + const { info } = props; + const isEdit = !!info.id; const [form] = FormBuilder.useForm(); - const getData = async () => { - const { data } = await props["inspectDepartmentVehiclesInfo"]({ id: props.id }); - form.setFieldsValue(data); - }; - - useEffect(() => { - props.id && getData(); - }, []); - const onSubmit = async (values) => { - const { success } = await props[!props.id ? "inspectDepartmentVehiclesAdd" : "inspectDepartmentVehiclesUpdate"]({ - id: props.id, - ...values, - }); - if (success) { + let outsideSuccess = false; + if (!isEdit) { + const { success } = await props["inspectDepartmentVehiclesAdd"]({ + ...values, + vehicleBelongType: 7, + }); + outsideSuccess = success; + } + else { + const { success } = await props["inspectDepartmentVehiclesUpdate"]({ + id: info.id, + ...values, + ...values.inspectCarList[0], + vehicleBelongType: 7, + }); + outsideSuccess = success; + } + if (outsideSuccess) { message.success("保存成功"); props.getData(); props.onCancel(); @@ -166,33 +173,74 @@ const AddModalComponent = (props) => { return ( ([ - { name: [field, "todo1"], label: "车牌类型", render: () }, - { name: [field, "todo2"], label: "车牌号", rules: [{ pattern: LICENSE_PLATE_NUMBER, message: "请输入正确的车牌号" }] }, - { name: [field, "todo3"], label: "车辆类型", render: () }, - ]), - } }, + { + name: "inspectCarList", + render: FORM_ITEM_RENDER_ENUM.FORM_LIST, + formListUniqueProps: { + showAddButton: !isEdit, + showRemoveButton: !isEdit, + options: field => ([ + { + name: [field.name, "licenceType"], + label: "车牌类型", + render: ( + { + form.setFieldValue(["inspectCarList", field.name, "licenceTypeName"], label); + }} + /> + ), + }, + { name: [field.name, "licenceTypeName"], label: "车牌类型名称", onlyForLabel: true }, + { + name: [field.name, "licenceNo"], + label: "车牌号", + rules: [{ pattern: LICENSE_PLATE_NUMBER, message: "请输入正确的车牌号" }], + }, + { name: [field.name, "vehicleTypeName"], label: "车辆类型名称", onlyForLabel: true }, + { + name: [field.name, "vehicleType"], + label: "车辆类型", + render: ( + { + form.setFieldValue(["inspectCarList", field.name, "vehicleTypeName"], label); + }} + /> + ), + }, + ]), + }, + }, ]} /> @@ -200,16 +248,7 @@ const AddModalComponent = (props) => { }; const ViewModalComponent = (props) => { - const [info, setInfo] = useState({}); - - const getData = async () => { - const { data } = await props["inspectDepartmentVehiclesInfo"]({ id: props.id }); - setInfo(data); - }; - - useEffect(() => { - props.id && getData(); - }, []); + const { info } = props; return ( { footer={[ , ]} - loading={props.inspectDepartmentVehicles.inspectDepartmentVehiclesLoading} + loading={props.vehicleApply.vehicleApplyLoading} > 车辆信息 - { - info.todo2.map((item, index) => ( - - )) - } + ); }; -const AddModal = Connect([NS_INSPECT_DEPARTMENT_VEHICLES], true)(AddModalComponent); -const ViewModal = Connect([NS_INSPECT_DEPARTMENT_VEHICLES], true)(ViewModalComponent); +const AddModal = Connect([NS_VEHICLE_APPLY], true)(AddModalComponent); +const ViewModal = Connect([NS_VEHICLE_APPLY], true)(ViewModalComponent); -export default Connect([NS_INSPECT_DEPARTMENT_VEHICLES], true)(List); +export default Connect([NS_VEHICLE_APPLY], true)(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 8de9a12..a476e0d 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PortBasedUnitsPersonnelAndVehicles/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PortBasedUnitsPersonnelAndVehicles/List/index.js @@ -4,28 +4,29 @@ import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import useTable from "zy-react-library/hooks/useTable"; -import { NS_PORT_BASED_UNITS_PERSONNEL_AND_VEHICLES } from "~/enumerate/namespace"; +import { NS_BRANCH_PERSONNEL_AND_VEHICLES } from "~/enumerate/namespace"; function List(props) { const [form] = Search.useForm(); - const { tableProps, getData } = useTable(props["portBasedUnitsPersonnelAndVehiclesList"], { + const { tableProps, getData } = useTable(props["branchPersonnelAndVehiclesList"], { form, + params: { corpType: 2 }, }); return (
{ - props.history.push(`./personnelAndVehicle/list?id=${record.id}`); + props.history.push(`./personnelAndVehicle/list?id=${record.corpId}`); }} > 人员及车辆详情 @@ -48,4 +49,4 @@ function List(props) { ); } -export default Connect([NS_PORT_BASED_UNITS_PERSONNEL_AND_VEHICLES], true)(List); +export default Connect([NS_BRANCH_PERSONNEL_AND_VEHICLES], true)(List); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PortBasedUnitsPersonnelAndVehicles/PersonnelAndVehicle/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PortBasedUnitsPersonnelAndVehicles/PersonnelAndVehicle/List/index.js index cb0ebfd..5c637d0 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PortBasedUnitsPersonnelAndVehicles/PersonnelAndVehicle/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PortBasedUnitsPersonnelAndVehicles/PersonnelAndVehicle/List/index.js @@ -10,7 +10,7 @@ import Table from "zy-react-library/components/Table"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useTable from "zy-react-library/hooks/useTable"; -import { NS_PORT_BASED_UNITS_PERSONNEL_AND_VEHICLES } from "~/enumerate/namespace"; +import { NS_STOCK_PERSONNEL_AND_VEHICLES } from "~/enumerate/namespace"; function List(props) { const query = useGetUrlQuery(); @@ -28,9 +28,9 @@ function List(props) { }, }); - const { tableProps, getData } = useTable(props["portBasedUnitsPersonnelAndVehiclesPersonnelAndVehicleList"], { + const { tableProps, getData } = useTable(props["stockPersonnelAndVehiclesList"], { form, - params: () => ({ departmentId: urlState.departmentId, id: query.id }), + params: () => ({ departmentId: urlState.departmentId, corpId: query.id }), manual: true, }); @@ -66,7 +66,7 @@ function List(props) {
)} columns={[ - { title: "部门", dataIndex: "todo1" }, - { title: "姓名", dataIndex: "todo2" }, - { title: "岗位", dataIndex: "todo3" }, - { title: "手机号", dataIndex: "todo4" }, - { title: "车辆数", dataIndex: "todo5" }, + { title: "部门", dataIndex: "departmentName" }, + { title: "姓名", dataIndex: "userName" }, + { title: "岗位", dataIndex: "postName" }, + { title: "手机号", dataIndex: "userPhone" }, + { title: "车辆数", dataIndex: "vehicleCount" }, { title: "操作", width: 200, @@ -132,4 +132,4 @@ function List(props) { ); } -export default Connect([NS_PORT_BASED_UNITS_PERSONNEL_AND_VEHICLES], true)(List); +export default Connect([NS_STOCK_PERSONNEL_AND_VEHICLES], true)(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 fe50eac..fad7bb1 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StakeholderPersonnelAndVehicles/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StakeholderPersonnelAndVehicles/List/index.js @@ -17,16 +17,16 @@ function List(props) {
{ - props.history.push(`./personnel/list?id=${record.id}`); + props.history.push(`./personnel/list?id=${record.applyCorpId}`); }} > 人员列表 @@ -44,7 +44,7 @@ function List(props) {
`${record.todo5}-${record.todo6}` }, + { title: "项目名称", dataIndex: "projectName" }, + { title: "姓名", dataIndex: "userName" }, + { title: "部门", dataIndex: "departmentName" }, + { title: "手机号", dataIndex: "userPhone" }, + { + title: "时间范围", + dataIndex: "visitStartTime", + render: (_, record) => `${record.visitStartTime}-${record.visitEndTime}`, + }, { title: "口门权限", - dataIndex: "todo7", - render: (_, record) => getLabelName({ list: STATUS_ENUM, status: record.todo7 }), + dataIndex: "mkmjPermission", + render: (_, record) => getLabelName({ list: STATUS_ENUM, status: record.mkmjPermission }), }, { title: "操作", @@ -78,7 +95,7 @@ function List(props) { onUpdateStatus(record); }} > - {record.todo7 === 1 ? "关闭" : "开启"} + {record.mkmjPermission === 1 ? "关闭" : "开启"} 口门权限
getLabelName({ list: STATUS_ENUM, status: record.todo7 }), + dataIndex: "mkmjPermission", + render: (_, record) => getLabelName({ list: STATUS_ENUM, status: record.mkmjPermission }), }, { title: "操作", @@ -72,15 +49,6 @@ function List(props) { fixed: "right", render: (_, record) => ( -
( - + {props.type !== "view" && ( + + )} { urlState.departmentId !== "" && ( + {props.type !== "view" && ( + + )} - {record.auditFlag === 3 && ( + {(props.type !== "view" && record.auditFlag === 3) && (