运单查询修改、国际离港运单信息修改

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

@@ -206,7 +206,7 @@ const keyWordsValidator = (rule: any, value: any, callback: any) => {
   const regsMap: { [x: string]: RegExp[] } = {
     // flight: [/^[A-Za-z0-9][A-Za-z][0-9]{3,4}$/, /^[0-9]{3,4}$/],
     flight: [/^[0-9]{1,4}$/],
-    waybill: [/^[0-9]{8}$/, /^[0-9]{3}\-[0-9]{8}$/],
+    waybill: [/^[0-9]{8}$/, /^[0-9]{11}$/, /^[0-9]{3}\-[0-9]{8}$/],
     freight: [/^[0-9]{5}$/, /^[0-9]{3}\-[0-9]{8}\-[0-9]{5}$/],
   }
   const regs = regsMap[props.name] ?? []

src/views/dataQuery/components/DataQueryView/useTable.ts

@@ -22,7 +22,14 @@ export function useTable(
       loading.value = true
     }
     try {
-      const { startDate, endDate, keyWords, company, flightDate } = formData
+      let { startDate, endDate, keyWords, company, flightDate } = formData
+      if (
+        tableName === 'waybill' &&
+        typeof keyWords === 'string' &&
+        keyWords.length === 11
+      ) {
+        keyWords = `${keyWords.slice(0, 3)}-${keyWords.slice(3)}`
+      }
       const dataContent =
         tableName === 'flight'
           ? [keyWords || null, company || null, flightDate]

src/views/realTime/components/WaybillView/useWaybillInfo.ts

@@ -47,6 +47,11 @@ const waybillInfoItemsMap = {
       label: '运单类型',
       key: 'type',
     },
+    {
+      label: '机场代理',
+      key: 'proxy',
+      getter: info => (info.proxy === 1 ? '是' : '否'),
+    },
     {
       label: '货代公司',
       key: 'cargoCompany',
@@ -68,11 +73,6 @@ const waybillInfoItemsMap = {
       label: '目的机场',
       key: 'arriveAirport',
     },
-    {
-      label: '机场代理',
-      key: 'proxy',
-      getter: info => (info.proxy === 1 ? '是' : '否'),
-    },
   ],
 }