Commit 94667847 authored by 吴春's avatar 吴春

1

parent 3941af00
......@@ -1035,7 +1035,30 @@
.RegistrationList .el-upload-list {
width: 200px;
}
.PQ_detail {
width: 100%;
border-collapse: collapse;
}
.PQ_detail tr th,
.v-table-title-cell {
background: #e6e6e6;
height: 40px;
font-size: 14px;
border-right: 1px solid #e6e6e6;
color: #333;
}
.PQ_detail tr {
background: #fff;
text-align: center;
height: 40px;
}
.PQ_detail tr td {
font-size: 12px;
border: 1px solid #e5e5e5;
}
</style>
<template>
......@@ -2373,7 +2396,190 @@
<td class="nowrap">{{ childItem.TC_Price }}</td>
<td>{{ childItem.Unit_Price }}</td>
<td class="nowrap">
<p>{{ childItem.PreferPrice }}</p>
<p style="text-decoration: underline;cursor: pointer;" @click="SellPrice(childItem)">
{{childItem.OrderPrice.B2BMemberPrice}}
<!-- <el-popover width="630" trigger="click"> -->
<el-popover width="630" >
<table class="PQ_detail">
<tr>
<td
colspan="6"
style="text-align: left; padding-left: 10px"
>
{{ $t("salesModule.BasePrice") }}
</td>
</tr>
<tr>
<td
colspan="6"
style="text-align: left; padding-left: 10px"
>
总金额:{{getTotalList(childItem)}}
<!--
decimal PreferPrice = ((dmodel.Unit_Price ?? 0) - (model.DiscountPrice ?? 0)) * (dmodel.ManNum ?? 0);
PreferPrice += ((dmodel.Unit_Price ?? 0) + (model.BabyChargePrice ?? 0) - (model.DiscountPrice ?? 0)) * (dmodel.ChirdNum ?? 0);
PreferPrice += (dmodel.BabyNum ?? 0) * (model.BabyPrice ?? 0);
PreferPrice += ((dmodel.Unit_Price ?? 0) + (model.OldManChargePrice ?? 0) - (model.DiscountPrice ?? 0)) * (dmodel.OldPeopleNum ?? 0);
PreferPrice += (model.OtherPrice ?? 0) * (TotalPNum);
PreferPrice += (model.VisaPrice ?? 0) * (TotalPNum);
PreferPrice -= (model.BackVisaPrice ?? 0) * (TotalPNum + (dmodel.BabyNum ?? 0) - (dmodel.VisaNum ?? 0));
PreferPrice += (dmodel.SingleRoomNum ?? 0) * (model.SingleRoomPrice ?? 0);
PreferPrice += (dmodel.ChirdNeedBedNum ?? 0) * (model.ChildNeedPrice ?? 0);
PreferPrice -= ((dmodel.ChirdNum ?? 0) - (dmodel.ChirdNeedBedNum ?? 0)) * (model.ChildNoNeedPrice ?? 0);
PreferPrice -= (ScenicRefundMoney) * TotalPNum;
PreferPrice += UnionPrice;
PreferPrice += (model.SingleDMCPrice ?? 0) * (dmodel.AirticketNum ?? 0); -->
</td>
</tr>
<tr>
<th>{{ $t("advmanager.v_type") }}</th>
<th>{{ $t("salesModule.HYTHJ") }}</th>
<th>{{ $t("salesModule.PTTHJ") }}</th>
<th>{{ $t("salesModule.ZKHYJ") }}</th>
<th colspan="2">{{ $t("salesModule.PTZKJ") }}</th>
</tr>
<tr>
<td>{{ $t("salesModule.Adult") }}</td>
<td>
{{
childItem.OrderPrice.B2BMemberPrice | priceFormat(childItem.OrderPrice.B2BMemberPrice)
}}
</td>
<td>{{ childItem.OrderPrice.B2BPrice | priceFormat(childItem.OrderPrice.B2BPrice) }}</td>
<td>
{{
childItem.OrderPrice.B2CMemberPrice | priceFormat(childItem.OrderPrice.B2CMemberPrice)
}}
</td>
<td colspan="2">
{{ childItem.OrderPrice.B2CPrice | priceFormat(childItem.OrderPrice.B2CPrice) }}
</td>
</tr>
<tr>
<td>{{ $t("salesModule.ChildBed") }}</td>
<td>
{{
(childItem.OrderPrice.B2BMemberPrice + childItem.OrderPrice.ChildNeedPrice)
| priceFormat(
childItem.OrderPrice.B2BMemberPrice + childItem.OrderPrice.ChildNeedPrice
)
}}
</td>
<td>
{{
(childItem.OrderPrice.B2BPrice + childItem.OrderPrice.ChildNeedPrice)
| priceFormat(childItem.OrderPrice.B2BPrice + childItem.OrderPrice.ChildNeedPrice)
}}
</td>
<td>
{{
(childItem.OrderPrice.B2CMemberPrice + childItem.OrderPrice.ChildNeedPrice)
| priceFormat(
childItem.OrderPrice.B2CMemberPrice + childItem.OrderPrice.ChildNeedPrice
)
}}
</td>
<td colspan="2">
{{
(childItem.OrderPrice.B2CPrice + childItem.OrderPrice.ChildNeedPrice)
| priceFormat(childItem.OrderPrice.B2CPrice + childItem.OrderPrice.ChildNeedPrice)
}}
</td>
</tr>
<tr>
<td>{{ $t("salesModule.ChildNoBed") }}</td>
<td>
{{
(childItem.OrderPrice.B2BMemberPrice - childItem.OrderPrice.ChildNoNeedPrice)
| priceFormat(
childItem.OrderPrice.B2BMemberPrice - childItem.OrderPrice.ChildNoNeedPrice
)
}}
</td>
<td>
{{
(childItem.OrderPrice.B2BPrice - childItem.OrderPrice.ChildNoNeedPrice)
| priceFormat(childItem.OrderPrice.B2BPrice - childItem.OrderPrice.ChildNoNeedPrice)
}}
</td>
<td>
{{
(childItem.OrderPrice.B2CMemberPrice - childItem.OrderPrice.ChildNoNeedPrice)
| priceFormat(
childItem.OrderPrice.B2CMemberPrice - childItem.OrderPrice.ChildNoNeedPrice
)
}}
</td>
<td colspan="2">
{{
(childItem.OrderPrice.B2CPrice - childItem.OrderPrice.ChildNoNeedPrice)
| priceFormat(childItem.OrderPrice.B2CPrice - childItem.OrderPrice.ChildNoNeedPrice)
}}
</td>
</tr>
<tr>
<td>{{ $t("salesModule.SingleJ") }}</td>
<td colspan="5">
{{
childItem.OrderPrice.SingleDMCPrice | priceFormat(childItem.OrderPrice.SingleDMCPrice)
}}
</td>
</tr>
<tr>
<td>{{ $t("Operation.Op_baby") }}</td>
<td colspan="5">
{{ childItem.OrderPrice.BabyPrice | priceFormat(childItem.OrderPrice.BabyPrice) }}
</td>
</tr>
<tr>
<td
colspan="6"
style="text-align: left; padding-left: 10px"
>
{{ $t("salesModule.OtherPrice") }}
</td>
</tr>
<tr>
<th>{{ $t("Operation.Op_oldmanSurcharge") }}</th>
<th>{{ $t("Operation.Op_childSurcharge") }}</th>
<th>{{ $t("salesModule.VisaBack") }}</th>
<th>{{ $t("Operation.Op_singleRoomcha") }}</th>
<th>{{ $t("Operation.Op_zafei") }}</th>
<th>小费</th>
</tr>
<tr>
<td>
{{
childItem.OrderPrice.OldManChargePrice
| priceFormat(childItem.OrderPrice.OldManChargePrice)
}}
</td>
<td>
{{
childItem.OrderPrice.BabyChargePrice
| priceFormat(childItem.OrderPrice.BabyChargePrice)
}}
</td>
<td>
{{ childItem.OrderPrice.VisaPrice | priceFormat2(childItem.OrderPrice.VisaPrice) }}(-{{
childItem.OrderPrice.BackVisaPrice | priceFormat(childItem.OrderPrice.BackVisaPrice)
}}
</td>
<td>
{{
childItem.OrderPrice.SingleRoomPrice
| priceFormat(childItem.OrderPrice.SingleRoomPrice)
}}
</td>
<td>
{{ childItem.OrderPrice.OtherPrice | priceFormat(childItem.OrderPrice.OtherPrice) }}
</td>
<td>{{ childItem.OrderPrice.TipAmount ? childItem.OrderPrice.TipAmount : "0.00" }}</td>
</tr>
</table>
<span slot="reference" class="price">{{ childItem.PreferPrice }}</span>
</el-popover>
<!-- {{ childItem.PreferPrice }} --></p>
</td>
<td class="nowrap">
<el-popover style="padding: 0" width="400" trigger="click">
......@@ -4319,16 +4525,42 @@
if (value == null) {
return 0.0;
}
let nStr = ""; //value.toFixed(2);
console.log("value",value);
let nStr = value.toFixed(2);
let x = nStr.split(".");
let x1 = x[0];
console.log("X1",x1);
let x2 = x.length > 1 ? "." + x[1] : "";
console.log("X2",x2);
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, "$1" + "," + "$2");
}
return x1 + x2;
},
priceFormat2(value) {
if (value == null) {
return "已包含";
}
let nStr = value.toFixed(2);
nStr += "";
let x = nStr.split(".");
let x1 = x[0];
let x2 = x.length > 1 ? "." + x[1] : "";
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, "$1" + "," + "$2");
}
let result = x1 + x2;
if (result === "0.00") {
result = "已包含";
}
return result;
},
},
methods: {
//显示订单联运信息
......@@ -5343,6 +5575,83 @@
this.notUpdate = true;
}
},
getTotalList(childItem) {
let String1 = '',Price1 = 0,String2 = '',Price2 = 0,String3 = '',Price3 = 0,
String4 = '',Price4 = 0,String5 = '',Price5 = 0,String6 = '',Price6 = 0,
String7 = '',Price7 = 0,String8 = '',Price8 = 0,String9 = '',Price9 = 0,
String10 = '',Price10 = 0,String11 = '',Price11 = 0,String12 = '',Price12 = 0
let datas = ''
if(childItem.ManNum>0) {
String1 = `${childItem.Unit_Price}-${childItem.DiscountPrice>0?childItem.DiscountPrice:0}*${childItem.ManNum}`
Price1 = childItem.Unit_Price-(childItem.DiscountPrice>0?childItem.DiscountPrice:0)*childItem.ManNum
console.log(String1,Price1,'------String1')
}
if(childItem.ChirdNum>0){
String2 = `(${childItem.Unit_Price } + ${childItem.OrderPrice.BabyChargePrice} - ${childItem.DiscountPrice>0?childItem.DiscountPrice:0 }) * ${childItem.ChirdNum}`
Price2 = (childItem.Unit_Price + childItem.OrderPrice.BabyChargePrice - (childItem.DiscountPrice>0?childItem.DiscountPrice:0 )) * childItem.ChirdNum
console.log(String1,Price2,'------String2')
}
if(childItem.BabyNum>0){
String3 = `${childItem.BabyNum} * ${childItem.OrderPrice.BabyPrice}`
Price3 = childItem.BabyNum*childItem.OrderPrice.BabyPrice
console.log(String1,Price3,'------String3')
}
if(childItem.OldPeopleNum>0){
String4 = `(${childItem.OrderPrice.Unit_Price} + ${childItem.OrderPrice.OldManChargePrice} - ${childItem.DiscountPrice}) * ${childItem.OldPeopleNum}`
Price4 = (childItem.OrderPrice.Unit_Price + childItem.OrderPrice.OldManChargePrice - childItem.DiscountPrice) * childItem.OldPeopleNum
console.log(String1,Price4,'------String4')
}
if(childItem.GuestNum>0){
String5 = `${childItem.OrderPrice.OtherPrice } * ${childItem.GuestNum}`
Price5 = childItem.OrderPrice.OtherPrice * childItem.GuestNum
console.log(String1,Price5,'------String5')
String6 = `${childItem.OrderPrice.VisaPrice } * ${childItem.GuestNum}`
Price6 = childItem.OrderPrice.VisaPrice * childItem.GuestNum
console.log(String1,Price6,'------String6')
String7 = `({{childItem.OrderPrice.BackVisaPrice }}) * ({{childItem.GuestNum}} + ({{childItem.BabyNum}} ) - ({{childItem.VisaNum}}))`
Price7 = childItem.OrderPrice.VisaPrice * childItem.GuestNum
console.log(String7,Price7,'------String7')
String8 = `({{childItem.SingleRoomNum}} ) * ({{childItem.OrderPrice.SingleRoomPrice}} )`
Price8 = childItem.OrderPrice.VisaPrice * childItem.GuestNum
console.log(String8,Price8,'------String8')
String9 = `({{childItem.ChirdNeedBedNum}} ) * ({{childItem.OrderPrice.ChildNeedPrice}} )`
Price9 = childItem.OrderPrice.VisaPrice * childItem.GuestNum
console.log(String9,Price9,'------String9')
String10 = `(({{childItem.ChirdNum }}) - ({{childItem.ChirdNeedBedNum }})) * ({{childItem.OrderPrice.ChildNoNeedPrice}})`
Price10 = childItem.OrderPrice.VisaPrice * childItem.GuestNum
console.log(String10,Price10,'------String10')
String11 = `{{childItem.OrderPrice.GoAddPrice}}+{{childItem.OrderPrice.BackAddPrice}}`
Price11 = childItem.OrderPrice.VisaPrice * childItem.GuestNum
console.log(String11,Price11,'------String11')
String12 = `({{childItem.OrderPrice.SingleDMCPrice }}) * ({{childItem.AirticketNum }})`
Price12 = childItem.OrderPrice.VisaPrice * childItem.GuestNum
console.log(String12,Price12,'------String10')
}
return {
String: ``,
Price: 0
}
// + ({{childItem.Unit_Price }} + {{childItem.OrderPrice.BabyChargePrice}} - {{childItem.DiscountPrice>0?childItem.DiscountPrice:0 }}) * {{childItem.ChirdNum}}
// + {{childItem.BabyNum }}* {{childItem.OrderPrice.BabyPrice}}
// + ({{childItem.OrderPrice.Unit_Price}} + ( {{childItem.OrderPrice.OldManChargePrice}}) - ( {{childItem.DiscountPrice}})) * ( {{childItem.OldPeopleNum}})
// + ({{childItem.OrderPrice.OtherPrice }}) * ({{childItem.GuestNum}})
// + ({{childItem.OrderPrice.VisaPrice}} ) * ({{childItem.GuestNum}})
// - ({{childItem.OrderPrice.BackVisaPrice }}) * ({{childItem.GuestNum}} + ({{childItem.BabyNum}} ) - ({{childItem.VisaNum}}))
// + ({{childItem.SingleRoomNum}} ) * ({{childItem.OrderPrice.SingleRoomPrice}} )
// + ({{childItem.ChirdNeedBedNum}} ) * ({{childItem.OrderPrice.ChildNeedPrice}} )
// - (({{childItem.ChirdNum }}) - ({{childItem.ChirdNeedBedNum }})) * ({{childItem.OrderPrice.ChildNoNeedPrice}})
// +{{childItem.OrderPrice.GoAddPrice}}+{{childItem.OrderPrice.BackAddPrice}}
// + ({{childItem.OrderPrice.SingleDMCPrice }}) * ({{childItem.AirticketNum }})
},
getTotalPrice(t) {
if (t === 3) {
if (parseFloat(this.addMsg.Unit_Price).toString() === "NaN") {
......@@ -6008,6 +6317,9 @@
},
(err) => {}
);
},
SellPrice(obj) {
},
getList() {
this.showID = -1;
......
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