Skip to content

S
SuperMan
Commit 20f89aed authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 46ae43c3 377fb9e9
Show whitespace changes
Inline Side-by-side
Showing with 186 additions and 173 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ 20f89aed
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
<span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能在修改!</span> <span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能在修改!</span>
</li> </li>
</ul> </ul>
税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br/>
税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)
</div> </div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " :style="{height: boxHeight + 'px'}" <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " :style="{height: boxHeight + 'px'}"
class="ownScrollbarStyle" ref="ownScrollbarStyle"> class="ownScrollbarStyle" ref="ownScrollbarStyle">
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 20f89aed
...@@ -132,28 +132,34 @@ ...@@ -132,28 +132,34 @@
</table> </table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr> <tr>
<th colspan="22" class="bgwhite">酒店使用</th> <th colspan="22" class="bgwhite">酒店使用 </th>
</tr>
<tr>
<th colspan="22" class="bgwhite">
税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br />
税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)
</th>
</tr> </tr>
<tr class="title"> <tr class="title">
<th width="90">使用时间</th> <th width="90">使用时间</th>
<th width="150">酒店名称</th> <th width="150">酒店名称</th>
<th width="70">占床<br/>不占床</th> <th width="70">占床<br />不占床</th>
<th width="70">实际<br/>用房数</th> <th width="70">实际<br />用房数</th>
<th width="70">房间<br/>类型</th> <th width="70">房间<br />类型</th>
<th width="70">房间数</th> <th width="70">房间数</th>
<th width="60">预定<br/>人数</th> <th width="60">预定<br />人数</th>
<th width="60">免费<br/>人数</th> <th width="60">免费<br />人数</th>
<th width="60">单价/人</th> <th width="60">单价/人</th>
<th width="60">金额<br/>小计</th> <th width="60">金额<br />小计</th>
<th width="60">返佣<br/>类型</th> <th width="60">返佣<br />类型</th>
<th width="60">返佣</th> <th width="60">返佣</th>
<th width="60">返佣<br/>金额</th> <th width="60">返佣<br />金额</th>
<th width="60">入汤税</th> <th width="60">入汤税</th>
<th width="60">城市税</th> <th width="60">城市税</th>
<th width="60">停车费</th> <th width="60">停车费</th>
<th width="60">税入<br/>税别</th> <th width="60">税入<br />税别</th>
<th width="60">总金额</th> <th width="60">总金额</th>
<th width="60">付款<br/>方式</th> <th width="60">付款<br />方式</th>
<th width="100">供应商</th> <th width="100">供应商</th>
<th width="100">状态</th> <th width="100">状态</th>
<th width="100">备注</th> <th width="100">备注</th>
...@@ -161,7 +167,8 @@ ...@@ -161,7 +167,8 @@
<template v-for='(outItem,outIndex) in list.HotelOrderListReport'> <template v-for='(outItem,outIndex) in list.HotelOrderListReport'>
<template v-for="(subItem,subIndex) in outItem.HotelOrderList"> <template v-for="(subItem,subIndex) in outItem.HotelOrderList">
<tr v-for="(childItem,childIndex) in subItem.OrderDetailsList"> <tr v-for="(childItem,childIndex) in subItem.OrderDetailsList">
<td v-if="childIndex==0&&subIndex==0" :rowspan="6*outItem.HotelOrderList.length" style="white-space:nowrap; ">{{outItem.UseTimeStr}} <td v-if="childIndex==0&&subIndex==0" :rowspan="6*outItem.HotelOrderList.length"
style="white-space:nowrap; ">{{outItem.UseTimeStr}}
</td> </td>
<td v-if="childIndex==0" :rowspan="6" style="text-align:left; ">{{subItem.HotelName}} <td v-if="childIndex==0" :rowspan="6" style="text-align:left; ">{{subItem.HotelName}}
<p class="cursorpointer" style="margin-top:5px;color: blue;"> <p class="cursorpointer" style="margin-top:5px;color: blue;">
......
src/components/Restaurant/bookDinnerStatistics.vue
View file @ 20f89aed
...@@ -27,32 +27,37 @@ ...@@ -27,32 +27,37 @@
</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">
<tbody :class="{bookDinnerStatisticsSplitTrCss:outindex%2!=0}">
<template v-for="(item,index) in outItem.StaticsReportList"> <template v-for="(item,index) in outItem.StaticsReportList">
<template v-for="(subItem,subIndex) in item.CommonReport.DiningList">
<template v-for="(thirdItem,thirdIndex) in subItem.DiningSummaryList">
<tr> <tr>
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td :rowspan="outItem.rootRowspan" v-if='index==0&&subIndex==0&&thirdIndex==0'>
<div style="max-width: 100px; min-width: 50px; ">{{outindex+1}}</div> {{outItem.NewCombinationNum}}
<div v-if='outItem.StaticsReportList.length>0' class="w100">{{outItem.NewCombinationNum}}</div>
</td> </td>
<td> <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<div class="w80">
{{item.StartCityNames}} {{item.StartCityNames}}
</div>
</td> </td>
<td> <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<div class="w120">
{{item.FlightDate}} {{item.FlightDate}}
<el-popover popper-class="bookDinnerStatistics_tripDetails" width="550" trigger="click"> <el-popover popper-class="bookDinnerStatistics_tripDetails" width="550" trigger="click">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
...@@ -86,58 +91,55 @@ ...@@ -86,58 +91,55 @@
</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;'>详情</el-button> style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>详情
</el-button>
</el-popover> </el-popover>
</div>
</td> </td>
<td> <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<div class="w120 link"> <div class="w150 link">
<p v-for='xx in stringToArr(item.TCNUMS)' @click="goUrlT('productQuery',xx,'产品查询')">{{xx}}</p> <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}({{item.TCID}})</p>
</div> </div>
</td> </td>
<td> <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<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 v-for="x in item.CommonReport.DiningList" style="vertical-align: top;"> <td :rowspan="subItem.DiningSummaryList.length" v-if='thirdIndex==0'>
<div style="width:350px;"> {{subItem.UseTimeStr}}
<table v-if="x.UseTimeStr" class="DiningTable" width="100%" border="0" cellspacing="0" </td>
cellpadding="0"> <td style="text-align:left;padding-left:3px;">
<tr> {{thirdItem.DiningName}}
<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
v-else>{{s.DiningName}}</span></td>
</tr>
</table>
</div>
</td> </td>
<td> <td>
<div class="w200"> {{thirdItem.UseDinnerTypeStr}}
{{item.Remarks}}
</div>
</td> </td>
<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"> <div class="w80 link">
<p @click="goUrl('bookDinnerStatisticsDetails',item,outItem,'订餐详情')">详情</p> <p @click="goUrl('bookDinnerStatisticsDetails',item,outItem,'订餐详情')">详情</p>
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr
<td :colspan="colspanTotal" style="text-align: left!important;padding-left: 20px;"> 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"> <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">
...@@ -146,7 +148,11 @@ ...@@ -146,7 +148,11 @@
</td> </td>
</tr> </tr>
</template> </template>
</template>
</template>
</tbody> </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"
...@@ -161,7 +167,7 @@ ...@@ -161,7 +167,7 @@
loading: false, loading: false,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 5,
SelectType: 2, SelectType: 2,
LineId: 14, LineId: 14,
LineteamId: "-1", LineteamId: "-1",
...@@ -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.CommonReport.DiningList = item.CommonReport.DiningList.concat(_chaArr);
}
}); });
item.itemRowSpan = itemRowSpan;
}); });
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/busManagement/busStatistics.vue
View file @ 20f89aed
...@@ -147,7 +147,8 @@ ...@@ -147,7 +147,8 @@
</td> </td>
<td> <td>
<div class="w80"> <div class="w80">
<template v-if="item.CommonReport&&item.CommonReport.BusPlanListReport&&item.CommonReport.BusPlanListReport.length>0&&item.CommonReport.BusPlanListReport[0].BusPlanOrderList&&item.CommonReport.BusPlanListReport[0].BusPlanOrderList[0]"> <template
v-if="item.CommonReport&&item.CommonReport.BusPlanListReport&&item.CommonReport.BusPlanListReport.length>0&&item.CommonReport.BusPlanListReport[0].BusPlanOrderList&&item.CommonReport.BusPlanListReport[0].BusPlanOrderList[0]">
{{item.CommonReport.BusPlanListReport[0].BusPlanOrderList[0].MainBusTypeStr}} {{item.CommonReport.BusPlanListReport[0].BusPlanOrderList[0].MainBusTypeStr}}
</template> </template>
</div> </div>
...@@ -407,6 +408,7 @@ ...@@ -407,6 +408,7 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
this.DataList = res.data.data.pageData.data; this.DataList = res.data.data.pageData.data;
console.log("this.dataList",this.DataList);
this.thLengthTitle = []; this.thLengthTitle = [];
this.colspanTotal = res.data.data.pageData.columnsCount + 13; this.colspanTotal = res.data.data.pageData.columnsCount + 13;
for (let i = 1; i <= res.data.data.pageData.columnsCount; i++) { for (let i = 1; i <= res.data.data.pageData.columnsCount; i++) {
...@@ -438,7 +440,6 @@ ...@@ -438,7 +440,6 @@
"-" + "-" +
myDate.getDate(); myDate.getDate();
this.msg.StartDate = nowDate; this.msg.StartDate = nowDate;
//this.msg.StartDate = '2019-08-12';
let width = window.innerWidth - 50; let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 210; let height = window.innerHeight - 65 - 210;
this.boxHeight = height; this.boxHeight = height;
......
src/components/scenicSpot/admissionStatistics.vue
View file @ 20f89aed
...@@ -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