Skip to content

S
SuperMan
Commit 1aef593d authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 37bfd553 bb2e60d2
Hide whitespace changes
Inline Side-by-side
Showing with 378 additions and 171 deletions
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @ 1aef593d
...@@ -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="4">收入</td>
<td class="CP_ComTitle2" colspan="3">团负费</td> <td class="CP_ComTitle2" colspan="5">团负费</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" style="display:none;">摘要</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" colspan="2">摘要</td>
<td class="CP_ComTitle2 CostcomCenter">金额<br />(人民币)</td>
<td class="CP_ComTitle2 CostcomCenter">摘要</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="2">金额<br />(人民币)</td> <td class="CP_ComTitle2 CostcomCenter" colspan="2">金额<br />(人民币)</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="2">摘要</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="3">金额<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,25 +681,25 @@ ...@@ -697,25 +681,25 @@
@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>
</el-form-item> </el-form-item>
</td> </td>
<td class="CP_ComTitle2" colspan="2">客人小费收入</td> <td class="CP_ComTitle2" colspan="2">客人小费收入</td>
<td> <td colspan="2">
<el-form-item> <el-form-item>
<el-input type='text' class="w70" v-model="OtherPrice.TripMoney" <el-input type='text' class="w70" v-model="OtherPrice.TripMoney"
@keyup.native="checkPrice(OtherPrice,'TripMoney',true),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'TripMoney',true),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td class="CP_ComTitle2">KB</td> <td class="CP_ComTitle2" colspan="2">KB</td>
<td colspan="2"> <td colspan="3">
<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),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
</tr> </tr>
...@@ -727,43 +711,42 @@ ...@@ -727,43 +711,42 @@
@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 colspan="2">
<el-form-item> <el-form-item>
<el-input type='text' class="w70" v-model="OtherPrice.GuidePeopleMoney" <el-input type='text' class="w70" v-model="OtherPrice.GuidePeopleMoney"
@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="5"></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" colspan="2">
小计 人民币小计
</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" colspan="2">
小计 人民币小计
</td> </td>
<td colspan="2"> <td colspan="5">
{{Number(OtherPrice.KBMoney)}} {{Number(OtherPrice.KBMoney)}}
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="12"></td> <td colspan="12"></td>
</tr> </tr>
...@@ -827,12 +810,11 @@ ...@@ -827,12 +810,11 @@
</tr> </tr>
<tr> <tr>
<td colspan="12" class="CP_ComTitle2">成本统计（以下报价为每人费用）<br /> <td colspan="12" class="CP_ComTitle2">成本统计（以下报价为每人费用）<br />
计算规则: (房+餐+车+景点)*汇率+内陆段交通*汇率+杂支部分*汇率+其他资产+机票票+收入+团负费+领队分摊+地接报价*汇率 计算规则: (房+餐+车+景点)*汇率+内陆段交通*汇率+杂支部分*汇率+其他资产+机票票+收入-团负费+领队分摊+地接报价*汇率
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="CP_ComTitle2">人数统计 <td class="CP_ComTitle2">人数统计
</td> </td>
<td class="CP_ComTitle2">成本价</td> <td class="CP_ComTitle2">成本价</td>
<td class="CP_ComTitle2" colspan="2">销售价格</td> <td class="CP_ComTitle2" colspan="2">销售价格</td>
...@@ -849,6 +831,78 @@ ...@@ -849,6 +831,78 @@
<el-input type="textarea" v-model="item.CostRemark"></el-input> <el-input type="textarea" v-model="item.CostRemark"></el-input>
</td> </td>
</tr> </tr>
<tr>
<td colspan="12"></td>
</tr>
<tr>
<td class="CP_ComTitle2">
婴儿
</td>
<td class="CP_ComTitle2" colspan="2">
单地接
</td>
<td class="CP_ComTitle2" colspan="2">
儿童占床
</td>
<td class="CP_ComTitle2" colspan="2">
儿童不占床
</td>
<td class="CP_ComTitle2">
儿童附加费
</td>
<td class="CP_ComTitle2">
老人附加费
</td>
<td class="CP_ComTitle2">
签证费
</td>
<td class="CP_ComTitle2">
单房差
</td>
</tr>
<tr>
<td>
<el-input placeholder="" v-model="teamPrice.BabyPrice" @keyup.native="checkInteger(teamPrice,'BabyPrice')"
class="w100">
</el-input>
</td>
<td colspan="2">
<el-input placeholder="" v-model="teamPrice.SingleDMCPrice"
@keyup.native="checkPrice(teamPrice,'SingleDMCPrice')" class="w100">
</el-input>
</td>
<td colspan="2">
<el-input placeholder="" v-model="teamPrice.ChildNeedPrice"
@keyup.native="checkInteger(teamPrice,'ChildNeedPrice')" class="w100">
</el-input>
</td>
<td colspan="2">
<el-input placeholder="" v-model="teamPrice.ChildNoNeedPrice"
@keyup.native="checkInteger(teamPrice,'ChildNoNeedPrice')" class="w100">
</el-input>
</td>
<td>
<el-input placeholder="" v-model="teamPrice.BabyChargePrice"
@keyup.native="checkPrice(teamPrice,'BabyChargePrice')" class="w100">
</el-input>
</td>
<td>
<el-input placeholder="" v-model="teamPrice.OldManChargePrice"
@keyup.native="checkInteger(teamPrice,'OldManChargePrice')" class="w100">
</el-input>
</td>
<td>
<el-input placeholder="" v-model="teamPrice.VisaPrice" @keyup.native="checkPrice(teamPrice,'VisaPrice')"
class="w100">
</el-input>
</td>
<td>
<el-input placeholder="" v-model="teamPrice.SingleRoomPrice"
@keyup.native="checkPrice(teamPrice,'SingleRoomPrice')" class="w100">
</el-input>
</td>
</tr>
<tr> <tr>
<td class="CP_ComTitle2">备注</td> <td class="CP_ComTitle2">备注</td>
<td colspan="11"> <td colspan="11">
...@@ -864,7 +918,7 @@ ...@@ -864,7 +918,7 @@
<script> <script>
export default { export default {
props: ["postConfig", "OtherPrice", "dayCostPrice", "LineList", "CostNumberList", "CurrencyNumberListExt", props: ["postConfig", "OtherPrice", "dayCostPrice", "LineList", "CostNumberList", "CurrencyNumberListExt",
"CostCurrencyList" "CostCurrencyList", "teamPrice"
], ],
data() { data() {
return { return {
...@@ -882,9 +936,94 @@ ...@@ -882,9 +936,94 @@
currencyTypeArr: [], //币种下拉列表 currencyTypeArr: [], //币种下拉列表
LineTeamList: [], //系列下拉列表 LineTeamList: [], //系列下拉列表
} }
}, },
methods: { methods: {
//交通部分小计
trafficXiaoJi(currencyType) {
var trafficTotal = 0;
//人民币
if (currencyType == 1) {
if (this.OtherPrice.InlandAirTicketCurrency == 1) {
trafficTotal += Number(this.OtherPrice.InlandAirTicketMoney);
} else {
trafficTotal += Number(this.OtherPrice.InlandAirTicketMoney) * this.getCurrencyMoney(this.OtherPrice
.InlandAirTicketCurrency);
}
if (this.OtherPrice.InlandShipTicketCurrency == 1) {
trafficTotal += Number(this.OtherPrice.InlandShipTicketMoney);
} else {
trafficTotal += Number(this.OtherPrice.InlandShipTicketMoney) * this.getCurrencyMoney(this.OtherPrice
.InlandShipTicketCurrency);
}
if (this.OtherPrice.InlandTrainTicketCurrency == 1) {
trafficTotal += Number(this.OtherPrice.InlandTrainTicketMoney);
} else {
trafficTotal += Number(this.OtherPrice.InlandTrainTicketMoney) * this.getCurrencyMoney(this.OtherPrice
.InlandTrainTicketCurrency);
}
}
//外币
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);
} else {
zazhiTotal += Number(this.OtherPrice.VisaMoney) * this.getCurrencyMoney(this.OtherPrice
.VisaMoneyCurrencyId);
}
if (this.OtherPrice.SafeMoneyCurrencyId == 1) {
zazhiTotal += Number(this.OtherPrice.SafeMoney);
} else {
zazhiTotal += Number(this.OtherPrice.SafeMoney) * this.getCurrencyMoney(this.OtherPrice
.SafeMoneyCurrencyId);
}
if (this.OtherPrice.LeaderTripMoneyCurrencyId == 1) {
zazhiTotal += Number(this.OtherPrice.LeaderTripMoney);
} else {
zazhiTotal += Number(this.OtherPrice.LeaderTripMoney) * this.getCurrencyMoney(this.OtherPrice
.LeaderTripMoneyCurrencyId);
}
if (this.OtherPrice.DriverGuideMoneyCurrencyId == 1) {
zazhiTotal += Number(this.OtherPrice.DriverGuideMoney);
} else {
zazhiTotal += Number(this.OtherPrice.DriverGuideMoney) * this.getCurrencyMoney(this.OtherPrice
.DriverGuideMoneyCurrencyId);
}
}
//外币
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 +1057,7 @@ ...@@ -918,7 +1057,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) {
...@@ -955,11 +1094,11 @@ ...@@ -955,11 +1094,11 @@
let totalMoney = 0.0; let totalMoney = 0.0;
this.CurrencyNumberListExt.forEach(x => { this.CurrencyNumberListExt.forEach(x => {
x.currencyNumberList.forEach(y => { x.currencyNumberList.forEach(y => {
if (peopleNumber === y.PeopleNumber) { // if (peopleNumber === y.PeopleNumber) {
totalMoney += // totalMoney +=
this.getConvertMoney(y.Money) * // this.getConvertMoney(y.Money) *
this.getCurrencyMoney(y.CurrencyId); // this.getCurrencyMoney(y.CurrencyId);
} // }
}); });
}); });
return totalMoney; return totalMoney;
...@@ -968,14 +1107,13 @@ ...@@ -968,14 +1107,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
) + ) +
...@@ -988,12 +1126,13 @@ ...@@ -988,12 +1126,13 @@
) + ) +
this.getConvertMoney(this.OtherPrice.SalesCommissionMoney) + this.getConvertMoney(this.OtherPrice.SalesCommissionMoney) +
this.getConvertMoney(this.OtherPrice.TripMoney) + this.getConvertMoney(this.OtherPrice.TripMoney) +
this.getConvertMoney(this.OtherPrice.GuidePeopleMoney) + this.getConvertMoney(this.OtherPrice.GuidePeopleMoney) -
this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
this.getConvertMoney(this.OtherPrice.KBMoney) + this.getConvertMoney(this.OtherPrice.KBMoney) +
this.getConvertMoney(this.OtherPrice.VisaMoney) * this.getCurrencyMoney( this.getConvertMoney(this.OtherPrice.VisaMoney) * this.getCurrencyMoney(
this.OtherPrice.VisaMoneyCurrencyId this.OtherPrice.VisaMoneyCurrencyId
); );
//KBMoney[团负费用减法]
// this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
return totalMoney; return totalMoney;
}, },
//获取系列列表 //获取系列列表
...@@ -1001,7 +1140,6 @@ ...@@ -1001,7 +1140,6 @@
if (isClear && isClear == 1) { if (isClear && isClear == 1) {
this.postConfig.LineteamId = 0; this.postConfig.LineteamId = 0;
} }
let msg = { let msg = {
lineID: lineId, lineID: lineId,
isTOOP: 1 isTOOP: 1
...@@ -1182,6 +1320,12 @@ ...@@ -1182,6 +1320,12 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.currencyTypeArr = res.data.data; this.currencyTypeArr = res.data.data;
this.currencyTypeArr.forEach(item => {
if (item.ID == 3) {
//徐总说日元默认加0.002
item.CurrentRate = Number(item.CurrentRate) + Number(0.002);
}
});
} }
}, },
err => {} err => {}
...@@ -1192,18 +1336,20 @@ ...@@ -1192,18 +1336,20 @@
let that = this; let that = this;
this.CostNumberList.forEach(x => { this.CostNumberList.forEach(x => {
x.SubtotalMoney = ( x.SubtotalMoney = (
this.getConvertMoney(x.AirTicketMoney) + that.getConvertMoney(x.AirTicketMoney) +
this.getConvertMoney(x.TicketMoney) + that.getConvertMoney(x.TicketMoney) +
this.getConvertMoney(x.SingleRoomMoney) + that.getConvertMoney(x.SingleRoomMoney) +
this.getConvertMoney(x.InlandTrafficMoney) + that.getConvertMoney(x.InlandTrafficMoney) +
this.getConvertMoney(x.OtherMoney) that.getConvertMoney(x.OtherMoney)
).toFixed(2); ).toFixed(0);
x.TotalMoney = ( //房餐车景点价格
that.getLocalTotalMoney() + var trip = Number(that.getLocalTotalMoney(x.PeopleNumber));
that.getCostTotalMoney() + //其他价格
this.getConvertMoney(x.SubtotalMoney) + var otherPrice = Number(that.getCostTotalMoney())
this.getCurrencyNumberTotalMoney(x.PeopleNumber) x.TotalMoney = (trip + otherPrice +
).toFixed(2); Number(that.getConvertMoney(x.SubtotalMoney))
).toFixed(0);
// + that.getCurrencyNumberTotalMoney(x.PeopleNumber)
}); });
}, },
//价格转换器 //价格转换器
...@@ -1214,21 +1360,27 @@ ...@@ -1214,21 +1360,27 @@
return parseFloat(value); return parseFloat(value);
}, },
//获取地接项目报价 //获取地接项目报价
getLocalTotalMoney() { getLocalTotalMoney(PeopleNumber) {
let totalMoney = 0.0; let totalMoney = 0.0;
this.dayCostPrice.forEach(x => { totalMoney = Number(this.getDayXiaoJi(1, 2)) + Number(this.getDayXiaoJi(2, 2)) / Number(PeopleNumber) +
let subTotalMoney = 0.0; Number(this.getDayXiaoJi(3, 2)) + Number(this.getDayXiaoJi(4, 2)) + Number(this.getDayXiaoJi(5, 2)) +
subTotalMoney = Number(this.getDayXiaoJi(6, 2));
(this.getConvertMoney(x.HotelCostPrice) + // this.dayCostPrice.forEach(x => {
this.getConvertMoney(x.BusCostPrice) + // let subTotalMoney = 0.0;
this.getConvertMoney(x.ScenicCostPrice) + // subTotalMoney =
this.getConvertMoney(x.BreakfastCostPrice) + // (this.getConvertMoney(x.HotelCostPrice) +
this.getConvertMoney(x.LunchCostPrice) +
this.getConvertMoney(x.DinnerCostPrice)) * // this.getConvertMoney(x.ScenicCostPrice) +
this.getCurrencyMoney(x.CurrencyId); // this.getConvertMoney(x.BreakfastCostPrice) +
totalMoney += subTotalMoney; // this.getConvertMoney(x.LunchCostPrice) +
}); // this.getConvertMoney(x.DinnerCostPrice)) *
return totalMoney; // this.getCurrencyMoney(x.CurrencyId)
// +(this.getConvertMoney(x.BusCostPrice)*this.getCurrencyMoney(x.CurrencyId)/PeopleNumber)
// ;
// totalMoney += subTotalMoney;
// });
console.log("totalMoney", totalMoney.toFixed(0))
return totalMoney.toFixed(0);
}, },
//计算领队分摊 //计算领队分摊
getLeaderShare() { getLeaderShare() {
...@@ -1239,11 +1391,11 @@ ...@@ -1239,11 +1391,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() {
...@@ -1252,6 +1404,7 @@ ...@@ -1252,6 +1404,7 @@
} }
}, },
mounted() { mounted() {
this.getSubtotalMoney();
this.getAllCurrency(); this.getAllCurrency();
}, },
created() { created() {
......
src/components/TravelManager/TravelNewQuotation/DirectNewQuotation.vue
View file @ 1aef593d
...@@ -116,10 +116,12 @@ ...@@ -116,10 +116,12 @@
<div class="singlePrice clearfix"> <div class="singlePrice clearfix">
<CostNewPrice ref="CostNewPrice" :postConfig="postConfig" :OtherPrice="otherPrice" <CostNewPrice ref="CostNewPrice" :postConfig="postConfig" :OtherPrice="otherPrice"
:dayCostPrice="dayCostPrice" :LineList="LineList" :CostCurrencyList="CostCurrencyList" :dayCostPrice="dayCostPrice" :LineList="LineList" :CostCurrencyList="CostCurrencyList"
:CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"></CostNewPrice> :CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"
:teamPrice="teamPrice"
></CostNewPrice>
</div> </div>
</div> </div>
<div class="DirectRightPrice" style="margin-left:20px; display:none"> <div class="DirectRightPrice" style="margin-left:20px; display:none;">
<div class="dingjiaDiv"> <div class="dingjiaDiv">
<span class="TMTitle"><i></i>定价</span> <span class="TMTitle"><i></i>定价</span>
&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;
...@@ -179,53 +181,11 @@ ...@@ -179,53 +181,11 @@
<template slot="prepend">直客</template> <template slot="prepend">直客</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item>
<el-input placeholder="" v-model="teamPrice.BabyPrice"
@keyup.native="checkInteger(teamPrice,'BabyPrice')" class="w200 ComSeat">
<template slot="prepend">婴儿</template>
</el-input>
</el-form-item>
<el-form-item>
<el-input placeholder="" v-model="teamPrice.SingleDMCPrice"
@keyup.native="checkPrice(teamPrice,'SingleDMCPrice')" class="w200 ComSeat">
<template slot="prepend">单地接</template>
</el-input>
</el-form-item>
</div> </div>
</div> </div>
<div class="clearfix" v-show="IsShow"> <div class="clearfix" v-show="IsShow">
<div class="Dleftname">增收</div> <div class="Dleftname">增收</div>
<div class="DrightList" style="width:900px;"> <div class="DrightList" style="width:900px;">
<el-form-item>
<el-input placeholder="" v-model="teamPrice.ChildNeedPrice"
@keyup.native="checkInteger(teamPrice,'ChildNeedPrice')" class="w200 ComSeat">
<template slot="prepend">儿童占床</template>
</el-input>
</el-form-item>
<el-form-item>
<el-input placeholder="" v-model="teamPrice.BabyChargePrice"
@keyup.native="checkPrice(teamPrice,'BabyChargePrice')" class="w200 ComSeat">
<template slot="prepend">儿童附加费</template>
</el-input>
</el-form-item>
<el-form-item>
<el-input placeholder="" v-model="teamPrice.OldManChargePrice"
@keyup.native="checkInteger(teamPrice,'OldManChargePrice')" class="w200 ComSeat">
<template slot="prepend">老人附加费</template>
</el-input>
</el-form-item>
<el-form-item>
<el-input placeholder="" v-model="teamPrice.VisaPrice" @keyup.native="checkPrice(teamPrice,'VisaPrice')"
class="w200 ComSeat">
<template slot="prepend">签证费</template>
</el-input>
</el-form-item>
<el-form-item>
<el-input placeholder="" v-model="teamPrice.SingleRoomPrice"
@keyup.native="checkPrice(teamPrice,'SingleRoomPrice')" class="w200 ComSeat">
<template slot="prepend">单房差</template>
</el-input>
</el-form-item>
<el-form-item> <el-form-item>
<el-input placeholder="" v-model="teamPrice.SafeMoney" @keyup.native="checkPrice(teamPrice,'SafeMoney')" <el-input placeholder="" v-model="teamPrice.SafeMoney" @keyup.native="checkPrice(teamPrice,'SafeMoney')"
class="w200 ComSeat"> class="w200 ComSeat">
...@@ -243,13 +203,6 @@ ...@@ -243,13 +203,6 @@
<div class="clearfix" v-show="IsShow"> <div class="clearfix" v-show="IsShow">
<div class="Dleftname">减免</div> <div class="Dleftname">减免</div>
<div class="DrightList"> <div class="DrightList">
<el-form-item>
<el-input placeholder="" v-model="teamPrice.ChildNoNeedPrice"
@keyup.native="checkInteger(teamPrice,'ChildNoNeedPrice')" class="w200 ComSeat">
<template slot="prepend">儿童不占床</template>
</el-input>
</el-form-item>
<el-form-item style="display:none;"> <el-form-item style="display:none;">
<el-input placeholder="" v-model="teamPrice.RebatePrice" <el-input placeholder="" v-model="teamPrice.RebatePrice"
@keyup.native="checkPrice(teamPrice,'RebatePrice')" class="w200 ComSeat"> @keyup.native="checkPrice(teamPrice,'RebatePrice')" class="w200 ComSeat">
...@@ -262,7 +215,6 @@ ...@@ -262,7 +215,6 @@
<template slot="prepend">早鸟优惠</template> <template slot="prepend">早鸟优惠</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-input placeholder="" v-model="teamPrice.BackVisaPrice" <el-input placeholder="" v-model="teamPrice.BackVisaPrice"
@keyup.native="checkPrice(teamPrice,'BackVisaPrice')" class="w200 ComSeat"> @keyup.native="checkPrice(teamPrice,'BackVisaPrice')" class="w200 ComSeat">
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ 1aef593d
<style> <style>
@import "../../../assets/css/newTravelManager.css"; @import "../../../assets/css/newTravelManager.css";
.BilldownLoadCommon input[type="checkbox"]+label::before {
content: "\A0";
display: inline-block;
width: 15px;
height: 15px;
margin-right: 5px;
border-radius: 4px;
background-color: white;
text-indent: .15em;
line-height: 15px;
color: white;
border: 1px solid #e95252;
}
.BilldownLoadCommon input[type="checkbox"]:checked+label::before {
content: "\2713";
background-color: #e95252;
}
.BilldownLoadCommon input[type="checkbox"] {
position: absolute;
clip: rect(0, 0, 0, 0);
}
.BilldownLoadCommon input[type="checkbox"]:focus+label::before {
box-shadow: none;
}
.BilldownLoadCommon input[type="checkbox"]:disabled+label::before {
background-color: gray;
box-shadow: none;
color: #555;
}
.BilldownLoadCommon table td{
text-align: left;
}
</style> </style>
<template> <template>
<div class="flexOne quoTation"> <div class="flexOne quoTation">
...@@ -159,7 +195,6 @@ ...@@ -159,7 +195,6 @@
<i class="iconfont icon-nav-hangzheng"></i> <i class="iconfont icon-nav-hangzheng"></i>
</el-tooltip> </el-tooltip>
</span> </span>
<span class="bianji opbd" @click="goUrl('QuotationNewPrice',item.ID,false)"> <span class="bianji opbd" @click="goUrl('QuotationNewPrice',item.ID,false)">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start" <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
popper-class="max-w250"> popper-class="max-w250">
...@@ -172,7 +207,7 @@ ...@@ -172,7 +207,7 @@
<i class="iconfont icon-shanchu"></i> <i class="iconfont icon-shanchu"></i>
</el-tooltip> </el-tooltip>
</span> </span>
<span style="background:#85ce61; " class="opbd" @click="DownLoadFile(item)"> <span style="background:#85ce61; " class="opbd" @click="showDownLoad(item)">
<el-tooltip class="item" effect="dark" content="下载" placement="top-start" popper-class="max-w250"> <el-tooltip class="item" effect="dark" content="下载" placement="top-start" popper-class="max-w250">
<i class="iconfont icon-bb-xiazai"></i> <i class="iconfont icon-bb-xiazai"></i>
</el-tooltip> </el-tooltip>
...@@ -191,6 +226,54 @@ ...@@ -191,6 +226,54 @@
<el-dialog custom-class='ComTeamPlan_info_box' :title="tripTitle" :visible.sync="outerVisible" center> <el-dialog custom-class='ComTeamPlan_info_box' :title="tripTitle" :visible.sync="outerVisible" center>
<commonTeamInfo ref="comDialog"></commonTeamInfo> <commonTeamInfo ref="comDialog"></commonTeamInfo>
</el-dialog> </el-dialog>
<!-- 下载弹窗 -->
<el-dialog custom-class='w450' title="报价单下载" :visible.sync="downloadBill" center>
<div class="BilldownLoadCommon">
<table style="width:380px;margin-left:44px;" border="0" cellspacing="0" cellpadding="0">
<tr>
<th colspan="2" style="height:50px;">
<span style="margin-left:-60px;">{{$t('salesModule.ChoiceNeed')}}</span>
</th>
</tr>
<tbody>
<tr height="36">
<td width="50%"><input id="IsShowTripPrice" type="checkbox" v-model="downLoadMsg.IsShowTripPrice" /><label
for="IsShowTripPrice">行程报价<br />(房、餐、车、门票)</label></td>
<td width="50%"><input id="IsShowTraffic" type="checkbox" v-model="downLoadMsg.IsShowTraffic" /><label
for="IsShowTraffic">内陆段交通部分</label></td>
</tr>
<tr height="36">
<td><input id="IsShowZaZhi" type="checkbox" v-model="downLoadMsg.IsShowZaZhi" /><label
for="IsShowZaZhi">杂支部分</label></td>
<td><input id="IsShowOtherZhichu" type="checkbox" v-model="downLoadMsg.IsShowOtherZhichu" /><label
for="IsShowOtherZhichu">其他支出</label></td>
</tr>
<tr height="36">
<td><input id="IsShowShouRu" type="checkbox" v-model="downLoadMsg.IsShowShouRu" /><label
for="IsShowShouRu">收入</label></td>
<td><input id="IsShowTuanFuFee" type="checkbox" v-model="downLoadMsg.IsShowTuanFuFee" /><label
for="IsShowTuanFuFee">团负费</label></td>
</tr>
<tr height="36">
<td><input id="IsShowLeaderFenTan" type="checkbox" v-model="downLoadMsg.IsShowLeaderFenTan" /><label
for="IsShowLeaderFenTan">领队分摊</label></td>
<td><input id="IsShowCost" type="checkbox" v-model="downLoadMsg.IsShowCost" /><label
for="IsShowCost">成本统计</label></td>
</tr>
<tr height="36">
<td><input id="IsShowOtherPrice" type="checkbox" v-model="downLoadMsg.IsShowOtherPrice" /><label
for="IsShowOtherPrice">其他定价</label></td>
</tr>
</tbody>
<tr height="66">
<td colspan="2" style="text-align:center;">
<input type="button" class="normalBtn" style="margin-left:-70px;" :value="$t('pub.sureBtn')" @click="DownLoadFile()" />
</td>
</tr>
</table>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -253,7 +336,22 @@ ...@@ -253,7 +336,22 @@
SalesPriceList: [], SalesPriceList: [],
CostList: [], CostList: [],
outerVisible: false, outerVisible: false,
tripTitle: "" tripTitle: "",
downloadBill: false,
//下载参数
downLoadMsg: {
ID: 0,
FileName: "",
IsShowTripPrice: true, //行程报价
IsShowTraffic: false, //交通价格
IsShowZaZhi: false, //杂支部分
IsShowOtherZhichu: false, //其他支出
IsShowShouRu: false, //收入部分
IsShowTuanFuFee: false, //团负费
IsShowLeaderFenTan: false, //领队分摊
IsShowCost: false, //成本统计
IsShowOtherPrice: false, //其他定价
},
}; };
}, },
components: { components: {
...@@ -459,7 +557,7 @@ ...@@ -459,7 +557,7 @@
}); });
}, },
//开团或修改 //开团或修改
goToOpenTravel(path,item) { goToOpenTravel(path, item) {
if (item.ID > 0) { if (item.ID > 0) {
this.$router.push({ this.$router.push({
name: path, name: path,
...@@ -467,7 +565,7 @@ ...@@ -467,7 +565,7 @@
configId: item.ID, configId: item.ID,
openState: item.OpenState, openState: item.OpenState,
isOffer: 1, isOffer: 1,
offerId:item.OfferId, offerId: item.OfferId,
blank: 'y' blank: 'y'
} }
}); });
...@@ -477,12 +575,9 @@ ...@@ -477,12 +575,9 @@
}); });
} }
}, },
//报价单下载 //显示下载弹窗
DownLoadFile(item) { showDownLoad(item) {
this.loading = true; this.downLoadMsg.ID = item.ID;
var newMsg = {
ID: item.ID
};
var fileName = ""; var fileName = "";
if (item.CustomerName) { if (item.CustomerName) {
fileName += "【" + item.CustomerName + "】"; fileName += "【" + item.CustomerName + "】";
...@@ -492,7 +587,14 @@ ...@@ -492,7 +587,14 @@
fileName += "【" + item.LineName + "】"; fileName += "【" + item.LineName + "】";
} }
fileName += "成本下载.xls"; fileName += "成本下载.xls";
this.GetLocalFile("quotation_get_DownLoadQuotation", newMsg, fileName, res => { this.downLoadMsg.FileName = fileName;
this.downloadBill = true;
},
//报价单下载
DownLoadFile() {
this.downloadBill = false;
this.loading = true;
this.GetLocalFile("quotation_get_DownLoadQuotation", this.downLoadMsg, this.downLoadMsg.FileName, res => {
this.loading = false; this.loading = false;
}); });
}, },
......
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