Skip to content

S
SuperMan
Commit 5ecaff45 authored by wuchun's avatar wuchun
Browse files
Options

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

parents cd7c5036 dfa49e94
Hide whitespace changes
Inline Side-by-side
Showing with 411 additions and 30 deletions
src/components/TravelManager/TravelTeam/priceGroup.vue
View file @ 5ecaff45
......@@ -534,7 +534,20 @@
.p20 {
padding: 20px;
}
.item-title {
font-size: 12px;
font-weight: normal;
color: #666;
}
.bold {
font-weight: bold;
}
.price {
cursor: pointer;
}
.price:hover {
color: red;
}
</style>
<template>
......@@ -578,8 +591,8 @@
<div class="p20">
<div class="mb title"><i class="iconfont icon-biaoti1"></i><span>包机信息</span></div>
<div class="mb"><span>{{item.Title}}</span></div>
<div>出发日期：<span>{{item.StartDate}}</span></div>
<div>团队信息：<span>{{item.TCNUM}}({{item.TCID}})</span></div>
<div class="bold"><span class="item-title">出发日期：</span><span>{{item.StartDate}}</span></div>
<div class="bold"><span class="item-title">团队信息：</span><span>{{item.TCNUM}}({{item.TCID}})</span></div>
</div>
</div>
<div class="el-col w_20">
......@@ -595,24 +608,195 @@
<div class="el-col w_10">
<div class="p20">
<div class="mb title"><i class="iconfont icon-jiage"></i><span>团位信息</span></div>
<div class="mb">当前余位：{{item.SurplusSeat}}</div>
<div class="mb">已报入： {{item.JoinNum}}
<div class="mb bold"><span class="item-title">当前余位：</span>{{item.SurplusSeat}}</div>
<div class="mb bold"><span class="item-title">已报入：</span>{{item.JoinNum}}
<span class="TCL-redType"
v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('Operation.Op_people')}}
</div>
<div class="mb">占位：{{item.Occupied}}</div>
<div class="mb">候补： <span v-if="item.IsSubstitution==1"
<div class="mb bold"><span class="item-title">占位：</span>{{item.Occupied}}</div>
<div class="mb bold"><span class="item-title">候补：</span> <span v-if="item.IsSubstitution==1"
class="TCL-greenType">{{$t('visa.v_yxhoubu')}}（{{$t('visa.v_houbu')}}{{item.HBNum}}{{$t('Operation.Op_people')}}）</span>
<span v-else class="TCL-redType">{{$t('visa.v_byxhoubu')}}</span></div>
</div>
</div>
<div class="el-col w_10">
<div class="p20">
<div class="mb title"><i class="iconfont icon-jiage"></i><span>价格信息</span></div>
<div class="mb"><span>中心价: {{item.B2BMemberPrice}}</span></div>
<!-- <div class="mb title"><i class="iconfont icon-jiage"></i><span>价格信息</span></div> -->
<!-- <div class="mb"><span>中心价: {{item.B2BMemberPrice}}</span></div>
<div class="mb"><span>小孩占床: {{item.ChildNeedPrice}}&nbsp;不占床: {{item.ChildNoNeedPrice}}</span></div>
<div class="mb"><span>婴儿: {{item.BabyPrice}}&nbsp; 婴儿附加费: {{item.BabyChargePrice}}</span></div>
<div class="mb"><span>老人附加费: {{item.OldManChargePrice}} &nbsp;签证: {{item.VisaPrice}}</span></div>
<div class="mb"><span>老人附加费: {{item.OldManChargePrice}} &nbsp;签证: {{item.VisaPrice}}</span></div> -->
<div>
<p>
<i class="iconfont icon-jiage"></i>{{ $t("Operation.Op_PriceInfo") }}
</p>
<p style="
color: #47bf8c;
font-size: 16px;
font-weight: bold;
margin: 5px 0;
">
{{ $t("Operation.Op_tradePrice") }}:￥{{
item.B2BMemberPrice | priceFormat(item.B2BMemberPrice)
}}<br />
{{ $t("Operation.Op_directPrice") }}:￥{{
item.B2CMemberPrice | priceFormat(item.B2CMemberPrice)
}}
</p>
<p>
<el-popover width="630" trigger="click">
<table class="PQ_detail">
<tr>
<td colspan="5" style="text-align: left; padding-left: 10px">
{{ $t("salesModule.BasePrice") }}
</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>{{ $t("salesModule.PTZKJ") }}</th>
</tr>
<tr>
<td>{{ $t("salesModule.Adult") }}</td>
<td>
{{
item.B2BMemberPrice | priceFormat(item.B2BMemberPrice)
}}
</td>
<td>{{ item.B2BPrice | priceFormat(item.B2BPrice) }}</td>
<td>
{{
item.B2CMemberPrice | priceFormat(item.B2CMemberPrice)
}}
</td>
<td>{{ item.B2CPrice | priceFormat(item.B2CPrice) }}</td>
</tr>
<tr>
<td>{{ $t("salesModule.ChildBed") }}</td>
<td>
{{
(item.B2BMemberPrice + item.ChildNeedPrice)
| priceFormat(
item.B2BMemberPrice + item.ChildNeedPrice
)
}}
</td>
<td>
{{
(item.B2BPrice + item.ChildNeedPrice)
| priceFormat(item.B2BPrice + item.ChildNeedPrice)
}}
</td>
<td>
{{
(item.B2CMemberPrice + item.ChildNeedPrice)
| priceFormat(
item.B2CMemberPrice + item.ChildNeedPrice
)
}}
</td>
<td>
{{
(item.B2CPrice + item.ChildNeedPrice)
| priceFormat(item.B2CPrice + item.ChildNeedPrice)
}}
</td>
</tr>
<tr>
<td>{{ $t("salesModule.ChildNoBed") }}</td>
<td>
{{
(item.B2BMemberPrice - item.ChildNoNeedPrice)
| priceFormat(
item.B2BMemberPrice - item.ChildNoNeedPrice
)
}}
</td>
<td>
{{
(item.B2BPrice - item.ChildNoNeedPrice)
| priceFormat(item.B2BPrice - item.ChildNoNeedPrice)
}}
</td>
<td>
{{
(item.B2CMemberPrice - item.ChildNoNeedPrice)
| priceFormat(
item.B2CMemberPrice - item.ChildNoNeedPrice
)
}}
</td>
<td>
{{
(item.B2CPrice - item.ChildNoNeedPrice)
| priceFormat(item.B2CPrice - item.ChildNoNeedPrice)
}}
</td>
</tr>
<tr>
<td>{{ $t("salesModule.SingleJ") }}</td>
<td colspan="4">
{{
item.SingleDMCPrice | priceFormat(item.SingleDMCPrice)
}}
</td>
</tr>
<tr>
<td>{{ $t("Operation.Op_baby") }}</td>
<td colspan="4">
{{ item.BabyPrice | priceFormat(item.BabyPrice) }}
</td>
</tr>
<tr>
<td colspan="5" 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>
</tr>
<tr>
<td>
{{
item.OldManChargePrice
| priceFormat(item.OldManChargePrice)
}}
</td>
<td>
{{
item.BabyChargePrice
| priceFormat(item.BabyChargePrice)
}}
</td>
<td>
{{ item.VisaPrice | priceFormat2(item.VisaPrice) }}（-{{
item.BackVisaPrice | priceFormat(item.BackVisaPrice)
}}）
</td>
<td>
{{
item.SingleRoomPrice
| priceFormat(item.SingleRoomPrice)
}}
</td>
<td>
{{ item.OtherPrice | priceFormat(item.OtherPrice) }}
</td>
</tr>
</table>
<span slot="reference" class="price">{{
$t("Operation.Op_priceDetail")
}}</span>
</el-popover>
</p>
</div>
</div>
</div>
<div class="el-col w_20">
......@@ -626,10 +810,10 @@
<div class="el-col w_10">
<div class="p20">
<div class="mb title"><i class="iconfont icon-yuangong"></i><span>发起信息</span></div>
<div class="mb">发起人：{{item.OPName}}</div>
<div class="mb"><span>经济舱: {{item.YSeat}}</span></div>
<div class="mb"><span>商务舱: {{item.CSeat}}</span></div>
<div class="mb"><span>头等舱: {{item.FSeat}}</span></div>
<div class="mb bold"><span class="item-title">发起人：</span>{{item.OPName}}</div>
<div class="mb bold"><span class="item-title">经济舱: </span><span>{{item.YSeat}}</span></div>
<div class="mb bold"><span class="item-title">商务舱: </span><span>{{item.CSeat}}</span></div>
<div class="mb bold"><span class="item-title">头等舱: </span><span>{{item.FSeat}}</span></div>
</div>
</div>
<div class="el-col w_10">
......
src/components/TravelManager/TravelTeam/travelTeamList.vue
View file @ 5ecaff45
......@@ -25,6 +25,20 @@
padding: 20px;
}
.item-title {
font-size: 12px;
font-weight: normal;
color: #666;
}
.bold {
font-weight: bold;
}
.price {
cursor: pointer;
}
.price:hover {
color: red;
}
</style>
<template>
<div class="TC_Content">
......@@ -97,8 +111,8 @@
<div class="p20">
<div class="mb title"><i class="iconfont icon-biaoti1"></i><span>包机信息</span></div>
<div class="mb"><span>{{item.GTeamName}}</span></div>
<div>出发日期：<span>{{item.StartDate}}</span></div>
<div>团队信息：<span>{{item.TCNUM}}({{item.TCID}})</span></div>
<div class="bold"><span class="item-title">出发日期：</span><span>{{item.StartDate}}</span></div>
<div class="bold"><span class="item-title">团队信息：</span><span>{{item.TCNUM}}({{item.TCID}})</span></div>
</div>
</div>
<div class="el-col w_20">
......@@ -114,20 +128,191 @@
<div class="el-col w_10">
<div class="p20">
<div class="mb title"><i class="iconfont icon-jiage"></i><span>机位信息</span></div>
<div class="mb"><span>经济舱: {{item.YSeat}} 剩余:{{item.SurplusYSeatNum}}</span></div>
<div class="mb"><span>商务舱: {{item.CSeat}} 剩余:{{item.SurplusCSeatNum}}</span></div>
<div class="mb"><span>头等舱: {{item.FSeat}} 剩余:{{item.SurplusFSeatNum}}</span></div>
<div class="mb"><span>报名人数: {{item.OrderGuestNum}} </span></div>
<div class="mb"><span>领队导游: {{item.LeaderNum}} </span></div>
<div class="mb bold"><span class="item-title">经济舱:</span><span>{{item.YSeat}} <span class="item-title">剩余:</span>{{item.SurplusYSeatNum}}</span></div>
<div class="mb bold"><span class="item-title">商务舱:</span><span> {{item.CSeat}} <span class="item-title">剩余:</span>{{item.SurplusCSeatNum}}</span></div>
<div class="mb bold"><span class="item-title">头等舱:</span><span> {{item.FSeat}} <span class="item-title">剩余:</span>{{item.SurplusFSeatNum}}</span></div>
<div class="mb bold"><span class="item-title">报名人数:</span><span> {{item.OrderGuestNum}} </span></div>
<div class="mb bold"><span class="item-title">领队导游:</span><span> {{item.LeaderNum}} </span></div>
</div>
</div>
<div class="el-col w_10">
<div class="p20">
<div class="mb title"><i class="iconfont icon-jiage"></i><span>价格信息</span></div>
<!-- <div class="mb title"><i class="iconfont icon-jiage"></i><span>价格信息</span></div>
<div class="mb"><span>中心价: {{item.MiddlePrice}}</span></div>
<div class="mb"><span>小孩占床: {{item.ChildNeedPrice}}&nbsp;不占床: {{item.ChildNoNeedPrice}}</span></div>
<div class="mb"><span>婴儿: {{item.BabyPrice}}&nbsp; 婴儿附加费: {{item.BabyChargePrice}}</span></div>
<div class="mb"><span>老人附加费: {{item.OldManChargePrice}} &nbsp;签证: {{item.VisaPrice}}</span></div>
<div class="mb"><span>老人附加费: {{item.OldManChargePrice}} &nbsp;签证: {{item.VisaPrice}}</span></div> -->
<div>
<p>
<i class="iconfont icon-jiage"></i>{{ $t("Operation.Op_PriceInfo") }}
</p>
<p style="
color: #47bf8c;
font-size: 16px;
font-weight: bold;
margin: 5px 0;
">
{{ $t("Operation.Op_tradePrice") }}:￥{{
item.B2BMemberPrice | priceFormat(item.B2BMemberPrice)
}}<br />
{{ $t("Operation.Op_directPrice") }}:￥{{
item.B2CMemberPrice | priceFormat(item.B2CMemberPrice)
}}
</p>
<p>
<el-popover width="630" trigger="click">
<table class="PQ_detail">
<tr>
<td colspan="5" style="text-align: left; padding-left: 10px">
{{ $t("salesModule.BasePrice") }}
</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>{{ $t("salesModule.PTZKJ") }}</th>
</tr>
<tr>
<td>{{ $t("salesModule.Adult") }}</td>
<td>
{{
item.B2BMemberPrice | priceFormat(item.B2BMemberPrice)
}}
</td>
<td>{{ item.B2BPrice | priceFormat(item.B2BPrice) }}</td>
<td>
{{
item.B2CMemberPrice | priceFormat(item.B2CMemberPrice)
}}
</td>
<td>{{ item.B2CPrice | priceFormat(item.B2CPrice) }}</td>
</tr>
<tr>
<td>{{ $t("salesModule.ChildBed") }}</td>
<td>
{{
(item.B2BMemberPrice + item.ChildNeedPrice)
| priceFormat(
item.B2BMemberPrice + item.ChildNeedPrice
)
}}
</td>
<td>
{{
(item.B2BPrice + item.ChildNeedPrice)
| priceFormat(item.B2BPrice + item.ChildNeedPrice)
}}
</td>
<td>
{{
(item.B2CMemberPrice + item.ChildNeedPrice)
| priceFormat(
item.B2CMemberPrice + item.ChildNeedPrice
)
}}
</td>
<td>
{{
(item.B2CPrice + item.ChildNeedPrice)
| priceFormat(item.B2CPrice + item.ChildNeedPrice)
}}
</td>
</tr>
<tr>
<td>{{ $t("salesModule.ChildNoBed") }}</td>
<td>
{{
(item.B2BMemberPrice - item.ChildNoNeedPrice)
| priceFormat(
item.B2BMemberPrice - item.ChildNoNeedPrice
)
}}
</td>
<td>
{{
(item.B2BPrice - item.ChildNoNeedPrice)
| priceFormat(item.B2BPrice - item.ChildNoNeedPrice)
}}
</td>
<td>
{{
(item.B2CMemberPrice - item.ChildNoNeedPrice)
| priceFormat(
item.B2CMemberPrice - item.ChildNoNeedPrice
)
}}
</td>
<td>
{{
(item.B2CPrice - item.ChildNoNeedPrice)
| priceFormat(item.B2CPrice - item.ChildNoNeedPrice)
}}
</td>
</tr>
<tr>
<td>{{ $t("salesModule.SingleJ") }}</td>
<td colspan="4">
{{
item.SingleDMCPrice | priceFormat(item.SingleDMCPrice)
}}
</td>
</tr>
<tr>
<td>{{ $t("Operation.Op_baby") }}</td>
<td colspan="4">
{{ item.BabyPrice | priceFormat(item.BabyPrice) }}
</td>
</tr>
<tr>
<td colspan="5" 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>
</tr>
<tr>
<td>
{{
item.OldManChargePrice
| priceFormat(item.OldManChargePrice)
}}
</td>
<td>
{{
item.BabyChargePrice
| priceFormat(item.BabyChargePrice)
}}
</td>
<td>
{{ item.VisaPrice | priceFormat2(item.VisaPrice) }}（-{{
item.BackVisaPrice | priceFormat(item.BackVisaPrice)
}}）
</td>
<td>
{{
item.SingleRoomPrice
| priceFormat(item.SingleRoomPrice)
}}
</td>
<td>
{{ item.OtherPrice | priceFormat(item.OtherPrice) }}
</td>
</tr>
</table>
<span slot="reference" class="price">{{
$t("Operation.Op_priceDetail")
}}</span>
</el-popover>
</p>
</div>
</div>
</div>
<div class="el-col w_20">
......@@ -141,7 +326,7 @@
<div class="el-col w_10">
<div class="p20">
<div class="mb title"><i class="iconfont icon-yuangong"></i><span>发起信息</span></div>
<div class="mb">发起人：{{item.CreateByName}}</div>
<div class="mb bold"><span class="item-title">发起人：</span>{{item.CreateByName}}</div>
<div>{{item.CreateTime}}</div>
</div>
</div>
......
src/components/orderCommon/order-form.vue
View file @ 5ecaff45
<style>
.commonOrderForm {
width: 94%;
margin: 0 auto;
<style scoped>
.commonOrderForm { overflow: auto;
height: 600px;
border-top: 3px solid #38425d;
background-color: #ffffff;
padding: 10px 10px 0;
width: 100%;padding:20px 20px 10px 80px;
}
.title {
border-left: 3px solid #e95252;
text-indent: 15px;
height: 16px;
font-family: "PingFangSc-Fine";
font-size: 16px;
margin-bottom: 20px;
line-height: 14px;
color: #000;
}
</style>
<template>
<div class="commonOrderForm">
<p>
<p class="title">
{{ $t("salesModule.SignImdi") }}
<span class="fr">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="cancelSubmit()" />
......
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