Procházet zdrojové kódy

行李视图修改

zhongxiaoyu před 2 roky
rodič
revize
668c030439

+ 18 - 9
src/views/baggageManagement/components/baggage/index.vue

@@ -363,8 +363,12 @@ export default {
           prop: 'noBSM'
         },
         {
-          label: '中转标记',
-          prop: 'transitSign'
+          label: '中转进航班',
+          prop: 'inFlightNo'
+        },
+        {
+          label: '中转出航班',
+          prop: 'transferFlightNo'
         },
         {
           label: '速运标记',
@@ -442,7 +446,8 @@ export default {
         { name: '发往位置', prop: 'toLocation' },
         { name: '发往位置描述', prop: 'toLocationMark', width: 110 },
         { name: '装载序号', prop: 'LoadSN' },
-        { name: '容器编号', prop: 'U_Device_ID', width: 100 }
+        { name: '容器编号', prop: 'U_Device_ID', width: 100 },
+        { name: '数据来源', prop: 'dataSource' }
       ],
       baggageTableData: [],
       spanArr: [],
@@ -506,14 +511,12 @@ export default {
   watch: {
     $route: {
       handler({ path, query }) {
+        this.infoBtn = ''
         if (path.includes('baggageView')) {
           const { flightNO, flightDate, bagSN } = query
           if (flightNO && flightDate && bagSN) {
-            const { flightNO: oldFlightNO, flightDate: oldFlightDate, bagSN: oldBagSN } = this.queryData
-            if (flightNO !== oldFlightNO || flightDate !== oldFlightDate || bagSN !== oldBagSN) {
-              this.queryData = { flightNO, flightDate, bagSN }
-              this.infoBtn = this.infoRadios[0]
-            }
+            this.queryData = { flightNO, flightDate, bagSN }
+            this.infoBtn = this.infoRadios[0]
           } else {
             this.$router.push('/advance')
           }
@@ -740,6 +743,13 @@ export default {
           item['landingAirport'] = `${item['landingAirport']}\n${
             item['landingTime'] ? item['landingTime'].replace('T', '\n') : ''
           }`
+          if (item['DeviceCode'] === 'STARHUB') {
+            item['dataSource'] = 'Manual Load'
+          } else if (item['toLocation']?.length === 2) {
+            item['dataSource'] = 'RFID'
+          } else if (item['secondaryCode'] === 'R') {
+            item['dataSource'] = 'BRS'
+          }
           return item
         })
         this.initTableData(this.baggageTableData)
@@ -753,7 +763,6 @@ export default {
       try {
         const result = await this.queryMessage(dataContent)
         this.messageList = result.map(message => {
-          message.dataContent = message.dataContent
           // message.dataContent = JSON.parse(message.dataContent).dataContent
           return message
         })