From 1b6ad5c703cfe37859fbc70248c55a200844f80e Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Wed, 28 Nov 2018 09:15:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=80=BC=E6=9C=BA=E6=9F=9C=E5=8F=B0-=E5=80=BC?=
 =?UTF-8?q?=E6=9C=BA=E5=B2=9B=E3=80=81=E8=A1=8C=E6=9D=8E=E8=BD=AC=E9=80=81?=
 =?UTF-8?q?=E5=B8=A6=E3=80=81=E8=88=AA=E7=AB=99=E6=A5=BC=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../checkin-desk/checkin-desk.component.html  | 20 +++++-----
 .../checkin-desk/checkin-desk.component.ts    | 39 +++++++++++++++++++
 2 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html
index 6aa559a..6a9708d 100644
--- a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html
+++ b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html
@@ -7,9 +7,9 @@
                             <option value="">选择列名</option>
                             <option value="checkindeskCode">值机柜台代码</option>
                             <option value="checkindeskName">值机柜台名称</option>
-                            <option value="checkinGroupCode">值机岛</option>
-                            <option value="chutCode">行李传送带</option>
-                            <option value="terminalAreaCode">航站楼区域</option>
+                            <option value="checkinGroupName">值机岛</option>
+                            <option value="chutName">行李传送带</option>
+                            <option value="terminalAreaName">航站楼区域</option>
                     </select>
                     <label class="radio-inline custom-radio nowrap mr-4">
                             <input type="radio" [(ngModel)]="FLT_POS" [value]="1" name="filter-position">
@@ -24,7 +24,7 @@
               <div class="line-operator-right mb-3 col-xlg-4 col-mlg-4 col-xl-4 col-lg-1">
                   <!-- <button type="button" class="btn btn-info mr-3">值机柜台编辑</button>
                   <button type="button" class="btn btn-info mr-3">打印</button> -->
-                  <button type="button" class="btn btn-info mr-3">刷新</button>
+                  <!-- <button type="button" class="btn btn-info mr-3">刷新</button> -->
               </div>
           </div>
 
@@ -33,7 +33,7 @@
               <label for="terminalAreaCode">所属航站楼区域：&nbsp;&nbsp;</label>
               <select  class="form-control" [(ngModel)]="filterItems.terminalAreaCode" (ngModelChange)="selectChange()" id="qy">
                   <option value=""></option>
-                  <option *ngFor="let items of terminalAreas" [value]="items.terminalAreaName">{{items.terminalAreaName}}</option>
+                  <option *ngFor="let items of terminalAreas" [value]="items.terminalAreaCode">{{items.terminalAreaName}}</option>
                   <!-- <option value="GH">国内区域</option>
                   <option value="CH">国外区域</option>
                   <option value="QH">其他区域</option> -->
@@ -43,7 +43,7 @@
               <label for="checkinGroupCode">值机岛：&nbsp;&nbsp;</label>
               <select  class="form-control" [(ngModel)]="filterItems.checkinGroupCode" (ngModelChange)="selectChange()" id="zjd">
                   <option value=""></option>
-                  <option *ngFor="let items of checkinGroups" [value]="items.checkinGroupName">{{items.checkinGroupName}}</option>
+                  <option *ngFor="let items of checkinGroups" [value]="items.checkinGroupCode">{{items.checkinGroupName}}</option>
                   <!-- <option value="A">A岛</option>
                   <option value="B">B岛</option>
                   <option value="C">C岛</option> -->
@@ -53,7 +53,7 @@
             <label for="chutCode">行李传送带：&nbsp;&nbsp;</label>
             <select  class="form-control" [(ngModel)]="filterItems.chutCode" (ngModelChange)="selectChange()" id="xl">
                 <option value=""></option>
-                <option *ngFor="let items of chuts" [value]="items.chutName">{{items.chutName}}</option>
+                <option *ngFor="let items of chuts" [value]="items.chutCode">{{items.chutName}}</option>
                 <!-- <option value="X">X行李</option>
                 <option value="Z">Z行李</option>
                 <option value="Y">Y行李</option> -->
@@ -82,9 +82,9 @@
                           <td>{{i+1}}</td>
                           <td>{{checkinDesk.checkindeskCode}}</td>
                           <td>{{checkinDesk.checkindeskName}}</td>
-                          <td>{{checkinDesk.checkinGroupCode}}</td>
-                          <td>{{checkinDesk.chutCode}}</td>
-                          <td>{{checkinDesk.terminalAreaCode}}</td>
+                          <td>{{checkinDesk.checkinGroupName}}</td>
+                          <td>{{checkinDesk.chutName}}</td>
+                          <td>{{checkinDesk.terminalAreaName}}</td>
                           <!-- <td *ngFor="let airline_col of checkindesk_lists" [ngStyle]="{'background-color':getColor(airline_col.COL_CODE)}">{{airline_row['renderFlight'][airline_col.COL_CODE]}}</td> -->
                       </tr>
                   </tbody>
diff --git a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.ts b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.ts
index 6c352c7..5ece7f2 100644
--- a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.ts
+++ b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.ts
@@ -40,6 +40,15 @@ ngOnInit() {
         data=>{
             this.checkinDesks = data;
             this.render_data = this.checkinDesks;
+            if(this.terminalAreas && this.terminalAreas.length>0){//所属航站楼区域数据转换处理
+                this.terminalAreasHandle();
+            }
+            if(this.checkinGroups && this.checkinGroups.length>0){//值机岛数据转换处理
+                this.checkinGroupsHandle();
+            }
+            if(this.checkinGroups && this.checkinGroups.length>0){//行李传送带数据转换处理
+                this.chutsHandle();
+            }
         }
     )
     //所属航站楼区域
@@ -74,6 +83,36 @@ ngOnInit() {
     tableCont.addEventListener('scroll',scrollHandle);
 }
 
+//所属航站楼区域数据转换处理
+terminalAreasHandle() {
+    this.render_data.forEach(item => {
+        let terminalAreasLinkIndex = this.terminalAreas.findIndex(val => val.terminalAreaCode === item['terminalAreaCode']);
+        item['terminalAreaName'] = this.terminalAreas[terminalAreasLinkIndex].terminalAreaName;
+    })
+}
+
+//值机岛数据转换处理
+checkinGroupsHandle() {
+    this.render_data.forEach(item => {
+        let checkinGroupsLinkIndex = this.checkinGroups.findIndex(val => val.checkinGroupCode === item['checkinGroupCode']);
+        let checkinGroups = this.checkinGroups[checkinGroupsLinkIndex].checkinGroupName
+        if(checkinGroups !=null){
+            item['checkinGroupName'] = checkinGroups;
+        }
+    })
+}
+
+//行李传送带数据转换处理
+chutsHandle() {
+    this.render_data.forEach(item => {
+        let chutsLinkIndex = this.chuts.findIndex(val => val.chutCode === item['chutCode']);
+        let chuts = this.chuts[chutsLinkIndex].chutName
+        if(chuts !=null && chuts !=""){
+            item['chutName'] = chuts;
+        }
+    })
+}
+
 /**
  * 选中某行
  * @param i