Skip to content

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

页面修改

parent ff23ec63
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 172 deletions
src/components/TravelManager/TravelList/PriceHotelWorkList.vue
View file @ 5a1b63ae
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
</span> </span>
</li> </li>
<li><span><em>日期</em> <li><span><em>日期</em>
<el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date" <el-date-picker v-model='msg.StartGroupDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateBefore"></el-date-picker> :picker-options="pickerBeginDateBefore"></el-date-picker>
- -
<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date" <el-date-picker v-model='msg.EndGroupDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateAfter"></el-date-picker> :picker-options="pickerBeginDateAfter"></el-date-picker>
</span> </span>
</li> </li>
...@@ -107,14 +107,13 @@ ...@@ -107,14 +107,13 @@
</div> </div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle" <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle"
:style="{height: boxHeight + 'px'}"> :style="{height: boxHeight + 'px'}">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" v-loading='loading' style="width:100%;"> <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" v-loading='loading'
style="width:100%;">
<tr> <tr>
<th width="120">序号</th> <th width="120">系列</th>
<th width="80">出发地</th> <th width="120">团号</th>
<th width="90">航班时间</th> <th width="80">地接团号</th>
<th width="145">公司团号</th> <th width="90">机位数</th>
<th width="100">机位总数<br />(Y/E/F)</th>
<th width="80">占床<br />不占床</th>
<th width="110">时间</th> <th width="110">时间</th>
<th width="120">酒店名称</th> <th width="120">酒店名称</th>
<th width="120">更换酒店</th> <th width="120">更换酒店</th>
...@@ -122,139 +121,73 @@ ...@@ -122,139 +121,73 @@
<th width="100">地接状态</th> <th width="100">地接状态</th>
<th width="150">操作</th> <th width="150">操作</th>
</tr> </tr>
<tr v-if="DataList.length==0"> <template v-for="item in DataList">
<td colspan="14">暂无数据</td> <tbody>
</tr> <template v-for="(subItem,subIndex) in item.HotelOrderListReports">
<template v-for="(outItem,outindex) in DataList"> <template v-for="(childItem,childIndex) in subItem.SubList">
<tbody :class="{roomReservationsSplitTrCss:outindex%2!=0}"> <tr>
<template v-for="(item,index) in outItem.StaticsReportList"> <td :rowspan="item.rootRowspan" v-if='subIndex==0&&childIndex==0'>{{item.LtName}}</td>
<template v-for="(subItem,subIndex) in item.CommonReport.HotelOrderListReport" <td :rowspan="item.rootRowspan" v-if='subIndex==0&&childIndex==0'>{{item.TCNUM}}({{item.TCID}})</td>
v-if="subItem.HotelOrderList.length>0"> <td :rowspan="item.rootRowspan" v-if='subIndex==0&&childIndex==0'>{{item.DMCNum}} </td>
<template v-for="(thirdItem,thirdIndex) in subItem.HotelOrderList"> <td :rowspan="item.rootRowspan" v-if='subIndex==0&&childIndex==0'>
<tr> {{$t('Airticket.Air_firstClass')}}：{{item.FSeat}}
<td {{$t('Airticket.Air_businessClass')}}：{{item.CSeat}}
:rowspan="outItem.rootRowspan" {{$t('Airticket.Air_EconomyClass')}}：{{item.YSeat}}
v-if='index==0&&subIndex==0&&thirdIndex==0'> </td>
{{outItem.NewCombinationNum}} <td :rowspan="subItem.SubList.length" v-if='childIndex==0'>
</td> {{childItem.JourneyDate}}
<td :rowspan="item.itemRowSpan" </td>
v-if='subIndex==0&&thirdIndex==0'> <td>
{{item.StartCityNames}} <template v-if="childItem.HotelName!=childItem.NewHotelName && childItem.NewHotelName!=''">
</td> <span style="text-decoration:line-through"> {{childItem.HotelName}}</span>
<td :rowspan="item.itemRowSpan" </template>
v-if='subIndex==0&&thirdIndex==0'> <template v-else>
<div class="w150"> {{childItem.HotelName}}
{{item.FlightDate}} </template>
<el-popover popper-class="roomReservations_tripDetails" width="550" trigger="click"> </td>
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <td>
<tr class="_color_666" style="text-align:center;"> <template v-if="childItem.HotelName!=childItem.NewHotelName">
<th width="60">{{$t('Airticket.Air_segment')}}</th> <span style="color:red;">{{childItem.NewHotelName}}</span>
<th width="80">{{$t('system.query_flightNum')}}</th> </template>
<th width="150">起飞时间</th> </td>
<th width="80">到达时间</th> <td>
<th width="100">经停城市</th> <template v-if="childItem.OPState==1">
</tr>
<tr v-for="(ds,din) in item.FlightList" :key="din" style="text-align:center;">
<td class="_d_name _color_666">
<span v-if="din==0">{{$t('Airticket.Air_go')}}</span>
<span
v-else-if="din==item.FlightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
<span
v-else-if="din>0 && din!=item.FlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
</td>
<td>
<div>{{ds.Flight_number}}</div>
<div style="margin-top:5px;">{{ds.AlName}}</div>
</td>
<td>
<div>{{ds.FlightDate}} {{ds.Departure_time}}</div>
<div style="margin-top:5px;">{{ds.dName}}</div>
</td>
<td>
<div>{{ds.FlightArrivalTime}} {{ds.Arrival_time}}</div>
<div style="margin-top:5px;">{{ds.aName}}</div>
</td>
<td>{{ds.StopoverName}}</td>
</tr>
</table>
<el-button slot="reference" class="normalBtn mt5"
style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>详情
</el-button>
</el-popover>
</div>
</td>
<td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')"
style="cursor:pointer;text-decoration:underline;">
{{item.TCNUMS}}({{item.TCIDS}})
</p>
</td>
<td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'>
<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}}
</p>
</td>
<td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrlT('passengerHouse',item.TCIDS,'房间分配')"
style="cursor:pointer;text-decoration:underline;">
{{item.CommonReport.HouseStatistics.NeedBed}}/{{item.CommonReport.HouseStatistics.NoNeedBed}}
</p>
</td>
<td :rowspan="subItem.HotelOrderList.length" v-if='thirdIndex==0'>
{{subItem.UseTimeStr}}
</td>
<td style="text-align:left;padding-left:2px;">
<template v-if="thirdItem.HotelName!=thirdItem.NewHotelName && thirdItem.NewHotelName!=''">
<span style="text-decoration:line-through"> {{thirdItem.HotelName}}</span>
</template>
<template v-else>
{{thirdItem.HotelName}}
</template>
</td>
<td style="text-align:left;padding-left:2px;">
<template v-if="thirdItem.HotelName!=thirdItem.NewHotelName">
<span style="color:red;">{{thirdItem.NewHotelName}}</span>
</template>
</td>
<td>
<template v-if="thirdItem.OPState==1">
<span style="color: green;">OP-指定</span> <span style="color: green;">OP-指定</span>
</template> </template>
<template v-else-if="thirdItem.OPState==2"> <template v-else-if="childItem.OPState==2">
<span style="color:red;">OP-暂定</span> <span style="color:red;">OP-暂定</span>
</template> </template>
</td> </td>
<td> <td>
<template v-if="thirdItem.DMCState==1"> <template v-if="childItem.DMCState==1">
<span style="color: green;">地接-OK</span> <span style="color: green;">地接-OK</span>
</template> </template>
<template v-else-if="thirdItem.DMCState==2"> <template v-else-if="childItem.DMCState==2">
<span style="color:red;">地接-暂定</span> <span style="color:red;">地接-暂定</span>
</template> </template>
<template v-else-if="thirdItem.DMCState==0"> <template v-else-if="childItem.DMCState==0">
<span style="color:red;">地接-未操作</span> <span style="color:red;">地接-未操作</span>
</template> </template>
</td> </td>
<td> <td>
<el-popover placement="right" width="540" trigger="click" v-model="subItem.isShowPop"> <el-popover placement="right" width="540" trigger="click" v-model="subItem.isShowPop">
<comCheckHotel :ref="'comCheckHotel'+index+subIndex+''" <comCheckHotel :ref="'comCheckHotel'+subIndex+childIndex+''" :UseDate="childItem.JourneyDate">
:UseDate="subItem.UseTimeStr"> </comCheckHotel>
</comCheckHotel> <el-button size="small" type="danger" :data-index="'comCheckHotel'+subIndex+childIndex+''"
<el-button size="small" type="danger" :data-index="'comCheckHotel'+index+subIndex+''" slot="reference" style="cursor:pointer;"
slot="reference" style="cursor:pointer;" @click="getChildHotel(subIndex,childIndex),subItem.isShowPop=true">
@click="getChildHotel(index,subIndex),subItem.isShowPop=true"> 更换酒店
酒店选择 </el-button>
</el-button> </el-popover>
</el-popover> </td>
</td> </tr>
</tr>
</template>
</template> </template>
</template> </template>
<tr>
<td :colspan="10">
{{item.Title}}
</td>
</tr>
</tbody> </tbody>
</template> </template>
</table> </table>
...@@ -272,27 +205,47 @@ ...@@ -272,27 +205,47 @@
currentPage: 1, currentPage: 1,
total: 0, total: 0,
msg: { msg: {
pageIndex: 1, //出团公司集合
pageSize: 5,
SelectType: 1,
StartDate: '',
EndDate: '',
//酒店编号
HotelId: 0,
//日期
DateStr: "",
//出团公司
OutBranchIds: [], OutBranchIds: [],
LineId: 14, pageIndex: 1,
pageSize: 10,
LineId: 0,
PlaceID: 0, PlaceID: 0,
LineIdList: [14],
LineteamId: 0, LineteamId: 0,
//航空公司
AirLineId: 0,
CreateBy: 0,
TCNUM: '', TCNUM: '',
PriceStatus: 0, StartGroupDate: '',
CombinationNum: '', EndGroupDate: '',
HotelStatus: 0 OutBranchId: -1,
AirTicketId: 0,
TeamMinNum: -1,
TeamMaxNum: -1,
CreateBy: 0,
ApplyMinNum: -1,
ApplyMaxNum: -1,
DayNum: -1,
OnlyShowOverTeam: false,
TCState: [3], //去掉默认显示
GroupState: [],
SalePlat: [],
UnionCityId: 0,
SaleBranchId: [],
total: 0,
//是否有数据
noData: false,
currentPage: 1,
//航班配置
FlightState: 0,
//预警团
IsWarning: false,
WarningQuery: '-1',
RateOnDay: '-1',
RateOn: '-1',
TeamType: 0, //一般常规团
IsShowUnion: -1,
TCID: 0,
HotelId: 0, //酒店编号
HotelUseTime: "", //酒店使用时间
}, },
DataList: [], //数据列表 DataList: [], //数据列表
boxHeight: 0, boxHeight: 0,
...@@ -310,17 +263,17 @@ ...@@ -310,17 +263,17 @@
childIndex: 0, childIndex: 0,
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: time => {
if (this.msg.EndDate == null) { if (this.msg.EndGroupDate == null) {
return false; return false;
} else { } else {
let endTime = new Date(this.msg.EndDate) let endTime = new Date(this.msg.EndGroupDate)
return endTime.getTime() < time.getTime() return endTime.getTime() < time.getTime()
} }
} }
}, },
pickerBeginDateAfter: { pickerBeginDateAfter: {
disabledDate: time => { disabledDate: time => {
let startTime = new Date(this.msg.StartDate) let startTime = new Date(this.msg.StartGroupDate)
return startTime.getTime() >= time.getTime() return startTime.getTime() >= time.getTime()
} }
} }
...@@ -359,8 +312,8 @@ ...@@ -359,8 +312,8 @@
'flightTotal': obj.TotalSeat, 'flightTotal': obj.TotalSeat,
'GuestNum': obj.CommonReport.HouseStatistics.RealityNum, 'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
'NewCombinationNum': outItem.NewCombinationNum, 'NewCombinationNum': outItem.NewCombinationNum,
'LeaderName':obj.LeaderName, 'LeaderName': obj.LeaderName,
'GuideName':obj.GuideName, 'GuideName': obj.GuideName,
blank: 'y', blank: 'y',
tab: title tab: title
} }
...@@ -376,22 +329,19 @@ ...@@ -376,22 +329,19 @@
}, },
getList() { getList() {
this.loading = true; this.loading = true;
this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => { this.apipost('travel_get_GetPriceHotelListService', this.msg, res => {
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;
var sourceData = res.data.data.pageData.data; var sourceData = res.data.data.pageData;
if (sourceData) { if (sourceData) {
sourceData.forEach(rootItem => { sourceData.forEach(rootItem => {
var rootRowspan = 0; //合团跨行 var rootRowspan = 0; //合团跨行
rootItem.StaticsReportList.forEach(subItem => { rootItem.HotelOrderListReports.forEach(subItem => {
var itemRowSpan = 0; //酒店跨行 var itemRowSpan = 0; //酒店跨行
subItem.CommonReport.HotelOrderListReport.forEach(thirdItem => { subItem.SubList.forEach(thirdItem => {
thirdItem.HotelOrderList.forEach(lastItem => { rootRowspan++;
rootRowspan++; itemRowSpan++;
itemRowSpan++;
});
thirdItem.isShowPop = false;
}); });
subItem.itemRowSpan = itemRowSpan; subItem.itemRowSpan = itemRowSpan;
}); });
...@@ -399,6 +349,7 @@ ...@@ -399,6 +349,7 @@
}); });
} }
this.DataList = sourceData; this.DataList = sourceData;
console.log("this.dataList", this.DataList);
this.$forceUpdate() this.$forceUpdate()
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
...@@ -514,17 +465,7 @@ ...@@ -514,17 +465,7 @@
"-" + "-" +
myDate.getDate(); myDate.getDate();
if (this.$route.query.hotelId) { this.msg.StartGroupDate = nowDate;
this.msg.HotelId = this.$route.query.hotelId;
}
if (this.$route.query.dateStr) {
this.msg.DateStr = this.$route.query.dateStr;
}
if (this.$route.query.hotelId || this.$route.query.dateStr) {
this.msg.StartDate = "";
} else {
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;
......
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