Skip to content

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

酒店分宿修改

parent cb917f4d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 324 additions and 264 deletions
src/components/Hotel/roomReservations.vue
View file @ bb6be056
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle"> <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" v-loading='loading'> <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" v-loading='loading'>
<tr> <tr>
<th width="w50">序号</th> <th width="w100">序号</th>
<th width="120">出发地</th> <th width="120">出发地</th>
<th width="120">航班时间</th> <th width="120">航班时间</th>
<th width="80">公司团号</th> <th width="80">公司团号</th>
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
<th width="80">实际用房数</th> <th width="80">实际用房数</th>
<th></th> <th></th>
<th v-for='item in thLengthTitle'>{{item}}</th> <th v-for='item in thLengthTitle'>{{item}}</th>
<th></th>
<th>备注</th> <th>备注</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
...@@ -50,8 +51,8 @@ ...@@ -50,8 +51,8 @@
<template v-for="(item,index) in outItem.StaticsReportList"> <template v-for="(item,index) in outItem.StaticsReportList">
<tr> <tr>
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div style="max-width: 100px; min-width: 50px; ">{{outindex+1}}</div> <div style="max-width: 100px; min-width: 50px;margin:auto;">{{outindex+1}}</div>
<div v-if='outItem.StaticsReportList.length>0' class="w100">{{outItem.NewCombinationNum}}</div> <div v-if='outItem.StaticsReportList.length>0' class="w150">{{outItem.NewCombinationNum}}</div>
</td> </td>
<td> <td>
<div class="w80"> <div class="w80">
...@@ -59,7 +60,7 @@ ...@@ -59,7 +60,7 @@
</div> </div>
</td> </td>
<td> <td>
<div class="w80"> <div class="w150">
{{item.FlightDate}} {{item.FlightDate}}
<el-popover popper-class="roomReservations_tripDetails" width="550" trigger="click"> <el-popover popper-class="roomReservations_tripDetails" width="550" trigger="click">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
...@@ -132,37 +133,39 @@ ...@@ -132,37 +133,39 @@
</p> </p>
</div> </div>
</td> </td>
<td v-for="(x,ii) in item.CommonReport.HotelList" style="vertical-align: top;"> <td style="vertical-align: top;">
<div class="w150" v-if='ii<item.CommonReport.valueLength'> <div :style="{width:150*item.CommonReport.newHotel.length+'px'}">
<p class="pDateStyle">{{x.CheckInDateStr}}</p> <div class="w150" v-for="childItem in item.CommonReport.newHotel" style="float:left;border-right:1px solid #d1d1d1;">
<p @click="goUrlR('HotelManagement',x.HotelId,'酒店管理')" <p class="pDateStyle">{{childItem.CheckInDateStr}}</p>
class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;"> <p @click="goUrlR('HotelManagement',childItem.HotelId,'酒店管理')"
<span v-if='x.HotelOrderState==0' class="colorE95252">（待定）</span>{{x.NewHotelName}} class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;">
</p> <span v-if='childItem.HotelOrderState==0' class="colorE95252">（待定）</span>{{childItem.NewHotelName}}
<p class="pDateStyle">{{item.CommonReport.HouseStatistics.RealityRoomNum}}</p> </p>
<p class="pDateStyle"> <p class="pDateStyle">{{item.CommonReport.HouseStatistics.RealityRoomNum}}</p>
<span v-for="q in x.OrderDetailsList">{{q.HouseTypeCount}}</span> <p class="pDateStyle">
</p> <span v-for="q in childItem.OrderDetailsList">{{q.HouseTypeCount}}</span>
<p class="pDateStyle"> </p>
<span v-for="x in item.CommonReport.HouseStatistics.HouseTypeList">{{x.HouseTypeCount}}</span> <p class="pDateStyle">
<span v-if="item.CommonReport.HouseStatistics.HouseTypeList.length==0">暂无订房</span> <span v-for="x in item.CommonReport.HouseStatistics.HouseTypeList">{{x.HouseTypeCount}}</span>
</p> <span v-if="item.CommonReport.HouseStatistics.HouseTypeList.length==0">暂无订房</span>
</p>
</div>
</div> </div>
</td> </td>
<td> <td>
<div class="w200"> <div class="w200">
{{item.Remarks}} {{item.Remarks}}
</div> </div>
</td> </td>
<td> <td>
<div class="w80 link"> <div class="w80 link" style="margin:auto;">
<p @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')">详情</p> <p @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')">详情</p>
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td :colspan="colspanTotal" style="text-align: left!important;padding-left: 20px;"> <td :colspan="item.colNum" style="text-align: left!important;padding-left: 20px;">
<div class="link"> <div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.Titles}}</p> <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.Titles}}</p>
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252"> <div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252">
...@@ -251,7 +254,7 @@ ...@@ -251,7 +254,7 @@
} }
}) })
}, },
goUrl(path, obj,outItem, title) { goUrl(path, obj, outItem, title) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
...@@ -278,8 +281,8 @@ ...@@ -278,8 +281,8 @@
this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => { this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.loading = false this.loading = false
this.total = res.data.data.count this.total = res.data.data.count;
this.list = res.data.data.pageData.data this.list = res.data.data.pageData.data;
this.thLengthArr = [] this.thLengthArr = []
this.thLengthTitle = [] this.thLengthTitle = []
this.colspanTotal = res.data.data.pageData.columnsCount + 9 this.colspanTotal = res.data.data.pageData.columnsCount + 9
...@@ -288,19 +291,32 @@ ...@@ -288,19 +291,32 @@
} }
this.list.forEach(outItem => { this.list.forEach(outItem => {
outItem.StaticsReportList.forEach(item => { outItem.StaticsReportList.forEach(item => {
item.CommonReport['valueLength'] = item.CommonReport.HotelList.length item.CommonReport['valueLength'] = item.CommonReport.HotelOrderListReport.length
if (item.CommonReport.HotelList.length < res.data.data.pageData.columnsCount) { if (item.CommonReport.HotelOrderListReport.length < res.data.data.pageData.columnsCount) {
let _cha = res.data.data.pageData.columnsCount - item.CommonReport.HotelList.length let _cha = res.data.data.pageData.columnsCount - item.CommonReport.HotelOrderListReport.length
let _chaArr = new Array() let _chaArr = new Array()
for (let i = 0; i < _cha; i++) { for (let i = 0; i < _cha; i++) {
_chaArr.push({ _chaArr.push({
'HotelName': '' 'HotelName': ''
}) })
} }
item.CommonReport.HotelList = item.CommonReport.HotelList.concat(_chaArr) item.CommonReport.HotelOrderListReport = item.CommonReport.HotelOrderListReport.concat(_chaArr)
} }
}) })
}) })
this.list.forEach(x=>{
x.StaticsReportList.forEach(y=>{
y.CommonReport.newHotel=[];
y.CommonReport.HotelOrderListReport.forEach(z=>{
z.HotelOrderList.forEach(q=>{
y.CommonReport.newHotel.push(q);
})
})
y.colNum = 9+y.CommonReport.newHotel.length;
})
})
console.log("this.list2",this.list);
} else { } else {
this.loading = false this.loading = false
this.$message.error(res.data.message) this.$message.error(res.data.message)
...@@ -316,27 +332,23 @@ ...@@ -316,27 +332,23 @@
parseInt(myDate.getMonth() + 1) + parseInt(myDate.getMonth() + 1) +
"-" + "-" +
myDate.getDate(); myDate.getDate();
if(this.$route.query.hotelId) if (this.$route.query.hotelId) {
{ this.msg.HotelId = this.$route.query.hotelId;
this.msg.HotelId=this.$route.query.hotelId;
} }
if(this.$route.query.dateStr) if (this.$route.query.dateStr) {
{ this.msg.DateStr = this.$route.query.dateStr;
this.msg.DateStr=this.$route.query.dateStr;
} }
if(this.$route.query.hotelId||this.$route.query.dateStr) if (this.$route.query.hotelId || this.$route.query.dateStr) {
{
this.msg.StartDate = ""; this.msg.StartDate = "";
} } else {
else this.msg.StartDate = nowDate;
{
this.msg.StartDate = nowDate;
} }
this.getList() this.getList()
this.getLineTeamList() this.getLineTeamList()
}, },
} }
</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