Commit 4f3c088d authored by 黄奎's avatar 黄奎

景点页面修改

parent 405f643a
...@@ -30,116 +30,112 @@ ...@@ -30,116 +30,112 @@
<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="admissionStatisticsTalbe" v-loading='loading'> <table border="0" cellspacing="1" cellpadding="0" class="admissionStatisticsTalbe" v-loading='loading'>
<tr> <tr>
<th width="50">序号</th> <th width="120">序号</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">机位总数/(Y/E/F)</th> <th width="120">机位总数/(Y/E/F)</th>
<th v-for='item in thLengthTitle'>{{item}}</th> <th width="120">日期</th>
<th>备注</th> <th width="250">景点</th>
<th class="w80">操作</th> <th width="100">操作</th>
</tr> </tr>
<tbody v-for="(outItem,outindex) in list" :class="{admissionStatisticsSplitTrCss:outindex%2!=0}"> <template v-for="(outItem,outindex) in DataList">
<template v-for="(item,index) in outItem.StaticsReportList"> <tbody :class="{admissionStatisticsSplitTrCss: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.ScenicList">
<div style="max-width: 100px; min-width: 50px; ">{{outindex+1}}</div> <template v-for="(thirdItem,thirdIndex) in subItem.ScenicStatisticsList">
<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="w80"> {{item.FlightDate}}
{{item.FlightDate}} <el-popover popper-class="admissionStatistics_tripDetails" width="550" trigger="click">
<el-popover popper-class="admissionStatistics_tripDetails" width="550" trigger="click"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr class="_color_666" style="text-align:center;">
<tr class="_color_666" style="text-align:center;"> <th width="60">{{$t('Airticket.Air_segment')}}</th>
<th width="60">{{$t('Airticket.Air_segment')}}</th> <th width="80">{{$t('system.query_flightNum')}}</th>
<th width="80">{{$t('system.query_flightNum')}}</th> <th width="150">起飞时间</th>
<th width="150">起飞时间</th> <th width="150">到达时间</th>
<th width="150">到达时间</th> <th width="100">经停城市</th>
<th width="100">经停城市</th> </tr>
</tr> <tr v-for="(ds,din) in item.FlightList" :key="din" style="text-align:center;">
<tr v-for="(ds,din) in item.FlightList" :key="din" style="text-align:center;"> <td class="_d_name _color_666">
<td class="_d_name _color_666"> <span v-if="din==0">{{$t('Airticket.Air_go')}}</span>
<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==item.FlightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span> <span
<span v-else-if="din>0 && din!=item.FlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
v-else-if="din>0 && din!=item.FlightList.length-1">{{$t('Airticket.Air_transit')}}</span> </td>
</td> <td>
<td> <div>{{ds.Flight_number}}</div>
<div>{{ds.Flight_number}}</div> <div style="margin-top:5px;">{{ds.AlName}}</div>
<div style="margin-top:5px;">{{ds.AlName}}</div> </td>
</td> <td>
<td> <div>{{ds.FlightDate}} {{ds.Departure_time}}</div>
<div>{{ds.FlightDate}} {{ds.Departure_time}}</div> <div style="margin-top:5px;">{{ds.dName}}</div>
<div style="margin-top:5px;">{{ds.dName}}</div> </td>
</td> <td>
<td> <div>{{ds.FlightArrivalTime}} {{ds.Arrival_time}}</div>
<div>{{ds.FlightArrivalTime}} {{ds.Arrival_time}}</div> <div style="margin-top:5px;">{{ds.aName}}</div>
<div style="margin-top:5px;">{{ds.aName}}</div> </td>
</td> <td>{{ds.StopoverName}}</td>
<td>{{ds.StopoverName}}</td> </tr>
</tr> </table>
</table> <el-button slot="reference" class="normalBtn mt5"
<el-button slot="reference" class="normalBtn mt5" style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>详情
style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>详情</el-button> </el-button>
</el-popover> </el-popover>
</div> </td>
</td> <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<td> <div class="w120 link">
<div class="w120 link"> <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}({{item.TCID}})</p>
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}</p> </div>
</div> </td>
</td> <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<td> <div class="w120 link">
<div class="w120 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> </div>
</div> </td>
</td> <td :rowspan="subItem.ScenicStatisticsList.length" v-if='thirdIndex==0'>
<td v-for="x in item.CommonReport.ScenicList" style="vertical-align: top;"> {{thirdItem.UseTimeStr}}
<div style="width: 100%;"> </td>
<p class="pDateStyle" v-if="x.UseTimeStr">{{x.UseTimeStr}}</p> <td style="text-align:left;padding-left:3px;">
<p @click="goUrlR('scenicSpotList',s.ID,'景区列表')" class="pMsgStyle phoverStype" {{thirdItem.ScenicName}}
v-for="s in x.ScenicStatisticsList">{{s.ScenicName}}</p> </td>
</div> <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
</td> <div class="link">
<td> <div class="w80">
<div class="w200"> <p @click="goUrl('admissionStatisticsDetails',item,outItem,'门票详情')">详情</p>
{{item.Remarks}} </div>
</div> </div>
</td> </td>
<td> </tr>
<div class="link"> <tr
<div class="w80"> v-if="subIndex== item.CommonReport.ScenicList.length-1 && thirdIndex==subItem.ScenicStatisticsList.length-1">
<p @click="goUrl('admissionStatisticsDetails',item,outItem,'门票详情')">详情</p> <td colspan="7" style="text-align:left; padding-left:5px">
</div> <div class="link">
</div> <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.Titles}}</p>
</td> <div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252">
</tr> 地接备注:{{outItem.StaticsReportList[0].DMCRemark}}</div>
<tr> </div>
<td :colspan="colspanTotal" style="text-align: left!important;padding-left: 20px;"> </td>
<div class="link"> </tr>
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.Titles}}</p> </template>
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252"> </template>
地接备注:{{outItem.StaticsReportList[0].DMCRemark}}</div> </template>
</div> </tbody>
</td> </template>
</tr>
</template>
</tbody>
</table> </table>
</div> </div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total></el-pagination> layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total></el-pagination>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
...@@ -158,15 +154,10 @@ ...@@ -158,15 +154,10 @@
}, },
LineList: [], LineList: [],
LineTeamList: [], LineTeamList: [],
thLengthTitle: [], DataList: [],
list: [],
colspanTotal: 0,
} }
}, },
methods: { methods: {
stringToArr(str) {
return str.split(',')
},
getLineList() { getLineList() {
this.apipost("line_post_GetAllList", {}, res => { this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -192,16 +183,6 @@ ...@@ -192,16 +183,6 @@
} }
); );
}, },
goUrlR(path, obj, title) {
this.$router.push({
name: path,
query: {
"ID": obj,
blank: 'y',
tab: title
}
})
},
goUrlT(path, obj, title) { goUrlT(path, obj, title) {
this.$router.push({ this.$router.push({
name: path, name: path,
...@@ -212,7 +193,7 @@ ...@@ -212,7 +193,7 @@
} }
}) })
}, },
goUrl(path, obj,outItem, title) { goUrl(path, obj, outItem, title) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
...@@ -235,31 +216,28 @@ ...@@ -235,31 +216,28 @@
this.currentPage = 1; this.currentPage = 1;
}, },
getList() { getList() {
this.loading = true this.loading = true;
this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => { this.apipost('dmcstatistics_post_GetUniteCombinationNumService', 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;
this.list = res.data.data.pageData.data; var tempData = res.data.data.pageData.data;
this.thLengthTitle = [] tempData.forEach(outItem => {
this.colspanTotal = res.data.data.pageData.columnsCount + 6 var rootRowspan = 0; //合团跨行
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.ScenicList.length < res.data.data.pageData.columnsCount) { var itemRowSpan = 0; //景点跨行
let _cha = res.data.data.pageData.columnsCount - item.CommonReport.ScenicList.length item.CommonReport.ScenicList.forEach(thirdItem => {
let _chaArr = new Array() thirdItem.ScenicStatisticsList.forEach(lastItem => {
for (let i = 0; i < _cha; i++) { rootRowspan++;
_chaArr.push({ itemRowSpan++;
'HotelName': '' });
}) });
} item.itemRowSpan = itemRowSpan;
item.CommonReport.ScenicList = item.CommonReport.ScenicList.concat(_chaArr) });
} rootRowspan += outItem.StaticsReportList.length;
}) outItem.rootRowspan = rootRowspan;
}) });
this.DataList = tempData;
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
...@@ -278,6 +256,7 @@ ...@@ -278,6 +256,7 @@
this.getList() this.getList()
}, },
} }
</script> </script>
<style> <style>
...@@ -305,39 +284,10 @@ ...@@ -305,39 +284,10 @@
.admissionStatisticsTalbe tr td { .admissionStatisticsTalbe tr td {
font-size: 12px; font-size: 12px;
} }
.admissionStatisticsTalbe tr td .pHouseStyle {
border-bottom: 1px solid #ccc;
height: 20px;
line-height: 20px;
}
.admissionStatisticsTalbe tr td .pHouseStyle:last-child {
border-bottom: none;
}
.admissionStatisticsTalbe tr td .pDateStyle {
border-bottom: 1px solid #ccc;
height: 20px;
line-height: 20px;
margin-top: 0;
}
.admissionStatisticsTalbe tr td .pMsgStyle {
padding: 0 10px;
line-height: 20px;
}
.admissionStatisticsTalbe tr td .link p:hover { .admissionStatisticsTalbe tr td .link p:hover {
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
.admissionStatisticsTalbe tr td .phoverStype:hover {
text-decoration: underline;
cursor: pointer;
}
.admissionStatistics_tripDetails { .admissionStatistics_tripDetails {
padding: 0; padding: 0;
box-shadow: 0px 1px 3px 0px #dedede; box-shadow: 0px 1px 3px 0px #dedede;
......
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