Skip to content

S
SuperMan
Commit 4f728bf3 authored by 沈良进's avatar 沈良进
Browse files
Options

save

parent 4fa75ef3
Show whitespace changes
Inline Side-by-side
Showing with 286 additions and 25 deletions
src/components/Hotel/roomReservationsDetailsNew.vue
View file @ 4f728bf3
......@@ -1040,23 +1040,25 @@
let jpaObj = this.allCurrencyList.find(item => {
return item.ID === 3; //筛选出匹配数据
});
obj.OrderDetailsList.forEach((item, index) => {
var tempPrice = 0;
var coefficient = 1;
//税别
if (obj.TaxType == 2) {
coefficient = 1 + this.XiaoFeiTaxFee;
}
if (index == 4 && obj.DMCPayType == 9) {
tempPrice = 0;
} else {
tempPrice = item.UnitPrice * (item.BookNum - item.HotelDiscount) * (coefficient - item.RebateRatio /
100);
}
totalPrice += tempPrice;
})
totalPrice += obj.ParkFee + obj.CityTax + obj.InTangTax;
obj.TotalPrice = totalPrice.toFixed(2);
// obj.OrderDetailsList.forEach((item, index) => {
// var tempPrice = 0;
// var coefficient = 1;
// //税别
// if (obj.TaxType == 2) {
// coefficient = 1 + this.XiaoFeiTaxFee;
// }
// if (index == 4 && obj.DMCPayType == 9) {
// tempPrice = 0;
// } else {
// tempPrice = item.UnitPrice * (item.BookNum - item.HotelDiscount) * (coefficient - item.RebateRatio /
// 100);
// }
// totalPrice += tempPrice;
// })
// totalPrice += obj.ParkFee + obj.CityTax + obj.InTangTax;
const item = obj.OrderDetailsList.find(item => item.HouseType === 2) || {TotalPrice: 0}
console.log(item, obj.OrderDetailsList)
obj.TotalPrice = item.TotalPrice.toFixed(2);
if (this.LineId == 14) {
if (currentObj && currentObj.ID > 0) {
//人民币
......@@ -1080,7 +1082,7 @@
}
}
// 将金额总计的值赋值给金额小计
obj.OrderDetailsList[0].TotalPrice = Number(totalPrice).toFixed(2);
obj.OrderDetailsList[0].TotalPrice = Number(obj.TotalPrice).toFixed(2);
this.$forceUpdate();
},
changeTotalPrice(obj) {
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 4f728bf3
......@@ -189,7 +189,7 @@
</tr>
</template>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<table v-if="[131,14, 90].includes(myLineId)" class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th colspan="26" class="bgwhite">酒店使用 </th>
</tr>
......@@ -438,6 +438,250 @@
</td>
</tr>
</table>
<table v-else class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th colspan="26" class="bgwhite">酒店使用 </th>
</tr>
<tr>
<th colspan="26" class="bgwhite">
税别计算: 单价 * (预订人数-免减人数) * (1 + 0.10 - 返佣比例 / 100) <br />
税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)<br />
司导间【月结】不计入总金额
</th>
</tr>
<tr class="title">
<th width="90">使用时间</th>
<th width="150">酒店名称</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">房间数</th>
<th width="60">预定<br />人数</th>
<th width="60">免费<br />人数</th>
<th width="60">单价/人</th>
<th width="60">金额<br />小计</th>
<th width="60">返佣<br />类型</th>
<th width="60">返佣</th>
<th width="60">返佣<br />金额</th>
<th width="60">入汤税</th>
<th width="60">城市税</th>
<th width="60">停车费</th>
<th width="60">税入<br />税别</th>
<th width="60">总金额</th>
<th width="60">付款<br />方式</th>
<th width="60">币种</th>
<th width="60">司导间<br />付款方式</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
style="white-space:nowrap; ">{{outItem.UseTimeStr}}
</td>
<td style="text-align:left; ">
<template v-if="subItem.HotelName!=subItem.NewHotelName && subItem.NewHotelName!=''">
<span style="text-decoration:line-through"> {{subItem.HotelName}}</span>
</template>
<template v-else>
{{subItem.HotelName}}
</template>
</td>
<td style="text-align:left; ">
<a target="_blank" v-if="subItem.ContractUrl!==''" :href="subItem.ContractUrl"
style="text-decoration: underline; cursor: pointer;color:red">查看手配书</a>
</td>
<td style="text-align:left;color:red; ">
{{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}}
</td>
<td >
{{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}
</td>
<td >
{{subItem.RealityHouseTypeCount}}
</td>
<td >
<span v-if="childItem.HouseType === 1">单间</span>
<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">
司导间
<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}}
</td>
<td >
{{childItem.BookNum}}
</td>
<td >
{{childItem.HotelDiscount}}
</td>
<td style="white-space:nowrap; " >
<p class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'roomReservationsDetails')">
{{moneyFormat(childItem.UnitPrice)}}
</p>
</td>
<td style="white-space:nowrap; " >
{{childItem.TotalPrice}}
</td>
<td >
<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 style="white-space:nowrap; " >
<!--含税-->
<template v-if="subItem.RebateType==1">
<!--税别-->
<template v-if="subItem.TaxType==2">
{{ (childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.1 )*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
<template v-else>
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2) }}
</template>
</template>
<!--不含税-->
<template v-else>
<!--税别-->
<template v-if="subItem.TaxType==2">
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.1)*( 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 >
{{subItem.InTangTax}}
</td>
<td >
{{subItem.CityTax}}
</td>
<td >
{{subItem.ParkFee}}
</td>
<td >
<template v-if="subItem.TaxType==1">
税入
</template>
<template v-if="subItem.TaxType==2">
税别
</template>
</td>
<td style="white-space:nowrap; ">
{{childItem.TotalPrice}}
</td>
<td >
<span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">签单</span>
<span v-else-if="subItem.PayStyle === 3">实物抵扣</span>
<span v-else-if="subItem.PayStyle === 4">预付</span>
<span v-else-if="subItem.PayStyle === 5">预付款抵扣</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else-if="subItem.PayStyle === 9">月结</span>
<span v-else-if="subItem.PayStyle === 11">刷卡</span>
<span v-else-if="subItem.PayStyle === 10">领队导游垫付</span>
<span v-else></span>
<br />
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td >
<template v-if="IsShowRMB">
<span>人民币</span>
</template>
<template v-else>
{{GetCurrency(subItem.CurrencyId)}}
</template>
</td>
<td >
<span v-if="subItem.DMCPayType === 1">现付</span>
<span v-else-if="subItem.DMCPayType === 2">签单</span>
<span v-else-if="subItem.DMCPayType === 3">实物抵扣</span>
<span v-else-if="subItem.DMCPayType === 4">预付</span>
<span v-else-if="subItem.DMCPayType === 5">预付款抵扣</span>
<span v-else-if="subItem.DMCPayType === 6">公司合团支付</span>
<span v-else-if="subItem.DMCPayType === 9">月结</span>
<span v-else-if="subItem.DMCPayType === 11">刷卡</span>
<span v-else-if="subItem.DMCPayType === 10">领队导游垫付</span>
<br />
<span v-show="subItem.DMCPayType==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td >
<span>{{subItem.SupplierName}}
<br />
<template v-if="subItem.SupplierPayType !== 0">
<span v-if="subItem.SupplierPayType == 1"> 现付 </span>
<span v-else-if="subItem.SupplierPayType == 2">签单</span>
<span v-else-if="subItem.SupplierPayType == 3">实物抵扣</span>
<span v-else-if="subItem.SupplierPayType == 4"> 预付</span>
<span v-else-if="subItem.SupplierPayType == 5">预付款抵扣</span>
<span v-else-if="subItem.SupplierPayType == 6">公司合团支付</span>
<span v-else-if="subItem.SupplierPayType == 9">月结</span>
<span v-else-if="subItem.SupplierPayType == 11">刷卡</span>
<span v-else-if="subItem.SupplierPayType == 10">领队导游垫付</span>
</template>
</span>
<div v-if="subItem.IsHaveShouPeiFee==0" style="color:red;">无手配费</div>
<div v-if="subItem.IsHaveShouPeiFee==1" style="color:red;">手配费:{{subItem.ShouPeiMoney}}</div>
</td>
<td >
<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 >
{{subItem.Remarks}}
</td>
</tr>
</template>
</template>
<tr v-if="TotalNav.planPriceList">
<td>总金额</td>
<td colspan="25">
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==1">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> (
<template v-if="IsShowRMB">
<span>人民币</span>
</template>
<template v-else>
{{plan.CurrencyName}}
</template>
) </span>
</span>
</td>
</tr>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th colspan="13" class="bgwhite">餐食使用</th>
......@@ -1413,6 +1657,13 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.list = res.data.data;
if(![131,14, 90].includes(this.myLineId)) {
this.list.HotelOrderListReport.forEach(item => {
item.HotelOrderList.forEach(item => {
item.OrderDetailsList = item.OrderDetailsList.filter(item => item.HouseType === 2)
})
})
}
this.ContractUrlCount = res.data.data.ContractUrlCount;
this.UseCount = this.list.UseCount;
if (
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 4f728bf3
......@@ -388,7 +388,7 @@
</div>
</td>
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
<span @click="showDialog(0, item.OfferId)" style="cursor: pointer">{{item.OfferId}}</span>
<span @click="showDialog(0, item.OfferId)" style="cursor: pointer" v-if="item.OfferId">报价单</span>
</td>
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0' style="width: 150px;">
<el-popover width="100" trigger="click" popper-class="DMC_HotelPop">
......
src/components/leaderPay2.vue
View file @ 4f728bf3
......@@ -624,11 +624,13 @@
<span style="color:red"> 不含税</span>
</template>
</td>
<td>
{{moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount))}}
<td v-if="subItem.OrderDetailsList.length === 1">
{{subItem.OrderDetailsList[0].TotalPrice ? subItem.OrderDetailsList[0].TotalPrice : moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount))}}
</td>
<td v-else>
{{moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount))}}</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
{{hotelTotalPrice(subItem.OrderDetailsList)}}
{{hotelTotalPrice(subItem.OrderDetailsList, subItem)}}
</td>
<td v-if="subIndex==0 && childIndex == 0" :rowspan="item.row">{{subItem.TradingTotalPrice}}</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
......@@ -2176,7 +2178,7 @@
this.apipost('dmcstatistics_post_GetNewLeaderPayStatics_V1', this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
console.log('dmcstatistics_post_GetNewLeaderPayStatics_V1', res.data.data)
this.list = res.data.data;
// 预计金额
this.planPriceList = this.list.planPriceList;
......@@ -2346,6 +2348,7 @@
Hoteldest[i].row = row
}
this.HotelDataList = this.unique(Hoteldest, 'id');
console.log('dmcstatistics_post_GetNewLeaderPayStatics_V1 result', this.list)
} else {
this.$message.error(res.data.message);
}
......@@ -2387,7 +2390,8 @@
}
return this.moneyFormat(totalPrice)
},
hotelTotalPrice(obj) {
hotelTotalPrice(obj, data) {
console.log('hotelTotalPrice', obj, data)
let totalPrice = 0
obj.forEach(x => {
if (x.PayStyle === 1) {
......@@ -2396,6 +2400,10 @@
totalPrice += 0
}
})
// 新版，直接使用后端返回的价格
if(obj.length === 1 && obj[0].TotalPrice) {
totalPrice = obj[0].TotalPrice
}
return this.moneyFormat(totalPrice)
},
getzongJE() {
......
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