航班视图修改

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 (