Skip to content

S
SuperMan
Commit f68f94bb authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents baa9bec6 208abebd
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 55 deletions
src/components/Restaurant/restaurantList.vue
View file @ f68f94bb
......@@ -386,9 +386,7 @@
<div class="btnList" style="text-align:center;">
<button v-if="IsEditDmcSource==1" @click="goSubInfo('restaurantInfoManage',item.ID)"
class="hotelBtn">{{$t('pub.updateMsg')}}</button>
<button @click="goUrl('RestaurantPackage',item.ID)" class="hotelBtn">{{$t('restaurant.res_package')}}</button>
<button @click="goSubInfo('restaurantInfoDetail',item.ID)" class="hotelBtn">{{$t('fnc.xiangqing')}}</button>
</div>
</div>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ f68f94bb
......@@ -951,10 +951,10 @@
item.OldManChargePrice | priceFormat(item.OldManChargePrice)
}}</b>
</td>
<td class="TC_cusTitle">{{ $t("Operation.Op_visaPrice") }}</td>
<!-- <td class="TC_cusTitle">{{ $t("Operation.Op_visaPrice") }}</td>
<td>
<b>{{ item.VisaPrice | priceFormat(item.VisaPrice) }}</b>
</td>
</td> -->
</tr>
<tr>
<td class="TC_cusTitle">
......@@ -965,10 +965,10 @@
item.SingleRoomPrice | priceFormat(item.SingleRoomPrice)
}}</b>
</td>
<td class="TC_cusTitle">{{ $t("Operation.Op_insurance") }}</td>
<!-- <td class="TC_cusTitle">{{ $t("Operation.Op_insurance") }}</td>
<td>
<b>{{ item.SafeMoney | priceFormat(item.SafeMoney) }}</b>
</td>
</td> -->
<td class="TC_cusTitle">{{ $t("Operation.Op_zafei") }}</td>
<td colspan="3">
<b>{{ item.OtherPrice | priceFormat(item.OtherPrice) }}</b>
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ f68f94bb
......@@ -596,9 +596,9 @@
<i class="iconfont icon-jiage"></i>{{$t('Operation.Op_PriceInfo')}}
</p>
<p class="travelprice">
{{$t('Operation.Op_tradePrice')}}：￥{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}</p>
{{$t('Operation.Op_tradePrice')}}：￥{{item.B2BPrice|priceFormat(item.B2BPrice)}}</p>
<p class="travelprice">
{{$t('Operation.Op_directPrice')}}：￥{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</p>
{{$t('Operation.Op_directPrice')}}：￥{{item.B2CPrice|priceFormat(item.B2CPrice)}}</p>
<p>
<el-popover width="700" trigger="click" popper-class="TC_customerInfo">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
......@@ -606,12 +606,12 @@
<td rowspan="2" style="text-align:center" width="60">
<i>{{$t('Operation.Op_standard')}}</i>
</td>
<td class="TC_cusTitle">{{$t('Operation.Op_fellowMember')}}</td>
<td><b>{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}</b></td>
<!-- <td class="TC_cusTitle">{{$t('Operation.Op_fellowMember')}}</td>
<td><b>{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}</b></td> -->
<td class="TC_cusTitle">{{$t('Operation.Op_fellow')}}</td>
<td><b>{{item.B2BPrice|priceFormat(item.B2BPrice)}}</b></td>
<td class="TC_cusTitle">{{$t('Operation.Op_directMember')}}</td>
<td><b>{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</b></td>
<!-- <td class="TC_cusTitle">{{$t('Operation.Op_directMember')}}</td>
<td><b>{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</b></td> -->
<td class="TC_cusTitle">{{$t('Operation.Op_direct')}}</td>
<td><b>{{item.B2CPrice|priceFormat(item.B2CPrice)}}</b></td>
</tr>
......@@ -633,14 +633,14 @@
<td><b>{{item.BabyChargePrice|priceFormat(item.BabyChargePrice)}}</b></td>
<td class="TC_cusTitle">{{$t('Operation.Op_oldmanSurcharge')}}</td>
<td><b>{{item.OldManChargePrice|priceFormat(item.OldManChargePrice)}}</b></td>
<td class="TC_cusTitle">{{$t('Operation.Op_visaPrice')}}</td>
<td><b>{{item.VisaPrice|priceFormat(item.VisaPrice)}}</b></td>
<!-- <td class="TC_cusTitle">{{$t('Operation.Op_visaPrice')}}</td>
<td><b>{{item.VisaPrice|priceFormat(item.VisaPrice)}}</b></td> -->
</tr>
<tr>
<td class="TC_cusTitle">{{$t('Operation.Op_singleRoomcha')}}</td>
<td><b>{{item.SingleRoomPrice|priceFormat(item.SingleRoomPrice)}}</b></td>
<td class="TC_cusTitle">{{$t('Operation.Op_insurance')}}</td>
<td><b>{{item.SafeMoney|priceFormat(item.SafeMoney)}}</b></td>
<!-- <td class="TC_cusTitle">{{$t('Operation.Op_insurance')}}</td>
<td><b>{{item.SafeMoney|priceFormat(item.SafeMoney)}}</b></td> -->
<td class="TC_cusTitle">{{$t('Operation.Op_zafei')}}</td>
<td colspan="3"><b>{{item.OtherPrice|priceFormat(item.OtherPrice)}}</b></td>
</tr>
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ f68f94bb
......@@ -550,28 +550,28 @@
<i class="iconfont icon-jiage"></i>{{$t('Operation.Op_PriceInfo')}}
</p>
<p class="travelprice">
{{$t('Operation.Op_tradePrice')}}：￥{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}</p>
{{$t('Operation.Op_tradePrice')}}：￥{{item.B2BPrice|priceFormat(item.B2BPrice)}}</p>
<p class="travelprice">
{{$t('Operation.Op_directPrice')}}：￥{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</p>
{{$t('Operation.Op_directPrice')}}：￥{{item.B2CPrice|priceFormat(item.B2CPrice)}}</p>
<p>
<el-popover width="700" trigger="click" popper-class="TC_customerInfo">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td rowspan="3" style="text-align:center" width="60">
<!-- <td rowspan="3" style="text-align:center" width="60">
<i>{{$t('Operation.Op_standard')}}</i>
</td>
<td class="TC_cusTitle">{{$t('Operation.Op_fellowMember')}}</td>
<td>
<b>{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}</b>
</td>
</td> -->
<td class="TC_cusTitle">{{$t('Operation.Op_fellow')}}</td>
<td>
<b>{{item.B2BPrice|priceFormat(item.B2BPrice)}}</b>
</td>
<td class="TC_cusTitle">{{$t('Operation.Op_directMember')}}</td>
<!-- <td class="TC_cusTitle">{{$t('Operation.Op_directMember')}}</td>
<td>
<b>{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</b>
</td>
</td> -->
<td class="TC_cusTitle">{{$t('Operation.Op_direct')}}</td>
<td>
<b>{{item.B2CPrice|priceFormat(item.B2CPrice)}}</b>
......@@ -607,20 +607,20 @@
<td>
<b>{{item.OldManChargePrice|priceFormat(item.OldManChargePrice)}}</b>
</td>
<td class="TC_cusTitle">{{$t('Operation.Op_visaPrice')}}</td>
<!-- <td class="TC_cusTitle">{{$t('Operation.Op_visaPrice')}}</td>
<td>
<b>{{item.VisaPrice|priceFormat(item.VisaPrice)}}</b>
</td>
</td> -->
</tr>
<tr>
<td class="TC_cusTitle">{{$t('Operation.Op_singleRoomcha')}}</td>
<td>
<b>{{item.SingleRoomPrice|priceFormat(item.SingleRoomPrice)}}</b>
</td>
<td class="TC_cusTitle">{{$t('Operation.Op_insurance')}}</td>
<!-- <td class="TC_cusTitle">{{$t('Operation.Op_insurance')}}</td>
<td>
<b>{{item.SafeMoney|priceFormat(item.SafeMoney)}}</b>
</td>
</td> -->
<td class="TC_cusTitle">{{$t('Operation.Op_zafei')}}</td>
<td colspan="3">
<b>{{item.OtherPrice|priceFormat(item.OtherPrice)}}</b>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ f68f94bb
......@@ -561,24 +561,28 @@
<template slot="prepend">{{$t('Operation.Op_oldmanSurcharge')}}</template>
</el-input>
</el-form-item>
<!-- 团费包含签证
<el-form-item prop="VisaPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.VisaPrice"
@keyup.native="checkPrice(priceData,'VisaPrice')">
<template slot="prepend">{{$t('Operation.Op_visaPrice')}}</template>
</el-input>
</el-form-item>
-->
<el-form-item prop="SingleRoomPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.SingleRoomPrice" @keyup.native="checkPrice(priceData,'SingleRoomPrice')">
<template slot="prepend">{{$t('Operation.Op_singleRoomcha')}}</template>
</el-input>
</el-form-item>
<!-- 团费包含保险
<el-form-item prop="SafeMoney">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.SafeMoney"
@keyup.native="checkInteger(priceData,'SafeMoney')">
<template slot="prepend">{{$t('Operation.Op_insurance')}}</template>
</el-input>
</el-form-item>
-->
<el-form-item prop="OtherPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.OtherPrice"
@keyup.native="checkPrice(priceData,'OtherPrice')">
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ f68f94bb
......@@ -554,24 +554,28 @@
<template slot="prepend">{{$t('Operation.Op_oldmanSurcharge')}}</template>
</el-input>
</el-form-item>
<!-- 团费包含签证
<el-form-item prop="VisaPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.VisaPrice"
@keyup.native="checkPrice(priceData,'VisaPrice')">
<template slot="prepend">{{$t('Operation.Op_visaPrice')}}</template>
</el-input>
</el-form-item>
-->
<el-form-item prop="SingleRoomPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.SingleRoomPrice" @keyup.native="checkPrice(priceData,'SingleRoomPrice')">
<template slot="prepend">{{$t('Operation.Op_singleRoomcha')}}</template>
</el-input>
</el-form-item>
<!-- 团费包含保险
<el-form-item prop="SafeMoney">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.SafeMoney"
@keyup.native="checkInteger(priceData,'SafeMoney')">
<template slot="prepend">{{$t('Operation.Op_insurance')}}</template>
</el-input>
</el-form-item>
-->
<el-form-item prop="OtherPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.OtherPrice"
@keyup.native="checkPrice(priceData,'OtherPrice')">
......@@ -608,6 +612,7 @@
<template slot="prepend">{{$t('Operation.Op_childNobed')}}</template>
</el-input>
</el-form-item>
<el-form-item prop="BackVisaPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.BackVisaPrice" @keyup.native="checkInteger(priceData,'BackVisaPrice')">
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @ f68f94bb
......@@ -509,24 +509,28 @@
<template slot="prepend">{{$t('Operation.Op_oldmanSurcharge')}}</template>
</el-input>
</el-form-item>
<!-- 团费包含签证
<el-form-item prop="VisaPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.VisaPrice"
@keyup.native="checkPrice(priceData,'VisaPrice')">
<template slot="prepend">{{$t('Operation.Op_visaPrice')}}</template>
</el-input>
</el-form-item>
-->
<el-form-item prop="SingleRoomPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.SingleRoomPrice" @keyup.native="checkPrice(priceData,'SingleRoomPrice')">
<template slot="prepend">{{$t('Operation.Op_singleRoomcha')}}</template>
</el-input>
</el-form-item>
<!-- 团费包含保险
<el-form-item prop="SafeMoney">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.SafeMoney"
@keyup.native="checkInteger(priceData,'SafeMoney')">
<template slot="prepend">{{$t('Operation.Op_insurance')}}</template>
</el-input>
</el-form-item>
-->
<el-form-item prop="OtherPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.OtherPrice"
@keyup.native="checkPrice(priceData,'OtherPrice')">
......@@ -614,7 +618,8 @@
'otherPlat':standardCurrencyName=='',}">{{standardCurrencyName}}{{$t('objFill.jiesuan')}}</span>
</el-form-item>
<el-form-item prop="OutGroupType" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.zhutuanlx')}}</span>
<span class="TP_Sendprepend"
style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.zhutuanlx')}}</span>
<el-select class="w180" v-model="priceData.OutGroupType">
<el-option v-for="item in OutGroupTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
......@@ -761,7 +766,8 @@
</el-select>
</el-form-item>
<el-form-item style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.baojiaddz')}}</span>
<span class="TP_Sendprepend"
style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.baojiaddz')}}</span>
<el-upload class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
:http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
<el-button size="small" type="primary">{{$t('objFill.shangchuan')}}</el-button>
......@@ -1652,7 +1658,8 @@
parseInt(this.priceData.FSeat);
if (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum) < Number(fitem.BindNum)) {
fitem.BindNum = 0;
this.Error(this.$t('objFill.v101.myOrdersAllType.zuiduoznbd') + (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum)) + this.$t('objFill.v101.myOrdersAllType.gejiwei'));
this.Error(this.$t('objFill.v101.myOrdersAllType.zuiduoznbd') + (Number(fitem.TicketNum) - Number(fitem
.OtherTeamUseNum)) + this.$t('objFill.v101.myOrdersAllType.gejiwei'));
}
this.selectFilghtList.forEach((x, index) => {
if (x.IsSelected) {
......@@ -1746,7 +1753,7 @@
if (type == 2) {
that.btnTongBu = that.$t('objFill.v101.myOrdersAllType.tongbujd');
} else {
that.btnText = that.$t('pub.saveBtn')+'...';
that.btnText = that.$t('pub.saveBtn') + '...';
}
});
},
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue
View file @ f68f94bb
......@@ -505,13 +505,14 @@
<template slot="prepend">{{$t('Operation.Op_singleRoomcha')}}</template>
</el-input>
</el-form-item>
<!-- 团费包含签证
<el-form-item prop="VisaPrice" style="display:none">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.VisaPrice"
@keyup.native="checkPrice(priceData,'VisaPrice')">
<template slot="prepend">{{$t('Operation.Op_visaPrice')}}</template>
</el-input>
</el-form-item>
-->
</div>
</div>
<div class="clearfix">
......@@ -539,12 +540,14 @@
<template slot="prepend">{{$t('Operation.Op_oldmanSurcharge')}}</template>
</el-input>
</el-form-item>
<!-- 团费包含保险
<el-form-item prop="SafeMoney" :class="{'showOther':TeamType==3}">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.SafeMoney"
@keyup.native="checkInteger(priceData,'SafeMoney')">
<template slot="prepend">{{$t('Operation.Op_visaPrice')}}</template>
</el-input>
</el-form-item>
-->
<el-form-item prop="OtherPrice" :class="{'showOther':TeamType==3}">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.OtherPrice"
@keyup.native="checkPrice(priceData,'OtherPrice')">
......
src/components/orderCommon/productOrderList.vue
View file @ f68f94bb
......@@ -623,10 +623,10 @@
</p>
<p style="color:#47bf8c;font-size:16px;font-weight:bold;margin: 5px 0;">
{{ $t("Operation.Op_tradePrice") }}:￥{{
item.B2BMemberPrice | priceFormat(item.B2BMemberPrice)
item.B2BPrice | priceFormat(item.B2BPrice)
}}<br />
{{ $t("Operation.Op_directPrice") }}:￥{{
item.B2CMemberPrice | priceFormat(item.B2CMemberPrice)
item.B2CPrice | priceFormat(item.B2CPrice)
}}
</p>
<p>
......@@ -639,52 +639,53 @@
</tr>
<tr>
<th v-if="pagesTitle=='跟团游产品'||pagesTitle=='当地游产品'">{{ $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>
<th>{{ $t("Operation.Op_tradePrice") }}</th>
<th colspan="5">{{ $t("Operation.Op_directPrice") }}</th>
<!-- <th>{{ $t("salesModule.ZKHYJ") }}</th> -->
<!-- <th colspan="2">{{ $t("salesModule.PTZKJ") }}</th> -->
</tr>
<tr>
<td v-if="pagesTitle=='跟团游产品'||pagesTitle=='当地游产品'">{{ $t("salesModule.Adult") }}</td>
<!--
<td>
{{
item.B2BMemberPrice | priceFormat(item.B2BMemberPrice)
}}
</td>
</td> -->
<td>{{ item.B2BPrice | priceFormat(item.B2BPrice) }}</td>
<td>
<!-- <td>
{{
item.B2CMemberPrice | priceFormat(item.B2CMemberPrice)
}}
</td>
<td colspan="2">{{ item.B2CPrice | priceFormat(item.B2CPrice) }}</td>
</td> -->
<td colspan="5">{{ item.B2CPrice | priceFormat(item.B2CPrice) }}</td>
</tr>
<template v-if="pagesTitle=='跟团游产品'||pagesTitle=='当地游产品'">
<tr>
<td>{{ $t("salesModule.ChildBed") }}</td>
<td>
<!-- <td>
{{
(item.B2BMemberPrice + item.ChildNeedPrice)
| priceFormat(
item.B2BMemberPrice + item.ChildNeedPrice
)
}}
</td>
</td> -->
<td>
{{
(item.B2BPrice + item.ChildNeedPrice)
| priceFormat(item.B2BPrice + item.ChildNeedPrice)
}}
</td>
<td>
<!-- <td>
{{
(item.B2CMemberPrice + item.ChildNeedPrice)
| priceFormat(
item.B2CMemberPrice + item.ChildNeedPrice
)
}}
</td>
<td colspan="2">
</td> -->
<td colspan="5">
{{
(item.B2CPrice + item.ChildNeedPrice)
| priceFormat(item.B2CPrice + item.ChildNeedPrice)
......@@ -693,29 +694,29 @@
</tr>
<tr>
<td>{{ $t("salesModule.ChildNoBed") }}</td>
<td>
<!-- <td>
{{
(item.B2BMemberPrice - item.ChildNoNeedPrice)
| priceFormat(
item.B2BMemberPrice - item.ChildNoNeedPrice
)
}}
</td>
<td>
</td> -->
<td >
{{
(item.B2BPrice - item.ChildNoNeedPrice)
| priceFormat(item.B2BPrice - item.ChildNoNeedPrice)
}}
</td>
<td>
<!-- <td>
{{
(item.B2CMemberPrice - item.ChildNoNeedPrice)
| priceFormat(
item.B2CMemberPrice - item.ChildNoNeedPrice
)
}}
</td>
<td colspan="2">
</td> -->
<td colspan="5">
{{
(item.B2CPrice - item.ChildNoNeedPrice)
| priceFormat(item.B2CPrice - item.ChildNoNeedPrice)
......@@ -752,7 +753,7 @@
<tr>
<th>{{ $t("Operation.Op_oldmanSurcharge") }}</th>
<th>{{ $t("Operation.Op_childSurcharge") }}</th>
<th>{{ $t("salesModule.VisaBack") }}</th>
<th>{{ $t("Operation.Op_visafeeBack") }}</th>
<th>{{ $t("Operation.Op_singleRoomcha") }}</th>
<th>{{ $t("Operation.Op_zafei") }}</th>
<th>{{$t('fnc.xiaofei')}}</th>
......@@ -771,9 +772,10 @@
}}
</td>
<td>
{{ item.VisaPrice | priceFormat(item.VisaPrice) }}（-{{
<!-- {{ item.VisaPrice | priceFormat(item.VisaPrice) }} -->
-{{
item.BackVisaPrice | priceFormat(item.BackVisaPrice)
}}）
}}
</td>
<td>
{{
......
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