Skip to content

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

报价单调整

parent 3e80f6ea
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 53 deletions
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ acbeff41
...@@ -309,7 +309,12 @@ ...@@ -309,7 +309,12 @@
{{OtherPrice.AirTicketMoeny}} {{OtherPrice.AirTicketMoeny}}
</el-form-item> </el-form-item>
</td> </td>
<td> <td colspan="2">
<el-form-item label="中段机票">
{{OtherPrice.InlandAirTicketMoney}}
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="税金"> <el-form-item label="税金">
{{teamPrice.TaxPrice}} {{teamPrice.TaxPrice}}
</el-form-item> </el-form-item>
...@@ -319,30 +324,35 @@ ...@@ -319,30 +324,35 @@
{{teamPrice.UnionPrice}} {{teamPrice.UnionPrice}}
</el-form-item> </el-form-item>
</td> </td>
<td colspan="5" rowspan="2">
小计(机票+中段机票+税金+联运+领队导游分摊+过夜+签证+保险):
<br />{{getCostTotalMoney()}}
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item label="领队导游分摊">
{{OtherPrice.AirTicketShareMoney}}
</el-form-item>
</td>
<td colspan="2"> <td colspan="2">
<el-form-item label="过夜"> <el-form-item label="过夜">
{{teamPrice.NightPrice}} {{teamPrice.NightPrice}}
</el-form-item> </el-form-item>
</td> </td>
<td> <td colspan="2">
<el-form-item label="签证"> <el-form-item label="签证">
{{teamPrice.VisaPrice}} {{teamPrice.VisaPrice}}
</el-form-item> </el-form-item>
</td> </td>
<td> <td colspan="2">
<el-form-item label="保险"> <el-form-item label="保险">
{{OtherPrice.SafeMoney}} {{OtherPrice.SafeMoney}}
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> </tr>
<el-form-item label="领队导游分摊"> <tr>
{{OtherPrice.AirTicketShareMoney}} <td colspan="13"></td>
</el-form-item>
</td>
<td colspan="2">
小计(机票+税金+联运+过夜+签证+保险+领队导游分摊):
<br />{{getCostTotalMoney()}}
</td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
...@@ -483,7 +493,7 @@ ...@@ -483,7 +493,7 @@
v-if="postConfig.ManagerAduitDate&&postConfig.ManagerAduitDate!=''&&postConfig.ManagerAduitName&&postConfig.ManagerAduitName!=''"> v-if="postConfig.ManagerAduitDate&&postConfig.ManagerAduitDate!=''&&postConfig.ManagerAduitName&&postConfig.ManagerAduitName!=''">
<p> {{postConfig.ManagerAduitName}}：{{postConfig.ManagerAduitDate}} <p> {{postConfig.ManagerAduitName}}：{{postConfig.ManagerAduitDate}}
<template v-if="postConfig.ManagerAduitStatus==1"> <template v-if="postConfig.ManagerAduitStatus==1">
<span style="color:#69D5A;">通过</span> <span style="color:blue;">通过</span>
</template> </template>
<template v-if="postConfig.ManagerAduitStatus==2"> <template v-if="postConfig.ManagerAduitStatus==2">
<span style="color:red;">驳回</span> <span style="color:red;">驳回</span>
...@@ -496,7 +506,7 @@ ...@@ -496,7 +506,7 @@
<p> <p>
{{postConfig.AuditByName}}：{{postConfig.AuditDate}} {{postConfig.AuditByName}}：{{postConfig.AuditDate}}
<template v-if="postConfig.TravelState==3"> <template v-if="postConfig.TravelState==3">
<span style="color:#69D5A;"> 通过</span> <span style="color:blue;"> 通过</span>
</template> </template>
<template v-if="postConfig.TravelState==4"> <template v-if="postConfig.TravelState==4">
<span style="color:red;"> 驳回</span> <span style="color:red;"> 驳回</span>
...@@ -651,14 +661,15 @@ ...@@ -651,14 +661,15 @@
}, },
//其它成本价格 //其它成本价格
getCostTotalMoney() { getCostTotalMoney() {
//机票+税金+联运+过夜+保险+领队导游分摊 //机票+中段机票+税金+领队导游分摊+联运+过夜+保险
let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketMoeny) + let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
this.getConvertMoney(this.OtherPrice.InlandAirTicketMoney) +
this.getConvertMoney(this.teamPrice.TaxPrice) + this.getConvertMoney(this.teamPrice.TaxPrice) +
this.getConvertMoney(this.teamPrice.UnionPrice) + this.getConvertMoney(this.teamPrice.UnionPrice) +
this.getConvertMoney(this.OtherPrice.AirTicketShareMoney) +
this.getConvertMoney(this.teamPrice.NightPrice) + this.getConvertMoney(this.teamPrice.NightPrice) +
this.getConvertMoney(this.teamPrice.VisaPrice) + this.getConvertMoney(this.teamPrice.VisaPrice) +
this.getConvertMoney(this.OtherPrice.SafeMoney) + this.getConvertMoney(this.OtherPrice.SafeMoney)
this.getConvertMoney(this.OtherPrice.AirTicketShareMoney)
return totalMoney; return totalMoney;
}, },
//获取汇率 //获取汇率
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue
View file @ acbeff41
...@@ -216,7 +216,12 @@ ...@@ -216,7 +216,12 @@
{{OtherPrice.AirTicketMoeny}} {{OtherPrice.AirTicketMoeny}}
</el-form-item> </el-form-item>
</td> </td>
<td> <td colspan="2">
<el-form-item label="中段机票">
{{OtherPrice.InlandAirTicketMoney}}
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="税金"> <el-form-item label="税金">
{{teamPrice.TaxPrice}} {{teamPrice.TaxPrice}}
</el-form-item> </el-form-item>
...@@ -226,29 +231,35 @@ ...@@ -226,29 +231,35 @@
{{teamPrice.UnionPrice}} {{teamPrice.UnionPrice}}
</el-form-item> </el-form-item>
</td> </td>
<td colspan="5" rowspan="2">
小计(机票+中段机票+税金+联运+领队导游分摊+过夜+签证+保险):
<br />{{getCostTotalMoney()}}
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item label="领队导游分摊">
{{OtherPrice.AirTicketShareMoney}}
</el-form-item>
</td>
<td colspan="2"> <td colspan="2">
<el-form-item label="过夜"> <el-form-item label="过夜">
{{teamPrice.NightPrice}} {{teamPrice.NightPrice}}
</el-form-item> </el-form-item>
</td> </td>
<td> <td colspan="2">
<el-form-item label="签证"> <el-form-item label="签证">
{{teamPrice.VisaPrice}} {{teamPrice.VisaPrice}}
</el-form-item> </el-form-item>
</td> </td>
<td> <td colspan="2">
<el-form-item label="保险"> <el-form-item label="保险">
{{OtherPrice.SafeMoney}} {{OtherPrice.SafeMoney}}
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> </tr>
<el-form-item label="领队导游分摊"> <tr>
{{OtherPrice.AirTicketShareMoney}} <td colspan="13"></td>
</el-form-item>
</td>
<td colspan="2">
小计(机票+税金+联运+过夜+签证+保险+领队导游分摊):{{getCostTotalMoney()}}
</td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
...@@ -323,7 +334,6 @@ ...@@ -323,7 +334,6 @@
<br />(人民币) <br />(人民币)
</td> </td>
<td> <td>
<template v-if="postConfig.LineId==14||postConfig.LineId==118"> <template v-if="postConfig.LineId==14||postConfig.LineId==118">
销售价格 销售价格
<br />(日币) <br />(日币)
...@@ -389,7 +399,7 @@ ...@@ -389,7 +399,7 @@
v-if="postConfig.ManagerAduitDate&&postConfig.ManagerAduitDate!=''&&postConfig.ManagerAduitName&&postConfig.ManagerAduitName!=''"> v-if="postConfig.ManagerAduitDate&&postConfig.ManagerAduitDate!=''&&postConfig.ManagerAduitName&&postConfig.ManagerAduitName!=''">
{{postConfig.ManagerAduitName}}：{{postConfig.ManagerAduitDate}} <template {{postConfig.ManagerAduitName}}：{{postConfig.ManagerAduitDate}} <template
v-if="postConfig.ManagerAduitStatus==1"> v-if="postConfig.ManagerAduitStatus==1">
<span style="color:#69D5A;"> 通过</span> <span style="color:blue;"> 通过</span>
</template> </template>
<template v-if="postConfig.ManagerAduitStatus==2"> <template v-if="postConfig.ManagerAduitStatus==2">
<span style="color:red;"> 驳回</span> <span style="color:red;"> 驳回</span>
...@@ -399,7 +409,7 @@ ...@@ -399,7 +409,7 @@
<template v-if="postConfig.AuditDate&&postConfig.AuditDate!=''"> <template v-if="postConfig.AuditDate&&postConfig.AuditDate!=''">
<br /> <br />
{{postConfig.AuditByName}}：{{postConfig.AuditDate}} <template v-if="postConfig.TravelState==3"> {{postConfig.AuditByName}}：{{postConfig.AuditDate}} <template v-if="postConfig.TravelState==3">
<span style="color:#69D5A;"> 通过</span> <span style="color:blue;"> 通过</span>
</template> </template>
<template v-if="postConfig.TravelState==4"> <template v-if="postConfig.TravelState==4">
<span style="color:red;"> 驳回</span> <span style="color:red;"> 驳回</span>
...@@ -501,14 +511,15 @@ ...@@ -501,14 +511,15 @@
}, },
//其它成本价格 //其它成本价格
getCostTotalMoney() { getCostTotalMoney() {
//机票+税金+联运+过夜+保险+领队导游分摊 //机票+中段机票+税金+领队导游分摊+联运+过夜+保险
let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketMoeny) + let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
this.getConvertMoney(this.OtherPrice.InlandAirTicketMoney) +
this.getConvertMoney(this.teamPrice.TaxPrice) + this.getConvertMoney(this.teamPrice.TaxPrice) +
this.getConvertMoney(this.teamPrice.UnionPrice) + this.getConvertMoney(this.teamPrice.UnionPrice) +
this.getConvertMoney(this.OtherPrice.AirTicketShareMoney) +
this.getConvertMoney(this.teamPrice.NightPrice) + this.getConvertMoney(this.teamPrice.NightPrice) +
this.getConvertMoney(this.teamPrice.VisaPrice) + this.getConvertMoney(this.teamPrice.VisaPrice) +
this.getConvertMoney(this.OtherPrice.SafeMoney) + this.getConvertMoney(this.OtherPrice.SafeMoney)
this.getConvertMoney(this.OtherPrice.AirTicketShareMoney)
return totalMoney; return totalMoney;
}, },
//获取汇率 //获取汇率
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
View file @ acbeff41
...@@ -303,12 +303,18 @@ ...@@ -303,12 +303,18 @@
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<el-form-item label="机票"> <el-form-item label="机票" label-position="right">
<el-input type="text" v-model='OtherPrice.AirTicketMoeny' class="w100" <el-input type="text" v-model='OtherPrice.AirTicketMoeny' class="w100"
@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> <td colspan="2">
<el-form-item label="中段机票">
<el-input type="text" v-model='OtherPrice.InlandAirTicketMoney' class="w100"
@keyup.native="checkPrice(OtherPrice,'InlandAirTicketMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="税金"> <el-form-item label="税金">
<el-input type="text" v-model='teamPrice.TaxPrice' class="w100" <el-input type="text" v-model='teamPrice.TaxPrice' class="w100"
@keyup.native="checkPrice(teamPrice,'TaxPrice'),getchange()"></el-input> @keyup.native="checkPrice(teamPrice,'TaxPrice'),getchange()"></el-input>
...@@ -320,34 +326,39 @@ ...@@ -320,34 +326,39 @@
@keyup.native="checkPrice(teamPrice,'UnionPrice'),getchange()"></el-input> @keyup.native="checkPrice(teamPrice,'UnionPrice'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="5" rowspan="2">
小计(机票+中段机票+税金+联运+领队导游分摊+过夜+签证+保险):
<br /> {{getCostTotalMoney()}}
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item label="领队导游分摊">
<el-input type='text' class="w100" v-model="OtherPrice.AirTicketShareMoney"
@keyup.native="checkPrice(OtherPrice,'AirTicketShareMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="2"> <td colspan="2">
<el-form-item label="过夜"> <el-form-item label="过夜">
<el-input type="text" v-model='teamPrice.NightPrice' class="w100" <el-input type="text" v-model='teamPrice.NightPrice' class="w100"
@keyup.native="checkPrice(teamPrice,'NightPrice'),getchange()"></el-input> @keyup.native="checkPrice(teamPrice,'NightPrice'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td> <td colspan="2">
<el-form-item label="签证"> <el-form-item label="签证">
<el-input type="text" v-model='teamPrice.VisaPrice' class="w100" <el-input type="text" v-model='teamPrice.VisaPrice' class="w100"
@keyup.native="checkPrice(teamPrice,'VisaPrice'),getchange()"></el-input> @keyup.native="checkPrice(teamPrice,'VisaPrice'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> <td colspan="2">
<el-form-item label="领队导游分摊">
<el-input type='text' class="w100" v-model="OtherPrice.AirTicketShareMoney"
@keyup.native="checkPrice(OtherPrice,'AirTicketShareMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td>
<el-form-item label="保险"> <el-form-item label="保险">
<el-input type='text' class="w60" v-model="OtherPrice.SafeMoney" <el-input type='text' class="w100" v-model="OtherPrice.SafeMoney"
@keyup.native="checkPrice(OtherPrice,'SafeMoney'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'SafeMoney'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> </tr>
小计(机票+税金+联运+过夜+签证+保险+领队导游分摊): <tr>
<br /> {{getCostTotalMoney()}} <td colspan="13"></td>
</td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
...@@ -484,8 +495,9 @@ ...@@ -484,8 +495,9 @@
@keyup.native="checkPrice(subItem,'SalePrice')" maxlength="8"></el-input> @keyup.native="checkPrice(subItem,'SalePrice')" maxlength="8"></el-input>
</td> </td>
<td> <td>
<el-input v-if="postConfig.LineId==14||postConfig.LineId==118" type='text' class="w70" v-model="subItem.JPYSalePrice" <el-input v-if="postConfig.LineId==14||postConfig.LineId==118" type='text' class="w70"
@keyup.native="checkPrice(subItem,'JPYSalePrice')" maxlength="8"></el-input> v-model="subItem.JPYSalePrice" @keyup.native="checkPrice(subItem,'JPYSalePrice')" maxlength="8">
</el-input>
</td> </td>
<td colspan="2"> <td colspan="2">
<el-input type="textarea" v-model="subItem.CostRemark"></el-input> <el-input type="textarea" v-model="subItem.CostRemark"></el-input>
...@@ -708,14 +720,16 @@ ...@@ -708,14 +720,16 @@
}, },
//其它成本价格 //其它成本价格
getCostTotalMoney() { getCostTotalMoney() {
//机票+税金+联运+过夜+保险+领队导游分摊 //机票+中段机票+税金+领队导游分摊+联运+过夜+保险
let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketMoeny) + let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
this.getConvertMoney(this.OtherPrice.InlandAirTicketMoney) +
this.getConvertMoney(this.teamPrice.TaxPrice) + this.getConvertMoney(this.teamPrice.TaxPrice) +
this.getConvertMoney(this.teamPrice.UnionPrice) + this.getConvertMoney(this.teamPrice.UnionPrice) +
this.getConvertMoney(this.OtherPrice.AirTicketShareMoney) +
this.getConvertMoney(this.teamPrice.NightPrice) + this.getConvertMoney(this.teamPrice.NightPrice) +
this.getConvertMoney(this.teamPrice.VisaPrice) + this.getConvertMoney(this.teamPrice.VisaPrice) +
this.getConvertMoney(this.OtherPrice.SafeMoney) + this.getConvertMoney(this.OtherPrice.SafeMoney)
this.getConvertMoney(this.OtherPrice.AirTicketShareMoney)
return totalMoney; return totalMoney;
}, },
//获取币种对应 的人数报价 //获取币种对应 的人数报价
......
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