高级查询2添加搜索

src/views/newBagDetails/components/baggageView.vue

@@ -252,12 +252,12 @@ export default {
           const { actualTakeOffTime, estimateTakeOffTime, scheduleTakeOffTime, actualLandInTime, estimateLandInTime, scheduleLandInTime } = itemObj
           newObj.newTakeoff_time = actualTakeOffTime ? actualTakeOffTime : estimateTakeOffTime ? estimateTakeOffTime : scheduleTakeOffTime
           newObj.newLand_time = actualLandInTime ? actualLandInTime : estimateLandInTime ? estimateLandInTime : scheduleLandInTime
-          newObj.takeTime = newObj.newTakeoff_time.split('T').at(-1)
-          newObj.landTime = newObj.newLand_time.split('T').at(-1)
+          newObj.takeTime = newObj.newTakeoff_time?.split('T').at(-1)
+          newObj.landTime = newObj.newLand_time?.split('T').at(-1)
           newArr[index] = Object.assign(newArr[index], newObj)
         }
       })
-      this.tableData = [...newArr]
+      this.tableData = _.orderBy([...newArr], ["landTime", "takeTime"], ["desc", "asc"]);
     }
   }
 }

src/views/newQuery/index.vue

@@ -14,11 +14,14 @@
           </div>
         </div>
         <div class="newQuery-head-right flex-wrap">
+          <el-popover placement="bottom" trigger="manual" content="请输入航班号（示例：CA1234）或行李牌号（示例：1234567890）" v-model="visible">
+            <el-input size="small" style="width: 320px;" slot="reference" prefix-icon="el-icon-search" placeholder="请输入您想要搜索的内容" clearable v-model="searchInput" @focus="visible = true" @blur="visible = false"></el-input>
+          </el-popover>
+          <el-button style="margin-left: 10px;" @click="handleSearch" size="mini" plain type="primary">查询</el-button>
           <template v-if="flag">
             <!-- <el-button @click="handleAdd" size="mini" plain type="primary">新增</el-button> -->
             <el-button @click="saveItem" size="mini" plain type="primary">保存条件</el-button>
           </template>
-          <el-button @click="handleSearch" size="mini" plain type="primary">查询</el-button>
           <el-button size="mini" class="r10" plain type="primary">
             <router-link to="/newQueryAdvance">切换</router-link>
           </el-button>
@@ -86,6 +89,8 @@ export default {
       queryBtns: [],
       flag: false,
       queryType: '',
+      searchInput: '',
+      visible: false,
       diaFlag: false,
       rmFlag: false,
       formObj: {
@@ -108,7 +113,8 @@ export default {
           { required: true, message: '请输入条件名称', trigger: 'blur' },
         ],
       },
-      nums: 1
+      nums: 1,
+      searchItems: []
     }
   },
   computed: {
@@ -250,10 +256,64 @@ export default {
         }
       }
     },
+    formatQuery (key, val) {
+      const r = {
+        left: '(',
+        column: key,
+        comparator: '=',
+        value: val,
+        right: ')',
+        connector: 'and'
+      }
+      this.searchItems.push(r)
+      this.flag = true
+      setTimeout(() => {
+        this.searchInput = ''
+        this.dataQuery = _.uniqBy(this.searchItems.reverse(), key)
+        this.tableTag = {
+          filter: this.dataQuery
+        }
+      }, 50);
+    },
     //查询
     handleSearch () {
-      this.queryType = 'query'
-      this.$refs.searchTable?.advancedQueryHandler()
+      let val = this.searchInput
+      if (val) {
+        const az = /^[a-zA-Z]+$/
+        const azNum = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$/
+        // const top2 = /^[a-zA-Z]{2}\w*$/
+        const top2 = /^([a-zA-Z][0-9])|([0-9][a-zA-Z])|([a-zA-Z]{2})/
+        const bagNum = /^[0-9]{10}$/
+        const bagNo = /^[a-zA-Z]{2}[0-9]{6}$/
+        // const bagNumCA = /^CA[0-9]{6}$/
+        const bagNumShort = /^[0-9a-zA-Z][a-zA-Z][0-9]{6}$/
+        if (azNum.test(val) && top2.test(val) && val.length < 8) {
+          // 字母加数字且前两位为字母则为航班号
+          if (val.length <= 5) {
+            const len = val.length
+            const lenCx = 6 - len
+            val = val.substring(0, 2) + '0'.repeat(lenCx) + val.substring(2, len)
+          }
+          this.formatQuery('carrierFlights', val)
+        } else if (
+          bagNum.test(val) ||
+          bagNo.test(val) ||
+          (bagNumShort.test(val) &&
+            Object.keys(AIRPORT_ID).includes(val.slice(0, 2).toUpperCase()))
+        ) {
+          // 纯数字且位数等于10则为行李牌号
+          this.formatQuery('luggageNum', val)
+        } else {
+          this.$message.error(
+            '请先输入有效查询信息如航班号、行李牌号'
+          )
+          return
+        }
+      }
+      else {
+        this.queryType = 'query'
+        this.$refs.searchTable?.advancedQueryHandler()
+      }
     },
     //确定-保存条件
     handleOk (formName) {

src/views/newQueryAdvance/index.vue

@@ -52,14 +52,14 @@
                   </template>
                   <template v-else-if="item.prop === 'No_BSM'">
                     <el-select v-model="form.noBSM" size="small" clearable @keyup.esc.native="dialogFocus">
-                      <el-option label="是" :value="1" />
-                      <el-option label="否" :value="0" />
+                      <el-option label="是" value="1" />
+                      <el-option label="否" value="0" />
                     </el-select>
                   </template>
                   <template v-else-if="item.prop === 'activeState'">
                     <el-select v-model="form.loadType" size="small" clearable @keyup.esc.native="dialogFocus">
-                      <el-option label="未激活" :value="0" />
-                      <el-option label="已激活" :value="1" />
+                      <el-option label="未激活" value="0" />
+                      <el-option label="已激活" value="1" />
                     </el-select>
                   </template>
                   <template v-else>
@@ -87,8 +87,7 @@ import Search from '@/components/SearchWithTooltip'
 import Dialog from '@/layout/components/Dialog'
 import Table from '../newQuery/components/table.vue'
 import { parseTime } from '@/utils/index'
-import { TempQuery, myQuery } from '@/api/temp'
-import { setTableFilters, exportToExcel } from '@/utils/table'
+import { exportToExcel } from '@/utils/table'
 
 export default {
   name: 'AdvancedHome',
@@ -215,40 +214,6 @@ export default {
           label: '无BSM状态',
         },
       ],
-      statusList: [
-        {
-          statusName: '值机',
-          statusCode: '值机',
-        },
-        {
-          statusName: '安检',
-          statusCode: '安检',
-        },
-        {
-          statusName: '分拣',
-          statusCode: '分拣',
-        },
-        {
-          statusName: '装车',
-          statusCode: '装车',
-        },
-        {
-          statusName: '装机',
-          statusCode: '装机',
-        },
-        {
-          statusName: '到达',
-          statusCode: '到达',
-        },
-        {
-          statusName: '卸机',
-          statusCode: '卸机',
-        },
-        // {
-        //   statusName: '已中转',
-        //   statusCode: '已中转'
-        // }
-      ],
       baggageTypeList: [],
       dataContent: [],
       rules: {
@@ -377,25 +342,24 @@ export default {
         return
       }
       const NEW_FORM = { ...this.form }
-      const NEW_PUSH = []
-      const START_TIME = {
-        column: 'carrierFlightsDate',
-        comparator: '>=',
-        connector: '',
-        left: '(',
-        right: ')',
-        value: this.carrierFlightsDate[0]
-      }
-      const END_TIME = {
-        column: 'carrierFlightsDate',
-        comparator: '<=',
-        connector: '',
-        left: '(',
-        right: ')',
-        value: this.carrierFlightsDate[1]
-      }
-      NEW_PUSH.push(START_TIME)
-      NEW_PUSH.push(END_TIME)
+      const NEW_PUSH = [
+        {
+          column: 'carrierFlightsDate',
+          comparator: '>=',
+          connector: '',
+          left: '(',
+          right: ')',
+          value: this.carrierFlightsDate[0]
+        },
+        {
+          column: 'carrierFlightsDate',
+          comparator: '<=',
+          connector: '',
+          left: '(',
+          right: ')',
+          value: this.carrierFlightsDate[1]
+        }
+      ]
       for (const key in NEW_FORM) {
         if (Object.hasOwnProperty.call(NEW_FORM, key)) {
           const _ele = NEW_FORM[key]