航班返航及撤销返航消息处理

This commit is contained in:
zhouyuejun
2019-01-24 10:22:06 +08:00
parent 9acf53cfc6
commit 63741d8ae8
4 changed files with 28 additions and 43 deletions
+9 -5
View File
@@ -862,9 +862,9 @@ export class MainComponent implements OnInit {
} else {
return false;
}
}else{
} else {
if (this.row_state['preFlight'] && this.row_state['reaFlight']) {
if ((flight['preFlight']['FLID'] === this.row_state['preFlight']['FLID'])&&(flight['reaFlight']['FLID'] === this.row_state['reaFlight']['FLID'])) {
if ((flight['preFlight']['FLID'] === this.row_state['preFlight']['FLID']) && (flight['reaFlight']['FLID'] === this.row_state['reaFlight']['FLID'])) {
return true;
} else {
return false;
@@ -1037,19 +1037,23 @@ export class MainComponent implements OnInit {
getReturnNotes(flight) {
if (this.orderHandle.isArriFlight(flight)) {
if (flight['preFlight']['FRET']) {
let preFret = flight['preFlight']['FRET'];
if (preFret && preFret.VALUE && preFret.REID) {
return true;
} else {
return false;
}
} else if (this.orderHandle.isDeptFlight(flight)) {
if (flight['reaFlight']['FRET']) {
let reaFret = flight['reaFlight']['FRET'];
if (reaFret && reaFret.VALUE && reaFret.REID) {
return true;
} else {
return false;
}
} else {
if ((flight['preFlight']['FRET']) || (flight['reaFlight']['FRET'])) {
let preFret = flight['preFlight']['FRET'];
let reaFret = flight['reaFlight']['FRET'];
if ((preFret && preFret.VALUE && preFret.REID) || (reaFret && reaFret.VALUE && reaFret.REID)) {
return true;
} else {
return false;
@@ -54,10 +54,10 @@
</div>
<div class="fl-fret" *ngIf="prefret">
<p *ngIf="prefret.REID==='A'">
空返:(空返时间:{{xxx}} 空返原因:{{prefret.VALUE}}
空返:(空返原因:{{prefret.VALUE}}
</p>
<p *ngIf="prefret.REID==='G'">
地返:(地返时间:{{xxx}} 地返原因:{{prefret.VALUE}}
地返:(地返原因:{{prefret.VALUE}}
</p>
</div>
</div>
@@ -77,10 +77,10 @@
</div>
<div class="fl-fret" *ngIf="reafret">
<p *ngIf="reafret.REID==='A'">
空返:(空返时间:{{xxx}} 空返原因:{{reafret.VALUE}}
空返:(空返原因:{{reafret.VALUE}}
</p>
<p *ngIf="reafret.REID==='G'">
地返:(地返时间:{{xxx}} 地返原因:{{reafret.VALUE}}
地返:(地返原因:{{reafret.VALUE}}
</p>
</div>
</div>
@@ -65,7 +65,7 @@ export class RelatedTabComponent implements OnInit {
this.predelay['STRT'] = new Date(dateFormatter(this.predelay['STRT'])).getTime();
this.predelay['DURA'] = parseInt(this.predelay['DURA'].substr(0, 2)) * 3600000 + parseInt(this.predelay['DURA'].substr(2, 3)) * 60000 + this.predelay['STRT']
}
if (cancleIndex > -1) {
if (cancleIndex > -1) {
this.precancle = this.lines.preFlight['ABN'][cancleIndex].BODY;
this.precancle = new Date(dateFormatter(this.precancle)).getTime();
}
@@ -77,7 +77,10 @@ export class RelatedTabComponent implements OnInit {
}
}
if (fretIndex > -1) {
this.prefret = this.lines.preFlight['ABN'][fretIndex].BODY;
let fret = this.lines.preFlight['ABN'][fretIndex].BODY;
if (fret.VALUE && fret.REID) {
this.prefret = fret;
}
}
}
if (this.lines.reaFlight && this.lines.reaFlight['ABN'] && this.lines.reaFlight['ABN'].length > 0) {
@@ -104,7 +107,10 @@ export class RelatedTabComponent implements OnInit {
}
}
if (fretIndex > -1) {
this.reafret = this.lines.reaFlight['ABN'][fretIndex].BODY;
let fret = this.lines.reaFlight['ABN'][fretIndex].BODY;
if (fret.VALUE && fret.REID) {
this.reafret = fret;
}
}
}
};