航班查询修改

src/views/dataQuery/components/DataQueryView/index.vue

@@ -134,10 +134,15 @@ const keyWordsValidator = (rule: any, value: any, callback: any) => {
   }
   const searchTitle = searchTitleMap[props.name] ?? '关键词'
   if (!value) {
-    return callback(new Error(`请输入${searchTitle}`))
+    if (['flight'].includes(props.name)) {
+      return callback()
+    } else {
+      return callback(new Error(`请输入${searchTitle}`))
+    }
   }
   const regsMap: { [x: string]: RegExp[] } = {
-    flight: [/^[A-Za-z0-9][A-Za-z][0-9]{3,4}$/, /^[0-9]{3,4}$/],
+    // flight: [/^[A-Za-z0-9][A-Za-z][0-9]{3,4}$/, /^[0-9]{3,4}$/],
+    flight: [/^[A-Za-z0-9]{1,6}$/],
     waybill: [/^[0-9]{3}\-[0-9]{8}/],
     freight: [/^[0-9]{5}$/, /^[0-9]{3}\-[0-9]{8}\-[0-9]{5}$/],
   }
@@ -146,7 +151,7 @@ const keyWordsValidator = (rule: any, value: any, callback: any) => {
   if (notMatched) {
     return callback(new Error(`请输入正确的${searchTitle}`))
   }
-  callback()
+  return callback()
 }
 const rules = {
   startDate: [{ required: true, message: '请选择开始日期', trigger: 'blur' }],
@@ -275,9 +280,10 @@ const cellClickHandler = (row, column, cell, event) => {
     display: flex;
   }
   &-form :deep {
+    margin-right: 12px;
     flex: 1;
     display: flex;
-    margin-right: 12px;
+    justify-content: flex-end;
     .form-left {
       flex: 1;
       display: flex;