chenrui  2 жил өмнө
parent
commit
66e6e20296

+ 2 - 3
src/views/baggageManagement/components/transferArrival/index.vue

@@ -184,7 +184,6 @@
         :summary-method="summaryMethod"
         border
         stripe
-        @row-click="rowClick"
       >
         <el-table-column
           v-for="(item, index) in tableColsCopy"
@@ -486,10 +485,10 @@ export default {
       let arrs = [
         this.formData.inboundCarrier.length == 0
           ? ""
-          : JSON.stringify(this.formData.inboundCarrier),
+          : this.formData.inboundCarrier[0],
         this.formData.outgoingAirline.length == 0
           ? ""
-          : JSON.stringify(this.formData.outgoingAirline),
+          : this.formData.outgoingAirline[0],
       ];
       let arr = [
         this.formData.currentAirport,

+ 2 - 2
src/views/baggageManagement/components/transferDeparture/index.vue

@@ -486,10 +486,10 @@ export default {
       let arrs = [
         this.formData.inboundCarrier.length == 0
           ? ""
-          : JSON.stringify(this.formData.inboundCarrier),
+          : this.formData.inboundCarrier[0],
         this.formData.outgoingAirline.length == 0
           ? ""
-          : JSON.stringify(this.formData.outgoingAirline),
+          : this.formData.outgoingAirline[0],
       ];
       let arr = [
         this.formData.currentAirport,

+ 41 - 41
src/views/baggageManagement/mixins/form.js

@@ -206,47 +206,47 @@ export default {
       this.$refs['form'].validate(valid => {
         if (valid) {
           let az = /^[a-zA-Z]+$/
-        let azNum = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$/
-        let top2 = /^[a-zA-Z]{2}\w*$/
-        let num = /^[0-9]+$/
-        // 纯字母则为旅客姓名
-        if (az.test(this.formData.search)) {
-          this.$router.push({
-            path: '/advance',
-            query: {
-              name: this.formData.search,
-              startDate: this.formData.startDate,
-              endDate: this.formData.endDate,
-              station:this.formData.currentAirport
-            }
-          })
-        }
-        // 字母加数字且前两位为字母则为航班号
-        else if (azNum.test(this.formData.search) && top2.test(this.formData.search)) {
-          this.$router.push({
-            path: '/advance',
-            query: {
-              FlightNO: this.formData.search,
-              startDate: this.formData.startDate,
-              endDate: this.formData.endDate,
-              station:this.formData.currentAirport
-            }
-          })
-        }
-        // 纯数字且位数等于10则为行李牌号
-        else if (num.test(this.formData.search) && this.formData.search.length == 10) {
-          this.$router.push({
-            path: '/advance',
-            query: {
-              grade: this.formData.search,
-              startDate: this.formData.startDate,
-              endDate: this.formData.endDate,
-              station:this.formData.currentAirport
-            }
-          })
-        } else {
-          this.$message.error('请输入有效查询信息如航班号、旅客姓名首字母、行李牌号')
-        }
+          let azNum = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$/
+          let top2 = /^[a-zA-Z]{2}\w*$/
+          let num = /^[0-9]+$/
+          // 纯字母则为旅客姓名
+          if (az.test(this.formData.search)) {
+            this.$router.push({
+              path: '/advance',
+              query: {
+                name: this.formData.search,
+                startDate: this.formData.startDate,
+                endDate: this.formData.endDate,
+                station: this.formData.currentAirport
+              }
+            })
+          }
+          // 字母加数字且前两位为字母则为航班号
+          else if (azNum.test(this.formData.search) && top2.test(this.formData.search)) {
+            this.$router.push({
+              path: '/advance',
+              query: {
+                FlightNO: this.formData.search,
+                startDate: this.formData.startDate,
+                endDate: this.formData.endDate,
+                station: this.formData.currentAirport
+              }
+            })
+          }
+          // 纯数字且位数等于10则为行李牌号
+          else if (num.test(this.formData.search) && this.formData.search.length == 10) {
+            this.$router.push({
+              path: '/advance',
+              query: {
+                grade: this.formData.search,
+                startDate: this.formData.startDate,
+                endDate: this.formData.endDate,
+                station: this.formData.currentAirport
+              }
+            })
+          } else {
+            // this.$message.error('请输入有效查询信息如航班号、旅客姓名首字母、行李牌号')
+          }
         } else {
           return false
         }