Skip to content

S
SuperMan
Commit 495ab5eb authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 31c70e2b b0827e00
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 58 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ 495ab5eb
......@@ -119,7 +119,7 @@
{{subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeName}}
<template v-if="childIndex==4">
<template v-if="subItem.DriverGuideIsRebate==1">
<br />返佣
<br /><span style="color:green">返佣</span>
</template>
<template v-else-if="subItem.DriverGuideIsRebate==0">
<br /><span style="color:red;">不返佣</span>
......@@ -186,11 +186,11 @@
<!-- 房间数 -->
<td>
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')"
v-model='childItem.HouseTypeCount' :disabled="childIndex<4?true:false"></el-input>
v-model='childItem.HouseTypeCount' :disabled="true"></el-input>
</td>
<td>
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')"
@input="calculationPrice(subItem)" v-model='childItem.BookNum' :disabled="childIndex<4?true:false">
@input="calculationPrice(subItem)" v-model='childItem.BookNum' :disabled="true">
</el-input>
</td>
<!-- 尚差房间数 -->
......@@ -220,7 +220,7 @@
<!-- 返佣类型 -->
<td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
<template v-if="subItem.RebateType==1">
含税
<span style="color:green">含税</span>
</template>
<template v-else>
<span style="color:red"> 不含税</span>
......@@ -690,8 +690,7 @@
if (obj.TaxType == 2) {
if (index == 4) {
if (obj.DriverGuideIsRebate == 1) {
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio /
100);
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio / 100);
} else {
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
}
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 495ab5eb
......@@ -28,8 +28,8 @@
<td>{{item.GuideName}}</td>
<td>
<el-popover width="900" trigger="click" popper-class="DMC_HotelPop">
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj" :TCID="item.TCIDS" :DMCNum="NewCombinationNum" :TCNUM="item.TCNUMS"
></commonHotelInfo>
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"
:TCID="item.TCIDS" :DMCNum="NewCombinationNum" :TCNUM="item.TCNUMS"></commonHotelInfo>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店信息</span>
</el-popover>
</td>
......@@ -118,7 +118,8 @@
</td>
<td>
<span>
<span>{{item.SupplierName}} <span v-if="item.SupplierPayType !== 0" :style="{'color': item.SupplierPayType == 2 ? '#E95252': '#111111'}">{{item.SupplierPayType == 2 ? '签单' : '现付'}}</span></span>
<span>{{item.SupplierName}} <span v-if="item.SupplierPayType !== 0"
:style="{'color': item.SupplierPayType == 2 ? '#E95252': '#111111'}">{{item.SupplierPayType == 2 ? '签单' : '现付'}}</span></span>
</span>
</td>
</tr>
......@@ -127,15 +128,11 @@
<td colspan="15">
<span v-for="item in TotalNav.busPrice">{{item.Str + '：' +item.TotalPrice}} &nbsp;&nbsp;&nbsp;&nbsp;</span>
</td>
<!-- <td>签单/预付/抵扣总金额</td>
<td colspan="7">
{{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingIncomeTotalPrice)}}
</td> -->
</tr>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th colspan="16" class="bgwhite">酒店使用</th>
<th colspan="21" class="bgwhite">酒店使用</th>
</tr>
<tr class="title">
<th width="100">使用时间</th>
......@@ -148,27 +145,33 @@
<th width="80">免费人数</th>
<th width="">单价/人</th>
<th width="">金额小计</th>
<th width="">返佣类型</th>
<th width="">返佣</th>
<th width="">入汤税</th>
<th width="">城市税</th>
<th width="">停车费</th>
<th width="">税入/税别</th>
<th width="">总金额</th>
<th width="">付款方式</th>
<th width="100">备注</th>
<th width="100">供应商</th>
<th width="100">状态</th>
<th width="100">备注</th>
</tr>
<template v-for='(outItem,outIndex) in list.HotelOrderListReport'>
<template v-for="(subItem,subIndex) in outItem.HotelOrderList">
<tr v-for="(childItem,childIndex) in subItem.OrderDetailsList">
<td v-if="childIndex==0&&subIndex==0" :rowspan="5*outItem.HotelOrderList.length">{{outItem.UseTimeStr}}
<td v-if="childIndex==0&&subIndex==0" :rowspan="6*outItem.HotelOrderList.length">{{outItem.UseTimeStr}}
</td>
<td v-if="childIndex==0" :rowspan="5">{{subItem.HotelName}}
<td v-if="childIndex==0" :rowspan="6">{{subItem.HotelName}}
<p class="cursorpointer" style="margin-top:5px;color: blue;">
<a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
</p>
</td>
<td v-if="childIndex==0" :rowspan="5">
<td v-if="childIndex==0" :rowspan="6">
{{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}
</td>
<td v-if="childIndex==0" :rowspan="5">
<td v-if="childIndex==0" :rowspan="6">
{{subItem.HouseStatistics.RealityRoomNum}}
</td>
<td>
......@@ -176,7 +179,20 @@
<span v-if="childItem.HouseType === 2">标准双人间</span>
<span v-if="childItem.HouseType === 3">大床房</span>
<span v-if="childItem.HouseType === 4">三人间</span>
<span v-if="childItem.HouseType === 5">司导间</span>
<span v-if="childItem.HouseType === 5">
司导间
<template v-if="childIndex==4">
<template v-if="subItem.DriverGuideIsRebate==1">
<br /><span style="color:green">返佣</span>
</template>
<template v-else-if="subItem.DriverGuideIsRebate==0">
<br /><span style="color:red;">不返佣</span>
</template>
</template>
</span>
<span v-if="childItem.HouseType === 6">
不占床
</span>
</td>
<td>
{{childItem.HouseTypeCount}}
......@@ -194,12 +210,29 @@
</p>
</td>
<td>
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
</td>
<td v-if="childIndex==0" :rowspan="6">
<template v-if="subItem.RebateType==1">
<span style="color:green">含税</span>
</template>
<template v-else>
<span style="color:red"> 不含税</span>
</template>
</td>
<td>
{{childItem.RebateRatio}} %
</td>
<td v-if="childIndex==0" :rowspan="5">
<td v-if="childIndex==0" :rowspan="6">
{{subItem.InTangTax}}
</td>
<td v-if="childIndex==0" :rowspan="6">
{{subItem.CityTax}}
</td>
<td v-if="childIndex==0" :rowspan="6">
{{subItem.ParkFee}}
</td>
<td v-if="childIndex==0" :rowspan="6">
<template v-if="subItem.TaxType==1">
税入
</template>
......@@ -207,10 +240,10 @@
税别
</template>
</td>
<td v-if="childIndex==0" :rowspan="5">
{{hotelTotalPrice(subItem.OrderDetailsList,subItem)}}
<td v-if="childIndex==0" :rowspan="6">
{{hotelTotalPrice(subItem)}}
</td>
<td v-if="childIndex==0" :rowspan="5">
<td v-if="childIndex==0" :rowspan="6">
<span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">签单</span>
<span v-else-if="subItem.PayStyle === 4">预付</span>
......@@ -220,21 +253,32 @@
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="5">
{{subItem.Remarks}}
<td v-if="childIndex==0" :rowspan="6">
<span>{{subItem.SupplierName}} <span v-if="subItem.SupplierPayType !== 0"
:style="{'color': subItem.SupplierPayType == 2 ? '#E95252': '#111111'}">{{subItem.SupplierPayType == 2 ? '签单' : '现付'}}</span></span>
</td>
<td v-if="childIndex==0" :rowspan="6">
<template v-if="subItem.DMCState==1">
<span style="color: green;">地接-OK</span>
</template>
<template v-else-if="subItem.DMCState==2">
<span style="color:red;">地接-暂定</span>
</template>
<template v-else>
<span style="color:red;">地接-未操作</span>
</template>
</td>
<td v-if="childIndex==0" :rowspan="5">
<span>{{subItem.SupplierName}} <span v-if="subItem.SupplierPayType !== 0" :style="{'color': subItem.SupplierPayType == 2 ? '#E95252': '#111111'}">{{subItem.SupplierPayType == 2 ? '签单' : '现付'}}</span></span>
<td v-if="childIndex==0" :rowspan="6">
{{subItem.Remarks}}
</td>
</tr>
</template>
</template>
<tr v-if="TotalNav.reimburseTotalPrice">
<td>总金额</td>
<td colspan="15">
<td colspan="20">
{{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}}
</td>
</tr>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
......@@ -305,10 +349,6 @@
<td colspan="11">
{{moneyFormat(TotalNav.reimburseTotalPrice.IncomeTotalPrice)}}
</td>
<!-- <td>签单/预付/抵扣总金额</td>
<td colspan="5">
{{moneyFormat(TotalNav.reimburseTotalPrice.TipTotalPrice)}}
</td> -->
</tr>
</table>
......@@ -381,12 +421,7 @@
<td colspan="11">
{{moneyFormat(TotalNav.reimburseTotalPrice.OtherTotalPrice)}}
</td>
<!-- <td>签单/预付/抵扣总金额</td>
<td colspan="5">
{{moneyFormat(TotalNav.reimburseTotalPrice.PlanTotalPrice)}}
</td> -->
</tr>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
......@@ -497,8 +532,8 @@
showZhan: true,
showBtnList: false,
showCaozuoTime: true,
ShowTaxType:true, //显示税入税别
ShowRebateRatio:true, //显示返佣比列
ShowTaxType: true, //显示税入税别
ShowRebateRatio: true, //显示返佣比列
},
}
},
......@@ -662,23 +697,32 @@
})
return this.moneyFormat(totalPrice)
},
hotelTotalPrice(obj, subItem) {
let totalPrice = 0
obj.forEach(x => {
if (subItem.TaxType == 2) {
if (x.PayStyle === 1) {
totalPrice += x.UnitPrice * (x.BookNum - x.HotelDiscount) * (1+0.08 - x.RebateRatio / 100)
hotelTotalPrice(obj) {
let totalPrice = 0;
obj.OrderDetailsList.forEach((item, index) => {
if (obj.PayStyle === 1) {
//税别
if (obj.TaxType == 2) {
if (index == 4) {
if (obj.DriverGuideIsRebate == 1) {
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item
.RebateRatio / 100);
} else {
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
}
} else {
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio /
100);
}
//税入
} else {
totalPrice += 0
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
}
} else {
if (x.PayStyle === 1) {
totalPrice += x.UnitPrice * (x.BookNum - x.HotelDiscount) * (1 - x.RebateRatio / 100)
} else {
totalPrice += 0
}
totalPrice += 0
}
})
totalPrice += obj.ParkFee + obj.CityTax + obj.InTangTax;
return this.moneyFormat(totalPrice)
},
diningTotalPrice(sObj, obj) {
......@@ -731,7 +775,7 @@
this.picIsShow = true
},
peopleStrToWord(str) {
if (str == 1)
if (str == 1)
return '大人'
if (str == 2)
return '中人'
......@@ -767,7 +811,6 @@
}
})
this.nav = nav;
console.log(this.nav,'navvvvvvvv');
} else {
this.Error(res.data.message)
}
......@@ -791,7 +834,7 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.list = res.data.data;
console.log("this.list",this.list);
console.log("this.list", this.list);
this.UseCount = this.list.UseCount;
if (this.list.OtherOrderReportList.OtherList && this.list.OtherOrderReportList.OtherList.length > 0) {
this.list.OtherOrderReportList.OtherList.forEach(x => {
......
src/components/index.vue
View file @ 495ab5eb
......@@ -899,7 +899,7 @@
</div>
<div style="text-align:center">
<p style="font-size:26px;color:#111111;margin:40px 0">第{{tsNumber}}期投诉案例分享已经发布</p>
<a @click="CloseTs" href="http://we.oytour.com:8110/?/article/8" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a>
<a @click="CloseTs" target="_blank" href="http://we.oytour.com:8110/?/article/8" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a>
</div>
</div>
</div>
......
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