内测bug修复

jsconfig.json

@@ -3,7 +3,8 @@
     "baseUrl": "src",
     "paths": {
       "~/*": ["*"]
-    }
+    },
+    "jsx": "react"
   },
   "include": ["src"]
 }

src/api/vehicleApply/index.js

@@ -24,6 +24,10 @@ export const vehicleApplyCheckLicenceNo = declareRequest(
   "vehicleApplyLoading",
   `Get > /primeport/vehicleApply/check-licence-no`,
 );
+export const vehicleApplyCheckLicenceNoBlack = declareRequest(
+  "vehicleApplyLoading",
+  `Get > /primeport/check-licence-no-black `,
+);
 export const vehicleApplyRecordsList = declareRequest(
   "vehicleApplyLoading",
   `Post > @/primeport/`,

src/pages/Container/Mobile/firstLevelDoor/PersonnelApplication/Apply/index.js

@@ -28,6 +28,7 @@ import {
   NS_ENCLOSED_AREA,
   NS_FIRST_LEVEL_DOOR_INFO,
   NS_MOBILE,
+  NS_VEHICLE_APPLY,
 } from "~/enumerate/namespace";
 import "../../../index.less";
 
@@ -367,7 +368,25 @@ function Apply(props) {
               <Form.Item
                 name="licenceNo"
                 label="车牌号"
-                rules={[{ required: true }, { pattern: LICENSE_PLATE_NUMBER, message: "请输入正确的车牌号" }]}
+                validateTrigger={["onChange", "onBlur"]}
+                rules={[
+                  { required: true },
+                  { pattern: LICENSE_PLATE_NUMBER, message: "请输入正确的车牌号" },
+                  {
+                    validator: async (_, value) => {
+                      if (value) {
+                        const { data } = await props["vehicleApplyCheckLicenceNoBlack"]({
+                          licenceNo: value,
+                        });
+                        return data.available ? Promise.resolve() : Promise.reject(new Error(data.availableMessage));
+                      }
+                      else {
+                        Promise.resolve();
+                      }
+                    },
+                    validateTrigger: "onBlur",
+                  },
+                ]}
               >
                 <Input placeholder="请输入车牌号" />
               </Form.Item>
@@ -869,4 +888,4 @@ const SafetyNoticeAndSignature = ({ checkboxRef, signatureUrl, setNoticePopupVis
   </>
 );
 
-export default Connect([NS_MOBILE, NS_FIRST_LEVEL_DOOR_INFO, NS_APPROVER_USER, NS_ENCLOSED_AREA], true)(Apply);
+export default Connect([NS_MOBILE, NS_FIRST_LEVEL_DOOR_INFO, NS_APPROVER_USER, NS_ENCLOSED_AREA, NS_VEHICLE_APPLY], true)(Apply);

src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/Add/index.js

@@ -228,7 +228,28 @@ function Add(props) {
             ),
           },
           { name: "vehicleTypeName", label: "车辆类型名称", onlyForLabel: true },
-          { name: "licenceNo", label: "车牌号", rules: [{ pattern: LICENSE_PLATE_NUMBER, message: "请输入正确的车牌号" }] },
+          {
+            name: "licenceNo",
+            label: "车牌号",
+            rules: [
+              { pattern: LICENSE_PLATE_NUMBER, message: "请输入正确的车牌号" },
+              {
+                validator: async (_, value) => {
+                  if (value) {
+                    const { data } = await props["vehicleApplyCheckLicenceNoBlack"]({
+                      licenceNo: value,
+                    });
+                    return data.available ? Promise.resolve() : Promise.reject(new Error(data.availableMessage));
+                  }
+                  else {
+                    Promise.resolve();
+                  }
+                },
+                validateTrigger: "onBlur",
+              },
+            ],
+            formItemProps: { validateTrigger: ["onChange", "onBlur"] },
+          },
           { name: "attachmentFile", label: "车辆照片", span: 24, render: (<Upload />) },
           { name: "drivingLicenseFile", label: "行驶证照片", span: 24, render: (<Upload />) },
           {

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

@@ -373,7 +373,7 @@ function Add(props) {
                           const { data } = await props["vehicleApplyCheckLicenceNo"]({
                             licenceNo: value,
                           });
-                          return data.available ? Promise.resolve() : Promise.reject(new Error("车牌号已存在"));
+                          return data.available ? Promise.resolve() : Promise.reject(new Error(data.availableMessage));
                         }
                         else {
                           Promise.resolve();

src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/Add/index.js

@@ -184,7 +184,7 @@ function Add(props) {
                       licenceNo: value,
                       id: query.id,
                     });
-                    return data.available ? Promise.resolve() : Promise.reject(new Error("车牌号已存在"));
+                    return data.available ? Promise.resolve() : Promise.reject(new Error(data.availableMessage));
                   }
                   else {
                     Promise.resolve();

src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicle/Add/index.js

@@ -10,7 +10,12 @@ import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
 import useUploadFile from "zy-react-library/hooks/useUploadFile";
 import { ID_NUMBER, LICENSE_PLATE_NUMBER, PHONE } from "zy-react-library/regular";
 import { getLabelName } from "zy-react-library/utils";
-import { NS_APPROVER_USER, NS_FIRST_LEVEL_DOOR_INFO, NS_TEMPORARY_VEHICLE } from "~/enumerate/namespace";
+import {
+  NS_APPROVER_USER,
+  NS_FIRST_LEVEL_DOOR_INFO,
+  NS_TEMPORARY_VEHICLE,
+  NS_VEHICLE_APPLY,
+} from "~/enumerate/namespace";
 
 function Add(props) {
   const [form] = FormBuilder.useForm();
@@ -73,7 +78,28 @@ function Add(props) {
           { name: "employeeVehicleUserName", label: "访问人姓名" },
           { name: "lsUserPhone", label: "手机号", rules: [{ pattern: PHONE, message: "请输入正确的手机号" }] },
           { name: "lsUserIdcard", label: "身份证号", rules: [{ pattern: ID_NUMBER, message: "请输入正确的身份证号" }] },
-          { name: "licenceNo", label: "车牌号", rules: [{ pattern: LICENSE_PLATE_NUMBER, message: "请输入正确的车牌号" }] },
+          {
+            name: "licenceNo",
+            label: "车牌号",
+            rules: [
+              { pattern: LICENSE_PLATE_NUMBER, message: "请输入正确的车牌号" },
+              {
+                validator: async (_, value) => {
+                  if (value) {
+                    const { data } = await props["vehicleApplyCheckLicenceNoBlack"]({
+                      licenceNo: value,
+                    });
+                    return data.available ? Promise.resolve() : Promise.reject(new Error(data.availableMessage));
+                  }
+                  else {
+                    Promise.resolve();
+                  }
+                },
+                validateTrigger: "onBlur",
+              },
+            ],
+            formItemProps: { validateTrigger: ["onChange", "onBlur"] },
+          },
           {
             name: "licenceType",
             label: "车牌类型",
@@ -219,4 +245,4 @@ function Add(props) {
   );
 }
 
-export default Connect([NS_TEMPORARY_VEHICLE, NS_APPROVER_USER, NS_FIRST_LEVEL_DOOR_INFO], true)(Add);
+export default Connect([NS_TEMPORARY_VEHICLE, NS_APPROVER_USER, NS_FIRST_LEVEL_DOOR_INFO, NS_VEHICLE_APPLY], true)(Add);