Skip to content

S
SuperMan
Commit 1e40fd92 authored by 黄奎's avatar 黄奎
Browse files
Options

订车、订房推送调整

parent b4747994
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 419 additions and 441 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 1e40fd92
...@@ -1050,21 +1050,22 @@ ...@@ -1050,21 +1050,22 @@
<el-button v-if="item.IsPush==0" @click.native='PushMessage(item)' type="primary" <el-button v-if="item.IsPush==0" @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">订房推送 style="background:#00C6FF; border-color:#00C6FF;">订房推送
</el-button> </el-button>
<el-tooltip v-else-if="item.IsPush==1" class="item" effect="dark" placement="top"> <el-tooltip v-else-if="item.IsPush==1" class="item" effect="dark" placement="top">
<div slot="content"> <div slot="content">
<div v-html="TipsContent(item,1)"></div> <div v-html="TipsContent(item,1)"></div>
</div> </div>
<el-button @click.native='PushMessage(item)' type="primary" style="background:red !important;">已推送 <el-button @click.native='PushMessage(item)' type="primary" style="background:red !important;">已推送订房
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-else-if="item.IsPush==2" class="item" effect="dark" :content="item.HotelPushDate" placement="top"> <el-tooltip v-else-if="item.IsPush==2" class="item" effect="dark" :content="item.HotelPushDate"
placement="top">
<div slot="content"> <div slot="content">
<div v-html="TipsContent(item,1)"></div> <div v-html="TipsContent(item,1)"></div>
</div> </div>
<el-button @click.native='PushMessage(item)' type="primary" <el-button @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">重新推送 style="background:#00C6FF; border-color:#00C6FF;">推送订房
</el-button> </el-button>
</el-tooltip> </el-tooltip>
</template> </template>
<template v-if="item.LineID==14||item.LineID==118"> <template v-if="item.LineID==14||item.LineID==118">
...@@ -1072,22 +1073,23 @@ ...@@ -1072,22 +1073,23 @@
style="background:#00C6FF; border-color:#00C6FF;">订车推送 style="background:#00C6FF; border-color:#00C6FF;">订车推送
</el-button> </el-button>
<!-- content="点击取消推送" --> <!-- content="点击取消推送" -->
<el-tooltip v-else-if="item.CarIsPush==1" class="item" effect="dark" :content="item.CarPushDate" placement="top"> <el-tooltip v-else-if="item.CarIsPush==1" class="item" effect="dark" :content="item.CarPushDate"
placement="top">
<div slot="content"> <div slot="content">
<div v-html="TipsContent(item,2)"></div> <div v-html="TipsContent(item,2)"></div>
</div> </div>
<el-button @click.native='PushBusMessage(item)' type="primary" style="background:red !important;"> <el-button @click.native='PushBusMessage(item)' type="primary" style="background:red !important;">
已推送 已推送订车
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-else-if="item.CarIsPush==2" class="item" effect="dark" placement="top"> <el-tooltip v-else-if="item.CarIsPush==2" class="item" effect="dark" placement="top">
<div slot="content"> <div slot="content">
<div v-html="TipsContent(item,2)"></div> <div v-html="TipsContent(item,2)"></div>
</div> </div>
<el-button @click.native='PushBusMessage(item)' type="primary" <el-button @click.native='PushBusMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">重新推送 style="background:#00C6FF; border-color:#00C6FF;">订车推送
</el-button> </el-button>
</el-tooltip> </el-tooltip>
</template> </template>
<el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C"> <el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">
{{$t('Operation.Op_remark')}} {{$t('Operation.Op_remark')}}
...@@ -1696,34 +1698,23 @@ ...@@ -1696,34 +1698,23 @@
} }
}); });
}, },
//提示信息(type=1酒店推送,type=2订车推送)
TipsContent(item, type) {
TipsContent(item,type){ let resultStr = '';
let resultStr=''; //订车推送
let dateStr=''; if (type == 2) {
if(type==2){ if (item.CarIsPush == 1) {
if(item.CarIsPush==1){ resultStr += '已推送订车，推送时间:' + item.CarPushDate + '<br/>点击可取消用车';
resultStr+= '点击取消推送'+"<br/>"+'' } else if (item.CarIsPush == 2) {
dateStr ='推送时间：'; resultStr += '已取消订车，取消时间:' + item.CarPushDate + '<br/>点击可重新推送用车';
}
else if(item.CarIsPush==2){
resultStr+= '点击重新推送'+"<br/>"
dateStr ='取消时间：';
}
if(item.CarPushDate){
resultStr+= dateStr+ item.CarPushDate+"<br/>"
} }
} else if(type==1){ }
if(item.IsPush==1){ //订房推送
dateStr ='推送时间：'; else if (type == 1) {
resultStr+= '点击取消推送'+"<br/>" if (item.IsPush == 1) {
} resultStr = '已推送订房，推送时间：' + item.HotelPushDate + '<br/> 点击可取消订房';
else if(item.IsPush==2){ } else if (item.IsPush == 2) {
dateStr ='取消时间：'; resultStr = '已取消订房推送，取消时间：' + item.HotelPushDate + '<br/>点击可重新推送订房';
resultStr+= '点击重新推送'+"<br/>"
}
if(item.HotelPushDate){
resultStr+= dateStr+ item.HotelPushDate+"<br/>"
} }
} }
return resultStr; return resultStr;
...@@ -1738,32 +1729,31 @@ ...@@ -1738,32 +1729,31 @@
if (item.IsPush == 1) { if (item.IsPush == 1) {
cmdStr = "travel_post_CancelPushTravelPriceToQYWork"; //取消推送 cmdStr = "travel_post_CancelPushTravelPriceToQYWork"; //取消推送
tipMessage = "【取消】推送"; tipMessage = "【取消】推送";
} let that = this; }
that.$confirm('是否确认操作酒店推送', this.$t('tips.tips'), { let that = this;
confirmButtonText: this.$t('pub.sureBtn'), that.$confirm('是否确认操作酒店推送', this.$t('tips.tips'), {
cancelButtonText: this.$t('pub.cancelBtn'), confirmButtonText: this.$t('pub.sureBtn'),
type: 'warning' cancelButtonText: this.$t('pub.cancelBtn'),
}).then(() => { type: 'warning'
this.queryCommonData.loading = true; }).then(() => {
this.apipost(cmdStr, pMsg, res => { this.queryCommonData.loading = true;
if (res.data.resultCode == 1) { this.apipost(cmdStr, pMsg, res => {
this.Success(tipMessage + '成功!'); if (res.data.resultCode == 1) {
this.getControlList(); this.Success(tipMessage + '成功!');
} else { this.getControlList();
this.Error(tipMessage + '失败!'); } else {
} this.Error(tipMessage + '失败!');
}); }
}).catch(() => {
}); });
}).catch(() => {
});
}, },
//订车推送 //订车推送
PushBusMessage(item) { PushBusMessage(item) {
var pMsg = { var pMsg = {
TCID: item.TCID TCID: item.TCID
}; };
var tipMessage = "订车推送消息"; var tipMessage = "订车推送消息";
var cmdStr = "travel_post_PushTravelBusToQYWork"; //推送消息 var cmdStr = "travel_post_PushTravelBusToQYWork"; //推送消息
if (item.CarIsPush == 1) { if (item.CarIsPush == 1) {
...@@ -1771,24 +1761,21 @@ ...@@ -1771,24 +1761,21 @@
tipMessage = "订车【取消】推送"; tipMessage = "订车【取消】推送";
} }
let that = this; let that = this;
that.$confirm('是否确认操作订车推送', this.$t('tips.tips'), { that.$confirm('是否确认操作订车推送', this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'), confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.queryCommonData.loading = true; this.queryCommonData.loading = true;
this.apipost(cmdStr, pMsg, res => { this.apipost(cmdStr, pMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(tipMessage + '成功!'); this.Success(tipMessage + '成功!');
this.getControlList(); this.getControlList();
} else { } else {
this.Error(tipMessage + '失败!'); this.Error(tipMessage + '失败!');
} }
});
}).catch(() => {
}); });
}).catch(() => {});
}, },
showDialog(ConfigId, OfferId) { showDialog(ConfigId, OfferId) {
this.dialog = { this.dialog = {
......
src/components/index.vue
View file @ 1e40fd92
...@@ -2075,7 +2075,7 @@ ...@@ -2075,7 +2075,7 @@
let day = changedate.getDate() let day = changedate.getDate()
let days = day > 9 ? day : '0' + Month let days = day > 9 ? day : '0' + Month
let DepartETime = Year + '-' + Months + '-' + days let DepartETime = Year + '-' + Months + '-' + days
console.log("ddddddd", DepartETime); console.log("Index_GetChangeThePrice", DepartETime);
let msg = { let msg = {
pageIndex: 1, pageIndex: 1,
pagesize: 5, pagesize: 5,
......
src/components/myOrdersAllType/components/OrderList.vue
View file @ 1e40fd92
...@@ -1097,8 +1097,7 @@ ...@@ -1097,8 +1097,7 @@
}); });
}, },
// 单据详情 // 单据详情
openDetails(FrID) { openDetails(FrID) {
console.log(FrID);
let query = { let query = {
id: FrID, id: FrID,
blank: "y", blank: "y",
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 1e40fd92
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
<template v-for="item in TypeArray"> <template v-for="item in TypeArray">
<div class="TFslide" <div class="TFslide"
:class="{'TFcked':item.isShow,'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)}" :class="{'TFcked':item.isShow,'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)}"
@click="clickFeature(item)" :key="item.subCode" @click="clickFeature(item)" :key="item.subCode">
>
<!--v-if="((item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState<=3)"--> <!--v-if="((item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState<=3)"-->
<img v-bind:src="item.imgUrl"> <img v-bind:src="item.imgUrl">
<div>{{item.ckTitle}}</div> <div>{{item.ckTitle}}</div>
...@@ -411,8 +410,8 @@ ...@@ -411,8 +410,8 @@
this.dialogPptistVisible = false this.dialogPptistVisible = false
}, },
handleMessage(event, targetOrigin) { handleMessage(event, targetOrigin) {
console.log("event", event); console.log("handleMessage_event", event);
console.log("event.data", event.data); console.log("handleMessage_event.data", event.data);
if (this.isPostMessage) return if (this.isPostMessage) return
if (event.data && event.data.data && !event.data.data) return if (event.data && event.data.data && !event.data.data) return
if (event && event.data) { if (event && event.data) {
...@@ -464,7 +463,6 @@ ...@@ -464,7 +463,6 @@
} }
}, },
getHtml: function (postData, SaveType, TeamType) { getHtml: function (postData, SaveType, TeamType) {
console.log("postData", postData);
var FeatureData = { var FeatureData = {
B2BRemark: postData.B2BRemark, B2BRemark: postData.B2BRemark,
ConfigId: postData.ConfigId, ConfigId: postData.ConfigId,
...@@ -521,7 +519,6 @@ ...@@ -521,7 +519,6 @@
} }
FeatureData.FeatureHtml = newHtml; FeatureData.FeatureHtml = newHtml;
} catch (err) {} } catch (err) {}
console.log("Api_FeatureData", FeatureData);
this.apipost("travel_post_SetFeature", FeatureData, res => { this.apipost("travel_post_SetFeature", FeatureData, res => {
try { try {
this.$refs.newFeature.setReadOnly(false) this.$refs.newFeature.setReadOnly(false)
......
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ 1e40fd92
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
</div> </div>
<TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" <TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
:subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig" :subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig"
v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice> v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
<div id="fiveAnchor"> <div id="fiveAnchor">
<!--常规团--> <!--常规团-->
<TravelPrice v-show="PostConfig.TeamType==0" @saveMsg="SaveData(1)" ref="TravelPrice" @headCallBack="getPrice" <TravelPrice v-show="PostConfig.TeamType==0" @saveMsg="SaveData(1)" ref="TravelPrice" @headCallBack="getPrice"
......
src/components/newTravelmanager/TravelGroupControl/TravelNotice.vue
View file @ 1e40fd92
...@@ -186,9 +186,6 @@ ...@@ -186,9 +186,6 @@
</div> </div>
</template> </template>
<script> <script>
import {
quillEditor
} from "vue-quill-editor";
import * as Quill from "quill"; //引入编辑器 import * as Quill from "quill"; //引入编辑器
import MyEdit from "../../EditTemplate.vue"; import MyEdit from "../../EditTemplate.vue";
//quill编辑器的字体 //quill编辑器的字体
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 1e40fd92
...@@ -357,7 +357,7 @@ ...@@ -357,7 +357,7 @@
<div> <div>
<div class="TravelPrice clearfix" :class="{'foldHeight':isFold==1}"> <div class="TravelPrice clearfix" :class="{'foldHeight':isFold==1}">
<span class="TMTitle"> <span class="TMTitle">
<i></i>{{$t('sm.tuanqishezhi')}} <i></i>{{$t('sm.tuanqishezhi')}}
</span> </span>
<span class="foldList" @click="fold" v-if="isFold==''">{{$t('sm.djzd')}}</span> <span class="foldList" @click="fold" v-if="isFold==''">{{$t('sm.djzd')}}</span>
<span class="foldList" @click="fold" v-if="isFold==1">{{$t('sm.djzk')}}</span> <span class="foldList" @click="fold" v-if="isFold==1">{{$t('sm.djzk')}}</span>
...@@ -654,7 +654,8 @@ ...@@ -654,7 +654,8 @@
</el-form-item> </el-form-item>
<el-form-item prop="OutBranchId" style="margin-top:1px;"> <el-form-item prop="OutBranchId" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('scen.sc_cp')}}</span> <span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('scen.sc_cp')}}</span>
<el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName" :disabled="CurrentUserInfo.RB_Group_id==2"> <el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName"
:disabled="CurrentUserInfo.RB_Group_id==2">
<el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
<el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id"> <el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
</el-option> </el-option>
...@@ -1236,9 +1237,7 @@ ...@@ -1236,9 +1237,7 @@
message: res.data.message message: res.data.message
}); });
} }
}, });
err => {}
);
}, },
//销售公司改变方法 //销售公司改变方法
ChangeSaleBranch(item) { ChangeSaleBranch(item) {
...@@ -1406,7 +1405,6 @@ ...@@ -1406,7 +1405,6 @@
}); });
this.returnPriceList = array; this.returnPriceList = array;
}, },
initCalendar: function (cur) { initCalendar: function (cur) {
var newDays = this.$calendarUtils.createCalendar(cur); var newDays = this.$calendarUtils.createCalendar(cur);
this.currentDay = newDays.CurrentDay; this.currentDay = newDays.CurrentDay;
...@@ -1526,8 +1524,7 @@ ...@@ -1526,8 +1524,7 @@
message: res.data.message message: res.data.message
}); });
} }
}, }
err => {}
); );
}, },
validateForm() { validateForm() {
...@@ -1729,9 +1726,7 @@ ...@@ -1729,9 +1726,7 @@
this.companyList = res.data.data; this.companyList = res.data.data;
this.getstandardCurrencyName() this.getstandardCurrencyName()
} }
}, });
err => {}
);
}, },
//选中航班选择框 //选中航班选择框
getSelect(item) { getSelect(item) {
...@@ -1912,10 +1907,12 @@ ...@@ -1912,10 +1907,12 @@
}, },
//关闭弹窗方法 //关闭弹窗方法
closeHotelDialog() { closeHotelDialog() {
console.log("xxxx")
this.outerVisible = false; this.outerVisible = false;
}, },
//保存完成初始化 //保存完成初始化
initStatus() { initStatus() {
console.log("yyyy")
this.isSaved = true; this.isSaved = true;
this.btnText = '保存'; this.btnText = '保存';
this.btnTongBu = "同步酒店"; this.btnTongBu = "同步酒店";
...@@ -1934,9 +1931,7 @@ ...@@ -1934,9 +1931,7 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
item.HotelList = res.data.data; item.HotelList = res.data.data;
} }
}, });
err => {}
);
} }
}, },
//获取少价信息 //获取少价信息
...@@ -1947,14 +1942,12 @@ ...@@ -1947,14 +1942,12 @@
LineTeamId: this.PostConfig.LineteamId LineTeamId: this.PostConfig.LineteamId
} }
this.apipost("sell_get_GetNewTCIDLessprice", msg, res => { this.apipost("sell_get_GetNewTCIDLessprice", msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.lessPriceData = res.data.data; this.lessPriceData = res.data.data;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, });
err => {}
);
}, },
//删除占用的酒店库存信息 //删除占用的酒店库存信息
DeleteStock(item) { DeleteStock(item) {
...@@ -1966,15 +1959,13 @@ ...@@ -1966,15 +1959,13 @@
useTime: item.SubList[0].JourneyDate useTime: item.SubList[0].JourneyDate
}; };
that.apipost("hoteluse_post_DeleteHotelUse", delMsg, res => { that.apipost("hoteluse_post_DeleteHotelUse", delMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
that.Success("操作成功!"); that.Success("操作成功!");
item.SubList[0].UseCount = 0; item.SubList[0].UseCount = 0;
} else { } else {
that.Error(res.data.message); that.Error(res.data.message);
} }
}, });
err => {}
);
}); });
}, },
//根据日期返回星期几 //根据日期返回星期几
...@@ -1989,15 +1980,12 @@ ...@@ -1989,15 +1980,12 @@
//获取团队类型 //获取团队类型
getTeamList() { getTeamList() {
this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => { this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.TeamListArr = res.data.data; this.TeamListArr = res.data.data;
} else {
} else { this.Error(res.data.message);
this.Error(res.data.message); }
} });
},
err => {}
);
}, },
uploadFileBtn(file) { //上传 uploadFileBtn(file) { //上传
let newArr = []; let newArr = [];
...@@ -2013,16 +2001,14 @@ ...@@ -2013,16 +2001,14 @@
//获取车辆列表 //获取车辆列表
getBusList() { getBusList() {
this.apipost("bus_get_GetBusTypePriceList", { this.apipost("bus_get_GetBusTypePriceList", {
IsHaveBusNum: 1 IsHaveBusNum: 1
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.busPriceList = res.data.data; this.busPriceList = res.data.data;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, });
err => {}
);
} }
}, },
mounted() { mounted() {
......
src/components/newTravelmanager/travelLineTrip/trifficTripThree.vue
View file @ 1e40fd92
...@@ -9,9 +9,7 @@ ...@@ -9,9 +9,7 @@
<div class="TDLeftPlan"> <div class="TDLeftPlan">
<span v-for="(subTraffic,subTrafficIndex) in trafficObj.SubTraffic"> <span v-for="(subTraffic,subTrafficIndex) in trafficObj.SubTraffic">
<span v-if="subTrafficIndex==0"> <span v-if="subTrafficIndex==0">
<el-form-item <el-form-item class="StartCity" :rules="trifficTripRules.StartCityId">
class="StartCity"
:rules="trifficTripRules.StartCityId">
<el-select :disabled="isOpenGroup" class="w120" placeholder="出发城市" filterable remote <el-select :disabled="isOpenGroup" class="w120" placeholder="出发城市" filterable remote
v-model="subTraffic.StartCityId" reserve-keyword :remote-method="GetDepartList1" v-model="subTraffic.StartCityId" reserve-keyword :remote-method="GetDepartList1"
@change="changeGetDepartList(subTraffic.StartCityId)"> @change="changeGetDepartList(subTraffic.StartCityId)">
...@@ -51,9 +49,10 @@ ...@@ -51,9 +49,10 @@
<!--增加交通计划--> <!--增加交通计划-->
<span style="line-height: 38px;"> <span style="line-height: 38px;">
<span v-if="!isOpenGroup" class="addTrafficPlan" @click="addTrafficPlan(trafficObj)">+</span> <span v-if="!isOpenGroup" class="addTrafficPlan" @click="addTrafficPlan(trafficObj)">+</span>
<!--减少交通计划--> <!--减少交通计划-->
<span v-if="trafficObj!=null && trafficObj.SubTraffic!=null && trafficObj.SubTraffic.length>1&&!isOpenGroup" <span
class="addTrafficPlan" @click="minusTrafficPlan(trafficObj)">-</span> v-if="trafficObj!=null && trafficObj.SubTraffic!=null && trafficObj.SubTraffic.length>1&&!isOpenGroup"
class="addTrafficPlan" @click="minusTrafficPlan(trafficObj)">-</span>
</span> </span>
</div> </div>
</div> </div>
...@@ -122,7 +121,6 @@ ...@@ -122,7 +121,6 @@
"QueryData", "QueryData",
"isOpenGroup", "isOpenGroup",
"subTotalIndex", "subTotalIndex",
"AllCityList", //所有的城市数据
"TimeTypeList", "TimeTypeList",
"UseTypeArray", "UseTypeArray",
"AirPickUp", "AirPickUp",
...@@ -255,7 +253,7 @@ ...@@ -255,7 +253,7 @@
if (val != 0) { if (val != 0) {
//获取当前选中的对象 //获取当前选中的对象
let obj = {}; let obj = {};
obj = that.AllCityList.find(item => { obj = that.ArriveList1.find(item => {
return item.ID === val; //筛选出匹配数据 return item.ID === val; //筛选出匹配数据
}); });
if (obj != undefined) { if (obj != undefined) {
...@@ -279,7 +277,7 @@ ...@@ -279,7 +277,7 @@
if (val != 0) { if (val != 0) {
//获取当前选中的对象 //获取当前选中的对象
let obj = {}; let obj = {};
obj = that.AllCityList.find(item => { obj = that.DepartList1.find(item => {
return item.ID === val; //筛选出匹配数据 return item.ID === val; //筛选出匹配数据
}); });
if (obj != undefined) { if (obj != undefined) {
...@@ -291,7 +289,6 @@ ...@@ -291,7 +289,6 @@
} }
} }
}, },
//接机送机点击切换 //接机送机点击切换
changeAirportType(t) { changeAirportType(t) {
if (t == this.trafficObj.AirportPickUp) { if (t == this.trafficObj.AirportPickUp) {
...@@ -425,17 +422,21 @@ ...@@ -425,17 +422,21 @@
</script> </script>
<style> <style>
.addTrafficPlan{ .addTrafficPlan {
line-height: 20px; line-height: 20px;
} }
.useTypeDiv .el-input .el-input__inner{
.useTypeDiv .el-input .el-input__inner {
height: 27px !important; height: 27px !important;
border-radius: 3px; border-radius: 3px;
} }
.StartCity .el-form-item__content{
.StartCity .el-form-item__content {
line-height: 35px; line-height: 35px;
} }
.TCtraffic.flex .TDplanList.TDplanListTwo{
.TCtraffic.flex .TDplanList.TDplanListTwo {
padding-top: 0; padding-top: 0;
} }
</style> </style>
src/components/orderCommon/order-form2.vue
View file @ 1e40fd92
...@@ -1037,8 +1037,6 @@ ...@@ -1037,8 +1037,6 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.couponList = res.data.data this.couponList = res.data.data
} }
}, (err) => {
console.log(err)
}) })
} }
}, },
......
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