From 8cbea4d402eb7a42d5b484a14508c78e9b55fc57 Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Tue, 18 Dec 2018 17:42:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=A3=E5=BA=A6=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail-tab/detail-tab.component.html      |   4 +-
 .../seasonal-plan.component.html              |  18 +-
 .../seasonal-plan/seasonal-plan.component.ts  | 213 ++----------------
 3 files changed, 35 insertions(+), 200 deletions(-)

diff --git a/src/app/pages/seasonal-plan/detail-tab/detail-tab.component.html b/src/app/pages/seasonal-plan/detail-tab/detail-tab.component.html
index b33a141..98c36cd 100644
--- a/src/app/pages/seasonal-plan/detail-tab/detail-tab.component.html
+++ b/src/app/pages/seasonal-plan/detail-tab/detail-tab.component.html
@@ -6,8 +6,8 @@
         <p><label>国际代码：</label>{{flight.internationalCode}}</p>
         <p><label>航空公司：</label>{{flight.airlineChnName}}</p>
         <p><label>航线类别：</label>{{flight.routeType}}</p>
-        <p><label>航班类别：</label>{{flight.flightTypeCode}}</p>
-        <p><label>航班任务：</label>{{flight.flightTask}}</p>
+        <p><label>航班类别：</label>{{flight.flightTypeNameCn}}</p>
+        <!-- <p><label>航班任务：</label>{{flight.flightTask}}</p> -->
         <p><label>运营日：</label>{{flight.operationDays}}</p>
         <p><label>开始日期：</label>{{flight.startDate}}</p>
         <p><label>结束日期：</label>{{flight.endDate}}</p>
diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.html b/src/app/pages/seasonal-plan/seasonal-plan.component.html
index 23e6cc4..53bc224 100644
--- a/src/app/pages/seasonal-plan/seasonal-plan.component.html
+++ b/src/app/pages/seasonal-plan/seasonal-plan.component.html
@@ -50,13 +50,13 @@
               <label for="flightTypeCode">航班类别：&nbsp;&nbsp;</label>
               <select  class="form-control" [(ngModel)]="filterItems.flightTypeCode" (ngModelChange)="selectChange()" >
                   <option value=""></option>
-                  <option value="P">客机</option>
+                  <!-- <option value="P">客机</option>
                   <option value="F">货机</option>
                   <option value="B">专机</option>
                   <option value="O">公务机</option>
                   <option value="M">军机</option>
-                  <option value="X">其他</option>
-                  <!-- <option *ngFor="let item of seasonals" [value]="item.flightTypeCode">{{item.flightTypeCode}}</option> -->
+                  <option value="X">其他</option> -->
+                  <option *ngFor="let item of flightTypes" [value]="item.flightTypeCode">{{item.flightTypeNameCn}}</option>
               </select>
           </div>
           <div class="input-container mr-4">
@@ -68,7 +68,7 @@
                   <!-- <option *ngFor="let item of seasonals" [value]="item.arriOrDept">{{item.arriOrDept}}</option> -->
               </select>
           </div>
-          <div class="input-container mr-4">
+         <!--  <div class="input-container mr-4">
               <label for="flightTask">航班任务：&nbsp;&nbsp;</label>
               <select  class="form-control" [(ngModel)]="filterItems.flightTask" (ngModelChange)="selectChange()">
                   <option value=""></option>
@@ -82,9 +82,9 @@
                   <option value="Q">补班</option>
                   <option value="X">其他</option>
                   <option value="A">计划外</option>
-                  <!-- <option *ngFor="let item of seasonals" [value]="item.flightTask">{{item.flightTask}}</option> -->
+                  <option *ngFor="let item of seasonals" [value]="item.flightTask">{{item.flightTask}}</option>
               </select>
-          </div>
+          </div> -->
         </div>
         <div class="third-condition row">
           <label class="radio-inline custom-checkbox nowrap mr-4">
@@ -110,7 +110,7 @@
                           <th>航空公司</th>
                           <th>航线类别</th>
                           <th>航班类别</th>
-                          <th>航班任务</th>
+                          <!-- <th>航班任务</th> -->
                           <th>运营日</th>
                           <th>开始日期</th>
                           <th>结束日期</th>
@@ -133,8 +133,8 @@
                           <td>{{seasonal.internationalCode}}</td>
                           <td>{{seasonal.airlineChnName}}</td>
                           <td>{{seasonal.routeType}}</td>
-                          <td>{{seasonal.flightTypeCode}}</td>
-                          <td>{{seasonal.flightTask}}</td>
+                          <td>{{seasonal.flightTypeNameCn}}</td>
+                          <!-- <td>{{seasonal.flightTask}}</td> -->
                           <td>{{seasonal.operationDays}}</td>
                           <td>{{seasonal.startDate}}</td>
                           <td>{{seasonal.endDate}}</td>
diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.ts b/src/app/pages/seasonal-plan/seasonal-plan.component.ts
index b061e3f..2fc8b97 100644
--- a/src/app/pages/seasonal-plan/seasonal-plan.component.ts
+++ b/src/app/pages/seasonal-plan/seasonal-plan.component.ts
@@ -32,8 +32,8 @@ export class SeasonalPlanComponent implements OnInit {
         { col_code: 'internationalCode', col_chn: '国际代码' },
         { col_code: 'airlineChnName', col_chn: '航空公司' },
         { col_code: 'routeType', col_chn: '航线类别' },
-        { col_code: 'flightTypeCode', col_chn: '航班类别' },
-        { col_code: 'flightTask', col_chn: '航班任务' },
+        { col_code: 'flightTypeNameCn', col_chn: '航班类别' },
+        /* { col_code: 'flightTask', col_chn: '航班任务' }, */
         { col_code: 'operationDays', col_chn: '运营日' },
         { col_code: 'startDate', col_chn: '开始日期' },
         { col_code: 'endDate', col_chn: '结束日期' },
@@ -56,13 +56,14 @@ export class SeasonalPlanComponent implements OnInit {
         routeType: '',  //航线类别
         flightTypeCode: '',  //航班类别
         arriOrDept: '', //到达/出发
-        flightTask: '',    //航班任务
+        /* flightTask: '',    //航班任务 */
     }
     public tabClose: boolean = true;
 
     seasonals : Array<any>; 
     airlines : Array<any>; //航空公司
     aircraftTypes : Array<any>; //机型
+    flightTypes : Array<any>; //航班类别
     public row_state: any = { renderFlight: {} };
     public render_data: Array<object> = [];  //显示数据，即需要显示的数据
     public return_data: Array<object> = []; //下拉框显示数据
@@ -78,6 +79,9 @@ export class SeasonalPlanComponent implements OnInit {
                 if(this.aircraftTypes && this.aircraftTypes.length > 0){//机型列表数据转换
                     this.aircraftTypesHandle();
                 }
+                if(this.flightTypes && this.flightTypes.length > 0){//航班类别列表数据转换
+                    this.flightTypesHandle();
+                }
                 this.render_data.forEach(element => {//航线类别列表显示数据转换
                     if (element['routeType'] == 'D') {
                         element['routeType'] = '国内'
@@ -106,74 +110,6 @@ export class SeasonalPlanComponent implements OnInit {
                         return item['arriOrDept']
                     }
                 });
-                this.render_data.forEach(item => {//航班类别列表显示数据转换
-                    if(item['flightTypeCode'] == 'P'){
-                        item['flightTypeCode'] = '客机'
-                        return item['flightTypeCode']
-                    }
-                    if(item['flightTypeCode'] == 'F'){
-                        item['flightTypeCode'] = '货机'
-                        return item['flightTypeCode']
-                    }
-                    if(item['flightTypeCode'] == 'B'){
-                        item['flightTypeCode'] = '专机'
-                        return item['flightTypeCode']
-                    }
-                    if(item['flightTypeCode'] == 'O'){
-                        item['flightTypeCode'] = '公务机'
-                        return item['flightTypeCode']
-                    }
-                    if(item['flightTypeCode'] == 'M'){
-                        item['flightTypeCode'] = '军机'
-                        return item['flightTypeCode']
-                    }
-                    if(item['flightTypeCode'] == 'X'){
-                        item['flightTypeCode'] = '其他'
-                        return item['flightTypeCode']
-                    }
-                });
-                this.render_data.forEach(item => {//航班任务列表显示数据转换
-                    if(item['flightTask'] == 'S'){
-                        item['flightTask'] = '正班'
-                        return item['flightTask']
-                    }
-                    if(item['flightTask'] == 'N'){
-                        item['flightTask'] = '包机'
-                        return item['flightTask']
-                    }
-                    if(item['flightTask'] == 'E'){
-                        item['flightTask'] = '急救'
-                        return item['flightTask']
-                    }
-                    if(item['flightTask'] == 'B'){
-                        item['flightTask'] = '专机'
-                        return item['flightTask']
-                    }
-                    if(item['flightTask'] == 'G'){
-                        item['flightTask'] = '通用'
-                        return item['flightTask']
-                    }
-                    if(item['flightTask'] == 'J'){
-                        item['flightTask'] = '加班'
-                        return item['flightTask']
-                    }
-                    if(item['flightTask'] == 'M'){
-                        item['flightTask'] = '军用'
-                        return item['flightTask']
-                    }
-                    if(item['flightTask'] == 'Q'){
-                        item['flightTask'] = '补班'
-                        return item['flightTask']
-                    }
-                    if(item['flightTask'] == 'X'){
-                        item['flightTask'] = '其他'
-                        return item['flightTask']
-                    }
-                    if(item['flightTask'] == 'A'){
-                        item['flightTask'] = '计划外'
-                        return item['flightTask']
-                    }
-                });
             }
         )
         //航空公司
@@ -190,6 +126,13 @@ export class SeasonalPlanComponent implements OnInit {
                 this.aircraftTypes = data;
             }
         )
+        //航班类别
+        this.flightTypes = this.basicDataService.flightTypes;
+        this.basicDataService.flightTypes_subject.subscribe(
+            data=> {
+                this.flightTypes = data;
+            }
+        )
         /**
          * 固定表头
          */
@@ -220,6 +163,16 @@ export class SeasonalPlanComponent implements OnInit {
         })
     }
 
+    //航班类别数据转换处理
+    flightTypesHandle() {
+        this.render_data.forEach(item => {
+            let flightTypesLinkIndex = this.flightTypes.findIndex(val => val.flightTypeCode === item['flightTypeCode']);
+            if(this.flightTypes[flightTypesLinkIndex]){
+                item['flightTypeNameCn'] = this.flightTypes[flightTypesLinkIndex].flightTypeNameCn;
+            }
+        })
+    }
+
     /**
      * 复选框勾选事件
      */
@@ -292,56 +245,6 @@ export class SeasonalPlanComponent implements OnInit {
             if(item['arriOrDept'] == '出发'){
                 item['arriOrDept'] = 'D'
             }
-            //航班类别
-            if(item['flightTypeCode'] == '客机'){
-                item['flightTypeCode'] = 'P'
-            }
-            if(item['flightTypeCode'] == '货机'){
-                item['flightTypeCode'] = 'F'
-            }
-            if(item['flightTypeCode'] == '专机'){
-                item['flightTypeCode'] = 'B'
-            }
-            if(item['flightTypeCode'] == '公务机'){
-                item['flightTypeCode'] = 'O'
-            }
-            if(item['flightTypeCode'] == '军机'){
-                item['flightTypeCode'] = 'M'
-            }
-            if(item['flightTypeCode'] == '其他'){
-                item['flightTypeCode'] = 'X'
-            }
-            //航班任务
-            if(item['flightTask'] == '正班'){
-                item['flightTask'] = 'S'
-            }
-            if(item['flightTask'] == '包机'){
-                item['flightTask'] = 'N'
-            }
-            if(item['flightTask'] == '急救'){
-                item['flightTask'] = 'E'
-            }
-            if(item['flightTask'] == '专机'){
-                item['flightTask'] = 'B'
-            }
-            if(item['flightTask'] == '通用'){
-                item['flightTask'] = 'G'
-            }
-            if(item['flightTask'] == '加班'){
-                item['flightTask'] = 'J'
-            }
-            if(item['flightTask'] == '军用'){
-                item['flightTask'] = 'M'
-            }
-            if(item['flightTask'] == '补班'){
-                item['flightTask'] = 'Q'
-            }
-            if(item['flightTask'] == '其他'){
-                item['flightTask'] = 'X'
-            }
-            if(item['flightTask'] == '计划外'){
-                item['flightTask'] = 'A'
-            }
             for (const key in this.filterItems) {
                 if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) {
                     if (item[key] == this.filterItems[key]) {
@@ -384,74 +287,6 @@ export class SeasonalPlanComponent implements OnInit {
                 return item['arriOrDept']
             }
         });
-        this.return_data.forEach(item => {//航班类别列表显示数据转换
-            if(item['flightTypeCode'] == 'P'){
-                item['flightTypeCode'] = '客机'
-                return item['flightTypeCode']
-            }
-            if(item['flightTypeCode'] == 'F'){
-                item['flightTypeCode'] = '货机'
-                return item['flightTypeCode']
-            }
-            if(item['flightTypeCode'] == 'B'){
-                item['flightTypeCode'] = '专机'
-                return item['flightTypeCode']
-            }
-            if(item['flightTypeCode'] == 'O'){
-                item['flightTypeCode'] = '公务机'
-                return item['flightTypeCode']
-            }
-            if(item['flightTypeCode'] == 'M'){
-                item['flightTypeCode'] = '军机'
-                return item['flightTypeCode']
-            }
-            if(item['flightTypeCode'] == 'X'){
-                item['flightTypeCode'] = '其他'
-                return item['flightTypeCode']
-            }
-        });
-        this.return_data.forEach(item => {//航班任务列表显示数据转换
-            if(item['flightTask'] == 'S'){
-                item['flightTask'] = '正班'
-                return item['flightTask']
-            }
-            if(item['flightTask'] == 'N'){
-                item['flightTask'] = '包机'
-                return item['flightTask']
-            }
-            if(item['flightTask'] == 'E'){
-                item['flightTask'] = '急救'
-                return item['flightTask']
-            }
-            if(item['flightTask'] == 'B'){
-                item['flightTask'] = '专机'
-                return item['flightTask']
-            }
-            if(item['flightTask'] == 'G'){
-                item['flightTask'] = '通用'
-                return item['flightTask']
-            }
-            if(item['flightTask'] == 'J'){
-                item['flightTask'] = '加班'
-                return item['flightTask']
-            }
-            if(item['flightTask'] == 'M'){
-                item['flightTask'] = '军用'
-                return item['flightTask']
-            }
-            if(item['flightTask'] == 'Q'){
-                item['flightTask'] = '补班'
-                return item['flightTask']
-            }
-            if(item['flightTask'] == 'X'){
-                item['flightTask'] = '其他'
-                return item['flightTask']
-            }
-            if(item['flightTask'] == 'A'){
-                item['flightTask'] = '计划外'
-                return item['flightTask']
-            }
-        });
         this.render_data = this.return_data;
         if (this.FLT_POS === 1) {
             this.inputFilter(this.render_data);