Commit cb586650 authored by 黄奎's avatar 黄奎

酒店查询修改

parent 435c08c7
......@@ -4,7 +4,7 @@
<ul>
<li>
<span><em>出团公司</em>
<el-select filterable v-model='msg.RB_Branch_id' :placeholder="$t('pub.unlimitedSel')">
<el-select filterable v-model='msg.OutBranchId' :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id">
</el-option>
......@@ -22,13 +22,13 @@
<li>
<span>
<em>订团号</em>
<el-input v-model='msg.TCNUM' class='w135'></el-input>
<el-input v-model='msg.CombinationNum' class='w135'></el-input>
</span>
</li>
<li>
<span>
<em>团号</em>
<el-input v-model='msg.NewCombinationNum' class='w135'></el-input>
<el-input v-model='msg.TCNUM' class='w135'></el-input>
</span>
</li>
<li><span><em>出发日期</em>
......@@ -41,7 +41,7 @@
<span>
<em>酒店</em>
<el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
......@@ -52,20 +52,18 @@
</ul>
</div>
<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="roomQueryTalbe" v-loading='loading'>
<tr>
<th width="w100">序号</th>
<th width="120">出发地</th>
<th width="80">公司团号</th>
<th width="120">机位总数<br/>(Y/E/F)</th>
<th></th>
<th v-for='item in thLengthTitle'>{{item}}</th>
<th></th>
<th width="120">机位总数<br />(Y/E/F)</th>
<th>使用时间&酒店情况</th>
</tr>
<tr v-if="list.length==0">
<tr v-if="dataList.length==0">
<td colspan="10">暂无数据</td>
</tr>
<tbody v-for="(outItem,outindex) in list" :class="{roomReservationsSplitTrCss:outindex%2!=0}">
<tbody v-for="(outItem,outindex) in dataList" :class="{roomQuerySplitTrCss:outindex%2!=0}">
<template v-for="(item,index) in outItem.StaticsReportList">
<tr>
<td :rowspan="outItem.StaticsReportList.length" v-if='index==0'>
......@@ -89,12 +87,6 @@
</p>
</div>
</td>
<td style="vertical-align: top;">
<div class="w260">
<p class="pDateStyle">时间</p>
<p class="pDateStyle" style="height: 50px!important; line-height: 50px;">酒店名称</p>
</div>
</td>
<td style="vertical-align: top;">
<div :style="{width:150*item.CommonReport.newHotel.length+'px'}">
<div class="w150" v-for="childItem in item.CommonReport.newHotel"
......@@ -102,8 +94,7 @@
<p class="pDateStyle">{{childItem.CheckInDateStr}}</p>
<p @click="goUrlR('HotelManagement',childItem.HotelId,'酒店管理')"
class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;">
<span v-if='childItem.HotelOrderState==0'
class="colorE95252">(待定)</span>{{childItem.NewHotelName}}
{{childItem.NewHotelName}}<span class="colorE95252">{{childItem.HotelOrderState==1?"OK":"暂定"}}</span>
</p>
</div>
</div>
......@@ -136,19 +127,18 @@
HotelId: 0,
//日期
DateStr: "",
RB_Branch_id:-1,
OutBranchId: -1,
//订团号
NewCombinationNum:""
CombinationNum: ""
},
//分公司类表
companyList:[],
companyList: [],
//酒店类表
HotelList: [],
LineList: [],
LineTeamList: [],
thLengthTitle: [],
list: [],
colspanTotal: 0,
dataList: [],
}
},
methods: {
......@@ -156,7 +146,7 @@
this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
}
}
});
},
//获取系列列表
......@@ -218,19 +208,17 @@
this.currentPage = 1;
},
getList() {
this.loading = true
this.loading = true;
this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.loading = false
this.total = res.data.data.count;
this.list = res.data.data.pageData.data;
this.thLengthArr = []
this.thLengthTitle = []
this.colspanTotal = res.data.data.pageData.columnsCount + 9
this.dataList = res.data.data.pageData.data;
this.thLengthTitle = [];
for (let i = 1; i <= res.data.data.pageData.columnsCount; i++) {
this.thLengthTitle.push('第' + i + '晚')
}
this.list.forEach(x => {
this.dataList.forEach(x => {
x.StaticsReportList.forEach(y => {
y.CommonReport.newHotel = [];
if (y.CommonReport.HotelOrderListReport != null && y.CommonReport.HotelOrderListReport
......@@ -241,17 +229,15 @@
})
})
}
y.colNum = 9 + y.CommonReport.newHotel.length;
})
})
} else {
this.loading = false
this.$message.error(res.data.message)
}
}, err => {})
},
//获取酒店列表
//获取酒店列表
GetHotelList() {
this.apipost(
"hotel_post_GetHasStockHotelList", {
......@@ -266,7 +252,7 @@
err => {}
);
},
getBranchList() {
getBranchList() {
this.apipost('admin_get_BranchGetList', {
RB_Group_Id: '2',
Status: 0,
......@@ -285,7 +271,6 @@
parseInt(myDate.getMonth() + 1) +
"-" +
myDate.getDate();
if (this.$route.query.hotelId) {
this.msg.HotelId = this.$route.query.hotelId;
}
......@@ -297,6 +282,7 @@
} else {
this.msg.StartDate = nowDate;
}
this.getBranchList();
this.GetHotelList();
this.getList();
this.getLineTeamList();
......@@ -304,76 +290,74 @@
}
</script>
<style>
.roomReservationsSplitTrCss td {
.roomQuerySplitTrCss td {
background: #eee !important;
}
.roomReservationsTalbe {
.roomQueryTalbe {
background: #ccc;
}
.roomReservationsTalbe tr th {
.roomQueryTalbe tr th {
background: #E6E6E6;
height: 40px;
font-size: 12px;
color: #333;
}
.roomReservationsTalbe tr {
.roomQueryTalbe tr {
background: #fff;
text-align: center;
height: 40px;
}
.roomReservationsTalbe tr td {
.roomQueryTalbe tr td {
font-size: 12px;
}
.roomReservationsTalbe tr td .pDateStyle {
.roomQueryTalbe tr td .pDateStyle {
border-bottom: 1px solid #ccc;
min-height: 24px;
line-height: 24px;
margin-top: 0;
box-sizing: content-box;
padding: 0 10px;
}
.roomReservationsTalbe tr td .pDateStyle:last-child {
.roomQueryTalbe tr td .pDateStyle:last-child {
border-bottom: none;
}
.roomReservationsTalbe tr td .pDateStyle>span:after {
.roomQueryTalbe tr td .pDateStyle>span:after {
content: '/';
}
.roomReservationsTalbe tr td .pDateStyle>span:last-child:after {
.roomQueryTalbe tr td .pDateStyle>span:last-child:after {
content: ''
}
.roomReservationsTalbe tr td .link p:hover {
.roomQueryTalbe tr td .link p:hover {
text-decoration: underline;
cursor: pointer;
}
.roomReservationsTalbe tr td .phoverStype:hover {
.roomQueryTalbe tr td .phoverStype:hover {
text-decoration: underline;
cursor: pointer;
}
.roomReservations_tripDetails {
.roomQuery_tripDetails {
padding: 0;
box-shadow: 0px 1px 3px 0px #dedede;
max-height: 400px;
overflow-y: auto;
}
.roomReservations_tripDetails .popper__arrow::after {
.roomQuery_tripDetails .popper__arrow::after {
border-bottom-color: #ededed !important;
}
.roomReservations_tripDetails table {
.roomQuery_tripDetails table {
padding: 10px 0 0 20px;
background-color: #ededed;
border-collapse: collapse;
......@@ -381,27 +365,27 @@
font-size: 12px;
}
.roomReservations_tripDetails table th {
.roomQuery_tripDetails table th {
background-color: #ededed;
padding: 5px;
}
.roomReservations_tripDetails table td {
.roomQuery_tripDetails table td {
background-color: #ffffff;
padding: 9px 15px;
color: #333333;
border: 1px solid #d2d2d2;
}
.roomReservations_tripDetails table td._d_name {
.roomQuery_tripDetails table td._d_name {
background-color: #ededed;
}
.roomReservations_tripDetails table ._color_666 {
.roomQuery_tripDetails table ._color_666 {
color: #666666;
}
.roomReservations_tripDetails table tr._color_666 th {
.roomQuery_tripDetails table tr._color_666 th {
padding: 9px 15px;
}
......
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