Skip to content

S
SuperMan
Commit bb70cd17 authored by 黄奎's avatar 黄奎
Browse files
Options

酒店优化

parent 55ae4542
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 38 deletions
src/components/Hotel/roomQuery.vue
View file @ bb70cd17
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<th width="100">地接状态</th> <th width="100">地接状态</th>
</tr> </tr>
<tr v-if="dataList.length==0"> <tr v-if="dataList.length==0">
<td colspan="10">暂无数据</td> <td colspan="11">暂无数据</td>
</tr> </tr>
<template v-for="(outItem,outindex) in dataList"> <template v-for="(outItem,outindex) in dataList">
<tbody :class="{roomQuerySplitTrCss:outindex%2!=0}"> <tbody :class="{roomQuerySplitTrCss:outindex%2!=0}">
...@@ -140,36 +140,30 @@ ...@@ -140,36 +140,30 @@
<template v-for="(subItem,subIndex) in item.PriceHotelResult"> <template v-for="(subItem,subIndex) in item.PriceHotelResult">
<template v-for="(thirdItem,thirdIndex) in subItem.SubList"> <template v-for="(thirdItem,thirdIndex) in subItem.SubList">
<tr> <tr>
<td :rowspan="outItem.PriceCommonList.length*item.PriceHotelResult.length*subItem.SubList.length" <td :rowspan="outItem.rootRowspan" v-if='index==0&&subIndex==0&&thirdIndex==0'>
v-if='index==0&&subIndex==0&&thirdIndex==0'>
{{outItem.NewCombinationNum}} {{outItem.NewCombinationNum}}
</td> </td>
<td :rowspan="item.PriceHotelResult.length*subItem.SubList.length" <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
v-if='subIndex==0&&thirdIndex==0'>
{{item.StartCityName}} {{item.StartCityName}}
</td> </td>
<td :rowspan="item.PriceHotelResult.length*subItem.SubList.length" <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
v-if='subIndex==0&&thirdIndex==0'>
<div class="w120 link"> <div class="w120 link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}</p> <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}</p>
</div> </div>
</td> </td>
<td :rowspan="item.PriceHotelResult.length*subItem.SubList.length" <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0' style="white-space:nowrap;">
v-if='subIndex==0&&thirdIndex==0' style="white-space:nowrap;">
<template v-for="(fItem,fIndex) in item.FlightList"> <template v-for="(fItem,fIndex) in item.FlightList">
<span style="height:25px; line-height:25px;"> <span style="height:25px; line-height:25px;">
<a style="color: #ff0066;font-weight: bold;">{{fItem.Flight_number}}</a> <a style="color: #ff0066;font-weight: bold;">{{fItem.Flight_number}}</a>
{{fItem.FlightDateStr}} {{fItem.FlightDateStr}}
{{fItem.Departure_time}} {{fItem.dName}} {{fItem.TicketArrivalTime}} {{fItem.aName}} {{fItem.Departure_time}} {{fItem.dName}} {{fItem.TicketArrivalTime}} {{fItem.aName}}
</span><br/> </span><br />
</template> </template>
</td> </td>
<td :rowspan="item.PriceHotelResult.length*subItem.SubList.length" <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
v-if='subIndex==0&&thirdIndex==0'>
{{item.LineteamName}} {{item.LineteamName}}
</td> </td>
<td :rowspan="item.PriceHotelResult.length*subItem.SubList.length" <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
v-if='subIndex==0&&thirdIndex==0'>
<div class="w120 link"> <div class="w120 link">
<p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')"> <p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')">
{{item.TotalSeat}}/{{item.YSeatNum}}/{{item.ESeatNum}}/{{item.FSeatNum}} {{item.TotalSeat}}/{{item.YSeatNum}}/{{item.ESeatNum}}/{{item.FSeatNum}}
...@@ -361,7 +355,24 @@ ...@@ -361,7 +355,24 @@
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
this.dataList = res.data.data.pageData; var sourceData = res.data.data.pageData;
if (sourceData) {
sourceData.forEach(rootItem => {
var rootRowspan = 0; //合团跨行
rootItem.PriceCommonList.forEach(subItem => {
var itemRowSpan = 0; //酒店跨行
subItem.PriceHotelResult.forEach(thirdItem => {
thirdItem.SubList.forEach(lastItem => {
rootRowspan++;
itemRowSpan++;
});
});
subItem.itemRowSpan = itemRowSpan;
});
rootItem.rootRowspan = rootRowspan;
});
}
this.dataList = sourceData;
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
......
src/components/Hotel/roomReservations.vue
View file @ bb70cd17
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
<th width="80">出发地</th> <th width="80">出发地</th>
<th width="90">航班时间</th> <th width="90">航班时间</th>
<th width="145">公司团号</th> <th width="145">公司团号</th>
<th width="100">机位总数<br/>(Y/E/F)</th> <th width="100">机位总数<br />(Y/E/F)</th>
<th width="80">占床<br />不占床</th> <th width="80">占床<br />不占床</th>
<th width="80">实际用房数</th> <th width="80">实际用房数</th>
<th width="100">操作</th> <th width="100">操作</th>
...@@ -124,10 +124,10 @@ ...@@ -124,10 +124,10 @@
<th width="100">地接状态</th> <th width="100">地接状态</th>
<th width="150">房间预订数<br />单间/标准双人间/大床房/三人间/司导间</th> <th width="150">房间预订数<br />单间/标准双人间/大床房/三人间/司导间</th>
</tr> </tr>
<tr v-if="list.length==0"> <tr v-if="DataList.length==0">
<td colspan="14">暂无数据</td> <td colspan="14">暂无数据</td>
</tr> </tr>
<template v-for="(outItem,outindex) in list"> <template v-for="(outItem,outindex) in DataList">
<tbody :class="{roomReservationsSplitTrCss:outindex%2!=0}"> <tbody :class="{roomReservationsSplitTrCss:outindex%2!=0}">
<template v-for="(item,index) in outItem.StaticsReportList"> <template v-for="(item,index) in outItem.StaticsReportList">
<template v-for="(subItem,subIndex) in item.CommonReport.HotelOrderListReport" <template v-for="(subItem,subIndex) in item.CommonReport.HotelOrderListReport"
...@@ -135,15 +135,15 @@ ...@@ -135,15 +135,15 @@
<template v-for="(thirdItem,thirdIndex) in subItem.HotelOrderList"> <template v-for="(thirdItem,thirdIndex) in subItem.HotelOrderList">
<tr> <tr>
<td <td
:rowspan="outItem.StaticsReportList.length*item.CommonReport.HotelOrderListReport.length*subItem.HotelOrderList.length" :rowspan="outItem.rootRowspan"
v-if='index==0&&subIndex==0&&thirdIndex==0'> v-if='index==0&&subIndex==0&&thirdIndex==0'>
{{outItem.NewCombinationNum}} {{outItem.NewCombinationNum}}
</td> </td>
<td :rowspan="item.CommonReport.HotelOrderListReport.length*subItem.HotelOrderList.length" <td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'> v-if='subIndex==0&&thirdIndex==0'>
{{item.StartCityNames}} {{item.StartCityNames}}
</td> </td>
<td :rowspan="item.CommonReport.HotelOrderListReport.length*subItem.HotelOrderList.length" <td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'> v-if='subIndex==0&&thirdIndex==0'>
<div class="w150"> <div class="w150">
{{item.FlightDate}} {{item.FlightDate}}
...@@ -185,31 +185,35 @@ ...@@ -185,31 +185,35 @@
</el-popover> </el-popover>
</div> </div>
</td> </td>
<td :rowspan="item.CommonReport.HotelOrderListReport.length*subItem.HotelOrderList.length" <td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'> v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="cursor:pointer;text-decoration:underline;"> <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')"
style="cursor:pointer;text-decoration:underline;">
{{item.TCNUMS}}({{item.TCIDS}}) {{item.TCNUMS}}({{item.TCIDS}})
</p> </p>
</td> </td>
<td :rowspan="item.CommonReport.HotelOrderListReport.length*subItem.HotelOrderList.length" <td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'> v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')" style="cursor:pointer;text-decoration:underline;"> <p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')"
style="cursor:pointer;text-decoration:underline;">
{{item.TotalSeat}}/{{item.CommonReport.HouseStatistics.RealityYSeatNum}}/{{item.CommonReport.HouseStatistics.RealityESeatNum}}/{{item.CommonReport.HouseStatistics.RealityFSeatNum}} {{item.TotalSeat}}/{{item.CommonReport.HouseStatistics.RealityYSeatNum}}/{{item.CommonReport.HouseStatistics.RealityESeatNum}}/{{item.CommonReport.HouseStatistics.RealityFSeatNum}}
</p> </p>
</td> </td>
<td :rowspan="item.CommonReport.HotelOrderListReport.length*subItem.HotelOrderList.length" <td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'> v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrlT('passengerHouse',item.TCIDS,'房间分配')" style="cursor:pointer;text-decoration:underline;"> <p @click="goUrlT('passengerHouse',item.TCIDS,'房间分配')"
style="cursor:pointer;text-decoration:underline;">
{{item.CommonReport.HouseStatistics.NeedBed}}/{{item.CommonReport.HouseStatistics.NoNeedBed}} {{item.CommonReport.HouseStatistics.NeedBed}}/{{item.CommonReport.HouseStatistics.NoNeedBed}}
</p> </p>
</td> </td>
<td :rowspan="item.CommonReport.HotelOrderListReport.length*subItem.HotelOrderList.length" <td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'> v-if='subIndex==0&&thirdIndex==0'>
{{item.CommonReport.HouseStatistics.RealityRoomNum}} {{item.CommonReport.HouseStatistics.RealityRoomNum}}
</td> </td>
<td :rowspan="item.CommonReport.HotelOrderListReport.length*subItem.HotelOrderList.length" <td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'> v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')" style="cursor:pointer;text-decoration:underline;">详情</p> <p @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')"
style="cursor:pointer;text-decoration:underline;">详情</p>
</td> </td>
<td :rowspan="subItem.HotelOrderList.length" v-if='thirdIndex==0'> <td :rowspan="subItem.HotelOrderList.length" v-if='thirdIndex==0'>
{{subItem.UseTimeStr}} {{subItem.UseTimeStr}}
...@@ -296,9 +300,7 @@ ...@@ -296,9 +300,7 @@
CombinationNum: '', CombinationNum: '',
HotelStatus: 0 HotelStatus: 0
}, },
thLengthTitle: [], DataList: [], //数据列表
list: [],
colspanTotal: 0,
boxHeight: 0, boxHeight: 0,
queryCommonData: { queryCommonData: {
//公司数据 //公司数据
...@@ -377,7 +379,24 @@ ...@@ -377,7 +379,24 @@
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
this.list = res.data.data.pageData.data; var sourceData = res.data.data.pageData.data;
if (sourceData) {
sourceData.forEach(rootItem => {
var rootRowspan = 0; //合团跨行
rootItem.StaticsReportList.forEach(subItem => {
var itemRowSpan = 0; //酒店跨行
subItem.CommonReport.HotelOrderListReport.forEach(thirdItem => {
thirdItem.HotelOrderList.forEach(lastItem => {
rootRowspan++;
itemRowSpan++;
});
});
subItem.itemRowSpan = itemRowSpan;
});
rootItem.rootRowspan = rootRowspan;
});
}
this.DataList = sourceData;
this.$forceUpdate() this.$forceUpdate()
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
...@@ -496,10 +515,11 @@ ...@@ -496,10 +515,11 @@
} else { } else {
this.msg.StartDate = nowDate; this.msg.StartDate = nowDate;
} }
let width = window.innerWidth - 50 let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 164 let height = window.innerHeight - 65 - 164;
this.boxHeight = height; this.boxHeight = height;
this.offsetwidth = width this.offsetwidth = width;
//this.msg.CombinationNum = "HP20190713TN07A1";
this.getLinePlaceList(); this.getLinePlaceList();
this.getAirlineList(); this.getAirlineList();
this.getEmployeeList(); this.getEmployeeList();
...@@ -507,6 +527,7 @@ ...@@ -507,6 +527,7 @@
this.getList(); this.getList();
}, },
} }
</script> </script>
<style> <style>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment