Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

src/views/advancedQuery/views/advancedHome.vue

@@ -54,7 +54,7 @@
         ref="table"
         max-height="100%"
         class="table"
-        :data="tableData"
+        :data="filteredTableData"
         border
         stripe
         fit
@@ -615,7 +615,45 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['clickedCells', 'queryForm'])
+    ...mapGetters(['clickedCells', 'queryForm']),
+    filteredTableData() {
+      return this.tableData.filter(item => {
+        let flag = true
+        Object.entries(this.filterValues).forEach(([key, value]) => {
+          if (value !== '' && item[key] !== value) {
+            flag = false
+          }
+        })
+        return flag
+      })
+    }
+  },
+  watch: {
+    filteredTableData: {
+      handler(val) {
+        this.spanArr = []
+        let contactDot = this.contactDot
+        val.forEach((item, index, arr) => {
+          if (index === 0) {
+            this.spanArr.push(1)
+          } else {
+            if (
+              item['FlightNO'] === arr[index - 1]['FlightNO'] &&
+              item['FlightDate'] === arr[index - 1]['FlightDate'] &&
+              item['PassengerNameUpcase'] === arr[index - 1]['PassengerNameUpcase'] &&
+              item['BagWeight'] === arr[index - 1]['BagWeight']
+            ) {
+              this.spanArr[contactDot] += 1
+              this.spanArr.push(0)
+            } else {
+              this.spanArr.push(1)
+              contactDot = index
+            }
+          }
+        })
+      },
+      deep: true
+    }
   },
   created() {
     // console.log(this.$store.state.app.queryForm)
@@ -689,11 +727,7 @@ export default {
       this.$refs['dialog'].focus()
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      if (
-        ['FlightDate', 'DepartureTime', 'SourceAirport', 'TargetAirport', 'PassengerNameUpcase', 'BagWeight'].includes(
-          column.property
-        )
-      ) {
+      if (['PassengerNameUpcase', 'BagWeight'].includes(column.property)) {
         const _row = this.spanArr[rowIndex]
         const _col = _row > 0 ? 1 : 0
         return {
@@ -719,6 +753,9 @@ export default {
       }
       return classString
     },
+    sortChangeHandler({ column, prop, order }) {
+      console.log(column, prop, order)
+    },
     cellClickHandler(row, column, cell, event) {
       if (['FlightNO', 'TransferFlightNO', 'BagSN'].includes(column.property)) {
         this.$store.dispatch('keepAlive/addClickedCell', {
@@ -918,24 +955,10 @@ export default {
               }
             }
           }
-          const tableData = this._.sortBy(result, ['FlightNO', 'FlightDate'])
-          this.spanArr = []
-          let contactDot = this.contactDot
+          const tableData = this._.sortBy(result, ['FlightDate', 'FlightNO', 'PassengerNameUpcase', 'BagWeight'])
           this.tableData = tableData.map((item, index, arr) => {
-            item.index = index
             item['deleted'] === 'DEL' || (item['deleted'] = '')
             item['activated'] = item['activated'] === 'I' ? '未激活' : '激活'
-            if (index === 0) {
-              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)
-              } else {
-                this.spanArr.push(1)
-                contactDot = index
-              }
-            }
             return item
           })
           setTableFilters(this.tableData, this.tableDataFilters)

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-25 17:55:08
+ * @LastEditTime: 2022-05-26 09:24:39
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -167,7 +167,7 @@
           :width="col.width"
           :formatter="tableFormat"
         >
-          <template slot="header">
+          <template #header>
             <el-tooltip
               :content="col.label"
               placement="top"
@@ -463,7 +463,6 @@ export default {
         if (item.hasTakenOff === 0) {
           this.leaveCount++
         }
-        item['waitfanj'] = item['noCheckInNumber'] - item['unLoad']
         item['loadNumberCopy'] = item['loadNumber']
         this.baggageCount = this.baggageCount + item.preLoad
       })
@@ -475,10 +474,6 @@ export default {
       //    // 这里输入数字即可调用
       // }, 2000);
     },
-    filterHandler(value, row, column) {
-      const property = column['property']
-      return row[property] === value
-    },
     setNumberTransform() {
       const numberItems = this.$refs.numberItem // 拿到数字的ref，计算元素数量
       const numberArr = this.orderNum.filter(item => !isNaN(item))

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-25 18:41:54
+ * @LastEditTime: 2022-05-26 09:56:00
  * @LastEditors: your name
  * @Description: 航班视图
 -->
@@ -284,7 +284,7 @@
         </div>
         <el-table
           ref="flightBaggageTable"
-          :data="flightBaggageTableData"
+          :data="filteredTableData"
           border
           style="width: 100%"
           height="320"
@@ -480,6 +480,19 @@ export default {
       warningContainers: []
     }
   },
+  computed: {
+    filteredTableData() {
+      return this.flightBaggageTableData.filter(item => {
+        let flag = true
+        Object.entries(this.filterValues).forEach(([key, value]) => {
+          if (value !== '' && item[key] !== value) {
+            flag = false
+          }
+        })
+        return flag
+      })
+    }
+  },
   created() {
     this.queryData = this._.cloneDeep(this.$route.query)
     // console.log(this.queryData)

src/views/baggageManagement/mixins/terminal.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Badguy
  * @Date: 2022-03-04 11:41:55
- * @LastEditTime: 2022-05-25 17:55:03
+ * @LastEditTime: 2022-05-26 10:25:59
  * @LastEditors: your name
  * @Description: 航站视图通用部分
  * have a nice day!
@@ -230,10 +230,10 @@ export default {
           this.$router.push({
             path: '/advance',
             query: {
-              FlightNO: row.FlightNO,
-              transferArrival: row.PreFlightNO,
-              startDate: row.FlightDate,
-              endDate: row.FlightDate
+              FlightNO: row.PreFlightNO,
+              transferDeparture: row.FlightNO,
+              startDate: row.PreFlightDate,
+              endDate: row.PreFlightDate
             }
           })
           break
@@ -241,10 +241,10 @@ export default {
           this.$router.push({
             path: '/advance',
             query: {
-              FlightNO: row.PreFlightNO,
-              transferDeparture: row.FlightNO,
-              startDate: row.PreFlightDate,
-              endDate: row.PreFlightDate
+              FlightNO: row.FlightNO,
+              transferArrival: row.PreFlightNO,
+              startDate: row.FlightDate,
+              endDate: row.FlightDate
             }
           })
           break