高级查询合并条件修改

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,18 @@ 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
+      })
+    }
   },
   created() {
     // console.log(this.$store.state.app.queryForm)
@@ -914,7 +925,7 @@ export default {
               }
             }
           }
-          const tableData = this._.sortBy(result, ['FlightDate', 'FlightNO', 'PassengerNameUpcase'])
+          const tableData = this._.sortBy(result, ['FlightDate', 'FlightNO', 'PassengerNameUpcase', 'BagWeight'])
           this.spanArr = []
           let contactDot = this.contactDot
           this.tableData = tableData.map((item, index, arr) => {
@@ -928,7 +939,8 @@ export default {
               if (
                 item['FlightNO'] === arr[index - 1]['FlightNO'] &&
                 item['FlightDate'] === arr[index - 1]['FlightDate'] &&
-                item['PassengerNameUpcase'] === arr[index - 1]['PassengerNameUpcase']
+                item['PassengerNameUpcase'] === arr[index - 1]['PassengerNameUpcase'] &&
+                item['BagWeight'] === arr[index - 1]['BagWeight']
               ) {
                 this.spanArr[contactDot] += 1
                 this.spanArr.push(0)

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)