|
|
@@ -446,7 +446,9 @@ export default {
|
|
|
} else {
|
|
|
if (
|
|
|
tableData[i]['flightNo'] === tableData[i - 1]['flightNo'] &&
|
|
|
- tableData[i]['flightDate'] === tableData[i - 1]['flightDate']
|
|
|
+ tableData[i]['flightDate'] === tableData[i - 1]['flightDate']&&
|
|
|
+ tableData[i]['departureAirport'] === tableData[i - 1]['departureAirport']&&
|
|
|
+ tableData[i]['landingAirport'] === tableData[i - 1]['landingAirport']
|
|
|
) {
|
|
|
spanArr[pos] += 1
|
|
|
spanArr.push(0)
|
|
|
@@ -460,7 +462,7 @@ export default {
|
|
|
this.pos = pos
|
|
|
},
|
|
|
tableSpanMethod({ row, column, rowIndex, columnIndex }) {
|
|
|
- if (['flightNo', 'flightDate'].includes(column['property'])) {
|
|
|
+ if (['flightNo', 'flightDate','departureAirport','landingAirport'].includes(column['property'])) {
|
|
|
const _row = this.spanArr[rowIndex]
|
|
|
const _col = _row > 0 ? 1 : 0
|
|
|
return {
|
|
|
@@ -499,13 +501,16 @@ export default {
|
|
|
// item['DealTime'] = item['DealTime'].replace('T', '\n')
|
|
|
// item.NodeNameEN && this.stepData.splice(index, 1, item)
|
|
|
// })
|
|
|
- this.baggageTableData = baggageDetails.map((item, index) => {
|
|
|
+ let baggageDetailsData = this._.sortBy(baggageDetails, ['flightDate','dealTime'])
|
|
|
+
|
|
|
+ this.baggageTableData = baggageDetailsData.map((item, index) => {
|
|
|
this.stepData.splice(index, 1, {
|
|
|
NodeNameEN: item.nodeCode,
|
|
|
DealTime: item.dealTime.replace('T', '\n')
|
|
|
})
|
|
|
-
|
|
|
+ if(item['dealTime'].split('T').length>1){
|
|
|
item['dealTime'] = item['dealTime'].split('T')[1]
|
|
|
+ }
|
|
|
item['departureAirport'] = `${item['departureAirport']}\n${item['departureTime'].split('T')[1]}`
|
|
|
item['landingAirport'] = `${item['landingAirport']}\n${item['landingTime'].split('T')[1]}`
|
|
|
return item
|
