修改高级查询2

src/getMenu.js

@@ -102,7 +102,7 @@ function parseMenuItem (data) {
           title: item.auth_name,
           elSvgIcon: item.show_icon ?? 'Fold',
           show_index: item.show_index,
-          qid: item.queryTemplateID,
+          qid: item.queryTemplateID
         },
         component: Layout,
         hidden: !item.is_show,
@@ -120,6 +120,7 @@ function parseMenuItem (data) {
           qid: item.queryTemplateID,
           auth_id: item.auth_id,
           up_auth_id: item.up_auth_id,
+          keepAlive: true
         },
         component: resolve => require(['@/views' + item.file_link], resolve),
         // component: () => import('./views/table/index.vue'),

src/views/newQuery/index.vue

@@ -256,19 +256,48 @@ export default {
       }
     },
     formatQuery (key, val) {
-      const r = {
-        left: '(',
-        column: key,
-        comparator: '=',
-        value: val,
-        right: ')',
-        connector: 'and'
+      if (key == 'luggageNum') {
+        const nval = this.baggageFormat(val)
+        const ndata = nval.split(',')
+        if (ndata.length > 1) {
+          ndata.map(item => {
+            const r = {
+              left: '(',
+              column: key,
+              comparator: '=',
+              value: item,
+              right: ')',
+              connector: 'or'
+            }
+            this.searchItems.push(r)
+          })
+        } else {
+          const r = {
+            left: '(',
+            column: key,
+            comparator: '=',
+            value: val,
+            right: ')',
+            connector: 'and'
+          }
+          this.searchItems.push(r)
+        }
+      }
+      else {
+        const r = {
+          left: '(',
+          column: key,
+          comparator: '=',
+          value: val,
+          right: ')',
+          connector: 'and'
+        }
+        this.searchItems.push(r)
       }
-      this.searchItems.push(r)
       this.flag = true
       setTimeout(() => {
         this.searchInput = ''
-        this.dataQuery = _.uniqBy(this.searchItems.reverse(), key)
+        this.dataQuery = key == 'luggageNum' ? this.searchItems : _.uniqBy(this.searchItems.reverse(), key)
         this.tableTag = {
           filter: this.dataQuery
         }
@@ -314,6 +343,22 @@ export default {
         this.$refs.searchTable?.advancedQueryHandler()
       }
     },
+    baggageFormat (baggageNO) {
+      // const bagNumCA = /^CA[0-9]{6}$/
+      const bagNumShort = /^[0-9a-zA-Z][a-zA-Z][0-9]{6}$/
+      if (
+        bagNumShort.test(baggageNO) &&
+        Object.keys(AIRPORT_ID).includes(baggageNO.slice(0, 2).toUpperCase())
+      ) {
+        return Array.from(
+          { length: 10 },
+          (_, i) =>
+            `${i}${AIRPORT_ID[baggageNO.slice(0, 2).toUpperCase()]
+            }${baggageNO.slice(2)}`
+        ).join()
+      }
+      return baggageNO || null
+    },
     //确定-保存条件
     handleOk (formName) {
       this.$refs[formName].validate((valid) => {