Skip to content

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

页面优化

parent 4f3c088d
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 141 deletions
src/components/Restaurant/bookDinnerStatistics.vue
View file @ a2f63691
...@@ -27,126 +27,132 @@ ...@@ -27,126 +27,132 @@
</li> </li>
</ul> </ul>
</div> </div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle" :style="{height: boxHeight + 'px'}"> <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle"
:style="{height: boxHeight + 'px'}">
<table border="0" cellspacing="1" cellpadding="0" class="bookDinnerStatisticsTalbe" v-loading='loading'> <table border="0" cellspacing="1" cellpadding="0" class="bookDinnerStatisticsTalbe" v-loading='loading'>
<tr> <tr>
<th width="50">序号</th> <th width="110">序号</th>
<th width="80">出发地</th> <th width="100">出发地</th>
<th width="80">航班时间</th> <th width="120">航班时间</th>
<th width="80">公司团号</th> <th width="140">公司团号</th>
<th width="120">机位总数/已收客数</th> <th width="120">机位总数/已收客数</th>
<th v-for='item in thLengthTitle'>{{item}}</th> <th width="120">时间</th>
<th>备注</th> <th width="130">餐厅名称</th>
<th>操作</th> <th width="100">用餐类型</th>
<th width="100">大</th>
<th width="100">中</th>
<th width="100">小</th>
<th width="100">操作</th>
</tr> </tr>
<tbody v-for="(outItem,outindex) in list" :class="{bookDinnerStatisticsSplitTrCss:outindex%2!=0}"> <template v-for="(outItem,outindex) in DataList">
<template v-for="(item,index) in outItem.StaticsReportList"> <tbody :class="{bookDinnerStatisticsSplitTrCss:outindex%2!=0}">
<tr> <template v-for="(item,index) in outItem.StaticsReportList">
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <template v-for="(subItem,subIndex) in item.CommonReport.DiningList">
<div style="max-width: 100px; min-width: 50px; ">{{outindex+1}}</div> <template v-for="(thirdItem,thirdIndex) in subItem.DiningSummaryList">
<div v-if='outItem.StaticsReportList.length>0' class="w100">{{outItem.NewCombinationNum}}</div> <tr>
</td> <td :rowspan="outItem.rootRowspan" v-if='index==0&&subIndex==0&&thirdIndex==0'>
<td> {{outItem.NewCombinationNum}}
<div class="w80"> </td>
{{item.StartCityNames}} <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
</div> {{item.StartCityNames}}
</td> </td>
<td> <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<div class="w120">
{{item.FlightDate}}
<el-popover popper-class="bookDinnerStatistics_tripDetails" width="550" trigger="click">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;">
<th width="60">{{$t('Airticket.Air_segment')}}</th>
<th width="80">{{$t('system.query_flightNum')}}</th>
<th width="150">起飞时间</th>
<th width="150">到达时间</th>
<th width="100">经停城市</th>
</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>
<div class="w120 link">
<p v-for='xx in stringToArr(item.TCNUMS)' @click="goUrlT('productQuery',xx,'产品查询')">{{xx}}</p>
</div>
</td>
<td>
<div class="w120 link">
<p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')">
{{item.TotalSeat}}/{{item.CommonReport.HouseStatistics.RealityYSeatNum}}/{{item.CommonReport.HouseStatistics.RealityESeatNum}}/{{item.CommonReport.HouseStatistics.RealityFSeatNum}}
</p>
</div>
</td>
<td v-for="x in item.CommonReport.DiningList" style="vertical-align: top;">
<div style="width:350px;">
<table v-if="x.UseTimeStr" class="DiningTable" width="100%" border="0" cellspacing="0"
cellpadding="0">
<tr>
<th width="12%">{{x.UseTimeStr.substring(5)}}</th>
<th width="10%">大</th>
<th width="10%">中</th>
<th width="10%">小</th>
<th width="15%">支付</th>
<th>餐厅</th>
</tr>
<tr v-for="s in x.DiningSummaryList">
<td>{{s.UseDinnerTypeStr}}</td>
<td v-for="t in s.DiningPriceList">{{t.PeoplePrice}}</td>
<td>{{s.PayStyleStr}}</td>
<td><span v-if="s.IsFeature==1" style="color:red;">{{s.DiningName}}</span> <span {{item.FlightDate}}
v-else>{{s.DiningName}}</span></td> <el-popover popper-class="bookDinnerStatistics_tripDetails" width="550" trigger="click">
</tr> <table width="100%" border="0" cellspacing="0" cellpadding="0">
</table> <tr class="_color_666" style="text-align:center;">
</div> <th width="60">{{$t('Airticket.Air_segment')}}</th>
</td> <th width="80">{{$t('system.query_flightNum')}}</th>
<td> <th width="150">起飞时间</th>
<div class="w200"> <th width="150">到达时间</th>
{{item.Remarks}} <th width="100">经停城市</th>
</div> </tr>
</td> <tr v-for="(ds,din) in item.FlightList" :key="din" style="text-align:center;">
<td> <td class="_d_name _color_666">
<div class="w80 link"> <span v-if="din==0">{{$t('Airticket.Air_go')}}</span>
<p @click="goUrl('bookDinnerStatisticsDetails',item,outItem,'订餐详情')">详情</p> <span v-else-if="din==item.FlightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
</div> <span
</td> v-else-if="din>0 && din!=item.FlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
</tr> </td>
<tr> <td>
<td :colspan="colspanTotal" style="text-align: left!important;padding-left: 20px;"> <div>{{ds.Flight_number}}</div>
<div class="link"> <div style="margin-top:5px;">{{ds.AlName}}</div>
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.Titles}}</p> </td>
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252"> <td>
地接备注:{{outItem.StaticsReportList[0].DMCRemark}}</div> <div>{{ds.FlightDate}} {{ds.Departure_time}}</div>
</div> <div style="margin-top:5px;">{{ds.dName}}</div>
</td> </td>
</tr> <td>
</template> <div>{{ds.FlightArrivalTime}} {{ds.Arrival_time}}</div>
</tbody> <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>
</td>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<div class="w150 link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}({{item.TCID}})</p>
</div>
</td>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<div class="w120 link">
<p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')">
{{item.TotalSeat}}/{{item.CommonReport.HouseStatistics.RealityYSeatNum}}/{{item.CommonReport.HouseStatistics.RealityESeatNum}}/{{item.CommonReport.HouseStatistics.RealityFSeatNum}}
</p>
</div>
</td>
<td :rowspan="subItem.DiningSummaryList.length" v-if='thirdIndex==0'>
{{subItem.UseTimeStr}}
</td>
<td style="text-align:left;padding-left:3px;">
{{thirdItem.DiningName}}
</td>
<td>
{{thirdItem.UseDinnerTypeStr}}
</td>
<td>
<!--大人-->
<template v-for="lastItem in thirdItem.DiningPriceList"
v-if="lastItem.PeopleType==1">{{lastItem.PeoplePrice}}</template>
</td>
<td>
<!--中学生-->
<template v-for="lastItem in thirdItem.DiningPriceList"
v-if="lastItem.PeopleType==2">{{lastItem.PeoplePrice}}</template>
</td>
<td>
<!--小学生-->
<template v-for="lastItem in thirdItem.DiningPriceList"
v-if="lastItem.PeopleType==3">{{lastItem.PeoplePrice}}</template>
</td>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<div class="w80 link">
<p @click="goUrl('bookDinnerStatisticsDetails',item,outItem,'订餐详情')">详情</p>
</div>
</td>
</tr>
<tr
v-if="subIndex== item.CommonReport.DiningList.length-1 && thirdIndex==subItem.DiningSummaryList.length-1">
<td :colspan="11" style="text-align: left!important;padding-left: 20px;">
<div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.Titles}}</p>
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252">
地接备注:{{outItem.StaticsReportList[0].DMCRemark}}</div>
</div>
</td>
</tr>
</template>
</template>
</template>
</tbody>
</template>
</table> </table>
</div> </div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
...@@ -173,7 +179,7 @@ ...@@ -173,7 +179,7 @@
LineList: [], LineList: [],
LineTeamList: [], LineTeamList: [],
thLengthTitle: [], thLengthTitle: [],
list: [], DataList: [],
colspanTotal: 0, colspanTotal: 0,
boxHeight: 0, boxHeight: 0,
} }
...@@ -235,7 +241,7 @@ ...@@ -235,7 +241,7 @@
} }
}) })
}, },
goUrl(path, obj,outItem, title) { goUrl(path, obj, outItem, title) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
...@@ -263,27 +269,23 @@ ...@@ -263,27 +269,23 @@
this.loading = false this.loading = false
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.msg.total = res.data.data.count; this.msg.total = res.data.data.count;
this.list = res.data.data.pageData.data; var sourceData = res.data.data.pageData.data;
this.thLengthArr = []; sourceData.forEach(outItem => {
this.thLengthTitle = []; var rootRowspan = 0; //合团跨行
this.colspanTotal = res.data.data.pageData.columnsCount + 6;
for (let i = 1; i <= res.data.data.pageData.columnsCount; i++) {
this.thLengthTitle.push('第' + i + '天');
}
this.list.forEach(outItem => {
outItem.StaticsReportList.forEach(item => { outItem.StaticsReportList.forEach(item => {
if (item.CommonReport.DiningList.length < res.data.data.pageData.columnsCount) { var itemRowSpan = 0; //餐厅跨行
let _cha = res.data.data.pageData.columnsCount - item.CommonReport.DiningList.length; item.CommonReport.DiningList.forEach(thirdItem => {
let _chaArr = new Array(); thirdItem.DiningSummaryList.forEach(lastItem => {
for (let i = 0; i < _cha; i++) { rootRowspan++;
_chaArr.push({ itemRowSpan++;
'HotelName': '' });
}); });
} item.itemRowSpan = itemRowSpan;
item.CommonReport.DiningList = item.CommonReport.DiningList.concat(_chaArr);
}
}); });
rootRowspan += outItem.StaticsReportList.length;
outItem.rootRowspan = rootRowspan;
}); });
this.DataList = sourceData;
this.$forceUpdate() this.$forceUpdate()
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
...@@ -300,14 +302,14 @@ ...@@ -300,14 +302,14 @@
"-" + "-" +
myDate.getDate(); myDate.getDate();
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;
console.log(height)
this.boxHeight = height; this.boxHeight = height;
this.offsetwidth = width this.offsetwidth = width;
this.getList() this.getList()
}, },
} }
</script> </script>
<style> <style>
...@@ -438,6 +440,7 @@ ...@@ -438,6 +440,7 @@
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
border-right: 1px solid #ccc; border-right: 1px solid #ccc;
} }
/* .bookDinnerStatisticsTalbe tr td .DiningTable tr:last-child >td{ /* .bookDinnerStatisticsTalbe tr td .DiningTable tr:last-child >td{
border-bottom:0; border-bottom:0;
} */ } */
......
src/components/scenicSpot/admissionStatistics.vue
View file @ a2f63691
...@@ -90,12 +90,12 @@ ...@@ -90,12 +90,12 @@
</el-popover> </el-popover>
</td> </td>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'> <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<div class="w120 link"> <div class="w150 link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}({{item.TCID}})</p> <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}({{item.TCID}})</p>
</div> </div>
</td> </td>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'> <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<div class="w120 link"> <div class="w150 link">
<p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')"> <p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')">
{{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>
......
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