运单查询修改

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

@@ -7,6 +7,7 @@
         :model="formData"
         class="data-query-form"
         :rules="rules"
+        @submit.native.prevent
       >
         <div v-if="name !== 'waybill'" class="form-left">
           <el-form-item prop="startDate">
@@ -43,7 +44,7 @@
               placeholder="请输入要搜索的内容"
               :prefix-icon="Search"
               clearable
-              @keyup.enter="dataQuery"
+              @keyup.enter.prevent="dataQuery"
             />
           </el-form-item>
         </div>
@@ -98,8 +99,8 @@ const props = defineProps({
 
 const today = parseTime(new Date(), '{y}-{m}-{d}') as string
 const formData = reactive({
-  startDate: today,
-  endDate: today,
+  startDate: props.name === 'waybill' ? null : today,
+  endDate: props.name === 'waybill' ? null : today,
   keyWords: '',
 })
 watchEffect(() => {
@@ -242,11 +243,19 @@ const cellClickHandler = (row, column, cell, event) => {
     case 'waybill': {
       switch (column.property) {
         case 'stockCode': {
-          if (!row.stockCode || !row.flightDate) {
+          if (
+            !row.stockCode ||
+            !row.flightDate ||
+            !['INT', 'DOM'].includes(row.DIType) ||
+            typeof row.FFID !== 'string' ||
+            !['A', 'D'].includes(row.FFID.at(-1))
+          ) {
             ElMessage.error('运单信息缺失!')
             return
           }
-          const viewName = `Waybill`
+          const viewName = `${row.DIType === 'DOM' ? '' : 'International'}${
+            row.FFID.at(-1) === 'D' ? 'Departure' : 'Arrival'
+          }Waybill`
           router.push({
             path: `/dataQuery/waybillQuery/${viewName}`,
             query: {

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

@@ -322,7 +322,7 @@ watch(tableData, async () => {
     return
   }
   if (tableRef.value?.table) {
-    tableRef.value?.table?.setScrollTop((finishedCount.value - 50) * 50)
+    tableRef.value?.table?.setScrollTop((finishedCount.value - 1) * 50)
   }
   hasSetTableScroll.value = true
 })

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

@@ -330,7 +330,7 @@ const columnGroupsMap: {
         },
         {
           columnName: 'outWarehouse',
-          columnLabel: '出库\n(批/运单/件)',
+          columnLabel: '出库\n(运单/件/重量)',
         },
         {
           columnName: 'outWarehouseTime',
@@ -702,7 +702,7 @@ const columnGroupsMap: {
         },
         {
           columnName: 'outWarehouse',
-          columnLabel: '出库\n(批/运单/件)',
+          columnLabel: '出库\n(运单/件/重量)',
         },
         {
           columnName: 'outWarehouseTime',

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

@@ -45,7 +45,7 @@ const flightInfoItemsMap = {
         key: 'depotJoin',
       },
       {
-        label: '已装载集装器/运单/货物数',
+        label: '已装载集装器/运单数/重量',
         key: 'loadPlane',
       },
       {
@@ -106,7 +106,7 @@ const flightInfoItemsMap = {
       //   showOverflowTooltip: true,
       // },
       {
-        label: '卸载数量（板/箱/卡）',
+        label: '卸载集装器数（板/箱/卡）',
         key: 'unloadPlaneInfo',
       },
       // {

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

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