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 @@ 选择列名 值机柜台代码 值机柜台名称 - 值机岛 - 行李传送带 - 航站楼区域 + 值机岛 + 行李传送带 + 航站楼区域 @@ -24,7 +24,7 @@ - 刷新 + @@ -33,7 +33,7 @@ 所属航站楼区域: - {{items.terminalAreaName}} + {{items.terminalAreaName}} @@ -43,7 +43,7 @@ 值机岛: - {{items.checkinGroupName}} + {{items.checkinGroupName}} @@ -53,7 +53,7 @@ 行李传送带: - {{items.chutName}} + {{items.chutName}} @@ -82,9 +82,9 @@ {{i+1}} {{checkinDesk.checkindeskCode}} {{checkinDesk.checkindeskName}} - {{checkinDesk.checkinGroupCode}} - {{checkinDesk.chutCode}} - {{checkinDesk.terminalAreaCode}} + {{checkinDesk.checkinGroupName}} + {{checkinDesk.chutName}} + {{checkinDesk.terminalAreaName}} 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