zhaoke 1 年之前
父节点
当前提交
43f83bad63

+ 8 - 0
public/staticConfig.js

@@ -64,6 +64,14 @@ switch (baseNewUrl) {
       hasStaticRoutes: true,
     }
     break
+  case '192.168.3.29':
+    PLATFROM_CONFIG = {
+      ...PLATFROM_CONFIG,
+      baseNewUrl: 'http://10.211.67.177:8043',
+      baseURLCA: 'http://10.211.67.177:8043',
+      hasStaticRoutes: true,
+    }
+    break
   case 'localhost':
     PLATFROM_CONFIG = {
       ...PLATFROM_CONFIG,

+ 1 - 1
src/views/newBagDetails/components/baggageView.vue

@@ -257,7 +257,7 @@ export default {
           newArr[index] = Object.assign(newArr[index], newObj)
         }
       })
-      this.tableData = _.orderBy([...newArr], ["landTime", "takeTime"], ["desc", "asc"]);
+      this.tableData = _.orderBy([...newArr], ["takeTime"], ["asc", "desc"]);
     }
   }
 }

+ 3 - 7
src/views/newBagDetails/index.vue

@@ -206,11 +206,7 @@ export default {
         carrierFlights,
         carrierFlightsDate
       }
-      this.tabClickObj = PNRNO ? {
-        luggageNum,
-        PNRNO,
-        carrierFlightsDate
-      } : {
+      this.tabClickObj = {
         luggageNum,
         carrierFlights,
         carrierFlightsDate
@@ -218,13 +214,13 @@ export default {
       this.activeIndex = index
       this.getLuggageInfo(this.tableDatas5Id, true)
       if (this.tabClickKey && this.tabClickKey != 'baggageView') {
-        this.tagObj = this.tabClickObj
+        this.tagObj = Object.assign(this.tabClickObj, { PNRNO: null })
       }
     },
     tabClick (item, index) {
       this.tabClickKey = item.key
       if (item.key == 'baggageList' || item.key == 'baggageMessage') {
-        this.tagObj = this.tabClickObj
+        this.tagObj = Object.assign(this.tabClickObj, { PNRNO: null })
       }
       setTimeout(() => {
         this.tabIndex = index

+ 42 - 0
src/views/newFlightView/index.vue

@@ -154,6 +154,34 @@ export default {
         {
           label: '中转行李',
           value: 'transfer_baggage_number'
+        },
+        {
+          label: '已装载',
+          value: 'loaded_bag_number'
+        },
+        {
+          label: '到达行李',
+          value: 'arrive_number'
+        },
+        {
+          label: '特殊行李',
+          value: 'special_number'
+        },
+        {
+          label: '容器行李',
+          value: 'container_baggage_number'
+        },
+        {
+          label: '已卸载行李数',
+          value: 'uninstalled_number'
+        },
+        {
+          label: '已转运行李数',
+          value: 'transferred_number'
+        },
+        {
+          label: '终止行李到达',
+          value: 'terminate_baggage_arrival_number'
         }
       ]
     }
@@ -194,6 +222,20 @@ export default {
             return row['No_BSM'] == 1
           case 'transfer_baggage_number':
             return row['inflightNo'] && row['dataState'] != 'DEL'
+          case 'loaded_bag_number':
+            return row['No_BSM'] != 1
+          case 'arrive_number':
+            return row['dataState'] != 'DEL' && row['arrivedtime']
+          case 'special_number':
+            return row['specialType']
+          case 'uninstalled_number':
+            return row['unloadtime']
+          case 'transferred_number':
+            return row['transferFlightNO']
+          case 'container_baggage_number':
+            return row['container_ID']
+          case 'terminate_baggage_arrival_number':
+            return row['dataState'] == 'DEL' || !row['arrivedtime'] || row['transferFlightNO']
           default:
             return (row[key] ?? '') !== ''
         }