Commit ff800269 authored by 华国豪's avatar 华国豪 🙄
parents 2a553c79 b40c4d35
...@@ -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,42 +557,41 @@ ...@@ -556,42 +557,41 @@
}, },
/*获取车辆成本价格*/ /*获取车辆成本价格*/
getBusPrice(obj) { getBusPrice(obj) {
let tempCostFee = 0; if(this.isShowBtn!=1){
var tempHighSpeedFee = 0; let tempCostFee = 0;
if (obj.AirportPickUp == 3 || obj.AirportPickUp == 4) { var tempHighSpeedFee = 0;
obj.PayType = 8; if (obj.AirportPickUp == 3 || obj.AirportPickUp == 4) {
} else if (obj.AirportPickUp == 13) { obj.PayType = 8;
obj.PayType = 7; } else if (obj.AirportPickUp == 13) {
} else { obj.PayType = 7;
obj.PayType = 2; } else {
} obj.PayType = 2;
//高速付款方式默认现付
obj.HighSpeedPayType = 1;
let busTypeObj = this.BusTypeList.find(item => item.Id === obj.BusType);
if (busTypeObj) {
//接送价格
if (obj.AirportPickUp == 1 || obj.AirportPickUp == 2) {
tempCostFee += parseFloat(busTypeObj.ReceivePrice);
//接送高速
tempHighSpeedFee += parseFloat(busTypeObj.PickUpHighSpeedFee);
}
//全天价格
if (obj.AirportPickUp == 12) {
tempCostFee += parseFloat(busTypeObj.AllDayPrice);
//全天高速
tempHighSpeedFee += parseFloat(busTypeObj.AllDayHighSpeedFee);
}
if (!obj.HighSpeedPrice) {
obj.HighSpeedPrice = 0;
}
if (!obj.CostPrice) {
obj.CostPrice = 0;
} }
if (obj.HighSpeedPrice == 0) { //高速付款方式默认现付
obj.HighSpeedPayType = 1;
let busTypeObj = this.BusTypeList.find(item => item.Id === obj.BusType);
if (busTypeObj) {
//接送价格
if (obj.AirportPickUp == 1 || obj.AirportPickUp == 2) {
tempCostFee += parseFloat(busTypeObj.ReceivePrice);
//接送高速
tempHighSpeedFee += parseFloat(busTypeObj.PickUpHighSpeedFee);
}
//全天价格
if (obj.AirportPickUp == 12) {
tempCostFee += parseFloat(busTypeObj.AllDayPrice);
//全天高速
tempHighSpeedFee += parseFloat(busTypeObj.AllDayHighSpeedFee);
}
obj.HighSpeedPrice = tempHighSpeedFee; obj.HighSpeedPrice = tempHighSpeedFee;
}
if (obj.CostPrice == 0) {
obj.CostPrice = tempCostFee; obj.CostPrice = tempCostFee;
if (!obj.HighSpeedPrice) {
obj.HighSpeedPrice = 0;
}
if (!obj.CostPrice) {
obj.CostPrice = 0;
}
} }
} }
}, },
......
...@@ -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>
<span class="TP_Sendprepend" style="margin-left:0;width:120px;">可退景点</span>
<el-select class="w180" v-model="priceData.ChooseBackScenicArr" multiple >
<el-option v-for="item in priceData.scenicBackList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-input placeholder="请输入" class="w460 ComSeat" v-model="priceData.AirportService">
<template slot="prepend">机场服务</template>
</el-input>
</el-form-item>
</div> </div>
<div class="clearfix">
<div class="leftSetInfo">
<span class="TPbaseSet"></span>
<span class="TPsecondTitle">可退景点</span>
</div>
<div class="TPright clearfix">
<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">
<template slot="prepend">机场服务</template>
</el-input>
</el-form-item>
</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