基础数据类型转换处理

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

@@ -31,7 +31,7 @@
                 <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 aircraftTypes" [value]="item.aircraftTypeCode">{{item.aircraftTypeCode}}</option>
+                    <option *ngFor="let item of aircraftTypes" [value]="item.aircraftTypeCode">{{item.aircraftTypeName}}</option>
                 </select>
             </div>
           </div>
@@ -63,8 +63,8 @@
                             <td>{{aircraft.maxTakeoffWeight}}</td>
                             <td>{{aircraft.maxAirbridges}}</td>
                             <td>{{aircraft.aircraftOwnerCode}}</td>
-                            <td>{{aircraft.airlineCode}}</td>
-                            <td>{{aircraft.aircraftTypeCode}}</td>
+                            <td>{{aircraft.airlineName}}</td>
+                            <td>{{aircraft.aircraftTypeName}}</td>
                         </tr>
                     </tbody>
                 </table>

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

@@ -49,11 +49,17 @@ export class AircraftComponent implements OnInit {
             data => {
                 this.aircrafts = data;
                 this.render_data = data;
+                if(this.aircraftTypes && this.aircraftTypes.length > 0){//机型列表数据转换
+                    this.basicDataTransHandle();
+                }
             }
         )
         this.basicDataService.airline_subject.subscribe(
             data => {
                 this.airlines = data;
+                if(this.airlines && this.airlines.length > 0){//航空公司数据转换处理
+                    this.airlinesHandle();
+                }
             }
         )
         this.basicDataService.aircraft_type_subject.subscribe(
@@ -61,7 +67,16 @@ export class AircraftComponent implements OnInit {
                 this.aircraftTypes = data;
             }
         )
-
+        //机型数据转换处理
+        this.render_data.forEach(item => {
+            let aircraftTypesLinkIndex = this.aircraftTypes.findIndex(val => val.aircraftTypeCode === item['aircraftTypeCode']);
+            item['aircraftTypeName'] = this.aircraftTypes[aircraftTypesLinkIndex].aircraftTypeName;
+        })
+        //航空公司数据转换处理
+        this.render_data.forEach(item => {
+            let airlinesLinkIndex = this.airlines.findIndex(val => val.airlineCode === item['airlineCode']);
+            item['airlineName'] = this.airlines[airlinesLinkIndex].airlineName;
+        })
         /**
          * 固定表头
          */
@@ -73,6 +88,22 @@ export class AircraftComponent implements OnInit {
         tableCont.addEventListener('scroll', scrollHandle);
     }
 
+    //航空公司数据转换处理
+    airlinesHandle() {
+        this.render_data.forEach(item => {
+            let airlinesLinkIndex = this.airlines.findIndex(val => val.airlineCode === item['airlineCode']);
+            item['airlineName'] = this.airlines[airlinesLinkIndex].airlineName;
+        })
+    }
+
+     //机型数据转换处理
+     basicDataTransHandle() {
+        this.render_data.forEach(item => {
+            let aircraftTypesLinkIndex = this.aircraftTypes.findIndex(val => val.aircraftTypeCode === item['aircraftTypeCode']);
+            item['aircraftTypeName'] = this.aircraftTypes[aircraftTypesLinkIndex].aircraftTypeName;
+        })
+    }
+
     /**
      * 选中某行
      * @param i