Commit 405f643a authored by 黄奎's avatar 黄奎

页面优化

parent 1a937002
...@@ -135,25 +135,25 @@ ...@@ -135,25 +135,25 @@
<th colspan="22" class="bgwhite">酒店使用</th> <th colspan="22" class="bgwhite">酒店使用</th>
</tr> </tr>
<tr class="title"> <tr class="title">
<th width="100">使用时间</th> <th width="90">使用时间</th>
<th width="180">酒店名称</th> <th width="150">酒店名称</th>
<th width="100">占床/不占床</th> <th width="70">占床<br/>不占床</th>
<th width="80">实际用房数</th> <th width="70">实际<br/>用房数</th>
<th width="">房间类型</th> <th width="70">房间<br/>类型</th>
<th width="">房间数</th> <th width="70">房间数</th>
<th width="80">预定人数</th> <th width="60">预定<br/>人数</th>
<th width="80">免费人数</th> <th width="60">免费<br/>人数</th>
<th width="">单价/人</th> <th width="60">单价/人</th>
<th width="">金额小计</th> <th width="60">金额<br/>小计</th>
<th width="">返佣类型</th> <th width="60">返佣<br/>类型</th>
<th width="">返佣</th> <th width="60">返佣</th>
<th width="">返佣金额</th> <th width="60">返佣<br/>金额</th>
<th width="">入汤税</th> <th width="60">入汤税</th>
<th width="">城市税</th> <th width="60">城市税</th>
<th width="">停车费</th> <th width="60">停车费</th>
<th width="">税入/税别</th> <th width="60">税入<br/>税别</th>
<th width="">总金额</th> <th width="60">总金额</th>
<th width="">付款方式</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,10 +161,9 @@ ...@@ -161,10 +161,9 @@
<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">{{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">{{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;">
<a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a> <a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
</p> </p>
...@@ -204,13 +203,13 @@ ...@@ -204,13 +203,13 @@
<td> <td>
{{childItem.HotelDiscount}} {{childItem.HotelDiscount}}
</td> </td>
<td> <td style="white-space:nowrap; ">
<p class="cursorpointer text-decoration" <p class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'roomReservationsDetails')"> @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'roomReservationsDetails')">
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}} {{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}}
</p> </p>
</td> </td>
<td> <td style="white-space:nowrap; ">
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}} {{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
</td> </td>
<td v-if="childIndex==0" :rowspan="6"> <td v-if="childIndex==0" :rowspan="6">
...@@ -224,7 +223,7 @@ ...@@ -224,7 +223,7 @@
<td> <td>
{{childItem.RebateRatio}} % {{childItem.RebateRatio}} %
</td> </td>
<td> <td style="white-space:nowrap; ">
<!--含税--> <!--含税-->
<template v-if="subItem.RebateType==1"> <template v-if="subItem.RebateType==1">
<!--税别--> <!--税别-->
...@@ -263,7 +262,7 @@ ...@@ -263,7 +262,7 @@
税别 税别
</template> </template>
</td> </td>
<td v-if="childIndex==0" :rowspan="6"> <td v-if="childIndex==0" :rowspan="6" style="white-space:nowrap; ">
{{hotelTotalPrice(subItem)}} {{hotelTotalPrice(subItem)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="6"> <td v-if="childIndex==0" :rowspan="6">
...@@ -857,7 +856,6 @@ ...@@ -857,7 +856,6 @@
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.list = res.data.data; this.list = res.data.data;
console.log("this.list", this.list);
this.UseCount = this.list.UseCount; this.UseCount = this.list.UseCount;
if (this.list.OtherOrderReportList.OtherList && this.list.OtherOrderReportList.OtherList.length > 0) { if (this.list.OtherOrderReportList.OtherList && this.list.OtherOrderReportList.OtherList.length > 0) {
this.list.OtherOrderReportList.OtherList.forEach(x => { this.list.OtherOrderReportList.OtherList.forEach(x => {
......
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