|
|
@@ -149,9 +149,6 @@
|
|
|
:filters="activatedItem"
|
|
|
:filter-method="filterHandler"
|
|
|
>
|
|
|
- <!-- <template slot-scope="scope">
|
|
|
- <div>{{ scope.row.activated == "I" ? 0 : 1 }}</div>
|
|
|
- </template> -->
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="BagWeight"
|
|
|
@@ -176,9 +173,15 @@
|
|
|
:filter-method="filterHandler"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
- prop="TransferFlightNO"
|
|
|
+ prop="PreFlightNONotNull"
|
|
|
label="中转进航班"
|
|
|
- :filters="TransferFlightNOItem"
|
|
|
+ :filters="PreFlightNONotNullItem"
|
|
|
+ :filter-method="filterHandler"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ prop="PreFlightNONull"
|
|
|
+ label="中转出航班"
|
|
|
+ :filters="PreFlightNONullItem"
|
|
|
:filter-method="filterHandler"
|
|
|
/>
|
|
|
</el-table>
|
|
|
@@ -439,7 +442,9 @@ export default {
|
|
|
activatedItem: [],
|
|
|
latestStatusItem: [],
|
|
|
bagLocationItem: [],
|
|
|
- TransferFlightNOItem: [],
|
|
|
+ PreFlightNONotNullItem: [],
|
|
|
+ PreFlightNONullItem: [],
|
|
|
+ PreFlightNONullItem:[],
|
|
|
U_Device_IDItem:[],
|
|
|
spanArr:[],
|
|
|
contactDot: 0,
|
|
|
@@ -708,6 +713,12 @@ export default {
|
|
|
let contactDot = this.contactDot;
|
|
|
this.tableData.forEach((item, index) => {
|
|
|
item.index = index;
|
|
|
+ if(item.activated =='I'){
|
|
|
+ item.activated = "未激活"
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ item.activated = "激活"
|
|
|
+ }
|
|
|
if (index === 0) {
|
|
|
this.spanArr.push(1);
|
|
|
} else {
|
|
|
@@ -760,7 +771,8 @@ export default {
|
|
|
activatedItemArr = [],
|
|
|
latestStatusItemArr = [],
|
|
|
bagLocationItemArr = [],
|
|
|
- TransferFlightNOItemArr = [],
|
|
|
+ PreFlightNONotNullItemArr = [],
|
|
|
+ PreFlightNONullItemArr = [],
|
|
|
U_Device_IDItemArr=[]
|
|
|
|
|
|
this.PassengerNameUpcaseItem.length = 0
|
|
|
@@ -774,7 +786,8 @@ export default {
|
|
|
this.activatedItem.length = 0
|
|
|
this.latestStatusItem.length = 0
|
|
|
this.bagLocationItem.length = 0
|
|
|
- this.TransferFlightNOItem.length = 0
|
|
|
+ this.PreFlightNONotNullItem.length = 0
|
|
|
+ this.PreFlightNONullItem.length = 0
|
|
|
this.U_Device_IDItem.length = 0
|
|
|
|
|
|
this.tableData.forEach(item => {
|
|
|
@@ -857,11 +870,18 @@ export default {
|
|
|
value: item.bagLocation
|
|
|
})
|
|
|
}
|
|
|
- if (TransferFlightNOItemArr.indexOf(item.TransferFlightNO) == -1 && item.TransferFlightNO != ''&& item.TransferFlightNO != null) {
|
|
|
- TransferFlightNOItemArr.push(item.TransferFlightNO)
|
|
|
- this.TransferFlightNOItem.push({
|
|
|
- text: item.TransferFlightNO,
|
|
|
- value: item.TransferFlightNO
|
|
|
+ if (PreFlightNONotNullItemArr.indexOf(item.PreFlightNONotNull) == -1 && item.PreFlightNONotNull != ''&& item.PreFlightNONotNull != null) {
|
|
|
+ PreFlightNONotNullItemArr.push(item.PreFlightNONotNull)
|
|
|
+ this.PreFlightNONotNullItem.push({
|
|
|
+ text: item.PreFlightNONotNull,
|
|
|
+ value: item.PreFlightNONotNull
|
|
|
+ })
|
|
|
+ }
|
|
|
+ if (PreFlightNONullItemArr.indexOf(item.PreFlightNONull) == -1 && item.PreFlightNONull != ''&& item.PreFlightNONull != null) {
|
|
|
+ PreFlightNONullItemArr.push(item.PreFlightNONull)
|
|
|
+ this.PreFlightNONullItem.push({
|
|
|
+ text: item.PreFlightNONull,
|
|
|
+ value: item.PreFlightNONull
|
|
|
})
|
|
|
}
|
|
|
if (U_Device_IDItemArr.indexOf(item.U_Device_ID) == -1 && item.U_Device_ID != ''&& item.U_Device_ID != null) {
|
