Skip to content

S
SuperMan
Commit ff800269 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 2a553c79 b40c4d35
Show whitespace changes
Inline Side-by-side
Showing with 296 additions and 88 deletions
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ ff800269
...@@ -135,8 +135,6 @@ ...@@ -135,8 +135,6 @@
padding: 9px 15px; padding: 9px 15px;
} }
.groupSuperSearchLayer {}
.groupSuperSearchLayer>p { .groupSuperSearchLayer>p {
padding: 20px 0; padding: 20px 0;
font-size: 14px; font-size: 14px;
...@@ -255,8 +253,6 @@ ...@@ -255,8 +253,6 @@
font-size: 0px; font-size: 0px;
} }
.groupTourOrder_remarks>div {}
.groupTourOrder_remarks>div>div:nth-child(1) { .groupTourOrder_remarks>div>div:nth-child(1) {
float: left; float: left;
display: flex; display: flex;
...@@ -790,6 +786,89 @@ ...@@ -790,6 +786,89 @@
margin: 5px; margin: 5px;
text-align: center; text-align: center;
} }
.groupts .leftSetInfo,.groupts .GO_TPright{
float:left;
}
.KT_Scenic{
width:400px;
max-height: 400px;
overflow: auto;
}
.KT_Scenic table th{
height:30px;
}
.KT_Scenic table td{
padding:9px 5px!important;
}
._TravelPricePopover .GOScenicDiv{
width: 500px;
max-height: 400px;
overflow: auto;
}
._TravelPricePopover table,.KT_Scenic table{
padding: 10px 0 0 20px;
background-color: #ededed;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
margin: 0 20px 5px 0;
width: 100%;
}
._TravelPricePopover table ._color_666 ,.KT_Scenic table ._color_666{
background-color: #ededed;
color: #666666;
padding: 5px;
}
._TravelPricePopover table td,.KT_Scenic table td{
background-color: #ffffff;
padding: 9px 0;
color: #333333;
text-align: center;
border: 1px solid #d2d2d2;
}
._TravelPricePopover table td._d_name {
background-color: #ededed;
}
.groupts .GO_Title{
display: inline-block;
margin-top: 10px;
padding-right:10px;
font-size:12px;
width: 90px;
text-align: right;
}
.groupts .SimulateDrop-box {
width: 230px;
min-height: 34px;
position: relative;
padding: 5px 21px 5px 6px;
float: left;
margin-top: 4px;
border: 1px solid #d1d1d1;
}
.groupts .GO_SimulaDrop{
position: absolute;
right:10px;
top:5px;
color:#d1d1d1;
}
.groupts .SD_flight {
display: inline-block;
height: 24px;
margin: 0 3px 3px 0;
overflow: hidden;
max-width: 200px;
white-space: nowrap;
text-overflow: ellipsis;
font-size:12px;
padding: 0 8px;
line-height: 22px;
background-color: #f0f2f5;
}
</style> </style>
...@@ -1398,18 +1477,60 @@ ...@@ -1398,18 +1477,60 @@
<el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')" @input='getTotalPrice();getHouseNo()'></el-input> <el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')" @input='getTotalPrice();getHouseNo()'></el-input>
</el-form-item>--> </el-form-item>-->
</el-col> </el-col>
<el-col :span="4"> <el-col :span="8">
<el-form-item label="可退景点"> <!-- <el-form-item label="可退景点">
<el-select filterable multiple class='multiple_input' v-model='addMsg.ScenicRefundArr' <el-select filterable multiple class='multiple_input' v-model='addMsg.ScenicRefundArr'
:placeholder="$t('pub.pleaseSel')" @change='ScenicRefundMethods'> :placeholder="$t('pub.pleaseSel')" @change='ScenicRefundMethods'>
<el-option v-for='item in ScenicRefundList' :label='item.ScenicName' :value='item.Id' <el-option v-for='item in ScenicRefundList' :label='item.ScenicName' :value='item.Id'
:key='item.ScenicName'> :key='item.ScenicName'>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
</el-col> <div class="clearfix">
<el-col :span="4"> <div class="leftSetInfo">
&nbsp; <span class="GO_Title">可退景点</span>
</div>
<div class="GO_TPright clearfix">
<el-popover popper-class="_TravelPricePopover" trigger="click">
<div>
<div class="GOScenicDiv">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="_color_666">选择</td>
<td class="_color_666">景点名称</td>
<td class="_color_666">OP设置金额</td>
<td class="_color_666">人数</td>
<td class="_color_666">退款金额</td>
</tr>
<tr v-for="item in ScenicRefundList">
<td>
<el-checkbox :checked="item.IsChecked" @change="getGOScenic(item)"></el-checkbox>
</td>
<td>
{{item.CouponsName}}
</td>
<td>
{{item.RefundMoney}}
</td>
<td>
<el-input class="w80" @keyup.native="checkInteger(item,'Number')" @change="getGOScenictWO"
v-model="item.Number"></el-input>
</td>
<td>
<el-input class="w80" @keyup.native="checkPrice(item,'BackMoney')" @change="getGOScenictWO"
v-model="item.BackMoney"></el-input>
</td>
</tr>
</table>
</div>
</div>
<div slot="reference" class="SimulateDrop-box">
<span class="SD_flight" v-for="subItem in SciencNameList">{{subItem}}</span>
<i class="iconfont icon-arrow-down GO_SimulaDrop"></i>
</div>
</el-popover>
</div>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
...@@ -1638,7 +1759,7 @@ ...@@ -1638,7 +1759,7 @@
<th width="200">操作</th> <th width="200">操作</th>
</tr> </tr>
<tr> <tr>
<td v-show="list.length==0" colspan="16" align="center">暂无数据</td> <td v-show="list.length==0" colspan="17" align="center">暂无数据</td>
</tr> </tr>
<template v-for="op in list"> <template v-for="op in list">
<tbody class="not_border"> <tbody class="not_border">
...@@ -1900,10 +2021,15 @@ ...@@ -1900,10 +2021,15 @@
@click='getDetail(item)'></el-button> @click='getDetail(item)'></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="修改备注" placement="top-start"> <el-tooltip class="item" effect="dark" content="修改备注" placement="top-start">
<el-button <!-- <el-button
v-if="(userId==1||userId==5)|| ( item.isOwn==1 ||item.isHaveFinance=='1'||item.orderState=='1')" v-if="(userId==1||userId==5)|| ( item.isOwn==1 ||item.isHaveFinance=='1'||item.orderState=='1')"
type="primary" style='background:#a55eea; border-color:#a55eea' icon="iconfont icon-beizhu" type="primary" style='background:#a55eea; border-color:#a55eea' icon="iconfont icon-beizhu"
@click='getRemarks(item)'></el-button> -->
<el-button
v-if="(userId==1||userId==5)|| item.isOwn==1"
type="primary" style='background:#a55eea; border-color:#a55eea' icon="iconfont icon-beizhu"
@click='getRemarks(item)'></el-button> @click='getRemarks(item)'></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" content="日志" placement="top-start" style="float:left"> <el-tooltip effect="dark" content="日志" placement="top-start" style="float:left">
<el-popover width='230' trigger="click"> <el-popover width='230' trigger="click">
...@@ -1995,7 +2121,24 @@ ...@@ -1995,7 +2121,24 @@
<!-- <span>暂无名单</span>--> <!-- <span>暂无名单</span>-->
<!-- </span>--> <!-- </span>-->
<span style="display: block">房间信息<span v-if="item.oneSex>0" <span style="display: block">房间信息<span v-if="item.oneSex>0"
style="color: #e95252">（{{item.oneSex==1?'单男':'单女'}}）</span>：{{item.orderGuestHouseStr}}</span> style="color: #e95252">（{{item.oneSex==1?'单男':'单女'}}）</span>：
{{item.orderGuestHouseStr}}
<el-popover trigger="click" popper-class="KT_Scenic">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;">
<th width="150">景点名称</th>
<th width="60">人数</th>
<th width="60">退款金额</th>
</tr>
<tr v-for="fItem in item.orderBackScenicList" style="text-align:center;">
<td style="text-align:left;">{{fItem.couponsName}}</td>
<td>{{fItem.number}}</td>
<td>{{fItem.backMoney}}</td>
</tr>
</table>
<span slot="reference" v-if="item.orderBackScenicList&&item.orderBackScenicList.length>0" style="color:#f56c6c;margin-left:20px;cursor:pointer;">退景点</span>
</el-popover>
</span>
<!-- <span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span> --> <!-- <span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span> -->
<div> <div>
<span v-if="item.opTipMoney==''&&item.tipMoney!=''" style="color:red">（小费：{{item.tipMoney}}）</span> <span v-if="item.opTipMoney==''&&item.tipMoney!=''" style="color:red">（小费：{{item.tipMoney}}）</span>
...@@ -2667,6 +2810,8 @@ ...@@ -2667,6 +2810,8 @@
RefuseVisaNum: '0', RefuseVisaNum: '0',
AirticketNum: "0", AirticketNum: "0",
ScenicRefundArr: [], ScenicRefundArr: [],
//景点新数组
OrderBackScenicList:[],
GoCityTime: "", GoCityTime: "",
BackCityTime: "", BackCityTime: "",
CommissionSharePeople: "-1", CommissionSharePeople: "-1",
...@@ -2890,8 +3035,7 @@ ...@@ -2890,8 +3035,7 @@
tcnum: '', tcnum: '',
isOrder: '', isOrder: '',
}, },
SciencNameList:[]
}; };
}, },
components: { components: {
...@@ -3377,24 +3521,45 @@ ...@@ -3377,24 +3521,45 @@
this.getTotalPrice(); this.getTotalPrice();
this.getTicheng(); this.getTicheng();
}, },
getScenicRefund(TCID) { getScenicRefund(TCID,OrderId) {
this.OrderId = OrderId;
let msg = {
TCID:TCID,
OrderId:OrderId
}
this.apipost( this.apipost(
"sellorder_get_GetScenicRefundList", { "sellorder_get_GetScenicRefundList", msg,
TCID
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.ScenicRefundList = res.data.data; this.ScenicRefundList = res.data.data;
this.ScenicRefundList.forEach(item => { this.getGOScenictWO();
item["ScenicName"] =
item.CouponsName + " -￥" + this.moneyFormat(item.RefundMoney);
});
this.ScenicRefundMethods();
} }
}, },
err => {} err => {}
); );
}, },
//勾选景点
getGOScenic(item){
item.IsChecked=!item.IsChecked;
},
//勾选
getGOScenictWO(){
this.addMsg.OrderBackScenicList=[];
this.SciencNameList=[];
this.ScenicRefundList.forEach(x=>{
if(x.IsChecked&&x.Number>0){
let obj = {
CouponsId:x.CouponsId,
IsChecked:x.IsChecked,
BackMoney:x.BackMoney,
Number:x.Number
}
this.SciencNameList.push(x.CouponsName);
this.addMsg.OrderBackScenicList.push(obj);
}
})
},
platformOrderMethods() { platformOrderMethods() {
if (this.addMsg.PlatformOrder == "") { if (this.addMsg.PlatformOrder == "") {
this.addMsg.MinOrderPrice = 0; this.addMsg.MinOrderPrice = 0;
...@@ -3463,6 +3628,10 @@ ...@@ -3463,6 +3628,10 @@
this.getMinPrice(obj.orderId); this.getMinPrice(obj.orderId);
this.addMsg.OrderId = obj.orderId; this.addMsg.OrderId = obj.orderId;
this.IsChargeLossOrders = obj.isChargeLossOrders; this.IsChargeLossOrders = obj.isChargeLossOrders;
//zk-点击修改清空景点
this.ScenicRefundList=[];
this.SciencNameList=[];
this.apipost( this.apipost(
"sellorder_post_GetOrderEntity", { "sellorder_post_GetOrderEntity", {
ID: obj.orderId ID: obj.orderId
...@@ -3479,7 +3648,8 @@ ...@@ -3479,7 +3648,8 @@
this.addObj.OpSetLossMoney = x.OpSetLossMoney; this.addObj.OpSetLossMoney = x.OpSetLossMoney;
this.addMsg.OneSex = x.OneSex; this.addMsg.OneSex = x.OneSex;
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr; this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr;
this.getScenicRefund(obj.tcid); this.addMsg.OrderBackScenicList=[];
this.getScenicRefund(obj.tcid,obj.orderId);
this.getPlatformAccount(obj.platformAccountTypeId, obj.platformAccount); this.getPlatformAccount(obj.platformAccountTypeId, obj.platformAccount);
this.SetOutCityId = res.data.data.SetOutCityId; this.SetOutCityId = res.data.data.SetOutCityId;
this.reOutCityId = res.data.data.SetBackCityId; this.reOutCityId = res.data.data.SetBackCityId;
...@@ -3497,19 +3667,6 @@ ...@@ -3497,19 +3667,6 @@
this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString(); this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString();
this.addMsg.OrderForm = x.OrderForm this.addMsg.OrderForm = x.OrderForm
this.addMsg.allName = x.ContactName this.addMsg.allName = x.ContactName
// this.addMsg_form.OrderId=x.OrderId;
// this.addMsg_form.OpSetLossMoney=x.OpSetLossMoney;//收损金额
// this.addMsg_form.BabyChargePrice=modelPrice.BabyChargePrice;//小孩附加费
// this.addMsg_form.BabyPrice=modelPrice.BabyPrice;//婴儿价
// this.addMsg_form.BackVisaPrice=modelPrice.BackVisaPrice;//退签证费
// this.addMsg_form.ChildNeedPrice=modelPrice.ChildNeedPrice;//小孩占床增收
// this.addMsg_form.ChildNoNeedPrice=modelPrice.ChildNoNeedPrice;//小孩不占床减收
// this.addMsg_form.OldManChargePrice=modelPrice.OldManChargePrice;//老人附加费
// this.addMsg_form.OtherPrice=modelPrice.OtherPrice;//杂费
// this.addMsg_form.SingleDMCPrice=modelPrice.SingleDMCPrice;//单地接
// this.addMsg_form.VisaPrice=modelPrice.VisaPrice;//签证费用
// this.addMsg_form.SingleRoomPrice=modelPrice.SingleRoomPrice;//单房差
this.IsChildrenTour = x.IsChildrenTour; this.IsChildrenTour = x.IsChildrenTour;
this.IsBirdDiscount = x.IsBirdDiscount; this.IsBirdDiscount = x.IsBirdDiscount;
...@@ -3622,7 +3779,7 @@ ...@@ -3622,7 +3779,7 @@
let x = res.data.data.model; let x = res.data.data.model;
this.addMsg = x; this.addMsg = x;
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr; this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr;
this.getScenicRefund(obj.tcid); this.getScenicRefund(obj.tcid,obj.orderId);
this.SetOutCityId = res.data.data.SetOutCityId; this.SetOutCityId = res.data.data.SetOutCityId;
this.reOutCityId = res.data.data.SetBackCityId; this.reOutCityId = res.data.data.SetBackCityId;
this.addMsg.CustomerType = x.CustomerType.toString(); this.addMsg.CustomerType = x.CustomerType.toString();
...@@ -4247,6 +4404,7 @@ ...@@ -4247,6 +4404,7 @@
Number(this.addMsg.AirticketNum); Number(this.addMsg.AirticketNum);
this.addMsg.IsChildrenTour = this.IsChildrenTour; this.addMsg.IsChildrenTour = this.IsChildrenTour;
this.addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount; this.addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount;
this.apipost( this.apipost(
"sellorder_post_SetOrderInfo_02", "sellorder_post_SetOrderInfo_02",
this.addMsg, this.addMsg,
......
src/components/busManagement/BusInfo.vue
View file @ ff800269
...@@ -263,6 +263,7 @@ ...@@ -263,6 +263,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM"> <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
<el-select filterable placeholder="请选择" v-model="subItem.BusCompany"> <el-select filterable placeholder="请选择" v-model="subItem.BusCompany">
<el-option :key="0" :value="0" label="请选择"></el-option>
<el-option v-for="item in SupplierList" :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for="item in SupplierList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
...@@ -556,6 +557,7 @@ ...@@ -556,6 +557,7 @@
}, },
/*获取车辆成本价格*/ /*获取车辆成本价格*/
getBusPrice(obj) { getBusPrice(obj) {
if(this.isShowBtn!=1){
let tempCostFee = 0; let tempCostFee = 0;
var tempHighSpeedFee = 0; var tempHighSpeedFee = 0;
if (obj.AirportPickUp == 3 || obj.AirportPickUp == 4) { if (obj.AirportPickUp == 3 || obj.AirportPickUp == 4) {
...@@ -581,17 +583,15 @@ ...@@ -581,17 +583,15 @@
//全天高速 //全天高速
tempHighSpeedFee += parseFloat(busTypeObj.AllDayHighSpeedFee); tempHighSpeedFee += parseFloat(busTypeObj.AllDayHighSpeedFee);
} }
obj.HighSpeedPrice = tempHighSpeedFee;
obj.CostPrice = tempCostFee;
if (!obj.HighSpeedPrice) { if (!obj.HighSpeedPrice) {
obj.HighSpeedPrice = 0; obj.HighSpeedPrice = 0;
} }
if (!obj.CostPrice) { if (!obj.CostPrice) {
obj.CostPrice = 0; obj.CostPrice = 0;
} }
if (obj.HighSpeedPrice == 0) {
obj.HighSpeedPrice = tempHighSpeedFee;
}
if (obj.CostPrice == 0) {
obj.CostPrice = tempCostFee;
} }
} }
}, },
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ ff800269
...@@ -185,7 +185,11 @@ ...@@ -185,7 +185,11 @@
max-height: 400px; max-height: 400px;
overflow: auto; overflow: auto;
} }
._TravelPricePopover .ScenicDiv{
width: 450px;
max-height: 400px;
overflow: auto;
}
._TravelPricePopover table { ._TravelPricePopover table {
padding: 10px 0 0 20px; padding: 10px 0 0 20px;
background-color: #ededed; background-color: #ededed;
...@@ -664,19 +668,50 @@ ...@@ -664,19 +668,50 @@
<template slot="prepend">集合标识</template> <template slot="prepend">集合标识</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item> </div>
<span class="TP_Sendprepend" style="margin-left:0;width:120px;">可退景点</span> <div class="clearfix">
<el-select class="w180" v-model="priceData.ChooseBackScenicArr" multiple > <div class="leftSetInfo">
<el-option v-for="item in priceData.scenicBackList" :key="item.ID" :label="item.Name" :value="item.ID"> <span class="TPbaseSet"></span>
</el-option> <span class="TPsecondTitle">可退景点</span>
</el-select> </div>
</el-form-item> <div class="TPright clearfix">
<el-form-item> <el-popover popper-class="_TravelPricePopover" trigger="click">
<div>
<div class="ScenicDiv">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="_color_666">选择</td>
<td class="_color_666">景点名称</td>
<td class="_color_666">退款金额</td>
</tr>
<tr v-for="item in priceData.ScenicBackList">
<td>
<el-checkbox :checked="item.IsChecked" @change="getScenic(item)"></el-checkbox>
</td>
<td>
{{item.Name}}
</td>
<td>
<el-input class="w80" @keyup.native="checkPrice(item,'RefundMoney')"
v-model="item.RefundMoney"></el-input>
</td>
</tr>
</table>
</div>
</div>
<div slot="reference" class="SimulateDrop-box">
<span class="SD_flight" v-for="subItem in ScenicList">{{subItem.Name}}</span>
<i class="iconfont icon-arrow-down SimulaDrop"></i>
</div>
</el-popover>
<el-form-item style="margin-top:1px;">
<el-input placeholder="请输入" class="w460 ComSeat" v-model="priceData.AirportService"> <el-input placeholder="请输入" class="w460 ComSeat" v-model="priceData.AirportService">
<template slot="prepend">机场服务</template> <template slot="prepend">机场服务</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
</div> </div>
</div>
<div class="clearfix"> <div class="clearfix">
<div class="leftSetInfo"> <div class="leftSetInfo">
<span class="TPbaseSet"></span> <span class="TPbaseSet"></span>
...@@ -973,6 +1008,8 @@ ...@@ -973,6 +1008,8 @@
offerList: [], offerList: [],
selectFilghtList: [], selectFilghtList: [],
FinfoList: [], FinfoList: [],
//选中景点
ScenicList:[],
//下拉框默认值 //下拉框默认值
SelectDefaultValue: 0, SelectDefaultValue: 0,
SelectOtherDefault: -1, SelectOtherDefault: -1,
...@@ -1142,10 +1179,8 @@ ...@@ -1142,10 +1179,8 @@
ChooseHotelArray: [], ChooseHotelArray: [],
//销售清位时间 //销售清位时间
SaleClearOrderHour: 0, SaleClearOrderHour: 0,
//可退景点选择列表
chooseBackScenicArr:[],
//可退景点下拉列表 //可退景点下拉列表
scenicBackList:[], ScenicBackList:[],
}; };
} }
this.returnPriceList.push(objItem); this.returnPriceList.push(objItem);
...@@ -1538,6 +1573,20 @@ ...@@ -1538,6 +1573,20 @@
} }
}); });
}, },
//选中景点选择框
getScenic(item){
item.IsChecked=!item.IsChecked;
this.initScenic();
},
//初始化景点
initScenic(){
this.ScenicList=[];
this.priceData.ScenicBackList.forEach(x=>{
if(x.IsChecked){
this.ScenicList.push(x);
}
})
},
goUrl(path, id) { goUrl(path, id) {
this.$router.push({ this.$router.push({
name: path, name: path,
...@@ -1735,6 +1784,7 @@ ...@@ -1735,6 +1784,7 @@
x["Checked"] = true; x["Checked"] = true;
this.chooseDay = this.priceData.StartDate; this.chooseDay = this.priceData.StartDate;
this.initFlightData(); this.initFlightData();
this.initScenic();
} else { } else {
x["Checked"] = false; x["Checked"] = false;
} }
......
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