中转航站视图跳转到航班视图参数问题、行李详情页样式问题

src/views/newBagDetails/index.vue

@@ -12,8 +12,10 @@
             </div>
           </el-col>
           <el-col :span="20">
-            <el-scrollbar ref="scrollPane" class="tags-view-wrapper">
-              <div v-for="(item,index) in detailsArr" class="tags-view-item" @click="tagClick(item,index)" :class="activeIndex == index ? 'active' : ''" :key="index">{{ item.luggageNum }}</div>
+            <el-scrollbar>
+              <div class="tags-view-wrapper">
+                <div v-for="(item,index) in detailsArr" class="tags-view-item" @click="tagClick(item,index)" :class="activeIndex == index ? 'active' : ''" :key="index">{{ item.luggageNum }}</div>
+              </div>
             </el-scrollbar>
           </el-col>
         </el-row>
@@ -269,38 +271,40 @@ export default {
         overflow: hidden;
         display: inline-block;
       }
-      .tags-view-wrapper {
-        width: calc(100%);
-        ::v-deep .is-vertical {
-          display: none;
+      .el-scrollbar {
+        height: 64px;
+        ::-webkit-scrollbar {
+          height: 0;
         }
-        .tags-view-item {
-          display: inline-block;
-          position: relative;
-          cursor: pointer;
-          height: 32px;
-          line-height: 32px;
-          // border: 1px solid #767eba;
-          // border-radius: 4px;
-          font-size: 14px;
-          font-family: Microsoft YaHei;
-          font-weight: 400;
-          color: #aaacb2;
-          margin-right: 100px;
-          &:last-child {
-            margin-right: 0;
-          }
-          &.active {
-            color: #fff;
+        .tags-view-wrapper {
+          display: flex;
+          .tags-view-item {
             position: relative;
-            &::after {
-              position: absolute;
-              content: "";
-              width: 100%;
-              left: 0;
-              bottom: 0;
-              height: 3px;
-              background: #2d67e3;
+            cursor: pointer;
+            height: 64px;
+            line-height: 64px;
+            // border: 1px solid #767eba;
+            // border-radius: 4px;
+            font-size: 14px;
+            font-family: Microsoft YaHei;
+            font-weight: 400;
+            color: #aaacb2;
+            margin-right: 100px;
+            &:last-child {
+              margin-right: 0;
+            }
+            &.active {
+              color: #fff;
+              position: relative;
+              &::after {
+                position: absolute;
+                content: "";
+                width: 100%;
+                left: 0;
+                bottom: 0;
+                height: 3px;
+                background: #2d67e3;
+              }
             }
           }
         }

src/views/newQuery/components/table.vue

@@ -604,14 +604,26 @@ export default {
           item => item.relation_data == column.property
         )[0]
         if (clickBtn) {
-          const { open_method, route_info, pass_parameters } = clickBtn
+          const { open_method, route_info, pass_parameters, relation_data } = clickBtn
           if (open_method == 2) {
             if (pass_parameters) {
               const query = pass_parameters.split(',')
               const obj = {}
-              query.forEach(item => {
-                obj[item] = row[item]
+              query.forEach(key => {
+                obj[key] = row[key]
               })
+              if (relation_data === 'Inbound_flight_number') {
+                obj.outAirport = obj.inbound_flights_departure_airport
+                obj.landAirport = obj.current_airport
+                delete obj.current_airport
+                delete obj.inbound_flights_departure_airport
+              }
+              if (relation_data === 'departure_flights_number') {
+                obj.outAirport = obj.current_airport
+                obj.landAirport = obj.departure_flights_destination_airport
+                delete obj.current_airport
+                delete obj.departure_flights_destination_airport
+              }
               this.$router.push({
                 path: route_info,
                 query: obj,
@@ -628,9 +640,20 @@ export default {
       exportToExcel(table, `${this.downName || this.AqueryParams.auth_name}`, fileName)
     },
     formatter (row, column, cellValue, index) {
-      const sameColumn = this.tableCols.find(
-        col => col.columnName === column.property
-      )
+      let sameColumn = null
+      this.tableCols.some(col => {
+        if (col.columnName === column.property) {
+          sameColumn = col
+          return true
+        } else if (col.children) {
+          col.children.some(childCol => {
+            if (childCol.columnName === column.property) {
+              sameColumn = childCol
+              return true
+            }
+          })
+        }
+      })
       if (sameColumn && this.fromDataType(sameColumn.dataType) === 'datetime') {
         return (cellValue ?? '').replace('T', ' ')
       }