Merge branch 'master' of http://120.26.64.82:10880/BFFE/SZYGM1.0

src/views/realTime/components/AirportView/useFormatter.ts

@@ -30,6 +30,13 @@ export function useFormatter(flag: Ref<boolean>) {
         }
       }
     }
+    // 临时处理-没有发起货站交接这一节点数据时，不显示发起货站交接时间
+    if (
+      property === 'requestDepotJoinTime' &&
+      !row["concat(requestDepotJoinBoard,'/',requestDepotJoin)"]
+    ) {
+      return ''
+    }
     if (property.includes('Time')) {
       if (
         ['planDepartureTime', 'acLandingTime', 'planLandingTime'].includes(

src/views/realTime/hooks/useTable.ts

@@ -207,6 +207,7 @@ const tableColumnsMap: {
       columnLabel: '退运',
       columnName: 'BILL_RETURN',
       className: 'cell-filter cell-filter-green node-departure',
+      defaultDisabled: true,
     },
     {
       columnLabel: '卸机',
@@ -402,11 +403,13 @@ const tableColumnsMap: {
       columnLabel: '拉下登记',
       columnName: 'CARGOS_OFFLOAD',
       className: 'cell-filter cell-filter-green node-departure',
+      defaultDisabled: true,
     },
     {
       columnLabel: '拉回确认',
       columnName: 'OFFLOAD_CONFIRM',
       className: 'cell-filter cell-filter-green node-departure',
+      defaultDisabled: true,
     },
     // {
     //   columnLabel: '起飞',
@@ -417,6 +420,7 @@ const tableColumnsMap: {
       columnLabel: '退运',
       columnName: 'BILL_RETURN',
       className: 'cell-filter cell-filter-green node-departure',
+      defaultDisabled: true,
     },
   ],
   ArrivalGoodsFlight: [
@@ -663,13 +667,13 @@ const tableColumnsMap: {
     // { columnLabel: '最新位置', columnName: 'execPosition' },
     { columnLabel: '处理结果', columnName: 'execResult' },
     { columnLabel: '处理时间', columnName: 'execTime', width: 130 },
-    { columnLabel: '中转出航班号', columnName: 'transferFlightNO' },
-    {
-      columnLabel: '中转航班起飞时间',
-      columnName: 'transferFlightDepTime',
-      width: 130,
-    },
-    { columnLabel: '装载序号', columnName: 'queueNo' },
+    // { columnLabel: '中转出航班号', columnName: 'transferFlightNO' },
+    // {
+    //   columnLabel: '中转航班起飞时间',
+    //   columnName: 'transferFlightDepTime',
+    //   width: 130,
+    // },
+    // { columnLabel: '装载序号', columnName: 'queueNo' },
   ],
   InternationalArrivalWaybillGoods: [
     {

src/views/realTime/hooks/useTrackData.ts

@@ -311,7 +311,9 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
         trackSteps: airport.trackSteps.filter(
           node =>
             node.flag ||
-            !['CARGOS_OFFLOAD', 'OFFLOAD_CONFIRM'].includes(node.nodeCode)
+            !['CARGOS_OFFLOAD', 'OFFLOAD_CONFIRM', 'BILL_RETURN'].includes(
+              node.nodeCode
+            )
         ),
       }))
       const sortedAirports =