Skip to content

S
SuperMan
Commit 2b16349c authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 669d067e
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 54 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ 2b16349c
......@@ -26,8 +26,8 @@
<span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能在修改!</span>
</li>
</ul>
税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br/>
税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100) <br/>
税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br />
税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100) <br />
司导间【月结】不计入总金额
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " :style="{height: boxHeight + 'px'}"
......@@ -117,7 +117,7 @@
<td v-if="childIndex==0" :rowspan="6">
{{subItem.RealityHouseTypeCount}}
</td>
<td v-if="childIndex==0" :rowspan="6">
<table class="hotelTable">
<tr>
......@@ -178,8 +178,8 @@
<br /><span style="color:red;">不返佣</span>
</template>
</template>
<template v-if="childIndex==5">
<br /><span style="color:red;">不返佣</span>
<template v-if="childIndex==5">
<br /><span style="color:red;">不返佣</span>
</template>
</td>
<!-- 房间数 -->
......@@ -189,7 +189,8 @@
</td>
<td>
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')"
@input="calculationPrice(subItem)" v-model='childItem.BookNum' :disabled="IsEditHotelPeople==0?true:false">
@input="calculationPrice(subItem)" v-model='childItem.BookNum'
:disabled="IsEditHotelPeople==0?true:false">
</el-input>
</td>
<!-- 尚差房间数 -->
......@@ -229,19 +230,19 @@
<td>
<template v-if="childIndex<4">
<el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')"
v-model='childItem.RebateRatio' @input="SetRebateRatio(subItem,childItem.RebateRatio),calculationPrice(subItem)"
v-model='childItem.RebateRatio'
@input="SetRebateRatio(subItem,childItem.RebateRatio),calculationPrice(subItem)"
:disabled="IsEditHotel==0?true:false"></el-input> %
</template>
<template v-if="childIndex==5">
<template v-if="childIndex==5">
<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 v-if="childIndex==4 && subItem.DriverGuideIsRebate==0">
<el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')"
v-model='childItem.RebateRatio' @input="calculationPrice(subItem)" :disabled="true"></el-input> %
</template>
</td>
<!--返佣金额-->
<td>
......@@ -344,14 +345,14 @@
<td width="70" style="text-align:right;">司导房付款方式：</td>
<td>
<el-select class='w135 sel' v-model='subItem.DMCPayType' :placeholder="$t('pub.pleaseSel')"
:disabled="IsEditHotel==0?true:false" @change="calculationPrice(subItem)">
:disabled="IsEditHotel==0?true:false" @change="calculationPrice(subItem)">
<el-option label='请选择' :value='0'></el-option>
<el-option label='月结' :value='9' ></el-option>
<el-option label='现付' :value='1' ></el-option>
<el-option label='月结' :value='9'></el-option>
<el-option label='现付' :value='1'></el-option>
<el-option label='签单' :value='2'></el-option>
<el-option label='实物抵扣' :value='3' ></el-option>
<el-option label='实物抵扣' :value='3'></el-option>
<el-option label='预付' :value='4'></el-option>
<el-option label='预付款抵扣' :value='5' ></el-option>
<el-option label='预付款抵扣' :value='5'></el-option>
<el-option label='公司合团支付' :value='6'></el-option>
</el-select>
</td>
......@@ -448,6 +449,8 @@
export default {
data() {
return {
//当前登录用户
CurrentUserInfo: {},
defaultSelectValue: 0,
list: [],
roomList: [],
......@@ -470,7 +473,7 @@
loading: false,
boxHeight: 0,
//合团的团期编号
NewTCIDs:"",
NewTCIDs: "",
//供应商列表
SupplierList: [],
ckedHotelId: 0,
......@@ -484,8 +487,8 @@
IsOperation: 1,
LeaderName: "", //领队名称
GuideName: "", //导游名称
IsEditHotelPeople:0,//是否有修改人数权限[0-不能修改，1-可以修改]
IsCombine:false,//是否是合团，true-是合团，false-不是合团
IsEditHotelPeople: 0, //是否有修改人数权限[0-不能修改，1-可以修改]
IsCombine: false, //是否是合团，true-是合团，false-不是合团
}
},
components: {
......@@ -495,12 +498,10 @@
},
methods: {
//付款方式切换
PayChange(subItem)
{
if(subItem.PayStyle>0)
{
subItem.DMCPayType=subItem.PayStyle;
}
PayChange(subItem) {
if (subItem.PayStyle > 0) {
subItem.DMCPayType = subItem.PayStyle;
}
},
//调用子组件方法
GetHotelUsePriceList(HotelId, UseDay, index, hotelSubIndex) {
......@@ -569,14 +570,12 @@
this.$refs[str][0].getCheckHotel();
},
//输入返佣自动前面4个房型赋值
SetRebateRatio(subItem,newValue)
{
subItem.OrderDetailsList.forEach((sItem,sIndex)=>{
if(sIndex<4)
{
sItem.RebateRatio=newValue;
}
});
SetRebateRatio(subItem, newValue) {
subItem.OrderDetailsList.forEach((sItem, sIndex) => {
if (sIndex < 4) {
sItem.RebateRatio = newValue;
}
});
},
DateMinus(sDate) {
var newDate = moment(sDate).format("YYYY-MM-DD");
......@@ -698,19 +697,24 @@
this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', {
TCIDs: this.$route.query.id,
NewCombinationNum: this.$route.query.NewCombinationNum,
IsCombine:this.IsCombine,
NewTCIDs:this.NewTCIDs
IsCombine: this.IsCombine,
NewTCIDs: this.NewTCIDs
}, res => {
if (res.data.resultCode == 1) {
this.IsOperation = res.data.data.IsOperation;
this.IsEditHotel = res.data.data.IsEditHotel;
this.IsEditHotelPeople=res.data.data.IsEditHotelPeople;
this.IsEditHotelPeople = res.data.data.IsEditHotelPeople;
if (this.CurrentUserInfo.EmployeeId == 615) {
this.IsEditHotel = 1;
this.IsEditHotelPeople = 1;
}
let list = res.data.data.HotelOrderListReport;
this.CreateBy = res.data.data.CreateBy;
this.CreateByPhoto = res.data.data.CreateByPhoto;
this.CreateByAccount = res.data.data.CreateByAccount;
if (list != null && list.length > 0) {
list.forEach((item,sIndex) => {
list.forEach((item, sIndex) => {
item.HotelOrderList.forEach(subItem => {
subItem.hotelList.push({
Name: subItem.NewHotelName,
......@@ -730,7 +734,7 @@
})
});
this.list = list;
this.$forceUpdate();
}
} else {
......@@ -742,22 +746,19 @@
calculationPrice(obj) {
let totalPrice = 0;
obj.OrderDetailsList.forEach((item, index) => {
var tempPrice=0;
var coefficient=1;
//税别
if(obj.TaxType == 2)
{
coefficient=1+0.08;
}
if(index==4 && obj.DMCPayType==9)
{
tempPrice=0;
var tempPrice = 0;
var coefficient = 1;
//税别
if (obj.TaxType == 2) {
coefficient = 1 + 0.08;
}
else
{
tempPrice= item.UnitPrice * (item.BookNum - item.HotelDiscount) * (coefficient - item.RebateRatio / 100);
if (index == 4 && obj.DMCPayType == 9) {
tempPrice = 0;
} else {
tempPrice = item.UnitPrice * (item.BookNum - item.HotelDiscount) * (coefficient - item.RebateRatio /
100);
}
totalPrice+=tempPrice;
totalPrice += tempPrice;
})
totalPrice += obj.ParkFee + obj.CityTax + obj.InTangTax;
obj.TotalPrice = totalPrice.toFixed(2);
......@@ -921,13 +922,15 @@
},
},
mounted() {
let userInfo = this.getLocalStorage()
this.CurrentUserInfo = userInfo;
this.LeaderName = this.$route.query.LeaderName;
this.GuideName = this.$route.query.GuideName;
this.TCNUM = this.$route.query.TCNUM;
this.flightTotal = this.$route.query.flightTotal;
this.GuestNum = this.$route.query.GuestNum;
this.IsCombine=this.$route.query.IsCombine;
this.NewTCIDs=this.$route.query.NewTCIDs;
this.IsCombine = this.$route.query.IsCombine;
this.NewTCIDs = this.$route.query.NewTCIDs;
let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 55;
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