"20230131-0201管理端修改建议"部分修改

src/components/ColumnSet/index.vue

@@ -165,7 +165,7 @@ const fullTableName = route.path + (props.name ? `/${props.name}` : '')
 watch(needShowColumns, defaultColumns => {
   const savedHiddenColumnKeys = savedHiddenColumnKeysMap[fullTableName]
   const columns = defaultColumns.filter(column => {
-    if (savedHiddenColumnKeys) {
+    if (savedHiddenColumnKeys?.length) {
       return !savedHiddenColumnKeys.includes(column.columnName)
     }
     return !column.defaultHidden

src/hooks/useTableColumnSet.ts

@@ -4,18 +4,16 @@ import { CommonTableColumn } from '~/common'
 export function useTableColumnSet(tableColumns: Ref<CommonTableColumn[]>) {
   const filterColumnKeys = ref<string[]>([])
   const filteredColumns = ref<CommonTableColumn[]>([])
-  watchEffect(() => {
-    filteredColumns.value = tableColumns.value.filter(column => {
-      if (
-        column.needShow &&
-        filterColumnKeys.value.includes(column.columnName)
-      ) {
+  watch(filterColumnKeys, keys => {
+    ;(filteredColumns.value = tableColumns.value.filter(column => {
+      if (column.needShow && keys.includes(column.columnName)) {
         column.hidden = false
         return column
       } else {
         column.hidden = true
       }
-    })
+    })),
+      { deep: true }
   })
   const columnChecked = (checkedColumnKeys: string[]) => {
     filterColumnKeys.value = checkedColumnKeys

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

@@ -413,28 +413,34 @@ const columnGroupsMap: {
         {
           columnName: 'enterPark',
           columnLabel: '入园\n(运单/件)',
+          headerClass: 'bg-purple',
         },
         {
           columnName: 'enterParkTime',
           columnLabel: '入园时间',
+          headerClass: 'bg-purple',
         },
         {
           columnName: 'enterCustoms',
           columnLabel: '海关中控\n(运单/件)',
+          headerClass: 'bg-purple',
           defaultHidden: true,
         },
         {
           columnName: 'enterCustomsTime',
           columnLabel: '海关中控\n时间',
+          headerClass: 'bg-purple',
           defaultHidden: true,
         },
         {
           columnName: 'passCustoms',
           columnLabel: '海关放行\n(运单/件)',
+          headerClass: 'bg-purple',
         },
         {
           columnName: 'passCustomsTime',
           columnLabel: '海关放行\n时间',
+          headerClass: 'bg-purple',
         },
         // {
         //   columnName: 'nopassCustoms',
@@ -447,10 +453,12 @@ const columnGroupsMap: {
         {
           columnName: 'receiveSure1',
           columnLabel: '运抵货站\n(运单/件)',
+          headerClass: 'bg-purple',
         },
         {
           columnName: 'receiveSureTime',
           columnLabel: '运抵货站\n时间',
+          headerClass: 'bg-purple',
         },
         // {
         //   columnName: 'returns2',
@@ -636,7 +644,7 @@ const columnGroupsMap: {
       ],
     },
     {
-      groupName: '货站相关',
+      groupName: '地服相关',
       children: [
         // {
         //   columnName: 'unloadBill',
@@ -665,7 +673,7 @@ const columnGroupsMap: {
       ],
     },
     {
-      groupName: '地服相关',
+      groupName: '货站相关',
       children: [
         {
           columnName: 'depotJoin',
@@ -686,10 +694,12 @@ const columnGroupsMap: {
         {
           columnName: "concat(passCustomsList_in,'/',passCustoms_in)",
           columnLabel: '海关放行\n(运单/件)',
+          headerClass: 'bg-purple',
         },
         {
           columnName: 'passCustomsTime_in',
           columnLabel: '海关放行\n时间',
+          headerClass: 'bg-purple',
         },
         {
           columnName: 'outWarehouse',

src/views/realTime/components/FlightView/useFlightInfo.ts

@@ -24,7 +24,7 @@ const flightInfoItemsMap = {
     ],
     [
       {
-        label: '特货信息/货物数',
+        label: '核单运单收数/件数',
         key: 'speCargoInfo',
       },
       {

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

@@ -63,7 +63,7 @@
                 <span v-if="index === 0" class="title-span"
                   >航班号：{{ trackAirline.flightNO }}</span
                 >
-                <span class="title-span"
+                <span v-if="!name.includes('InterNationalDeparture')" class="title-span"
                   >{{ trackAirport.isDeparture ? '出港' : '进港' }}：{{
                     trackAirport.airport
                   }}</span