Skip to content

A
Athena
Commit 2ef323c9 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

11

parent 0a57a597
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 637 additions and 63 deletions
src/components/Ticket/Choose.vue
View file @ 2ef323c9
......@@ -11,10 +11,10 @@
<el-select style="width:80%" v-model="choose_info.departure_city" filterable placeholder="请选择">
<el-option :value=0 label="不限"></el-option>
<el-option
v-for="item in cawei"
:key="item.id"
:label="item.title"
:value="item.id">
v-for="item in cfd"
:key="item.ID"
:label="item.Name"
:value="item.ID">
</el-option>
</el-select>
</div>
......@@ -23,10 +23,10 @@
<el-select style="width:80%" v-model="choose_info.arrival_city" filterable placeholder="请选择">
<el-option :value=0 label="不限"></el-option>
<el-option
v-for="item in cawei"
:key="item.id"
:label="item.title"
:value="item.id">
v-for="item in cfd"
:key="item.ID"
:label="item.Name"
:value="item.ID">
</el-option>
</el-select>
</div>
......@@ -65,10 +65,14 @@
<span>婴儿 | </span>
<el-input-number size="mini" v-model="choose_info.ye" @change="handleChange" :min="0" :max="10" label="描述文字"></el-input-number>
</div>
<el-button @click="Search" size="small">搜索</el-button>
<div class="number">
<span>老人 | </span>
<el-input-number size="mini" v-model="choose_info.lr" @change="handleChange" :min="0" :max="10" label="描述文字"></el-input-number>
</div>
</div>
<div>
<div class="city" style="width:200px;display:inline-block;margin-right:10px">
<div class="city" style="width:200px;display:inline-block;">
<span>舱位选择 | </span>
<el-select v-model="choose_info.freightSpace" placeholder="请选择">
<el-option
......@@ -79,7 +83,7 @@
</el-option>
</el-select>
</div>
<div class="city" style="width:250px;display:inline-block">
<div class="city" style="width:250px;display:inline-block;margin:0 10px">
<span>航空公司 | </span>
<el-select style="width:180px" filterable v-model="choose_info.airLineID" placeholder="请选择">
<el-option :value=0 label="不限"></el-option>
......@@ -87,6 +91,7 @@
:key="item.AirLineId"></el-option>
</el-select>
</div>
<el-button @click="Search" size="small">搜索</el-button>
</div>
</el-col>
</el-row>
......@@ -118,6 +123,7 @@ export default {
cr:0,
child:0,
ye:0,
lr:0,
},
startweek:"",
......@@ -135,6 +141,7 @@ export default {
input10:"",
value:"",
airlineList:[],
cfd:[],
}
},
......@@ -143,9 +150,22 @@ export default {
},
created(){
this.initAirlines();
this.CFD();
this.$emit("ChooseInfo",this.choose_info)
},
methods: {
CFD(){
this.apipost(
"dict_post_Destination_GetCityList", {},
res => {
if (res.data.resultCode == 1) {
this.cfd=res.data.data;
}
},
err => {
}
);
},
// 航空公司下拉框
initAirlines() {
this.apipost(
......@@ -199,13 +219,13 @@ export default {
handleChange(){},
Search(){
this.choose_info.airTicketScatterNum=this.choose_info.cr+this.choose_info.child+this.choose_info.ye;
console.log(this.choose_info,'choose_info');
this.$emit("ChooseInfo",this.choose_info)
sessionStorage.setItem("ChooseInfo",JSON.stringify(this.choose_info));
this.$router.push({
path: 'TicketList',
query:this.choose_info
path: 'TicketList'
})
}
}
......
src/components/Ticket/FillItinerary.vue 0 → 100644
View file @ 2ef323c9
This diff is collapsed.
src/components/Ticket/TicketHome.vue
View file @ 2ef323c9
......@@ -175,7 +175,7 @@ export default {
methods: {
JXYH(){
this.apiJavaPost('/api/dmc/airticket/getB2BAirticketList',this.Youhui,res=>{
console.log("Youhui",res)
// console.log("Youhui",res)
this.yhList=res.data.data.pageData;
},null)
},
......@@ -188,6 +188,8 @@ export default {
console.log("ChooseInfo",val)
if(val){
this.Choose_Info=val;
this.Choose_Info.airTicketScatterNum=this.Choose_Info.cr+this.Choose_Info.lr+this.Choose_Info.child;
}
},
loadSize(){
......
src/components/Ticket/TicketList.vue
View file @ 2ef323c9
This diff is collapsed.
src/components/global/head.vue
View file @ 2ef323c9
......@@ -48,7 +48,9 @@
<!-- <el-menu-item index="2-3">单团</el-menu-item>
<el-menu-item index="2-4">私人订制</el-menu-item> -->
</el-submenu>
<el-menu-item index="3"><a href="javascript:void(0);">机票</a></el-menu-item>
<!-- <el-menu-item index="3"><a href="javascript:void(0);">机票</a></el-menu-item> -->
<!-- <el-menu-item index="5"><a href="javascript:void(0);">机票</a></el-menu-item>
<el-menu-item index="2"><a href="javascript:void(0);">酒店</a></el-menu-item>
<el-menu-item index="4"><a href="javascript:void(0);">餐厅</a></el-menu-item>
......
src/components/mall/newcalendar.vue
View file @ 2ef323c9
......@@ -69,6 +69,7 @@
</div>
</template>
<script>
import moment from 'moment'
import bus from '../../plugins/event-bus'
export default {
props:{
......@@ -88,7 +89,7 @@ export default {
},mounted(){
},created(){
this.getYearMonthDay();
// this.getYearMonthDay();
},methods:{
selectDate(index){
if(this.$data.daysData[index].day == 0) {
......@@ -110,9 +111,11 @@ export default {
bus.$emit('chosen-tripdate', this.currentDay.substring(0,7) + '-' + clickDay)
},
getYearMonthDay(){
// console.log("day",this.day);
let currentYear = this.currentDay.substring(0,4); //当前年份
let currentMonth = this.currentDay.substring(5,7); //当前月份
let day=moment(this.day).add(1, 'month').format('YYYY-MM-DD');
// let day=this.day;
let currentYear = day.substring(0,4); //当前年份
let currentMonth =day.substring(5,7); //当前月份
// console.log("currentYear",currentYear)
// console.log("currentMonth",currentMonth)
let date = new Date();
let strDate = date.getDate();
......@@ -136,9 +139,8 @@ export default {
var dateObject = new Date(currentDay);
var firstDay = dateObject.getDay();//得到每个月1号是周几
for (var i in this.priceData) {
var price = this.priceData[i];
let price = this.priceData[i];
var dayIndex = price.dateStr.substring(price.dateStr.length-2,price.dateStr.length);
// console.log(dayIndex)
var dayDict = daysData[Number(dayIndex)-1];
dayDict.price = price.price;
if(dayIndex<strDate&&strMonth==currentMonth){
......
src/router.js
View file @ 2ef323c9
......@@ -138,6 +138,14 @@ export default new Router({
meta: {
title: '机票列表'
}
},
{
path: '/FillItinerary/:id',
name: 'FillItinerary',
component: resolve => require(['@/components/Ticket/FillItinerary'], resolve),
meta: {
title: '行程填写'
}
}
]
}
......
src/views/index.vue
View file @ 2ef323c9
......@@ -68,7 +68,7 @@ export default {
path='/heel'
}
if(index=='3'){
path='/TicketList'
path='/TicketHome'
}
if (path != "") {
this.$router.push({ path });
......
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