Skip to content

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

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

parents 3f96063e cca2d1a9
Show whitespace changes
Inline Side-by-side
Showing with 756 additions and 19 deletions
src/components/Hotel/HotelAccountInfo.vue
View file @ cd4ef8c6
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</el-tooltip> </el-tooltip>
</td> </td>
<td width="80"> <td width="80">
{{item.UseAmount}}{{$t('hotel_.hotel_people')}} {{item.UseAmount}}{{$t('hotel.hotel_people')}}
</td> </td>
<td width="200" class="orderNum" @click="showTip(index)"> <td width="200" class="orderNum" @click="showTip(index)">
<i class="iconfont icon-dingdanhao"></i>{{$t('hotel.order_Number')}}<span class="orderId">{{item.ID}}</span> <i class="iconfont icon-dingdanhao"></i>{{$t('hotel.order_Number')}}<span class="orderId">{{item.ID}}</span>
......
src/components/NeedCenter/DinnerNeed.vue
View file @ cd4ef8c6
...@@ -538,7 +538,7 @@ ...@@ -538,7 +538,7 @@
<i class="iconfont icon-img-rili"></i>{{item.NeedDateStr}} <i class="iconfont icon-img-rili"></i>{{item.NeedDateStr}}
</td> </td>
<td> <td>
<span class="SubName" v-if="item.SubName">{{item.SubName}}</span>{{item.UseNum}}{{$t('hotel_.hotel_people')}} <span class="SubName" v-if="item.SubName">{{item.SubName}}</span>{{item.UseNum}}{{$t('hotel.hotel_people')}}
</td> </td>
<td> <td>
<i class="iconfont icon-img_dz"></i><span v-if="item.CountryName!=''">{{item.CountryName}} / </span> <i class="iconfont icon-img_dz"></i><span v-if="item.CountryName!=''">{{item.CountryName}} / </span>
......
src/components/NeedCenter/HotelNeed.vue
View file @ cd4ef8c6
...@@ -539,7 +539,7 @@ ...@@ -539,7 +539,7 @@
<i class="iconfont icon-img-rili"></i>{{item.NeedDateStr}} <i class="iconfont icon-img-rili"></i>{{item.NeedDateStr}}
</td> </td>
<td> <td>
<span class="SubName" v-if="item.SubName">{{item.SubName}}</span>{{item.UseNum}}{{$t('hotel_.hotel_people')}} <span class="SubName" v-if="item.SubName">{{item.SubName}}</span>{{item.UseNum}}{{$t('hotel.hotel_people')}}
</td> </td>
<td> <td>
<i class="iconfont icon-img_dz"></i><span v-if="item.CountryName!=''">{{item.CountryName}} / </span> <i class="iconfont icon-img_dz"></i><span v-if="item.CountryName!=''">{{item.CountryName}} / </span>
......
src/components/NeedCenter/ScenicNeed.vue
View file @ cd4ef8c6
...@@ -538,7 +538,7 @@ ...@@ -538,7 +538,7 @@
<i class="iconfont icon-img-rili"></i>{{item.NeedDateStr}} <i class="iconfont icon-img-rili"></i>{{item.NeedDateStr}}
</td> </td>
<td> <td>
<span class="SubName" v-if="item.SubName">{{item.SubName}}</span>{{item.UseNum}}{{$t('hotel_.hotel_people')}} <span class="SubName" v-if="item.SubName">{{item.SubName}}</span>{{item.UseNum}}{{$t('hotel.hotel_people')}}
</td> </td>
<td> <td>
<i class="iconfont icon-img_dz"></i><span v-if="item.CountryName!=''">{{item.CountryName}} / </span> <i class="iconfont icon-img_dz"></i><span v-if="item.CountryName!=''">{{item.CountryName}} / </span>
......
src/components/NeedCenter/TicketNeed.vue
View file @ cd4ef8c6
...@@ -515,7 +515,7 @@ ...@@ -515,7 +515,7 @@
<i class="iconfont icon-img-rili"></i>{{item.NeedDateStr}} <i class="iconfont icon-img-rili"></i>{{item.NeedDateStr}}
</td> </td>
<td> <td>
<span class="SubName" v-if="item.SubName">{{item.SubName}}</span>{{item.UseNum}}{{$t('hotel_.hotel_people')}} <span class="SubName" v-if="item.SubName">{{item.SubName}}</span>{{item.UseNum}}{{$t('hotel.hotel_people')}}
</td> </td>
<td> <td>
<i class="iconfont icon-img_dz"></i><span v-if="item.CountryName!=''">{{item.CountryName}} / </span> <i class="iconfont icon-img_dz"></i><span v-if="item.CountryName!=''">{{item.CountryName}} / </span>
......
src/components/Restaurant/RestauranAccountingDetail.vue
View file @ cd4ef8c6
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
</el-tooltip> </el-tooltip>
</td> </td>
<td width="80"> <td width="80">
{{item.UseAccount}}{{$t('hotel_.hotel_people')}} {{item.UseAccount}}{{$t('hotel.hotel_people')}}
</td> </td>
<td width="300" class="orderNum" @click="showTip(index)"> <td width="300" class="orderNum" @click="showTip(index)">
<i class="iconfont icon-dingdanhao"></i>{{$t('hotel.order_Number')}}<span class="orderId">{{item.ID}}</span> <i class="iconfont icon-dingdanhao"></i>{{$t('hotel.order_Number')}}<span class="orderId">{{item.ID}}</span>
......
src/components/SalesModule/groupTourOrder.vue
View file @ cd4ef8c6
...@@ -2181,7 +2181,7 @@ ...@@ -2181,7 +2181,7 @@
<span style="display: block">{{ $t("salesModule.RoomInfo") <span style="display: block">{{ $t("salesModule.RoomInfo")
}}<span v-if="item.oneSex > 0" }}<span v-if="item.oneSex > 0"
style="color: #e95252">（{{ item.oneSex == 1 ?$t('objFill.dannan') : $t('objFill.dannv') }}）</span><span style="color: #e95252">（{{ item.oneSex == 1 ?$t('objFill.dannan') : $t('objFill.dannv') }}）</span><span
v-if="item.chirdNoNeedBedNum > 0" style="color: #e95252">（{{$t('Operation.Op_childNobed')}}{{ item.chirdNoNeedBedNum }}{{$t('hotel_.hotel_people')}} v-if="item.chirdNoNeedBedNum > 0" style="color: #e95252">（{{$t('Operation.Op_childNobed')}}{{ item.chirdNoNeedBedNum }}{{$t('hotel.hotel_people')}}
）</span>：{{ item.orderGuestHouseStr }}</span> ）</span>：{{ item.orderGuestHouseStr }}</span>
......
src/components/SalesVisa/ModifyVisaProduct.vue
View file @ cd4ef8c6
...@@ -437,7 +437,8 @@ ...@@ -437,7 +437,8 @@
</el-form-item> </el-form-item>
<el-form-item :label="$t('objFill.v101.Rest.tiqianyudts')" prop="BookAdvance"> <el-form-item :label="$t('objFill.v101.Rest.tiqianyudts')" prop="BookAdvance">
<el-input v-model="addMsg.BookAdvance" @keyup.native="checkInteger(addMsg,'BookAdvance')" :placeholder="$t('objFill.v101.administrative.gongzuor')"></el-input> <!-- :placeholder="$t('objFill.v101.administrative.gongzuor')" -->
<el-input v-model="addMsg.BookAdvance" @keyup.native="checkInteger(addMsg,'BookAdvance')" :placeholder="$t('ground.tianshu')"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('objFill.v101.Rest.jiageyxriqi')" style="width:588px"> <el-form-item :label="$t('objFill.v101.Rest.jiageyxriqi')" style="width:588px">
<el-date-picker <el-date-picker
......
src/components/SalesVisa/components/OneClickDocumentPreparation.vue
View file @ cd4ef8c6
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<span>{{$t('objFill.theorderselected')}}：</span> <span>{{$t('objFill.theorderselected')}}：</span>
<template v-for="(x,index) in multipleSelection"> <template v-for="(x,index) in multipleSelection">
<el-tag :key="index" size="mini" style="margin-left: 5px;margin-bottom: 3px;"> <el-tag :key="index" size="mini" style="margin-left: 5px;margin-bottom: 3px;">
{{x.Id+' '+x.CreateName+' '+x.PeopleNum}}{{$t('hotel_.hotel_people')}} {{x.Id+' '+x.CreateName+' '+x.PeopleNum}}{{$t('hotel.hotel_people')}}
</el-tag> </el-tag>
</template> </template>
<span style="margin-left: 20px;">{{$t('objFill.zongrenshu')}}：{{getPeopleNum()}}</span> <span style="margin-left: 20px;">{{$t('objFill.zongrenshu')}}：{{getPeopleNum()}}</span>
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
<div v-for="(item,index) in proofList" class="table-box proofList-box"> <div v-for="(item,index) in proofList" class="table-box proofList-box">
<div style="margin-bottom: 5px;"> <div style="margin-bottom: 5px;">
<el-tag :key="index" size="mini"> <el-tag :key="index" size="mini">
{{item.Id+' '+item.CreateName+' '+item.PeopleNum}}{{$t('hotel_.hotel_people')}} {{item.Id+' '+item.CreateName+' '+item.PeopleNum}}{{$t('hotel.hotel_people')}}
</el-tag> </el-tag>
</div> </div>
<div class="d-flex"> <div class="d-flex">
......
src/components/Ticketing/TicketAccountingDetails.vue
View file @ cd4ef8c6
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
</el-tooltip> </el-tooltip>
</td> </td>
<td width="80"> <td width="80">
{{item.UseAccount}}{{$t('hotel_.hotel_people')}} {{item.UseAccount}}{{$t('hotel.hotel_people')}}
</td> </td>
<td width="300" class="orderNum" @click="showTip(index)"> <td width="300" class="orderNum" @click="showTip(index)">
<i class="iconfont icon-dingdanhao"></i><span class="orderId">{{$t('objFill.orderid')}}{{item.ID}}</span> <i class="iconfont icon-dingdanhao"></i><span class="orderId">{{$t('objFill.orderid')}}{{item.ID}}</span>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ cd4ef8c6
...@@ -1544,6 +1544,9 @@ ...@@ -1544,6 +1544,9 @@
<el-dropdown-item @click.native="CopyTripAndFeature(item, 2)"> <el-dropdown-item @click.native="CopyTripAndFeature(item, 2)">
{{ $t("objFill.v101.xiugaictriqi") }} {{ $t("objFill.v101.xiugaictriqi") }}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="ckChangePrice(item)">
价格变更
</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
...@@ -1565,10 +1568,6 @@ ...@@ -1565,10 +1568,6 @@
{{ item.OutGroupAuditRemark }} {{ item.OutGroupAuditDate }} {{ item.OutGroupAuditRemark }} {{ item.OutGroupAuditDate }}
</div> </div>
</div> </div>
<!-- <div class="clearfix TCL-redType" v-if="item.ProductRecommend">
<div class="TCL_remarkTitle">{{$t('Operation.Op_bentuanMaidian')}}：</div>
<div class="TCL_Content">{{item.ProductRecommend}}</div>
</div> -->
<div class="clearfix TCL-redType" v-if="item.OPRemark"> <div class="clearfix TCL-redType" v-if="item.OPRemark">
<div class="TCL_remarkTitle">{{ $t("Operation.Op_duiwaiRemark") }}：</div> <div class="TCL_remarkTitle">{{ $t("Operation.Op_duiwaiRemark") }}：</div>
<div class="TCL_Content">{{ item.OPRemark }}</div> <div class="TCL_Content">{{ item.OPRemark }}</div>
...@@ -1619,6 +1618,33 @@ ...@@ -1619,6 +1618,33 @@
</div> </div>
</div> </div>
</div> </div>
<div class="TC_remarkContent" v-if="item.PriceChangeModel&&item.PriceChangeModel.ID > 0">
<div class="clearfix TCL-redType">
<div class="TCL_remarkTitle" style="width: auto">
<span style="color: black">价格变更： {{ item.PriceChangeModel.ChangeRemark }}</span>
<template v-if="item.PriceChangeModel.ChangePriceStatus == 1">
<span
style="color: blue; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>
</template>
<template v-if="item.PriceChangeModel.ChangePriceStatus == 2">
<span
style="color: green; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>
</template>
<template v-if="item.PriceChangeModel.ChangePriceStatus == 3">
<span
style="color: red; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>
<span style="color: red">{{ $t("objFill.yuanyin") }}:
<template v-if="item.PriceChangeModel.MAContent">
{{item.PriceChangeModel.MAContent}}
</template>
<template v-else>
{{item.PriceChangeModel.AuditContent}}
</template>
</span>
</template>
</div>
</div>
</div>
</li> </li>
</ul> </ul>
<div class="noData" v-show="queryMsg.noData"> <div class="noData" v-show="queryMsg.noData">
...@@ -1807,6 +1833,39 @@ ...@@ -1807,6 +1833,39 @@
</el-button> </el-button>
</div> </div>
</div> </div>
<!--价格变更-->
<div class="combottomDiv OPremarkDiv" style="height: 150px" v-show="changePriceMsg.isShowChangePrice">
<div class="combottomTitle">
价格变更申请
</div>
<el-form label-width="100px">
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_tradePrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2BPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_directPrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2CPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="变更原因" prop="Remark">
<el-input v-model="changePriceMsg.ChangeRemark" maxlength="50"></el-input>
</el-form-item>
</el-col>
</el-form>
<div slot="footer" class="dialog-footer">
&nbsp;
<el-button size="small" @click="changePriceMsg.isShowChangePrice = false">
{{ $t("pub.cancelBtn") }}
</el-button>
<el-button type="primary" size="small" :loading="saveLoading" @click="SetChangePrice">
{{ $t("pub.sureBtn") }}
</el-button>
</div>
</div>
<div v-if="dialog.show"> <div v-if="dialog.show">
<el-dialog :visible.sync="dialog.show" width="1400px" :title="$t('objFill.baojiaxiangqing')"> <el-dialog :visible.sync="dialog.show" width="1400px" :title="$t('objFill.baojiaxiangqing')">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog> <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
...@@ -2029,6 +2088,15 @@ ...@@ -2029,6 +2088,15 @@
copyType: "", copyType: "",
CurrentTCNUM: "", CurrentTCNUM: "",
}, },
//价格变更
changePriceMsg: {
isShowChangePrice: false,
TCID: 0,
NewB2BPrice: "",
NewB2CPrice: "",
ChangePriceStatus: 1,
ChangeRemark: "",
},
flightStatus: [{ flightStatus: [{
Id: 0, Id: 0,
Name: this.$t("pub.unlimitedSel"), Name: this.$t("pub.unlimitedSel"),
...@@ -2374,7 +2442,7 @@ ...@@ -2374,7 +2442,7 @@
//获取TCID //获取TCID
clickAirticket(item) { clickAirticket(item) {
this.updateAirticketObj.TCID = item.TCID; this.updateAirticketObj.TCID = item.TCID;
console.log(" this.updateAirticketObj",item.TCID, this.updateAirticketObj) console.log(" this.updateAirticketObj", item.TCID, this.updateAirticketObj)
}, },
//开启散客机票 //开启散客机票
openAirticket() { openAirticket() {
...@@ -3249,6 +3317,32 @@ ...@@ -3249,6 +3317,32 @@
); );
}); });
}, },
ckChangePrice(item) {
this.changePriceMsg.isShowChangePrice = true;
this.changePriceMsg.TCID = item.TCID;
},
//价格变更
SetChangePrice() {
var that = this;
that.apipost(
'travel_post_SetTravelPriceChange',
that.changePriceMsg,
(res) => {
that.saveLoading = false;
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.changePriceMsg.isShowChangePrice = false;
that.changePriceMsg.NewB2BPrice = "";
that.changePriceMsg.NewB2BPrice = "";
that.changePriceMsg.TCID = 0;
that.getControlList();
} else {
that.Error(res.data.message);
}
},
(err) => {}
);
},
//签证op设置 //签证op设置
ckOPInfo(item) { ckOPInfo(item) {
this.VisaOPMsg.VisaShow = true; this.VisaOPMsg.VisaShow = true;
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ cd4ef8c6
...@@ -1046,6 +1046,9 @@ ...@@ -1046,6 +1046,9 @@
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native='CopyTripAndFeature(item,2)'>{{$t('objFill.v101.xiugaictriqi')}} <el-dropdown-item @click.native='CopyTripAndFeature(item,2)'>{{$t('objFill.v101.xiugaictriqi')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="ckChangePrice(item)">
价格变更
</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
...@@ -1105,6 +1108,33 @@ ...@@ -1105,6 +1108,33 @@
</div> </div>
</div> </div>
</div> </div>
<div class="TC_remarkContent" v-if="item.PriceChangeModel&&item.PriceChangeModel.ID > 0">
<div class="clearfix TCL-redType">
<div class="TCL_remarkTitle" style="width: auto">
<span style="color: black">价格变更： {{ item.PriceChangeModel.ChangeRemark }}</span>
<template v-if="item.PriceChangeModel.ChangePriceStatus == 1">
<span
style="color: blue; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>
</template>
<template v-if="item.PriceChangeModel.ChangePriceStatus == 2">
<span
style="color: green; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>
</template>
<template v-if="item.PriceChangeModel.ChangePriceStatus == 3">
<span
style="color: red; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>
<span style="color: red">{{ $t("objFill.yuanyin") }}:
<template v-if="item.PriceChangeModel.MAContent">
{{item.PriceChangeModel.MAContent}}
</template>
<template v-else>
{{item.PriceChangeModel.AuditContent}}
</template>
</span>
</template>
</div>
</div>
</div>
</li> </li>
</ul> </ul>
<div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div> <div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>
...@@ -1232,6 +1262,38 @@ ...@@ -1232,6 +1262,38 @@
</el-button> </el-button>
</div> </div>
</div> </div>
<!--价格变更-->
<div class="combottomDiv OPremarkDiv" style="height: 150px" v-show="changePriceMsg.isShowChangePrice">
<div class="combottomTitle">
价格变更申请
</div>
<el-form label-width="100px">
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_tradePrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2BPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_directPrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2CPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="变更原因" prop="Remark">
<el-input v-model="changePriceMsg.ChangeRemark" maxlength="50"></el-input>
</el-form-item>
</el-col>
</el-form>
<div slot="footer" class="dialog-footer">
&nbsp;
<el-button size="small" @click="changePriceMsg.isShowChangePrice = false">
{{ $t("pub.cancelBtn") }}
</el-button>
<el-button type="primary" size="small" :loading="saveLoading" @click="SetChangePrice">
{{ $t("pub.sureBtn") }}
</el-button>
</div>
</div>
<el-dialog :visible.sync="dialog.show" width="1400px" :title="$t('objFill.baojiaxiangqing')"> <el-dialog :visible.sync="dialog.show" width="1400px" :title="$t('objFill.baojiaxiangqing')">
<div v-if="dialog.show"> <div v-if="dialog.show">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog> <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
...@@ -1446,6 +1508,15 @@ ...@@ -1446,6 +1508,15 @@
copyType: "", copyType: "",
CurrentTCNUM: "", CurrentTCNUM: "",
}, },
//价格变更
changePriceMsg: {
isShowChangePrice: false,
TCID: 0,
NewB2BPrice: "",
NewB2CPrice: "",
ChangePriceStatus: 1,
ChangeRemark: "",
},
//更新可售机票数量 //更新可售机票数量
updateAirticketObj: { updateAirticketObj: {
TCID: 0, TCID: 0,
...@@ -1678,6 +1749,33 @@ ...@@ -1678,6 +1749,33 @@
); );
}); });
}, },
ckChangePrice(item) {
this.changePriceMsg.isShowChangePrice = true;
this.changePriceMsg.TCID = item.TCID;
},
//价格变更
SetChangePrice() {
var that = this;
that.apipost(
'travel_post_SetTravelPriceChange',
that.changePriceMsg,
(res) => {
that.saveLoading = false;
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.changePriceMsg.isShowChangePrice = false;
that.changePriceMsg.NewB2BPrice = "";
that.changePriceMsg.NewB2CPrice = "";
that.changePriceMsg.ChangeRemark = "";
that.changePriceMsg.TCID = 0;
that.getControlList();
} else {
that.Error(res.data.message);
}
},
(err) => {}
);
},
//签证op设置 //签证op设置
ckOPInfo(item) { ckOPInfo(item) {
this.VisaOPMsg.VisaShow = true; this.VisaOPMsg.VisaShow = true;
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ cd4ef8c6
...@@ -454,7 +454,8 @@ ...@@ -454,7 +454,8 @@
</p> </p>
<p class="travelnowrap"> <p class="travelnowrap">
<span>{{$t('Airticket.Air_StartTime')}}</span> <span>{{$t('Airticket.Air_StartTime')}}</span>
<span class="go_date">{{item.StartDate}}(<font style="color:red;font-weight:bold;">{{item.StartDateWeekStr}}</font>)</span> <span class="go_date">{{item.StartDate}}(<font style="color:red;font-weight:bold;">
{{item.StartDateWeekStr}}</font>)</span>
<template v-if="item.RelationPriceList&&item.RelationPriceList.length>0"> <template v-if="item.RelationPriceList&&item.RelationPriceList.length>0">
<el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')"> <el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')">
<el-popover width="350" trigger="click" popper-class="TC_HotelPop"> <el-popover width="350" trigger="click" popper-class="TC_HotelPop">
...@@ -870,6 +871,9 @@ ...@@ -870,6 +871,9 @@
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native='CopyTripAndFeature(item,2)'>{{$t('objFill.v101.xiugaictriqi')}} <el-dropdown-item @click.native='CopyTripAndFeature(item,2)'>{{$t('objFill.v101.xiugaictriqi')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="ckChangePrice(item)">
价格变更
</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
...@@ -922,6 +926,33 @@ ...@@ -922,6 +926,33 @@
</div> </div>
</div> </div>
</div> </div>
<div class="TC_remarkContent" v-if="item.PriceChangeModel&&item.PriceChangeModel.ID > 0">
<div class="clearfix TCL-redType">
<div class="TCL_remarkTitle" style="width: auto">
<span style="color: black">价格变更： {{ item.PriceChangeModel.ChangeRemark }}</span>
<template v-if="item.PriceChangeModel.ChangePriceStatus == 1">
<span
style="color: blue; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>
</template>
<template v-if="item.PriceChangeModel.ChangePriceStatus == 2">
<span
style="color: green; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>
</template>
<template v-if="item.PriceChangeModel.ChangePriceStatus == 3">
<span
style="color: red; font-weight: bold">【{{ item.PriceChangeModel.ChangePriceStatusStr }}】</span>
<span style="color: red">{{ $t("objFill.yuanyin") }}:
<template v-if="item.PriceChangeModel.MAContent">
{{item.PriceChangeModel.MAContent}}
</template>
<template v-else>
{{item.PriceChangeModel.AuditContent}}
</template>
</span>
</template>
</div>
</div>
</div>
</li> </li>
</ul> </ul>
<div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div> <div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>
...@@ -1035,6 +1066,38 @@ ...@@ -1035,6 +1066,38 @@
</el-button> </el-button>
</div> </div>
</div> </div>
<!--价格变更-->
<div class="combottomDiv OPremarkDiv" style="height: 150px" v-show="changePriceMsg.isShowChangePrice">
<div class="combottomTitle">
价格变更申请
</div>
<el-form label-width="100px">
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_tradePrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2BPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('Operation.Op_directPrice')" prop="Remark">
<el-input v-model="changePriceMsg.NewB2CPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="变更原因" prop="Remark">
<el-input v-model="changePriceMsg.ChangeRemark" maxlength="50"></el-input>
</el-form-item>
</el-col>
</el-form>
<div slot="footer" class="dialog-footer">
&nbsp;
<el-button size="small" @click="changePriceMsg.isShowChangePrice = false">
{{ $t("pub.cancelBtn") }}
</el-button>
<el-button type="primary" size="small" :loading="saveLoading" @click="SetChangePrice">
{{ $t("pub.sureBtn") }}
</el-button>
</div>
</div>
<el-dialog :visible.sync="dialog.show" width="1400px" :title="$t('objFill.baojiaxiangqing')"> <el-dialog :visible.sync="dialog.show" width="1400px" :title="$t('objFill.baojiaxiangqing')">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog> <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
</el-dialog> </el-dialog>
...@@ -1243,6 +1306,14 @@ ...@@ -1243,6 +1306,14 @@
copyType: "", copyType: "",
CurrentTCNUM: "", CurrentTCNUM: "",
}, },
changePriceMsg: {
isShowChangePrice: false,
TCID: 0,
NewB2BPrice: "",
NewB2CPrice: "",
ChangePriceStatus: 1,
ChangeRemark: "",
},
saveLoading: false, //保存loading防止重复提交 saveLoading: false, //保存loading防止重复提交
//当前登录用户信息 //当前登录用户信息
CurrentUserInfo: {}, CurrentUserInfo: {},
...@@ -1422,6 +1493,33 @@ ...@@ -1422,6 +1493,33 @@
); );
}); });
}, },
ckChangePrice(item) {
this.changePriceMsg.isShowChangePrice = true;
this.changePriceMsg.TCID = item.TCID;
},
//价格变更
SetChangePrice() {
var that = this;
that.apipost(
'travel_post_SetTravelPriceChange',
that.changePriceMsg,
(res) => {
that.saveLoading = false;
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.changePriceMsg.isShowChangePrice = false;
that.changePriceMsg.NewB2BPrice = "";
that.changePriceMsg.NewB2CPrice = "";
that.changePriceMsg.ChangeRemark="";
that.changePriceMsg.TCID = 0;
that.getControlList();
} else {
that.Error(res.data.message);
}
},
(err) => {}
);
},
//提示信息(type=1酒店推送,type=2订车推送) //提示信息(type=1酒店推送,type=2订车推送)
TipsContent(item, type) { TipsContent(item, type) {
let resultStr = ''; let resultStr = '';
......
src/components/dmc/manager/changePriceAudit.vue 0 → 100644
View file @ cd4ef8c6
<template>
<div class="groupApproval">
<div class="query-box">
<ul>
<li>
<em>{{$t('scen.sc_cp')}}</em>
<el-select filterable v-model='msg.QRB_Branch_Id' size="small" @change='getControlList()' clearable>
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
</el-select>
</li>
<li>
<span>
<em>{{$t('objFill.tuanduilx')}}</em>
<el-select class="w200" v-model="msg.TeamType" filterable :placeholder="$t('pub.pleaseImport')" size="small"
@change="getControlList()">
<el-option v-for="item in groupType" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('fnc.shzhuangtai')}}</em>
<el-select class="w200" v-model="msg.ChangePriceStatus" filterable :placeholder="$t('pub.pleaseImport')"
size="small" @change="getControlList()">
<el-option v-for="item in BranchAuditStateType" :label="item.Name" :value="item.Id" :key="item.Id">
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('visa.v_tuanhao')}}</em>
<el-input maxlength="50" v-model="msg.TCNUM" class="permiss-input w200" size="small"
@keyup.enter="getControlList" :placeholder="$t('pub.pleaseImport')" clearable @clear="getControlList">
</el-input>
</span>
</li>
<li>
<span>
<em>{{$t('objFill.v101.dmc.chutrq')}}</em>
<el-date-picker style="width: 300px;" v-model="StartTime" format='yyyy-MM-dd' value-format="yyyy-MM-dd"
size="small" type="daterange" :range-separator="$t('OrderList.zhi')"
:start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')" @change="getStartTime"
clearable>
</el-date-picker>
</span>
</li>
<li>
<button class="hollowFixedBtn" type="button" @click="getControlList">{{$t('pub.searchBtn')}}</button>
</li>
</ul>
</div>
<el-table v-loading="loading" ref="multipleTable" :data="dataList" tooltip-effect="dark" style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column :label="$t('scen.sc_temID')" width="200">
<template slot-scope="scope">
<p>{{scope.row.OutBranchName}}</p>
<span style="cursor: pointer;text-decoration: underline;"
@click="goTravel(scope.row)">{{scope.row.TCNUM}}({{scope.row.TCID}})</span>
</template>
</el-table-column>
<el-table-column prop="StartDate" :label="$t('hotel.hotel_StarDate')" width="120" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="LtName" :label="$t('advmanager.v_xilie')" width="200" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.LineName}}<br />
{{scope.row.LtName}}
</template>
</el-table-column>
<el-table-column prop="Title" :label="$t('Operation.Op_TeamName')" width="200" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="" :label="$t('visaT.Applicant')+'/'+$t('objFill.shengqirq')" width="200">
<template slot-scope="scope">
<p> {{scope.row.CreateByName}}</p>
<p> {{scope.row.CreateTime}}</p>
</template>
</el-table-column>
<el-table-column prop="OPName" :label="$t('objFill.v101.dmc.shengqyy')" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.ChangeRemark}}
</template>
</el-table-column>
<el-table-column prop="PriceTeamTypeName" :label="$t('objFill.v101.commissonBill.col.t3')" width="130">
<template slot-scope="scope">
<template v-if="scope.row.TeamTypeName">{{scope.row.TeamTypeName}}</template>
</template>
</el-table-column>
<el-table-column prop="B2BPrice" :label="$t('Operation.Op_tradePrice')" width="130">
<template slot-scope="scope">
<span>
{{scope.row.B2BPrice}}=><font style="color:red">{{scope.row.NewB2BPrice}}</font>
</span>
</template>
</el-table-column>
<el-table-column prop="B2CPrice" :label="$t('Operation.Op_directPrice')" width="130">
<template slot-scope="scope">
<span>
{{scope.row.B2CPrice}}=><font style="color:red;">{{scope.row.NewB2CPrice}}</font>
</span>
</template>
</el-table-column>
<el-table-column prop="" :label="$t('fnc.shzhuangtai')" width="100">
<template slot-scope="scope">
<span :style="{'color':scope.row.ChangePriceStatus==3?'red':scope.row.ChangePriceStatus==2?'#33B3FF':'blue'}">
{{scope.row.ChangePriceStatusStr}}
</span>
</template>
</el-table-column>
<el-table-column prop="" :label="$t('system.table_operation')" width="150">
<template slot-scope="scope">
<div class="_icon_btn">
<el-tooltip class="item" effect="dark" :content="$t('fnc.shenhe')" placement="top"
v-if="scope.row.ChangePriceStatus==1">
<i v-loading="loading" class="iconfont icon-ico_commodity_defaul" @click="shenhei(scope.row)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('fnc.bohui')" placement="top"
v-if="scope.row.ChangePriceStatus==1">
<i class="iconfont icon-shenhebohui" @click="bohui(scope.row)"></i>
</el-tooltip>
</div>
</template>
</el-table-column>
</el-table>
<div style="width: 100%;">
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
</el-pagination>
</div>
<el-dialog custom-class="w600" :title="$t('objFill.bohuiyy')" :visible.sync="cancelOrderDialog">
<div style="padding-bottom:20px">
<el-input type="textarea" autofocus rows="5" :placeholder="$t('objFill.v101.dmc.qingtxbtyy')" clear="w300"
v-model="cancelRemark">
</el-input>
<el-row :gutter="20" style="margin-top: 20px;">
<el-col :span="24" style="text-align: right;">
<el-button class="normalBtn" value="" @click="cancelOrderHandler" :loading="loading">
{{$t('objFill.v101.dmc.quedinbh')}}</el-button>
<el-button class="hollowFixedBtn" @click="cancelOrderDialog = false,cancelRemark=''">{{$t('pub.closeSel')}}
</el-button>
</el-col>
</el-row>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
components: {
},
data() {
return {
StartTime: [],
groupType: [{
Name: this.$t('advmanager.v_all'),
Id: -1
},
{
Name: this.$t('objFill.xiaobaot'),
Id: 1
},
{
Name: this.$t('MarketingActi.local'),
Id: 2
},
{
Name: this.$t('objFill.changguit'),
Id: 0
}
],
BranchAuditStateType: [
{
Name: this.$t('objFill.dsh'),
Id: 1
},
{
Name: this.$t('visa.v_tongguo'),
Id: 2
},
{
Name: this.$t('fnc.bohui'),
Id: 3
}
],
companyList: [],
cancelRemark: '',
dataRow: null,
cancelOrderDialog: false,
loading: false,
dataList: [],
msg: {
pageIndex: 1,
pageSize: 10,
TCNUM: '', //团号
TeamType: -1, //团队类型 0-常规，1-小包团，2-当地游
QRB_Branch_Id: "",
QStartDate: '',
QEndDate: '',
ChangePriceStatus: 1, //默认待审核
},
total: 0,
multipleSelection: [],
getCompanyMsg: {
RB_Group_Id: 2,
Status: '0',
},
}
},
created() {
var myDate = new Date();
var MonthDayNum = new Date(myDate.getFullYear(), myDate.getMonth(), 0).getDate();
var firstDay = `${myDate.getFullYear()}-${myDate.getMonth() + 1}-01`
var lastDay = `${myDate.getFullYear()}-${myDate.getMonth() + 1}-${MonthDayNum}`
// this.StartTime = [firstDay, lastDay]
// this.msg.QStartDate = firstDay;
// this.msg.QEndDate = lastDay;
this.getCompany()
},
mounted() {
this.getList()
},
methods: {
getStartTime() {
if (this.StartTime.length == 2) {
this.msg.QStartDate = this.StartTime[0]
this.msg.QEndDate = this.StartTime[1]
} else {
this.msg.QStartDate = ''
this.msg.QEndDate = ''
}
this.getControlList()
},
getCompany() {
this.apipost('admin_get_BranchGetList', this.getCompanyMsg, res => {
if (res.data.resultCode == 1) {
this.companyList = res.data.data;
}
})
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
getControlList() {
this.msg.pageIndex = 1;
this.getList()
},
handleSizeChange(e) {
this.msg.pageSize = e;
this.getList()
},
handleCurrentChange(e) {
this.msg.pageIndex = e;
this.getList()
},
getList() {
this.loading = true;
if (this.StartTime) {
this.msg.QStartDate = this.StartTime[0];
this.msg.QEndDate = this.StartTime[1];
} else {
this.msg.QStartDate = "";
this.msg.QEndDate = "";
}
let msg = JSON.parse(JSON.stringify(this.msg))
this.apipost(
"travel_post_GetTravelPriceChangeAuditPage",
msg,
res => {
this.loading = false
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
} else {
this.Error(res.data.message);
}
}
);
},
shenhei(item) {
let that = this;
that.$confirm(this.$t('objFill.v101.dmc.shifshtggt'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.groupAudit(2, item.ID)
}).catch(() => {
});
},
cancelOrderHandler() {
if (!this.cancelRemark) return this.Error(this.$t('objFill.v101.dmc.qingsrbhyy'))
let that = this;
that.$confirm(this.$t('objFill.v101.dmc.shifoubhgt'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
//掉接口
this.groupAudit(3, this.dataRow.ID)
}).catch(() => {
});
},
bohui(item) {
this.dataRow = item
this.cancelOrderDialog = true
return
},
groupAudit(type, ID, name, length) {
let postMsg = {
ID: ID,
ChangePriceStatus: type,
AuditContent: this.cancelRemark
}
this.loading = true
this.apipost("travel_post_AuditTravelPriceChange", postMsg, res => {
if (res.data.resultCode == 1) {
if (!name) {
this.cancelOrderDialog = false
this.Success(res.data.message);
this.getList()
} else {
if (length) {
this.cancelOrderDialog = false
this.Success(res.data.message);
this.getList()
}
}
} else {
this.Error(res.data.message);
}
this.loading = false
});
},
goTravel(item) { //跳转到团队列表
var newPath = "TravelControlList";
var query = {
TCID: item.TCID,
blank: 'y',
tab: '团控列表'
};
if (item.TeamType == 1) {
newPath = "TravelControlListSale";
query = {
TCID: item.TCID,
blank: 'y',
tab: '团控列表'
};
}
if (item.TeamType == 2) {
newPath = "oneDayTrip";
query = {
id: item.TCID,
blank: 'y',
tab: '团控列表'
};
}
this.$router.push({
path: newPath,
query: query
});
}
}
}
</script>
<style scoped>
.groupApproval .singeRowTable {
margin-top: 20px;
}
._nav {
margin: 20px 0 0 0;
background-color: #f5f5f5;
}
._nav li {
float: left;
font-size: 14px;
color: #666666;
padding: 15px 20px;
cursor: pointer;
position: relative;
background-color: #f1f1f1;
margin-right: 5px
}
._nav li._active {
background-color: #FFFFFF;
color: #333333
}
._nav li._active::after {
content: "";
width: 20px;
height: 3px;
background-color: #E95252;
display: inline-block;
position: absolute;
bottom: 0;
left: 38%;
}
._icon_btn i {
width: 30px;
height: 30px;
display: inline-block;
color: white !important;
border-radius: 50%;
text-align: center;
line-height: 30px;
margin-right: 10px;
cursor: pointer;
outline: none;
}
._icon_btn i.icon-ico_commodity_defaul {
background-color: #F16C3C;
}
._icon_btn i.icon-ico_commodity_defaul:hover {
background-color: #e87c54
}
._icon_btn i.icon-ico_commodity_defaul:active {
background-color: #f76630
}
._icon_btn i.icon-shenhebohui {
background-color: #E95252
}
._icon_btn i.icon-mingxi {
background-color: rgb(71, 191, 140)
}
</style>
\ No newline at end of file
src/components/scenicSpot/scenicSpotDetails.vue
View file @ cd4ef8c6
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</el-tooltip> </el-tooltip>
</td> </td>
<td width="80"> <td width="80">
{{item.UseAccount}}{{$t('hotel_.hotel_people')}} {{item.UseAccount}}{{$t('hotel.hotel_people')}}
</td> </td>
<td width="200" class="orderNum" @click="showTip(index)"> <td width="200" class="orderNum" @click="showTip(index)">
<i class="iconfont icon-dingdanhao"></i><span class="orderId">{{$t('objFill.orderid')}}{{item.ID}}</span> <i class="iconfont icon-dingdanhao"></i><span class="orderId">{{$t('objFill.orderid')}}{{item.ID}}</span>
......
src/components/visualization/progress.vue
View file @ cd4ef8c6
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="title" v-if="rank==-1">{{$t('salesModule.ShouKe')}}{{this.count}}{{$t('hotel.hotel_people')}}</div> <div class="title" v-if="rank==-1">{{$t('salesModule.ShouKe')}}{{this.count}}{{$t('hotel.hotel_people')}}</div>
<div class="h-title" :style="{color:color}" v-else> <div class="h-title" :style="{color:color}" v-else>
<span class="blod">{{$t('objFill.v101.tuanduipmin')}} {{rank==0?$t('objFill.v101.Rest.weishangban'):"NO."+rank}}</span> <span class="blod">{{$t('objFill.v101.tuanduipmin')}} {{rank==0?$t('objFill.v101.Rest.weishangban'):"NO."+rank}}</span>
收客{{this.count}}{{$t('hotel_.hotel_people')}} 收客{{this.count}}{{$t('hotel.hotel_people')}}
</div> </div>
</div> </div>
</template> </template>
......
src/router/config.js
View file @ cd4ef8c6
...@@ -5260,6 +5260,14 @@ export default { ...@@ -5260,6 +5260,14 @@ export default {
title: '出团公司审核' title: '出团公司审核'
} }
}, },
{
path: '/changePriceAudit',
name: 'changePriceAudit',
component: resolve => require(['@/components/dmc/manager/changePriceAudit'], resolve),
meta: {
title: '团队价格审核'
}
},
{ {
path: '/newFeature', path: '/newFeature',
name: 'newFeature', name: 'newFeature',
......
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