From 63f995b7d7f3c19a0707977ed6cb2aff70077d0b Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Tue, 27 Nov 2018 09:50:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9E=E6=9C=BA-=E8=88=AA=E7=A9=BA=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E3=80=81=E6=9C=BA=E5=9E=8B=E6=95=B0=E6=8D=AE=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aircraft/aircraft.component.html          |  7 +----
 .../basic-data/aircraft/aircraft.component.ts | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.html b/src/app/pages/basic-data/aircraft/aircraft.component.html
index 2ba21cd..7f7ce0b 100644
--- a/src/app/pages/basic-data/aircraft/aircraft.component.html
+++ b/src/app/pages/basic-data/aircraft/aircraft.component.html
@@ -38,18 +38,13 @@
                 <select  class="form-control" [(ngModel)]="filterItems.airlineCode" (ngModelChange)="selectChange()" id="airlineCompany">
                     <option value=""></option>
                     <option *ngFor="let item of airlines" [value]="item.airlineName">{{item.airlineName}}</option>
-                    <!-- <option value="GH">海南航空公司</option>
-                    <option value="CH">国外航空公司</option> -->
                 </select>
             </div>
             <div class="input-container mr-4">
                 <label for="aircraftTypeCode">机型：&nbsp;&nbsp;</label>
                 <select  class="form-control" [(ngModel)]="filterItems.aircraftTypeCode" (ngModelChange)="selectChange()" id="jx">
                     <option value=""></option>
-                    <option *ngFor="let item of aircrafts" [value]="item.aircraftTypeCode">{{item.aircraftTypeCode}}</option>
-                    <!-- <option value="A">A306</option>
-                    <option value="B">B252</option>
-                    <option value="C">C256</option> -->
+                    <option *ngFor="let item of aircraftTypes" [value]="item.aircraftTypeName">{{item.aircraftTypeName}}</option>
                 </select>
             </div>
           </div>
diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.ts b/src/app/pages/basic-data/aircraft/aircraft.component.ts
index 812e516..90ada75 100644
--- a/src/app/pages/basic-data/aircraft/aircraft.component.ts
+++ b/src/app/pages/basic-data/aircraft/aircraft.component.ts
@@ -26,6 +26,7 @@ public filterItems = {
     aircraftTypeCode:'',
 }
 airlines : Array<any>; //航空公司
+aircraftTypes : Array<any>; //机型
 aircrafts : Array<any>;
 public row_state: any = { renderFlight: {} };
 public render_data: Array<object> = [];  //显示数据，即需要显示的数据
@@ -37,6 +38,12 @@ ngOnInit() {
         data=>{
             this.aircrafts = data;
             this.render_data = this.aircrafts;
+            if(this.aircraftTypes && this.aircraftTypes.length > 0){//机型列表数据转换
+                this.basicDataTransHandle();
+            }
+            if(this.airlines && this.airlines.length > 0){//航空公司数据处理
+                this.basicDataAirlinesHandle();
+            }
         }
     )
     //航空公司
@@ -46,6 +53,13 @@ ngOnInit() {
             this.airlines = data;
         }
     )
+    //机型
+    this.aircraftTypes = this.basicDataService.aircraft_type;
+    this.basicDataService.aircraft_type_subject.subscribe(
+        data=>{
+            this.aircraftTypes = data;
+        }
+    )
     
     /**
      * 固定表头
@@ -58,6 +72,21 @@ ngOnInit() {
     tableCont.addEventListener('scroll',scrollHandle);
 }
 
+basicDataTransHandle() {
+    this.render_data.forEach(item => {
+        //机型数据转换处理
+        let aircraftTypesLinkIndex = this.aircraftTypes.findIndex(val => val.aircraftTypeCode === item['aircraftTypeCode']);
+        item['aircraftTypeCode'] = this.aircraftTypes[aircraftTypesLinkIndex].aircraftTypeName;
+    })
+}
+
+basicDataAirlinesHandle() {
+    this.render_data.forEach(item => {
+        //航空公司数据处理
+        let airlinesLinkIndex = this.airlines.findIndex(val => val.airlineCode === item['airlineCode']);
+        item['airlineCode'] = this.airlines[airlinesLinkIndex].airlineName;
+    })
+}
 /**
  * 选中某行
  * @param i