Skip to content

S
SuperMan
Commit a601f109 authored by youjie's avatar youjie
Browse files
Options

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

parents abb0bdf7 4e3bedf0
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 86 deletions
src/components/Hotel/roomReservationsDetailsNew.vue
View file @ a601f109
...@@ -42,10 +42,7 @@ ...@@ -42,10 +42,7 @@
<span v-if="IsOperation==1" style="color:red;font-size:14px;">{{$t('ground.yizhidanbng')}}</span> <span v-if="IsOperation==1" style="color:red;font-size:14px;">{{$t('ground.yizhidanbng')}}</span>
</li> </li>
</ul> </ul>
{{$t('ground.jisuan1')}} <br />
{{$t('ground.jisuan2')}} <br />
{{$t('ground.sidaobsuan')}}<br />
付款方式是现付的，必須上传手配书.
</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">
...@@ -56,7 +53,7 @@ ...@@ -56,7 +53,7 @@
&nbsp;&nbsp;{{$t('leader.leader_Guide')}}:{{GuideName}}.</th> &nbsp;&nbsp;{{$t('leader.leader_Guide')}}:{{GuideName}}.</th>
<th class="fz14" colspan="17"> <th class="fz14" colspan="17">
<el-tooltip class="item" effect="dark" content="批量上传手配书" placement="top-start" <el-tooltip class="item" effect="dark" content="批量上传手配书" placement="top-start"
style="float:left;margin-left:20px;"> style="float:left;margin-left:20px;display:none;">
<el-popover placement="bottom" popper-class="piliangPop" width="400" trigger="click" <el-popover placement="bottom" popper-class="piliangPop" width="400" trigger="click"
v-model="isShowPiliangPop"> v-model="isShowPiliangPop">
<table class="dmcSetTable roomReserSet" border="0" cellspacing="0" cellpadding="0"> <table class="dmcSetTable roomReserSet" border="0" cellspacing="0" cellpadding="0">
...@@ -273,31 +270,36 @@ ...@@ -273,31 +270,36 @@
<!-- 房间类型 --> <!-- 房间类型 -->
<td> <td>
<div v-if="childItem.HouseType === 2"> <div v-if="childItem.HouseType === 2">
{{subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeNameExt}} <template
<template v-if="childIndex==4"> v-if="subItem.HouseStatistics.HouseTypeList&&subItem.HouseStatistics.HouseTypeList.length>1">
<template v-if="subItem.DriverGuideIsRebate==1"> {{subItem.HouseStatistics.HouseTypeList[1].HouseTypeNameExt}}
<br /><span style="color:green">{{$t('hotel.hotel_commission')}}</span>
</template> </template>
<template v-else-if="subItem.DriverGuideIsRebate==0"> <template v-if="childIndex==4">
<br /><span style="color:red;">{{$t('ground.bufanyong')}}</span> <template v-if="subItem.DriverGuideIsRebate==1">
<br /><span style="color:green">{{$t('hotel.hotel_commission')}}</span>
</template>
<template v-else-if="subItem.DriverGuideIsRebate==0">
<br /><span style="color:red;">{{$t('ground.bufanyong')}}</span>
</template>
</template> </template>
</template> <template v-if="childIndex==5">
<template v-if="childIndex==5"> <br /><span style="color:red;">{{$t('ground.bufanyong')}}</span>
<br /><span style="color:red;">{{$t('ground.bufanyong')}}</span> </template></div>
</template></div>
</td> </td>
<!-- 房间数 --> <!-- 房间数 -->
<td> <td>
<div v-if="childItem.HouseType === 2"> <div v-if="childItem.HouseType === 2">
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')" <el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')"
v-model='childItem.HouseTypeCount' :disabled="IsEditHotelPeople==0?true:false"></el-input></div> v-model='childItem.HouseTypeCount' :disabled="IsEditHotelPeople==0?true:false"></el-input>
</div>
</td> </td>
<td> <td>
<div v-if="childItem.HouseType === 2"> <div v-if="childItem.HouseType === 2">
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')" <el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')"
@input="calculationPrice(subItem)" v-model='childItem.BookNum' @input="calculationPrice(subItem)" v-model='childItem.BookNum'
:disabled="IsEditHotelPeople==0?true:false"> :disabled="IsEditHotelPeople==0?true:false">
</el-input></div> </el-input>
</div>
</td> </td>
<!-- 尚差房间数 --> <!-- 尚差房间数 -->
<!-- <td> <!-- <td>
...@@ -309,38 +311,39 @@ ...@@ -309,38 +311,39 @@
<!-- 单价/每人 --> <!-- 单价/每人 -->
<td> <td>
<div v-if="childItem.HouseType === 2"> <div v-if="childItem.HouseType === 2">
<template v-if="childIndex==1"> <template v-if="childIndex==1">
<template v-if="EditBtn||LineId==90"> <template v-if="EditBtn">
<el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter' <el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
@input="calculationPrice(subItem)" v-model='childItem.UnitPrice'></el-input> @input="calculationPrice(subItem)" v-model='childItem.UnitPrice'></el-input>
</template>
<template v-else>
<el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
@input="calculationPrice(subItem)" v-model='childItem.UnitPrice'
:disabled="(IsEditHotel==0||childItem.IsHaveStockPrice==1)?true:false">
</el-input>
</template>
</template> </template>
<template v-else> <template v-else>
<el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter' <el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
@input="calculationPrice(subItem)" v-model='childItem.UnitPrice' @input="calculationPrice(subItem)" v-model='childItem.UnitPrice'
:disabled="(IsEditHotel==0||childItem.IsHaveStockPrice==1)?true:false"> :disabled="IsEditHotel==0?true:false">
</el-input> </el-input>
</template> </template></div>
</template>
<template v-else>
<el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
@input="calculationPrice(subItem)" v-model='childItem.UnitPrice'
:disabled="IsEditHotel==0?true:false">
</el-input>
</template></div>
</td> </td>
<!-- 免减人数 --> <!-- 免减人数 -->
<td> <td>
<div v-if="childItem.HouseType === 2"> <div v-if="childItem.HouseType === 2">
<el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'HotelDiscount')" <el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'HotelDiscount')"
v-model='childItem.HotelDiscount' @input="calculationPrice(subItem)"> v-model='childItem.HotelDiscount' @input="calculationPrice(subItem)">
</el-input></div> </el-input>
</div>
</td> </td>
<!-- 金额小计 --> <!-- 金额小计 -->
<td style="white-space:nowrap;"> <td style="white-space:nowrap;">
<div v-if="childItem.HouseType === 2"> <div v-if="childItem.HouseType === 2">
<el-input class='w40' @keyup.native="checkInteger(childItem,'TotalPrice')" <el-input class='w40' @keyup.native="checkInteger(childItem,'TotalPrice')"
v-model='childItem.TotalPrice' @input="calculationPrice(subItem)"> v-model='childItem.TotalPrice' @input="calculationPrice(subItem)">
</el-input> </el-input>
</div> </div>
</td> </td>
<!-- 返佣类型 --> <!-- 返佣类型 -->
...@@ -355,44 +358,44 @@ ...@@ -355,44 +358,44 @@
<!--返佣--> <!--返佣-->
<td> <td>
<div v-if="childItem.HouseType === 2"> <div v-if="childItem.HouseType === 2">
<template v-if="childIndex<4"> <template v-if="childIndex<4">
<el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')" <el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')"
v-model='childItem.RebateRatio' v-model='childItem.RebateRatio'
@input="SetRebateRatio(subItem,childItem.RebateRatio),calculationPrice(subItem)" @input="SetRebateRatio(subItem,childItem.RebateRatio),calculationPrice(subItem)"
:disabled="IsEditHotel==0?true:false"></el-input> % :disabled="IsEditHotel==0?true:false"></el-input> %
</template> </template>
<template v-if="childIndex==5"> <template v-if="childIndex==5">
<el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')" <el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')"
v-model='childItem.RebateRatio' @input="calculationPrice(subItem)" :disabled="true"></el-input> % v-model='childItem.RebateRatio' @input="calculationPrice(subItem)" :disabled="true"></el-input> %
</template> </template>
<template v-if="childIndex==4 && subItem.DriverGuideIsRebate==0"> <template v-if="childIndex==4 && subItem.DriverGuideIsRebate==0">
<el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')" <el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')"
v-model='childItem.RebateRatio' @input="calculationPrice(subItem)" :disabled="true"></el-input> % v-model='childItem.RebateRatio' @input="calculationPrice(subItem)" :disabled="true"></el-input> %
</template></div> </template></div>
</td> </td>
<!--返佣金额--> <!--返佣金额-->
<td> <td>
<div v-if="childItem.HouseType === 2"> <div v-if="childItem.HouseType === 2">
<!--含税--> <!--含税-->
<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 + XiaoFeiTaxFee )*( childItem.RebateRatio / 100)).toFixed(2)}} {{ (childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + XiaoFeiTaxFee )*( 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> <template v-if="subItem.TaxType==2">
</template> {{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + XiaoFeiTaxFee)*( childItem.RebateRatio / 100)).toFixed(2)}}
<!--不含税--> </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"> </template>
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + XiaoFeiTaxFee)*( childItem.RebateRatio / 100)).toFixed(2)}} </template></div>
</template>
<template v-else>
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
</template></div>
</td> </td>
<!-- 入汤税 --> <!-- 入汤税 -->
<td style="white-space:nowrap;"> <td style="white-space:nowrap;">
...@@ -696,7 +699,7 @@ ...@@ -696,7 +699,7 @@
BookNum: 0 BookNum: 0
}, },
], ],
ChooseCountry:"651" ChooseCountry: "651"
} }
}, },
components: { components: {
...@@ -945,12 +948,12 @@ ...@@ -945,12 +948,12 @@
IsCombine: '', IsCombine: '',
NewTCIDs: '' NewTCIDs: ''
} }
if(this.$route.query.OrderType){ if (this.$route.query.OrderType) {
msg = { msg = {
TCIDs: this.$route.query.id, TCIDs: this.$route.query.id,
OrderType: this.$route.query.OrderType OrderType: this.$route.query.OrderType
} }
}else{ } else {
msg = { msg = {
TCIDs: this.$route.query.id, TCIDs: this.$route.query.id,
NewCombinationNum: this.$route.query.NewCombinationNum, NewCombinationNum: this.$route.query.NewCombinationNum,
...@@ -973,9 +976,9 @@ ...@@ -973,9 +976,9 @@
this.CreateByPhoto = res.data.data.CreateByPhoto; this.CreateByPhoto = res.data.data.CreateByPhoto;
this.CreateByAccount = res.data.data.CreateByAccount; this.CreateByAccount = res.data.data.CreateByAccount;
// in list"> // in list">
// <template v-for="(subItem,subIndex) in item.HotelOrderList"> // <template v-for="(subItem,subIndex) in item.HotelOrderList">
// <tr v-for="(childItem,childIndex) in subItem.OrderDetailsList" :key="childIndex"> // <tr v-for="(childItem,childIndex) in subItem.OrderDetailsList" :key="childIndex">
if (list != null && list.length > 0) { if (list != null && list.length > 0) {
list.forEach((item, sIndex) => { list.forEach((item, sIndex) => {
...@@ -1002,7 +1005,8 @@ ...@@ -1002,7 +1005,8 @@
subItem.ReserveNo = this.$route.query.NewCombinationNum; subItem.ReserveNo = this.$route.query.NewCombinationNum;
} }
subItem.OrderDetailsList = subItem.OrderDetailsList.filter(item => item.HouseType === 2) subItem.OrderDetailsList = subItem.OrderDetailsList.filter(item => item.HouseType === 2)
console.log('subItem.OrderDetailsList', subItem.OrderDetailsList, subItem.OrderDetailsList.filter(item => item.HouseType === 2)) console.log('subItem.OrderDetailsList', subItem.OrderDetailsList, subItem.OrderDetailsList
.filter(item => item.HouseType === 2))
subItem.isShowPop = false; subItem.isShowPop = false;
subItem.ckedHotelName = ""; subItem.ckedHotelName = "";
//遍历手配 //遍历手配
...@@ -1241,13 +1245,10 @@ ...@@ -1241,13 +1245,10 @@
if (this.$route.query.LineId) { if (this.$route.query.LineId) {
this.LineId = this.$route.query.LineId; this.LineId = this.$route.query.LineId;
} }
if(this.LineId==90) if (this.LineId == 90) {
{ this.ChooseCountry = 2;
this.ChooseCountry=2; } else if (this.LineId == 14) {
} this.ChooseCountry = 651;
else if(this.LineId==14)
{
this.ChooseCountry=651;
} }
this.GetAuth(); this.GetAuth();
this.getAllCurrency(); this.getAllCurrency();
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ a601f109
...@@ -670,7 +670,7 @@ ...@@ -670,7 +670,7 @@
<span class="TCL-greenType">{{item.SaleClearOrderHour}}{{$t('salesModule.Hour')}}</span> <span class="TCL-greenType">{{item.SaleClearOrderHour}}{{$t('salesModule.Hour')}}</span>
</p> </p>
<p <p
v-if="(item.LineID==14 || item.LineID==90) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 "> v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj" <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM" :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
......
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