1

src/views/advancedQuery/views/advancedHome.vue

@@ -34,10 +34,10 @@
             class="btnAn"
             @click="gjFlag = true"
           >高级查询</button>
-          <div
+          <!-- <div
             class="setting"
             @click="show"
-          />
+          /> -->
         </div>
       </Search>
     </div>
@@ -334,6 +334,22 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="中转进航班">
+                  <el-input
+                    v-model="form.transferArrival"
+                    size="small"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="中转出航班">
+                  <el-input
+                    v-model="form.transferDeparture"
+                    size="small"
+                  />
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
         </div>
@@ -401,7 +417,9 @@ export default {
         U_Device_ID: '',
         name: '',
         pnr: '',
-        check: ''
+        check: '',
+        transferArrival:'',
+        transferDeparture:''
       },
       dataContent: [],
       rules: {
@@ -440,7 +458,7 @@ export default {
     document.querySelector('.interfaceLog_head_time_start .el-input__prefix').innerHTML = '开始：'
     document.querySelector('.interfaceLog_head_time_end .el-input__prefix i').remove()
     document.querySelector('.interfaceLog_head_time_end .el-input__prefix').innerHTML = '结束：'
-    const { FlightNO, FlightDate,name,grade,startDate,endDate,station,destination ,UDeviceID} = this.$route.query
+    const { FlightNO, FlightDate,name,grade,startDate,endDate,station,destination ,UDeviceID,transferArrival,transferDeparture} = this.$route.query
     if (FlightNO && FlightDate) {
       this.$router.replace(this.$route.path)
       const parsedTime = parseTime(new Date(FlightDate), '{y}-{m}-{d}')
@@ -493,6 +511,14 @@ export default {
       this.form['U_Device_ID'] = UDeviceID
       this.onCheckGj()
     }
+    if(transferArrival){
+      this.form['transferArrival'] = transferArrival
+      this.onCheckGj()
+    }
+    if(transferDeparture){
+      this.form['transferDeparture'] = transferDeparture
+      this.onCheckGj()
+    }
   },
   updated() {
     // table数据更新
@@ -544,7 +570,9 @@ export default {
         U_Device_ID: '',
         name: '',
         pnr: '',
-        check: ''
+        check: '',
+        transferArrival:'',
+        transferDeparture:''
       }
       if (this.timeStart == '' || this.timeEnd == '' || val == '') {
         this.$message.error('请先输入完整查询信息')
@@ -603,7 +631,7 @@ export default {
       // 参数顺序   【航班开始日期，航班结束日期，航班号，航班号，行李牌号，行李牌号，起飞站，起飞站，目的站，目的站，特殊行李类型，特殊 行李类型，旅客姓名大写拼音，旅客姓名大写拼音，pnr,pnr,值机号，值机号】
       this.dataContent = []
       this.dataContent = []
-      const { time, status, flightNumber, destination, station, grade, type, U_Device_ID, name, pnr, check } = this.form
+      const { time, status, flightNumber, destination, station, grade, type, U_Device_ID, name, pnr, check,transferArrival,transferDeparture} = this.form
       if (time && time.length) {
         this.dataContent.push(time[0])
         this.dataContent.push(time[1])
@@ -616,7 +644,9 @@ export default {
           U_Device_ID == '' &&
           name == '' &&
           pnr == '' &&
-          check == ''
+          check == ''&&
+          transferArrival == ''&&
+          transferDeparture == ''
         ) {
           this.$message.error('请先输入查询信息')
         } else {
@@ -629,6 +659,8 @@ export default {
           this.setDataContent(name)
           this.setDataContent(pnr)
           this.setDataContent(check)
+          this.setDataContent(transferArrival)
+          this.setDataContent(transferDeparture)
           this.setDataContent(U_Device_ID)
           this.statItemsQueryByStatMain(this.dataContent)
           this.gjFlag = false

src/views/baggageManagement/components/flight/index.vue

@@ -607,8 +607,9 @@ export default {
       this.$router.push({
         path: '/advance',
         query: {
-          FlightNO: row.PreFlightNO,
-          FlightDate: row.PreFlightDate
+          transferArrival: row.PreFlightNO,
+          startDate: this.queryData.FlightDate,
+          endDate: this.queryData.FlightDate,
         }
       })
     },
@@ -616,8 +617,9 @@ export default {
       this.$router.push({
         path: '/advance',
         query: {
-          FlightNO: row.TransferFlightNO,
-          FlightDate: row.TransferFlightDate
+          transferDeparture: row.TransferFlightNO,
+          startDate: this.queryData.FlightDate,
+          endDate: this.queryData.FlightDate,
         }
       })
     },