Commit 2b16349c authored by 黄奎's avatar 黄奎

页面修改

parent 669d067e
...@@ -26,8 +26,8 @@ ...@@ -26,8 +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 + 0.08 - 返佣比例 / 100) <br />
税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100) <br/> 税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100) <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'}"
...@@ -189,7 +189,8 @@ ...@@ -189,7 +189,8 @@
</td> </td>
<td> <td>
<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' :disabled="IsEditHotelPeople==0?true:false"> @input="calculationPrice(subItem)" v-model='childItem.BookNum'
:disabled="IsEditHotelPeople==0?true:false">
</el-input> </el-input>
</td> </td>
<!-- 尚差房间数 --> <!-- 尚差房间数 -->
...@@ -229,13 +230,13 @@ ...@@ -229,13 +230,13 @@
<td> <td>
<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' @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> % :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)" v-model='childItem.RebateRatio' @input="calculationPrice(subItem)" :disabled="true"></el-input> %
: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')"
...@@ -346,12 +347,12 @@ ...@@ -346,12 +347,12 @@
<el-select class='w135 sel' v-model='subItem.DMCPayType' :placeholder="$t('pub.pleaseSel')" <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='0'></el-option>
<el-option label='月结' :value='9' ></el-option> <el-option label='月结' :value='9'></el-option>
<el-option label='现付' :value='1' ></el-option> <el-option label='现付' :value='1'></el-option>
<el-option label='签单' :value='2'></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='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-option label='公司合团支付' :value='6'></el-option>
</el-select> </el-select>
</td> </td>
...@@ -448,6 +449,8 @@ ...@@ -448,6 +449,8 @@
export default { export default {
data() { data() {
return { return {
//当前登录用户
CurrentUserInfo: {},
defaultSelectValue: 0, defaultSelectValue: 0,
list: [], list: [],
roomList: [], roomList: [],
...@@ -470,7 +473,7 @@ ...@@ -470,7 +473,7 @@
loading: false, loading: false,
boxHeight: 0, boxHeight: 0,
//合团的团期编号 //合团的团期编号
NewTCIDs:"", NewTCIDs: "",
//供应商列表 //供应商列表
SupplierList: [], SupplierList: [],
ckedHotelId: 0, ckedHotelId: 0,
...@@ -484,8 +487,8 @@ ...@@ -484,8 +487,8 @@
IsOperation: 1, IsOperation: 1,
LeaderName: "", //领队名称 LeaderName: "", //领队名称
GuideName: "", //导游名称 GuideName: "", //导游名称
IsEditHotelPeople:0,//是否有修改人数权限[0-不能修改,1-可以修改] IsEditHotelPeople: 0, //是否有修改人数权限[0-不能修改,1-可以修改]
IsCombine:false,//是否是合团,true-是合团,false-不是合团 IsCombine: false, //是否是合团,true-是合团,false-不是合团
} }
}, },
components: { components: {
...@@ -495,11 +498,9 @@ ...@@ -495,11 +498,9 @@
}, },
methods: { methods: {
//付款方式切换 //付款方式切换
PayChange(subItem) PayChange(subItem) {
{ if (subItem.PayStyle > 0) {
if(subItem.PayStyle>0) subItem.DMCPayType = subItem.PayStyle;
{
subItem.DMCPayType=subItem.PayStyle;
} }
}, },
//调用子组件方法 //调用子组件方法
...@@ -569,12 +570,10 @@ ...@@ -569,12 +570,10 @@
this.$refs[str][0].getCheckHotel(); this.$refs[str][0].getCheckHotel();
}, },
//输入返佣自动前面4个房型赋值 //输入返佣自动前面4个房型赋值
SetRebateRatio(subItem,newValue) SetRebateRatio(subItem, newValue) {
{ subItem.OrderDetailsList.forEach((sItem, sIndex) => {
subItem.OrderDetailsList.forEach((sItem,sIndex)=>{ if (sIndex < 4) {
if(sIndex<4) sItem.RebateRatio = newValue;
{
sItem.RebateRatio=newValue;
} }
}); });
}, },
...@@ -698,19 +697,24 @@ ...@@ -698,19 +697,24 @@
this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', { this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', {
TCIDs: this.$route.query.id, TCIDs: this.$route.query.id,
NewCombinationNum: this.$route.query.NewCombinationNum, NewCombinationNum: this.$route.query.NewCombinationNum,
IsCombine:this.IsCombine, IsCombine: this.IsCombine,
NewTCIDs:this.NewTCIDs NewTCIDs: this.NewTCIDs
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.IsOperation = res.data.data.IsOperation; this.IsOperation = res.data.data.IsOperation;
this.IsEditHotel = res.data.data.IsEditHotel; 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; let list = res.data.data.HotelOrderListReport;
this.CreateBy = res.data.data.CreateBy; this.CreateBy = res.data.data.CreateBy;
this.CreateByPhoto = res.data.data.CreateByPhoto; this.CreateByPhoto = res.data.data.CreateByPhoto;
this.CreateByAccount = res.data.data.CreateByAccount; this.CreateByAccount = res.data.data.CreateByAccount;
if (list != null && list.length > 0) { if (list != null && list.length > 0) {
list.forEach((item,sIndex) => { list.forEach((item, sIndex) => {
item.HotelOrderList.forEach(subItem => { item.HotelOrderList.forEach(subItem => {
subItem.hotelList.push({ subItem.hotelList.push({
Name: subItem.NewHotelName, Name: subItem.NewHotelName,
...@@ -742,22 +746,19 @@ ...@@ -742,22 +746,19 @@
calculationPrice(obj) { calculationPrice(obj) {
let totalPrice = 0; let totalPrice = 0;
obj.OrderDetailsList.forEach((item, index) => { obj.OrderDetailsList.forEach((item, index) => {
var tempPrice=0; var tempPrice = 0;
var coefficient=1; var coefficient = 1;
//税别 //税别
if(obj.TaxType == 2) if (obj.TaxType == 2) {
{ coefficient = 1 + 0.08;
coefficient=1+0.08;
} }
if(index==4 && obj.DMCPayType==9) if (index == 4 && obj.DMCPayType == 9) {
{ tempPrice = 0;
tempPrice=0; } else {
} tempPrice = item.UnitPrice * (item.BookNum - item.HotelDiscount) * (coefficient - item.RebateRatio /
else 100);
{
tempPrice= item.UnitPrice * (item.BookNum - item.HotelDiscount) * (coefficient - item.RebateRatio / 100);
} }
totalPrice+=tempPrice; totalPrice += tempPrice;
}) })
totalPrice += obj.ParkFee + obj.CityTax + obj.InTangTax; totalPrice += obj.ParkFee + obj.CityTax + obj.InTangTax;
obj.TotalPrice = totalPrice.toFixed(2); obj.TotalPrice = totalPrice.toFixed(2);
...@@ -921,13 +922,15 @@ ...@@ -921,13 +922,15 @@
}, },
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage()
this.CurrentUserInfo = userInfo;
this.LeaderName = this.$route.query.LeaderName; this.LeaderName = this.$route.query.LeaderName;
this.GuideName = this.$route.query.GuideName; this.GuideName = this.$route.query.GuideName;
this.TCNUM = this.$route.query.TCNUM; this.TCNUM = this.$route.query.TCNUM;
this.flightTotal = this.$route.query.flightTotal; this.flightTotal = this.$route.query.flightTotal;
this.GuestNum = this.$route.query.GuestNum; this.GuestNum = this.$route.query.GuestNum;
this.IsCombine=this.$route.query.IsCombine; this.IsCombine = this.$route.query.IsCombine;
this.NewTCIDs=this.$route.query.NewTCIDs; this.NewTCIDs = this.$route.query.NewTCIDs;
let width = window.innerWidth - 50; let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 55; let height = window.innerHeight - 65 - 55;
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