Commit a64705f2 authored by 黄奎's avatar 黄奎

页面修改

parent a1db8f15
......@@ -251,7 +251,7 @@
<td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
</tr>
<tr>
<td width="80" class="CP_ComTitle2 CostcomCenter">车资</td>
<td width="80" class="CP_ComTitle2 CostcomCenter">车资</td>
<td width="80" class="CP_ComTitle2 CostcomCenter">过路费</td>
<td width="80" class="CP_ComTitle2 CostcomCenter">人数</td>
<td width="80" class="CP_ComTitle2 CostcomCenter">每人<br />车资</td>
......@@ -1704,8 +1704,6 @@
//其他价格
var otherPrice = Number(that.getCostTotalMoney());
var jpyotherPrice = Number(that.getCostJpyTotalMoney());
console.log("trip", trip)
console.log("otherPrice", otherPrice)
x.TotalMoney = (trip + otherPrice +
Number(that.getConvertMoney(x.SubtotalMoney))
).toFixed(0);
......@@ -1728,31 +1726,21 @@
var wuPrice = Number(this.getDayXiaoJi(5, 2)); //午餐
var wanPrice = Number(this.getDayXiaoJi(6, 2)); //晚餐
var otherPrice = Number(this.getDayXiaoJi(9, 2)); //其它费用
//每人车费
var perBusFee = 0;
if (PeopleNumber > 0) {
perBusFee = (Number(this.getDayXiaoJi(2, 2)) + Number(this.getDayXiaoJi(7, 2))) / Number(PeopleNumber)
.toFixed(0);
}
totalMoney = perBusFee + hotelPrice + sencePrice + zaoPrice + wuPrice + wanPrice + otherPrice;
var busFee = Number(this.getDayXiaoJi(2, 2))+ Number(this.getDayXiaoJi(7, 2)); //车费
totalMoney = busFee + hotelPrice + sencePrice + zaoPrice + wuPrice + wanPrice + otherPrice;
return totalMoney.toFixed(0);
},
//获取地接项目报价
getLocalJpyTotalMoney(PeopleNumber) {
let totalMoney = 0.0;
//每人车费
var perBusFee = 0;
if (PeopleNumber > 0) {
perBusFee = (Number(this.getDayXiaoJi(2, 1)) + Number(this.getDayXiaoJi(7, 1))) / Number(PeopleNumber)
.toFixed(0);
}
var busFee = Number(this.getDayXiaoJi(2, 1))+Number(this.getDayXiaoJi(7, 1)); //车费
var hotelPrice = Number(this.getDayXiaoJi(1, 1)); //酒店费用
var sencePrice = Number(this.getDayXiaoJi(3, 1)); //景点费用
var zaoPrice = Number(this.getDayXiaoJi(4, 1)); //早餐
var wuPrice = Number(this.getDayXiaoJi(5, 1)); //午餐
var wanPrice = Number(this.getDayXiaoJi(6, 1)); //晚餐
var otherPrice = Number(this.getDayXiaoJi(9, 1)); //其它费用
totalMoney = perBusFee + hotelPrice + sencePrice + zaoPrice + wuPrice + wanPrice + otherPrice;
totalMoney = busFee + hotelPrice + sencePrice + zaoPrice + wuPrice + wanPrice + otherPrice;
return totalMoney.toFixed(0);
},
//计算领队分摊
......
......@@ -201,10 +201,10 @@
{{subItem.PassFee}}
</td>
<td>
{{childItem.PeopleNumber}}
{{childItem.PeopleNumber}}
</td>
<td>
{{((Number(subItem.BusCostPrice)+Number(subItem.PassFee))/Number(childItem.PeopleNumber)).toFixed(0)}}
<!-- {{((Number(subItem.BusCostPrice)+Number(subItem.PassFee))/Number(childItem.PeopleNumber)).toFixed(0)}} -->
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{subItem.ScenicCostPrice}}
......@@ -244,10 +244,10 @@
{{getDayXiaoJi(7,1)}}
</td>
<td>
{{childItem.PeopleNumber}}
{{childItem.PeopleNumber}}
</td>
<td>
{{((Number(getDayXiaoJi(2,1))+Number(getDayXiaoJi(7,1)))/Number(childItem.PeopleNumber)).toFixed(0)}}
<!-- {{((Number(getDayXiaoJi(2,1))+Number(getDayXiaoJi(7,1)))/Number(childItem.PeopleNumber)).toFixed(0)}} -->
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(3,1)}}
......@@ -285,10 +285,10 @@
{{getDayXiaoJi(7,2)}}
</td>
<td>
{{childItem.PeopleNumber}}
{{childItem.PeopleNumber}}
</td>
<td>
{{((Number(getDayXiaoJi(2,2))+Number(getDayXiaoJi(7,2)))/Number(childItem.PeopleNumber)).toFixed(0)}}
<!-- {{((Number(getDayXiaoJi(2,2))+Number(getDayXiaoJi(7,2)))/Number(childItem.PeopleNumber)).toFixed(0)}} -->
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(3,2)}}
......@@ -339,13 +339,13 @@
</td>
<td>
<template v-if="CostNumberList&&CostNumberList.length>0">
{{CostNumberList[0].PeopleNumber}}
{{CostNumberList[0].PeopleNumber}}
</template>
</td>
<td>
<template v-if="CostNumberList&&CostNumberList.length>0">
<!-- <template v-if="CostNumberList&&CostNumberList.length>0">
{{((Number(subItem.BusCostPrice)+Number(subItem.PassFee))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
</template>
</template> -->
</td>
<td>
{{subItem.ScenicCostPrice}}
......@@ -381,7 +381,7 @@
</td>
<td>
<template v-if="CostNumberList&&CostNumberList.length>0">
{{CostNumberList[0].PeopleNumber}}
{{CostNumberList[0].PeopleNumber}}
</template>
</td>
<td>
......
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