diff --git a/jjb.config.js b/jjb.config.js
index 6f74de5..161dbda 100644
--- a/jjb.config.js
+++ b/jjb.config.js
@@ -20,7 +20,7 @@ module.exports = {
},
},
// 应用唯一标识符
- appIdentifier: "primeport",
+ appIdentifier: "primeport-h5",
// 应用上下文注入全局变量
contextInject: {
// 应用Key
diff --git a/src/api/enclosedPersonnelAndVehicleStatistics/index.js b/src/api/enclosedPersonnelAndVehicleStatistics/index.js
index 4864cd7..9143b91 100644
--- a/src/api/enclosedPersonnelAndVehicleStatistics/index.js
+++ b/src/api/enclosedPersonnelAndVehicleStatistics/index.js
@@ -2,7 +2,7 @@ import { declareRequest } from "@cqsjjb/jjb-dva-runtime";
export const enclosedPersonnelAndVehicleStatisticsList = declareRequest(
"enclosedPersonnelAndVehicleStatisticsLoading",
- `Post > @/primeport/vehicleApply/fgsCount`,
+ `Post > @/primeport/closedArea/count`,
);
export const enclosedPersonnelAndVehicleStatisticsVehicleEntryAndExitRecordsList
= declareRequest(
diff --git a/src/pages/Container/Mobile/firstLevelDoor/PersonnelApplication/Apply/index.js b/src/pages/Container/Mobile/firstLevelDoor/PersonnelApplication/Apply/index.js
index 2c0bac6..27d7266 100644
--- a/src/pages/Container/Mobile/firstLevelDoor/PersonnelApplication/Apply/index.js
+++ b/src/pages/Container/Mobile/firstLevelDoor/PersonnelApplication/Apply/index.js
@@ -236,6 +236,44 @@ function Apply(props) {
columns={[ACCESS_TYPE_ENUM]}
onConfirm={(event) => {
setMkmjType(event[0]);
+ form.resetFields([
+ "tmpMkmjType",
+ "drivingUserName",
+ "applyPersonUserName",
+ "userPhone",
+ "userCard",
+ "vehicleType",
+ "vehicleTypeName",
+ "licenceType",
+ "licenceTypeName",
+ "licenceNo",
+ "visitStartTime",
+ "visitEndTime",
+ "hgAuthArea",
+ "hgAuthAreaName",
+ "levelOneMkmjId",
+ "levelOneMkmjName",
+ "jurisdictionalCorpId",
+ "jurisdictionalCorpName",
+ "closedAreaId",
+ "closedAreaName",
+ "levelTwoMkmjId",
+ "levelTwoMkmjName",
+ "vehicleLicensePhoto",
+ "vehiclePhoto",
+ "facePhoto",
+ "applyReason",
+ "auditPersonUserId",
+ "auditPersonUserName",
+ "auditPersonCorpId",
+ "auditPersonCorpName",
+ "auditPersonDepartmentId",
+ "auditPersonDepartmentName",
+ "safetyNoticeAgreed",
+ "signature",
+ ]);
+ setSignatureUrl("");
+ checkboxRef.current?.uncheck?.();
form.setFieldValue("tmpMkmjType", "");
form.setFieldValue("vehicleTypeName", "");
form.setFieldValue("licenceTypeName", "");
@@ -262,6 +300,7 @@ function Apply(props) {
{tmpApplyType && (
{
if (value) {
@@ -319,7 +318,7 @@ const SelectEntourageModalComponent = (props) => {
}
else {
let personBelongType = 1;
- if (props.entrance === "enterprise")
+ if (props.entrance === "enterprise")F
personBelongType = 2;
return { personBelongType };
}
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 07811a3..d7d86eb 100644
--- a/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/Add/index.js
+++ b/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/Add/index.js
@@ -192,7 +192,6 @@ function Add(props) {
render: (
{
if (value) {
diff --git a/src/pages/Container/Supervision/EnclosedArea/AreaAndEntrance/EnclosedAreaDoor/List/index.js b/src/pages/Container/Supervision/EnclosedArea/AreaAndEntrance/EnclosedAreaDoor/List/index.js
index b9a9936..dc18ea6 100644
--- a/src/pages/Container/Supervision/EnclosedArea/AreaAndEntrance/EnclosedAreaDoor/List/index.js
+++ b/src/pages/Container/Supervision/EnclosedArea/AreaAndEntrance/EnclosedAreaDoor/List/index.js
@@ -231,6 +231,16 @@ const AddModalComponent = (props) => {
}, [mkmjAreaJurisdictionalCorpId]);
const onSubmit = async (values) => {
+ if (
+ Number(values.outDirectionType) === 2
+ && values.outDirectionArea
+ && values.closedAreaId
+ && String(values.outDirectionArea) === String(values.closedAreaId)
+ ) {
+ message.warning("口门离开区域不能和封闭区域重复");
+ return;
+ }
+
const { success } = await props[!props.id ? "firstLevelDoorInfoAdd" : "firstLevelDoorInfoEdit"]({
...values,
mkmjLevel,
diff --git a/src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/List/index.js b/src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/List/index.js
index 06f95a8..efbd125 100644
--- a/src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/List/index.js
+++ b/src/pages/Container/Supervision/EnclosedArea/PersonnelAndVehicleStatistics/List/index.js
@@ -34,16 +34,18 @@ function List(props) {
useEffect(() => {
getData();
+console.log(urlState.parentId)
}, [urlState.parentId]);
return (
(
@@ -58,7 +60,6 @@ function List(props) {
backParentIds: urlState.backParentIds.slice(0, -1),
});
}}
- ghost
>
返回
@@ -67,7 +68,7 @@ function List(props) {
)}
columns={[
- { title: "区域名称", dataIndex: "todo1", render: (_, record) => (
+ { title: "区域名称", dataIndex: "closedAreaName", render: (_, record) => (
) },
- { title: "人员现存数", dataIndex: "todo2" },
- { title: "车辆现存数", dataIndex: "todo3" },
+ { title: "人员现存数", dataIndex: "personCount" },
+ { title: "车辆现存数", dataIndex: "carCount" },
{
title: "操作",
width: 200,
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 50dc00d..91e3bc3 100644
--- a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehicles/index.js
+++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehicles/index.js
@@ -263,20 +263,37 @@ const InfoModalComponent = (props) => {
items={[
{ label: "相关方名称", children: info.vehicleCorpName },
{ label: "项目名称", children: info.projectName },
- { label: "审核人员", children: info.currentAuditUserName },
{ label: "时间范围", children: `${info.visitStartTime}-${info.visitEndTime}` },
{ label: "地域范围", children: info.gateLevelAuthArea && JSON.parse(info.gateLevelAuthArea).area.map(item => item.value).join("、") },
{ label: "驾驶人员", children: info.drivingUserName },
{ label: "车辆类型", children: info.vehicleTypeName },
{ label: "车牌类型", children: info.licenceTypeName },
{ label: "车牌号", children: info.licenceNo },
- { label: "审核状态", children: getLabelName({ list: VEHICLE_AUDIT_STATUS_ENUM, status: info.auditFlag }) },
- ...(info.auditFlag === 3 ? [{ label: "驳回原因", children: info.refusalReason }] : []),
{ label: "车辆照片", children: () },
{ label: "车辆行驶证照片", children: () },
{ label: "申请人签字", children: () },
]}
/>
+ {
+ info.auditFlag !== 1 &&(
+ <>
+ 审核信息
+
+ >
+ )
+ }
+
);
};