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

src/views/advancedQuery/views/advancedHome.vue

@@ -68,16 +68,20 @@
         <el-table-column
           prop="index"
           label="序号"
+          :width="60"
         />
         <el-table-column
           prop="FlightNO"
           label="航班号"
-          :filters="FlightNOItem"
+          :filters="tableFilters.FlightNO"
           :filter-method="filterHandler"
         >
           <template slot-scope="scope">
             <el-button
               size="mini"
+              style="text-overflow: ellipsis;
+                white-space: normal;
+                word-break: break-all;"
               @click="flightClickHandler(scope.row)"
             >{{ scope.row.FlightNO }}</el-button>
           </template>
@@ -85,30 +89,31 @@
         <el-table-column
           prop="FlightDate"
           label="航班日期"
-          :filters="FlightDateItem"
+          :filters="tableFilters.FlightDate"
           :filter-method="filterHandler"
         />
         <el-table-column
           prop="SourceAirport"
           label="起飞站"
-          :filters="SourceAirportItem"
+          :filters="tableFilters.SourceAirport"
           :filter-method="filterHandler"
         />
         <el-table-column
           prop="TargetAirport"
           label="目的地"
-          :filters="TargetAirportItem"
+          :filters="tableFilters.TargetAirport"
           :filter-method="filterHandler"
         />
         <el-table-column
           prop="PassengerNameUpcase"
           label="旅客姓名"
-          :filters="PassengerNameUpcaseItem"
+          :filters="tableFilters.PassengerNameUpcase"
           :filter-method="filterHandler"
         />
         <el-table-column
           prop="BagSN"
           label="行李牌号"
+          :width="130"
         >
           <template slot-scope="scope">
             <el-button
@@ -120,19 +125,20 @@
         <el-table-column
           prop="SpecialType"
           label="特殊行李类型"
-          :filters="SpecialTypeItem"
+          :width="130"
+          :filters="tableFilters.SpecialType"
           :filter-method="filterHandler"
         />
         <el-table-column
           prop="checkIn"
           label="值机"
-          :filters="checkInItem"
+          :filters="tableFilters.checkIn"
           :filter-method="filterHandler"
         />
         <el-table-column
           label="删除"
           prop="deleted"
-          :filters="deletedItem"
+          :filters="tableFilters.deleted"
           :filter-method="filterHandler"
         >
           <!-- <template slot-scope="scope">
@@ -142,7 +148,7 @@
         <el-table-column
           label="激活"
           prop="activated"
-          :filters="activatedItem"
+          :filters="tableFilters.activated"
           :filter-method="filterHandler"
         >
           <!-- <template slot-scope="scope">
@@ -156,19 +162,19 @@
         <el-table-column
           prop="latestStatus"
           label="最新状态"
-          :filters="latestStatusItem"
+          :filters="tableFilters.latestStatus"
           :filter-method="filterHandler"
         />
         <el-table-column
           prop="bagLocation"
           label="最新位置"
-          :filters="bagLocationItem"
+          :filters="tableFilters.bagLocation"
           :filter-method="filterHandler"
         />
         <el-table-column
           prop="TransferFlightNO"
           label="中转进航班"
-          :filters="TransferFlightNOItem"
+          :filters="tableFilters.TransferFlightNO"
           :filter-method="filterHandler"
         />
       </el-table>
@@ -401,18 +407,32 @@ export default {
         //   { required: true, message: "请输入有效航班号", trigger: "blur" },
         // ],
       },
-      PassengerNameUpcaseItem: [],
-      FlightNOItem: [],
-      FlightDateItem: [],
-      SourceAirportItem: [],
-      TargetAirportItem: [],
-      SpecialTypeItem: [],
-      checkInItem: [],
-      deletedItem: [],
-      activatedItem: [],
-      latestStatusItem: [],
-      bagLocationItem: [],
-      TransferFlightNOItem: []
+      // PassengerNameUpcaseItem: [],
+      // FlightNOItem: [],
+      // FlightDateItem: [],
+      // SourceAirportItem: [],
+      // TargetAirportItem: [],
+      // SpecialTypeItem: [],
+      // checkInItem: [],
+      // deletedItem: [],
+      // activatedItem: [],
+      // latestStatusItem: [],
+      // bagLocationItem: [],
+      // TransferFlightNOItem: [],
+      tableFilters: {
+        FlightNO: [],
+        FlightDate: [],
+        SourceAirport: [],
+        TargetAirport: [],
+        PassengerNameUpcase: [],
+        SpecialType: [],
+        checkIn: [],
+        deleted: [],
+        activated: [],
+        latestStatus: [],
+        bagLocation: [],
+        TransferFlightNO: []
+      }
     }
   },
   created() {
@@ -591,11 +611,24 @@ export default {
       }
     },
     // 表格行点击处理
-    flightClickHandler(row) {
-      this.$router.push({ path: '/advance/flightView', query: row })
+    flightClickHandler({ FlightNO, FlightDate }) {
+      this.$router.push({
+        path: '/advance/flightView',
+        query: {
+          FlightNO,
+          FlightDate
+        }
+      })
     },
-    baggageClickHandler(row) {
-      this.$router.push({ path: '/advance/baggageView', query: row })
+    baggageClickHandler({ FlightNO, FlightDate, BagSN }) {
+      this.$router.push({
+        path: '/advance/baggageView',
+        query: {
+          FlightNO,
+          FlightDate,
+          BagSN
+        }
+      })
     },
     // 综合查询
     async integratedQuery(obj = {}) {
@@ -623,9 +656,12 @@ export default {
         if (res.code == 0) {
           this.tableData = res.returnData.map((item, index) => {
             item['index'] = index + 1
+            item['deleted'] = item['deleted'] === 'DEL' ? 'DEL' : ''
+            item['activated'] = item['activated'] === 'I' ? '未激活' : '已激活'
             return item
           })
-          this.getTableFilterItem()
+          // this.getTableFilterItem()
+          this.setTableFilters(this.tableData, this.tableFilters)
         } else {
           this.$message.error(res.message)
         }
@@ -649,126 +685,169 @@ export default {
         console.log('出错了', error)
       }
     },
+    // 表格添加过滤条件
+    setTableFilters(tableData, filters) {
+      const tempFilters = {}
+      const tempArrays = {}
+      Object.keys(filters).forEach(key => {
+        tempFilters[key] = []
+        tempArrays[key] = []
+      })
+      tableData.forEach(item => {
+        Object.keys(tempFilters).forEach(key => {
+          if ((item[key] ?? '') !== '' && !tempArrays[key].includes(item[key])) {
+            tempArrays[key].push(item[key])
+            tempFilters[key].push({
+              text: item[key],
+              value: item[key]
+            })
+          }
+        })
+      })
+      Object.keys(tempFilters).forEach(key => {
+        filters[key] = this._.orderBy(tempFilters[key], o => o.value)
+      })
+    },
     filterHandler(value, row, column) {
       const property = column['property']
       return row[property] === value
     },
-    getTableFilterItem() {
-      let PassengerNameUpcaseItemArr = [],
-        FlightNOItemArr = [],
-        FlightDateItemArr = [],
-        SourceAirportItemArr = [],
-        TargetAirportItemArr = [],
-        SpecialTypeItemArr = [],
-        checkInItemArr = [],
-        deletedItemArr = [],
-        activatedItemArr = [],
-        latestStatusItemArr = [],
-        bagLocationItemArr = [],
-        TransferFlightNOItemArr = []
+    // getTableFilterItem() {
+    //   let PassengerNameUpcaseItemArr = [],
+    //     FlightNOItemArr = [],
+    //     FlightDateItemArr = [],
+    //     SourceAirportItemArr = [],
+    //     TargetAirportItemArr = [],
+    //     SpecialTypeItemArr = [],
+    //     checkInItemArr = [],
+    //     deletedItemArr = [],
+    //     activatedItemArr = [],
+    //     latestStatusItemArr = [],
+    //     bagLocationItemArr = [],
+    //     TransferFlightNOItemArr = []
 
-      this.PassengerNameUpcaseItem.length = 0
-      this.FlightNOItem.length = 0
-      this.FlightDateItem.length = 0
-      this.SourceAirportItem.length = 0
-      this.TargetAirportItem.length = 0
-      this.SpecialTypeItem.length = 0
-      this.checkInItem.length = 0
-      this.deletedItem.length = 0
-      this.activatedItem.length = 0
-      this.latestStatusItem.length = 0
-      this.bagLocationItem.length = 0
-      this.TransferFlightNOItem.length = 0
+    //   this.PassengerNameUpcaseItem.length = 0
+    //   this.FlightNOItem.length = 0
+    //   this.FlightDateItem.length = 0
+    //   this.SourceAirportItem.length = 0
+    //   this.TargetAirportItem.length = 0
+    //   this.SpecialTypeItem.length = 0
+    //   this.checkInItem.length = 0
+    //   this.deletedItem.length = 0
+    //   this.activatedItem.length = 0
+    //   this.latestStatusItem.length = 0
+    //   this.bagLocationItem.length = 0
+    //   this.TransferFlightNOItem.length = 0
 
-      this.tableData.forEach(item => {
-        if (PassengerNameUpcaseItemArr.indexOf(item.PassengerNameUpcase) == -1 && item.PassengerNameUpcase != ''&& item.PassengerNameUpcase != null) {
-          PassengerNameUpcaseItemArr.push(item.PassengerNameUpcase)
-          this.PassengerNameUpcaseItem.push({
-            text: item.PassengerNameUpcase,
-            value: item.PassengerNameUpcase
-          })
-        }
-        if (FlightNOItemArr.indexOf(item.FlightNO) == -1 && item.FlightNO != ''&& item.FlightNO != null) {
-          FlightNOItemArr.push(item.FlightNO)
-          this.FlightNOItem.push({
-            text: item.FlightNO,
-            value: item.FlightNO
-          })
-        }
+    //   this.tableData.forEach(item => {
+    //     if (
+    //       PassengerNameUpcaseItemArr.indexOf(item.PassengerNameUpcase) == -1 &&
+    //       item.PassengerNameUpcase != '' &&
+    //       item.PassengerNameUpcase != null
+    //     ) {
+    //       PassengerNameUpcaseItemArr.push(item.PassengerNameUpcase)
+    //       this.PassengerNameUpcaseItem.push({
+    //         text: item.PassengerNameUpcase,
+    //         value: item.PassengerNameUpcase
+    //       })
+    //     }
+    //     if (FlightNOItemArr.indexOf(item.FlightNO) == -1 && item.FlightNO != '' && item.FlightNO != null) {
+    //       FlightNOItemArr.push(item.FlightNO)
+    //       this.FlightNOItem.push({
+    //         text: item.FlightNO,
+    //         value: item.FlightNO
+    //       })
+    //     }
 
-        if (FlightDateItemArr.indexOf(item.FlightDate) == -1 && item.FlightDate != ''&& item.FlightDate != null) {
-          FlightDateItemArr.push(item.FlightDate)
-          this.FlightDateItem.push({
-            text: item.FlightDate,
-            value: item.FlightDate
-          })
-        }
-        if (SourceAirportItemArr.indexOf(item.SourceAirport) == -1 && item.SourceAirport != ''&& item.SourceAirport != null) {
-          SourceAirportItemArr.push(item.SourceAirport)
-          this.SourceAirportItem.push({
-            text: item.SourceAirport,
-            value: item.SourceAirport
-          })
-        }
-        if (TargetAirportItemArr.indexOf(item.TargetAirport) == -1 && item.TargetAirport != ''&& item.TargetAirport != null) {
-          TargetAirportItemArr.push(item.TargetAirport)
-          this.TargetAirportItem.push({
-            text: item.TargetAirport,
-            value: item.TargetAirport
-          })
-        }
-        if (SpecialTypeItemArr.indexOf(item.SpecialType) == -1 && item.SpecialType != ''&& item.SpecialType != null) {
-          SpecialTypeItemArr.push(item.SpecialType)
-          this.SpecialTypeItem.push({
-            text: item.SpecialType,
-            value: item.SpecialType
-          })
-        }
+    //     if (FlightDateItemArr.indexOf(item.FlightDate) == -1 && item.FlightDate != '' && item.FlightDate != null) {
+    //       FlightDateItemArr.push(item.FlightDate)
+    //       this.FlightDateItem.push({
+    //         text: item.FlightDate,
+    //         value: item.FlightDate
+    //       })
+    //     }
+    //     if (
+    //       SourceAirportItemArr.indexOf(item.SourceAirport) == -1 &&
+    //       item.SourceAirport != '' &&
+    //       item.SourceAirport != null
+    //     ) {
+    //       SourceAirportItemArr.push(item.SourceAirport)
+    //       this.SourceAirportItem.push({
+    //         text: item.SourceAirport,
+    //         value: item.SourceAirport
+    //       })
+    //     }
+    //     if (
+    //       TargetAirportItemArr.indexOf(item.TargetAirport) == -1 &&
+    //       item.TargetAirport != '' &&
+    //       item.TargetAirport != null
+    //     ) {
+    //       TargetAirportItemArr.push(item.TargetAirport)
+    //       this.TargetAirportItem.push({
+    //         text: item.TargetAirport,
+    //         value: item.TargetAirport
+    //       })
+    //     }
+    //     if (SpecialTypeItemArr.indexOf(item.SpecialType) == -1 && item.SpecialType != '' && item.SpecialType != null) {
+    //       SpecialTypeItemArr.push(item.SpecialType)
+    //       this.SpecialTypeItem.push({
+    //         text: item.SpecialType,
+    //         value: item.SpecialType
+    //       })
+    //     }
 
-        if (checkInItemArr.indexOf(item.checkIn) == -1 && item.checkIn != ''&& item.checkIn != null) {
-          checkInItemArr.push(item.checkIn)
-          this.checkInItem.push({
-            text: item.checkIn,
-            value: item.checkIn
-          })
-        }
-        if (deletedItemArr.indexOf(item.deleted) == -1 && item.deleted != ''&& item.deleted != null) {
-          deletedItemArr.push(item.deleted)
-          this.deletedItem.push({
-            text: item.deleted,
-            value: item.deleted
-          })
-        }
-        if (activatedItemArr.indexOf(item.activated) == -1 && item.activated != ''&& item.activated != null) {
-          activatedItemArr.push(item.activated)
-          this.activatedItem.push({
-            text: item.activated,
-            value: item.activated
-          })
-        }
-        if (latestStatusItemArr.indexOf(item.latestStatus) == -1 && item.latestStatus != ''&& item.latestStatus != null) {
-          latestStatusItemArr.push(item.latestStatus)
-          this.latestStatusItem.push({
-            text: item.latestStatus,
-            value: item.latestStatus
-          })
-        }
-        if (bagLocationItemArr.indexOf(item.bagLocation) == -1 && item.bagLocation != ''&& item.bagLocation != null) {
-          bagLocationItemArr.push(item.bagLocation)
-          this.bagLocationItem.push({
-            text: item.bagLocation,
-            value: item.bagLocation
-          })
-        }
-        if (TransferFlightNOItemArr.indexOf(item.TransferFlightNO) == -1 && item.TransferFlightNO != ''&& item.TransferFlightNO != null) {
-          TransferFlightNOItemArr.push(item.TransferFlightNO)
-          this.TransferFlightNOItem.push({
-            text: item.TransferFlightNO,
-            value: item.TransferFlightNO
-          })
-        }
-      })
-    },
+    //     if (checkInItemArr.indexOf(item.checkIn) == -1 && item.checkIn != '' && item.checkIn != null) {
+    //       checkInItemArr.push(item.checkIn)
+    //       this.checkInItem.push({
+    //         text: item.checkIn,
+    //         value: item.checkIn
+    //       })
+    //     }
+    //     if (deletedItemArr.indexOf(item.deleted) == -1 && item.deleted != '' && item.deleted != null) {
+    //       deletedItemArr.push(item.deleted)
+    //       this.deletedItem.push({
+    //         text: item.deleted,
+    //         value: item.deleted
+    //       })
+    //     }
+    //     if (activatedItemArr.indexOf(item.activated) == -1 && item.activated != '' && item.activated != null) {
+    //       activatedItemArr.push(item.activated)
+    //       this.activatedItem.push({
+    //         text: item.activated,
+    //         value: item.activated
+    //       })
+    //     }
+    //     if (
+    //       latestStatusItemArr.indexOf(item.latestStatus) == -1 &&
+    //       item.latestStatus != '' &&
+    //       item.latestStatus != null
+    //     ) {
+    //       latestStatusItemArr.push(item.latestStatus)
+    //       this.latestStatusItem.push({
+    //         text: item.latestStatus,
+    //         value: item.latestStatus
+    //       })
+    //     }
+    //     if (bagLocationItemArr.indexOf(item.bagLocation) == -1 && item.bagLocation != '' && item.bagLocation != null) {
+    //       bagLocationItemArr.push(item.bagLocation)
+    //       this.bagLocationItem.push({
+    //         text: item.bagLocation,
+    //         value: item.bagLocation
+    //       })
+    //     }
+    //     if (
+    //       TransferFlightNOItemArr.indexOf(item.TransferFlightNO) == -1 &&
+    //       item.TransferFlightNO != '' &&
+    //       item.TransferFlightNO != null
+    //     ) {
+    //       TransferFlightNOItemArr.push(item.TransferFlightNO)
+    //       this.TransferFlightNOItem.push({
+    //         text: item.TransferFlightNO,
+    //         value: item.TransferFlightNO
+    //       })
+    //     }
+    //   })
+    // },
 
     // 统计行数
     summaryRow(num) {

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-06 15:11:47
+ * @LastEditTime: 2022-05-07 14:23:56
  * @LastEditors: your name
  * @Description: 行李视图
 -->
@@ -26,7 +26,6 @@
       </div>
       <div class="part1_info">
         <el-row :gutter="12">
-          <!-- 第一行 -->
           <el-col
             v-for="(item, index) in baggageBasicInfoCols"
             :key="index"
@@ -109,6 +108,7 @@
         border
         stripe
         fit
+        :span-method="tableSpanMethod"
         :header-cell-style="{ color: '#101116' }"
       >
         <el-table-column
@@ -422,13 +422,44 @@ export default {
     //   if (columnIndex < 4) {
     //     const _row = this.spanArr[rowIndex]
     //     const _col = _row > 0 ? 1 : 0
-    //     // console.log(`rowspan:${_row} colspan:${_col}`)
     //     return {
     //       rowspan: _row,
     //       colspan: _col
     //     }
     //   }
     // },
+    initTableData(tableData) {
+      const spanArr = []
+      let pos = 0
+      for (let i = 0; i < tableData.length; i++) {
+        if (i === 0) {
+          spanArr.push(1)
+        } else {
+          if (
+            tableData[i]['flightNo'] === tableData[i - 1]['flightNo'] &&
+            tableData[i]['flightDate'] === tableData[i - 1]['flightDate']
+          ) {
+            spanArr[pos] += 1
+            spanArr.push(0)
+          } else {
+            spanArr.push(1)
+            pos = i
+          }
+        }
+      }
+      this.spanArr = spanArr
+      this.pos = pos
+    },
+    tableSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (['flightNo', 'flightDate'].includes(column['property'])) {
+        const _row = this.spanArr[rowIndex]
+        const _col = _row > 0 ? 1 : 0
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
+      }
+    },
     // 行李详情基础信息
     queryBaggageBasicInfo(dataContent) {
       return myQuery(queryMap.baggageBasicInfoByID, ...dataContent)
@@ -459,19 +490,18 @@ export default {
         //   item['DealTime'] = item['DealTime'].replace('T', '\n')
         //   item.NodeNameEN && this.stepData.splice(index, 1, item)
         // })
-        this.baggageTableData = this._.orderBy(baggageDetails, item => new Date(item.dealTime.replace('T', ' ')).getTime()).map(
-          (item, index) => {
-            this.stepData.splice(index, 1, {
-              NodeNameEN: item.nodeCode,
-              DealTime: item.dealTime.replace('T', '\n')
-            })
+        this.baggageTableData = baggageDetails.map((item, index) => {
+          this.stepData.splice(index, 1, {
+            NodeNameEN: item.nodeCode,
+            DealTime: item.dealTime.replace('T', '\n')
+          })
 
-            item['dealTime'] = item['dealTime'].split('T')[1]
-            item['departureAirport'] = `${item['departureAirport']}\n${item['departureTime'].split('T')[1]}`
-            item['landingAirport'] = `${item['landingAirport']}\n${item['landingTime'].split('T')[1]}`
-            return item
-          }
-        )
+          item['dealTime'] = item['dealTime'].split('T')[1]
+          item['departureAirport'] = `${item['departureAirport']}\n${item['departureTime'].split('T')[1]}`
+          item['landingAirport'] = `${item['landingAirport']}\n${item['landingTime'].split('T')[1]}`
+          return item
+        })
+        this.initTableData(this.baggageTableData)
       } catch (error) {
         console.log('错误', error)
       }

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-06 18:20:55
+ * @LastEditTime: 2022-05-07 15:30:59
  * @LastEditors: your name
  * @Description: 航班视图
 -->
@@ -81,7 +81,7 @@
                 <span>航班状态：</span>
               </el-col>
               <el-col :span="12">
-                <span>{{ flightInfo.FlightStatus || '正常' }}</span>
+                <span>{{ flightInfo.FlightStatus === null ? '正常' : flightInfo.FlightStatus }}</span>
               </el-col>
             </el-row>
 
@@ -105,10 +105,10 @@
 
             <el-row>
               <el-col :span="12">
-                <span>中转行李数：</span>
+                <span>中转进行李数：</span><span>{{ flightInfo.count4 }}</span>
               </el-col>
               <el-col :span="12">
-                <span>{{ flightInfo.count3 }}</span>
+                <span>中转出行李数：</span><span>{{ flightInfo.count3 }}</span>
               </el-col>
             </el-row>
           </div>
@@ -397,6 +397,7 @@ const departureBaggageTableColumn = [
   },
   { name: '装载序号', prop: 'LoadSN', align: 'center' },
   { name: '值机', prop: 'checkIn', align: 'center' },
+  { name: '状态', prop: 'status', align: 'center' },
   { name: '安检', prop: 'security', align: 'center' },
   { name: '分拣', prop: 'sorting', align: 'center' },
   { name: '装车', prop: 'loading', align: 'center' },
@@ -417,10 +418,10 @@ export default {
       keyWords: '',
       openUTC: true,
       props: { multiple: true },
-      options: [
-        { value: 0, label: 'VIP行李' },
-        { value: 0, label: 'VIP行李' }
-      ],
+      // options: [
+      //   { value: 0, label: 'VIP行李' },
+      //   { value: 0, label: 'VIP行李' }
+      // ],
       containerTableColumn: [
         { name: '容器编号', prop: 'containerNumber', align: 'center' },
         { name: '类型', prop: 'style', align: 'center' },
@@ -429,7 +430,7 @@ export default {
       transferInTableColumn: [
         { name: '航班号', prop: 'PreFlightNO', align: 'center' },
         { name: '日期', prop: 'PreFlightDate', align: 'center' },
-        { name: '时间', prop: 'prePlanLandingTime', align: 'center' },
+        { name: '时间', prop: 'flightTime', align: 'center' },
         { name: '始发站', prop: 'PlanDepartureApt', align: 'center' },
         { name: '航班状态', prop: 'FlightStatus', align: 'center' },
         { name: '中转数', prop: 'totalNumber', align: 'center' }
@@ -513,17 +514,27 @@ export default {
       }
     },
     // 表格添加过滤条件
-    setTableFilters() {
-      this.flightBaggageTableData.forEach(item => {
-        Object.keys(this.flightBaggageTableFilters).forEach(key => {
-          if ((item[key] ?? '') !== '' && this.flightBaggageTableFilters[key].every(obj => obj.value !== item[key])) {
-            this.flightBaggageTableFilters[key].push({
+    setTableFilters(tableData, filters) {
+      const tempFilters = {}
+      const tempArrays = {}
+      Object.keys(filters).forEach(key => {
+        tempFilters[key] = []
+        tempArrays[key] = []
+      })
+      tableData.forEach(item => {
+        Object.keys(tempFilters).forEach(key => {
+          if ((item[key] ?? '') !== '' && !tempArrays[key].includes(item[key])) {
+            tempArrays[key].push(item[key])
+            tempFilters[key].push({
               text: item[key],
               value: item[key]
             })
           }
         })
       })
+      Object.keys(tempFilters).forEach(key => {
+        filters[key] = this._.orderBy(tempFilters[key], o => o.value)
+      })
     },
     filterHandler(value, row, column) {
       const property = column['property']
@@ -641,12 +652,16 @@ export default {
         flightInfo.length && (this.flightInfo = flightInfo[0])
         this.containerTableData = containerTableDataData
         this.transferOutBaggageTableData = transferOutBaggageTableData.map(item => {
-          item['flightTime'] = item['flightDate'].split('T')[1]
+          item['flightTime'] = item['flightDate'] ? item['flightDate'].split('T')[1] : ''
+          return item
+        })
+        this.transferInBaggageTableData = transferInBaggageTableData.map(item => {
+          item['flightTime'] = item['flightDate'] ? item['flightDate'].split('T')[1] : ''
           return item
         })
-        this.transferInBaggageTableData = transferInBaggageTableData
         this.flightBaggageTableData = flightBaggageTableData.map((item, index) => {
           item['checkIn'] = `${item['checkIn'] ?? ''}\n${item['checkInTime'] ? item['checkInTime'].split('T')[1] : ''}`
+          item['status'] = item['status'] === 'DEL' ? '删除' : ''
           item['security'] = `${item['DealInfo'] ?? ''}\n${item['DealTime'] ? item['DealTime'].split('T')[1] : ''}`
           item['sorting'] = `${item['sortLocationMark'] ?? ''}\n${
             item['sortDealTime'] ? item['sortDealTime'].split('T')[1] : ''
@@ -661,7 +676,7 @@ export default {
           return item
         })
 
-        this.setTableFilters()
+        this.setTableFilters(this.flightBaggageTableData, this.flightBaggageTableFilters)
       } catch (error) {
         console.log('错误', error)
       }
@@ -714,7 +729,7 @@ export default {
             margin-bottom: 27px;
           }
           span {
-            display: block;
+            display: inline-block;
             font-size: 16px;
             font-weight: 400;
             color: #ffffff;

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: Badguy
  * @Date: 2022-02-09 16:35:57
- * @LastEditTime: 2022-03-15 18:01:35
+ * @LastEditTime: 2022-05-07 14:21:28
  * @LastEditors: your name
  * @Description: 中转01-进港
  * have a nice day!
@@ -454,7 +454,6 @@ export default {
       }
       this.spanArr = spanArr
       this.pos = pos
-      this.tableData = tableData
     },
     tableSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (