2.14部分修改

src/views/dataQuery/components/DataQueryView/index.vue

@@ -67,7 +67,7 @@
       <SimpleTable
         ref="tableRef"
         :data="tableData"
-        :columns="filteredColumns"
+        :columns="tableColumns"
         :cell-class-name="cellClass"
         :column-props="{ formatter }"
         @cell-click="cellClickHandler"
@@ -175,7 +175,7 @@ const { tableColumns, tableData, getTableData } = useTable(
   loading
 )
 
-const { filteredColumns, columnChecked } = useTableColumnSet(tableColumns)
+const { columnChecked } = useTableColumnSet(tableColumns)
 
 const formatter: CommonTableFormatter = (row, column, cellValue, index) => {
   const value = String(cellValue ?? '').trim()

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

@@ -110,10 +110,12 @@ const columnGroupsMap: {
         {
           columnName: 'checks',
           columnLabel: '收运核查\n(拒运/查验)',
+          defaultHidden: true,
         },
         {
           columnName: 'checkTime',
           columnLabel: '收运核查\n时间',
+          defaultHidden: true,
         },
         {
           columnName: 'securityYes',
@@ -416,34 +418,34 @@ const columnGroupsMap: {
         {
           columnName: 'enterPark',
           columnLabel: '入园\n(运单/件)',
-          headerClass: 'bg-purple',
+          labelClassName: 'bg-purple',
         },
         {
           columnName: 'enterParkTime',
           columnLabel: '入园时间',
-          headerClass: 'bg-purple',
+          labelClassName: 'bg-purple',
         },
         {
           columnName: 'enterCustoms',
           columnLabel: '海关中控\n(运单/件)',
-          headerClass: 'bg-purple',
+          labelClassName: 'bg-purple',
           defaultHidden: true,
         },
         {
           columnName: 'enterCustomsTime',
           columnLabel: '海关中控\n时间',
-          headerClass: 'bg-purple',
+          labelClassName: 'bg-purple',
           defaultHidden: true,
         },
         {
           columnName: 'passCustoms',
           columnLabel: '海关放行\n(运单/件)',
-          headerClass: 'bg-purple',
+          labelClassName: 'bg-purple',
         },
         {
           columnName: 'passCustomsTime',
           columnLabel: '海关放行\n时间',
-          headerClass: 'bg-purple',
+          labelClassName: 'bg-purple',
         },
         // {
         //   columnName: 'nopassCustoms',
@@ -456,12 +458,12 @@ const columnGroupsMap: {
         {
           columnName: 'receiveSure1',
           columnLabel: '运抵货站\n(运单/件)',
-          // headerClass: 'bg-purple',
+          // labelClassName: 'bg-purple',
         },
         {
           columnName: 'receiveSureTime',
           columnLabel: '运抵货站\n时间',
-          // headerClass: 'bg-purple',
+          // labelClassName: 'bg-purple',
         },
         // {
         //   columnName: 'returns2',
@@ -699,12 +701,12 @@ const columnGroupsMap: {
         {
           columnName: "concat(passCustomsList_in,'/',passCustoms_in)",
           columnLabel: '海关放行\n(运单/件)',
-          headerClass: 'bg-purple',
+          labelClassName: 'bg-purple',
         },
         {
           columnName: 'passCustomsTime_in',
           columnLabel: '海关放行\n时间',
-          headerClass: 'bg-purple',
+          labelClassName: 'bg-purple',
         },
         {
           columnName: 'outWarehouse',
@@ -785,7 +787,6 @@ export function useAirportTable(name: string, formData: CommonData) {
               : undefined,
             flexGrow: 1,
             align: 'center',
-            // headerClass: headerClassMap[group.groupName] ?? '',
             labelClassName: headerClassMap[group.groupName] ?? '',
             groupName: group.groupName,
             ...column,

src/views/realTime/components/FlightView/ContainerWaybillDialog.vue

@@ -177,7 +177,12 @@ const formatter: CommonTableFormatter = (row, column, cellValue, index) => {
   if (column.property.includes('Time')) {
     return value.replace(/(T|\s)+/, '\n')
   }
-  return value
+  if (column.property === 'nodeCode') {
+    if (props.name.includes('InternationalDeparture') && value === 'LS_CARGO') {
+      return '实配'
+    }
+    return NODE_CODE[value] ?? ''
+  }
 }
 </script>
 

src/views/realTime/components/FlightView/index.vue

@@ -64,7 +64,7 @@
         <SimpleTable
           ref="waybillTableRef"
           :data="waybillTableData"
-          :columns="filteredWaybillColumns"
+          :columns="waybillTableColumns"
           :row-class-name="flightWaybillRowClass"
           :cell-class-name="flightWaybillCellClass"
           :column-props="{ formatter: tableFormatter }"
@@ -145,7 +145,7 @@ const tableFormatter: CommonTableFormatter = (
   column,
   cellValue,
   index
-  ) => {
+) => {
   if (column.property === 'execResult') {
     const execResult = Number(cellValue)
     if (Number.isNaN(execResult)) {
@@ -171,7 +171,7 @@ const tableFormatter: CommonTableFormatter = (
     return value.slice(5, -3).replace(/(T|\s)+/, '\n')
   }
   if (column.property === 'nodeCode') {
-    if (props.name.includes('InternationalDeparture') && value === 'LS_CARGO'){
+    if (props.name.includes('InternationalDeparture') && value === 'LS_CARGO') {
       return '实配'
     }
     return NODE_CODE[value] ?? ''
@@ -187,10 +187,7 @@ const UTCFlag = ref(true)
 //   ElMessage.info('开发中')
 // }
 
-const {
-  filteredColumns: filteredWaybillColumns,
-  columnChecked,
-} = useTableColumnSet(waybillTableColumns)
+const { columnChecked } = useTableColumnSet(waybillTableColumns)
 
 const waybillTableRef = ref<InstanceType<typeof SimpleTable> | null>(null)
 const { exportToExcel } = useTableExport()

src/views/realTime/components/WaybillView/index.vue

@@ -84,7 +84,7 @@
       <SimpleTable
         ref="tableRef"
         :data="tableData"
-        :columns="filteredColumns"
+        :columns="tableColumns"
         scrollbar-always-on
         :row-class-name="rowClass"
         :cell-class-name="cellClass"
@@ -282,7 +282,7 @@ const downloadHandler = () => {
   exportToExcel({ table })
 }
 
-const { filteredColumns, columnChecked } = useTableColumnSet(tableColumns)
+const { columnChecked } = useTableColumnSet(tableColumns)
 
 const { rowClass, cellClass } = useTableStyle(`${props.name}Goods`)
 

src/views/realTime/hooks/useTable.ts

@@ -189,11 +189,13 @@ const tableColumnsMap: {
       columnLabel: '拉下登记',
       columnName: 'CARGOS_OFFLOAD',
       className: 'cell-filter cell-filter-green node-departure',
+      checkDisabled: true,
     },
     {
       columnLabel: '拉回确认',
       columnName: 'OFFLOAD_CONFIRM',
       className: 'cell-filter cell-filter-green node-departure',
+      checkDisabled: true,
     },
     // {
     //   columnLabel: '起飞',
@@ -399,11 +401,13 @@ const tableColumnsMap: {
       columnLabel: '拉下登记',
       columnName: 'CARGOS_OFFLOAD',
       className: 'cell-filter cell-filter-green node-departure',
+      checkDisabled: true,
     },
     {
       columnLabel: '拉回确认',
       columnName: 'OFFLOAD_CONFIRM',
       className: 'cell-filter cell-filter-green node-departure',
+      checkDisabled: true,
     },
     // {
     //   columnLabel: '起飞',
@@ -492,6 +496,7 @@ const tableColumnsMap: {
   ],
   InternationalDepartureFlightWaybill: [
     { columnLabel: '运单号', columnName: 'stockCode', width: 120 },
+    { columnLabel: '分类', columnName: 'type' },
     { columnLabel: '集装器数量', columnName: 'stowageNum' },
     {
       columnLabel: '品名',
@@ -571,11 +576,11 @@ const tableColumnsMap: {
       columnName: 'ACC_BUP',
       className: 'cell-filter cell-filter-green node-departure',
     },
-    {
-      columnLabel: '待运区',
-      columnName: 'WAT_LOC',
-      className: 'cell-filter cell-filter-green node-departure',
-    },
+    // {
+    //   columnLabel: '待运区',
+    //   columnName: 'WAT_LOC',
+    //   className: 'cell-filter cell-filter-green node-departure',
+    // },
     // {
     //   columnLabel: '货站交接',
     //   columnName: 'CARGOS_HANDOVER_STATUS_02',
@@ -600,6 +605,7 @@ const tableColumnsMap: {
       columnLabel: '拉下',
       columnName: 'CARGOS_OFFLOAD',
       className: 'cell-filter cell-filter-green node-departure',
+      checkDisabled: true,
     },
     {
       columnLabel: '实配',

src/views/realTime/hooks/useTrackData.ts

@@ -130,22 +130,22 @@ const trackNodesMap = {
       name: '理货',
       nodeCode: 'ACC_BUP',
     },
+    // {
+    //   name: '待运区',
+    //   nodeCode: 'WAT_LOC',
+    // },
+    // {
+    //   name: '货站交接',
+    //   nodeCode: 'CARGOS_HANDOVER_STATUS_02',
+    // },
     {
-      name: '待运区',
-      nodeCode: 'WAT_LOC',
+      name: '交接复核',
+      nodeCode: 'CARGOS_HANDOVER_STATUS_03',
+    },
+    {
+      name: '机下交接',
+      nodeCode: '出港货邮',
     },
-    // {
-      //   name: '货站交接',
-      //   nodeCode: 'CARGOS_HANDOVER_STATUS_02',
-      // },
-      {
-        name: '交接复核',
-        nodeCode: 'CARGOS_HANDOVER_STATUS_03',
-      },
-      {
-        name: '机下交接',
-        nodeCode: '出港货邮',
-      },
     {
       name: '装机',
       nodeCode: '装载完成',
@@ -159,7 +159,7 @@ const trackNodesMap = {
       nodeCode: 'LS_CARGO',
     },
     // {
-      //   name: '退运',
+    //   name: '退运',
     //   nodeCode: '',
     // },
   ],