Commit cd4ef8c6 authored by liudong1993's avatar liudong1993
parents 3f96063e cca2d1a9
......@@ -78,7 +78,7 @@
</el-tooltip>
</td>
<td width="80">
{{item.UseAmount}}{{$t('hotel_.hotel_people')}}
{{item.UseAmount}}{{$t('hotel.hotel_people')}}
</td>
<td width="200" class="orderNum" @click="showTip(index)">
<i class="iconfont icon-dingdanhao"></i>{{$t('hotel.order_Number')}}<span class="orderId">{{item.ID}}</span>
......
......@@ -538,7 +538,7 @@
<i class="iconfont icon-img-rili"></i>{{item.NeedDateStr}}
</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>
<i class="iconfont icon-img_dz"></i><span v-if="item.CountryName!=''">{{item.CountryName}} / </span>
......
......@@ -539,7 +539,7 @@
<i class="iconfont icon-img-rili"></i>{{item.NeedDateStr}}
</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>
<i class="iconfont icon-img_dz"></i><span v-if="item.CountryName!=''">{{item.CountryName}} / </span>
......
......@@ -538,7 +538,7 @@
<i class="iconfont icon-img-rili"></i>{{item.NeedDateStr}}
</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>
<i class="iconfont icon-img_dz"></i><span v-if="item.CountryName!=''">{{item.CountryName}} / </span>
......
......@@ -515,7 +515,7 @@
<i class="iconfont icon-img-rili"></i>{{item.NeedDateStr}}
</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>
<i class="iconfont icon-img_dz"></i><span v-if="item.CountryName!=''">{{item.CountryName}} / </span>
......
......@@ -77,7 +77,7 @@
</el-tooltip>
</td>
<td width="80">
{{item.UseAccount}}{{$t('hotel_.hotel_people')}}
{{item.UseAccount}}{{$t('hotel.hotel_people')}}
</td>
<td width="300" class="orderNum" @click="showTip(index)">
<i class="iconfont icon-dingdanhao"></i>{{$t('hotel.order_Number')}}<span class="orderId">{{item.ID}}</span>
......
......@@ -2181,7 +2181,7 @@
<span style="display: block">{{ $t("salesModule.RoomInfo")
}}<span v-if="item.oneSex > 0"
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>
......
......@@ -437,7 +437,8 @@
</el-form-item>
<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 :label="$t('objFill.v101.Rest.jiageyxriqi')" style="width:588px">
<el-date-picker
......
......@@ -7,7 +7,7 @@
<span>{{$t('objFill.theorderselected')}}</span>
<template v-for="(x,index) in multipleSelection">
<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>
</template>
<span style="margin-left: 20px;">{{$t('objFill.zongrenshu')}}:{{getPeopleNum()}}</span>
......@@ -206,7 +206,7 @@
<div v-for="(item,index) in proofList" class="table-box proofList-box">
<div style="margin-bottom: 5px;">
<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>
</div>
<div class="d-flex">
......
......@@ -82,7 +82,7 @@
</el-tooltip>
</td>
<td width="80">
{{item.UseAccount}}{{$t('hotel_.hotel_people')}}
{{item.UseAccount}}{{$t('hotel.hotel_people')}}
</td>
<td width="300" class="orderNum" @click="showTip(index)">
<i class="iconfont icon-dingdanhao"></i><span class="orderId">{{$t('objFill.orderid')}}{{item.ID}}</span>
......
......@@ -1544,6 +1544,9 @@
<el-dropdown-item @click.native="CopyTripAndFeature(item, 2)">
{{ $t("objFill.v101.xiugaictriqi") }}
</el-dropdown-item>
<el-dropdown-item @click.native="ckChangePrice(item)">
价格变更
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -1565,10 +1568,6 @@
{{ item.OutGroupAuditRemark }} {{ item.OutGroupAuditDate }}
</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="TCL_remarkTitle">{{ $t("Operation.Op_duiwaiRemark") }}:</div>
<div class="TCL_Content">{{ item.OPRemark }}</div>
......@@ -1619,6 +1618,33 @@
</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>
</ul>
<div class="noData" v-show="queryMsg.noData">
......@@ -1807,6 +1833,39 @@
</el-button>
</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">
<el-dialog :visible.sync="dialog.show" width="1400px" :title="$t('objFill.baojiaxiangqing')">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
......@@ -2029,6 +2088,15 @@
copyType: "",
CurrentTCNUM: "",
},
//价格变更
changePriceMsg: {
isShowChangePrice: false,
TCID: 0,
NewB2BPrice: "",
NewB2CPrice: "",
ChangePriceStatus: 1,
ChangeRemark: "",
},
flightStatus: [{
Id: 0,
Name: this.$t("pub.unlimitedSel"),
......@@ -2374,7 +2442,7 @@
//获取TCID
clickAirticket(item) {
this.updateAirticketObj.TCID = item.TCID;
console.log(" this.updateAirticketObj",item.TCID, this.updateAirticketObj)
console.log(" this.updateAirticketObj", item.TCID, this.updateAirticketObj)
},
//开启散客机票
openAirticket() {
......@@ -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设置
ckOPInfo(item) {
this.VisaOPMsg.VisaShow = true;
......
......@@ -1046,6 +1046,9 @@
</el-dropdown-item>
<el-dropdown-item @click.native='CopyTripAndFeature(item,2)'>{{$t('objFill.v101.xiugaictriqi')}}
</el-dropdown-item>
<el-dropdown-item @click.native="ckChangePrice(item)">
价格变更
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -1105,6 +1108,33 @@
</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>
</ul>
<div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>
......@@ -1232,6 +1262,38 @@
</el-button>
</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')">
<div v-if="dialog.show">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
......@@ -1446,6 +1508,15 @@
copyType: "",
CurrentTCNUM: "",
},
//价格变更
changePriceMsg: {
isShowChangePrice: false,
TCID: 0,
NewB2BPrice: "",
NewB2CPrice: "",
ChangePriceStatus: 1,
ChangeRemark: "",
},
//更新可售机票数量
updateAirticketObj: {
TCID: 0,
......@@ -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设置
ckOPInfo(item) {
this.VisaOPMsg.VisaShow = true;
......
......@@ -454,7 +454,8 @@
</p>
<p class="travelnowrap">
<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">
<el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')">
<el-popover width="350" trigger="click" popper-class="TC_HotelPop">
......@@ -870,6 +871,9 @@
</el-dropdown-item>
<el-dropdown-item @click.native='CopyTripAndFeature(item,2)'>{{$t('objFill.v101.xiugaictriqi')}}
</el-dropdown-item>
<el-dropdown-item @click.native="ckChangePrice(item)">
价格变更
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -922,6 +926,33 @@
</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>
</ul>
<div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>
......@@ -1035,6 +1066,38 @@
</el-button>
</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')">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
</el-dialog>
......@@ -1243,6 +1306,14 @@
copyType: "",
CurrentTCNUM: "",
},
changePriceMsg: {
isShowChangePrice: false,
TCID: 0,
NewB2BPrice: "",
NewB2CPrice: "",
ChangePriceStatus: 1,
ChangeRemark: "",
},
saveLoading: false, //保存loading防止重复提交
//当前登录用户信息
CurrentUserInfo: {},
......@@ -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订车推送)
TipsContent(item, type) {
let resultStr = '';
......
This diff is collapsed.
......@@ -79,7 +79,7 @@
</el-tooltip>
</td>
<td width="80">
{{item.UseAccount}}{{$t('hotel_.hotel_people')}}
{{item.UseAccount}}{{$t('hotel.hotel_people')}}
</td>
<td width="200" class="orderNum" @click="showTip(index)">
<i class="iconfont icon-dingdanhao"></i><span class="orderId">{{$t('objFill.orderid')}}{{item.ID}}</span>
......
......@@ -4,7 +4,7 @@
<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>
<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>
</template>
......
......@@ -5260,6 +5260,14 @@ export default {
title: '出团公司审核'
}
},
{
path: '/changePriceAudit',
name: 'changePriceAudit',
component: resolve => require(['@/components/dmc/manager/changePriceAudit'], resolve),
meta: {
title: '团队价格审核'
}
},
{
path: '/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