修改bug

jjb.config.js

@@ -20,7 +20,7 @@ module.exports = {
     },
   },
   // 应用唯一标识符
-  appIdentifier: "primeport",
+  appIdentifier: "primeport-h5",
   // 应用上下文注入全局变量
   contextInject: {
     // 应用Key

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(

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) {
         </Form.Item>
         {tmpApplyType && (
           <Form.Item
+            key={tmpApplyType || "tmpMkmjType"}
             name="tmpMkmjType"
             label="申请口门"
             rules={[{ required: true, message: "请选择选择申请口门" }]}
@@ -777,6 +816,7 @@ const EnclosedAreaFields = ({
       <input type="hidden" />
     </Form.Item>
     <Form.Item
+      key={form.getFieldValue("jurisdictionalCorpId") || "levelTwoMkmjId"}
       name="levelTwoMkmjId"
       label="口门"
       rules={[{ required: true, message: "请选择口门" }]}

src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/Add/index.js

@@ -114,7 +114,6 @@ function Add(props) {
             render: (
               <DepartmentSelectTree
                 searchType="inType"
-                level={1}
                 params={{ enterpriseType: [2] }}
                 onChange={(value) => {
                   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 };
       }

src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/Add/index.js

@@ -192,7 +192,6 @@ function Add(props) {
             render: (
               <DepartmentSelectTree
                 searchType="inType"
-                level={1}
                 params={{ enterpriseType: [2] }}
                 onChange={(value) => {
                   if (value) {

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,

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 (
     <Page isShowAllAction={false}>
       <Search
         options={[
-          { name: "todo1", label: "区域名称" },
+          { name: "closedAreaName", label: "区域名称" },
         ]}
         form={form}
         onFinish={getData}
+
       />
       <Table
         toolBarRender={() => (
@@ -58,7 +60,6 @@ function List(props) {
                       backParentIds: urlState.backParentIds.slice(0, -1),
                     });
                   }}
-                  ghost
                 >
                   返回
                 </Button>
@@ -67,7 +68,7 @@ function List(props) {
           </Space>
         )}
         columns={[
-          { title: "区域名称", dataIndex: "todo1", render: (_, record) => (
+          { title: "区域名称", dataIndex: "closedAreaName", render: (_, record) => (
             <Button
               type="link"
               onClick={() => {
@@ -77,11 +78,11 @@ function List(props) {
                 });
               }}
             >
-              {record.todo1}
+              {record.closedAreaName}
             </Button>
           ) },
-          { title: "人员现存数", dataIndex: "todo2" },
+          { title: "人员现存数", dataIndex: "personCount" },
-          { title: "车辆现存数", dataIndex: "todo3" },
+          { title: "车辆现存数", dataIndex: "carCount" },
           {
             title: "操作",
             width: 200,

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: (<PreviewImg files={info.attachmentFile} />) },
           { label: "车辆行驶证照片", children: (<PreviewImg files={info.drivingLicenseFile} />) },
           { label: "申请人签字", children: (<PreviewImg files={info.informSignFile} />) },
         ]}
       />
+      {
+        info.auditFlag !== 1 &&(
+          <>
+            <Divider orientation="left">审核信息</Divider>
+            <Descriptions
+              column={1}
+              bordered
+              styles={{ label: { width: 200 } }}
+              items={[
+                { label: "审核人员", children: info.currentAuditUserName },
+                { label: "审核状态", children: getLabelName({ list: VEHICLE_AUDIT_STATUS_ENUM, status: info.auditFlag }) },
+                ...(info.auditFlag === 3 ? [{ label: "驳回原因", children: info.refusalReason }] : []),
+                { label: "审核时间", children: info.currentAuditTime },
+
+              ]}
+            />
+          </>
+        )
+      }
+
     </div>
   );
 };