Commit ec9d7675 authored by 黄奎's avatar 黄奎

报价单调整

parent e9573ddb
...@@ -31,24 +31,10 @@ ...@@ -31,24 +31,10 @@
border: 1px solid #106BAF !important; border: 1px solid #106BAF !important;
} }
.CostPriceDiv {
float: left;
width: 19%;
margin-right: 23px;
}
.CP_ComTitle { .CP_ComTitle {
color: #106BAF; color: #106BAF;
} }
.w79 {
width: 79px !important;
}
.w70 {
width: 70px !important;
}
.CostcomCenter { .CostcomCenter {
text-align: center; text-align: center;
} }
...@@ -61,11 +47,12 @@ ...@@ -61,11 +47,12 @@
.CostNewTable .el-input__inner { .CostNewTable .el-input__inner {
padding: 0 5px; padding: 0 5px;
} }
</style> </style>
<template> <template>
<div> <div>
<div class="CostNewPrice clearfix CP_Div" style="width:1700px;"> <div class="CostNewPrice clearfix CP_Div" style="width:1600px;">
<el-form> <el-form>
<div class="QuotationFirstDiv1"> <div class="QuotationFirstDiv1">
<table style="font-size:14px;"> <table style="font-size:14px;">
...@@ -212,40 +199,42 @@ ...@@ -212,40 +199,42 @@
<template v-if="subItem.ContainDinnerType==2">{{$t('objFill.hanwancan')}}</template> <template v-if="subItem.ContainDinnerType==2">{{$t('objFill.hanwancan')}}</template>
<template v-if="subItem.ContainDinnerType==3">{{$t('objFill.v101.hanzaowanc')}}</template> <template v-if="subItem.ContainDinnerType==3">{{$t('objFill.v101.hanzaowanc')}}</template>
</td> </td>
<td> <td style="white-space:nowrap;">
{{subItem.HotelCostPrice}} {{subItem.HotelCostPrice}}
<template v-if="subItem.IsHotelChange"> <template v-if="subItem.IsHotelChange">
<br /> <el-tooltip class="item" effect="dark" :content="subItem.HotelChangeRemark" placement="top-start">
<font style="color:red;"> <font style="color:red;">
<template v-if="subItem.HotelChangeValue>0"> <template v-if="subItem.HotelChangeValue>0">
+{{subItem.HotelChangeValue}} +{{subItem.HotelChangeValue}}
</template> </template>
<template v-else> <template v-else>
{{subItem.HotelChangeValue}} {{subItem.HotelChangeValue}}
</template> </template>
<font style="color:#409eff;">({{subItem.HotelChangeRemark}})</font> </font>
</font> </el-tooltip>
=<font style="color:red">{{subItem.HotelChangePrice}}</font>
</template> </template>
</td> </td>
<td> <td style="white-space:nowrap;">
{{subItem.BusCostPrice}} {{subItem.BusCostPrice}}
<template v-if="subItem.IsBusChange"> <template v-if="subItem.IsBusChange">
<br /> <el-tooltip class="item" effect="dark" :content="subItem.BusChangeRemark" placement="top-start">
<font style="color:red;"> <font style="color:red;">
<template v-if="subItem.BusChangeValue>0"> <template v-if="subItem.BusChangeValue>0">
+{{subItem.BusChangeValue}} +{{subItem.BusChangeValue}}
</template> </template>
<template v-else> <template v-else>
{{subItem.BusChangeValue}} {{subItem.BusChangeValue}}
</template> </template>
<font style="color:#409eff;">({{subItem.BusChangeRemark}})</font> </font>
</font> </el-tooltip>
=<font style="color:red">{{subItem.BusChangePrice}}</font>
</template> </template>
</td> </td>
<td> <td>
{{subItem.PassFee}} {{subItem.PassFee}}
</td> </td>
<td style="width:250px;"> <td style="width:250px;white-space:nowrap;">
<template v-if="subItem.BreakfastName&&subItem.BreakfastName!=''"> <template v-if="subItem.BreakfastName&&subItem.BreakfastName!=''">
{{$t('objFill.v101.zaocanmc')}}: {{subItem.BreakfastName}}<br /> {{$t('objFill.v101.zaocanmc')}}: {{subItem.BreakfastName}}<br />
</template> </template>
...@@ -276,46 +265,47 @@ ...@@ -276,46 +265,47 @@
</template> </template>
</template> </template>
</td> </td>
<td> <td style="white-space:nowrap;">
<template v-if="subItem.BreakfastName&&subItem.BreakfastName!=''">
{{$t('objFill.v101.zaocanmc')}}: {{subItem.BreakfastCostPrice}}<br />
</template>
<template v-if="subItem.LunchName&&subItem.LunchName!=''">
{{$t('objFill.v101.wucanmc')}}: {{subItem.LunchCostPrice}}<br />
</template>
<template v-if="subItem.DinnerName&&subItem.DinnerName!=''">
{{$t('objFill.v101.wancaimc')}}: {{subItem.DinnerCostPrice}}<br />
</template>
<template v-if="subItem.IsBreakfastChange"> <template v-if="subItem.IsBreakfastChange">
<br /> {{$t('objFill.v101.zaocanmc')}}:
<font style="color:red;"> {{subItem.BreakfastCostPrice}}
{{$t('objFill.v101.zaocanmc')}}: <el-tooltip class="item" effect="dark" :content="subItem.BreakfastChangeRemark" placement="top-start">
<template v-if="subItem.BreakfastChangeValue>0"> <font style="color:red;">
+ <template v-if="subItem.BreakfastChangeValue>0">
</template> +
{{subItem.BreakfastChangeValue}} <font style="color:#409eff;">({{subItem.BreakfastChangeRemark}}) </template>
{{subItem.BreakfastChangeValue}}
</font> </font>
</font> </el-tooltip>
=<font style="color:red;">{{subItem.BreakfastChangePrice}}</font>
</template> </template>
<template v-if="subItem.IsLunchChange"> <template v-if="subItem.IsLunchChange">
<br /> <br />
<font style="color:red;"> {{$t('objFill.v101.wucanmc')}}:
{{$t('objFill.v101.wucanmc')}}: {{subItem.LunchCostPrice}}
<template v-if="subItem.LunchChangeValue>0"> <el-tooltip class="item" effect="dark" :content="subItem.LunchChangeRemark" placement="top-start">
+ <font style="color:red;">
</template> <template v-if="subItem.LunchChangeValue>0">
{{subItem.LunchChangeValue}} <font style="color:#409eff;">({{subItem.LunchChangeRemark}})</font> +
</font> </template>
{{subItem.LunchChangeValue}}
</font>
</el-tooltip>
=<font style="color:red;">{{subItem.LunchChangePrice}}</font>
</template> </template>
<template v-if="subItem.IsDinnerChange"> <template v-if="subItem.IsDinnerChange">
<br /> <br />
<font style="color:red;"> {{$t('objFill.v101.wancaimc')}}:
{{$t('objFill.v101.wancaimc')}}: {{subItem.DinnerCostPrice}}
<template v-if="subItem.DinnerChangeValue>0"> <el-tooltip class="item" effect="dark" :content="subItem.DinnerChangeRemark" placement="top-start">
+ <font style="color:red;">
</template> <template v-if="subItem.DinnerChangeValue>0">
{{subItem.DinnerChangeValue}} <font style="color:#409eff;">({{subItem.DinnerChangeRemark}})</font> +
</font> </template>
{{subItem.DinnerChangeValue}}
</font>
</el-tooltip>
=<font style="color:red;">{{subItem.DinnerChangePrice}}</font>
</template> </template>
</td> </td>
<td> <td>
...@@ -328,7 +318,7 @@ ...@@ -328,7 +318,7 @@
</template> </template>
</template> </template>
</td> </td>
<td> <td style="white-space:nowrap;">
<template v-for="(childItem,childIndex) in subItem.ScenicList"> <template v-for="(childItem,childIndex) in subItem.ScenicList">
<template v-if="childItem.TicketId>0||childItem.TicketName!=''"> <template v-if="childItem.TicketId>0||childItem.TicketName!=''">
<font> <font>
...@@ -339,19 +329,34 @@ ...@@ -339,19 +329,34 @@
</template> </template>
<template v-if="subItem.IsScenicChange"> <template v-if="subItem.IsScenicChange">
<br /> <br />
<font style="color:red;"> {{subItem.ScenicCostPrice}}
<template v-if="subItem.ScenicChangeValue>0"> <el-tooltip class="item" effect="dark" :content="subItem.ScenicChangeRemark" placement="top-start">
+ <font style="color:red;">
</template> <template v-if="subItem.ScenicChangeValue>0">
{{subItem.ScenicChangeValue}} <font style="color:#409eff;">({{subItem.ScenicChangeRemark}})</font> +
</font> </template>
{{subItem.ScenicChangeValue}}
</font>
</el-tooltip>
=<font style="color:red">{{subItem.ScenicChangePrice}}</font>
</template> </template>
</td> </td>
<td> <td>
{{subItem.OtherName}} {{subItem.OtherName}}
</td> </td>
<td> <td style="white-space:nowrap;">
{{subItem.OtherPrice}} {{subItem.OtherPrice}}
<template v-if="subItem.IsOtherChange">
<el-tooltip class="item" effect="dark" :content="subItem.OtherChangeRemark" placement="top-start">
<font style="color:red;">
<template v-if="subItem.OtherChangeValue>0">
+
</template>
{{subItem.OtherChangeValue}}
</font>
</el-tooltip>
=<font style="color:red;">{{subItem.OtherChangePrice}}</font>
</template>
</td> </td>
</tr> </tr>
</template> </template>
...@@ -363,37 +368,76 @@ ...@@ -363,37 +368,76 @@
<td colspan="2"> <td colspan="2">
{{$t('objFill.jiudianxj')}}: {{getDayXiaoJi(1,1)}} {{$t('objFill.jiudianxj')}}: {{getDayXiaoJi(1,1)}}
<template v-if="getDayChangeXiaoJi(1,1)!=0"> <template v-if="getDayChangeXiaoJi(1,1)!=0">
<br /> <font style="color:red;">
<font style="color:red">{{$t('objFill.jiudianchangxj')}} :{{getDayChangeXiaoJi(1,1)}}</font> <template v-if="getDayChangeXiaoJi(1,1)>0">
+{{getDayChangeXiaoJi(1,1)}}
</template>
<template v-else>
{{getDayChangeXiaoJi(1,1)}}
</template>
</font>
=<font style="color:red">{{Number(getDayXiaoJi(1,1))+Number(getDayChangeXiaoJi(1,1))}}</font>
</template> </template>
</td> </td>
<!--车资小计--> <!--车资小计-->
<td colspan="2"> <td colspan="2" style="white-space:nowrap;">
{{$t('objFill.chezhixj')}}:{{getDayXiaoJi(2,1)}} {{$t('objFill.chezhixj')}}:{{getDayXiaoJi(2,1)}}
<template v-if="getDayChangeXiaoJi(2,1)!=0"> <template v-if="getDayChangeXiaoJi(2,1)!=0">
<br /> <font style="color:red;">
<font style="color:red">{{$t('objFill.chezhichangexj')}}:{{getDayChangeXiaoJi(2,1)}}</font> <template v-if="getDayChangeXiaoJi(2,1)>0">
+{{getDayChangeXiaoJi(2,1)}}
</template>
<template v-else>
{{getDayChangeXiaoJi(2,1)}}
</template>
</font>
=<font style="color:red">{{Number(getDayXiaoJi(2,1))+Number(getDayChangeXiaoJi(2,1))}}</font>
</template> </template>
</td> </td>
<!--餐小计--> <!--餐小计-->
<td colspan="2"> <td colspan="2">
{{$t('objFill.canxj')}}: {{getDayXiaoJi(4,1)}} {{$t('objFill.canxj')}}: {{getDayXiaoJi(4,1)}}
<template v-if="getDayChangeXiaoJi(4,1)!=0"> <template v-if="getDayChangeXiaoJi(4,1)!=0">
<br /> <font style="color:red">
<font style="color:red">{{$t('objFill.canchangexj')}}:{{getDayChangeXiaoJi(4,1)}}</font> <template v-if="getDayChangeXiaoJi(4,1)>0">
+{{getDayChangeXiaoJi(4,1)}}
</template>
<template v-else>
{{getDayChangeXiaoJi(4,1)}}
</template>
</font>
=<font style="color:red"> {{Number(getDayXiaoJi(4,1))+Number(getDayChangeXiaoJi(4,1))}}</font>
</template> </template>
</td> </td>
<!--门票小计--> <!--门票小计-->
<td colspan="2"> <td colspan="2">
{{$t('objFill.menpiaoxj')}}: {{getDayXiaoJi(3,1)}} {{$t('objFill.menpiaoxj')}}: {{getDayXiaoJi(3,1)}}
<template v-if="getDayChangeXiaoJi(3,1)!=0"> <template v-if="getDayChangeXiaoJi(3,1)!=0">
<br /> <font style="color:red">
<font style="color:red">{{$t('objFill.menpiaochangexj')}}:{{getDayChangeXiaoJi(3,1)}}</font> <template v-if="getDayChangeXiaoJi(3,1)>0">
+{{getDayChangeXiaoJi(3,1)}}
</template>
<template v-else>
{{getDayChangeXiaoJi(3,1)}}
</template>
</font>
=<font style="color:red">{{Number(getDayXiaoJi(3,1))+ Number(getDayChangeXiaoJi(3,1))}}</font>
</template> </template>
</td> </td>
<!--其它费用小计--> <!--其它费用小计-->
<td colspan="2"> <td colspan="2">
{{$t('objFill.zazhixj')}}: {{getDayXiaoJi(9,1)}} {{$t('objFill.zazhixj')}}: {{getDayXiaoJi(9,1)}}
<template v-if="getDayChangeXiaoJi(9,1)!=0">
<font style="color:red">
<template v-if="getDayChangeXiaoJi(9,1)>0">
+{{getDayChangeXiaoJi(9,1)}}
</template>
<template v-else>
{{getDayChangeXiaoJi(9,1)}}
</template>
</font>
=<font style="color:red">{{Number(getDayXiaoJi(9,1))+ Number(getDayChangeXiaoJi(9,1))}}</font>
</template>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -403,22 +447,77 @@ ...@@ -403,22 +447,77 @@
<!--酒店小计--> <!--酒店小计-->
<td colspan="2"> <td colspan="2">
{{$t('objFill.jiudianxj')}}: {{getDayXiaoJi(1,2)}} {{$t('objFill.jiudianxj')}}: {{getDayXiaoJi(1,2)}}
<template v-if="getDayChangeXiaoJi(1,2)!=0">
<font style="color:red;">
<template v-if="getDayChangeXiaoJi(1,2)>0">
+{{getDayChangeXiaoJi(1,2)}}
</template>
<template v-else>
{{getDayChangeXiaoJi(1,2)}}
</template>
</font>
=<font style="color:red">{{Number(getDayXiaoJi(1,2))+Number(getDayChangeXiaoJi(1,2))}}</font>
</template>
</td> </td>
<!--车资小计--> <!--车资小计-->
<td colspan="2"> <td colspan="2">
{{$t('objFill.chezhixj')}}:{{getDayXiaoJi(2,2)}} {{$t('objFill.chezhixj')}}:{{getDayXiaoJi(2,2)}}
<template v-if="getDayChangeXiaoJi(2,2)!=0">
<font style="color:red;">
<template v-if="getDayChangeXiaoJi(2,2)>0">
+{{getDayChangeXiaoJi(2,2)}}
</template>
<template v-else>
{{getDayChangeXiaoJi(2,2)}}
</template>
</font>
=<font style="color:red">{{Number(getDayXiaoJi(2,2))+Number(getDayChangeXiaoJi(2,2))}}</font>
</template>
</td> </td>
<!--餐小计--> <!--餐小计-->
<td colspan="2"> <td colspan="2">
{{$t('objFill.canxj')}}: {{getDayXiaoJi(4,2)}} {{$t('objFill.canxj')}}: {{getDayXiaoJi(4,2)}}
<template v-if="getDayChangeXiaoJi(4,2)!=0">
<font style="color:red;">
<template v-if="getDayChangeXiaoJi(4,2)>0">
+{{getDayChangeXiaoJi(4,2)}}
</template>
<template v-else>
{{getDayChangeXiaoJi(4,2)}}
</template>
</font>
=<font style="color:red">{{Number(getDayXiaoJi(4,2))+Number(getDayChangeXiaoJi(4,2))}}</font>
</template>
</td> </td>
<!--门票小计--> <!--门票小计-->
<td colspan="2"> <td colspan="2">
{{$t('objFill.menpiaoxj')}}: {{getDayXiaoJi(3,2)}} {{$t('objFill.menpiaoxj')}}: {{getDayXiaoJi(3,2)}}
<template v-if="getDayChangeXiaoJi(3,2)!=0">
<font style="color:red;">
<template v-if="getDayChangeXiaoJi(3,2)>0">
+{{getDayChangeXiaoJi(3,2)}}
</template>
<template v-else>
{{getDayChangeXiaoJi(3,2)}}
</template>
</font>
=<font style="color:red">{{Number(getDayXiaoJi(3,2))+Number(getDayChangeXiaoJi(3,2))}}</font>
</template>
</td> </td>
<!--其它费用小计--> <!--其它费用小计-->
<td colspan="2"> <td colspan="2">
{{$t('objFill.zazhixj')}}: {{getDayXiaoJi(9,2)}} {{$t('objFill.zazhixj')}}: {{getDayXiaoJi(9,2)}}
<template v-if="getDayChangeXiaoJi(9,2)!=0">
<font style="color:red;">
<template v-if="getDayChangeXiaoJi(9,2)>0">
+{{getDayChangeXiaoJi(9,2)}}
</template>
<template v-else>
{{getDayChangeXiaoJi(9,2)}}
</template>
</font>
=<font style="color:red;">{{Number(getDayXiaoJi(9,2))+Number(getDayChangeXiaoJi(9,2))}}</font>
</template>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -595,22 +694,131 @@ ...@@ -595,22 +694,131 @@
{{subItem.PeopleNumber}} {{subItem.PeopleNumber}}
</td> </td>
<td> <td>
{{getDayXiaoJi(1,1)}}({{$t('objFill.jiu')}})+ {{getDayXiaoJi(1,1)}}
{{ (getDayXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}({{$t('objFill.v101.chezczcyrs')}})+{{getDayXiaoJi(4,1)}}({{$t('objFill.can')}})+{{getDayXiaoJi(3,1)}}({{$t('scen.sc_piao')}}) <template v-if="getDayChangeXiaoJi(1,1)!=0">
+{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}({{$t('objFill.v101.zazhizzzcyrsK')}}) <font style="color:red;">
<template v-if="getDayChangeXiaoJi(1,1)>0">
+{{getDayChangeXiaoJi(1,1)}}
</template>
<template v-else>
{{getDayChangeXiaoJi(1,1)}}
</template>
</font>
</template>
({{$t('objFill.jiu')}})+
{{ (getDayXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}
<template v-if="getDayChangeXiaoJi(2,1)!=0">
<font style="color:red;">
<template v-if="getDayChangeXiaoJi(2,1)>0">
+{{(getDayChangeXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}
</template>
<template v-else>
{{(getDayChangeXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}
</template>
</font>
</template>
({{$t('objFill.v101.chezczcyrs')}})
+{{getDayXiaoJi(4,1)}}
<template v-if="getDayChangeXiaoJi(4,1)!=0">
<font style="color:red;">
<template v-if="getDayChangeXiaoJi(4,1)>0">
+{{getDayChangeXiaoJi(4,1)}}
</template>
<template v-else>
{{getDayChangeXiaoJi(4,1)}}
</template>
</font>
</template>
({{$t('objFill.can')}})
+{{getDayXiaoJi(3,1)}}
<template v-if="getDayChangeXiaoJi(3,1)!=0">
<font style="color:red;">
<template v-if="getDayChangeXiaoJi(3,1)>0">
+{{getDayChangeXiaoJi(3,1)}}
</template>
<template v-else>
{{getDayChangeXiaoJi(3,1)}}
</template>
</font>
</template>
({{$t('scen.sc_piao')}})
+{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}
<template v-if="getDayChangeXiaoJi(9,1)!=0">
<font style="color:red;">
<template v-if="getDayChangeXiaoJi(9,1)>0">
+{{(getDayChangeXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}
</template>
<template v-else>
{{(getDayChangeXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}
</template>
</font>
</template>
({{$t('objFill.v101.zazhizzzcyrsK')}})
</td> </td>
<td> <td style="white-space:nowrap;">
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}} {{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
<template v-if="getLocalJpyChangeTotalMoney(subItem.PeopleNumber)!=0">
<font style="color:red;">
<template v-if="getLocalJpyChangeTotalMoney(subItem.PeopleNumber)>0">
+{{getLocalJpyChangeTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else>
{{getLocalJpyChangeTotalMoney(subItem.PeopleNumber)}}
</template>
</font>
=<font style="color:red">
{{Number(getLocalJpyTotalMoney(subItem.PeopleNumber))+Number(getLocalJpyChangeTotalMoney(subItem.PeopleNumber))}}
</font>
</template>
</td> </td>
<td colspan="2"> <td colspan="2">
<template v-if="teamPrice&&teamPrice.SingleDMCPrice&&teamPrice.SingleDMCPrice>0"> <template v-if="teamPrice&&teamPrice.SingleDMCPrice&&teamPrice.SingleDMCPrice>0">
{{teamPrice.SingleDMCPrice}} {{teamPrice.SingleDMCPrice}}
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)!=0">
<font style="color:red;">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)>0">
+{{getLocalChangeTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else>
{{getLocalChangeTotalMoney(subItem.PeopleNumber)}}
</template>
</font>
=<font style="color:red">
{{Number(teamPrice.SingleDMCPrice)+Number(getLocalChangeTotalMoney(subItem.PeopleNumber))}}
</font>
</template>
</template> </template>
<template v-else-if="postConfig.LineId==14||postConfig.LineId==118"> <template v-else-if="postConfig.LineId==14||postConfig.LineId==118">
{{getLocalTotalMoney(subItem.PeopleNumber)}} {{getLocalTotalMoney(subItem.PeopleNumber)}}
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)!=0">
<font style="color:red;">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)>0">
+{{getLocalChangeTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else>
{{getLocalChangeTotalMoney(subItem.PeopleNumber)}}
</template>
</font>
=<font style="color:red">
{{Number(getLocalTotalMoney(subItem.PeopleNumber))+Number(getLocalChangeTotalMoney(subItem.PeopleNumber))}}
</font>
</template>
</template> </template>
<template v-else-if="postConfig.LineId==168"> <template v-else-if="postConfig.LineId==168">
{{getLocalTotalMoney(subItem.PeopleNumber)}} {{getLocalTotalMoney(subItem.PeopleNumber)}}
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)!=0">
<font style="color:red;">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)>0">
+{{getLocalChangeTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else>
{{getLocalChangeTotalMoney(subItem.PeopleNumber)}}
</template>
</font>
=<font style="color:red">
{{Number(getLocalTotalMoney(subItem.PeopleNumber))+Number(getLocalChangeTotalMoney(subItem.PeopleNumber))}}
</font>
</template>
</template> </template>
<template v-else> <template v-else>
{{subItem.SubtotalMoney}} {{subItem.SubtotalMoney}}
...@@ -618,6 +826,19 @@ ...@@ -618,6 +826,19 @@
</td> </td>
<td colspan="2"> <td colspan="2">
{{subItem.TotalMoney}} {{subItem.TotalMoney}}
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)!=0">
<font style="color:red;">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)>0">
+{{getLocalChangeTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else>
{{getLocalChangeTotalMoney(subItem.PeopleNumber)}}
</template>
</font>
=<font style="color:red">
{{Number(subItem.TotalMoney)+Number(getLocalChangeTotalMoney(subItem.PeopleNumber))}}
</font>
</template>
</td> </td>
<td> <td>
{{subItem.SalePrice}} {{subItem.SalePrice}}
...@@ -693,7 +914,6 @@ ...@@ -693,7 +914,6 @@
{{postConfig.ChangeAduitContent}} {{postConfig.ChangeAduitContent}}
</p> </p>
</template> </template>
<template v-if="IsEdit==2||IsEdit==4"> <template v-if="IsEdit==2||IsEdit==4">
<el-input type="textarea" v-model="postConfig.CRemarks"></el-input> <el-input type="textarea" v-model="postConfig.CRemarks"></el-input>
</template> </template>
...@@ -832,12 +1052,12 @@ ...@@ -832,12 +1052,12 @@
if (!this.currentData) { if (!this.currentData) {
return return
} }
this.OtherPrice = this.currentData.otherPrice this.OtherPrice = this.currentData.otherPrice;
this.dayCostPrice = this.currentData.dayCostPriceList this.dayCostPrice = this.currentData.dayCostPriceList;
this.CostCurrencyList = this.currentData.CostCurrencyList this.CostCurrencyList = this.currentData.CostCurrencyList;
this.CostNumberList = this.currentData.CostNumberList this.CostNumberList = this.currentData.CostNumberList;
this.queryMsg = this.currentData.queryMsg this.queryMsg = this.currentData.queryMsg;
this.teamPrice = this.currentData.teamPrice this.teamPrice = this.currentData.teamPrice;
}, },
//下载文件 //下载文件
downloadFile(fileUrl, fileName) { downloadFile(fileUrl, fileName) {
...@@ -935,6 +1155,11 @@ ...@@ -935,6 +1155,11 @@
xiaoJi += Number(item.DinnerChangeValue) * Number(currencyRate); xiaoJi += Number(item.DinnerChangeValue) * Number(currencyRate);
} }
} }
if (type == 9) {
if (item.IsOtherChange) {
xiaoJi += Number(item.OtherChangeValue) * Number(currencyRate);
}
}
}); });
return xiaoJi.toFixed(0); return xiaoJi.toFixed(0);
}, },
...@@ -948,7 +1173,7 @@ ...@@ -948,7 +1173,7 @@
this.getConvertMoney(this.OtherPrice.AirTicketShareMoney) + 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.KBMoney) this.getConvertMoney(this.OtherPrice.KBMoney)
return totalMoney; return totalMoney;
}, },
...@@ -993,6 +1218,20 @@ ...@@ -993,6 +1218,20 @@
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice; totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
return totalMoney.toFixed(2); return totalMoney.toFixed(2);
}, },
getLocalChangeTotalMoney(PeopleNumber) {
let totalMoney = 0.0;
if (PeopleNumber <= 0) {
PeopleNumber = 1;
}
var hotelPrice = Number(this.getDayChangeXiaoJi(1, 2)); //酒店费用
var sencePrice = Number(this.getDayChangeXiaoJi(3, 2)); //景点费用
var canPrice = Number(this.getDayChangeXiaoJi(4, 2)); //餐
var otherPrice = Number(this.getDayChangeXiaoJi(9, 2)) / PeopleNumber; //其它费用
var busFee = Number(this.getDayChangeXiaoJi(2, 2)) / PeopleNumber; //车费
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
console.log("getLocalChangeTotalMoney", totalMoney);
return totalMoney.toFixed(2);
},
//获取地接项目报价(日元) //获取地接项目报价(日元)
getLocalJpyTotalMoney(PeopleNumber) { getLocalJpyTotalMoney(PeopleNumber) {
if (PeopleNumber <= 0) { if (PeopleNumber <= 0) {
...@@ -1007,6 +1246,20 @@ ...@@ -1007,6 +1246,20 @@
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice; totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
return totalMoney.toFixed(2); return totalMoney.toFixed(2);
}, },
//获取地接项目变更金额
getLocalJpyChangeTotalMoney(PeopleNumber) {
if (PeopleNumber <= 0) {
PeopleNumber = 1;
}
let totalMoney = 0.0;
var busFee = Number(this.getDayChangeXiaoJi(2, 1)) / PeopleNumber;
var hotelPrice = Number(this.getDayChangeXiaoJi(1, 1)); //酒店费用
var sencePrice = Number(this.getDayChangeXiaoJi(3, 1)); //景点费用
var canPrice = Number(this.getDayChangeXiaoJi(4, 1)); //早餐
var otherPrice = Number(this.getDayChangeXiaoJi(9, 1)) / PeopleNumber; //其它费用
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
return totalMoney.toFixed(2);
},
getchange() { getchange() {
this.getLeaderShare(); this.getLeaderShare();
} }
...@@ -1022,4 +1275,5 @@ ...@@ -1022,4 +1275,5 @@
}, },
}; };
</script>
\ No newline at end of file </script>
...@@ -132,6 +132,7 @@ ...@@ -132,6 +132,7 @@
msg, msg,
res => { res => {
this.loading = false; this.loading = false;
console.log("travel_get_GetMyTravelInfo_V4_OfferChange",res.data);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var tempData = res.data.data; var tempData = res.data.data;
if (tempData.ID && tempData.ID > 0) { if (tempData.ID && tempData.ID > 0) {
......
<style> <style>
.DQ_copyTopDiv {
width: 373px;
height: 110px;
font-size: 12px;
padding: 15px;
overflow: auto;
background-color: #f5f5f5;
}
.DQ_copyTopDiv::-webkit-scrollbar {
width: 4px;
height: 8px;
}
.DQ_copyTopDiv::-webkit-scrollbar-thumb {
border-radius: 4px;
box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
background: #c9c9c9;
}
.DQ_copyTopDiv::-webkit-scrollbar-track {
box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
border-radius: 4px;
background: #ededed;
}
.DQ_comSpan {
display: inline-block;
width: 40px;
height: 20px;
background-color: #2aaef2;
text-align: center;
line-height: 20px;
color: #fff;
}
.DQ_details {
width: 100%;
margin-top: 10px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.DQ_dateList {
margin-top: 30px;
}
.DQ_rightDate {
float: right;
margin-top: 18px;
font-size: 12px;
}
.DanCheked {
background-color: #2aa872;
color: #fff !important;
}
.DQ_Ulist li {
list-style-type: none;
display: block;
cursor: pointer;
border: 1px solid #f5f5f5;
padding: 3px;
margin-bottom: 10px;
border-radius: 5px;
}
.DQckedLi {
border-color: #2aa872 !important;
}
.DQ_Ulist li {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
}
.DQ_copyBtn {
float: right;
margin: 0 0 0 30px;
}
.DQ_Otcopy {
float: right;
}
.DrightList {
margin-left: 80px;
}
.ScienTicket .el-form-item__content {
margin-left: 0 !important;
}
.EditQuotation {
position: absolute;
color: #e95252;
right: -27px;
top: -18px;
}
.w875 {
width: 875px !important;
}
</style> </style>
...@@ -116,11 +8,9 @@ ...@@ -116,11 +8,9 @@
<div class="switchDiv clearfix" style="width:98%;"> <div class="switchDiv clearfix" style="width:98%;">
<div class="DirectPriceCenter"> <div class="DirectPriceCenter">
<div class="singlePrice clearfix" v-loading="loading"> <div class="singlePrice clearfix" v-loading="loading">
<CostNewPriceCC ref="CostNewPrice" :postConfig="postData" :OtherPrice="OtherPrice" <CostNewPriceAudit v-if="haveData" ref="CostNewPrice" :postConfig="postData" :OfferArray="OfferArray"
:dayCostPrice="dayCostPriceList" :LineList="LineList" :CostCurrencyList="CostCurrencyList" :IsEdit="0">
:CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt" :teamPrice="teamPrice" </CostNewPriceAudit>
:loading="loading" :OfferId="OfferId">
</CostNewPriceCC>
</div> </div>
</div> </div>
</div> </div>
...@@ -128,15 +18,13 @@ ...@@ -128,15 +18,13 @@
</div> </div>
</template> </template>
<script> <script>
import CostNewPriceCC from "../TravelNewQuotation/CostNewPriceCC"; import CostNewPriceAudit from "../TravelNewQuotation/CostNewPriceAudit";
export default { export default {
props: ['ConfigId', 'OfferId'], props: ['ConfigId', 'OfferId'],
data() { data() {
return { return {
CheckedVaule: 2, haveData: false,
UnCheckedVaule: 1, OfferArray: [],
IsShow: false,
ConfigID: 0,
//基本配置 //基本配置
postData: { postData: {
ID: 0, ID: 0,
...@@ -166,11 +54,13 @@ ...@@ -166,11 +54,13 @@
StartCityId: 0, StartCityId: 0,
ReturnArriveCityId: 0, //返回抵达城市 ReturnArriveCityId: 0, //返回抵达城市
CustomerName: "", //客户名称 CustomerName: "", //客户名称
TeamType: 0, //团队类型 TeamType: 0, //团队类型,
TravelState: 1, //团控状态(1-草稿,2-待审核,3-审核通过,4-审核拒绝,5已撤销) LineName: "", //线路名称
LtName: "", //系列名称
OutBranchId: -1, //出团公司 OutBranchId: -1, //出团公司
OutBranchName: "", //出团公司名称
OutDateTime: "", //出发时间 OutDateTime: "", //出发时间
OfferPayType: 0, //报价单付款方式 OfferPayType: 0, //报价单付款方式()
SaleOfferPayType: 0, //售价付款方式 SaleOfferPayType: 0, //售价付款方式
AuditContent: "", //审核备注 AuditContent: "", //审核备注
AuditByName: "", //审核人员 AuditByName: "", //审核人员
...@@ -185,81 +75,6 @@ ...@@ -185,81 +75,6 @@
PriceTeamType: 0, //团队类型, PriceTeamType: 0, //团队类型,
PriceTeamTypeName: "", //团队类型, PriceTeamTypeName: "", //团队类型,
}, },
dayCostPriceList: [], //报价列表
OtherPrice: {
CostId: 0, //主键编号
ConfigID: 0, //配置编号
OfferId: 0, //报价单编号
InlandAirTicketCurrency: 0, //内陆段机位币种
InlandAirTicketMoney: 0, //内陆段机位金额(每人)
InlandShipTicketCurrency: 0, //内陆段船票币种
InlandShipTicketMoney: 0, //内陆段船票金额(每人)
InlandTrainTicketCurrency: 0, //内陆段火车币种
InlandTrainTicketMoney: 0, //内陆段火车金额(每人)
VisaMoney: 0, //签证费用(每人)
SafeMoney: 0, //保险费用(每人)
LeaderTripMoney: 0, //领队小费
DriverGuideMoney: 0, //司机小费
SalesCommissionMoney: 0, //销售提成
OfficeCommissionMoney: 0, //作业处提成
TripMoney: 0, //小费
GuidePeopleMoney: 0, //导游人头费
AirTicketMoeny: 0, //机票成本费用
KBMoney: 0, //KB人头费
AirTicketShareMoney: 0, //机票分摊费用
TicketShareMoney: 0, //门票分摊费用,
SingleRoomShareMoney: 0, //单房差分摊费用
InlandTrafficShareMoney: 0, //内陆段交通分摊费用
OtherShareMoney: 0, //杂费分摊费用
OtherRemark: "", //其他价格备注
VisaMoneyCurrencyId: 0, //签证费币种
SafeMoneyCurrencyId: 0, //保险费币种
LeaderTripMoneyCurrencyId: 0, //领队小费币种
DriverGuideMoneyCurrencyId: 0, //司机小费币种
LeaderGuideDriveZhuSu: 0, //领队导游住宿费
GuideMoneyCurrencyId: 0, //导游小费币种
GuideMoney: 0, //导游小费
InternationalAirTicket: 0, //国际段机票
InternationalAirTicketCurrency: 0, //国际段机票币种
GuideComplement: 0, //导游回补
TipComplement: 0, //小费回补
},
CostCurrencyList: [], //选择的币种
CostNumberList: [], //人数
CurrencyNumberListExt: [], //币种和人数列表
//团报价信息
teamPrice: {
QuotationId: 0, //主键编号
TeamId: 0, //团期编号
ConfigID: 0, //团队配置编号
OfferId: 0, //报价编号
B2BMemberPrice: 0, //同业会员价
B2BPrice: 0, //同业价格
B2CMemberPrice: 0, //直客会员价,
B2CPrice: 0, //直客价格
ChildNeedPrice: 0, //小孩占床价格,
ChildNoNeedPrice: 0, //小孩不占床价格
BabyPrice: 0, //婴儿价格
BabyChargePrice: 0, //婴儿附加费
OldManChargePrice: 0, //老人附加费
VisaPrice: 0, //签证
OtherPrice: 0, //杂费
SingleRoomPrice: 0, //单房差
SingleDMCPrice: 0, //单地接
RebatePrice: 0, //同行返佣
DiscountPrice: 0, //早鸟优惠
IsSupportChildren: 1, //是否支持儿童出游(1-支持,2-不支持)
SafeMoney: 0, //保险费
PeopleNumber: 0, //人数
AirticketMoney: 0, //机票费用
BackVisaPrice: 0, //退签证费
BackSafeMoney: 0, //退保险费
ContractUrl: "", //合同地址
PriceRemark: "", //定价备注
ContractArray: [],
},
LineList: [], //线路列表
loading: false loading: false
}; };
}, },
...@@ -272,12 +87,15 @@ ...@@ -272,12 +87,15 @@
let msg = { let msg = {
offerId: offerId offerId: offerId
}; };
this.OfferArray = [];
this.haveData = false;
this.loading = true; this.loading = true;
this.apipost( this.apipost(
"travel_get_GetMyTravelInfo_V4", "travel_get_GetMyTravelInfo_V4",
msg, msg,
res => { res => {
this.loading = false; this.loading = false;
console.log("priceDialog", res.data);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var tempData = res.data.data; var tempData = res.data.data;
if (tempData.ID && tempData.ID > 0) { if (tempData.ID && tempData.ID > 0) {
...@@ -310,18 +128,15 @@ ...@@ -310,18 +128,15 @@
if (tempData.NightNum && tempData.NightNum > 0) { if (tempData.NightNum && tempData.NightNum > 0) {
this.postData.NightNum = tempData.NightNum; this.postData.NightNum = tempData.NightNum;
} }
this.postData.CustomerName = tempData.CustomerName;
this.postData.OutBranchId = tempData.OutBranchId;
this.postData.OutDateTime = tempData.OutDateTime;
this.postData.TeamTypeName = tempData.TeamTypeName;
this.postData. PriceTeamType=tempData.PriceTeamType, //团队类型,
this.postData. PriceTeamTypeName=tempData.PriceTeamTypeName, //团队类型,
this.LineList = tempData.LineList;
if (tempData.OfferArray && tempData.OfferArray.length > 0) { if (tempData.OfferArray && tempData.OfferArray.length > 0) {
var offerObj = tempData.OfferArray[0]; var offerObj = tempData.OfferArray[0];
if (offerObj) { if (offerObj) {
if (offerObj.AuditContent) { if (offerObj.AuditContent) {
this.postData.AuditContent = offerObj.AuditContent; if (this.IsEdit == 2) {
this.postData.AuditContent = "";
} else {
this.postData.AuditContent = offerObj.AuditContent;
}
} }
if (offerObj.AuditByName) { if (offerObj.AuditByName) {
this.postData.AuditByName = offerObj.AuditByName; this.postData.AuditByName = offerObj.AuditByName;
...@@ -343,30 +158,6 @@ ...@@ -343,30 +158,6 @@
} }
if (offerObj.ManagerAduitStatus) { if (offerObj.ManagerAduitStatus) {
this.postData.ManagerAduitStatus = offerObj.ManagerAduitStatus; this.postData.ManagerAduitStatus = offerObj.ManagerAduitStatus;
}
if (offerObj.ChangeManagerAduitName) {
this.postData.ChangeManagerAduitName = offerObj.ChangeManagerAduitName;
}
if (offerObj.ChangeManagerAduitContent) {
this.postData.ChangeManagerAduitContent = offerObj.ChangeManagerAduitContent;
}
if (offerObj.ChangeManagerAduitDate) {
this.postData.ChangeManagerAduitDate = offerObj.ChangeManagerAduitDate;
}
if (offerObj.ChangeManagerAduitStatus) {
this.postData.ChangeManagerAduitStatus = offerObj.ChangeManagerAduitStatus;
}
if (offerObj.ChangeAduitContent) {
this.postData.ChangeAduitContent = offerObj.ChangeAduitContent;
}
if (offerObj.ChangeAuditByName) {
this.postData.ChangeAuditByName = offerObj.ChangeAuditByName;
}
if (offerObj.ChangeAduitDate) {
this.postData.ChangeAduitDate = offerObj.ChangeAduitDate;
} }
if (offerObj.OPName && offerObj.OPName != '') { if (offerObj.OPName && offerObj.OPName != '') {
this.postData.OPName = offerObj.OPName; this.postData.OPName = offerObj.OPName;
...@@ -381,28 +172,23 @@ ...@@ -381,28 +172,23 @@
this.postData.SaleOfferPayType = offerObj.SaleOfferPayType; this.postData.SaleOfferPayType = offerObj.SaleOfferPayType;
} }
} }
this.currentData = tempData.OfferArray.find(item => item.IsDefault);
if (this.currentData) {
if (this.currentData.otherPrice) {
this.OtherPrice = this.currentData.otherPrice
}
if (this.currentData.dayCostPriceList) {
this.dayCostPriceList = this.currentData.dayCostPriceList
}
if (this.currentData.CostCurrencyList) {
this.CostCurrencyList = this.currentData.CostCurrencyList
}
if (this.currentData.CostNumberList) {
this.CostNumberList = this.currentData.CostNumberList
}
if (this.currentData.queryMsg) {
this.queryMsg = this.currentData.queryMsg
}
if (this.currentData.teamPrice) {
this.teamPrice = this.currentData.teamPrice
}
}
} }
this.postData.CustomerName = tempData.CustomerName;
this.postData.OutBranchId = tempData.OutBranchId;
this.postData.OutDateTime = tempData.OutDateTime;
this.postData.LineName = tempData.LineName;
this.postData.LtName = tempData.LtName;
this.postData.OutBranchName = tempData.OutBranchName;
this.postData.TeamTypeName = tempData.TeamTypeName;
this.postData.TeamType = tempData.TeamType;
this.postData.PriceTeamTypeName = tempData.PriceTeamTypeName;
this.postData.PriceTeamType = tempData.PriceTeamType;
if (tempData.OfferArray) {
tempData.OfferArray.forEach(item => {
this.OfferArray.push(item)
})
}
this.haveData = true;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -415,7 +201,7 @@ ...@@ -415,7 +201,7 @@
this.getPostData() this.getPostData()
}, },
components: { components: {
CostNewPriceCC: CostNewPriceCC CostNewPriceAudit: CostNewPriceAudit
} }
}; };
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
border-bottom: 1px solid #606266; border-bottom: 1px solid #606266;
padding-left: 5px !important; padding-left: 5px !important;
} }
</style> </style>
<template> <template>
...@@ -47,7 +48,7 @@ ...@@ -47,7 +48,7 @@
<td style="width:100px;" class="CP_ComTitle2 CostcomCenter">变更类型</td> <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">变更类型</td>
<td style="width:100px;" class="CP_ComTitle2 CostcomCenter">天数</td> <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">天数</td>
<td style="width:100px;" class="CP_ComTitle2 CostcomCenter">变更值</td> <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">变更值</td>
<td style="width:100px;" class="CP_ComTitle2 CostcomCenter">变更备注</td> <td style="width:250px;" class="CP_ComTitle2 CostcomCenter">变更备注</td>
<td style="width:100px;" class="CP_ComTitle2 CostcomCenter"> <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">
<a style="color:blue;cursor:pointer;" @click="AddOfferObj()">添加</a> <a style="color:blue;cursor:pointer;" @click="AddOfferObj()">添加</a>
</td> </td>
...@@ -75,7 +76,10 @@ ...@@ -75,7 +76,10 @@
<el-input v-model="item.ChangeValue" style="width:100px;" max="6"></el-input> <el-input v-model="item.ChangeValue" style="width:100px;" max="6"></el-input>
</td> </td>
<td> <td>
<el-input v-model="item.ChangeRemarks" style="width:100px;" maxlength="50"></el-input> <el-select v-model="item.ChangeRemarks" placeholder="请选择">
<el-option v-for="(cItem,cIndex) in changeRemarkList" :key="cIndex" :label="cItem.Name"
:value="cItem.Name"></el-option>
</el-select>
</td> </td>
<td> <td>
<a style="color:red;cursor:pointer;" @click="DeleteOfferChange(item,index)">删除</a> <a style="color:red;cursor:pointer;" @click="DeleteOfferChange(item,index)">删除</a>
...@@ -98,6 +102,9 @@ ...@@ -98,6 +102,9 @@
loading: false, loading: false,
dataList: [], dataList: [],
changeTypeList: [], //变更类型 changeTypeList: [], //变更类型
changeRemarkList: [
]
}; };
}, },
methods: { methods: {
...@@ -197,13 +204,25 @@ ...@@ -197,13 +204,25 @@
this.changeTypeList = res.data.data; this.changeTypeList = res.data.data;
} }
}); });
},
getChangeRemark() {
var posMsg = {
Key: "Travel_Offer_ChangeRemark"
};
this.apipost("dict_get_GetDictValueCommonList", posMsg, res => {
if (res.data.resultCode == 1) {
this.changeRemarkList = res.data.data;
}
});
} }
}, },
created() { created() {
this.getChangeType(); this.getChangeType();
this.getChangeRemark();
}, },
mounted() { mounted() {
this.getOfferChange(); this.getOfferChange();
} }
}; };
</script>
\ No newline at end of file </script>
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