增加-机场集团、国家、机型组、航空集团下拉框数据对接

src/app/pages/basic-data/airline/airline.component.html

@@ -21,10 +21,10 @@
   
             <div class="second-condition mb-3 row">
               <div class="input-container mr-4">
-                <label for="airlineName">航空集团：&nbsp;&nbsp;</label>
-                <select class="form-control" [(ngModel)]="filterItems.airlineName" (ngModelChange)="selectChange()" id="handkong">
+                <label for="airlineGroupId">航空集团：&nbsp;&nbsp;</label>
+                <select class="form-control" [(ngModel)]="filterItems.airlineGroupId" (ngModelChange)="selectChange()" id="handkong">
                     <option value=""></option>
-                    <option *ngFor="let item of airlines" [value]="item.airlineName" >{{item.airlineName}}</option>
+                    <option *ngFor="let item of airlinegroups" [value]="item.airlineGroupId" >{{item.airlineGroupName}}</option>
                 </select>
             </div>
             <div class="input-container mr-4">

src/app/pages/basic-data/airline/airline.component.ts

@@ -29,6 +29,7 @@ export class AirlineComponent implements OnInit {
     FLT_POS = 1;    //过滤还是定位
     SEL_COL = '';   //选择列名
 
+    airlinegroups: Array<any>; //航空集团
     airlines: Array<any>;
     public row_state: any = { renderFlight: {} };
     public render_data: Array<object> = [];  //显示数据，即需要显示的数据
@@ -39,6 +40,7 @@ export class AirlineComponent implements OnInit {
         briefNameChn: '',
     }
     ngOnInit() {
+        this.airlinegroups = this.basicDataService.airlinegroup;
         this.airlines = this.basicDataService.airline;
         this.render_data = this.basicDataService.airline;
         this.basicDataService.airline_subject.subscribe(
@@ -47,6 +49,9 @@ export class AirlineComponent implements OnInit {
                 this.render_data = data;
             }
         )
+        this.basicDataService.airlinegroup_subject.subscribe(
+            data => this.airlinegroups = data
+        )
         /**
          * 固定表头
          */