update

src/components/Ticket/AirlineTicketOrder.vue

+<template>
+  <div class="AirlineTicketOrder">
+      <el-row>
+        <el-col :span="20" :offset="2">
+            <el-form ref="form" :model="form" label-width="100px">
+
+            <el-form-item label="订单状态:">
+                <el-select v-model="form.status" filterable size="mini">
+                    <el-option label="全部" :value=0></el-option>
+                    <el-option label="正常" :value=1></el-option>
+                    <el-option label="取消" :value=2></el-option>
+                    <el-option label="代付款" :value=3></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="下单开始时间:">
+                <el-date-picker size="mini" type="date" placeholder="下单开始时间" v-model="form.startTime"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="下单结束时间:">
+                <el-date-picker size="mini" type="date" placeholder="下单开始时间" v-model="form.endTime"></el-date-picker>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" size="mini">查询</el-button>
+            </el-form-item>
+            
+        </el-form>
+
+        <el-table 
+        v-loading="loading"
+        :data="tableData"
+        stripe
+        style="width: 100%">
+        <el-table-column
+        prop="id"
+        label="订单id">
+        </el-table-column>
+        <el-table-column
+        prop="contactName"
+        label="联系人姓名">
+        </el-table-column>
+        <el-table-column
+        prop="contactMobile"
+        label="联系人电话">
+        </el-table-column>
+         <el-table-column
+        prop="status"
+        label="订单状态">
+        </el-table-column>
+        
+         <el-table-column label="操作">
+      <template slot-scope="scope">
+        
+        <el-button
+          size="mini"
+          type="danger"
+          @click="handleEdit(scope.$index, scope.row)">修改订单</el-button>
+      </template>
+    </el-table-column>
+    </el-table>
+    <div style="text-align:right;margin:10px 0;">   
+        <el-pagination
+            @current-change="Currentchange"
+            background
+            layout="prev, pager, next"
+            :total="total">
+            </el-pagination>
+    </div>
+        </el-col>
+      </el-row>
+        
+
+
+      
+  </div>
+</template>
+<script>
+export default {
+  data () {
+    return {
+        form:{
+            status:0,
+            startTime:'',
+            endTime:'',
+            pageIndex:1,
+            pageSize:15,
+        },
+      tableData:[],
+      total:0,
+      loading:false,
+    }
+  },
+  mounted() {
+    
+    
+  },
+  created(){
+      this.List();
+  },
+  methods: {
+      Currentchange(val){
+          this.form.pageIndex=val;
+          this.List();
+      },
+      handleEdit(index,row){
+        //   console.log("row",row)
+          this.$router.push({
+                path: `/EditTicketOrder/${row.id}`
+            })
+      },
+    List(){
+        this.loading=true;
+        this.apiJavaPost('/api/dmc/airticket/GetB2BAirtickOrderPageList',this.form,res=>{
+                // console.log(res);
+                this.loading=false;
+                if(res.data.resultCode==1){
+                    this.tableData=res.data.data.pageData;
+                    this.total=res.data.data.count;
+                }
+                
+                
+            },null)
+    },
+  }
+}
+</script>
+
+<style>
+.AirlineTicketOrder .el-pager{
+    margin-top:6px;
+}
+.AirlineTicketOrder .el-form-item{
+    display: inline-block;
+    margin:10px 5px;
+}
+</style>

src/components/Ticket/Choose.vue

@@ -232,12 +232,15 @@ export default {
 }
 </script>
 <style>
+.choose_back .msg .el-input__icon{
+    line-height: 0;
+}
 
-    .msg .el-select{
+ .choose_back .msg .el-select{
     width: 130px;
     height: 100%;
 }
-.msg .el-select>.el-input{
+.choose_back .msg .el-select>.el-input{
     width: 100%;
 }
 .msg .el-button{
@@ -281,16 +284,11 @@ export default {
     padding-left: 6px;
     box-sizing: border-box
 }
-.msg .el-input{
-    width: 145px;
-    height: 100%;
-}
+
 .msg .el-input.is-active .el-input__inner, .el-input__inner:focus{
     border-color: none;
 }
-.msg .el-date-editor.el-input, .el-date-editor.el-input__inner{
-    width: 145px;
-}
+
 .msg .el-input__inner{
     border: none;
     height: 100%;

src/components/Ticket/FillItinerary.vue

@@ -270,7 +270,7 @@ export default {
         //获取订单详情
         GetDes(){
             this.apiJavaPost('/api/dmc/airticket/getB2BAirticketInfo',{AirTicketId:this.AirTicketId},res=>{
-                // console.log("订单",res)
+                console.log("订单",res)
                 this.getlistSigel=res.data.data;
                 this.getlistSigel.synum=this.getlistSigel.airTicketScatterNum-this.getlistSigel.useScatterNum;
                 
@@ -307,6 +307,7 @@ export default {
                     airProductId:this.personNum.airProductId,//机票产品id
                     birthday:'',//出生日期
                     mobilePhone:'',
+                    eName:'',
                     name:"",
                     nationality:2,
                     passportNo:"",//护照号码
@@ -399,6 +400,13 @@ export default {
 }
 </script>
 <style>
+.w31{
+    /* background: #58a; */
+    /* background: radial-gradient(circle at 0 25px, transparent 15px, #58a 16px) top left,
+    radial-gradient(circle at 100px 25px, transparent 15px, #58a 16px) right top;
+    background-size: 50% 100%;
+    background-repeat: no-repeat; */
+}
 .ticket_list .padd{
     padding-left:25px;
     box-sizing: border-box;

src/components/Ticket/TicketHome.vue

@@ -377,16 +377,13 @@ p{
     padding-bottom: 2px;
     box-sizing: border-box
 }
-.el-input{
-    width: 145px;
+.msg  .el-input{
     height: 100%;
 }
-.el-input.is-active .el-input__inner, .el-input__inner:focus{
+.msg  .el-input.is-active .el-input__inner, .el-input__inner:focus{
     border-color: none;
 }
-.el-date-editor.el-input, .el-date-editor.el-input__inner{
-    width: 145px;
-}
+
 .msg .el-input__inner{
     border: none;
     height: 100%;

src/components/Ticket/TicketList.vue

@@ -517,7 +517,7 @@ export default {
        
         getList(){
             this.apiJavaPost('/api/dmc/airticket/getB2BAirticketList',this.choose_info,res=>{
-                console.log("机票列表",res)
+                // console.log("机票列表",res)
                 this.datalist=res.data.data.pageData;
                 if(this.datalist.length>0){
                     this.datalist.forEach(item=>{
@@ -593,6 +593,9 @@ export default {
 <style>
 @import '../../assets/global/font.css';
 @import '../../assets/css/reset.css';
+.ticket_1 .msg .el-input__icon{
+    line-height: 0;
+}
 .ticket_1 .msg .number{
     width:150px;
     height:34px;

src/components/global/head.vue

@@ -6,8 +6,8 @@
     margin-top:10px;
 }
 .header .ckxx{
-    width:38px;
-    height:38px;
+    width:39px;
+    height:39px;
     background:rgba(73,192,161,1);
     border-radius:50%;
     color:#fff;
@@ -134,6 +134,7 @@ color:rgba(51,51,51,1);
                             <el-menu default-active="" class="el-menu-demo small" mode="horizontal" background-color="rgba(0,0,0,0)" active-text-color="#EF4455">
                                 <el-menu-item index="1" @click="goUrl('PsCenter',false)"><a href="javascript:void(0);">个人主页</a></el-menu-item>
                                 <el-menu-item index="2" @click="goUrl('PsOrder',false)"><a href="javascript:void(0);">订单管理</a></el-menu-item>
+                                <el-menu-item index="6" @click="goUrl('AirlineTicketOrder',false)"><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="4" @click="goUrl('PsSystem',false)"><a href="javascript:void(0);">系统管理</a></el-menu-item>
                                 <el-menu-item index="5" @click="goUrl('PsAccBalance',false)"><a href="javascript:void(0);">账户余额</a></el-menu-item>
@@ -239,10 +240,12 @@ export default {
     },
     goUrl(path,bl){
         // console.log("path",path)
-        // console.log("bl",bl)
-        localStorage.homePage = bl;
+        if(path=='heel'){
+            sessionStorage.setItem("defaultKey",'2-1');
+            this.$emit('forword', '2-1')
+        }
+        sessionStorage.setItem("Homepage",bl);
         this.$store.commit('HomePage',bl)
-        // console.log(" this.homePage.", this.homePage) 
         this.$router.push({name:path});
     }
   }

src/main.js

@@ -29,15 +29,6 @@ Vue.http = Vue.prototype.$http = axios
 Vue.commonUtils = Vue.prototype.$commonUtils=commonUtils
 Vue.prototype.$echarts = echarts
 router.beforeEach((to, from, next) => {  
-  let ticket=to.path.substring(1, 7);
-  if(ticket=="ticket"){
-    sessionStorage.setItem("Homepage",'ticket');
-    store.commit('HomePage','ticket')
-  }else{
-    sessionStorage.setItem("Homepage",'true');
-    store.commit('HomePage','true')
-  }
-  
 
   if (to.meta.title) {    
     if(localStorage.g && localStorage.g!='undefined'){

src/router.js

@@ -162,7 +162,25 @@ export default new Router({
             meta: {
               title: '支付'
             }
+          },
+          {
+            path: '/AirlineTicketOrder',
+            name: 'AirlineTicketOrder',
+            component: resolve => require(['@/components/Ticket/AirlineTicketOrder'], resolve),
+            meta: {
+              title: '机票订单'
+            }
+          },
+          {
+            path: '/EditTicketOrder/:id',
+            name: 'EditTicketOrder',
+            component: resolve => require(['@/components/Ticket/EditTicketOrder'], resolve),
+            meta: {
+              title: '修改机票订单'
+            }
           }
+          
+          
         ]
         }
       ]