Browse Source

跳转航班视图修改

zhongxiaoyu 2 years ago
parent
commit
25f15a28d3

+ 1 - 1
src/components/SimpleTable/index.vue

@@ -124,7 +124,7 @@ export default {
       const filtered = this.tableData.filter(item => {
         let flag = true
         Object.entries(this.filterValues).forEach(([key, arr]) => {
-          if (arr.length && !arr.includes(item[key])) {
+          if (arr.length && !arr.includes(String(item[key]))) {
             flag = false
           }
         })

+ 10 - 7
src/components/TableHeaderCell/index.vue

@@ -38,6 +38,7 @@
               multiple
               filterable
               default-first-option
+              collapse-tags
               clearable
               @change="newVal => { $emit('update:filter-values', newVal) }"
             >
@@ -77,12 +78,10 @@ export default {
       default: 'underline'
     },
     filterOptions: {
-      type: Array,
-      default: undefined
+      type: Array
     },
     filterValues: {
-      type: Array,
-      default: undefined
+      type: Array
     },
     sortable: {
       type: Boolean,
@@ -104,12 +103,16 @@ export default {
       return this.filterValues?.length
     },
     filterable() {
-      return this.filterOptions?.length
+      return !!this.filterOptions
     }
   },
   watch: {
-    filterValues(val) {
-      this.selections = val
+    filterValues: {
+      handler(val) {
+        this.selections = val
+      },
+      immediate: true,
+      deep: true
     }
   },
   methods: {

+ 1 - 1
src/utils/table.js

@@ -131,7 +131,7 @@ export function setTableFilters (tableData, filters) {
   })
   tableData.forEach(item => {
     Object.keys(tempSets).forEach(key => {
-      (item[key] ?? '') !== '' && tempSets[key].add(item[key])
+      (item[key] ?? '') !== '' && tempSets[key].add(String(item[key]))
     })
   })
   Object.keys(tempSets).forEach(key => {

+ 1 - 1
src/views/advancedQuery/views/advancedHome.vue

@@ -669,7 +669,7 @@ export default {
       const filtered = this.tableData.filter(item => {
         let flag = true
         Object.entries(this.filterValues).forEach(([key, arr]) => {
-          if (arr.length && !arr.includes(item[key])) {
+          if (arr.length && !arr.includes(String(item[key]))) {
             flag = false
           }
         })

+ 1 - 1
src/views/baggageManagement/components/container/index.vue

@@ -269,7 +269,7 @@ export default {
       const filtered = this.tableData.filter(item => {
         let flag = true
         Object.entries(this.filterValues).forEach(([key, arr]) => {
-          if (arr.length && !arr.includes(item[key])) {
+          if (arr.length && !arr.includes(String(item[key]))) {
             flag = false
           }
         })

+ 1 - 1
src/views/baggageManagement/components/containerHistory/index.vue

@@ -208,7 +208,7 @@ export default {
       const filtered = this.tableData.filter(item => {
         let flag = true
         Object.entries(this.filterValues).forEach(([key, arr]) => {
-          if (arr.length && !arr.includes(item[key])) {
+          if (arr.length && !arr.includes(String(item[key]))) {
             flag = false
           }
         })

+ 43 - 30
src/views/baggageManagement/components/flight/index.vue

@@ -606,7 +606,7 @@ export default {
           sortable: true
         },
         { label: '装载序号', prop: 'LoadSN' },
-        { label: '值机', prop: 'checkInTime', width: 140 },
+        { label: '值机', prop: 'checkInTime', width: 140, filterable: true },
         { label: '状态', prop: 'latestStatus', filterable: true, sortable: true },
         { label: '安检', prop: 'securityTime', width: 140 },
         { label: '分拣', prop: 'sortTime', width: 140 },
@@ -635,7 +635,7 @@ export default {
       const filtered = this.flightBaggageTableData.filter(item => {
         let flag = true
         Object.entries(this.filterValues).forEach(([key, arr]) => {
-          if (arr.length && !arr.includes(item[key])) {
+          if (arr.length && !arr.includes(String(item[key]))) {
             flag = false
           }
         })
@@ -673,7 +673,7 @@ export default {
           if (flightNO && flightDate) {
             const { flightNO: oldFlightNO, flightDate: oldFlightDate } = this.queryData
             if (flightNO !== oldFlightNO || flightDate !== oldFlightDate) {
-              this.queryData = { flightNO, flightDate }
+              this.queryData = { ...query }
               this.queryAirline([flightNO, flightDate])
             }
           } else {
@@ -736,6 +736,14 @@ export default {
     this.loading?.close()
   },
   methods: {
+    setTableFilterValues() {
+      Object.keys(this.filterValues).forEach(key => {
+        this.filterValues[key] = []
+        if (this.queryData[key]) {
+          this.filterValues[key] = [this.queryData[key]]
+        }
+      })
+    },
     rowClass({ row, rowIndex }) {
       const classes = []
       if (this.warningContainers.includes(row['containerNumber']) || row['latestStatus'] === '待翻减') {
@@ -768,10 +776,10 @@ export default {
         [
           'containerNumber',
           'preFlightNO',
-          'totalNumber',
+          // 'totalNumber',
           'inFlightNO',
           'transferFlightNO',
-          'transferNumber',
+          // 'transferNumber',
           'PassengerNameUpcase',
           'BagSN',
           'U_Device_ID'
@@ -798,10 +806,10 @@ export default {
         [
           'containerNumber',
           'preFlightNO',
-          'totalNumber',
+          // 'totalNumber',
           'inFlightNO',
           'transferFlightNO',
-          'transferNumber',
+          // 'transferNumber',
           'PassengerNameUpcase',
           'BagSN',
           'U_Device_ID'
@@ -840,17 +848,17 @@ export default {
               }
             })
             break
-          case 'totalNumber':
-            this.$router.push({
-              path: '/advance',
-              query: {
-                flightNO: this.queryData.flightNO,
-                startDate: this.queryData.flightDate,
-                endDate: this.queryData.flightDate,
-                transferArrival: row.preFlightNO
-              }
-            })
-            break
+          // case 'totalNumber':
+          //   this.$router.push({
+          //     path: '/advance',
+          //     query: {
+          //       flightNO: this.queryData.flightNO,
+          //       startDate: this.queryData.flightDate,
+          //       endDate: this.queryData.flightDate,
+          //       transferArrival: row.preFlightNO
+          //     }
+          //   })
+          //   break
           case 'inFlightNO':
             this.$router.push({
               path: `${this.$route.path.split('/').slice(0, -1).join('/')}/flightView`,
@@ -869,17 +877,17 @@ export default {
               }
             })
             break
-          case 'transferNumber':
-            this.$router.push({
-              path: '/advance',
-              query: {
-                flightNO: this.queryData.flightNO,
-                startDate: this.queryData.flightDate,
-                endDate: this.queryData.flightDate,
-                transferDeparture: row.transferFlightNO
-              }
-            })
-            break
+          // case 'transferNumber':
+          //   this.$router.push({
+          //     path: '/advance',
+          //     query: {
+          //       flightNO: this.queryData.flightNO,
+          //       startDate: this.queryData.flightDate,
+          //       endDate: this.queryData.flightDate,
+          //       transferDeparture: row.transferFlightNO
+          //     }
+          //   })
+          //   break
           case 'PassengerNameUpcase':
             this.$message.info('开发中')
             break
@@ -930,7 +938,11 @@ export default {
             sums[index] = '合计'
           } else if (
             // 需要计算的列
-            ['numberOfBags', 'totalNumber', 'transferNumber'].includes(column.property)
+            [
+              'numberOfBags'
+              // 'totalNumber',
+              // 'transferNumber'
+            ].includes(column.property)
           ) {
             const values = data.map(item => Number(item[column.property]))
             if (values.some(value => !isNaN(value))) {
@@ -1020,6 +1032,7 @@ export default {
           return item
         })
         setTableFilters(this.flightBaggageTableData, this.flightBaggageTableFilters)
+        this.setTableFilterValues()
       } catch (error) {
         this.$message.error('失败')
       }

+ 381 - 362
src/views/baggageManagement/mixins/terminal.js

@@ -7,8 +7,8 @@
  * have a nice day!
  */
 
-import { mapGetters } from "vuex";
-import { commonTableCellClass } from "@/utils/table";
+import { mapGetters } from 'vuex'
+import { commonTableCellClass } from '@/utils/table'
 
 export default {
   data() {
@@ -21,408 +21,427 @@ export default {
       spanArr: [],
       pos: 0,
       loading: false,
-      computedTableHeight: undefined,
-    };
+      computedTableHeight: undefined
+    }
   },
   created() {
-    this.setFilterAndSort(this.tableCols);
+    this.setFilterAndSort(this.tableCols)
   },
   updated() {
-    this.setTableHeight();
+    this.setTableHeight()
   },
   activated() {
-    this.setTableHeight();
+    this.setTableHeight()
   },
   computed: {
-    ...mapGetters(["clickedCells"]),
+    ...mapGetters(['clickedCells']),
     dealedTableData() {
-      const filtered = this.tableData.filter((item) => {
-        let flag = true;
+      const filtered = this.tableData.filter(item => {
+        let flag = true
         Object.entries(this.filterValues).forEach(([key, arr]) => {
-          if (arr.length && !arr.includes(item[key])) {
-            flag = false;
+          if (arr.length && !arr.includes(String(item[key]))) {
+            flag = false
           }
-        });
-        return flag;
-      });
+        })
+        return flag
+      })
       const sortRules = Object.entries(this.tableDataSortRules).reduce(
         (pre, [key, value]) => {
           if (value) {
-            pre[0].push(key);
-            value = value === "ascending" ? "asc" : "desc";
-            pre[1].push(value);
+            pre[0].push(key)
+            value = value === 'ascending' ? 'asc' : 'desc'
+            pre[1].push(value)
           }
-          return pre;
+          return pre
         },
         [[], []]
-      );
-      return this._.orderBy(filtered, sortRules[0], sortRules[1]);
-    },
+      )
+      return this._.orderBy(filtered, sortRules[0], sortRules[1])
+    }
   },
   watch: {
     dealedTableData: {
       handler(val) {
-        this.spanArr = [];
-        let contactDot = this.contactDot;
+        this.spanArr = []
+        let contactDot = this.contactDot
         val.forEach((item, index, arr) => {
           if (index === 0) {
-            this.spanArr.push(1);
+            this.spanArr.push(1)
           } else {
-            if (item["flightNO"] === arr[index - 1]["flightNO"] && item["flightDate"] === arr[index - 1]["flightDate"]) {
-              this.spanArr[contactDot] += 1;
-              this.spanArr.push(0);
+            if (
+              item['flightNO'] === arr[index - 1]['flightNO'] &&
+              item['flightDate'] === arr[index - 1]['flightDate']
+            ) {
+              this.spanArr[contactDot] += 1
+              this.spanArr.push(0)
             } else {
-              this.spanArr.push(1);
-              contactDot = index;
+              this.spanArr.push(1)
+              contactDot = index
             }
           }
-        });
+        })
       },
-      deep: true,
-    },
+      deep: true
+    }
   },
   methods: {
     // 设置表格高度
     setTableHeight() {
-      const headerHeight = 80;
-      const bottomBlankHeight = 41;
-      const formWrapHeight = this.$refs["formWrap"].offsetHeight;
-      this.computedTableHeight = `calc(100vh - ${headerHeight + bottomBlankHeight + formWrapHeight}px)`;
+      const headerHeight = 80
+      const bottomBlankHeight = 41
+      const formWrapHeight = this.$refs['formWrap'].offsetHeight
+      this.computedTableHeight = `calc(100vh - ${headerHeight + bottomBlankHeight + formWrapHeight}px)`
       this.$nextTick(() => {
-        this.$refs.table?.doLayout();
-      });
+        this.$refs.table?.doLayout()
+      })
     },
     // 设置筛选和排序
     setFilterAndSort(tableCols) {
-      const self = this;
+      const self = this
       Object.values(tableCols).forEach(({ prop, filterable, sortable, children }) => {
         if (children) {
-          self.setFilterAndSort(children);
+          self.setFilterAndSort(children)
         } else {
           if (filterable) {
-            self.$set(self.tableDataFilters, prop, []);
-            self.$set(self.filterValues, prop, []);
+            self.$set(self.tableDataFilters, prop, [])
+            self.$set(self.filterValues, prop, [])
           }
           if (sortable) {
-            self.$set(self.tableDataSortRules, prop, "");
+            self.$set(self.tableDataSortRules, prop, '')
           }
         }
-      });
+      })
     },
     // 合计行
     summaryMethod({ columns, data }) {
-      const sums = [];
+      const sums = []
       if (columns.length > 0) {
         columns.forEach((column, index) => {
           if (index === 0) {
-            sums[index] = "合计";
+            sums[index] = '合计'
           } else if (index === 1) {
-            sums[index] = "航班数:" + this.tableData.length;
+            sums[index] = '航班数:' + this.tableData.length
           } else if (
             // 需要计算的列
             [
-              "passagernum",
-              "checkNumber",
-              "not_actived",
-              "expect_load",
-              "security_all",
-              "sortNumber",
-              "loadNumber",
-              "boardID",
-              "tounLoad",
-              "OFFCount",
-              "delbag",
-              "noBSM",
-              "reach",
-              "did_not_arrive",
-              "special",
-              "claim",
-              "uninstalled",
-              "terminateArrive",
-              "terminatedNotArrived",
-              "delivered",
-              "not_shipped",
-              "container",
-              "bulk",
-              "checkInTravellerNumber",
-              "checkInNumber",
-              "unActive",
-              "preLoad",
-              "noCheckInNumber",
-              "midIn",
-              "checkIns",
-              "projectedLoad",
-              "loadedQuantity",
-              "numberOfDestinationArrivals",
-              "endPointNotReached",
-              "specialQuantity",
-              "numberOfClaims",
-              "numberToBeUninstalled",
-              "terminateArrivalQuantity",
-              "terminateUnreachedQuantity",
-              "quantityShipped",
-              "undeliveredQuantity",
-              "numberOfContainers",
-              "numberOfBulk",
-              "inTransferBaggageCount",
-              "inTransferredBaggageCount",
-              "outTransferBaggageCount",
-              "outTransferredBaggageCount",
-              "exceptions",
-              "warning",
+              'passagernum',
+              'checkNumber',
+              'not_actived',
+              'expect_load',
+              'security_all',
+              'sortNumber',
+              'loadNumber',
+              'boardID',
+              'tounLoad',
+              'OFFCount',
+              'delbag',
+              'noBSM',
+              'reach',
+              'did_not_arrive',
+              'special',
+              'claim',
+              'uninstalled',
+              'terminateArrive',
+              'terminatedNotArrived',
+              'delivered',
+              'not_shipped',
+              'container',
+              'bulk',
+              'checkInTravellerNumber',
+              'checkInNumber',
+              'unActive',
+              'preLoad',
+              'noCheckInNumber',
+              'midIn',
+              'checkIns',
+              'projectedLoad',
+              'loadedQuantity',
+              'numberOfDestinationArrivals',
+              'endPointNotReached',
+              'specialQuantity',
+              'numberOfClaims',
+              'numberToBeUninstalled',
+              'terminateArrivalQuantity',
+              'terminateUnreachedQuantity',
+              'quantityShipped',
+              'undeliveredQuantity',
+              'numberOfContainers',
+              'numberOfBulk',
+              'inTransferBaggageCount',
+              'inTransferredBaggageCount',
+              'outTransferBaggageCount',
+              'outTransferredBaggageCount',
+              'exceptions',
+              'warning'
             ].includes(column.property)
           ) {
-            const values = data.map((item) => Number(item[column.property]));
-            if (values.some((value) => !isNaN(value))) {
+            const values = data.map(item => Number(item[column.property]))
+            if (values.some(value => !isNaN(value))) {
               sums[index] = values.reduce((prev, curr) => {
-                const value = Number(curr);
+                const value = Number(curr)
                 if (!isNaN(value)) {
-                  return Number(prev) + Number(curr);
+                  return Number(prev) + Number(curr)
                 } else {
-                  return Number(prev);
+                  return Number(prev)
                 }
-              }, 0);
+              }, 0)
             } else {
-              sums[index] = 0;
+              sums[index] = 0
             }
           } else {
             // 过滤某些字段不参与计算
-            sums[index] = "-";
+            sums[index] = '-'
           }
-        });
+        })
       }
-      return sums;
+      return sums
     },
     cellClass({ row, column, rowIndex, columnIndex }) {
-      const classes = commonTableCellClass({ row, column, rowIndex, columnIndex });
+      const classes = commonTableCellClass({ row, column, rowIndex, columnIndex })
       if (
         [
-          "flightNO",
-          "preFlightNO",
-          "inTransferBaggageCount",
-          "inTransferredBaggageCount",
-          "outTransferBaggageCount",
-          "outTransferredBaggageCount",
-          "tounLoad",
-          "OFFCount",
-          "checkInNumber",
-          "unActive",
-          "preLoad",
-          "midIn",
-          "noCheckInNumber",
-          "checkNumber",
-          "sortNumber",
-          "loadNumber",
-          "boardID",
-          "checkIns",
-          "terminateArrivalQuantity",
-          "projectedLoad",
-          "loadedQuantity",
-          "numberOfDestinationArrivals",
-          "uninstalled",
-          "numberOfContainers",
-          "numberOfBulk",
-          "noBSM",
+          'flightNO',
+          'preFlightNO',
+          'inTransferBaggageCount',
+          'inTransferredBaggageCount',
+          'outTransferBaggageCount',
+          'outTransferredBaggageCount',
+          'tounLoad',
+          'OFFCount',
+          'checkInNumber',
+          'unActive',
+          'preLoad',
+          'midIn',
+          'noCheckInNumber',
+          'checkNumber',
+          'sortNumber',
+          'loadNumber',
+          'boardID',
+          'checkIns',
+          'terminateArrivalQuantity',
+          'projectedLoad',
+          'loadedQuantity',
+          'numberOfDestinationArrivals',
+          'uninstalled',
+          'numberOfContainers',
+          'numberOfBulk',
+          'noBSM'
         ].includes(column.property) &&
         row[column.property]
       ) {
-        classes.push("cell-click");
-        if (this.clickedCells.some((cell) => cell.pageName === this.$route.name && Object.entries(cell.row).every(([key, value]) => row[key] === value) && cell.columnProp === column.property)) {
-          classes.push("cell-clicked");
+        classes.push('cell-click')
+        if (
+          this.clickedCells.some(
+            cell =>
+              cell.pageName === this.$route.name &&
+              Object.entries(cell.row).every(([key, value]) => row[key] === value) &&
+              cell.columnProp === column.property
+          )
+        ) {
+          classes.push('cell-clicked')
         }
       }
-      if (column.property === "tounLoad" && row[column.property]) {
-        classes.push("cell-tounLoad");
+      if (column.property === 'tounLoad' && row[column.property]) {
+        classes.push('cell-tounLoad')
       }
-      if (column.property === "warning" && row["warningState"] && row["warningState"] == 2) {
-        classes.push("cell-tounLoad");
+      if (column.property === 'warning' && row['warningState'] && row['warningState'] == 2) {
+        classes.push('cell-tounLoad')
       }
-      if (column.property === "warning" && row["warningState"] && row["warningState"] == 1) {
-        classes.push("cell-tounLoadNew");
+      if (column.property === 'warning' && row['warningState'] && row['warningState'] == 1) {
+        classes.push('cell-tounLoadNew')
       }
-      if (column.property === "outTransferredBaggageCount" && row["warningState"] && row["warningState"] == 2) {
-        classes.push("cell-tounLoad");
+      if (column.property === 'outTransferredBaggageCount' && row['warningState'] && row['warningState'] == 2) {
+        classes.push('cell-tounLoad')
       }
-      if (column.property === "outTransferredBaggageCount" && row["warningState"] && row["warningState"] == 1) {
-        classes.push("cell-tounLoadNew");
+      if (column.property === 'outTransferredBaggageCount' && row['warningState'] && row['warningState'] == 1) {
+        classes.push('cell-tounLoadNew')
       }
-      if (column.property === "outTransferBaggageCount" && row["sharpSign"]) {
-        classes.push("cell-tounLoadNew");
+      if (column.property === 'outTransferBaggageCount' && row['sharpSign']) {
+        classes.push('cell-tounLoadNew')
       }
-      if (column.property === "inTransferredBaggageCount" && row["warningState"] && row["warningState"] == 2) {
-        classes.push("cell-tounLoad");
+      if (column.property === 'inTransferredBaggageCount' && row['warningState'] && row['warningState'] == 2) {
+        classes.push('cell-tounLoad')
       }
-      if (column.property === "inTransferredBaggageCount" && row["warningState"] && row["warningState"] == 1) {
-        classes.push("cell-tounLoadNew");
+      if (column.property === 'inTransferredBaggageCount' && row['warningState'] && row['warningState'] == 1) {
+        classes.push('cell-tounLoadNew')
       }
-      if (column.property === "inTransferBaggageCount" && row["sharpSign"]) {
-        classes.push("cell-tounLoadNew");
+      if (column.property === 'inTransferBaggageCount' && row['sharpSign']) {
+        classes.push('cell-tounLoadNew')
       }
-      return classes.join(" ");
+      return classes.join(' ')
     },
     cellClickHandler(row, column, cell, event) {
       if (
         [
-          "flightNO",
-          "preFlightNO",
-          "inTransferBaggageCount",
-          "inTransferredBaggageCount",
-          "outTransferBaggageCount",
-          "outTransferredBaggageCount",
-          "tounLoad",
-          "OFFCount",
-          "checkInNumber",
-          "unActive",
-          "preLoad",
-          "midIn",
-          "noCheckInNumber",
-          "checkNumber",
-          "sortNumber",
-          "loadNumber",
-          "boardID",
-          "checkIns",
-          "terminateArrivalQuantity",
-          "projectedLoad",
-          "loadedQuantity",
-          "numberOfDestinationArrivals",
-          "uninstalled",
-          "numberOfContainers",
-          "numberOfBulk",
-          "noBSM",
+          'flightNO',
+          'preFlightNO',
+          'inTransferBaggageCount',
+          'inTransferredBaggageCount',
+          'outTransferBaggageCount',
+          'outTransferredBaggageCount',
+          'tounLoad',
+          'OFFCount',
+          'checkInNumber',
+          'unActive',
+          'preLoad',
+          'midIn',
+          'noCheckInNumber',
+          'checkNumber',
+          'sortNumber',
+          'loadNumber',
+          'boardID',
+          'checkIns',
+          'terminateArrivalQuantity',
+          'projectedLoad',
+          'loadedQuantity',
+          'numberOfDestinationArrivals',
+          'uninstalled',
+          'numberOfContainers',
+          'numberOfBulk',
+          'noBSM'
         ].includes(column.property) &&
         row[column.property]
       ) {
-        this.$store.dispatch("keepAlive/addClickedCell", {
+        this.$store.dispatch('keepAlive/addClickedCell', {
           row,
           columnProp: column.property,
-          pageName: this.$route.name,
-        });
+          pageName: this.$route.name
+        })
         switch (column.property) {
-          case "flightNO":
+          case 'flightNO':
             this.$router.push({
               path: `${this.$route.path}/flightView`,
               query: {
                 flightNO: row.flightNO,
-                flightDate: row.flightDate,
-              },
-            });
-            break;
-          case "preFlightNO":
+                flightDate: row.flightDate
+              }
+            })
+            break
+          case 'preFlightNO':
             this.$router.push({
-              path: "/transfer/arrival/flightView",
-              query: {
-                flightNO: row.preFlightNO,
-                flightDate: row.flightDate,
-              },
-            });
-            break;
-          case "inTransferBaggageCount":
-            this.$router.push({
-              path: "/advance",
+              path: `${this.$route.path}/flightView`,
               query: {
                 flightNO: row.preFlightNO,
-                transferDeparture: row.flightNO,
-                startDate: row.preFlightDate,
-                endDate: row.preFlightDate,
-                departureStation: row.preAirport,
-                destination: this.formData.currentAirport,
-              },
-            });
-            break;
-          case "inTransferredBaggageCount":
-            this.$router.push({
-              path: "/advance",
-              query: {
-                flightNO: row.flightNO,
-                transferArrival: row.preFlightNO,
-                startDate: row.flightDate,
-                endDate: row.flightDate,
-                departureStation: this.formData.currentAirport,
-                destination: row.targetAirport,
-              },
-            });
-            break;
-          case "outTransferBaggageCount":
+                flightDate: row.flightDate
+              }
+            })
+            break
+          // case "inTransferBaggageCount":
+          //   this.$router.push({
+          //     path: "/advance",
+          //     query: {
+          //       flightNO: row.preFlightNO,
+          //       transferDeparture: row.flightNO,
+          //       startDate: row.preFlightDate,
+          //       endDate: row.preFlightDate,
+          //       departureStation: row.preAirport,
+          //       destination: this.formData.currentAirport,
+          //     },
+          //   });
+          //   break;
+          case 'inTransferBaggageCount':
+          case 'outTransferBaggageCount':
             this.$router.push({
-              path: "/advance",
+              path: `${this.$route.path}/flightView`,
               query: {
                 flightNO: row.preFlightNO,
-                transferDeparture: row.flightNO,
-                startDate: row.preFlightDate,
-                endDate: row.preFlightDate,
-                departureStation: row.preAirport,
-                destination: this.formData.currentAirport,
-              },
-            });
-            break;
-          case "outTransferredBaggageCount":
+                flightDate: row.preFlightDate,
+                transferFlightNO: row.flightNO
+              }
+            })
+            break
+          // case 'inTransferredBaggageCount':
+          //   this.$router.push({
+          //     path: '/advance',
+          //     query: {
+          //       flightNO: row.flightNO,
+          //       transferArrival: row.preFlightNO,
+          //       startDate: row.flightDate,
+          //       endDate: row.flightDate,
+          //       departureStation: this.formData.currentAirport,
+          //       destination: row.targetAirport
+          //     }
+          //   })
+          //   break
+          case 'inTransferredBaggageCount':
+          case 'outTransferredBaggageCount':
             this.$router.push({
-              path: "/advance",
+              path: `${this.$route.path}/flightView`,
               query: {
                 flightNO: row.flightNO,
-                transferArrival: row.preFlightNO,
-                startDate: row.flightDate,
-                endDate: row.flightDate,
-                departureStation: this.formData.currentAirport,
-                destination: row.targetAirport,
-              },
-            });
-            break;
-          case "tounLoad":
+                flightDate: row.flightDate,
+                inFlightNO: row.preFlightNO
+              }
+            })
+            break
+          // case 'outTransferBaggageCount':
+          //   this.$router.push({
+          //     path: '/advance',
+          //     query: {
+          //       flightNO: row.preFlightNO,
+          //       transferDeparture: row.flightNO,
+          //       startDate: row.preFlightDate,
+          //       endDate: row.preFlightDate,
+          //       departureStation: row.preAirport,
+          //       destination: this.formData.currentAirport
+          //     }
+          //   })
+          //   break
+          // case 'outTransferredBaggageCount':
+          //   this.$router.push({
+          //     path: '/advance',
+          //     query: {
+          //       flightNO: row.flightNO,
+          //       transferArrival: row.preFlightNO,
+          //       startDate: row.flightDate,
+          //       endDate: row.flightDate,
+          //       departureStation: this.formData.currentAirport,
+          //       destination: row.targetAirport
+          //     }
+          //   })
+          //   break
+          case 'tounLoad':
             this.$router.push({
-              path: "/advance",
+              path: '/advance',
               query: {
                 flightNO: row.flightNO,
                 startDate: row.flightDate,
                 endDate: row.flightDate,
                 departureStation: this.formData.currentAirport,
                 destination: row.targetAirport,
-                unLoad: 0,
-              },
-            });
-            break;
-          case "OFFCount":
+                unLoad: 0
+              }
+            })
+            break
+          case 'OFFCount':
             this.$router.push({
-              path: "/advance",
+              path: '/advance',
               query: {
                 flightNO: row.flightNO,
                 startDate: row.flightDate,
                 endDate: row.flightDate,
                 departureStation: this.formData.currentAirport,
                 destination: row.targetAirport,
-                unLoad: 1,
-              },
-            });
-            break;
-          // case 'checkInNumber':
-          //   this.$router.push({
-          //     path: '/advance',
-          //     query: {
-          //       flightNO: row.flightNO,
-          //       startDate: row.flightDate,
-          //       endDate: row.flightDate,
-          //       departureStation: this.formData.currentAirport,
-          //       destination: row.targetAirport,
-          //       checkIn: 1
-          //     }
-          //   })
-          //   break
-          case "unActive":
+                unLoad: 1
+              }
+            })
+            break
+          case 'unActive':
             this.$router.push({
-              path: "/advance",
+              path: '/advance',
               query: {
                 flightNO: row.flightNO,
                 startDate: row.flightDate,
                 endDate: row.flightDate,
                 departureStation: this.formData.currentAirport,
                 destination: row.targetAirport,
-                active: 0,
-              },
-            });
-            break;
-          case "preLoad":
+                active: 0
+              }
+            })
+            break
+          case 'preLoad':
             this.$router.push({
-              path: "/advance",
+              path: '/advance',
               query: {
                 flightNO: row.flightNO,
                 startDate: row.flightDate,
@@ -430,80 +449,80 @@ export default {
                 departureStation: this.formData.currentAirport,
                 destination: row.targetAirport,
                 active: 1,
-                canceled: 0,
-              },
-            });
-            break;
-          case "midIn":
+                canceled: 0
+              }
+            })
+            break
+          case 'midIn':
             this.$router.push({
-              path: "/advance",
+              path: '/advance',
               query: {
                 flightNO: row.flightNO,
                 startDate: row.flightDate,
                 endDate: row.flightDate,
                 departureStation: this.formData.currentAirport,
                 destination: row.targetAirport,
-                transferIn: 1,
-              },
-            });
-            break;
-          case "noCheckInNumber":
+                transferIn: 1
+              }
+            })
+            break
+          case 'noCheckInNumber':
             this.$router.push({
-              path: "/advance",
+              path: '/advance',
               query: {
                 flightNO: row.flightNO,
                 startDate: row.flightDate,
                 endDate: row.flightDate,
                 departureStation: this.formData.currentAirport,
                 destination: row.targetAirport,
-                canceled: 1,
-              },
-            });
-            break;
-          case "noBSM":
+                canceled: 1
+              }
+            })
+            break
+          case 'noBSM':
             this.$router.push({
-              path: "/advance",
+              path: '/advance',
               query: {
                 flightNO: row.flightNO,
                 startDate: row.flightDate,
                 endDate: row.flightDate,
                 departureStation: this.formData.currentAirport,
                 destination: row.targetAirport,
-                noBSM: 0,
-              },
-            });
-            break;
-          case "checkInNumber":
-          case "checkNumber":
-          case "sortNumber":
+                noBSM: 0
+              }
+            })
+            break
+          case 'checkInNumber':
+          case 'checkNumber':
+          case 'sortNumber':
             {
               const reflect = {
-                checkInNumber: "值机",
-                checkNumber: "安检",
-                sortNumber: "分拣",
-              };
+                checkInNumber: '值机',
+                checkNumber: '安检',
+                sortNumber: '分拣'
+              }
               this.$router.push({
-                path: "/advance",
+                path: '/advance',
                 query: {
                   flightNO: row.flightNO,
                   startDate: row.flightDate,
                   endDate: row.flightDate,
                   departureStation: this.formData.currentAirport,
                   destination: row.targetAirport,
-                  status: reflect[column.property],
-                },
-              });
+                  status: reflect[column.property]
+                }
+              })
             }
-            break;
-          case "loadNumber":
-          case "boardID":
+            break
+          case 'loadNumber':
+          case 'boardID':
             {
               const reflect = {
-                loadNumber: "装车",
-                boardID: "装机",
-              };
+                loadNumber: '装车',
+                boardID: '装机'
+              }
               this.$router.push({
-                path: "/advance",
+                path: '/advance',
                 query: {
                   flightNO: row.flightNO,
                   startDate: row.flightDate,
@@ -511,36 +530,36 @@ export default {
                   departureStation: this.formData.currentAirport,
                   destination: row.targetAirport,
                   status: reflect[column.property],
-                  canceled: 0,
-                },
-              });
+                  canceled: 0
+                }
+              })
             }
-            break;
-          case "checkIns":
-          case "numberOfDestinationArrivals":
-          case "uninstalled":
+            break
+          case 'checkIns':
+          case 'numberOfDestinationArrivals':
+          case 'uninstalled':
             {
               const reflect = {
-                checkIns: "值机",
-                numberOfDestinationArrivals: "到达",
-                uninstalled: "卸机",
-              };
+                checkIns: '值机',
+                numberOfDestinationArrivals: '到达',
+                uninstalled: '卸机'
+              }
               this.$router.push({
-                path: "/advance",
+                path: '/advance',
                 query: {
                   flightNO: row.flightNO,
                   startDate: row.flightDate,
                   endDate: row.flightDate,
                   departureStation: row.departureAirport,
                   destination: this.formData.currentAirport,
-                  status: reflect[column.property],
-                },
-              });
+                  status: reflect[column.property]
+                }
+              })
             }
-            break;
-          case "projectedLoad":
+            break
+          case 'projectedLoad':
             this.$router.push({
-              path: "/advance",
+              path: '/advance',
               query: {
                 flightNO: row.flightNO,
                 startDate: row.flightDate,
@@ -548,56 +567,56 @@ export default {
                 departureStation: row.departureAirport,
                 destination: this.formData.currentAirport,
                 active: 1,
-                canceled: 0,
-              },
-            });
-            break;
-          case "loadedQuantity":
+                canceled: 0
+              }
+            })
+            break
+          case 'loadedQuantity':
             this.$router.push({
-              path: "/advance",
+              path: '/advance',
               query: {
                 flightNO: row.flightNO,
                 startDate: row.flightDate,
                 endDate: row.flightDate,
                 departureStation: row.departureAirport,
                 destination: this.formData.currentAirport,
-                status: "装车",
-                canceled: 0,
-              },
-            });
-            break;
-          case "terminateArrivalQuantity":
+                status: '装车',
+                canceled: 0
+              }
+            })
+            break
+          case 'terminateArrivalQuantity':
             this.$router.push({
-              path: "/advance",
+              path: '/advance',
               query: {
                 flightNO: row.flightNO,
                 startDate: row.flightDate,
                 endDate: row.flightDate,
                 departureStation: row.departureAirport,
                 destination: this.formData.currentAirport,
-                status: "到达",
-                transferIn: 0,
-              },
-            });
-            break;
-          case "numberOfContainers":
-          case "numberOfBulk":
+                status: '到达',
+                transferIn: 0
+              }
+            })
+            break
+          case 'numberOfContainers':
+          case 'numberOfBulk':
             this.$router.push({
-              path: "/advance",
+              path: '/advance',
               query: {
                 flightNO: row.flightNO,
                 startDate: row.flightDate,
                 endDate: row.flightDate,
                 departureStation: row.departureAirport,
                 destination: this.formData.currentAirport,
-                loadType: column.property === "numberOfContainers" ? 0 : 1,
-              },
-            });
-            break;
+                loadType: column.property === 'numberOfContainers' ? 0 : 1
+              }
+            })
+            break
           default:
-            break;
+            break
         }
       }
-    },
-  },
-};
+    }
+  }
+}