zcloud_gbs
/
zcloud-gbs-primeport-react
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

人员进出记录修改

master
853931625@qq.com 2026-08-27 16:05:09 +08:00
parent 3144572369
commit d1a40d593c
8 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/api/enclosedAreaVehicleApply/index.js
View File

@ -14,7 +14,7 @@ export const enclosedAreaVehicleApplyInfo = declareRequest(
);
export const enclosedAreaVehicleApplyVehicleList = declareRequest(
"enclosedAreaVehicleApplyLoading",
`Get > /primeport/closedAreaCarApply/getCarByCarBelongType`,
`Get > /primeport/vehicleApply/getCarByVehicleBelongType`,
);
export const enclosedAreaVehicleApplySave = declareRequest(
"enclosedAreaVehicleApplyLoading",
@ -24,3 +24,4 @@ export const enclosedAreaVehicleApplyRecordsAccessRecordsList = declareRequest(
"enclosedAreaVehicleApplyLoading",
`Post > @/primeport/`,
);

4
src/api/stockPersonnelAndVehicles/index.js
View File

@ -21,9 +21,9 @@ export const stockPersonnelAndVehiclesAuthorization = declareRequest(
`Post > @/primeport/personApply/authorization`,
);
export const stockPersonnelAndVehiclesVehicleManagementVehicleRecordsList
= declareRequest("stockPersonnelAndVehiclesLoading", `Post > @/primeport/`);
= declareRequest("stockPersonnelAndVehiclesLoading", `Post > @/primeport/dahuaVehicleAccessRecord/list`);
export const mkmjSwipeCardRecordList = declareRequest(
"stockPersonnelAndVehiclesLoading",
`Post > @/primeport/dahuaAccessRecord/list`,
`Post > @/primeport/closedArea/personInOutRecord`,
)

2
src/pages/Container/Enterprise/EnclosedArea/EnterprisePersonnelPermissions/List/index.js
View File

@ -125,7 +125,7 @@ function List(props) {
<Button
type="link"
onClick={() => {
props.history.push(`./personnelRecords?userCard=${record.id}`);
props.history.push(`./personnelRecords?userCard=${record.userIdCard}&deptId=${record.deptId}`);
}}
>
人员进出记录

14
src/pages/Container/Enterprise/EnclosedArea/EnterprisePersonnelPermissions/PersonnelRecords/index.js
View File

@ -20,9 +20,9 @@ function PersonnelRecords(props) {
form,
usePermission:false,
transform: values => ({
swingTimeStart: values.time?.[0] ? `${values.time?.[0]} 00:00:00` : undefined,
swingTimeEnd: values.time?.[1] ? `${values.time?.[1]} 23:59:59` : undefined,
userId: query.userCard
userCard: query.userCard,
deptId: query.deptId
// cardNo: window.btoa("130302197401180816")
}),
@ -32,8 +32,8 @@ function PersonnelRecords(props) {
<Page headerTitle="人员进出记录">
<Search
options={[
{ name: "time", label: "进出港时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
{ name: "mkmjName", label: "口门名称" },
{ name: "timeRange", label: "进出港时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
{ name: "doorName", label: "口门名称" },
]}
onFinish={getData}
form={form}
@ -41,8 +41,8 @@ function PersonnelRecords(props) {
<Table
columns={[
{ title: "姓名", dataIndex: "personName" },
{ title: "进出港时间", dataIndex: "swingTime" },
{ title: "口门名称", dataIndex: "mkmjName" },
{ title: "进出港时间", dataIndex: "eventTime" },
{ title: "口门名称", dataIndex: "doorName" },
{ title: "开门类型", dataIndex: "enterOrExit",render:(_, record) => (record.enterOrExit ===1?"进":record.enterOrExit ===2?"出":record.enterOrExit ===3?"进出":"") },
]}
{...tableProps}

1
src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/VehicleEntryAndExitRecords/index.js
View File

@ -45,7 +45,6 @@ function VehicleEntryAndExitRecords(props) {
<Table
options={false}
columns={[
{ title: "车辆类型", dataIndex: "carTypeName" },
{ title: "车牌号", dataIndex: "plateNo" },
{ title: "车辆类型", dataIndex: "carTypeName" },
{ title: "通道名称", dataIndex: "laneName" },

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

@ -119,7 +119,7 @@ function List(props) {
type="link"
onClick={() => {
// TODO
props.history.push(`./personnelRecords?userCard=${record.userId}`);
props.history.push(`./personnelRecords?userCard=${record.userId}&deptId=${record.deptId}`);
}}
>
人员进出记录

13
src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/PersonnelRecords/index.js
View File

@ -21,9 +21,8 @@ function PersonnelRecords(props) {
form,
usePermission:false,
transform: values => ({
swingTimeStart: values.time?.[0] ? `${values.time?.[0]} 00:00:00` : undefined,
swingTimeEnd: values.time?.[1] ? `${values.time?.[1]} 23:59:59` : undefined,
userId: query.userCard,
userCard: query.userCard,
deptId: query.deptId
// cardNo: window.btoa("130302197401180816")
}),
@ -33,8 +32,8 @@ function PersonnelRecords(props) {
<Page headerTitle="人员进出记录">
<Search
options={[
{ name: "time", label: "进出港时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
{ name: "mkmjName", label: "口门名称" },
{ name: "timeRange", label: "进出港时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
{ name: "doorName", label: "口门名称" },
]}
onFinish={getData}
form={form}
@ -42,8 +41,8 @@ function PersonnelRecords(props) {
<Table
columns={[
{ title: "姓名", dataIndex: "personName" },
{ title: "进出港时间", dataIndex: "swingTime" },
{ title: "口门名称", dataIndex: "mkmjName" },
{ title: "进出港时间", dataIndex: "eventTime" },
{ title: "口门名称", dataIndex: "doorName" },
{ title: "开门类型", dataIndex: "enterOrExit",render:(_, record) => (record.enterOrExit ===1?"进":record.enterOrExit ===2?"出":record.enterOrExit ===3?"进出":"") },
]}
{...tableProps}

22
src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/VehicleManagement/VehicleRecords/index.js
View File

@ -19,7 +19,13 @@ function VehicleRecords(props) {
const query = useGetUrlQuery();
const { tableProps, getData } = useTable(props["stockPersonnelAndVehiclesVehicleManagementVehicleRecordsList"], {
form,
params: { id: query.id },
params: { carNum: query.licenceNo },
transform: values => ({
enterTimeStart: values.time?.[0] ? `${values.time?.[0]} 00:00:00` : undefined,
enterTimeEnd: values.time?.[1] ? `${values.time?.[1]} 23:59:59` : undefined,
exitTimeStart: values.vehicleDepartureTime?.[0] ? `${values.vehicleDepartureTime?.[0]} 00:00:00` : undefined,
exitTimeEnd: values.vehicleDepartureTime?.[1] ? `${values.vehicleDepartureTime?.[1]} 23:59:59` : undefined,
}),
});
return (
@ -34,16 +40,16 @@ function VehicleRecords(props) {
/>
<Table
columns={[
{ title: "车辆所属人", dataIndex: "vehicleContactName" },
{ title: "车牌号", dataIndex: "vehiclePlateNumber" },
{ title: "车辆所属人", dataIndex: "vehicleOwnerName" },
{ title: "车牌号", dataIndex: "carNum" },
{
title: "车辆在港状态",
dataIndex: "vehicleArrivalStatus",
dataIndex: "vehiclePortStatus",
},
{ title: "入港闸口", dataIndex: "vehicleArrivalBarrier" },
{ title: "进港时间", dataIndex: "vehicleArrivalTime" },
{ title: "离港闸口", dataIndex: "vehicleDepartureBarrier" },
{ title: "离港时间", dataIndex: "vehicleDepartureTime" },
{ title: "入港闸口", dataIndex: "enterSluiceChannelName" },
{ title: "进港时间", dataIndex: "enterTime" },
{ title: "离港闸口", dataIndex: "exitTime" },
{ title: "离港时间", dataIndex: "exitSluiceChannelName" },
]}
{...tableProps}
/>