|
@@ -1,7 +1,7 @@
|
|
|
<!--
|
|
|
* @Author: your name
|
|
|
* @Date: 2022-01-17 10:39:22
|
|
|
- * @LastEditTime: 2022-05-17 17:59:01
|
|
|
+ * @LastEditTime: 2022-05-17 18:35:16
|
|
|
* @LastEditors: your name
|
|
|
* @Description: 航班视图
|
|
|
-->
|
|
@@ -185,7 +185,7 @@
|
|
|
:key="item.id"
|
|
|
:prop="item.prop"
|
|
|
:label="item.name"
|
|
|
- :align="item.align"
|
|
|
+ :align="item.align || 'center'"
|
|
|
:show-overflow-tooltip="true"
|
|
|
/>
|
|
|
</el-table>
|
|
@@ -213,7 +213,7 @@
|
|
|
:key="item.id"
|
|
|
:prop="item.prop"
|
|
|
:label="item.name"
|
|
|
- :align="item.align"
|
|
|
+ :align="item.align || 'center'"
|
|
|
:show-overflow-tooltip="true"
|
|
|
/>
|
|
|
</el-table>
|
|
@@ -241,7 +241,7 @@
|
|
|
:key="item.id"
|
|
|
:prop="item.prop"
|
|
|
:label="item.name"
|
|
|
- :align="item.align"
|
|
|
+ :align="item.align || 'center'"
|
|
|
:show-overflow-tooltip="true"
|
|
|
/>
|
|
|
</el-table>
|
|
@@ -291,6 +291,7 @@
|
|
|
show-summary
|
|
|
:summary-method="summaryRow(flightBaggageTableData.length)"
|
|
|
:header-cell-style="{ color: '#101116' }"
|
|
|
+ :cell-class-name="cellClass"
|
|
|
@row-click="flightBaggageTableClickHandler"
|
|
|
>
|
|
|
<el-table-column
|
|
@@ -298,7 +299,9 @@
|
|
|
:key="item.index"
|
|
|
:prop="item.prop"
|
|
|
:label="item.name"
|
|
|
- :align="item.align"
|
|
|
+ :align="item.align || 'center'"
|
|
|
+ :width="item.width"
|
|
|
+ :formatter="tableFormat"
|
|
|
:filters="flightBaggageTableFilters[item.prop]"
|
|
|
:filter-method="flightBaggageTableFilters[item.prop] && filterHandler"
|
|
|
filter-placement="top"
|
|
@@ -352,54 +355,50 @@ import tableColsMixin from '../../mixins/tableCols'
|
|
|
import timeZoneMixin from '../../mixins/timeZone'
|
|
|
|
|
|
// const arrivalBaggageTableColumn = [
|
|
|
-// { name: '序号', prop: 'index', align: 'center' },
|
|
|
-// { name: '旅客姓名', prop: 'name', align: 'center', sortable: 'custom' },
|
|
|
-// { name: '行李牌号', prop: 'bagNo', align: 'center' },
|
|
|
+// { name: '序号', prop: 'index' },
|
|
|
+// { name: '旅客姓名', prop: 'name', sortable: 'custom' },
|
|
|
+// { name: '行李牌号', prop: 'bagNo' },
|
|
|
// {
|
|
|
// name: '特殊行李类型',
|
|
|
// prop: 'specialType',
|
|
|
-// align: 'center',
|
|
|
// sortable: 'custom'
|
|
|
// },
|
|
|
// {
|
|
|
// name: '容器编号',
|
|
|
// prop: 'containerNo',
|
|
|
-// align: 'center',
|
|
|
// sortable: 'custom'
|
|
|
// },
|
|
|
-// { name: '装载序号', prop: 'loadSequenceIndex', align: 'center' },
|
|
|
-// { name: '卸载', prop: 'uninstall', align: 'center' },
|
|
|
-// { name: '到达', prop: 'arrival', align: 'center' },
|
|
|
-// { name: '提取', prop: 'extract', align: 'center' },
|
|
|
-// { name: '旅客仓位', prop: 'positionNo', align: 'center' },
|
|
|
-// { name: '中转标志', prop: 'transitStatus', align: 'center' },
|
|
|
-// { name: '卷宗号', prop: 'fileNumber', align: 'center' }
|
|
|
+// { name: '装载序号', prop: 'loadSequenceIndex' },
|
|
|
+// { name: '卸载', prop: 'uninstall' },
|
|
|
+// { name: '到达', prop: 'arrival' },
|
|
|
+// { name: '提取', prop: 'extract' },
|
|
|
+// { name: '旅客仓位', prop: 'positionNo' },
|
|
|
+// { name: '中转标志', prop: 'transitStatus' },
|
|
|
+// { name: '卷宗号', prop: 'fileNumber' }
|
|
|
// ]
|
|
|
const departureBaggageTableColumn = [
|
|
|
- // { name: '序号', prop: 'index', align: 'center' },
|
|
|
- { name: '旅客姓名', prop: 'PassengerNameUpcase', align: 'center', sortable: 'custom' },
|
|
|
- { name: '行李牌号', prop: 'BagSN', align: 'center' },
|
|
|
+ // { name: '序号', prop: 'index' },
|
|
|
+ { name: '旅客姓名', prop: 'PassengerNameUpcase', sortable: 'custom' },
|
|
|
+ { name: '行李牌号', prop: 'BagSN' },
|
|
|
{
|
|
|
name: '特殊行李类型',
|
|
|
prop: 'SpecialType',
|
|
|
- align: 'center',
|
|
|
sortable: 'custom'
|
|
|
},
|
|
|
{
|
|
|
name: '容器编号',
|
|
|
prop: 'U_Device_ID',
|
|
|
- align: 'center',
|
|
|
sortable: 'custom'
|
|
|
},
|
|
|
- { name: '装载序号', prop: 'LoadSN', align: 'center' },
|
|
|
- { name: '值机', prop: 'checkIn', align: 'center' },
|
|
|
- { name: '状态', prop: 'latestStatus', align: 'center' },
|
|
|
- { name: '安检', prop: 'security', align: 'center' },
|
|
|
- { name: '分拣', prop: 'sorting', align: 'center' },
|
|
|
- { name: '装车', prop: 'loading', align: 'center' },
|
|
|
- { name: '装机', prop: 'installed', align: 'center' },
|
|
|
- { name: '中转标志', prop: 'transitFlag', align: 'center' },
|
|
|
- { name: '卷宗号', prop: 'fileNumber', align: 'center' }
|
|
|
+ { name: '装载序号', prop: 'LoadSN' },
|
|
|
+ { name: '值机', prop: 'checkIn', width: 140 },
|
|
|
+ { name: '状态', prop: 'latestStatus' },
|
|
|
+ { name: '安检', prop: 'security', width: 140 },
|
|
|
+ { name: '分拣', prop: 'sorting', width: 140 },
|
|
|
+ { name: '装车', prop: 'loading', width: 140 },
|
|
|
+ { name: '装机', prop: 'installed', width: 140 },
|
|
|
+ { name: '中转标志', prop: 'transitFlag' },
|
|
|
+ { name: '卷宗号', prop: 'fileNumber' }
|
|
|
]
|
|
|
export default {
|
|
|
name: 'FlightView',
|
|
@@ -420,25 +419,25 @@ export default {
|
|
|
// { value: 0, label: 'VIP行李' }
|
|
|
// ],
|
|
|
containerTableColumn: [
|
|
|
- { name: '容器编号', prop: 'containerNumber', align: 'center' },
|
|
|
- { name: '类型', prop: 'style', align: 'center' },
|
|
|
- { name: '行李数', prop: 'numberOfBags', align: 'center' }
|
|
|
+ { name: '容器编号', prop: 'containerNumber' },
|
|
|
+ { name: '类型', prop: 'style' },
|
|
|
+ { name: '行李数', prop: 'numberOfBags' }
|
|
|
],
|
|
|
transferInTableColumn: [
|
|
|
- { name: '航班号', prop: 'PreFlightNO', align: 'center' },
|
|
|
- { name: '日期', prop: 'PreFlightDate', align: 'center' },
|
|
|
- { name: '时间', prop: 'flightTime', align: 'center' },
|
|
|
- { name: '始发站', prop: 'PlanDepartureApt', align: 'center' },
|
|
|
- { name: '航班状态', prop: 'FlightStatus', align: 'center' },
|
|
|
- { name: '中转数', prop: 'totalNumber', align: 'center' }
|
|
|
+ { name: '航班号', prop: 'PreFlightNO' },
|
|
|
+ { name: '日期', prop: 'PreFlightDate' },
|
|
|
+ { name: '时间', prop: 'flightTime' },
|
|
|
+ { name: '始发站', prop: 'PlanDepartureApt' },
|
|
|
+ { name: '航班状态', prop: 'FlightStatus' },
|
|
|
+ { name: '中转数', prop: 'totalNumber' }
|
|
|
],
|
|
|
transferOutTableColumn: [
|
|
|
- { name: '航班号', prop: 'TransferFlightNO', align: 'center' },
|
|
|
- { name: '日期', prop: 'TransferFlightDate', align: 'center' },
|
|
|
- { name: '时间', prop: 'flightTime', align: 'center' },
|
|
|
- { name: '始发站', prop: 'PlanDepartureApt', align: 'center' },
|
|
|
- { name: '目的站', prop: 'PlanLandingApt', align: 'center' },
|
|
|
- { name: '中转数', prop: 'transferNumber', align: 'center' }
|
|
|
+ { name: '航班号', prop: 'TransferFlightNO' },
|
|
|
+ { name: '日期', prop: 'TransferFlightDate' },
|
|
|
+ { name: '时间', prop: 'flightTime' },
|
|
|
+ { name: '始发站', prop: 'PlanDepartureApt' },
|
|
|
+ { name: '目的站', prop: 'PlanLandingApt' },
|
|
|
+ { name: '中转数', prop: 'transferNumber' }
|
|
|
],
|
|
|
// tableCols:
|
|
|
// this.$route.matched[0].path === '/arrival' || this.$route.matched[1].path === '/transfer/arrival'
|
|
@@ -469,6 +468,11 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
methods: {
|
|
|
+ cellClass({ row, column, rowIndex, columnIndex }) {
|
|
|
+ if (['checkIn', 'security', 'sorting', 'loading', 'installed'].includes(column.property)) {
|
|
|
+ return 'pre-line'
|
|
|
+ }
|
|
|
+ },
|
|
|
// 合计行
|
|
|
summaryMethod({ columns, data }) {
|
|
|
const sums = []
|
|
@@ -616,18 +620,12 @@ export default {
|
|
|
return item
|
|
|
})
|
|
|
this.flightBaggageTableData = flightBaggageTableData.map((item, index) => {
|
|
|
- item['checkIn'] = `${item['checkIn'] ?? ''} ${item['checkInTime'] ? item['checkInTime'].split('T')[1] : ''}`
|
|
|
+ item['checkIn'] = `${item['checkIn'] ?? ''}\n${item['checkInTime'] ?? ''}`
|
|
|
item['latestStatus'] = item['Status'] === 'DEL' ? '删除' : item['latestStatus']
|
|
|
- item['security'] = `${item['DealInfo'] ?? ''} ${item['DealTime'] ? item['DealTime'].split('T')[1] : ''}`
|
|
|
- item['sorting'] = `${item['sortLocationMark'] ?? ''} ${
|
|
|
- item['sortDealTime'] ? item['sortDealTime'].split('T')[1] : ''
|
|
|
- }`
|
|
|
- item['loading'] = `${item['loadLocationMark'] ?? ''} ${
|
|
|
- item['loadDealTime'] ? item['loadDealTime'].split('T')[1] : ''
|
|
|
- }`
|
|
|
- item['installed'] = `${item['inflLocationMark'] ?? ''} ${
|
|
|
- item['inflLoadDealTime'] ? item['inflLoadDealTime'].split('T')[1] : ''
|
|
|
- }`
|
|
|
+ item['security'] = `${item['DealInfo'] ?? ''}\n${item['DealTime'] ?? ''}`
|
|
|
+ item['sorting'] = `${item['sortLocationMark'] ?? ''}\n${item['sortDealTime'] ?? ''}`
|
|
|
+ item['loading'] = `${item['loadLocationMark'] ?? ''}\n${item['loadDealTime'] ?? ''}`
|
|
|
+ item['installed'] = `${item['inflLocationMark'] ?? ''}\n${item['inflLoadDealTime'] ?? ''}`
|
|
|
item['transitFlag'] = item['preFlightNO'] === 1 ? '是' : '否'
|
|
|
return item
|
|
|
})
|