离港运单视图-表格内容修改

public/config.js

@@ -214,10 +214,12 @@ var DATACONTENT_ID = {
   // 运单
   departureWaybillInfo: 1803520, // 国内离港运单基础信息
   departureWaybillGoods: 1803521, // 国内离港运单节点跟踪
+  departureWaybillPull: 100101, // 国内离港运单拉下信息
   arrivalWaybillInfo: 1803520, // 国内进港运单基础信息
   arrivalWaybillGoods: 1803521, // 国内进港运单节点跟踪
   internationalDepartureWaybillInfo: 1803520, // 国际离港运单基础信息
   internationalDepartureWaybillGoods: 1803521, // 国际离港运单节点跟踪
+  internationalDepartureWaybillPull: 100102, // 国际离港运单拉下信息
   internationalArrivalWaybillInfo: 1803520, // 国际进港运单基础信息
   internationalArrivalWaybillGoods: 1803521, // 国际进港运单节点跟踪
   // 货物

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

@@ -31,7 +31,7 @@
         </el-button>
         <ColumnSet
           class="button-sqaure"
-          :table-columns="tableColumns"
+          :table-columns="isDeparture ? pullTableColumns : tableColumns"
           @checked-submit="columnChecked"
         />
       </div>
@@ -79,6 +79,16 @@
     </div>
     <div class="goods-list">
       <SimpleTable
+        v-if="isDeparture"
+        ref="tableRef"
+        :data="pullTableData"
+        :columns="pullTableColumns"
+        sequence
+        scrollbar-always-on
+        :column-props="{ formatter }"
+      />
+      <SimpleTable
+        v-else
         ref="tableRef"
         :data="tableData"
         :columns="tableColumns"
@@ -115,6 +125,8 @@ const props = defineProps({
   },
 })
 
+const isDeparture = computed(() => props.name.includes('Departure'))
+
 const route = useRoute()
 const { flightDate, waybillNO } = route.query
 const dataContent = [flightDate, waybillNO] as string[]
@@ -131,10 +143,16 @@ const { tableColumns, tableData: trackData, getTableData } = useTable(
   dataContent
 )
 
+const {
+  tableColumns: pullTableColumns,
+  tableData: pullTableData,
+  getTableData: getPullTableData,
+} = useTable(`${props.name}Pull`, dataContent)
+
 // 判断是否有另外一个机场的节点信息，没有则隐藏那些列
 watch(trackData, data => {
   let anotherAirportNodeFlag = ''
-  if (props.name.includes('Departure')) {
+  if (isDeparture.value) {
     anotherAirportNodeFlag = 'node-arrival'
   } else {
     anotherAirportNodeFlag = 'node-departure'
@@ -161,7 +179,11 @@ watch(trackData, data => {
   })
 })
 
-useLoop([getWaybillInfo, getTableData], 'waybill')
+const loopFuncs = [getWaybillInfo, getTableData]
+if (isDeparture.value) {
+  loopFuncs.push(getPullTableData)
+}
+useLoop(loopFuncs, 'waybill')
 
 const { trackAirlines, trackBoxStyle } = useTrackData(props.name, trackData)
 
@@ -243,6 +265,12 @@ const tableData = computed(() => {
 })
 
 const formatter: CommonTableFormatter = (row, column, cellValue, index) => {
+  if (column.property === 'wholePull') {
+    return cellValue === 1 ? '是' : '否'
+  }
+  if (column.property === 'pullTime') {
+    return datetimeToTime(cellValue, flightDate as CommonValue)
+  }
   const value = String(cellValue ?? '').split('\n')
   if (value[2]) {
     value[2] = datetimeToTime(value[2], flightDate as CommonValue)
@@ -262,7 +290,9 @@ const exportHandler = () => {
   exportToExcel({ table })
 }
 
-const { columnChecked } = useTableColumnSet(tableColumns)
+const { columnChecked } = useTableColumnSet(
+  isDeparture.value ? pullTableColumns : tableColumns
+)
 
 const { rowClass, cellClass } = useTableStyle(`${props.name}Goods`)
 

src/views/realTime/hooks/useTable.ts

@@ -237,6 +237,32 @@ const tableColumnsMap: {
       className: 'cell-filter cell-filter-cyan node-arrival',
     },
   ],
+  DepartureWaybillPull: [
+    {
+      columnLabel: '集装器编号',
+      columnName: 'ULDNO',
+    },
+    {
+      columnLabel: '是否整单拉下',
+      columnName: 'wholePull',
+    },
+    {
+      columnLabel: '拉下件数',
+      columnName: 'pullNum',
+    },
+    {
+      columnLabel: '拉下重量',
+      columnName: 'pullWeight',
+    },
+    {
+      columnLabel: '拉下一个码',
+      columnName: 'pullCode',
+    },
+    {
+      columnLabel: '拉下时间',
+      columnName: 'pullTime',
+    },
+  ],
   DepartureGoodsFlight: [
     { columnLabel: '航班号', columnName: 'C0' },
     { columnLabel: '航班日期', columnName: 'C1' },
@@ -660,6 +686,32 @@ const tableColumnsMap: {
       className: 'cell-filter cell-filter-green node-departure',
     },
   ],
+  InternationalDepartureWaybillPull: [
+    {
+      columnLabel: '集装器编号',
+      columnName: 'ULDNO',
+    },
+    {
+      columnLabel: '是否整单拉下',
+      columnName: 'wholePull',
+    },
+    {
+      columnLabel: '拉下件数',
+      columnName: 'pullNum',
+    },
+    {
+      columnLabel: '拉下重量',
+      columnName: 'pullWeight',
+    },
+    {
+      columnLabel: '拉下一个码',
+      columnName: 'pullCode',
+    },
+    {
+      columnLabel: '拉下时间',
+      columnName: 'pullTime',
+    },
+  ],
   InternationalDepartureGoodsFlight: [
     { columnLabel: '航班号', columnName: 'C0' },
     { columnLabel: '航班日期', columnName: 'C1' },

src/views/realTime/hooks/useTableStyle.ts

@@ -119,12 +119,6 @@ export function useTableStyle(tableName?: string) {
     //   }
     // }
 
-    if (tableName?.includes('ArrivalWaybillGoods')) {
-      if (['C1'].includes(column.property)) {
-        classes.push('cell-click')
-      }
-    }
-
     return classes.join(' ')
   }