Skip to content

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

页面优化

parent 705451e3
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 31 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ 377fb9e9
...@@ -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 @ 377fb9e9
...@@ -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;">
...@@ -224,26 +231,26 @@ ...@@ -224,26 +231,26 @@
{{childItem.RebateRatio}} % {{childItem.RebateRatio}} %
</td> </td>
<td style="white-space:nowrap; "> <td style="white-space:nowrap; ">
<!--含税--> <!--含税-->
<template v-if="subItem.RebateType==1"> <template v-if="subItem.RebateType==1">
<!--税别--> <!--税别-->
<template v-if="subItem.TaxType==2"> <template v-if="subItem.TaxType==2">
{{ (childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.08 )*( childItem.RebateRatio / 100)).toFixed(2)}} {{ (childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.08 )*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
<template v-else>
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2) }}
</template>
</template> </template>
<!--不含税-->
<template v-else> <template v-else>
<!--税别--> {{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2) }}
<template v-if="subItem.TaxType==2">
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.08)*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
<template v-else>
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
</template> </template>
</template>
<!--不含税-->
<template v-else>
<!--税别-->
<template v-if="subItem.TaxType==2">
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.08)*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
<template v-else>
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
</template>
</td> </td>
<td v-if="childIndex==0" :rowspan="6"> <td v-if="childIndex==0" :rowspan="6">
{{subItem.InTangTax}} {{subItem.InTangTax}}
......
src/components/busManagement/busStatistics.vue
View file @ 377fb9e9
...@@ -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;
......
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