zhongxiaoyu 2 роки тому
батько
коміт
89bbad8cf8

+ 5 - 5
src/views/realTime/hooks/useTable.ts

@@ -535,11 +535,6 @@ const tableColumnsMap: {
       columnName: '板箱清单XML',
       className: 'cell-filter cell-filter-green',
     },
-    {
-      columnLabel: '拉下',
-      columnName: 'CARGOS_OFFLOAD',
-      className: 'cell-filter cell-filter-green',
-    },
     {
       columnLabel: '待运区',
       columnName: 'WAT_LOC',
@@ -560,6 +555,11 @@ const tableColumnsMap: {
       columnName: '装载完成',
       className: 'cell-filter cell-filter-green',
     },
+    {
+      columnLabel: '拉下',
+      columnName: 'CARGOS_OFFLOAD',
+      className: 'cell-filter cell-filter-green',
+    },
   ],
   InternationalDepartureGoodsFlight: [
     { columnLabel: '航班号', columnName: 'C0' },

+ 15 - 5
src/views/realTime/hooks/useTrackData.ts

@@ -131,10 +131,6 @@ const trackNodesMap = {
       name: '理货',
       nodeCode: '板箱清单XML',
     },
-    {
-      name: '拉下',
-      nodeCode: 'CARGOS_OFFLOAD',
-    },
     {
       name: '待运区',
       nodeCode: 'WAT_LOC',
@@ -151,6 +147,14 @@ const trackNodesMap = {
       name: '装机',
       nodeCode: '装载完成',
     },
+    {
+      name: '拉下',
+      nodeCode: 'CARGOS_OFFLOAD',
+    },
+    // {
+    //   name: '退运',
+    //   nodeCode: '',
+    // },
   ],
   internationalArrival: [
     {
@@ -169,6 +173,10 @@ const trackNodesMap = {
       name: '理货',
       nodeCode: 'RCF报',
     },
+    // {
+    //   name: '快件运抵',
+    //   nodeCode: '',
+    // },
     {
       name: '海关放行',
       nodeCode: 'MTREL_in',
@@ -204,7 +212,9 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
           trackNodesMap.departure
             .concat(trackNodesMap.internationalDeparture)
             .some(node => node.nodeCode === nodeCode) ||
-          (name.includes('Departure') && nodeCode === 'NEW')
+          (name.includes('Departure') &&
+            typeof nodeCode === 'string' &&
+            ['MTEXDEC', 'NEW'].includes(nodeCode))
         const airport = isDeparture
           ? String(departureAirport ?? '')
           : String(arriveAirport ?? '')