1

src/views/advancedQuery/views/advancedHome.vue

@@ -586,7 +586,7 @@ export default {
   },
   beforeDestroy () {
     this.loading = false
-    // 
+    //
     // if (this.$route.matched.filter(item => item.name && item.meta.title).length > 1) {
     //   this.$store.dispatch('app/setQueryForm', {
     //     ...this.form,
@@ -826,11 +826,11 @@ export default {
         if (az.test(val)) {
           this.form['passengerName'] = val
           this.onCheckGj(true)
-        } else if (azNum.test(val) && top2.test(val)) {
+        } else if (azNum.test(val) && top2.test(val)&&val.length < 8) {
           // 字母加数字且前两位为字母则为航班号
           this.form['flightNO'] = val
           this.onCheckGj(true)
-        } else if ((num.test(val) && val.length === 10) || bagNo.test(val)) {
+        } else if ((num.test(val) && val.length === 10) || (bagNo.test(val)&&val.length >7)) {
           // 纯数字且位数等于10则为行李牌号
           this.form['baggageNO'] = val
           this.onCheckGj(true)

src/views/baggageManagement/mixins/form.js

@@ -234,6 +234,7 @@ export default {
           // const top2 = /^[a-zA-Z]{2}\w*$/
           const top2 = /^([a-zA-Z][0-9])|([0-9][a-zA-Z])|([a-zA-Z]{2})/
           const num = /^[0-9]+$/
+          const bagNo = /^[a-zA-Z]{2}[0-9]{6}$/
           const queryData = {
             startDate: this.startDate,
             endDate: this.endDate
@@ -246,10 +247,10 @@ export default {
           if (az.test(this.formData.search)) {
             // 纯字母则为旅客姓名
             queryData['passengerName'] = this.formData.search
-          } else if (azNum.test(this.formData.search) && top2.test(this.formData.search)) {
+          } else if (azNum.test(this.formData.search) && top2.test(this.formData.search)&&this.formData.search.length <8) {
             // 字母加数字且前两位为字母则为航班号
             queryData['flightNO'] = this.formData.search
-          } else if (num.test(this.formData.search) && this.formData.search.length === 10) {
+          } else if ((num.test(this.formData.search) && this.formData.search.length === 10)||((bagNo.test(this.formData.search)&&this.formData.search.length >7))) {
             // 纯数字且位数等于10则为行李牌号
             queryData['baggageNO'] = this.formData.search
           } else {