高级查询取消行合并

src/views/advancedQuery/views/advancedHome.vue

@@ -63,7 +63,6 @@
         show-summary
         :cell-class-name="cellClass"
         :summary-method="summaryRow(tableData.length)"
-        :span-method="objectSpanMethod"
         @cell-click="cellClickHandler"
       >
         <el-table-column
@@ -918,7 +917,7 @@ export default {
               }
             }
           }
-          const tableData = this._.sortBy(result, ['FlightNO', 'FlightDate'])
+          const tableData = this._.sortBy(result, ['FlightNO', 'FlightDate', 'BagSN'])
           this.spanArr = []
           let contactDot = this.contactDot
           this.tableData = tableData.map((item, index, arr) => {

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))