修改高级查询缓存

src/getMenu.js

@@ -56,6 +56,13 @@ router.beforeEach(async (to, from, next) => {
           const menusArray = parseMenuItem(nd)
           const treeMenu = listToTree(menusArray, 'up_auth_id', 'auth_id')
           const dataMenu = _.unionBy(treeMenu, 'auth_id')
+          const ndatamenu = dataMenu.filter(item => item.auth_id == 212)
+          if (ndatamenu?.length) {
+            const nitemchild = ndatamenu[0].children || []
+            nitemchild.map(item => {
+              item.meta.keepAlive = true
+            })
+          }
           const menus = parseMenu(dataMenu)
 
           if (PLATFROM_CONFIG.hasStaticRoutes) {
@@ -89,11 +96,12 @@ router.beforeEach(async (to, from, next) => {
   }
 })
 
-function parseMenuItem (data) {
+function parseMenuItem (arr) {
   const menus = []
+  const data = _.cloneDeep(arr)
   data.map(item => {
     if (item.auth_type == 1) {
-      menus.push({
+      const routeParm = {
         auth_id: item.auth_id,
         up_auth_id: item.up_auth_id,
         path: item.route_info,
@@ -102,13 +110,15 @@ function parseMenuItem (data) {
           title: item.auth_name,
           elSvgIcon: item.show_icon ?? 'Fold',
           show_index: item.show_index,
-          qid: item.queryTemplateID
+          qid: item.queryTemplateID,
+          keepAlive: true
         },
         component: Layout,
         hidden: !item.is_show,
-      })
+      }
+      menus.push(routeParm)
     } else if (item.auth_type == 2) {
-      menus.push({
+      const routeParm = {
         auth_id: item.auth_id,
         up_auth_id: item.up_auth_id,
         path: item.route_info,
@@ -119,13 +129,16 @@ function parseMenuItem (data) {
           show_index: item.show_index,
           qid: item.queryTemplateID,
           auth_id: item.auth_id,
-          up_auth_id: item.up_auth_id,
-          keepAlive: item.auth_ident == 'search_page' ? true : false
+          up_auth_id: item.up_auth_id
         },
         component: resolve => require(['@/views' + item.file_link], resolve),
         // component: () => import('./views/table/index.vue'),
         hidden: !item.is_show,
-      })
+      }
+      if (item.auth_ident == 'search_page') {
+        routeParm.meta['keepAlive'] = true
+      }
+      menus.push(routeParm)
     }
   })
 

src/views/newQueryAdvance/index.vue

@@ -357,6 +357,8 @@ export default {
           value: this.carrierFlightsDate[1]
         }
       ]
+      const nss1 = [], nss2 = []
+      const NEW_DATA = []
       for (const key in NEW_FORM) {
         if (Object.hasOwnProperty.call(NEW_FORM, key)) {
           const _ele = NEW_FORM[key]
@@ -373,11 +375,59 @@ export default {
           }
         }
       }
+      NEW_PUSH.forEach(citem => {
+        const { column, value } = citem
+        if (column == 'luggageNum') {
+          const nval = this.baggageFormat(value)
+          const ndata = nval.split(',')
+          if (ndata.length > 1) {
+            ndata.map((item, index) => {
+              const r = {
+                left: index == 0 ? '(' : '',
+                column,
+                comparator: '=',
+                value: item,
+                right: ndata.length - 1 == index ? ')' : '',
+                connector: ndata.length - 1 == index ? 'and' : 'or'
+              }
+              NEW_DATA.push(r)
+            })
+          } else {
+            NEW_DATA.push(citem)
+          }
+        } else {
+          NEW_DATA.push(citem)
+        }
+      })
+      NEW_DATA.map((citem) => {
+        const { column } = citem
+        if (column == 'luggageNum') {
+          nss1.push(citem)
+        } else {
+          nss2.push(citem)
+        }
+      })
       this.tableTag = {
-        filter: NEW_PUSH
+        filter: [...nss1, ...nss2]
       }
       this.gjFlag = false
     },
+    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
+    },
     exportHandler: _.throttle(
       function (refName, tableName) {
         const table = this.$refs[refName].$el.cloneNode(true)