Skip to content

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

页面修改

parent f612518c
Show whitespace changes
Inline Side-by-side
Showing with 110 additions and 63 deletions
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @ d264972e
...@@ -276,7 +276,7 @@ ...@@ -276,7 +276,7 @@
{{childItem.PeopleNumber}} {{childItem.PeopleNumber}}
</td> </td>
<td> <td>
{{Number(subItem.BusCostPrice)/Number(childItem.PeopleNumber)}} {{(Number(subItem.BusCostPrice)/Number(childItem.PeopleNumber)).toFixed(0)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
<el-input type='text' v-model="subItem.ScenicCostPrice" class="w70" <el-input type='text' v-model="subItem.ScenicCostPrice" class="w70"
...@@ -303,10 +303,7 @@ ...@@ -303,10 +303,7 @@
<tr> <tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0" <td colspan="3" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0"
:rowspan="CostNumberList.length"> :rowspan="CostNumberList.length">
<template v-if="dayCostPrice&&dayCostPrice.length>0"> 外币小计
<span>{{getCurrencyName(dayCostPrice[0].CurrencyId)}}</span>
</template>
小计
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(1,1)}} {{getDayXiaoJi(1,1)}}
...@@ -318,7 +315,7 @@ ...@@ -318,7 +315,7 @@
{{childItem.PeopleNumber}} {{childItem.PeopleNumber}}
</td> </td>
<td> <td>
{{(Number(getDayXiaoJi(2,1))/Number(childItem.PeopleNumber)).toFixed(2)}} {{(Number(getDayXiaoJi(2,1))/Number(childItem.PeopleNumber)).toFixed(0)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(3,1)}} {{getDayXiaoJi(3,1)}}
...@@ -338,7 +335,7 @@ ...@@ -338,7 +335,7 @@
<tr> <tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0" <td colspan="3" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0"
:rowspan="CostNumberList.length"> :rowspan="CostNumberList.length">
人民币 小计 人民币小计
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(1,2)}} {{getDayXiaoJi(1,2)}}
...@@ -350,7 +347,7 @@ ...@@ -350,7 +347,7 @@
{{childItem.PeopleNumber}} {{childItem.PeopleNumber}}
</td> </td>
<td> <td>
{{(Number(getDayXiaoJi(2,2))/Number(childItem.PeopleNumber)).toFixed(2)}} {{(Number(getDayXiaoJi(2,2))/Number(childItem.PeopleNumber)).toFixed(0)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(3,2)}} {{getDayXiaoJi(3,2)}}
...@@ -401,7 +398,7 @@ ...@@ -401,7 +398,7 @@
</td> </td>
<td> <td>
<template v-if="CostNumberList&&CostNumberList.length>0"> <template v-if="CostNumberList&&CostNumberList.length>0">
{{Number(subItem.BusCostPrice)/Number(CostNumberList[0].PeopleNumber)}} {{(Number(subItem.BusCostPrice)/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
</template> </template>
</td> </td>
<td> <td>
...@@ -424,10 +421,7 @@ ...@@ -424,10 +421,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter"> <td colspan="3" class="CP_ComTitle2 CostcomCenter">
<template v-if="dayCostPrice&&dayCostPrice.length>0"> 外币小计
<span>{{getCurrencyName(dayCostPrice[0].CurrencyId)}}</span>
</template>
小计
</td> </td>
<td> <td>
{{getDayXiaoJi(1,1)}} {{getDayXiaoJi(1,1)}}
...@@ -442,7 +436,7 @@ ...@@ -442,7 +436,7 @@
</td> </td>
<td> <td>
<template v-if="CostNumberList&&CostNumberList.length>0"> <template v-if="CostNumberList&&CostNumberList.length>0">
{{(Number(getDayXiaoJi(2,1))/Number(CostNumberList[0].PeopleNumber)).toFixed(2)}} {{(Number(getDayXiaoJi(2,1))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
</template> </template>
</td> </td>
<td> <td>
...@@ -460,7 +454,7 @@ ...@@ -460,7 +454,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter"> <td colspan="3" class="CP_ComTitle2 CostcomCenter">
人民币 小计 人民币小计
</td> </td>
<td> <td>
{{getDayXiaoJi(1,2)}} {{getDayXiaoJi(1,2)}}
...@@ -475,7 +469,7 @@ ...@@ -475,7 +469,7 @@
</td> </td>
<td> <td>
<template v-if="CostNumberList&&CostNumberList.length>0"> <template v-if="CostNumberList&&CostNumberList.length>0">
{{(Number(getDayXiaoJi(2,2))/Number(CostNumberList[0].PeopleNumber)).toFixed(2)}} {{(Number(getDayXiaoJi(2,2))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
</template> </template>
</td> </td>
<td> <td>
...@@ -634,40 +628,30 @@ ...@@ -634,40 +628,30 @@
</tr> </tr>
<tr> <tr>
<td class="CP_ComTitle2"> <td class="CP_ComTitle2">
小计 外币小计
</td> </td>
<td colspan="4"> <td colspan="4">
{{Number(OtherPrice.InlandAirTicketMoney)+Number(OtherPrice.InlandShipTicketMoney)+Number(OtherPrice.InlandTrainTicketMoney)}} {{trafficXiaoJi(2)}}
</td> </td>
<td class="CP_ComTitle2"> <td class="CP_ComTitle2">
小计 外币小计
</td> </td>
<td colspan="5"> <td colspan="5">
{{Number(OtherPrice.VisaMoney)+Number(OtherPrice.SafeMoney)+Number(OtherPrice.LeaderTripMoney)+Number(OtherPrice.DriverGuideMoney)}} {{zazhiXiaoJi(2)}}
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="CP_ComTitle2"> <td class="CP_ComTitle2">
人民币 小计 人民币小计
</td> </td>
<td colspan="4"> <td colspan="4">
{{ {{ trafficXiaoJi(1) }}
(Number(OtherPrice.InlandAirTicketMoney)*Number(getCurrencyMoney(OtherPrice.InlandAirTicketCurrency))
+Number(OtherPrice.InlandShipTicketMoney)*Number(getCurrencyMoney(OtherPrice.InlandShipTicketCurrency))
+Number(OtherPrice.InlandTrainTicketMoney)*Number(getCurrencyMoney(OtherPrice.InlandTrainTicketCurrency))
).toFixed(2)
}}
</td> </td>
<td class="CP_ComTitle2"> <td class="CP_ComTitle2">
人民币 小计 人民币小计
</td> </td>
<td colspan="5"> <td colspan="5">
{{ ( Number(OtherPrice.VisaMoney)*Number(getCurrencyMoney(OtherPrice.VisaMoneyCurrencyId)) {{zazhiXiaoJi(1)}}
+Number(OtherPrice.SafeMoney)*Number(getCurrencyMoney(OtherPrice.SafeMoneyCurrencyId))
+Number(OtherPrice.LeaderTripMoney)*Number(getCurrencyMoney(OtherPrice.LeaderTripMoneyCurrencyId))
+Number(OtherPrice.DriverGuideMoney)*Number(getCurrencyMoney(OtherPrice.DriverGuideMoneyCurrencyId))
).toFixed(2)
}}
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -675,19 +659,19 @@ ...@@ -675,19 +659,19 @@
</tr> </tr>
<tr> <tr>
<td class="CP_ComTitle2" colspan="2">其他支出</td> <td class="CP_ComTitle2" colspan="2">其他支出</td>
<td class="CP_ComTitle2" colspan="3">机票</td> <td class="CP_ComTitle2" colspan="3" style="display:none;">机票</td>
<td class="CP_ComTitle2" colspan="3">收入</td> <td class="CP_ComTitle2" colspan="3">收入</td>
<td class="CP_ComTitle2" colspan="3">团负费</td> <td class="CP_ComTitle2" colspan="6">团负费</td>
</tr> </tr>
<tr> <tr>
<td class="CP_ComTitle2 CostcomCenter">摘要</td> <td class="CP_ComTitle2 CostcomCenter">摘要</td>
<td class="CP_ComTitle2 CostcomCenter">金额<br />(人民币)</td> <td class="CP_ComTitle2 CostcomCenter">金额<br />(人民币)</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="2">摘要</td> <td class="CP_ComTitle2 CostcomCenter" colspan="2" style="display:none;">摘要</td>
<td class="CP_ComTitle2 CostcomCenter">金额<br />(人民币)</td> <td class="CP_ComTitle2 CostcomCenter" style="display:none;">金额<br />(人民币)</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="2">摘要</td> <td class="CP_ComTitle2 CostcomCenter" colspan="2">摘要</td>
<td class="CP_ComTitle2 CostcomCenter">金额<br />(人民币)</td> <td class="CP_ComTitle2 CostcomCenter">金额<br />(人民币)</td>
<td class="CP_ComTitle2 CostcomCenter">摘要</td> <td class="CP_ComTitle2 CostcomCenter">摘要</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="2">金额<br />(人民币)</td> <td class="CP_ComTitle2 CostcomCenter" colspan="5">金额<br />(人民币)</td>
</tr> </tr>
<tr> <tr>
<td style="white-space:nowrap; " class="CP_ComTitle2">销售提成1%</td> <td style="white-space:nowrap; " class="CP_ComTitle2">销售提成1%</td>
...@@ -697,8 +681,8 @@ ...@@ -697,8 +681,8 @@
@keyup.native="checkPrice(OtherPrice,'SalesCommissionMoney'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'SalesCommissionMoney'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td class="CP_ComTitle2" colspan="2">机票</td> <td class="CP_ComTitle2" colspan="2" style="display:none;">机票</td>
<td> <td style="display:none;">
<el-form-item> <el-form-item>
<el-input type='text' class="w70" v-model="OtherPrice.AirTicketMoeny" <el-input type='text' class="w70" v-model="OtherPrice.AirTicketMoeny"
@keyup.native="checkPrice(OtherPrice,'AirTicketMoeny'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'AirTicketMoeny'),getchange()"></el-input>
...@@ -712,7 +696,7 @@ ...@@ -712,7 +696,7 @@
</el-form-item> </el-form-item>
</td> </td>
<td class="CP_ComTitle2">KB</td> <td class="CP_ComTitle2">KB</td>
<td colspan="2"> <td colspan="5">
<el-form-item> <el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.KBMoney" <el-input type='text' class="w120" v-model="OtherPrice.KBMoney"
@keyup.native="checkPrice(OtherPrice,'KBMoney',true)"></el-input> @keyup.native="checkPrice(OtherPrice,'KBMoney',true)"></el-input>
...@@ -727,7 +711,7 @@ ...@@ -727,7 +711,7 @@
@keyup.native="checkPrice(OtherPrice,'OfficeCommissionMoney'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'OfficeCommissionMoney'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="3"></td> <td colspan="3" style="display:none;"></td>
<td class="CP_ComTitle2" colspan="2">导游人头费</td> <td class="CP_ComTitle2" colspan="2">导游人头费</td>
<td> <td>
<el-form-item> <el-form-item>
...@@ -735,35 +719,34 @@ ...@@ -735,35 +719,34 @@
@keyup.native="checkPrice(OtherPrice,'GuidePeopleMoney'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'GuidePeopleMoney'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="3"></td> <td colspan="6"></td>
</tr> </tr>
<tr> <tr>
<td class="CP_ComTitle2"> <td class="CP_ComTitle2">
小计 人民币小计
</td> </td>
<td> <td>
{{Number(OtherPrice.SalesCommissionMoney)+Number(OtherPrice.OfficeCommissionMoney)}} {{Number(OtherPrice.SalesCommissionMoney)+Number(OtherPrice.OfficeCommissionMoney)}}
</td> </td>
<td class="CP_ComTitle2"> <td class="CP_ComTitle2" style="display:none;">
小计 人民币小计
</td> </td>
<td colspan="2"> <td colspan="2" style="display:none;">
{{Number(OtherPrice.AirTicketMoeny)}} {{Number(OtherPrice.AirTicketMoeny)}}
</td> </td>
<td class="CP_ComTitle2"> <td class="CP_ComTitle2">
小计 人民币小计
</td> </td>
<td colspan="2"> <td colspan="2">
{{Number(OtherPrice.TripMoney)+Number(OtherPrice.GuidePeopleMoney)}} {{Number(OtherPrice.TripMoney)+Number(OtherPrice.GuidePeopleMoney)}}
</td> </td>
<td class="CP_ComTitle2"> <td class="CP_ComTitle2">
小计 人民币小计
</td> </td>
<td colspan="2"> <td colspan="6">
{{Number(OtherPrice.KBMoney)}} {{Number(OtherPrice.KBMoney)}}
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="12"></td> <td colspan="12"></td>
</tr> </tr>
...@@ -885,6 +868,71 @@ ...@@ -885,6 +868,71 @@
}, },
methods: { methods: {
//交通部分小计
trafficXiaoJi(currencyType) {
var trafficTotal = 0;
//人民币
if (currencyType == 1) {
if (this.OtherPrice.InlandAirTicketCurrency == 1) {
trafficTotal += Number(this.OtherPrice.InlandAirTicketMoney);
}
if (this.OtherPrice.InlandShipTicketCurrency == 1) {
trafficTotal += Number(this.OtherPrice.InlandShipTicketMoney);
}
if (this.OtherPrice.InlandTrainTicketCurrency == 1) {
trafficTotal += Number(this.OtherPrice.InlandTrainTicketMoney);
}
}
//外币
else {
if (this.OtherPrice.InlandAirTicketCurrency != 1) {
trafficTotal += Number(this.OtherPrice.InlandAirTicketMoney);
}
if (this.OtherPrice.InlandShipTicketCurrency != 1) {
trafficTotal += Number(this.OtherPrice.InlandShipTicketMoney);
}
if (this.OtherPrice.InlandTrainTicketCurrency != 1) {
trafficTotal += Number(this.OtherPrice.InlandTrainTicketMoney);
}
}
return trafficTotal.toFixed(0);
},
//杂支小计
zazhiXiaoJi(currencyType) {
var zazhiTotal = 0;
//人民币
if (currencyType == 1) {
if (this.OtherPrice.VisaMoneyCurrencyId == 1) {
zazhiTotal += Number(this.OtherPrice.VisaMoney);
}
if (this.OtherPrice.SafeMoneyCurrencyId == 1) {
zazhiTotal += Number(this.OtherPrice.SafeMoney);
}
if (this.OtherPrice.LeaderTripMoneyCurrencyId == 1) {
zazhiTotal += Number(this.OtherPrice.LeaderTripMoney);
}
if (this.OtherPrice.DriverGuideMoneyCurrencyId == 1) {
zazhiTotal += Number(this.OtherPrice.DriverGuideMoney);
}
}
//外币
else {
if (this.OtherPrice.VisaMoneyCurrencyId != 1) {
zazhiTotal += Number(this.OtherPrice.VisaMoney);
}
if (this.OtherPrice.SafeMoneyCurrencyId != 1) {
zazhiTotal += Number(this.OtherPrice.SafeMoney);
}
if (this.OtherPrice.LeaderTripMoneyCurrencyId != 1) {
zazhiTotal += Number(this.OtherPrice.LeaderTripMoney);
}
if (this.OtherPrice.DriverGuideMoneyCurrencyId != 1) {
zazhiTotal += Number(this.OtherPrice.DriverGuideMoney);
}
}
return zazhiTotal.toFixed(0);
},
//每天小计 //每天小计
getDayXiaoJi(type, currencyType) { getDayXiaoJi(type, currencyType) {
var xiaoJi = 0; var xiaoJi = 0;
...@@ -918,7 +966,7 @@ ...@@ -918,7 +966,7 @@
xiaoJi += Number(item.DinnerCostPrice) * Number(currencyRate); xiaoJi += Number(item.DinnerCostPrice) * Number(currencyRate);
} }
}); });
return xiaoJi.toFixed(2); return xiaoJi.toFixed(0);
}, },
//获取汇率 //获取汇率
getCurrencyMoney(currencyId) { getCurrencyMoney(currencyId) {
...@@ -968,14 +1016,13 @@ ...@@ -968,14 +1016,13 @@
getCostTotalMoney() { getCostTotalMoney() {
let totalMoney = let totalMoney =
this.getConvertMoney(this.OtherPrice.InlandAirTicketMoney) * this.getConvertMoney(this.OtherPrice.InlandAirTicketMoney) *
this.getCurrencyMoney( this.OtherPrice.InlandAirTicketCurrency) + this.getCurrencyMoney(this.OtherPrice.InlandAirTicketCurrency) +
this.getConvertMoney(this.OtherPrice.InlandShipTicketMoney) * this.getConvertMoney(this.OtherPrice.InlandShipTicketMoney) *
this.getCurrencyMoney( this.getCurrencyMoney(
this.OtherPrice.InlandShipTicketCurrency this.OtherPrice.InlandShipTicketCurrency
) + ) +
this.getConvertMoney(this.OtherPrice.InlandTrainTicketMoney) * this.getConvertMoney(this.OtherPrice.InlandTrainTicketMoney) *
this.getCurrencyMoney( this.OtherPrice.InlandTrainTicketCurrency) this.getCurrencyMoney(this.OtherPrice.InlandTrainTicketCurrency) +
+
this.getConvertMoney(this.OtherPrice.DriverGuideMoney) * this.getCurrencyMoney( this.getConvertMoney(this.OtherPrice.DriverGuideMoney) * this.getCurrencyMoney(
this.OtherPrice.DriverGuideMoneyCurrencyId this.OtherPrice.DriverGuideMoneyCurrencyId
) + ) +
...@@ -1197,13 +1244,13 @@ ...@@ -1197,13 +1244,13 @@
this.getConvertMoney(x.SingleRoomMoney) + this.getConvertMoney(x.SingleRoomMoney) +
this.getConvertMoney(x.InlandTrafficMoney) + this.getConvertMoney(x.InlandTrafficMoney) +
this.getConvertMoney(x.OtherMoney) this.getConvertMoney(x.OtherMoney)
).toFixed(2); ).toFixed(0);
x.TotalMoney = ( x.TotalMoney = (
that.getLocalTotalMoney() + that.getLocalTotalMoney() +
that.getCostTotalMoney() + that.getCostTotalMoney() +
this.getConvertMoney(x.SubtotalMoney) + this.getConvertMoney(x.SubtotalMoney) +
this.getCurrencyNumberTotalMoney(x.PeopleNumber) this.getCurrencyNumberTotalMoney(x.PeopleNumber)
).toFixed(2); ).toFixed(0);
}); });
}, },
//价格转换器 //价格转换器
...@@ -1239,11 +1286,11 @@ ...@@ -1239,11 +1286,11 @@
var InlandTrafficShareMoney = this.OtherPrice.InlandTrafficShareMoney; var InlandTrafficShareMoney = this.OtherPrice.InlandTrafficShareMoney;
var OtherShareMoney = this.OtherPrice.OtherShareMoney; var OtherShareMoney = this.OtherPrice.OtherShareMoney;
this.CostNumberList.forEach(x => { this.CostNumberList.forEach(x => {
x.AirTicketMoney = (AirTicketShareMoney / x.PeopleNumber).toFixed(2); x.AirTicketMoney = (AirTicketShareMoney / x.PeopleNumber).toFixed(0);
x.TicketMoney = (TicketShareMoney / x.PeopleNumber).toFixed(2); x.TicketMoney = (TicketShareMoney / x.PeopleNumber).toFixed(0);
x.SingleRoomMoney = (SingleRoomShareMoney / x.PeopleNumber).toFixed(2); x.SingleRoomMoney = (SingleRoomShareMoney / x.PeopleNumber).toFixed(0);
x.InlandTrafficMoney = (InlandTrafficShareMoney / x.PeopleNumber).toFixed(2); x.InlandTrafficMoney = (InlandTrafficShareMoney / x.PeopleNumber).toFixed(0);
x.OtherMoney = (OtherShareMoney / x.PeopleNumber).toFixed(2); x.OtherMoney = (OtherShareMoney / x.PeopleNumber).toFixed(0);
}); });
}, },
getchange() { getchange() {
......
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