Browse Source

1.0航班视图-行李列表-请求参数及内容格式化修改

zhongxiaoyu 1 year ago
parent
commit
fdf20aae9b

+ 25 - 4
src/views/baggageManagementTemp/components/flight/index.vue

@@ -304,7 +304,7 @@
 // import BackButton from '@/components/BackButton'
 import Dialog from '@/layout/components/Dialog/index.vue'
 import TimeZoneSelector from '@/components/TimeZoneSelector'
-import { myQuery } from '@/api/temp'
+import { TempQuery, myQuery } from '@/api/temp'
 import tableColsMixin from '../../mixins/tableCols'
 import timeZoneMixin from '../../mixins/timeZone'
 import TableHeaderCell from '@/components/TableHeaderCell'
@@ -1036,8 +1036,28 @@ export default {
     queryContainer (dataContent) {
       return myQuery(SERVICE_ID.flightContainer, ...dataContent)
     },
-    queryBaggageByFlightNO (dataContent) {
-      return myQuery(SERVICE_ID.flightBaggage, ...dataContent)
+    // queryBaggageByFlightNO (dataContent) {
+    //   return myQuery(SERVICE_ID.flightBaggage, ...dataContent)
+    // },
+    async queryBaggageTable(dataContent) {
+      try {
+        const res = await TempQuery({
+          serviceId: 1144,
+          dataContent: {
+            flightNO: dataContent[0],
+            flightDate: dataContent[1],
+            departureAirport: dataContent[2],
+            arriveAirport: dataContent[3],
+          }
+        })
+        if (Number(res.code) === 0) {
+          return res.returnData.listValues
+        } else {
+          return Promise.reject(res.message)
+        }
+      } catch (error) {
+        return Promise.reject(error)
+      }
     },
     async queryAirline (dataContent) {
       try {
@@ -1071,7 +1091,8 @@ export default {
         const [flightInfo, containerTableDataData, flightBaggageTableData] = await Promise.all([
           this.queryflightInfo(dataContent),
           this.queryContainer(dataContent),
-          this.queryBaggageByFlightNO(dataContent)
+          // this.queryBaggageByFlightNO(dataContent)
+          this.queryBaggageTable(dataContent)
         ])
         if (flightInfo.length) {
           this.flightInfo = flightInfo[0]

+ 1 - 1
src/views/baggageManagementTemp/mixins/timeZone.js

@@ -28,7 +28,7 @@ export default {
         case 'sortTime':
         case 'loadTime':
         case 'inflTime':
-          return cellValue ? `${timeInZone(cellValue.split(',')[0], this.timeZone)}\n${cellValue.split(',')[1]}` : ''
+          return cellValue ? `${timeInZone(cellValue.split('_')[0], this.timeZone)}\n${cellValue.split('_')[1]}` : ''
         // return `${cellValue ?? ''}\n${getTimeInZone(row['checkInTime'], this.timeZone)}`
         // case 'DealInfo':
         //   return `${cellValue ?? ''}\n${getTimeInZone(row['DealTime'], this.timeZone)}`