Browse Source

运单视图-国内运单跟踪节点修改

zhongxiaoyu 2 years ago
parent
commit
91ac383076
2 changed files with 62 additions and 32 deletions
  1. 44 24
      src/views/realTime/hooks/useTable.ts
  2. 18 8
      src/views/realTime/hooks/useTrackData.ts

+ 44 - 24
src/views/realTime/hooks/useTable.ts

@@ -121,11 +121,11 @@ const tableColumnsMap: {
       columnName: 'ACC_CHECK',
       className: 'cell-filter cell-filter-green',
     },
-    {
-      columnLabel: '拒运',
-      columnName: 'ACC_CHECK_2',
-      className: 'cell-filter cell-filter-green',
-    },
+    // {
+    //   columnLabel: '拒运',
+    //   columnName: 'ACC_CHECK_2',
+    //   className: 'cell-filter cell-filter-green',
+    // },
     {
       columnLabel: '安检',
       columnName: '安检',
@@ -133,17 +133,27 @@ const tableColumnsMap: {
     },
     {
       columnLabel: '加货',
-      columnName: 'LS_CARGO',
+      columnName: 'ACC_BUP',
       className: 'cell-filter cell-filter-green',
     },
     {
-      columnLabel: '待运区',
-      columnName: 'WAT_LOC',
+      columnLabel: '预配载',
+      columnName: 'LS_CARGO',
       className: 'cell-filter cell-filter-green',
     },
+    // {
+    //   columnLabel: '待运区',
+    //   columnName: 'WAT_LOC',
+    //   className: 'cell-filter cell-filter-green',
+    // },
     {
       columnLabel: '货站交接',
-      columnName: 'CARGOS_DEP_ULD_HANDOVER',
+      columnName: 'CARGOS_HANDOVER_STATUS_02',
+      className: 'cell-filter cell-filter-green',
+    },
+    {
+      columnLabel: '运输前复核',
+      columnName: 'CARGOS_HANDOVER_STATUS_03',
       className: 'cell-filter cell-filter-green',
     },
     {
@@ -157,12 +167,12 @@ const tableColumnsMap: {
       className: 'cell-filter cell-filter-green',
     },
     {
-      columnLabel: '拉下',
+      columnLabel: '拉下登记',
       columnName: 'CARGOS_OFFLOAD',
       className: 'cell-filter cell-filter-green',
     },
     {
-      columnLabel: '拉回',
+      columnLabel: '拉回确认',
       columnName: 'OFFLOAD_CONFIRM',
       className: 'cell-filter cell-filter-green',
     },
@@ -183,7 +193,7 @@ const tableColumnsMap: {
     },
     {
       columnLabel: '机下交接',
-      columnName: 'CARGOS_HANDOVER_STATUS',
+      columnName: 'CARGOS_HANDOVER_STATUS_01',
       className: 'cell-filter cell-filter-cyan',
     },
     {
@@ -198,7 +208,7 @@ const tableColumnsMap: {
     },
     {
       columnLabel: '出库',
-      columnName: 'FSU_DLV',
+      columnName: 'FSUDLV',
       className: 'cell-filter cell-filter-cyan',
     },
   ],
@@ -293,7 +303,7 @@ const tableColumnsMap: {
     },
     {
       columnLabel: '出库',
-      columnName: 'FSU_DLV',
+      columnName: 'FSUDLV',
       className: 'cell-filter cell-filter-cyan',
     },
     {
@@ -306,11 +316,11 @@ const tableColumnsMap: {
       columnName: 'ACC_CHECK',
       className: 'cell-filter cell-filter-green',
     },
-    {
-      columnLabel: '拒运',
-      columnName: 'ACC_CHECK_2',
-      className: 'cell-filter cell-filter-green',
-    },
+    // {
+    //   columnLabel: '拒运',
+    //   columnName: 'ACC_CHECK_2',
+    //   className: 'cell-filter cell-filter-green',
+    // },
     {
       columnLabel: '安检',
       columnName: '安检',
@@ -322,13 +332,23 @@ const tableColumnsMap: {
       className: 'cell-filter cell-filter-green',
     },
     {
-      columnLabel: '待运区',
-      columnName: 'WAT_LOC',
+      columnLabel: '预配载',
+      columnName: 'LS_CARGO',
       className: 'cell-filter cell-filter-green',
     },
+    // {
+    //   columnLabel: '待运区',
+    //   columnName: 'WAT_LOC',
+    //   className: 'cell-filter cell-filter-green',
+    // },
     {
       columnLabel: '货站交接',
-      columnName: 'CARGOS_DEP_ULD_HANDOVER',
+      columnName: 'CARGOS_HANDOVER_STATUS_02',
+      className: 'cell-filter cell-filter-green',
+    },
+    {
+      columnLabel: '运输前复核',
+      columnName: 'CARGOS_HANDOVER_STATUS_03',
       className: 'cell-filter cell-filter-green',
     },
     {
@@ -342,12 +362,12 @@ const tableColumnsMap: {
       className: 'cell-filter cell-filter-green',
     },
     {
-      columnLabel: '拉下',
+      columnLabel: '拉下登记',
       columnName: 'CARGOS_OFFLOAD',
       className: 'cell-filter cell-filter-green',
     },
     {
-      columnLabel: '拉回',
+      columnLabel: '拉回确认',
       columnName: 'OFFLOAD_CONFIRM',
       className: 'cell-filter cell-filter-green',
     },

+ 18 - 8
src/views/realTime/hooks/useTrackData.ts

@@ -35,15 +35,25 @@ const trackNodesMap = {
     },
     {
       name: '加货',
-      nodeCode: 'LS_CARGO',
+      nodeCode: 'ACC_BUP',
     },
     {
-      name: '待运区',
-      nodeCode: 'WAT_LOC',
+      name: '预配载',
+      nodeCode: 'LS_CARGO',
     },
+    // {
+    //   name: '待运区',
+    //   nodeCode: 'WAT_LOC',
+    // },
     {
       name: '货站交接',
-      nodeCode: 'CARGOS_DEP_ULD_HANDOVER',
+      // nodeCode: 'CARGOS_DEP_ULD_HANDOVER',
+      nodeCode: 'CARGOS_HANDOVER_STATUS_02',
+    },
+    {
+      name: '运输前复核',
+      nodeCode: 'CARGOS_HANDOVER_STATUS_03',
+      labelWidth: 70,
     },
     {
       name: '机下交接',
@@ -54,11 +64,11 @@ const trackNodesMap = {
       nodeCode: '装载完成',
     },
     {
-      name: '拉下',
+      name: '拉下登记',
       nodeCode: 'CARGOS_OFFLOAD',
     },
     {
-      name: '拉回',
+      name: '拉回确认',
       nodeCode: 'OFFLOAD_CONFIRM',
     },
     // {
@@ -77,7 +87,7 @@ const trackNodesMap = {
     },
     {
       name: '机下交接',
-      nodeCode: 'CARGOS_HANDOVER_STATUS',
+      nodeCode: 'CARGOS_HANDOVER_STATUS_01',
     },
     {
       name: '货站交接',
@@ -89,7 +99,7 @@ const trackNodesMap = {
     },
     {
       name: '出库',
-      nodeCode: 'FSU_DLV',
+      nodeCode: 'FSUDLV',
     },
   ],
   internationalDeparture: [],