Merge remote-tracking branch 'origin/master'

@@ -30,8 +30,9 @@ module.exports = {
     assetsPublicPath: '/',
     assetsPublicPath: '/',
     proxyTable: {
     proxyTable: {
       '/api':{
       '/api':{
-          target: 'http://192.168.1.53:12343',//设置你调用的接口域名和端口号 别忘了加http
-          // target: 'http://localhost:12343',//设置你调用的接口域名和端口号 别忘了加http
+         target: 'http://192.168.1.53:12343',//设置你调用的接口域名和端口号 别忘了加http
+         // target: 'http://192.168.1.189:12343',//设置你调用的接口域名和端口号 别忘了加http
+           // target: 'http://localhost:12343',//设置你调用的接口域名和端口号 别忘了加http
           changeOrigin: true,
           changeOrigin: true,
           pathRewrite: {
           pathRewrite: {
               '^/api/': '/'//这里理解成用‘/api’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add'，直接写‘/api/user/add’即可
               '^/api/': '/'//这里理解成用‘/api’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add'，直接写‘/api/user/add’即可

@@ -10,10 +10,12 @@
     "build": "node build/build.js"
     "build": "node build/build.js"
   },
   },
   "dependencies": {
   "dependencies": {
+    "@xkeshi/vue-barcode": "^1.0.0",
     "axios": "^0.19.0",
     "axios": "^0.19.0",
     "echarts": "^3.3.2",
     "echarts": "^3.3.2",
     "element-ui": "^2.13.0",
     "element-ui": "^2.13.0",
     "eslint": "^5.14.1",
     "eslint": "^5.14.1",
+    "eslint-plugin-html": "^6.0.2",
     "fecha": "^4.2.0",
     "fecha": "^4.2.0",
     "file-saver": "^2.0.2",
     "file-saver": "^2.0.2",
     "font-awesome": "^4.7.0",
     "font-awesome": "^4.7.0",
@@ -62,7 +64,7 @@
     "http-proxy-middleware": "^0.19.1",
     "http-proxy-middleware": "^0.19.1",
     "json-loader": "^0.5.4",
     "json-loader": "^0.5.4",
     "mockjs": "^1.0.1-beta3",
     "mockjs": "^1.0.1-beta3",
-    "node-sass": "^4.14.1",
+    "node-sass": "^4.5.0",
     "opn": "^4.0.2",
     "opn": "^4.0.2",
     "optimize-css-assets-webpack-plugin": "^1.3.0",
     "optimize-css-assets-webpack-plugin": "^1.3.0",
     "ora": "^1.0.0",
     "ora": "^1.0.0",

+import axios from 'axios'
+import http from "../http";
+
+
+let baseUrl = 'wltp-flight-consigneeconsigner/consignee'
+
+export const getList = params => { return axios.get(`${baseUrl}/list`, { params: params }); };
+
+export const remove = params => { return axios.delete(`${baseUrl}/remove`, { params: params }); };
+
+export const add = params => { return http.post(`${baseUrl}/add`,params)};
+
+export const edit = params => { return http.put(`${baseUrl}/edit`,params)};
+
+

+import axios from 'axios'
+import http from '../http.js'
+
+
+let baseUrl = 'wltp-flight-consigneeconsigner/consigner'
+
+export const getList = params => { return axios.get(`${baseUrl}/list`, { params: params }); };
+
+export const remove = params => { return axios.delete(`${baseUrl}/remove`, { params: params }); };
+
+export const add = params => { return http.post(`${baseUrl}/add`,params)};
+
+export const edit = params => { return http.put(`${baseUrl}/edit`,params)};
+
+

@@ -12,6 +12,8 @@ export const updateMT2201 = params => { return http.put(`${baseUrl}/updateMt2201
 
 
 export const addMt2201 = params => { return http.post(`${baseUrl}/addMt2201`,params)};
 export const addMt2201 = params => { return http.post(`${baseUrl}/addMt2201`,params)};
 
 
+export const selectSecurityAwba = params => { return http.get(`${baseUrl}/selectSecurityAwba`,params)};
+
 export const getLostLoadChange = params => { return http.get(`${baseUrl}/getLostLoadChange`,  params)};
 export const getLostLoadChange = params => { return http.get(`${baseUrl}/getLostLoadChange`,  params)};
 
 
 export const saveLostChange = params => { return http.get(`${baseUrl}/saveLostChange`,  params)};
 export const saveLostChange = params => { return http.get(`${baseUrl}/saveLostChange`,  params)};

+import axios from 'axios'
+
+let baseUrl = 'nmms-server-export/history'
+
+
+
+export const getHistoryList = params => { return axios.get(`${baseUrl}/list`, { params: params }); };
+

+import axios from 'axios'
+
+let base = '/wlpt-flight-scheduling-interface/inquiry';
+
+
+
+export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
+

+import http from '../http.js'
+import axios from "axios";
+
+let baseUrl = 'wltp-security-declaration/security'
+
+export const getList = params => { return http.get(`${baseUrl}/list`,  params)};
+
+export const remove = params => { return axios.delete(`${baseUrl}/remove`, { params: params }); };
+
+export const edit = params => { return http.put(`${baseUrl}/edit`, params)};
+
+export const add = params => { return http.post(`${baseUrl}/add`,params)};
+
+

-
 import Vue from 'vue'
 import Vue from 'vue'
 import App from './App'
 import App from './App'
 import ElementUI from 'element-ui'
 import ElementUI from 'element-ui'
@@ -17,6 +16,10 @@ import * as socketApi from './api/socket'
 import '@/styles/index.scss'
 import '@/styles/index.scss'
 import sys_init from '@/common/init/sys_init'
 import sys_init from '@/common/init/sys_init'
 
 
+// 条形组件
+import VueBarcode from '@xkeshi/vue-barcode'; //导入条形码插件
+Vue.component('barcode', VueBarcode);
+
 
 
 //定义一个全局过滤器实现日期格式化
 //定义一个全局过滤器实现日期格式化
 Vue.filter('datefmt',function(input,fmtstring){
 Vue.filter('datefmt',function(input,fmtstring){

@@ -25,7 +25,6 @@ import ExitLoading from './views/nmms/ExitLoading.vue'
 import ExitFlightDesc from './views/nmms/ExitFlightDesc.vue'
 import ExitFlightDesc from './views/nmms/ExitFlightDesc.vue'
 import LostLoad from './views/lostLoadChange/lostLoading.vue'
 import LostLoad from './views/lostLoadChange/lostLoading.vue'
 import LostLoadChange from './views/lostLoadChange/lostLoadChange.vue'
 import LostLoadChange from './views/lostLoadChange/lostLoadChange.vue'
-
 import OrigFlightList from './views/nmms_import/OrigFlightList.vue'
 import OrigFlightList from './views/nmms_import/OrigFlightList.vue'
 import EnterFlightInfo from './views/nmms_import/EnterFlightInfo.vue'
 import EnterFlightInfo from './views/nmms_import/EnterFlightInfo.vue'
 import OrigMaster from './views/nmms_import/OrigMaster.vue'
 import OrigMaster from './views/nmms_import/OrigMaster.vue'
@@ -36,9 +35,21 @@ import AllocateSearch from './views/nmms_import/AllocateSearch.vue'
 import Importallocation from './views/nmms_import/Importallocation.vue'
 import Importallocation from './views/nmms_import/Importallocation.vue'
 import Allocatearrive from './views/nmms_import/Allocatearrive.vue'
 import Allocatearrive from './views/nmms_import/Allocatearrive.vue'
 import User from './views/nav1/user.vue'
 import User from './views/nav1/user.vue'
-import Page4 from './views/nav2/Page4.vue'
-import Page5 from './views/nav2/Page5.vue'
+import preConfiguration from './views/nav2/preConfiguration.vue'
+import allocate from './views/nav2/allocate.vue'
+import charge from './views/nav2/charge.vue'
+import documents from './views/nav2/documents.vue'
+import booking from './views/nav4/booking.vue'
+import order from './views/nav4/order.vue'
+import airlift from './views/nav4/airlift.vue'
+import inquiry from './views/nav4/inquiry.vue'
 import Page6 from './views/nav3/Page6.vue'
 import Page6 from './views/nav3/Page6.vue'
+import Page7 from './views/nav3/Page7.vue'
+
+
+
+
+
 import echarts from './views/charts/echarts.vue'
 import echarts from './views/charts/echarts.vue'
 import SecrityInspection from './views/staff/security_inspection.vue'
 import SecrityInspection from './views/staff/security_inspection.vue'
 import Key from './views/staff/key.vue'
 import Key from './views/staff/key.vue'
@@ -75,6 +86,9 @@ import queryDeparture from './views/airtransport/queryDeparture.vue'
 import queryDeclare from './views/airtransport/queryDeclare.vue'
 import queryDeclare from './views/airtransport/queryDeclare.vue'
 import outConfigure from './views/airtransport/outConfigure.vue'
 import outConfigure from './views/airtransport/outConfigure.vue'
 import queryFlightConfigure from './views/airtransport/queryFlightConfigure.vue'
 import queryFlightConfigure from './views/airtransport/queryFlightConfigure.vue'
+import Consigner from './views/consigner/consigner.vue'
+import Consignee from './views/consigner/consignee.vue'
+import Security from './views/security/security.vue'
 
 
 
 
 
 
@@ -103,15 +117,44 @@ let routes = [
     },
     },
     // { path: '/test', component: Main },
     // { path: '/test', component: Main },
 
 
+    {
+        path: '/',
+        component: Home,
+        name: '海关货物流转',
+        iconCls: 'el-icon-delete-location',
+        children: [
+            { path: '/Page6', component: Page6, name: '申请列表' },
+            { path: '/Page7', component: Page7, name: '申请添加' },
+        ]
+    },
+
+    {
+        path: '/domdep',
+        component: Home,
+        name: '订舱系统',
+        iconCls: 'el-icon-delete-location',
+        children: [
+            { path: '/booking', component: booking, name: '在线订舱' },
+            { path: '/order', component: order, name: '订舱信息' },
+            { path: '/airlift', component: airlift, name: '空运专线' },
+        ]
+    },
+
+
+
+
     // 货运系统--航班预配
     // 货运系统--航班预配
     {
     {
         path: '/domdep',
         path: '/domdep',
         component: Home,
         component: Home,
         name: '国内出港',
         name: '国内出港',
-        iconCls: 'el-icon-setting',
+        iconCls: 'el-icon-position',
         children: [
         children: [
-            { path: '/Page4', component: Page4, name: '航班预配' },
-            // { path: '/role', component: Role, name: '组织机构' },
+            { path: '/preConfiguration', component: preConfiguration, name: '航班预配' },
+            { path: '/allocate', component: allocate, name: '航班配载' },
+            { path: '/documents', component: documents, name: '航班文件' },
+            { path: '/charge', component: charge, name: '付费处理' },
+
             // { path: '/perm', component: Perm, name: '权限管理' },
             // { path: '/perm', component: Perm, name: '权限管理' },
             // { path: '/log', component: LOG, name: '系统日志' },
             // { path: '/log', component: LOG, name: '系统日志' },
             // { path: '/department', component: Department, name: '部门管理' },
             // { path: '/department', component: Department, name: '部门管理' },
@@ -161,6 +204,15 @@ let routes = [
         ]
         ]
     },
     },
     {
     {
+        path: '/sec',
+        component: Home,
+        name: '安检清单申报管理',
+        iconCls: 'el-icon-collection',
+        children: [
+            {path: '/security', component: Security, name: '安检清单申报'}
+        ]
+    },
+    {
         path: '/nmms2',
         path: '/nmms2',
         component: Home,
         component: Home,
         name: '进港业务申报',
         name: '进港业务申报',
@@ -177,6 +229,16 @@ let routes = [
             {path:'/allocatearrive',component:Allocatearrive,name:'分拨运抵'},
             {path:'/allocatearrive',component:Allocatearrive,name:'分拨运抵'},
         ]
         ]
     },
     },
+    // 货运系统--航班预配
+    {
+        path: '/flight_scheduling',
+        component: Home,
+        name: '航班计划',
+        iconCls: 'el-icon-delete-location',
+        children: [
+            { path: '/inquiry', component: inquiry, name: '航班计划查询' },
+        ]
+    },
     {
     {
         path: '/lost',
         path: '/lost',
         component: Home,
         component: Home,
@@ -231,6 +293,16 @@ let routes = [
         ]
         ]
     },
     },
     {
     {
+        path: '/con',
+        component: Home,
+        name: '收发货人管理',
+        iconCls:'el-icon-goods',
+        children:[
+            {path:'/consigner',component:Consigner,name:'发货人管理'},
+            {path:'/consignee',component:Consignee,name:'收货人管理'},
+        ]
+    },
+    {
         path: '/out',
         path: '/out',
         component: Home,
         component: Home,
         name: '出港申报',
         name: '出港申报',
@@ -252,6 +324,7 @@ let routes = [
         iconCls: 'fa fa-id-card-o',
         iconCls: 'fa fa-id-card-o',
         children: [
         children: [
             { path: '/location', component: Location, name: '能源缴费' },
             { path: '/location', component: Location, name: '能源缴费' },
+
         ]
         ]
     },
     },
     {
     {

@@ -42,8 +42,8 @@
           fixStyle: '',
           fixStyle: '',
           logining: false,
           logining: false,
           ruleForm2: {
           ruleForm2: {
-          account: '',
-          checkPass: ''
+          account: 'admin',
+          checkPass: 'vmvnv1v2VV'
           },
           },
           rules2: {
           rules2: {
           account: [
           account: [

+<template>
+    <section>
+        <!--工具条-->
+        <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
+            <el-form :inline="true" :model="filters">
+                <el-form-item>
+                    <el-input v-model="filters.companyName" placeholder="关键字查询"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" v-on:click="getConsigner()">查询</el-button>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="companyAdd">新增</el-button>
+                </el-form-item>
+            </el-form>
+        </el-col>
+
+        <!--列表-->
+        <el-table :data="consignerList" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;">
+            <el-table-column type="selection" width="55">
+            </el-table-column>
+            <el-table-column label="序号" type="index">
+            </el-table-column>
+            <el-table-column prop="companyName" label="收货人公司"  >
+            </el-table-column>
+            <el-table-column prop="conCity" label="收货人城市"  >
+            </el-table-column>
+            <el-table-column prop="country" label="收货人国家代码"  >
+            </el-table-column>
+            <el-table-column prop="conPhone" label="收货人电话"  >
+            </el-table-column>
+            <el-table-column prop="enterprise" label="收货人企业代码"  >
+            </el-table-column>
+            <el-table-column label="操作" min-width="150">
+                <template slot-scope="scope">
+                    <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+                    <el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!--编辑界面-->
+        <el-dialog title="编辑" :visible.sync="editFormVisible" :close-on-click-modal="false">
+            <el-form :model="editForm" label-width="100px" :rules="editFormRules" ref="editForm">
+                <el-form-item label="ID">
+                    <span>{{editForm.id}}</span>
+                </el-form-item>
+                <el-form-item label="公司" prop="companyName">
+                    <el-input v-model="editForm.companyName" auto-complete="on" placeholder="公司"></el-input>
+                </el-form-item>
+                <el-form-item label="收货人名称" prop="conName">
+                    <el-input v-model="editForm.conName" auto-complete="on" placeholder="收货人名称"></el-input>
+                </el-form-item>
+                <el-form-item label="电话" prop="conPhone">
+                    <el-input v-model="editForm.conPhone" auto-complete="on" placeholder="电话"></el-input>
+                </el-form-item>
+                <el-form-item label="传真" prop="conFax">
+                    <el-input v-model="editForm.conFax" auto-complete="on" placeholder="传真"></el-input>
+                </el-form-item>
+                <el-form-item label="国家代码" prop="country">
+                    <el-input v-model="editForm.country" auto-complete="on" placeholder="国家代码"></el-input>
+                </el-form-item>
+                <el-form-item label="城市" prop="conCity">
+                    <el-input v-model="editForm.conCity" auto-complete="on" placeholder="城市"></el-input>
+                </el-form-item>
+                <el-form-item label="邮编" prop="conPostcode">
+                    <el-input v-model="editForm.conPostcode" auto-complete="on" placeholder="邮编"></el-input>
+                </el-form-item>
+                <el-form-item label="地址" prop="conAddress">
+                    <el-input v-model="editForm.conAddress" auto-complete="on" placeholder="地址"></el-input>
+                </el-form-item>
+                <el-form-item label="收货人AEO" prop="conAeo">
+                    <el-input v-model="editForm.conAeo" auto-complete="on" placeholder="收货人AEO"></el-input>
+                </el-form-item>
+                <el-row>
+                    <el-col :span="6">
+                        <el-form-item label="企业代码" prop="enterprise">
+                            <el-select v-model="editForm.enterprise" placeholder="请选择">
+                                <el-option
+                                        v-for="item in options"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="+" prop="enterprise">
+                            <el-input v-model="editForm.ent"/>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click.native="editFormVisible = false">取消</el-button>
+                <el-button type="primary" @click.native="editSubmit">提交</el-button>
+            </div>
+        </el-dialog>
+
+        <!--新增界面-->
+        <el-dialog title="新增" :visible.sync="addFormVisible" :close-on-click-modal="false">
+            <el-form :model="addForm" label-width="100px" :rules="addFormRules" ref="addForm">
+                <el-form-item label="公司" prop="companyName">
+                    <el-input v-model="addForm.companyName" auto-complete="on" placeholder="公司"></el-input>
+                </el-form-item>
+                <el-form-item label="收货人名称" prop="conName">
+                    <el-input v-model="addForm.conName" auto-complete="on" placeholder="收货人名称"></el-input>
+                </el-form-item>
+                <el-form-item label="电话" prop="conPhone">
+                    <el-input v-model="addForm.conPhone" auto-complete="on" placeholder="电话"></el-input>
+                </el-form-item>
+                <el-form-item label="传真" prop="conFax">
+                    <el-input v-model="addForm.conFax" auto-complete="on" placeholder="传真"></el-input>
+                </el-form-item>
+                <el-form-item label="国家代码" prop="country">
+                    <el-input v-model="addForm.country" auto-complete="on" placeholder="国家代码"></el-input>
+                </el-form-item>
+                <el-form-item label="城市" prop="conCity">
+                    <el-input v-model="addForm.conCity" auto-complete="on" placeholder="城市"></el-input>
+                </el-form-item>
+                <el-form-item label="邮编" prop="conPostcode">
+                    <el-input v-model="addForm.conPostcode" auto-complete="on" placeholder="邮编"></el-input>
+                </el-form-item>
+                <el-form-item label="地址" prop="conAddress">
+                    <el-input v-model="addForm.conAddress" auto-complete="on" placeholder="地址"></el-input>
+                </el-form-item>
+                <el-form-item label="收货人AEO" prop="conAeo">
+                    <el-input v-model="addForm.conAeo" auto-complete="on" placeholder="收货人AEO"></el-input>
+                </el-form-item>
+                <el-row>
+                    <el-col :span="6">
+                        <el-form-item label="企业代码" prop="enterprise">
+                            <el-select v-model="addForm.enterprise" placeholder="请选择">
+                                <el-option
+                                        v-for="item in options"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="+" prop="enterprise">
+                            <el-input v-model="addForm.ent"/>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click.native="addFormVisible = false">取消</el-button>
+                <el-button type="primary" @click.native="addSubmit">提交</el-button>
+            </div>
+        </el-dialog>
+    </section>
+</template>
+
+<script>
+    import util from '../../common/js/util'
+    import NProgress from 'nprogress'
+    import { getList, remove, add, edit} from '../../api/consigner/consignee';
+    import moment from 'moment'
+
+    export default {
+        data() {
+            return {
+
+                options: [{
+                    value: 'USCI',
+                    label: 'USCI'
+                }, {
+                    value: 'OC',
+                    label: 'OC'
+                }, {
+                    value: '9999',
+                    label: '9999'
+                }],
+
+                filters: {
+                    companyName: ''
+                },
+                consignerList: [],
+                total: 0,
+                pageSize: 1,
+                limitSize: 5,
+                listLoading: false,
+                //编辑界面是否显示
+                editFormVisible: false,
+                editLoading: false,
+                editFormRules: {
+
+                    companyName: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+
+                    conName: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+                    country: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+                    enterprise: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+                    conCity: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+                    conAddress: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ]
+                },
+                //编辑界面数据
+                editForm: {
+                    id:'',
+                    companyName: '',
+                    conAddress: '',
+                    conAeo: '',
+                    conCity: '',
+                    conFax: '',
+                    conName: '',
+                    conPhone: '',
+                    conPostcode: '',
+                    country: '',
+                    enterprise: '',
+                    ent: ''
+                },
+                //新增界面是否显示
+                addFormVisible: false,
+                addFormRules: {
+                    companyName: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+                    conName: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+                    country: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+                    enterprise: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+                    conCity: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+                    conAddress: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ]
+                },
+
+                //新增界面数据
+                addForm: {
+                    companyName: '',
+                    conAddress: '',
+                    conAeo: '',
+                    conCity: '',
+                    conFax: '',
+                    conName: '',
+                    conPhone: '',
+                    conPostcode: '',
+                    country: '',
+                    enterprise: '',
+                    ent: ''
+                }
+            }
+        },
+        mounted() {
+            this.getConsigner();
+
+        },
+        methods: {
+
+            //获取收货人列表
+            getConsigner() {
+                let para = {
+                    pageSize: this.pageSize,
+                    limitSize: this.limitSize,
+                    companyName: this.filters.companyName
+                };
+                this.listLoading = true;
+                getList(para).then((res) => {
+                    this.total = res.data.data.total;
+                    this.consignerList = res.data.data.list;
+                    this.listLoading = false;
+                }).catch((error) => {
+                    this.listLoading = false;
+                    if(null!= error.response && error.response!==undefined){
+                        let status= error.response.status;
+                        let msg = error.response.statusText;
+                        alert(status+msg);
+                    }else {
+                        alert(error);
+                    }
+
+                });
+
+            },
+
+
+            //删除
+            handleDel: function (index, row) {
+                this.$confirm('确认删除该记录吗?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    this.listLoading = true;
+                    let para = {id: row.id };
+                    remove(para).then((res) => {
+                        if (res.data.code == 200){
+                            this.listLoading = false;
+                            this.$message({
+                                message: '删除成功',
+                                type: 'success'
+                            });
+                            this.getConsigner();
+                        }else {
+                            this.listLoading = false;
+                            this.$message({
+                                message: '删除失败',
+                                type: 'error'
+                            });
+                            this.getConsigner();
+                        }
+
+                    }).catch((error) => {
+                        this.listLoading = false;
+                        alert(error);
+                    });
+                }).catch();
+            },
+            /**
+             * 显示编辑界面
+             * @param index
+             * @param row 为这行的数据对象
+             */
+            handleEdit: function (index, row) {
+                this.editFormVisible = true;
+                let strings = row.enterprise.split("+");
+                row.enterprise = strings[0];
+                row.ent = strings[1]
+                this.editForm = Object.assign({}, row);
+                this.getConsigner();
+            },
+
+            //编辑
+            editSubmit: function () {
+
+                this.$refs.editForm.validate((valid) => {
+                    if (valid) {
+                        this.$confirm('确认提交吗？', '提示', {}).then(() => {
+                            this.editLoading = true;
+                            this.editForm.enterprise = this.editForm.enterprise+"+"+this.editForm.ent;
+                            let para = Object.assign({}, this.editForm);
+                            this.editLoading = true;
+                            edit(para).then((res) => {
+                                if (res.data.code == 200){
+                                    this.$message({
+                                        message: '提交成功',
+                                        type: 'success'
+                                    });
+                                    this.$refs['editForm'].resetFields();
+                                    this.editFormVisible = false;
+                                    this.getConsigner();
+                                }else {
+                                    this.$message({
+                                        message: '提交失败',
+                                        type: 'error'
+                                    });
+                                }
+
+                            }).catch(error => alert(error));
+                        });
+                    }
+                });
+            },
+
+            //显示新增界面，每次点开初始化数据
+            companyAdd: function () {
+                this.addFormVisible = true;
+                this.getConsigner();
+            },
+            //新增
+            addSubmit: function () {
+                this.$refs.addForm.validate((valid) => {
+                    if (valid) {
+                        this.$confirm('确认提交吗？', '提示', {}).then(() => {
+                            //NProgress.start();
+                            this.listLoading = true;
+                            this.addForm.enterprise = this.addForm.enterprise+"+"+this.addForm.ent;
+                            let para = Object.assign({}, this.addForm);
+                            add(para).then((res) => {
+                                if (res.data.code == 200){
+                                    //NProgress.done();
+                                    this.$message({
+                                        message: '提交成功',
+                                        type: 'success'
+                                    });
+                                    this.$refs['addForm'].resetFields();
+                                    this.addFormVisible = false;
+                                    this.getConsigner();
+                                }else {
+                                    this.$message({
+                                        message: '提交失败',
+                                        type: 'error'
+                                    });
+                                }
+                            }).catch(error => alert(error));
+                        });
+                    }
+                });
+            },
+            selsChange: function (sels) {
+                this.sels = sels;
+            },
+            //批量删除
+            batchRemove: function () {
+                var ids = this.sels.map(item => item.id).toString();
+                this.$confirm('确认删除选中记录吗？', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    this.listLoading = true;
+                    //NProgress.start();
+                    let para = { ids: ids };
+                    batchRemove(para).then((res) => {
+                        this.listLoading = false;
+                        //NProgress.done();
+                        this.$message({
+                            message: '删除成功',
+                            type: 'success'
+                        });
+                        this.getConsigner();
+                    });
+                }).catch(() => {
+
+                });
+            }
+        },
+
+    }
+</script>

+<template>
+    <section>
+        <!--工具条-->
+        <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
+            <el-form :inline="true" :model="filters">
+                <el-form-item>
+                    <el-input v-model="filters.companyName" placeholder="关键字查询"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" v-on:click="getConsigner()">查询</el-button>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="companyAdd">新增</el-button>
+                </el-form-item>
+            </el-form>
+        </el-col>
+
+        <!--列表-->
+        <el-table :data="consignerList" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;">
+            <el-table-column type="selection" width="55">
+            </el-table-column>
+            <el-table-column label="序号" type="index">
+            </el-table-column>
+            <el-table-column prop="companyName" label="发货人公司"  >
+            </el-table-column>
+            <el-table-column prop="conCity" label="发货人城市"  >
+            </el-table-column>
+            <el-table-column prop="country" label="发货人国家代码"  >
+            </el-table-column>
+            <el-table-column prop="conPhone" label="发货人电话"  >
+            </el-table-column>
+            <el-table-column prop="enterprise" label="发货人企业代码"  >
+            </el-table-column>
+            <el-table-column label="操作" min-width="150">
+                <template slot-scope="scope">
+                    <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+                    <el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!--编辑界面-->
+        <el-dialog title="编辑" :visible.sync="editFormVisible" :close-on-click-modal="false">
+            <el-form :model="editForm" label-width="100px" :rules="editFormRules" ref="editForm">
+                <el-form-item label="ID">
+                    <span>{{editForm.id}}</span>
+                </el-form-item>
+                <el-form-item label="公司" prop="companyName">
+                    <el-input v-model="editForm.companyName" auto-complete="on" placeholder="公司"></el-input>
+                </el-form-item>
+                <el-form-item label="发货人名称" prop="conName">
+                    <el-input v-model="editForm.conName" auto-complete="on" placeholder="发货人名称"></el-input>
+                </el-form-item>
+                <el-form-item label="电话" prop="conPhone">
+                    <el-input v-model="editForm.conPhone" auto-complete="on" placeholder="电话"></el-input>
+                </el-form-item>
+                <el-form-item label="传真" prop="conFax">
+                    <el-input v-model="editForm.conFax" auto-complete="on" placeholder="传真"></el-input>
+                </el-form-item>
+                <el-form-item label="国家代码" prop="country">
+                    <el-input v-model="editForm.country" auto-complete="on" placeholder="国家代码"></el-input>
+                </el-form-item>
+                <el-form-item label="城市" prop="conCity">
+                    <el-input v-model="editForm.conCity" auto-complete="on" placeholder="城市"></el-input>
+                </el-form-item>
+                <el-form-item label="邮编" prop="conPostcode">
+                    <el-input v-model="editForm.conPostcode" auto-complete="on" placeholder="邮编"></el-input>
+                </el-form-item>
+                <el-form-item label="地址" prop="conAddress">
+                    <el-input v-model="editForm.conAddress" auto-complete="on" placeholder="地址"></el-input>
+                </el-form-item>
+                <el-form-item label="发货人AEO" prop="conAeo">
+                    <el-input v-model="editForm.conAeo" auto-complete="on" placeholder="发货人AEO"></el-input>
+                </el-form-item>
+                <el-row>
+                    <el-col :span="6">
+                        <el-form-item label="企业代码" prop="enterprise">
+                            <el-select v-model="editForm.enterprise" placeholder="请选择">
+                                <el-option
+                                        v-for="item in options"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="+" prop="enterprise">
+                            <el-input v-model="editForm.ent"/>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click.native="editFormVisible = false">取消</el-button>
+                <el-button type="primary" @click.native="editSubmit" :loading="editLoading">提交</el-button>
+            </div>
+        </el-dialog>
+
+        <!--新增界面-->
+        <el-dialog title="新增" :visible.sync="addFormVisible" :close-on-click-modal="false">
+            <el-form :model="addForm" label-width="100px" :rules="addFormRules" ref="addForm">
+                <el-form-item label="公司" prop="companyName">
+                    <el-input v-model="addForm.companyName" auto-complete="on" placeholder="公司"></el-input>
+                </el-form-item>
+                <el-form-item label="发货人名称" prop="conName">
+                    <el-input v-model="addForm.conName" auto-complete="on" placeholder="发货人名称"></el-input>
+                </el-form-item>
+                <el-form-item label="电话" prop="conPhone">
+                    <el-input v-model="addForm.conPhone" auto-complete="on" placeholder="电话"></el-input>
+                </el-form-item>
+                <el-form-item label="传真" prop="conFax">
+                    <el-input v-model="addForm.conFax" auto-complete="on" placeholder="传真"></el-input>
+                </el-form-item>
+                <el-form-item label="国家代码" prop="country">
+                    <el-input v-model="addForm.country" auto-complete="on" placeholder="国家代码"></el-input>
+                </el-form-item>
+                <el-form-item label="城市" prop="conCity">
+                    <el-input v-model="addForm.conCity" auto-complete="on" placeholder="城市"></el-input>
+                </el-form-item>
+                <el-form-item label="邮编" prop="conPostcode">
+                    <el-input v-model="addForm.conPostcode" auto-complete="on" placeholder="邮编"></el-input>
+                </el-form-item>
+                <el-form-item label="地址" prop="conAddress">
+                    <el-input v-model="addForm.conAddress" auto-complete="on" placeholder="地址"></el-input>
+                </el-form-item>
+                <el-form-item label="发货人AEO" prop="conAeo">
+                    <el-input v-model="addForm.conAeo" auto-complete="on" placeholder="发货人AEO"></el-input>
+                </el-form-item>
+                <el-row>
+                    <el-col :span="6">
+                        <el-form-item label="企业代码" prop="enterprise">
+                            <el-select v-model="addForm.enterprise" placeholder="请选择">
+                                <el-option
+                                        v-for="item in options"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="+" prop="enterprise">
+                            <el-input v-model="addForm.ent"/>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click.native="addFormVisible = false">取消</el-button>
+                <el-button type="primary" @click.native="addSubmit">提交</el-button>
+            </div>
+        </el-dialog>
+    </section>
+</template>
+
+<script>
+    import util from '../../common/js/util'
+    import NProgress from 'nprogress'
+    import { getList, remove, add, edit} from '../../api/consigner/consigner';
+    import moment from 'moment'
+
+    export default {
+        data() {
+            return {
+
+                options: [{
+                    value: 'USCI',
+                    label: 'USCI'
+                }, {
+                    value: 'OC',
+                    label: 'OC'
+                }, {
+                    value: '9999',
+                    label: '9999'
+                }],
+
+                filters: {
+                    companyName: ''
+                },
+                consignerList: [],
+                total: 0,
+                pageSize: 1,
+                limitSize: 5,
+                listLoading: false,
+                //编辑界面是否显示
+                editFormVisible: false,
+                editLoading: false,
+                editFormRules: {
+
+                    companyName: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+
+                    conName: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+                    country: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+                    enterprise: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+                    conCity: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+                    conAddress: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ]
+                },
+                //编辑界面数据
+                editForm: {
+                    id:'',
+                    companyName: '',
+                    conAddress: '',
+                    conAeo: '',
+                    conCity: '',
+                    conFax: '',
+                    conName: '',
+                    conPhone: '',
+                    conPostcode: '',
+                    country: '',
+                    enterprise: '',
+                    ent: ''
+                },
+                //新增界面是否显示
+                addFormVisible: false,
+                addFormRules: {
+                    companyName: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+                    conName: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+                    country: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+                    enterprise: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+                    conCity: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ],
+                    conAddress: [
+                        { required: true, message: '不能为空！！!', trigger: 'blur' }
+                    ]
+                },
+
+                //新增界面数据
+                addForm: {
+                    companyName: '',
+                    conAddress: '',
+                    conAeo: '',
+                    conCity: '',
+                    conFax: '',
+                    conName: '',
+                    conPhone: '',
+                    conPostcode: '',
+                    country: '',
+                    enterprise: '',
+                    ent: ''
+                }
+            }
+        },
+        mounted() {
+            this.getConsigner();
+
+        },
+        methods: {
+
+            //获取发货人列表
+            getConsigner() {
+                let para = {
+                    pageSize: this.pageSize,
+                    limitSize: this.limitSize,
+                    companyName: this.filters.companyName
+                };
+                this.listLoading = true;
+                getList(para).then((res) => {
+                    this.total = res.data.data.total;
+                    this.consignerList = res.data.data.list;
+                    this.listLoading = false;
+                }).catch((error) => {
+                    this.listLoading = false;
+                    if(null!= error.response && error.response!==undefined){
+                        let status= error.response.status;
+                        let msg = error.response.statusText;
+                        alert(status+msg);
+                    }else {
+                        alert(error);
+                    }
+
+                });
+
+            },
+
+
+            //删除
+            handleDel: function (index, row) {
+                this.$confirm('确认删除该记录吗?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    this.listLoading = true;
+                    let para = {id: row.id };
+                    remove(para).then((res) => {
+                        if (res.data.code == 200){
+                            this.listLoading = false;
+                            this.$message({
+                                message: '删除成功',
+                                type: 'success'
+                            });
+                            this.getConsigner();
+                        }else {
+                            this.listLoading = false;
+                            this.$message({
+                                message: '删除失败',
+                                type: 'error'
+                            });
+                            this.getConsigner();
+                        }
+
+                    }).catch((error) => {
+                        this.listLoading = false;
+                        alert(error);
+                    });
+                }).catch();
+            },
+            /**
+             * 显示编辑界面
+             * @param index
+             * @param row 为这行的数据对象
+             */
+            handleEdit: function (index, row) {
+                this.editFormVisible = true;
+                let strings = row.enterprise.split("+");
+                row.enterprise = strings[0];
+                row.ent = strings[1]
+                this.editForm = Object.assign({}, row);
+                this.getConsigner();
+            },
+
+            //编辑
+            editSubmit: function () {
+
+                this.$refs.editForm.validate((valid) => {
+                    if (valid) {
+                        this.$confirm('确认提交吗？', '提示', {}).then(() => {
+                            this.editLoading = true;
+                            this.editForm.enterprise = this.editForm.enterprise+"+"+this.editForm.ent;
+                            let para = Object.assign({}, this.editForm);
+                            this.editLoading = true;
+                            edit(para).then((res) => {
+                                if (res.data.code == 200){
+                                    this.$message({
+                                        message: '提交成功',
+                                        type: 'success'
+                                    });
+                                    this.$refs['editForm'].resetFields();
+                                    this.editFormVisible = false;
+                                    this.getConsigner();
+                                }else {
+                                    this.$message({
+                                        message: '提交失败',
+                                        type: 'error'
+                                    });
+                                }
+
+                            }).catch(error => alert(error));
+                        });
+                    }
+                });
+            },
+
+            //显示新增界面，每次点开初始化数据
+            companyAdd: function () {
+                this.addFormVisible = true;
+                this.getConsigner();
+            },
+            //新增
+            addSubmit: function () {
+                this.$refs.addForm.validate((valid) => {
+                    if (valid) {
+                        this.$confirm('确认提交吗？', '提示', {}).then(() => {
+                            //NProgress.start();
+                            this.listLoading = true;
+                            this.addForm.enterprise = this.addForm.enterprise+"+"+this.addForm.ent;
+                            let para = Object.assign({}, this.addForm);
+                            add(para).then((res) => {
+                                if (res.data.code == 200){
+                                    //NProgress.done();
+                                    this.$message({
+                                        message: '提交成功',
+                                        type: 'success'
+                                    });
+                                    this.$refs['addForm'].resetFields();
+                                    this.addFormVisible = false;
+                                    this.getConsigner();
+                                }else {
+                                    this.$message({
+                                        message: '提交失败',
+                                        type: 'error'
+                                    });
+                                }
+                            }).catch(error => alert(error));
+                        });
+                    }
+                });
+            },
+            selsChange: function (sels) {
+                this.sels = sels;
+            },
+            //批量删除
+            batchRemove: function () {
+                var ids = this.sels.map(item => item.id).toString();
+                this.$confirm('确认删除选中记录吗？', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    this.listLoading = true;
+                    //NProgress.start();
+                    let para = { ids: ids };
+                    batchRemove(para).then((res) => {
+                        this.listLoading = false;
+                        //NProgress.done();
+                        this.$message({
+                            message: '删除成功',
+                            type: 'success'
+                        });
+                        this.getConsigner();
+                    });
+                }).catch(() => {
+
+                });
+            }
+        },
+
+    }
+</script>

-<template>
-  <el-container>
-    <el-main>
-      <el-row>
-        <el-col :span="24">
-          <div class="grid-content content">航班预配</div>
-        </el-col>
-      </el-row>
-<!--      搜索区域-->
-      <el-row>
-        <el-form :inline="true" :model="formInline" class="demo-form-inline">
-          <el-col :span="5">
-            <el-form-item label="航班号">
-              <el-input v-model="formInline.user" placeholder="请输入航班号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item>
-              <el-button type="primary" @click="onSubmit">查询</el-button>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item>
-              <el-select v-model="formInline.value" placeholder="航班操作" style="margin-left: 50px">
-                <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-form>
-      </el-row>
-<!--      表单区域①-->
-      <el-row>
-        <el-table
-                ref="multipleTable"
-                :data="tableData"
-                tooltip-effect="dark"
-                style="width: 100%"
-                @selection-change="handleSelectionChange">
-          <el-table-column
-                  type="selection"
-                  width="55">
-          </el-table-column>
-          <el-table-column
-                  label="运单号">
-            <template slot-scope="scope">{{ scope.row.date }}</template>
-          </el-table-column>
-          <el-table-column
-                  prop="name"
-                  label="件数">
-          </el-table-column>
-          <el-table-column
-                  prop="address"
-                  label="重量">
-          </el-table-column>
-          <el-table-column
-                  prop="name"
-                  label="体积">
-          </el-table-column>
-          <el-table-column
-                  prop="address"
-                  label="品名">
-          </el-table-column>
-        </el-table>
-        <div style="margin-top:5px;margin-left: 1000px">
-          <el-button type="primary" >配上</el-button>
-          <el-button type="success" @click="dialogFormVisible = true">新增</el-button>
-          <el-button type="warning" @click="dialogFormsVisible = true">导入</el-button>
-        </div>
-      </el-row>
-<!--      表单①新增按钮弹框-->
-      <el-row>
-        <el-dialog title="新增页面" :visible.sync="dialogFormVisible">
-          <el-form :model="form">
-            <el-row>
-              <el-col :span="10">
-                <el-form-item label="运单号" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="目的站" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="件数" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="重量" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"  placeholder="单位：KG"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="体积" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="品名" :label-width="formLabelWidth">
-                  <el-select v-model="form.region" placeholder="请选择品名">
-                    <el-option label="品名一" value="品名一"></el-option>
-                    <el-option label="品名二" value="品名二"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="特货代码" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="代理人" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="优先级" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="备注" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-          <div slot="footer" class="dialog-footer">
-            <el-button @click="dialogFormVisible = false">取 消</el-button>
-            <el-button type="primary" @click="dialogFormVisible = false">保 存</el-button>
-          </div>
-        </el-dialog>
-      </el-row>
-<!--      表单①导入按钮弹框-->
-      <el-row>
-        <el-dialog  title="批量导入" :visible.sync="dialogFormsVisible">
-          <el-form :model="form1" >
-            <el-row>
-              <el-col :span="5">
-                <el-form-item>
-                  <el-form-item label="ULD" :label-width="formsLabelWidths">
-                    <el-input v-model="form1.name" autocomplete="off"></el-input>
-                  </el-form-item>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-dialog>
-      </el-row>
-<!--      表单区域②-->
-      <el-row>
-        <el-table
-                ref="multipleTable"
-                :data="tableData"
-                tooltip-effect="dark"
-                style="width: 100%"
-                @selection-change="handleSelectionChange">
-          <el-table-column
-                  label="ULD类型">
-            <template slot-scope="scope">{{ scope.row.date }}</template>
-          </el-table-column>
-          <el-table-column
-                  prop="name"
-                  label="件数">
-          </el-table-column>
-          <el-table-column
-                  prop="address"
-                  label="机仓位">
-          </el-table-column>
-        </el-table>
-        <div style="margin-top:5px;margin-left: 1000px">
-          <el-button type="primary" >拉下</el-button>
-          <el-button type="success" @click="dialogFormVisibles = true">新增</el-button>
-          <el-button type="danger" >删除</el-button>
-        </div>
-      </el-row>
-<!--      表单②新增按钮弹框-->
-      <el-row>
-        <el-dialog title="新增页面" :visible.sync="dialogFormVisibles">
-          <el-form :model="forms">
-            <el-row>
-              <el-col :span="10">
-                <el-form-item label="ULD" :label-width="formLabelWidths">
-                  <el-input v-model="forms.name" autocomplete="off"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="件数" :label-width="formLabelWidths">
-                  <el-input v-model="forms.name" autocomplete="off"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="机仓位" :label-width="formLabelWidths">
-                  <el-select v-model="forms.region" placeholder="请选择机仓位">
-                    <el-option label="仓位一" value="仓位一"></el-option>
-                    <el-option label="仓位二" value="仓位二"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="板位" :label-width="formLabelWidths">
-                  <el-select v-model="forms.region" placeholder="请选择板位">
-                    <el-option label="板位一" value="板位一"></el-option>
-                    <el-option label="板位二" value="板位二"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="板型" :label-width="formLabelWidths">
-                  <el-select v-model="forms.region" placeholder="请选择板型">
-                    <el-option label="板型一" value="板型一"></el-option>
-                    <el-option label="板型二" value="板型二"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-          <div slot="footer" class="dialog-footer">
-            <el-button @click="dialogFormVisibles = false">取 消</el-button>
-            <el-button type="primary" @click="dialogFormVisibles = false">保 存</el-button>
-          </div>
-
-        </el-dialog>
-      </el-row>
-    </el-main>
-  </el-container>
-</template>
-<script>
-  export default {
-    data() {
-      return {
-        formInline: {
-          user: '',
-          value: ''
-        },
-        tableData:[],
-        multipleSelection: [],
-        options: [{
-          value: '操作1',
-          label: '操作1'
-        }, {
-          value: '操作2',
-          label: '操作2'
-        }],
-        dialogFormVisible: false,
-        dialogFormVisibles: false,
-        dialogFormsVisible: false,
-        form: {},
-        form1: {},
-        forms: {},
-        formLabelWidth: '120px',
-        formLabelWidths: '120px',
-      }
-    },
-    methods: {
-      onSubmit() {
-        console.log('submit!');
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      }
-    }
-  }
-</script>

-<template>
-	<section>page5...
-	</section>
-</template>

+<template>
+	<el-container>
+		<el-main>
+			<el-row>
+				<el-col :span="24">
+					<div class="grid-content content">航班配载</div>
+				</el-col>
+			</el-row>
+			<!--      搜索区域-->
+			<el-row>
+				<el-form :inline="true" :model="formInline" class="demo-form-inline">
+					<el-col :span="5">
+						<el-form-item label="航班号">
+							<el-input v-model="formInline.flightNo" placeholder="请输入航班号"></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="4">
+						<el-form-item>
+							<el-button type="primary" @click="onSubmit">查询</el-button>
+						</el-form-item>
+					</el-col>
+					<el-col :span="4">
+						<el-form-item>
+							<el-select v-model="formInline.operation" placeholder="航班操作" style="margin-left: 50px">
+								<el-option
+										v-for="item in operation"
+										:key="item.value"
+										:label="item.label"
+										:value="item.value">
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+<!--			表单区域①-->
+			<el-row>
+				<el-table
+						ref="multipleTable"
+						:data="tableData"
+						tooltip-effect="dark"
+						style="width: 100%"
+						@selection-change="handleSelectionChange">
+					<el-table-column
+							type="selection"
+							width="55">
+					</el-table-column>
+					<el-table-column
+							prop="uld"
+							label="ULD">
+					</el-table-column>
+					<el-table-column
+							prop="stowage"
+							label="配载重量">
+					</el-table-column>
+					<el-table-column
+							prop="ground"
+							label="是否地勤交接">
+					</el-table-column>
+					<el-table-column
+							prop="warehouse"
+							label="仓库">
+					</el-table-column>
+					<el-table-column
+							prop="bup"
+							label="BUP">
+					</el-table-column>
+				</el-table>
+				<el-table
+						ref="multipleTable"
+						:data="tableData1"
+						tooltip-effect="dark"
+						style="width: 100%"
+						@selection-change="handleSelectionChange">
+					<el-table-column
+							type="selection"
+							width="55">
+					</el-table-column>
+					<el-table-column
+							prop="box"
+							label="板箱号">
+					</el-table-column>
+					<el-table-column
+							prop="assembling"
+							label="装配件数">
+					</el-table-column>
+					<el-table-column
+							prop="stowage"
+							label="配载重量">
+					</el-table-column>
+				</el-table>
+				<div style="margin-top:5px;margin-left: 20px">
+					<el-button @click="dialogFormVisible = true">待运导入</el-button>
+					<el-button>装箱</el-button>
+					<el-button>部分装箱</el-button>
+					<el-button>放散舱</el-button>
+					<el-button>部分放散舱</el-button>
+					<el-button @click="dialogTableVisible = true">正式舱单</el-button>
+					<el-button>地勤交接</el-button>
+					<el-button @click="dialogFormVisible3 = true">转配</el-button>
+					<el-button>航班文件</el-button>
+					<el-button type="primary" >散货配上</el-button>
+					<el-button type="success">卸下</el-button>
+					<el-button type="warning">运单保存</el-button>
+				</div>
+			</el-row>
+            <!--			表单①待运导入按钮弹框-->
+			<el-row>
+				<el-dialog title="待运导入" :visible.sync="dialogFormVisible">
+					<el-form :model="form">
+						<el-row>
+							<el-col :span="10">
+								<el-form-item>
+									<el-form-item label="航班号" :label-width="formLabelWidth">
+										<el-input v-model="form.flightNo" ></el-input>
+									</el-form-item>
+								</el-form-item>
+							</el-col>
+							<el-col :span="10">
+								<el-form-item>
+									<el-form-item label="运单号" :label-width="formLabelWidth">
+										<el-input v-model="form.waybillNo"></el-input>
+									</el-form-item>
+								</el-form-item>
+							</el-col>
+						</el-row>
+						<el-row>
+							<el-col :span="7">
+								<el-form-item>
+									<el-form-item label="代理人" :label-width="formLabelWidth">
+										<el-input v-model="form.agent" ></el-input>
+									</el-form-item>
+								</el-form-item>
+							</el-col>
+							<el-col :span="7">
+								<el-form-item>
+									<el-form-item label="承运人" :label-width="formLabelWidth">
+										<el-input v-model="form.carrier"></el-input>
+									</el-form-item>
+								</el-form-item>
+							</el-col>
+							<el-col :span="7">
+								<el-form-item>
+									<el-form-item label="起始站" :label-width="formLabelWidth">
+										<el-input v-model="form.departure"></el-input>
+									</el-form-item>
+								</el-form-item>
+							</el-col>
+						</el-row>
+						<el-row>
+							<el-col :span="7">
+								<el-form-item>
+									<el-form-item label="中转/目的站" :label-width="formLabelWidth">
+										<el-input v-model="form.destination" ></el-input>
+									</el-form-item>
+								</el-form-item>
+							</el-col>
+							<el-col :span="7">
+								<el-form-item>
+									<el-form-item label="特货代码" :label-width="formLabelWidth">
+										<el-input v-model="form.code"></el-input>
+									</el-form-item>
+								</el-form-item>
+							</el-col>
+							<el-col :span="8">
+								<el-form-item>
+									<el-form-item label="CBA" :label-width="formLabelWidth">
+										<el-radio v-model="form.radio" label="1">是</el-radio>
+										<el-radio v-model="form.radio" label="2">否</el-radio>
+									</el-form-item>
+								</el-form-item>
+							</el-col>
+						</el-row>
+						<el-row>
+							<el-col :span="19">
+								<el-form-item>
+									<el-form-item label="制单时间" :label-width="formLabelWidth">
+										<el-date-picker
+												v-model="form.value1"
+												type="datetimerange"
+												start-placeholder="开始日期"
+												end-placeholder="结束日期"
+												:default-time="['12:00:00']">
+										</el-date-picker>
+									</el-form-item>
+								</el-form-item>
+							</el-col>
+							<el-col :span="2" >
+								<el-form-item >
+									<el-button type="primary">查 询</el-button>
+								</el-form-item>
+							</el-col>
+						</el-row>
+						<el-table
+								ref="multipleTable"
+								:data="tableData3"
+								tooltip-effect="dark"
+								style="width: 100%"
+								@selection-change="handleSelectionChange">
+							<el-table-column
+									type="selection"
+									width="55">
+							</el-table-column>
+							<el-table-column
+									prop="productName"
+									label="品名">
+							</el-table-column>
+							<el-table-column
+									prop="waybillNo"
+									label="运单号">
+							</el-table-column>
+							<el-table-column
+									prop="departure"
+									label="始发站">
+							</el-table-column>
+							<el-table-column
+									prop="destination"
+									label="目的站">
+							</el-table-column>
+							<el-table-column
+									prop="number"
+									label="仓库件数">
+							</el-table-column>
+							<el-table-column
+									prop="weight"
+									label="仓库重量">
+							</el-table-column>
+						</el-table>
+						<div style="margin-top: 20px;margin-left: 585px">
+							<el-button @click="dialogFormVisible1=true">散货装配</el-button>
+						</div>
+						<el-table
+								ref="multipleTable"
+								:data="tableData4"
+								tooltip-effect="dark"
+								style="width: 100%"
+								@selection-change="handleSelectionChange">
+							<el-table-column
+									type="selection"
+									width="55">
+							</el-table-column>
+							<el-table-column
+									prop="box"
+									label="板箱号">
+							</el-table-column>
+							<el-table-column
+									prop="total"
+									label="总件数">
+							</el-table-column>
+							<el-table-column
+									prop="totalWeight"
+									label="总重量"
+									show-overflow-tooltip>
+							</el-table-column>
+						</el-table>
+						<div style="margin-top: 20px;margin-left: 585px">
+							<el-button @click="dialogFormVisible2=true">ULD装配</el-button>
+						</div>
+					</el-form>
+				</el-dialog>
+			</el-row>
+			<!--			表单①正式舱单按钮弹框-->
+			<el-row>
+				<el-dialog  title="打印" :visible.sync="dialogTableVisible">
+					<el-tabs v-model="activeName" @tab-click="handleClick">
+						<el-tab-pane label="舱单打印" name="first">
+							<el-table
+									:data="tableData1"
+									style="width: 100%"
+									row-key="id"
+									border
+									lazy
+									:load="load"
+									:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+								<el-table-column
+										type="selection"
+										width="55">
+								</el-table-column>
+								<el-table-column
+										prop="date"
+										label="板箱号">
+								</el-table-column>
+								<el-table-column
+										prop="name"
+										label="配载件数">
+								</el-table-column>
+								<el-table-column
+										prop="address"
+										label="配载重量">
+								</el-table-column>
+								<el-table-column
+										prop="date"
+										label="配载体积">
+								</el-table-column>
+								<el-table-column
+										prop="name"
+										label="特殊处理代码"
+										width="120px">
+								</el-table-column>
+								<el-table-column
+										prop="address"
+										label="品名">
+								</el-table-column>
+								<el-table-column
+										prop="date"
+										label="始发站">
+								</el-table-column>
+								<el-table-column
+										prop="name"
+										label="目的站">
+								</el-table-column>
+								<el-table-column
+										prop="address"
+										label="优先级">
+								</el-table-column>
+								<el-table-column
+										prop="name"
+										label="备注">
+								</el-table-column>
+								<el-table-column
+										prop="address"
+										label="舱单打印">
+								</el-table-column>
+							</el-table>
+						</el-tab-pane>
+						<el-tab-pane label="分批单打印" name="second">分批单打印</el-tab-pane>
+						<el-tab-pane label="分批单打印" name="third">分批单打印</el-tab-pane>
+					</el-tabs>
+					<div style="margin-top: 10px;margin-left: 250px">
+						<el-button @click="">无ULD打印</el-button>
+						<el-button @click="">有ULD打印</el-button>
+						<el-button @click="">装载舱单打印</el-button>
+					</div>
+				</el-dialog>
+			</el-row>
+			<!--			表单①转配按钮弹框-->
+			<el-row>
+				<el-dialog title="转配航班" :visible.sync="dialogFormVisible3" width="30%">
+					<el-form :model="form3">
+						<el-row>
+							<el-col :span="20">
+								<el-form-item label="航班号" :label-width="formLabelWidth">
+									<el-input v-model="form3.flightNo" autocomplete="off"></el-input>
+								</el-form-item>
+							</el-col>
+						</el-row>
+						<el-row>
+							<el-col :span="20">
+								<el-form-item label="航班日期" :label-width="formLabelWidth">
+									<el-input v-model="form3.flightDate" autocomplete="off"></el-input>
+								</el-form-item>
+							</el-col>
+						</el-row>
+						<el-row>
+							<el-col :span="20">
+								<el-form-item label="航段" :label-width="formLabelWidth">
+									<el-input v-model="form3.segment" autocomplete="off"></el-input>
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</el-form>
+					<div style="text-align: center">
+						<el-button type="primary" @click="dialogFormVisible3 = false">转 配</el-button>
+						<el-button @click="dialogFormVisible3 = false">取 消</el-button>
+					</div>
+				</el-dialog>
+			</el-row>
+			<!--			航班配载  待运导入  散货装配按钮-->
+			<el-row>
+				<el-dialog title="操作区" :visible.sync="dialogFormVisible1">
+					<el-form :model="form1">
+						<el-row>
+							<el-col :span="21">
+								<el-form-item label="小计：" :label-width="formLabelWidth">
+									<el-input
+											placeholder="货物信息"
+											v-model="form1.subtotal"
+											:disabled="true">
+									</el-input>
+								</el-form-item>
+							</el-col>
+						</el-row>
+						<el-row>
+							<el-col :span="7">
+								<el-form-item label="运单号" :label-width="formLabelWidth">
+									<el-select v-model="form1.waybillNo" placeholder="请选择">
+										<el-option label="货单一" value="yi"></el-option>
+										<el-option label="货单二" value="er"></el-option>
+									</el-select>
+								</el-form-item>
+							</el-col>
+							<el-col :span="5">
+								<el-input v-model="form1.waybill" placeholder="单号"></el-input>
+							</el-col>
+							<el-col :span="8">
+								<el-input v-model="form1.location" placeholder="库位"></el-input>
+							</el-col>
+						</el-row>
+						<el-row>
+							<el-col :span="8">
+								<el-form-item label="件数" :label-width="formLabelWidth">
+									<el-input v-model="form1.number"></el-input>
+								</el-form-item>
+							</el-col>
+							<el-col :span="8">
+								<el-form-item label="重量" :label-width="formLabelWidth">
+									<el-input v-model="form1.weight" placeholder="KG"></el-input>
+								</el-form-item>
+							</el-col>
+						</el-row>
+						<el-row >
+							<el-col :span="21">
+								<el-form-item label="储运备注" :label-width="formLabelWidth">
+									<el-input v-model="form1.remarks"></el-input>
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</el-form>
+					<div slot="footer" class="dialog-footer">
+						<el-button @click="dialogFormVisible1 = false">散货配上</el-button>
+						<el-button @click="dialogFormVisible1 = false">卸下</el-button>
+						<el-button type="primary" @click="dialogFormVisible1 = false">运单保存</el-button>
+					</div>
+				</el-dialog>
+			</el-row>
+			<!--			航班配载  待运导入  ULD装配按钮-->
+			<el-row>
+				<el-dialog title="操作区" :visible.sync="dialogFormVisible2">
+					<el-form :model="form2">
+						<el-row>
+							<el-col :span="21">
+								<el-form-item label="小计：" :label-width="formLabelWidth">
+									<el-input
+											placeholder="货物信息"
+											v-model="form2.subtotal"
+											:disabled="true">
+									</el-input>
+								</el-form-item>
+							</el-col>
+						</el-row>
+						<el-row>
+							<el-col :span="8">
+								<el-form-item label="仓库" :label-width="formLabelWidth">
+									<el-input v-model="form2.warehouse"></el-input>
+								</el-form-item>
+							</el-col>
+							<el-col :span="8">
+								<el-form-item label="库位" :label-width="formLabelWidth">
+									<el-input v-model="form2.location"></el-input>
+								</el-form-item>
+							</el-col>
+						</el-row>
+						<el-row >
+							<el-col :span="6">
+								<el-form-item label="ULD号" :label-width="formLabelWidth">
+									<el-input v-model="form2.uldNo"></el-input>
+								</el-form-item>
+							</el-col>
+							<el-col :span="5">
+								<el-input v-model="form2.uldNo" placeholder=""></el-input>
+							</el-col>
+							<el-col :span="3">
+								<el-input v-model="form2.uldNo" placeholder=""></el-input>
+							</el-col>
+						</el-row>
+					</el-form>
+					<div slot="footer" class="dialog-footer">
+						<el-button @click="dialogFormVisible2 = false">板箱配上</el-button>
+						<el-button @click="dialogFormVisible2 = false">卸下</el-button>
+					</div>
+				</el-dialog>
+			</el-row>
+			<!--			表单区域②-->
+			<el-row style="margin-top:20px">
+				<el-table
+						ref="multipleTable"
+						:data="tableData2"
+						tooltip-effect="dark"
+						style="width: 100%"
+						@selection-change="handleSelectionChange">
+					<el-table-column
+							type="selection"
+							width="55">
+					</el-table-column>
+					<el-table-column
+							prop="box"
+							label="板箱号">
+					</el-table-column>
+					<el-table-column
+							prop="assembling"
+							label="装配件数">
+					</el-table-column>
+					<el-table-column
+							prop="stowage"
+							label="配载重量">
+					</el-table-column>
+				</el-table>
+			</el-row>
+			<div style="margin-left: 970px">
+				<el-button type="primary">板箱配上</el-button>
+				<el-button type="success">卸下</el-button>
+			</div>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				formInline: {
+					flightNo: undefined,
+					operation: undefined
+				},
+				operation: [{
+					value: '操作1',
+					label: '操作1'
+				}, {
+					value: '操作2',
+					label: '操作2'
+				}],
+				tableData:[],
+				tableData1:[],
+				tableData2:[],
+				form: {
+					flightNo:undefined,
+					waybillNo:undefined,
+					agent:undefined,
+					carrier:undefined,
+					departure:undefined,
+					destination:undefined,
+					code:undefined,
+					value1: '',
+					radio: '1'
+				},
+				tableData3:[],
+				tableData4:[],
+				dialogFormVisible: false,
+				form1: {
+					subtotal: undefined,
+					waybillNo: undefined,
+					waybill: undefined,
+					location: undefined,
+					number: undefined,
+					weight: undefined,
+					remarks: undefined,
+				},
+				form2: {
+					subtotal: undefined,
+					warehouse: undefined,
+					location: undefined,
+					uldNo: undefined,
+				},
+				form3: {
+					flightNo:undefined,
+					flightDate:undefined,
+					segment:undefined,
+				},
+				dialogFormVisible1: false,
+				dialogFormVisible2: false,
+				dialogFormVisible3: false,
+				dialogTableVisible: false,
+				innerVisible: false,
+				innerVisible1: false,
+				formLabelWidth: '120px',
+			}
+		}
+	}
+</script>

+<template>
+    <el-container>
+        <el-main>
+            <el-row>
+                <el-col :span="24">
+                    <div class="grid-content content">收费处理</div>
+                </el-col>
+            </el-row>
+            <!--            两个表单区域-->
+            <el-row>
+                <el-tabs v-model="activeName" @tab-click="handleClick">
+                    <el-tab-pane label="计费" name="first">
+                        <el-form ref="form" :model="form" label-width="80px">
+                            <el-row>
+                                <el-col :span="6">
+                                    <el-form-item label="运单号">
+                                        <el-input v-model="form.name"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="6">
+                                    <el-form-item label="">
+                                        <el-button @click="">挑单</el-button>
+                                        <el-button @click="">批量挑单</el-button>
+                                    </el-form-item>
+                                </el-col>
+                            </el-row>
+                            <el-row>
+                                <el-col :span="6">
+                                    <el-form-item label="结算客户">
+                                        <el-input v-model="form.name"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="6">
+                                    <el-form-item label="付款方式" :label-width="formLabelWidth">
+                                        <el-select v-model="form.waybillNo" placeholder="请选择">
+                                            <el-option label="方式一" value="yi"></el-option>
+                                            <el-option label="方式二" value="er"></el-option>
+                                        </el-select>
+                                    </el-form-item>
+                                </el-col>
+                            </el-row>
+                            <el-row>
+                                <el-table
+                                        :data="tableData"
+                                        style="width: 100%"
+                                        row-key="id"
+                                        border
+                                        lazy
+                                        :load="load"
+                                        :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+                                    <el-table-column
+                                            prop="date"
+                                            label="状态">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="name"
+                                            label="运单号">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="address"
+                                            label="计费重量">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="date"
+                                            label="处置费">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="name"
+                                            label="超重费">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="address"
+                                            label="仓储费">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="date"
+                                            label="总费用">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="name"
+                                            label="航班">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="address"
+                                            label="特货代码">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="date"
+                                            label="品名">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="name"
+                                            label="方式">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="address"
+                                            label="客户">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="address"
+                                            label="收/发货人">
+                                    </el-table-column>
+                                </el-table>
+                            </el-row>
+                            <div>
+                                <el-button @click="">清除</el-button>
+                                <el-button @click="">核对并现结结算</el-button>
+                                <el-button @click="">导出</el-button>
+                                <el-button @click="">打印</el-button>
+                            </div>
+                        </el-form>
+                    </el-tab-pane>
+                    <el-tab-pane label="已结算" name="second">已结算</el-tab-pane>
+                </el-tabs>
+            </el-row>
+        </el-main>
+    </el-container>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                form: {
+
+                },
+                activeName: 'first',
+                tableData:[],
+            }
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>

+<template>
+    <el-container>
+        <el-main>
+            <el-row>
+                <el-col :span="24">
+                    <div class="grid-content content">航班文件</div>
+                </el-col>
+            </el-row>
+            <!--            搜索区域-->
+            <el-row>
+                <el-form :inline="true" :model="formInline" class="demo-form-inline">
+                    <el-col :span="5">
+                        <el-form-item label="航班号">
+                            <el-input v-model="formInline.flightNo" placeholder="请输入航班号"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                        <el-form-item>
+                            <el-button type="primary" @click="onSubmit">查询</el-button>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                        <el-form-item>
+                            <el-select v-model="formInline.operation" placeholder="航班操作" style="margin-left: 50px">
+                                <el-option
+                                        v-for="item in operation"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <!--            三个表单区域-->
+            <el-row>
+                <el-tabs v-model="activeName" @tab-click="handleClick">
+                    <el-tab-pane label="舱单" name="first">
+                        <el-table
+                                :data="tableData"
+                                style="width: 100%"
+                                row-key="id"
+                                border
+                                lazy
+                                :load="load"
+                                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+                            <el-table-column
+                                    prop="box"
+                                    label="板箱号">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="assembling"
+                                    label="配载件数">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="stowage"
+                                    label="配载重量">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="stowageVol"
+                                    label="配载体积">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="code"
+                                    label="特殊处理代码">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="productName"
+                                    label="品名">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="departure"
+                                    label="始发站">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="destination"
+                                    label="目的站">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="priority"
+                                    label="优先级">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="remarks"
+                                    label="备注">
+                            </el-table-column>
+                        </el-table>
+                    </el-tab-pane>
+                    <el-tab-pane label="机长通知单" name="second">
+
+                    </el-tab-pane>
+                    <el-tab-pane label="舱单编辑区" name="third">
+                        <el-form ref="form" :model="form" label-width="80px">
+                            <el-row>
+                                <el-col :span="6">
+                                    <el-form-item label="ULD类别">
+                                        <el-select v-model="form.type" placeholder="请选择">
+                                            <el-option label="ULD" value="ULD"></el-option>
+                                            <el-option label="其他" value="其他"></el-option>
+                                        </el-select>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="6">
+                                    <el-form-item label="ULD号">
+                                        <el-input v-model="form.uldNo"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="6">
+                                    <el-form-item label="">
+                                        <el-button>添加ULD</el-button>
+                                        <el-button>清空ULD</el-button>
+                                    </el-form-item>
+                                </el-col>
+                            </el-row>
+                            <el-row>
+                                <el-col :span="6">
+                                    <el-form-item label="运单号">
+                                        <el-input v-model="form.waybillNo"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="6">
+                                    <el-form-item label="件数">
+                                        <el-input v-model="form.number"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="6">
+                                    <el-form-item label="重量">
+                                        <el-input v-model="form.weight"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                            </el-row>
+                            <el-row>
+                                <el-col :span="6">
+                                    <el-form-item label="配载件数">
+                                        <el-input v-model="form.assembling"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="6">
+                                    <el-form-item label="配载重量">
+                                        <el-input v-model="form.stowage"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="6">
+                                    <el-form-item label="配载体积">
+                                        <el-input v-model="form.stowageVol"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                            </el-row>
+                            <el-row>
+                                <el-col :span="6">
+                                    <el-form-item label="特货代码">
+                                        <el-input v-model="form.code"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="6">
+                                    <el-form-item label="品名">
+                                        <el-input v-model="form.productName"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="6">
+                                    <el-form-item label="始发站">
+                                        <el-input v-model="form.departure"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                            </el-row>
+                            <el-row>
+                                <el-col :span="6">
+                                    <el-form-item label="目的站">
+                                        <el-input v-model="form.destination"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="6">
+                                    <el-form-item label="优先级">
+                                        <el-select v-model="form.priority" placeholder="请选择">
+                                            <el-option label="一" value="一"></el-option>
+                                            <el-option label="二" value="二"></el-option>
+                                        </el-select>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="6">
+                                    <el-form-item label="备注">
+                                        <el-input v-model="form.remarks"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                            </el-row>
+                        </el-form>
+                    </el-tab-pane>
+                </el-tabs>
+                <div>
+                    <el-button>导入舱单</el-button>
+                    <el-button>舱单保存</el-button>
+                    <el-button>发送FFM</el-button>
+                    <el-button>发送H2000舱单报</el-button>
+                    <el-button>不正常检查</el-button>
+                    <el-button @click="dialogTableVisible = true">打印</el-button>
+                    <el-button>打印标签</el-button>
+                </div>
+            </el-row>
+            <!--            航班文件    打印按钮-->
+            <el-row>
+                <el-dialog  title="打印" :visible.sync="dialogTableVisible">
+                    <el-tabs v-model="activeName1" @tab-click="handleClick">
+                        <el-tab-pane label="舱单打印" name="first">
+                            <el-table
+                                    :data="tableData1"
+                                    style="width: 100%"
+                                    row-key="id"
+                                    border
+                                    lazy
+                                    :load="load"
+                                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+                                <el-table-column
+                                        type="selection"
+                                        width="55">
+                                </el-table-column>
+                                <el-table-column
+                                        prop="date"
+                                        label="板箱号">
+                                </el-table-column>
+                                <el-table-column
+                                        prop="name"
+                                        label="配载件数">
+                                </el-table-column>
+                                <el-table-column
+                                        prop="address"
+                                        label="配载重量">
+                                </el-table-column>
+                                <el-table-column
+                                        prop="date"
+                                        label="配载体积">
+                                </el-table-column>
+                                <el-table-column
+                                        prop="name"
+                                        label="特殊处理代码"
+                                        width="120px">
+                                </el-table-column>
+                                <el-table-column
+                                        prop="address"
+                                        label="品名">
+                                </el-table-column>
+                                <el-table-column
+                                        prop="date"
+                                        label="始发站">
+                                </el-table-column>
+                                <el-table-column
+                                        prop="name"
+                                        label="目的站">
+                                </el-table-column>
+                                <el-table-column
+                                        prop="address"
+                                        label="优先级">
+                                </el-table-column>
+                                <el-table-column
+                                        prop="name"
+                                        label="备注">
+                                </el-table-column>
+                                <el-table-column
+                                        prop="address"
+                                        label="舱单打印">
+                                </el-table-column>
+                            </el-table>
+                        </el-tab-pane>
+                        <el-tab-pane label="分批单打印" name="second">分批单打印</el-tab-pane>
+                        <el-tab-pane label="分批单打印" name="third">分批单打印</el-tab-pane>
+                    </el-tabs>
+                    <div style="margin-top: 10px;margin-left: 250px">
+                        <el-button @click="">无ULD打印</el-button>
+                        <el-button @click="">有ULD打印</el-button>
+                        <el-button @click="">装载舱单打印</el-button>
+                    </div>
+                </el-dialog>
+            </el-row>
+        </el-main>
+    </el-container>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                formInline: {
+                    flightNo: undefined,
+                    operation: undefined
+                },
+                form: {
+                    type:undefined,
+                    uldNo:undefined,
+                    waybillNo:undefined,
+                    number:undefined,
+                    weight:undefined,
+                    assembling:undefined,
+                    stowage:undefined,
+                    stowageVol:undefined,
+                    code:undefined,
+                    productName:undefined,
+                    departure:undefined,
+                    destination:undefined,
+                    priority:undefined,
+                    remarks:undefined,
+                },
+                tableData:[],
+                tableData1:[],
+                dialogTableVisible: false,
+                dialogTableVisible1: false,
+                activeName: 'first',
+                activeName1: 'first',
+
+            };
+
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>

+<template>
+   <el-container>
+      <el-main>
+      <el-row>
+        <el-col :span="24">
+          <div class="grid-content content">航班预配</div>
+        </el-col>
+      </el-row>
+<!--      搜索区域-->
+      <el-row>
+        <el-form :inline="true" :model="formInline" class="demo-form-inline">
+          <el-col :span="5">
+            <el-form-item label="航班号">
+              <el-input v-model="formInline.flightNo" placeholder="请输入航班号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item>
+              <el-button type="primary" @click="onSubmit">查询</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item>
+              <el-select v-model="formInline.operation" placeholder="航班操作" style="margin-left: 50px">
+                <el-option
+                        v-for="item in operation"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+<!--      表单区域①-->
+      <el-row>
+        <el-table
+                ref="multipleTable"
+                :data="tableData"
+                tooltip-effect="dark"
+                style="width: 100%"
+                @selection-change="handleSelectionChange">
+          <el-table-column
+                  type="selection"
+                  width="55">
+          </el-table-column>
+          <el-table-column
+                  prop="waybillNo"
+                  label="运单号">
+          </el-table-column>
+          <el-table-column
+                  prop="number"
+                  label="件数">
+          </el-table-column>
+          <el-table-column
+                  prop="weight"
+                  label="重量">
+          </el-table-column>
+          <el-table-column
+                  prop="volume"
+                  label="体积">
+          </el-table-column>
+          <el-table-column
+                  prop="product"
+                  label="品名">
+          </el-table-column>
+        </el-table>
+        <div style="margin-top:5px;margin-left: 1000px">
+          <el-button type="primary" >配上</el-button>
+          <el-button type="success" @click="dialogFormVisible = true">新增</el-button>
+          <el-button type="warning" @click="dialogForm1Visible = true">导入</el-button>
+        </div>
+      </el-row>
+<!--      表单①新增按钮弹框-->
+      <el-row >
+        <el-dialog title="新增页面" :visible.sync="dialogFormVisible">
+          <el-form :model="form">
+            <el-row>
+              <el-col :span="10">
+                <el-form-item label="运单号" :label-width="formLabelWidth">
+                  <el-input v-model="form.waybillNo" autocomplete="off"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="目的站" :label-width="formLabelWidth">
+                  <el-input v-model="form.destination" autocomplete="off"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="件数" :label-width="formLabelWidth">
+                  <el-input v-model="form.number" autocomplete="off"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="重量" :label-width="formLabelWidth">
+                  <el-input v-model="form.weight" autocomplete="off"  placeholder="单位：KG"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="体积" :label-width="formLabelWidth">
+                  <el-input v-model="form.volume" autocomplete="off"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="品名" :label-width="formLabelWidth">
+                  <el-select v-model="form.product" placeholder="请选择品名">
+                    <el-option label="品名一" value="品名一"></el-option>
+                    <el-option label="品名二" value="品名二"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="特货代码" :label-width="formLabelWidth">
+                  <el-input v-model="form.code" autocomplete="off"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="代理人" :label-width="formLabelWidth">
+                  <el-input v-model="form.agent" autocomplete="off"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="优先级" :label-width="formLabelWidth">
+                  <el-input v-model="form.priority" autocomplete="off"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="备注" :label-width="formLabelWidth">
+                  <el-input v-model="form.remarks" autocomplete="off"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="dialogFormVisible = false">取 消</el-button>
+            <el-button type="primary" @click="dialogFormVisible = false">保 存</el-button>
+          </div>
+        </el-dialog>
+      </el-row>
+<!--      表单①导入按钮弹框-->
+      <el-row align="center">
+        <el-dialog  title="批量导入" :visible.sync="dialogForm1Visible" style="width: 100%">
+          <el-form :model="form1" >
+            <el-row>
+              <el-col :span="7">
+                <el-form-item>
+                  <el-form-item label="航班号" :label-width="formLabelWidthd">
+                    <el-input v-model="form1.flightNo"></el-input>
+                  </el-form-item>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7">
+                <el-form-item>
+                  <el-form-item label="始发站" :label-width="formLabelWidthd">
+                    <el-input v-model="form1.departure"></el-input>
+                  </el-form-item>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7">
+                <el-form-item>
+                  <el-form-item label="中转站" :label-width="formLabelWidthd">
+                    <el-input v-model="form1.transfer"></el-input>
+                  </el-form-item>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7">
+                <el-form-item>
+                  <el-form-item label="目的站" :label-width="formLabelWidthd">
+                    <el-input v-model="form1.destination"></el-input>
+                  </el-form-item>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7">
+                <el-form-item>
+                  <el-form-item label="代理人" :label-width="formLabelWidthd">
+                    <el-input v-model="form1.agent"></el-input>
+                  </el-form-item>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7">
+                <el-form-item>
+                  <el-form-item label="特货代码" :label-width="formLabelWidthd">
+                    <el-input v-model="form1.code"></el-input>
+                  </el-form-item>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                  <el-form-item label="是否拉货" :label-width="formLabelWidthd">
+                    <el-select v-model="form1.goods" placeholder="是否拉货"  style="width: 160px">
+                      <el-option
+                              v-for="item in goods"
+                              :key="item.value"
+                              :label="item.label"
+                              :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item>
+                  <el-form-item label="制单时间" :label-width="formLabelWidthd">
+                    <el-date-picker
+                            v-model="form1.voucher"
+                            type="date"
+                            placeholder="选择日期"
+                            style="width: 160px">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item>
+                  <el-form-item label="入仓时间" :label-width="formLabelWidthd">
+                    <el-date-picker
+                            v-model="form1.warehousing"
+                            type="date"
+                            placeholder="选择日期"
+                            style="width: 160px">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-form-item>
+              </el-col>
+              <el-col :span="13" style="margin-left: 70px">
+                <el-form-item>
+                      <el-radio-group v-model="form1.radio">
+                      <el-radio :label="3">邮件单</el-radio>
+                      <el-radio :label="6">有库存</el-radio>
+                      <el-radio :label="9">已审核</el-radio>
+                      <el-radio :label="12">已放行</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col>
+                <div style="margin-top: 20px;margin-left: 580px">
+                  <el-button type="primary">查询</el-button>
+                </div>
+              </el-col>
+              <el-col>
+                <el-table
+                        ref="multipleTable"
+                        :data="tableData1"
+                        tooltip-effect="dark"
+                        style="width: 100%"
+                        @selection-change="handleSelectionChange">
+                  <el-table-column
+                          type="selection"
+                          width="55">
+                  </el-table-column>
+                  <el-table-column
+                          prop="waybillNo"
+                          label="运单号"
+                          width="120">
+                  </el-table-column>
+                  <el-table-column
+                          prop="number"
+                          label="件数"
+                          width="120">
+                  </el-table-column>
+                  <el-table-column
+                          prop="volume"
+                          label="体积"
+                          width="120">
+                  </el-table-column>
+                  <el-table-column
+                          prop="weight"
+                          label="重量"
+                          show-overflow-tooltip>
+                  </el-table-column>
+                </el-table>
+                <div style="margin-top: 20px;margin-left: 580px">
+                  <el-button type="success">导入</el-button>
+                  <el-button type="info">取消</el-button>
+                </div>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-dialog>
+      </el-row>
+<!--      表单区域②-->
+      <el-row>
+        <el-table
+                ref="multipleTable"
+                :data="tableData2"
+                tooltip-effect="dark"
+                style="width: 100%"
+                @selection-change="handleSelectionChange">
+          <el-table-column
+                  prop="type"
+                  label="ULD类型">
+          </el-table-column>
+          <el-table-column
+                  prop="number"
+                  label="件数">
+          </el-table-column>
+          <el-table-column
+                  prop="machine"
+                  label="机仓位">
+          </el-table-column>
+        </el-table>
+        <div style="margin-top:5px;margin-left: 1000px">
+          <el-button type="primary" >拉下</el-button>
+          <el-button type="success" @click="dialogFormVisibles = true">新增</el-button>
+          <el-button type="danger" >删除</el-button>
+        </div>
+      </el-row>
+<!--      表单②新增按钮弹框-->
+      <el-row>
+        <el-dialog title="新增页面" :visible.sync="dialogFormVisibles">
+          <el-form :model="forms">
+            <el-row>
+              <el-col :span="10">
+                <el-form-item label="ULD" :label-width="formLabelWidths">
+                  <el-input v-model="forms.uld" autocomplete="off"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="件数" :label-width="formLabelWidths">
+                  <el-input v-model="forms.number" autocomplete="off"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="机仓位" :label-width="formLabelWidths">
+                    <el-select v-model="forms.machine" placeholder="请选择机仓位">
+                    <el-option label="仓位一" value="仓位一"></el-option>
+                    <el-option label="仓位二" value="仓位二"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="板位" :label-width="formLabelWidths">
+                  <el-select v-model="forms.position" placeholder="请选择板位">
+                    <el-option label="板位一" value="板位一"></el-option>
+                    <el-option label="板位二" value="板位二"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="板型"  :label-width="formLabelWidths">
+                  <el-select v-model="forms.plate" placeholder="请选择板型">
+                    <el-option label="板型一" value="板型一"></el-option>
+                    <el-option label="板型二" value="板型二"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="dialogFormVisibles = false">取 消</el-button>
+            <el-button type="primary" @click="dialogFormVisibles = false">保 存</el-button>
+          </div>
+        </el-dialog>
+      </el-row>
+    </el-main>
+  </el-container>
+</template>
+<script>
+    export default {
+      data() {
+         return {
+        formInline: {
+          flightNo: undefined,
+          operation: undefined,
+        },
+        tableData:[],
+        form: {
+          waybillNo:undefined,
+          destination:undefined,
+          number:undefined,
+          weight:undefined,
+          volume:undefined,
+          product:undefined,
+          code:undefined,
+          agent:undefined,
+          priority:undefined,
+          remarks:undefined,
+        },
+        form1: {
+          flightNo:undefined,
+          departure:undefined,
+          transfer:undefined,
+          destination:undefined,
+          agent:undefined,
+          code:undefined,
+          goods:undefined,
+          voucher:undefined,
+          warehousing:undefined,
+          radio:undefined,
+        },
+        tableData1:[],
+        tableData2:[],
+        forms: {
+          uld:undefined,
+          number:undefined,
+          machine:undefined,
+          position:undefined,
+          plate:undefined,
+        },
+        dialogFormVisible: false,
+        dialogForm1Visible: false,
+        dialogFormVisibles: false,
+        radio: 3,
+        formLabelWidth: '120px',
+        formLabelWidths: '120px',
+        formLabelWidthd: '120px',
+        operation: [{
+          value: '操作1',
+          label: '操作1'
+        }, {
+          value: '操作2',
+          label: '操作2'
+        }],
+        goods: [{
+          value: '是',
+          label: '是'
+        }, {
+          value: '否',
+          label: '否'
+        }],
+      }
+    },
+      methods: {
+         onSubmit() {
+        console.log('submit!');
+      },
+         handleSelectionChange(val) {
+        this.multipleSelection = val;
+      }
+    }
+  }
+</script>

 <template>
 <template>
-	<section>page6...
+	<section>
+<!--		工具条-->
+		<el-row class="toolbar" style="padding-bottom: 0px;">
+			<el-form :inline="true"  ref="form" :model="form">
+				<el-row>
+					<el-col span="5">
+						<el-form-item label="车牌号：">
+							<el-input v-model="form.input" placeholder="" size="small"style="width: 120px"></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col span="5">
+						<el-form-item label="挂靠名称:">
+							<el-input v-model="form.input" placeholder="" size="small" style="width: 120px"></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col span="5">
+						<el-form-item label="目的场站:">
+							<el-select v-model="form.region" placeholder="请选择" size="small" style="width: 120px">
+								<el-option label="综保区货站" value="zongbaoqu"></el-option>
+								<el-option label="三号货站" value="sanhao"></el-option>
+								<el-option label="冷链货站" value="lenglian"></el-option>
+								<el-option label="快邮货站" value="kuaiyou"></el-option>
+								<el-option label="西货站" value="xi"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col span="5">
+						<el-form-item label="卡 口:" style="margin-left: 10px">
+							<el-select v-model="form.region" placeholder="请选择" size="small" style="width: 120px">
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col span="2">
+						<el-form-item>
+							<el-button type="primary" @click="" size="small">查&nbsp;&nbsp;&nbsp;询</el-button>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+		</el-row>
+<!--		列表-->
+		<el-row>
+			<el-table
+					:data="tableData"
+					border
+					style="width: 100%">
+				<el-table-column
+						fixed
+						prop="date"
+						label="操作">
+					<el-button @click="handleClick(scope.row)" type="primary" size="small">查看</el-button>
+				</el-table-column>
+				<el-table-column
+						prop="name"
+						label="是否失效">
+				</el-table-column>
+				<el-table-column
+						prop="province"
+						label="车牌号"
+						width="100">
+				</el-table-column>
+				<el-table-column
+						prop="city"
+						label="挂靠单位">
+				</el-table-column>
+				<el-table-column
+						prop="zip"
+						label="目的关区">
+				</el-table-column>
+				<el-table-column
+						prop="name"
+						label="卡口">
+				</el-table-column>
+				<el-table-column
+						prop="province"
+						label="地磅称重">
+				</el-table-column>
+				<el-table-column
+						prop="city"
+						label="总货重">
+				</el-table-column>
+				<el-table-column
+						prop="address"
+						label="进出差值">
+				</el-table-column>
+				<el-table-column
+						prop="zip"
+						label="备案车重">
+				</el-table-column>
+				<el-table-column
+						prop="name"
+						label="业务类型">
+				</el-table-column>
+				<el-table-column
+						prop="province"
+						label="货物类型">
+				</el-table-column>
+				<el-table-column
+						prop="city"
+						label="二维码编号"
+						width="110">
+				</el-table-column>
+				<el-table-column
+						prop="address"
+						label="进出场站">
+				</el-table-column>
+				<el-table-column
+						prop="zip"
+						label="已进已出">
+				</el-table-column>
+				<el-table-column
+						prop="zip"
+						label="更新时间">
+				</el-table-column>
+				<el-table-column
+						fixed="right"
+						label="操作"
+						width="150">
+					<template slot-scope="scope">
+						<el-button type="success" size="mini">修改</el-button>
+						<el-button type="danger" size="mini">删除</el-button>
+						<el-button type="warning" size="mini" style="margin-top: 2px;margin-left: 0px">审核</el-button>
+						<el-button type="info" size="mini">异常</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+		</el-row>
+		<!--		分页-->
+		<div class="block">
+			<el-pagination
+					@size-change="handleSizeChange"
+					@current-change="handleCurrentChange"
+					:current-page="currentPage4"
+					:page-sizes="[100, 200, 300, 400]"
+					:page-size="100"
+					layout="total, sizes, prev, pager, next, jumper"
+					:total="400">
+			</el-pagination>
+		</div>
 	</section>
 	</section>
-</template>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tableData:[
+					{
+						date: '',
+						name: '未失效',
+						province: '晋A5ES6',
+						city: '河南诺畅',
+						address: '4604',
+						zip: '西货站'
+					}
+				],
+				currentPage4: 4,
+				form: {
+					name: '',
+					region: '',
+					date1: '',
+					date2: '',
+					delivery: false,
+					type: [],
+					resource: '',
+					desc: ''
+				}
+			}
+		},
+		methods: {
+			onSubmit() {
+				console.log('submit!');
+			},
+			handleSizeChange(val) {
+				console.log(`每页 ${val} 条`);
+			},
+			handleCurrentChange(val) {
+				console.log(`当前页: ${val}`);
+			}
+		}
+	}
+</script>
+
+<style scoped>
+
+
+</style>

+<template>
+        <section>
+            <!--        工具条-->
+            <el-row class="toolbar" style="padding-bottom: 0px;">
+                <el-form :inline="true"  ref="form" :model="form"  >
+                    <el-row>
+                        <el-col span="8">
+                            <el-form-item label="主单号：">
+                                <el-input v-model="form.input" placeholder="" size="small" style="width: 240px"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col span="8">
+                            <el-form-item>
+                                <el-button type="primary" @click="" size="small" style="margin-left: 40px">查&nbsp;&nbsp;&nbsp;询</el-button>
+                                <span style="color: red;margin-left: 10px">查询单号前请先选定业务类型</span>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-form>
+            </el-row>
+            <!--        列表-->
+            <el-row>
+                <el-table
+                        :data="tableData"
+                        style="width: 100%">
+                    <el-table-column
+                            fixed
+                            prop="date"
+                            label="操作">
+                        <el-button @click="handleClick(scope.row)" type="primary" size="small">查看</el-button>
+                    </el-table-column>
+                    <el-table-column
+                            prop="date"
+                            label="航班号">
+                    </el-table-column>
+                    <el-table-column
+                            prop="name"
+                            label="航班日期">
+                    </el-table-column>
+                    <el-table-column
+                            prop="address"
+                            label="航段">
+                    </el-table-column>
+                    <el-table-column
+                            prop="date"
+                            label="主单号">
+                    </el-table-column>
+                    <el-table-column
+                            prop="name"
+                            label="件数">
+                    </el-table-column>
+                    <el-table-column
+                            prop="address"
+                            label="重量">
+                    </el-table-column>
+                    <el-table-column
+                            prop="date"
+                            label="关区">
+                    </el-table-column>
+                    <el-table-column
+                            prop="name"
+                            label="时间">
+                    </el-table-column>
+                    <el-table-column
+                            prop="address"
+                            label="回执内容">
+                    </el-table-column>
+                </el-table>
+            </el-row>
+            <!--        申请表单信息-->
+            <el-row style="padding-bottom: 0px;">
+                <el-form ref="form" :model="form">
+                    <el-row>
+                        <el-col span="8">
+                            <el-row>
+                                <el-form-item label="输入备注：">
+                                    <el-input
+                                            type="text"
+                                            placeholder=""
+                                            v-model="form.text"
+                                            maxlength="10"
+                                            show-word-limit
+                                            size="small" style="width: 180px">
+                                    </el-input>
+                                </el-form-item>
+                            </el-row>
+                            <el-row>
+                                <el-form-item label="车牌号码：">
+                                    <el-input v-model="form.input" placeholder="" size="small" style="width: 180px"></el-input>
+                                </el-form-item>
+                            </el-row>
+                            <el-row>
+                                <el-form-item label="货物类型：">
+                                    <el-select v-model="form.region" placeholder="请选择" size="small" style="width: 180px">
+                                        <el-option label="转关货" value="zongbaoqu"></el-option>
+                                        <el-option label="换单货" value="sanhao"></el-option>
+                                        <el-option label="普通货" value="lenglian"></el-option>
+                                        <el-option label="退库货" value="kuaiyou"></el-option>
+                                        <el-option label="查验货" value="xi"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-row>
+                            <el-row>
+                                <el-form-item label="运输公司：">
+                                    <el-input v-model="form.input" placeholder="" size="small" style="width: 180px"></el-input>
+                                </el-form-item>
+                            </el-row>
+                            <el-row>
+                                <el-form-item label="挂靠单位：">
+                                    <el-input v-model="form.input" placeholder="" size="small" style="width: 180px"></el-input>
+                                </el-form-item>
+                            </el-row>
+                        </el-col>
+                        <el-col span="7">
+                            <el-row>
+                                <el-form-item label="是否空车：">
+                                    <el-radio v-model="radio" label="1" style="margin-left: 20px">是</el-radio>
+                                    <el-radio v-model="radio" label="2">否</el-radio>
+                                </el-form-item>
+                            </el-row>
+                            <el-row>
+                                <el-form-item label="业务类型：">
+                                    <el-select v-model="form.region" placeholder="请选择" size="small" style="width: 180px">
+                                        <el-option label="进口提货" value="zongbaoqu"></el-option>
+                                        <el-option label="出口送货" value="sanhao"></el-option>
+                                        <el-option label="分拨业务" value="lenglian"></el-option>
+                                        <el-option label="调拨业务" value="kuaiyou"></el-option>
+                                    </el-select>
+                                </el-form-item>
+
+                            </el-row>
+                            <el-row>
+                                <el-form-item label="申请单位：">
+                                    <el-input v-model="form.input" placeholder="" size="small" style="width: 180px"></el-input>
+                                </el-form-item>
+                            </el-row>
+                            <el-row>
+                                <el-form-item label="备案单位：">
+                                    <el-input v-model="form.input" placeholder="" size="small" style="width: 180px"></el-input>
+                                </el-form-item>
+
+                            </el-row>
+                            <el-row>
+                                <el-form-item label="主单列表：">
+                                    <el-input
+                                            type="textarea"
+                                            :rows="4"
+                                            placeholder="请输入主单号，例如17212341234，多个单号以‘，’（英文）分割"
+                                            v-model="textarea"
+                                            style="width: 180px">
+                                    </el-input>
+                                </el-form-item>
+                            </el-row>
+
+                        </el-col>
+                        <el-col span="3">
+                            <el-row>
+                                <el-form-item  label="选择场站信息：" >
+                                </el-form-item>
+                            </el-row>
+                        </el-col>
+                        <el-col span="4">
+                            <el-row>
+                                <el-tree
+                                        :data="data"
+                                        show-checkbox
+                                        node-key="id"
+                                        :default-expanded-keys="[2, 3]">
+                                </el-tree>
+                            </el-row>
+                        </el-col>
+                    </el-row>
+                    <el-row style="margin-left: 320px">
+                        <el-button type="success">保&nbsp;&nbsp;&nbsp;&nbsp;存</el-button>
+                        <el-button type="info">返&nbsp;&nbsp;&nbsp;&nbsp;回</el-button>
+                    </el-row>
+                </el-form>
+            </el-row>
+        </section>
+
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                form: {
+                    input: '',
+                },
+                radio:'',
+                tableData:[],
+                data: [{
+                    id: 1,
+                    label: '4604',
+                    children: [{
+                        id: 3,
+                        label: '西货站',
+                        children: [{
+                            id: 4,
+                            label: '一号卡口进'
+                        }, {
+                            id: 5,
+                            label: '一号卡口出',
+                        }]
+                    }, {
+                        id: 2,
+                        label: '军投货站',
+                        children: [{
+                            id: 6,
+                            label: '一号卡口进'
+                        }, {
+                            id: 7,
+                            label: '一号卡口出',
+                        }]
+                    }]
+                },
+                    {
+                        id: 1,
+                        label: '4620',
+                        children: [{
+                            id: 3,
+                            label: '综保区货站仓库',
+                            children: [{
+                                id: 4,
+                                label: '内三卡口进'
+                            }, {
+                                id: 5,
+                                label: '内三卡口出',
+                            }]
+                        }]
+                    },
+                    {
+                        id: 1,
+                        label: '4612',
+                        children: [{
+                            id: 3,
+                            label: '综保区',
+                            children: [{
+                                id: 4,
+                                label: '六号主卡口进'
+                            }, {
+                                id: 5,
+                                label: '六号主卡口出',
+                            }]
+                        }]
+                    }],
+                defaultProps: {
+                    children: 'children',
+                    label: 'label'
+                },
+                textarea: ''
+            }
+        },
+        methods: {
+
+        },
+    }
+</script>
+
+<style scoped>
+    /*.father{*/
+    /*    position: relative;*/
+    /*}*/
+    /*.sun{*/
+    /*    position: absolute;*/
+    /*    top:-220px;*/
+    /*    right:80px*/
+    /*}*/
+
+
+</style>

+<template>
+    <div class="bg order">
+        <span class="air">空运服务-订舱确认</span>
+        <div class="px">
+<!--            发件人信息-->
+            <h4 class="title">发件人信息</h4>
+            <div class="r-table">
+                <table  class="tb" width="100%">
+                    <tbody>
+                    <tr>
+                        <th width="15%">姓名</th>
+                        <td width="18%"><el-input v-model="name" placeholder="" ></el-input></td>
+                        <th width="15%">联系电话</th>
+                        <td width="18%"><el-input v-model="tel" placeholder="" ></el-input></td>
+                        <th width="15%">公司</th>
+                        <td width="18%"><el-input v-model="company" placeholder="" ></el-input></td>
+                    </tr>
+                    <tr>
+                        <th width="15%">税号</th>
+                        <td width="18%"><el-input v-model="taxId" placeholder="" ></el-input></td>
+                        <th width="15%">邮编</th>
+                        <td width="18%"><el-input v-model="postcode" placeholder="" ></el-input></td>
+                        <th width="15%">省市区</th>
+                        <td width="18%"><el-input v-model="province" placeholder="" ></el-input></td>
+                    </tr>
+                    <tr>
+                        <th colspan="1">详细地址</th>
+                        <td colspan="5"><el-input v-model="address" placeholder="" ></el-input></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+<!--            收件人信息-->
+            <h4 class="title">收件人信息</h4>
+            <div class="r-table">
+                <table  class="tb" width="100%">
+                    <tbody>
+                    <tr>
+                        <th width="15%">姓名</th>
+                        <td width="18%"><el-input v-model="name" placeholder="" ></el-input></td>
+                        <th width="15%">联系电话</th>
+                        <td width="18%"><el-input v-model="tel" placeholder="" ></el-input></td>
+                        <th width="15%">公司</th>
+                        <td width="18%"><el-input v-model="company" placeholder="" ></el-input></td>
+                    </tr>
+                    <tr>
+                        <th width="15%">邮箱</th>
+                        <td width="18%"><el-input v-model="postcode" placeholder="" ></el-input></td>
+                        <th width="15%">身份证/护照</th>
+                        <td width="18%"><el-input v-model="idCard" placeholder="" ></el-input></td>
+                        <th width="15%">税号</th>
+                        <td width="18%"><el-input v-model="companyTaxesNumber" placeholder="" ></el-input></td>
+                    </tr>
+                    <tr>
+                        <th width="15%">国家</th>
+                        <td width="18%"><el-input v-model="country" placeholder="" ></el-input></td>
+                        <th width="15%">省/州</th>
+                        <td width="18%"><el-input v-model="province" placeholder="" ></el-input></td>
+                        <th width="15%">城市</th>
+                        <td width="18%"><el-input v-model="city" placeholder="" ></el-input></td>
+                    </tr>
+                    <tr>
+                        <th colspan="1">详细地址</th>
+                        <td colspan="5"><el-input v-model="address" placeholder="" ></el-input></td>
+                    </tr>
+                    <tr>
+                        <th colspan="1">邮编</th>
+                        <td colspan="5"><el-input v-model="postcode" placeholder="" ></el-input></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+<!--            货件信息-->
+            <h4 class="title">货件信息</h4>
+            <div class="r-table">
+                <table  class="tb" width="100%">
+                    <tbody>
+                    <tr>
+                        <th width="15%">客户单号</th>
+                        <td width="18%"><el-input v-model="input" placeholder="" ></el-input></td>
+                        <th width="15%">总件数</th>
+                        <td width="18%"><el-input v-model="input" placeholder="" ></el-input></td>
+                        <th width="15%">总重量(kg)</th>
+                        <td width="18%"><el-input v-model="input" placeholder="" ></el-input></td>
+                    </tr>
+                    <tr>
+                        <th width="15%">总体积(m³)</th>
+                        <td width="18%"><el-input v-model="input" placeholder="" ></el-input></td>
+                        <th width="15%">包裹</th>
+                        <td width="18%">
+                            <el-input v-model="input" placeholder="长" style="width: 60px" ></el-input>×
+                            <el-input v-model="input" placeholder="宽" style="width: 60px" ></el-input>×
+                            <el-input v-model="input" placeholder="高" style="width: 60px" ></el-input>
+                        </td>
+                        <th width="15%">是否退件</th>
+                        <td width="18%">
+                            <el-select v-model="value" placeholder="请选择">
+                                <el-option
+                                        v-for="item in options"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th width="15%">运输方式</th>
+                        <td width="18%">
+                            <el-select v-model="value" placeholder="请选择">
+                                <el-option
+                                        v-for="item in options"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </td>
+                        <th width="15%">是否带电</th>
+                        <td width="18%">
+                            <el-select v-model="value" placeholder="请选择">
+                                <el-option
+                                        v-for="item in options"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </td>
+                        <th width="15%">运费付款方式</th>
+                        <td width="18%">
+                            <el-select v-model="value" placeholder="请选择">
+                                <el-option
+                                        v-for="item in options"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th width="15%">税金支付方式</th>
+                        <td width="18%">
+                            <el-select v-model="value" placeholder="请选择">
+                                <el-option
+                                        v-for="item in options"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </td>
+                        <th width="15%">一般贸易报关出口</th>
+                        <td width="18%">
+                            <el-select v-model="value" placeholder="请选择">
+                                <el-option
+                                        v-for="item in options"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </td>
+                        <th width="15%">一般贸易报关进口</th>
+                        <td width="18%">
+                            <el-select v-model="value" placeholder="请选择">
+                                <el-option
+                                        v-for="item in options"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th colspan="1">贸易条款</th>
+                        <td colspan="1"><el-input v-model="input" placeholder="" ></el-input></td>
+                        <th colspan="1">出口原因</th>
+                        <td colspan="6">
+                            <el-select v-model="value" placeholder="请选择" style="width: 100%">
+                                <el-option
+                                        v-for="item in options"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </td>
+
+                    </tr>
+                    <tr>
+                        <th colspan="1">商业发票备注</th>
+                        <td colspan="5"><el-input v-model="input" placeholder="" ></el-input></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+<!--            货物信息-->
+            <h4 class="title">货物信息</h4>
+            <div class="r-table order">
+                <table  class="tb" width="100%">
+                    <tbody>
+                    <tr>
+                        <th width="9%">中文名</th>
+                        <th width="13%">英文名</th>
+                        <th width="9%">材质</th>
+                        <th width="9%">申报价值(单价)</th>
+                        <th width="5%">数量</th>
+                        <th width="9%">申报价值(总价)</th>
+                        <th width="9%">原产地</th>
+                        <th width="9%">海关货物编号</th>
+                        <th width="9%">配货名称</th>
+                        <th width="12%">配货备注</th>
+                        <th width="7%">操作</th>
+                    </tr>
+                    <tr>
+                        <td width="9%"><el-input v-model="nameCn" placeholder="" ></el-input></td>
+                        <td width="13%"><el-input v-model="name" placeholder="" ></el-input></td>
+                        <td width="9%"><el-input v-model="texture" placeholder="" ></el-input></td>
+                        <td width="9%"><el-input v-model="perPrice" placeholder="" ></el-input></td>
+                        <td width="5%"><el-input v-model="input" placeholder="" ></el-input></td>
+                        <td width="9%"><el-input v-model="totalPrices" placeholder="" ></el-input></td>
+                        <td width="9%"><el-input v-model="originArea" placeholder="" ></el-input></td>
+                        <td width="9%"><el-input v-model="hsCode" placeholder="" ></el-input></td>
+                        <td width="9%"><el-input v-model="cargoName" placeholder="" ></el-input></td>
+                        <td width="12%"><el-input v-model="cargoRemark" placeholder="" ></el-input></td>
+                        <td width="7%" style="text-align: center">
+                            <el-button  icon="el-icon-plus" size="mini" circle></el-button>
+                            <el-button  icon="el-icon-minus" size="mini" circle></el-button>
+                        </td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+            <div style="text-align: center;margin-top: 30px">
+                <el-button type="danger"  style="width: 180px;height: 50px">确认下单</el-button>
+            </div>
+            <div style="margin-top: 50px;height: 80px"> </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "airlift"
+    }
+</script>
+
+<style scoped>
+    .bg{
+        background-color: #F2F2F2;
+    }
+    .air{
+        font-size: 20px;
+        color: #308aee;
+        margin-top: 20px;
+        display: block;
+    }
+    .px{
+        background-color: #FFFFFF;
+        width: 100%;
+        height: 500px;
+    }
+    .title{
+        color: #127ef2;
+        font-size: 16px;
+        font-weight: bold;
+        margin: 20px 30px;
+        text-align: left;
+    }
+    .r-table .tb > tbody > tr > th {
+        background-color: #d8ecff;
+        text-align: center;
+    }
+    .r-table .tb > tbody > tr > td {
+        /*padding: 4px;  （间接决定了行高）*/
+        /*display: table-cell;*/
+    }
+
+</style>

+<template>
+    <div class="bg">
+        <el-container>
+<!--                顶栏区域-->
+            <el-header style="height: 120px">
+                <el-row class="header">
+                    <el-col :span="9">
+                        <span style="font-size: 50px">KT际通</span>
+                        <span>在线订舱平台</span>
+                    </el-col>
+                    <el-col :span="13" style="margin-left: 30px;margin-top: 30px;width: 300px ">
+                        <el-menu :default-active="activeIndex"
+                                 class="el-menu-demo"
+                                 mode="horizontal"
+                                 @select="handleSelect"
+                                 style="text-color:#303133;active-text-color:#FFF">
+                            <el-menu-item index="1">首 页</el-menu-item>
+                            <el-menu-item index="2">行业方案</el-menu-item>
+                            <el-menu-item index="3">关于我们</el-menu-item>
+                        </el-menu>
+                    </el-col>
+                </el-row>
+            </el-header>
+<!--            主要区域-->
+            <el-main>
+<!--                空运查询内容-->
+                <el-row style="margin-top: 30px">
+                    <el-col :span="10" style="margin-right: 10px;background-color: #FFF;">
+                        <div style="height: 600px;">
+                            <div style="width: 100%;height: 80px;border-bottom: solid 2px #29A1F7;">
+                                <el-col :span="15" style="margin-left: 0px;margin-top: 20px;">
+                                    <span style="font-size: 25px;margin-left: 50px">空运查询</span>
+                                </el-col>
+                                <el-col :span="8" style="margin-top: 23px;">
+                                    <span style="font-size: 17px">约计3000条航线数据</span>
+                                </el-col>
+                            </div>
+                            <el-row>
+                                <el-form ref="form" :model="form" label-width="80px" style="font-size: 50px;" >
+                                    <el-form-item label="航程方向" >
+                                        <el-radio-group v-model="form.airLine">
+                                            <el-radio   style="padding-left: 20px" label="出口"></el-radio>
+                                            <el-radio label="进口"></el-radio>
+                                        </el-radio-group>
+                                    </el-form-item>
+                                    <el-form-item label="起运地">
+                                        <el-select   style="width: 320px" v-model="form.originStation" placeholder="起运地">
+                                            <el-option label="上海" value="shanghai"></el-option>
+                                            <el-option label="北京" value="beijing"></el-option>
+                                        </el-select>
+                                    </el-form-item>
+                                    <el-form-item label="目的地">
+                                        <el-select   style="width: 320px" v-model="form.deliveryAddress" placeholder="目的地">
+                                            <el-option label="上海" value="shanghai"></el-option>
+                                            <el-option label="北京" value="beijing"></el-option>
+                                        </el-select>
+                                    </el-form-item>
+                                    <el-form-item label="货物重量">
+                                        <el-input  style="width: 320px" v-model="form.weight" placeholder="单位：KG"></el-input>
+                                    </el-form-item>
+                                    <div style="padding-left: 150px">
+                                        <el-button style="background-color: #F18F4C;color: #FFF">查价下单</el-button>
+                                    </div>
+                                </el-form>
+                                <div style="width: 100%;height: 200px;margin-top: 30px;padding-left: 50px;border-top: dashed 2px #D5D5D5;">
+                                    <p>
+                                        <span><i class="el-icon-phone" style="color: #29A1F7;padding-right: 5px"></i>一键订舱，方便快捷</span>
+                                    </p>
+                                    <p>
+                                        <span><i class="el-icon-edit-outline" style="color: #29A1F7;padding-right: 5px"></i>数据准确，专有团队维护</span>
+                                    </p>
+                                    <span><i class="el-icon-location-information" style="color: #29A1F7;padding-right: 5px"></i>货物在线跟踪</span>
+                                </div>
+                            </el-row>
+                        </div>
+                    </el-col>
+<!--                    广告位-->
+                    <el-col :span="13"  style="margin-right: 0px;background-color: rgba(41,161,247,0.1);float: right;">
+                        <div style="height: 600px;">
+                        </div>
+                    </el-col>
+                </el-row>
+<!--                优价航线标题栏-->
+                <el-row style="margin-top: 30px">
+                    <span style="font-size: 25px">优价航线</span>
+                </el-row>
+<!--                优价航线内容-->
+                <el-row style="background-color: #FFF;height: 300px;">
+                    <el-table
+                            :data="tableData"
+                            style="width: 100%">
+                        <el-table-column
+                                prop="airLine"
+                                label="航行路线">
+                        </el-table-column>
+                        <el-table-column
+                                prop="transportLimitation"
+                                label="运输时效">
+                        </el-table-column>
+                        <el-table-column
+                                prop="deliveryAddress"
+                                label="交货地">
+                        </el-table-column>
+                        <el-table-column
+                                prop="flightCycle"
+                                label="航班周期">
+                        </el-table-column>
+                        <el-table-column
+                                prop="transportPrice"
+                                label="最低价格">
+                        </el-table-column>
+                        <el-table-column
+                                fixed="right"
+                                label=""
+                                width="120">
+                            <template slot-scope="scope">
+                                <el-button
+                                        size="small" plain
+                                        type="warning"
+                                        @click="">订舱</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-row>
+<!--                热门航线标题栏-->
+                <el-row style="margin-top: 30px">
+                    <span style="font-size: 25px">热门航线</span>
+                </el-row>
+<!--                热门航线内容-->
+                <el-row style="background-color: #FFF;height: 680px;">
+                    <el-col :span="24">
+                        <el-tabs type="border-card" style="width: 100%;height: 680px" stretch="true">
+                            <el-tab-pane>
+                                <span slot="label"><i class="el-icon-right"></i>出口航线</span>
+                                <el-row style="height: 300px;margin-top: 0px">
+                                    <el-col :span="8"
+                                            style="border-right:solid 1px #F5F5F5;border-bottom:solid 1px #F5F5F5;height: 300px;width: 32%;margin-right: 15px">
+                                        <h2>CZ</h2>
+                                        <el-table
+                                                :data="tableData1"
+                                                :header-cell-style="headClass"
+                                                :cell-style="rowClass"
+                                                style="width: 100%;background-color: #F5F5F5">
+                                            <el-table-column
+                                                    prop="airLine"
+                                                    label="航段">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop="transportLimitation"
+                                                    label="时效">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop="flightCycle"
+                                                    label="周期">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop="transportPrice"
+                                                    label="航运价">
+                                            </el-table-column>
+                                        </el-table>
+                                        <div style="text-align: center;margin-top: 6px">交货地:GUANGZHOU AIRPORT 广州</div>
+                                        <div style="text-align: center;margin-top: 6px">
+                                            <el-button type="warning" plain style="width: 120px" >订舱</el-button>
+                                        </div>
+                                    </el-col>
+                                    <el-col :span="8"
+                                            style="border-right:solid 1px #F5F5F5;border-bottom:solid 1px #F5F5F5;height: 300px;width: 32%;margin-right: 15px">
+                                        <h2>CZ</h2>
+                                        <el-table
+                                                :data="tableData2"
+                                                :header-cell-style="headClass"
+                                                :cell-style="rowClass"
+                                                style="width: 100%;background-color: #F5F5F5">
+                                            <el-table-column
+                                                    prop="airLine"
+                                                    label="航段">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop="transportLimitation"
+                                                    label="时效">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop="flightCycle"
+                                                    label="周期">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop="transportPrice"
+                                                    label="航运价">
+                                            </el-table-column>
+                                        </el-table>
+                                        <div style="text-align: center;margin-top: 6px">交货地:GUANGZHOU AIRPORT 广州</div>
+                                        <div style="text-align: center;margin-top: 6px">
+                                            <el-button type="warning" plain style="width: 120px" >订舱</el-button>
+                                        </div>
+                                    </el-col>
+                                    <el-col :span="8"
+                                            style="border-bottom:solid 1px #F5F5F5;height: 300px;width: 32%">
+                                        <h2>CZ</h2>
+                                        <el-table
+                                                :data="tableData3"
+                                                :header-cell-style="headClass"
+                                                :cell-style="rowClass"
+                                                style="width: 100%;background-color: #F5F5F5">
+                                            <el-table-column
+                                                    prop="airLine"
+                                                    label="航段">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop="transportLimitation"
+                                                    label="时效">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop="flightCycle"
+                                                    label="周期">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop="transportPrice"
+                                                    label="航运价">
+                                            </el-table-column>
+                                        </el-table>
+                                        <div style="text-align: center;margin-top: 6px">交货地:GUANGZHOU AIRPORT 广州</div>
+                                        <div style="text-align: center;margin-top: 6px">
+                                            <el-button type="warning" plain style="width: 120px" >订舱</el-button>
+                                        </div>
+                                    </el-col>
+                                </el-row>
+                                <el-row style="height: 300px;margin-top: 0px">
+                                    <el-col :span="8"
+                                            style="border-right:solid 1px #F5F5F5;height: 300px;width: 32%;margin-right: 15px">
+                                        <h2>CZ</h2>
+                                        <el-table
+                                                :data="tableData4"
+                                                :header-cell-style="headClass"
+                                                :cell-style="rowClass"
+                                                style="width: 100%;background-color: #F5F5F5">
+                                            <el-table-column
+                                                    prop="airLine"
+                                                    label="航段">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop="transportLimitation"
+                                                    label="时效">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop="flightCycle"
+                                                    label="周期">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop="transportPrice"
+                                                    label="航运价">
+                                            </el-table-column>
+                                        </el-table>
+                                        <div style="text-align: center;margin-top: 6px">交货地:GUANGZHOU AIRPORT 广州</div>
+                                        <div style="text-align: center;margin-top: 6px">
+                                            <el-button type="warning" plain style="width: 120px" >订舱</el-button>
+                                        </div>
+                                    </el-col>
+                                    <el-col :span="8"
+                                            style="border-right:solid 1px #F5F5F5;height: 300px;width: 32%;margin-right: 15px">
+                                        <h2>CZ</h2>
+                                        <el-table
+                                                :data="tableData5"
+                                                :header-cell-style="headClass"
+                                                :cell-style="rowClass"
+                                                style="width: 100%;background-color: #F5F5F5">
+                                            <el-table-column
+                                                    prop="airLine"
+                                                    label="航段">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop="transportLimitation"
+                                                    label="时效">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop="flightCycle"
+                                                    label="周期">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop="transportPrice"
+                                                    label="航运价">
+                                            </el-table-column>
+                                        </el-table>
+                                        <div style="text-align: center;margin-top: 6px">交货地:GUANGZHOU AIRPORT 广州</div>
+                                        <div style="text-align: center;margin-top: 6px">
+                                            <el-button type="warning" plain style="width: 120px" >订舱</el-button>
+                                        </div>
+                                    </el-col>
+                                    <el-col :span="8"
+                                            style="height: 300px;width: 32%">
+                                        <h2>CZ</h2>
+                                        <el-table
+                                                :data="tableData6"
+                                                :header-cell-style="headClass"
+                                                :cell-style="rowClass"
+                                                style="width: 100%;background-color: #F5F5F5">
+                                            <el-table-column
+                                                    prop="airLine"
+                                                    label="航段">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop="transportLimitation"
+                                                    label="时效">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop="flightCycle"
+                                                    label="周期">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop="transportPrice"
+                                                    label="航运价">
+                                            </el-table-column>
+                                        </el-table>
+                                        <div style="text-align: center;margin-top: 6px">交货地:GUANGZHOU AIRPORT 广州</div>
+                                        <div style="text-align: center;margin-top: 6px">
+                                            <el-button type="warning" plain style="width: 120px" >订舱</el-button>
+                                        </div>
+                                    </el-col>
+                                </el-row>
+                            </el-tab-pane>
+                            <el-tab-pane label="进口航线">
+                                <span slot="label"><i class="el-icon-back"></i>进口航线</span>
+                            </el-tab-pane>
+                            <el-tab-pane label="空运专线">
+                                <span slot="label"><i class="el-icon-star-off"></i>空运专线</span>
+                            </el-tab-pane>
+                        </el-tabs>
+                    </el-col>
+                </el-row>
+<!--                热门港口标题栏-->
+                <el-row style="margin-top: 30px">
+                    <span style="font-size: 25px">热门港口</span>
+                </el-row>
+<!--                热门港口内容-->
+                <el-row style="background-color: #FFF;height: 300px;padding: 25px">
+                    <el-col :span="24">
+                        <el-tabs :tab-position="tabPosition" style="width: 100%;height: 280px;">
+                            <el-tab-pane label="北京">
+                                <el-table
+                                        :data="tableData7"
+                                        style="width: 100%">
+                                    <el-table-column
+                                            prop="airLine"
+                                            label="航行路线">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="transportLimitation"
+                                            label="运输时效">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="deliveryAddress"
+                                            label="交货地">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="flightCycle"
+                                            label="航班周期">
+                                    </el-table-column>
+                                    <el-table-column
+                                            fixed="right"
+                                            label=""
+                                            width="120">
+                                        <template slot-scope="scope">
+                                            <el-button
+                                                    size="small" plain
+                                                    type="warning"
+                                                    @click="">订舱</el-button>
+                                        </template>
+                                    </el-table-column>
+                                </el-table>
+                            </el-tab-pane>
+                            <el-tab-pane label="上海">
+                                <el-table
+                                        :data="tableData8"
+                                        style="width: 100%">
+                                    <el-table-column
+                                            prop="airLine"
+                                            label="航行路线">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="transportLimitation"
+                                            label="运输时效">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="deliveryAddress"
+                                            label="交货地">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="flightCycle"
+                                            label="航班周期">
+                                    </el-table-column>
+                                    <el-table-column
+                                            fixed="right"
+                                            label=""
+                                            width="120">
+                                        <template slot-scope="scope">
+                                            <el-button
+                                                    size="small" plain
+                                                    type="warning"
+                                                    @click="">订舱</el-button>
+                                        </template>
+                                    </el-table-column>
+                                </el-table>
+                            </el-tab-pane>
+                            <el-tab-pane label="深圳">
+                                <el-table
+                                        :data="tableData9"
+                                        style="width: 100%">
+                                    <el-table-column
+                                            prop="airLine"
+                                            label="航行路线">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="transportLimitation"
+                                            label="运输时效">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="deliveryAddress"
+                                            label="交货地">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="flightCycle"
+                                            label="航班周期">
+                                    </el-table-column>
+                                    <el-table-column
+                                            fixed="right"
+                                            label=""
+                                            width="120">
+                                        <template slot-scope="scope">
+                                            <el-button
+                                                    size="small" plain
+                                                    type="warning"
+                                                    @click="">订舱</el-button>
+                                        </template>
+                                    </el-table-column>
+                                </el-table>
+                            </el-tab-pane>
+                            <el-tab-pane label="广州">
+                                <el-table
+                                        :data="tableData10"
+                                        style="width: 100%">
+                                    <el-table-column
+                                            prop="airLine"
+                                            label="航行路线">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="transportLimitation"
+                                            label="运输时效">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="deliveryAddress"
+                                            label="交货地">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="flightCycle"
+                                            label="航班周期">
+                                    </el-table-column>
+                                    <el-table-column
+                                            fixed="right"
+                                            label=""
+                                            width="120">
+                                        <template slot-scope="scope">
+                                            <el-button
+                                                    size="small" plain
+                                                    type="warning"
+                                                    @click="">订舱</el-button>
+                                        </template>
+                                    </el-table-column>
+                                </el-table>
+                            </el-tab-pane>
+                            <el-tab-pane label="宁波">
+                                <el-table
+                                        :data="tableData11"
+                                        style="width: 100%">
+                                    <el-table-column
+                                            prop="airLine"
+                                            label="航行路线">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="transportLimitation"
+                                            label="运输时效">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="deliveryAddress"
+                                            label="交货地">
+                                    </el-table-column>
+                                    <el-table-column
+                                            prop="flightCycle"
+                                            label="航班周期">
+                                    </el-table-column>
+                                    <el-table-column
+                                            fixed="right"
+                                            label=""
+                                            width="120">
+                                        <template slot-scope="scope">
+                                            <el-button
+                                                    size="small" plain
+                                                    type="warning"
+                                                    @click="">订舱</el-button>
+                                        </template>
+                                    </el-table-column>
+                                </el-table>
+                            </el-tab-pane>
+                        </el-tabs>
+                    </el-col>
+                </el-row>
+<!--                查询工具-->
+                <el-row style="background-color: #FFF;height: 180px;margin-top: 60px">
+                    <el-col :span="24">
+                        <el-tabs :tab-position="tabPositions" style="width: 80%;height: 280px;margin: 20px">
+                            <el-tab-pane label="机场代码查询">
+                                <span style="font-size: 25px">机场代码查询</span>
+                                <span style="font-size: 15px">（收录2016年IATA最新机场三字代码、城市三字代码。）</span>
+                                <el-input v-model="input" placeholder="请输入内容"></el-input>
+                            </el-tab-pane>
+                            <el-tab-pane label="商品编码查询">
+                                <span style="font-size: 25px">商品编码查询</span>
+                                <span style="font-size: 15px">（提供海关HScode编码、对应税率、申报要素查询服务，根据海关最新政策实时更新。）</span>
+                                <el-input v-model="input" placeholder="请输入内容"></el-input>
+                            </el-tab-pane>
+                            <el-tab-pane label="全球港口查询">
+                                <span style="font-size: 25px">全球港口查询</span>
+                                <span style="font-size: 15px">（收录2016年IATA最新机场三字代码、城市三字代码。）</span>
+                                <el-input v-model="input" placeholder="请输入内容"></el-input>
+                            </el-tab-pane>
+                            <el-tab-pane label="空运货物查询">
+                                <span style="font-size: 25px">空运货物查询</span>
+                                <span style="font-size: 15px">（提供世界各国航空公司货物追踪、货物查询服务，实时追踪最新货况。）</span>
+                                <el-input v-model="input" placeholder="请输入内容"></el-input>
+                            </el-tab-pane>
+                            <el-tab-pane label="快件跟踪查询">
+                                <span style="font-size: 25px">快件跟踪查询</span>
+                                <span style="font-size: 15px"></span>
+                                <el-input v-model="input" placeholder="请输入内容"></el-input>
+                            </el-tab-pane>
+                        </el-tabs>
+                    </el-col>
+                </el-row>
+            </el-main>
+        </el-container>
+    </div>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                // 空运查询
+                form: {
+                    airLine:undefined,
+                    originStation:undefined,
+                    deliveryAddress:undefined,
+                    weight:undefined,
+                },
+                // 优价航线表格
+                tableData:[],
+                // 热门航线表格
+                tableData1:[],
+                tableData2:[],
+                tableData3:[],
+                tableData4:[],
+                tableData5:[],
+                tableData6:[],
+                // 热门港口表格
+                tableData7:[],
+                tableData8:[],
+                tableData9:[],
+                tableData10:[],
+                tableData11:[],
+
+                tabPosition: 'left',
+                tabPositions: 'bottom',
+            }
+        },
+        methods: {
+            headClass () {
+                return 'text-align: center;background:#F5F5F5;'
+            },
+            rowClass () {
+                return 'text-align: center;background:#F5F5F5;'
+            }
+        },
+    }
+</script>
+
+<style scoped>
+    .bg{
+        background-color: #F2F2F2;
+    }
+    .header{
+        font-size: 20px;
+        line-height: 120px;
+       color:#FFF;
+    }
+    .el-header{
+        background-color: #29A1F7;
+    }
+    .el-tabs{
+        width: 250px;
+    }
+    .el-menu{
+        background-color: #29A1F7;
+        font-size: 20px;
+        border-bottom-color: #29A1F7;
+    }
+</style>

+<template>
+    <el-container>
+        <el-main style="background-color: #EAEAEA">
+<!--            航班号查询-->
+            <el-row style="height: 180px">
+                <el-col :span="24">
+                    <el-row>
+                        <p style="font-size: 28px">航班号查询</p>
+                    </el-row>
+                    <el-row>
+                        <!--工具条-->
+                            <el-form :inline="true" :model="filters">
+                                <el-form-item>
+                                    <el-input v-model="filters.flightNo" ></el-input>
+                                </el-form-item>
+                                <el-form-item>
+                                    <el-button type="primary" v-on:click="getDomesticClearance()">查询</el-button>
+                                </el-form-item>
+                            </el-form>
+                    </el-row>
+                </el-col>
+            </el-row>
+<!--            条件查询-->
+            <el-row style="">
+                <el-col :span="24">
+                    <el-row>
+                        <p style="font-size: 28px">条件查询</p>
+                    </el-row>
+                    <el-row>
+                        <el-tabs v-model="activeName" @tab-click="getDomesticClearance()" style="width: 100%">
+                            <el-tab-pane label="国内出港" name="first">
+                                <div style=";margin-top: 15px">
+                                    <el-time-picker
+                                            v-model="value1"
+                                            placeholder="任意时间点"
+                                    style="width: 140px">
+                                    </el-time-picker>
+                                    <el-time-picker
+                                            v-model="value2"
+                                            placeholder="任意时间点"
+                                            style="width: 140px">
+                                    </el-time-picker>
+                                    <el-select v-model="value" placeholder="目的地" style="width: 140px">
+                                        <el-option
+                                                v-for="item in options"
+                                                :key="item.value"
+                                                :label="item.label"
+                                                :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                                    <el-select v-model="value" placeholder="航空公司" style="width: 140px">
+                                        <el-option
+                                                v-for="item in options"
+                                                :key="item.value"
+                                                :label="item.label"
+                                                :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                                    <el-button type="primary">点击查询</el-button>
+                                </div>
+                                <el-row style="margin-top: 15px">
+                                    <el-col :span="23">
+                                        <el-table
+                                                :data="tableData"
+                                                style="width: 100%">
+                                            <el-table-column
+                                                    prop=""
+                                                    label="计划离港">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="航班号">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="航空公司">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="目的地">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="预计/实际离港">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="状态">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="航站楼">
+                                            </el-table-column>
+                                        </el-table>
+                                    </el-col>
+                                </el-row>
+                            </el-tab-pane>
+                            <el-tab-pane label="国际/地区出港" name="second">
+                                <div style=";margin-top: 15px">
+                                    <el-time-picker
+                                            v-model="value1"
+
+                                            placeholder="任意时间点"
+                                            style="width: 140px">
+                                    </el-time-picker>
+                                    <el-time-picker
+                                            arrow-control
+                                            v-model="value2"
+                                            placeholder="任意时间点"
+                                            style="width: 140px">
+                                    </el-time-picker>
+                                    <el-select v-model="value" placeholder="目的地" style="width: 140px">
+                                        <el-option
+                                                v-for="item in options"
+                                                :key="item.value"
+                                                :label="item.label"
+                                                :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                                    <el-select v-model="value" placeholder="航空公司" style="width: 140px">
+                                        <el-option
+                                                v-for="item in options"
+                                                :key="item.value"
+                                                :label="item.label"
+                                                :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                                    <el-button type="primary">点击查询</el-button>
+                                </div>
+                                <el-row style="margin-top: 15px">
+                                    <el-col :span="23">
+                                        <el-table
+                                                :data="tableData"
+                                                style="width: 100%">
+                                            <el-table-column
+                                                    prop=""
+                                                    label="计划离港">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="航班号">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="航空公司">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="目的地">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="预计/实际离港">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="状态">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="航站楼">
+                                            </el-table-column>
+                                        </el-table>
+                                    </el-col>
+                                </el-row>
+                            </el-tab-pane>
+                            <el-tab-pane label="国内到港" name="third">
+                                <div style=";margin-top: 15px">
+                                    <el-time-picker
+                                            v-model="value1"
+                                            placeholder="任意时间点"
+                                            style="width: 140px">
+                                    </el-time-picker>
+                                    <el-time-picker
+                                            arrow-control
+                                            v-model="value2"
+                                            placeholder="任意时间点"
+                                            style="width: 140px">
+                                    </el-time-picker>
+                                    <el-select v-model="value" placeholder="目的地" style="width: 140px">
+                                        <el-option
+                                                v-for="item in options"
+                                                :key="item.value"
+                                                :label="item.label"
+                                                :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                                    <el-select v-model="value" placeholder="航空公司" style="width: 140px">
+                                        <el-option
+                                                v-for="item in options"
+                                                :key="item.value"
+                                                :label="item.label"
+                                                :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                                    <el-button type="primary">点击查询</el-button>
+                                </div>
+                                <el-row style="margin-top: 15px">
+                                    <el-col :span="23">
+                                        <el-table
+                                                :data="tableData"
+                                                style="width: 100%">
+                                            <el-table-column
+                                                    prop=""
+                                                    label="计划离港">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="航班号">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="航空公司">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="目的地">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="预计/实际离港">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="状态">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="航站楼">
+                                            </el-table-column>
+                                        </el-table>
+                                    </el-col>
+                                </el-row>
+                            </el-tab-pane>
+                            <el-tab-pane label="国际/地区到港" name="fourth">
+                                <div style=";margin-top: 15px">
+                                    <el-time-picker
+                                            v-model="value1"
+                                            placeholder="任意时间点"
+                                            style="width: 140px">
+                                    </el-time-picker>
+                                    <el-time-picker
+                                            arrow-control
+                                            v-model="value2"
+                                            placeholder="任意时间点"
+                                            style="width: 140px">
+                                    </el-time-picker>
+                                    <el-select v-model="value" placeholder="目的地" style="width: 140px">
+                                        <el-option
+                                                v-for="item in options"
+                                                :key="item.value"
+                                                :label="item.label"
+                                                :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                                    <el-select v-model="value" placeholder="航空公司" style="width: 140px">
+                                        <el-option
+                                                v-for="item in options"
+                                                :key="item.value"
+                                                :label="item.label"
+                                                :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                                    <el-button type="primary">点击查询</el-button>
+                                </div>
+                                <el-row style="margin-top: 15px">
+                                    <el-col :span="23">
+                                        <el-table
+                                                :data="tableData"
+                                                style="width: 100%">
+                                            <el-table-column
+                                                    prop=""
+                                                    label="计划离港">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="航班号">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="航空公司">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="目的地">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="预计/实际离港">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="状态">
+                                            </el-table-column>
+                                            <el-table-column
+                                                    prop=""
+                                                    label="航站楼">
+                                            </el-table-column>
+                                        </el-table>
+                                    </el-col>
+                                </el-row>
+                            </el-tab-pane>
+                        </el-tabs>
+                    </el-row>
+                    <el-row>
+                        <div>
+                            <pagination background layout="total, prev, pager, next" v-show="total>0" :total="total" :page.sync="pageSize" :limit.sync="pageNum"
+                                        @pagination="getDomesticClearance"/>
+                        </div>
+
+                    </el-row>
+                </el-col>
+            </el-row>
+        </el-main>
+    </el-container>
+</template>
+
+<script>
+    import {getList} from '../../api/inquiry/inquiry'
+    export default {
+        data() {
+            return {
+                currentPage4: 4,
+                activeName: 'first',
+                filters: {
+                    flightNo: ''
+                },
+                total: 1,
+                pageSize: 1,
+                pageNum: 30,
+                domesticClearanceList: [],
+            };
+        },
+        methods: {
+
+            //获取列表集合
+            getDomesticClearance() {
+
+                // this.listLoading = true;
+                // //NProgress.start();
+                // getList().then((res) => {
+                //     this.total = res.data.total;
+                //     this.domesticClearanceList = res.data.list;
+                //     this.listLoading = false;
+                //     //NProgress.done();
+                // }).catch((error) => {
+                //
+                //     this.listLoading = false;
+                //     if(null!= error.response && error.response!==undefined){
+                //         let status= error.response.status;
+                //         let msg = error.response.statusText;
+                //         alert(status+msg);
+                //     }else {
+                //         alert(error);
+                //     }
+                //
+                // });
+            }
+        },
+
+    }
+</script>
+
+<style scoped>
+.input-with-select{
+    width: 450px;
+}
+.el-row{
+    margin-left: 10px;
+    width: 98%;
+    background-color: #FFFFFF;
+}
+</style>

+<template>
+    <div class="bg order">
+        <span class="air">空运服务-订舱确认</span>
+        <div class="px">
+<!--            下单信息-->
+            <h4 class="title">下单信息</h4>
+            <div class="r-table">
+                <table  class="tb">
+                    <tbody>
+                    <tr>
+                        <th width="10%">航空公司</th>
+                        <td width="10%">{{defaultQuery.flightno}}</td>
+                        <th width="10%">起运机场</th>
+                        <td width="10%">北京</td>
+                        <th width="10%">目的机场</th>
+                        <td width="10%">法兰克福</td>
+                        <th width="10%">下单重量(KG)</th>
+                        <td width="10%"><el-input v-model="weight" placeholder="" size="mini"></el-input></td>
+                        <th width="10%">运价单价</th>
+                        <td width="10%">CNY 23.50/KG</td>
+                    </tr>
+                    <tr>
+                        <th>报关方式</th>
+                        <td colspan="4">
+                            <el-radio v-model="customsType" label="1">自理报关</el-radio>
+                            <el-radio v-model="customsType" label="2">委托报关</el-radio>
+                        </td>
+<!--                        surchargePrice-->
+                        <th rowspan="4">附加费</th>
+                        <td colspan="3">操作费： CNY 0.00/票</td>
+                        <td><el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="">
+                        </el-input-number></td>
+                    </tr>
+                    <tr>
+                        <th rowspan="3">门到门服务</th>
+                        <td colspan="4"><el-checkbox v-model="homeDelivery">上门提货</el-checkbox></td>
+                        <td colspan="3">制单费： CNY 50.00/票</td>
+                        <td><el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="">
+                        </el-input-number></td>
+                    </tr>
+                    <tr>
+                        <td colspan="4" rowspan="2"><el-checkbox v-model="sendToHome">清关派送</el-checkbox></td>
+                        <td colspan="3">订舱预录费： CNY 30.00 /票</td>
+                        <td><el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="">
+                        </el-input-number></td>
+                    </tr>
+                    <tr>
+                        <td colspan="4">地面操作费： CNY 0/KG</td>
+                    </tr>
+                    <tr>
+                        <th>预估费用</th>
+                        <td colspan="3">运费：CNY 23500.00 (最低100.00KG 起运)</td>
+                        <td colspan="3">附加费：CNY 230.00</td>
+                        <td colspan="3">	共计：CNY 23730.00</td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+<!--            货物信息-->
+            <h4 class="title">货物信息</h4>
+            <div class="r-table">
+                <table class="tb" width="100%">
+                    <tbody>
+                    <tr>
+                        <th width="35%">*是否有电池、液体、粉末、磁性及其它违禁物品</th>
+                        <td width="15%">
+                            <el-radio v-model="radio1" label="1">是</el-radio>
+                            <el-radio v-model="radio1" label="2">否</el-radio></td>
+                        <th width="35%">*是否购买保险</th>
+                        <td width="15%">
+                            <el-radio v-model="radio4" label="1">是</el-radio>
+                            <el-radio v-model="radio4" label="2">否</el-radio></td>
+                    </tr>
+                    <tr>
+                        <th width="35%">*是否超长托盘</th>
+                        <td width="15%">
+                            <el-radio v-model="radio1" label="1">是</el-radio>
+                            <el-radio v-model="radio1" label="2">否</el-radio></td>
+                        <th width="35%">*是否名牌</th>
+                        <td width="15%">
+                            <el-radio v-model="radio4" label="1">是</el-radio>
+                            <el-radio v-model="radio4" label="2">否</el-radio></td>
+                    </tr>
+                    </tbody>
+                </table>
+                <table class="tb" style="margin-top: 10px;width: 100%">
+                    <tbody>
+                    <tr>
+                        <th width="20%">中文品名</th>
+                        <th width="20%">英文品名</th>
+                        <th width="10%">*数量(件)</th>
+                        <th width="10%">*实重（KG）</th>
+                        <th width="10%">*总体积（CBM）</th>
+                        <th width="20%">最大尺寸(长x宽x高)</th>
+                        <th width="10%">操作</th>
+                    </tr>
+                    <tr>
+                        <td><el-input v-model="nameCn" placeholder="" size="mini"></el-input></td>
+                        <td><el-input v-model="name" placeholder="" size="mini"></el-input></td>
+                        <td><el-input v-model="billCount" placeholder="" size="mini"></el-input></td>
+                        <td><el-input v-model="weight" placeholder="" size="mini"></el-input></td>
+                        <td><el-input v-model="input" placeholder="" size="mini"></el-input></td>
+                        <td><el-input v-model="input" placeholder="" size="mini"></el-input></td>
+                        <td><el-button  icon="el-icon-plus" size="mini" circle></el-button>
+                            <el-button  icon="el-icon-minus" size="mini" circle></el-button></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+<!--            收发件通知人信息-->
+            <div class="r-table" style="margin-top: 35px">
+                <el-collapse v-model="activeNames" @change="handleChange" class="col">
+                    <el-collapse-item title="发件人信息" name="1">
+                        <table class="tb" width="100%">
+                            <tbody>
+                            <tr>
+                                <th width="15%">姓名</th>
+                                <td width="35%"><el-input v-model="name" placeholder="" ></el-input></td>
+                                <th width="15%">联系电话</th>
+                                <td width="35%"><el-input v-model="tel" placeholder="" ></el-input></td>
+                            </tr>
+                            <tr>
+                                <th colspan="1">公司</th>
+                                <td colspan="3"><el-input v-model="company" placeholder="" ></el-input></td>
+                            </tr>
+                            <tr>
+                                <th colspan="1">详细地址	</th>
+                                <td colspan="3"><el-input v-model="address" placeholder="" ></el-input></td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </el-collapse-item>
+                    <el-collapse-item title="收件人信息" name="2" class="father">
+                        <div class="relative">
+                            <el-button type="text" @click="dialogTableVisible  = true">收件地址库</el-button>
+                            <el-checkbox v-model="checked1" style="margin-left: 20px">加入地址库</el-checkbox>
+                        </div>
+                        <table class="tb" width="100%">
+                            <tbody>
+                            <tr>
+                                <th width="15%">姓名</th>
+                                <td width="35"><el-input v-model="name" placeholder="" ></el-input></td>
+                                <th width="15%">联系电话</th>
+                                <td width="35%"><el-input v-model="tel" placeholder="" ></el-input></td>
+                            </tr>
+                            <tr>
+                                <th colspan="1">公司</th>
+                                <td colspan="3"><el-input v-model="company" placeholder="" ></el-input></td>
+                            </tr>
+                            <tr>
+                                <th colspan="1">详细地址</th>
+                                <td colspan="3"><el-input v-model="address" placeholder="" ></el-input></td>
+                            </tr>
+                            <tr>
+                                <th colspan="1">特殊信息</th>
+                                <td colspan="3"><el-input v-model="input" placeholder="" ></el-input></td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </el-collapse-item>
+                    <el-collapse-item title="通知人信息" name="3" class="father">
+                        <div class="relative"><el-checkbox v-model="checked">同收件人</el-checkbox></div>
+                        <table class="tb" width="100%">
+                            <tbody>
+                            <tr>
+                                <th width="15%">姓名</th>
+                                <td width="35%"><el-input v-model="name" placeholder="" ></el-input></td>
+                                <th width="15%">联系电话</th>
+                                <td width="35%"><el-input v-model="tel" placeholder="" ></el-input></td>
+                            </tr>
+                            <tr>
+                                <th colspan="1">公司</th>
+                                <td colspan="3"><el-input v-model="company" placeholder="" ></el-input></td>
+                            </tr>
+                            <tr>
+                                <th colspan="1">详细地址</th>
+                                <td colspan="3"><el-input v-model="address" placeholder="" ></el-input></td>
+                            </tr>
+                            <tr>
+                                <th colspan="1">特殊信息</th>
+                                <td colspan="3"><el-input v-model="input" placeholder="" ></el-input></td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </el-collapse-item>
+                </el-collapse>
+            </div>
+            <div style="text-align: center;margin-top: 30px">
+                <el-button type="danger"  style="width: 180px;height: 50px">确认下单</el-button>
+            </div>
+            <div style="margin-top: 50px;height: 80px"> </div>
+        </div>
+<!--        收件地址库弹框-->
+        <div>
+            <el-dialog title="请选择收件人" :visible.sync="dialogTableVisible">
+                <el-table :data="gridData">
+                    <el-table-column property="date" label="姓名" width="150"></el-table-column>
+                    <el-table-column property="name" label="电话" width="200"></el-table-column>
+                    <el-table-column property="address" label="地址"></el-table-column>
+                </el-table>
+                <div style="margin-top: 10px;text-align: right">
+                    <el-button>取消</el-button>
+                    <el-button type="primary">请选择收件人</el-button>
+                </div>
+            </el-dialog>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        data() {
+            return{
+                num: 1,
+                radio: '',
+                radio1: '',
+                radio2: '',
+                radio3: '',
+                radio4: '',
+                dialogTableVisible:false,
+
+            }
+        }
+    }
+</script>
+
+<style scoped>
+    .bg{
+        background-color: #F2F2F2;
+    }
+    .air{
+        font-size: 20px;
+        color: #308aee;
+        margin-top: 20px;
+        display: block;
+    }
+    .r-table{
+        text-align: center;
+    }
+
+    /*line-height: 100px;*/
+    .tb{
+        font-size: 14px;
+        box-sizing: border-box;
+        display: table;
+        border-spacing: 0;
+        border-collapse: collapse;
+    }
+    .px{
+        background-color: #FFFFFF;
+        width: 100%;
+        height: 500px;
+    }
+    .title{
+        color: #127ef2;
+        font-size: 16px;
+        font-weight: bold;
+        margin: 20px 30px;
+        text-align: left;
+    }
+    .r-table .tb > tbody > tr > th {
+        background-color: #d8ecff;
+        padding: 10px 5px;
+        text-align: center;
+        border: 1px solid #ddd;
+    }
+    .r-table .tb > tbody > tr > td {
+        padding: 8px;
+        border: 1px solid #ddd;
+        display: table-cell;
+    }
+    .col .tb > tbody > tr > th {
+        border: 0px;
+    }
+    .col .tb > tbody > tr > td {
+        border: 0px;
+    }
+    .father{
+        position: relative;
+    }
+    .relative{
+        position: absolute;
+        top:11px;
+        right: 100px;
+    }
+</style>
+<style>
+    .order .el-collapse-item__header{
+        color: #127ef2;
+        font-size: 16px;
+        font-weight: bold;
+        margin: 20px 30px;
+        text-align: left;
+    }
+</style>

@@ -84,7 +84,7 @@
                     <span>{{scope.row.weight}}</span>
                     <span>{{scope.row.weight}}</span>
                 </template>
                 </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="货物描述" width="120" align="center">
+            <el-table-column label="货物描述" width="120" style="height: 20px" align="center">
                 <template slot-scope="scope">
                 <template slot-scope="scope">
                     <span>{{scope.row.goodsname}}</span>
                     <span>{{scope.row.goodsname}}</span>
                 </template>
                 </template>
@@ -565,9 +565,9 @@
                 this.listLoading = true
                 this.listLoading = true
                 if (this.arriveQuery.awba !== undefined) {
                 if (this.arriveQuery.awba !== undefined) {
                     getMt3201ListForParam(this.arriveQuery).then(res => {
                     getMt3201ListForParam(this.arriveQuery).then(res => {
-                        this.arriveData = res.data.dataList
-                        this.total = res.data.count
-                        if (res.data.dataList.length > 0){
+                        this.arriveData = res.data.data.list
+                        this.total = res.data.data.total
+                        if (res.data.data.list.length > 0){
                             this.arriveQuery.carrier = this.arriveData[0].carrier
                             this.arriveQuery.carrier = this.arriveData[0].carrier
                             this.arriveQuery.flightno = this.arriveData[0].flightno
                             this.arriveQuery.flightno = this.arriveData[0].flightno
                             this.arriveQuery.flightdate = this.arriveData[0].flightdate
                             this.arriveQuery.flightdate = this.arriveData[0].flightdate
@@ -581,8 +581,8 @@
                     })
                     })
                 } else {
                 } else {
                     getMt3201ListForParam(this.arriveQuery).then(res => {
                     getMt3201ListForParam(this.arriveQuery).then(res => {
-                        this.arriveData = res.data.dataList
-                        this.total = res.data.count
+                        this.arriveData = res.data.data.list
+                        this.total = res.data.data.total
                         setTimeout(() => {
                         setTimeout(() => {
                             this.listLoading = false
                             this.listLoading = false
                         }, 1.5 * 1000)
                         }, 1.5 * 1000)

@@ -9,16 +9,16 @@
                             class="filter-item" value-format="yyyy-MM-dd"></el-date-picker>
                             class="filter-item" value-format="yyyy-MM-dd"></el-date-picker>
             <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleSearch">查询</el-button>
             <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleSearch">查询</el-button>
         </div>
         </div>
-        <el-table :data="flightData" stripe style="font-size: 14px" border>
+        <el-table :data="flightData" v-loading="listLoading" stripe style="font-size: 14px" border>
             <el-table-column label="航班号" width="180px" align="center">
             <el-table-column label="航班号" width="180px" align="center">
                 <template slot-scope="scope">
                 <template slot-scope="scope">
-                    <span>{{ scope.row.carrier }}{{ scope.row.flightNo }}</span>
+                    <span>{{ scope.row.carrier }}{{ scope.row.flightno }}</span>
                 </template>
                 </template>
             </el-table-column>
             </el-table-column>
             <el-table-column label="航班日期" width="190px" align="center">
             <el-table-column label="航班日期" width="190px" align="center">
                 <template slot-scope="scope">
                 <template slot-scope="scope">
                     <i class="el-icon-time"></i>
                     <i class="el-icon-time"></i>
-                    <span>{{ scope.row.flightDate }}</span>
+                    <span>{{ scope.row.flightdate }}</span>
                 </template>
                 </template>
             </el-table-column>
             </el-table-column>
             <el-table-column label="始发站" width="160px" align="center">
             <el-table-column label="始发站" width="160px" align="center">
@@ -55,6 +55,7 @@
         inject: ['reload'],
         inject: ['reload'],
         data() {
         data() {
             return {
             return {
+                listLoading: false,
                 total: 1,
                 total: 1,
                 listQuery: {
                 listQuery: {
                     pageSize: 1,
                     pageSize: 1,
@@ -74,9 +75,11 @@
                 this.listQuery.flightDate = new Date();
                 this.listQuery.flightDate = new Date();
             },
             },
             getList() {
             getList() {
+                this.listLoading = true;
                 getFlightListForParam(this.listQuery).then(res => {
                 getFlightListForParam(this.listQuery).then(res => {
-                    this.flightData = res.data.dataList
-                    this.total = res.data.count
+                    this.flightData = res.data.data.list
+                    this.total = res.data.data.total
+                    this.listLoading = false;
                 })
                 })
             },
             },
             handleSearch() {
             handleSearch() {
@@ -84,26 +87,26 @@
             },
             },
             handleLoading(row) {
             handleLoading(row) {
                 row.messageType = 'MT4201'
                 row.messageType = 'MT4201'
-                row.flightdate = row.flightDate
-                row.flightno = row.flightNo
+                row.flightdate = row.flightdate
+                row.flightno = row.flightno
                 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
                 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
             },
             },
             handleTidy(row) {
             handleTidy(row) {
                 row.messageType = 'MT5202'
                 row.messageType = 'MT5202'
-                row.flightdate = row.flightDate
-                row.flightno = row.flightNo
+                row.flightdate = row.flightdate
+                row.flightno = row.flightno
                 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
                 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
             },
             },
             handleArrive(row) {
             handleArrive(row) {
                 row.messageType = 'MT3201'
                 row.messageType = 'MT3201'
-                row.flightdate = row.flightDate
-                row.flightno = row.flightNo
+                row.flightdate = row.flightdate
+                row.flightno = row.flightno
                 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
                 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
             },
             },
             handlePre(row) {
             handlePre(row) {
                 row.messageType = 'MT2201'
                 row.messageType = 'MT2201'
-                row.flightdate = row.flightDate
-                row.flightno = row.flightNo
+                row.flightdate = row.flightdate
+                row.flightno = row.flightno
                 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
                 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
             }
             }
         },
         },

@@ -117,7 +117,7 @@
                 this.flight.originstation = this.$route.params.scopeRow.originstation
                 this.flight.originstation = this.$route.params.scopeRow.originstation
                 this.flight.destinationstation = this.$route.params.scopeRow.destinationstation
                 this.flight.destinationstation = this.$route.params.scopeRow.destinationstation
                 this.flight.messageType = this.$route.params.scopeRow.messageType
                 this.flight.messageType = this.$route.params.scopeRow.messageType
-                if (this.$route.params.scopeRow.awba !== undefined) {
+                if (this.$route.params.scopeRow.awba !== undefined && this.$route.params.scopeRow.awba != null) {
                     this.flight.awba = this.$route.params.scopeRow.awba.replace('-', '')
                     this.flight.awba = this.$route.params.scopeRow.awba.replace('-', '')
                 }
                 }
             }
             }

@@ -126,7 +126,7 @@
                         </el-button>
                         </el-button>
 
 
                         <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)"
                         <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)"
-                                   :disabled="scope.row.status ==='24'">发删除报
+                                   :disabled="scope.row.status ==='24'">发送删除报
                         </el-button>
                         </el-button>
 
 
                     </template>
                     </template>
@@ -244,8 +244,7 @@
                                 <el-select v-model="loadingModel.customcode"  placeholder="请选择关区代码"
                                 <el-select v-model="loadingModel.customcode"  placeholder="请选择关区代码"
                                            filterable clearable remote :remote-method="remoteMethodCustomCode" :loading="customLoading"
                                            filterable clearable remote :remote-method="remoteMethodCustomCode" :loading="customLoading"
                                            allow-create
                                            allow-create
-                                           default-first-option
-                                >
+                                           default-first-option>
                                     <el-option v-for="item in customCodeList" :key="item.customcode" :label="item.customcode"
                                     <el-option v-for="item in customCodeList" :key="item.customcode" :label="item.customcode"
                                                :value="item.customcode">
                                                :value="item.customcode">
                                         <span style="float: left">{{ item.customcode }}</span>
                                         <span style="float: left">{{ item.customcode }}</span>
@@ -317,7 +316,10 @@
                     </el-table-column>
                     </el-table-column>
                 </el-table>
                 </el-table>
             </el-dialog>
             </el-dialog>
-            <el-dialog title="删除原因" :visible.sync="dialogDeleteVisible" width="30%">
+            <el-dialog title="删除原因" :visible.sync="dialogDeleteVisible" width="50%">
+                <div style="">
+                    <el-button type="success" @click="historyList()">选择历史消息</el-button>
+                </div>
                 <el-form ref="loadingDeleteForm" :model="respModel" :rules="loadingDeleteRules"
                 <el-form ref="loadingDeleteForm" :model="respModel" :rules="loadingDeleteRules"
                          label-width="120px" style="margin-right: 50px">
                          label-width="120px" style="margin-right: 50px">
                     <el-form-item label="删除原因" prop="reason">
                     <el-form-item label="删除原因" prop="reason">
@@ -338,6 +340,23 @@
                     <el-button type="primary" @click="sendLoadingDelete()">发送</el-button>
                     <el-button type="primary" @click="sendLoadingDelete()">发送</el-button>
                 </div>
                 </div>
             </el-dialog>
             </el-dialog>
+            <el-dialog title="历史信息" :visible.sync="historyDialog" width="50%">
+                <el-table v-loading="listLoading" :data="historyData" stripe style="font-size: 12px"
+                          border >
+
+                        <el-table-column prop="operperson" label="删除原因" />
+                        <el-table-column prop="operreason" label="删除操作人" />
+                        <el-table-column prop="opertel" label="操作人Tel"/>
+                    <el-table-column label="操作">
+                    <template slot-scope="scope">
+                        <el-button type="success" @click="historyEcho(scope.row)">选择</el-button>
+                    </template>
+                    </el-table-column>
+                </el-table>
+                <pagination background layout="total, prev, pager, next" v-show="historyTotal>0" :total="historyTotal" :page.sync="historyQuery.pageSize" :limit.sync="historyQuery.limitSize"
+                            @pagination="historyList()"/>
+            </el-dialog>
+
         </div>
         </div>
     </div>
     </div>
 </template>
 </template>
@@ -348,6 +367,7 @@
         getMt4201ListForParam, deleteByIsDelete, updateStatus,
         getMt4201ListForParam, deleteByIsDelete, updateStatus,
         updateMT4201, addMt4201, sendCreateMt4201, sendDeleteMt4201, test
         updateMT4201, addMt4201, sendCreateMt4201, sendDeleteMt4201, test
     } from '@/api/exitLoading'
     } from '@/api/exitLoading'
+    import {getHistoryList} from '@/api/history/history';
     import {Message} from "element-ui"
     import {Message} from "element-ui"
     import {
     import {
         validAwb,
         validAwb,
@@ -401,6 +421,7 @@
             }
             }
             return {
             return {
                 total: 0,
                 total: 0,
+                historyTotal: 0,
                 isAdmin: false,
                 isAdmin: false,
                 dialogMap: {
                 dialogMap: {
                     update: '编辑出港装载',
                     update: '编辑出港装载',
@@ -408,10 +429,12 @@
                 },
                 },
                 customCodeList: [],
                 customCodeList: [],
                 airportCode:[],
                 airportCode:[],
+                historyData: [],
                 dialogStatus: undefined,
                 dialogStatus: undefined,
                 dialogTableVisible: false,
                 dialogTableVisible: false,
                 dialogFormVisible: false,
                 dialogFormVisible: false,
                 dialogDeleteVisible: false,
                 dialogDeleteVisible: false,
+                historyDialog: false,
                 customLoading: false,
                 customLoading: false,
                 listLoading: false,
                 listLoading: false,
                 loadingQuery: {
                 loadingQuery: {
@@ -426,6 +449,10 @@
                     customcode: undefined,
                     customcode: undefined,
                     messageType: undefined
                     messageType: undefined
                 },
                 },
+                historyQuery: {
+                    pageSize: 1,
+                    limitSize: 5,
+                },
                 loadingRoles: {
                 loadingRoles: {
                     awba: [{required: true, trigger: 'blur', validator: validatorAwb}],
                     awba: [{required: true, trigger: 'blur', validator: validatorAwb}],
                     awbh: [{required: true, trigger: 'blur', validator: validatorAwbh}],
                     awbh: [{required: true, trigger: 'blur', validator: validatorAwbh}],
@@ -556,9 +583,9 @@
                 this.listLoading = true
                 this.listLoading = true
                 if (this.loadingQuery.awba !== undefined && this.loadingQuery.awba !== '') {
                 if (this.loadingQuery.awba !== undefined && this.loadingQuery.awba !== '') {
                     getMt4201ListForParam(this.loadingQuery).then(res => {
                     getMt4201ListForParam(this.loadingQuery).then(res => {
-                        this.loadingData = res.data.dataList
-                        this.total = res.data.count
-                        if (res.data.count > 0) {
+                        this.loadingData = res.data.data.list
+                        this.total = res.data.data.total
+                        if (res.data.data.total > 0) {
                             this.loadingQuery.carrier = this.loadingData[0].carrier
                             this.loadingQuery.carrier = this.loadingData[0].carrier
                             this.loadingQuery.flightno = this.loadingData[0].flightno
                             this.loadingQuery.flightno = this.loadingData[0].flightno
                             this.loadingQuery.flightdate = this.loadingData[0].flightdate
                             this.loadingQuery.flightdate = this.loadingData[0].flightdate
@@ -572,8 +599,8 @@
                     })
                     })
                 } else {
                 } else {
                     getMt4201ListForParam(this.loadingQuery).then(res => {
                     getMt4201ListForParam(this.loadingQuery).then(res => {
-                        this.loadingData = res.data.dataList
-                        this.total = res.data.count
+                        this.loadingData = res.data.data.list
+                        this.total = res.data.data.total
                         setTimeout(() => {
                         setTimeout(() => {
                             this.listLoading = false
                             this.listLoading = false
                         }, 1.5 * 1000)
                         }, 1.5 * 1000)
@@ -667,6 +694,27 @@
                 })
                 })
             },
             },
 
 
+            // 查询删除报历史消息
+            historyList(){
+                this.historyDialog = true;
+                this.listLoading = true;
+                getHistoryList(this.historyQuery).then(res => {
+                    this.historyData = res.data.data.list
+                    this.historyTotal = res.data.data.total
+                    if (res.data.data.total > 0) {
+                    }
+                    setTimeout(() => {
+                        this.listLoading = false
+                    }, 1.5 * 1000)
+                })
+            },
+            // 回显删除报历史消息
+            historyEcho(val){
+                this.respModel.reason = val.operperson;
+                this.respModel.contactName = val.operreason;
+                this.respModel.contactTel = val.opertel;
+                this.historyDialog = false;
+            },
             // 发送删除报
             // 发送删除报
             handleSendDelete(row) {
             handleSendDelete(row) {
                 this.respModel = {
                 this.respModel = {

@@ -41,9 +41,10 @@
                 </el-col>
                 </el-col>
             </el-row>
             </el-row>
         </div>
         </div>
-        <tree-table v-loading="listLoading" :data="manifestData" :eval-func="func" :expand-all="true"
+        <el-table v-loading="listLoading" :data="manifestData" :eval-func="func" :expand-all="true"
                     style="font-size: 13px" border @selection-change="handleSelectionChange"
                     style="font-size: 13px" border @selection-change="handleSelectionChange"
                     :row-class-name="tableRowClassName">
                     :row-class-name="tableRowClassName">
+            <el-table-column type="selection" width="60"></el-table-column>
             <el-table-column label="航班号" width="80px" align="center">
             <el-table-column label="航班号" width="80px" align="center">
                 <template slot-scope="scope">
                 <template slot-scope="scope">
                     <span>{{ scope.row.carrier }}{{ scope.row.flightno }}</span>
                     <span>{{ scope.row.carrier }}{{ scope.row.flightno }}</span>
@@ -127,10 +128,10 @@
                     <a style="color: #1d8ce0; margin-right: 5px" v-if="scope.row.messageType==='MT3201'" @click="handleUpdate(scope.row)">出港运抵</a>
                     <a style="color: #1d8ce0; margin-right: 5px" v-if="scope.row.messageType==='MT3201'" @click="handleUpdate(scope.row)">出港运抵</a>
                     <a style="color: #1d8ce0; margin-right: 5px" v-if="scope.row.messageType==='MT4201'" @click="handleUpdate(scope.row)">出港装载</a>
                     <a style="color: #1d8ce0; margin-right: 5px" v-if="scope.row.messageType==='MT4201'" @click="handleUpdate(scope.row)">出港装载</a>
                     <a style="color: #1d8ce0; margin-right: 5px" v-if="scope.row.messageType==='MT5202'" @click="handleUpdate(scope.row)">出港理货</a>
                     <a style="color: #1d8ce0; margin-right: 5px" v-if="scope.row.messageType==='MT5202'" @click="handleUpdate(scope.row)">出港理货</a>
-                    <a style="color: #1d8ce0" @click="handleUpdateStatus(scope.row)">更改状态</a>
+<!--                    <a style="color: #1d8ce0" @click="handleUpdateStatus(scope.row)">更改状态</a>-->
                 </template>
                 </template>
             </el-table-column>
             </el-table-column>
-        </tree-table>
+        </el-table>
         <pagination v-show="total>0" :total="total" :page.sync="listQuery.pageSize" :limit.sync="listQuery.limitSize"
         <pagination v-show="total>0" :total="total" :page.sync="listQuery.pageSize" :limit.sync="listQuery.limitSize"
                     @pagination="getList"/>
                     @pagination="getList"/>
     </div>
     </div>
@@ -201,8 +202,8 @@
             getList() {
             getList() {
                 this.listLoading = true
                 this.listLoading = true
                 getManifests(this.listQuery).then(res =>{
                 getManifests(this.listQuery).then(res =>{
-                    this.manifestData = res.data.dataList
-                    this.total = res.data.count
+                    this.manifestData = res.data.data.list
+                    this.total = res.data.data.total
                     setTimeout(() =>{
                     setTimeout(() =>{
                         this.listLoading = false
                         this.listLoading = false
                     },1500)
                     },1500)
@@ -212,6 +213,7 @@
 
 
             },
             },
             handleSearch(){
             handleSearch(){
+                this.listQuery.pageSize =1;
                 this.getList()
                 this.getList()
             },
             },
             handleUpdateStatus(row){
             handleUpdateStatus(row){

@@ -70,13 +70,6 @@
                   :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
                   :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
             <el-table-column type="selection" width="55">
             <el-table-column type="selection" width="55">
             </el-table-column>
             </el-table-column>
-<!--            <el-table-column label="航班信息" width="90" align="center">-->
-<!--                <template slot-scope="scope">-->
-<!--                    <p class="tableInline">{{scope.row.carrier}}{{scope.row.flightno}}</p>-->
-<!--                    <p class="tableInline">{{scope.row.flightdate}}</p>-->
-<!--                    <p class="tableInline">{{scope.row.originstation}}-{{scope.row.destinationstation}}</p>-->
-<!--                </template>-->
-<!--            </el-table-column>-->
             <el-table-column label="运单号" width="200" align="center">
             <el-table-column label="运单号" width="200" align="center">
                 <template slot-scope="scope">
                 <template slot-scope="scope">
                     <span class="tableInline" v-if="scope.row.awbh !==''">{{scope.row.awbh}}</span>
                     <span class="tableInline" v-if="scope.row.awbh !==''">{{scope.row.awbh}}</span>
@@ -384,6 +377,7 @@
                 </el-row>
                 </el-row>
                 <div class="grid-content content" style="font-size: 10px">
                 <div class="grid-content content" style="font-size: 10px">
                     发货人信息
                     发货人信息
+                    <el-button type="success" @click="consignerSelect()">选择发货人信息</el-button>
                 </div>
                 </div>
                 <el-row>
                 <el-row>
                     <el-col :span="3">
                     <el-col :span="3">
@@ -459,6 +453,7 @@
                 </el-row>
                 </el-row>
                 <div class="grid-content content" style="font-size: 10px">
                 <div class="grid-content content" style="font-size: 10px">
                     收货人信息
                     收货人信息
+                    <el-button type="success" @click="consigneeSelect()">选择收货人信息</el-button>
                 </div>
                 </div>
                 <el-row>
                 <el-row>
                     <el-col :span="3">
                     <el-col :span="3">
@@ -638,6 +633,82 @@
             <el-button type="primary" @click="sendDelete()">发送</el-button>
             <el-button type="primary" @click="sendDelete()">发送</el-button>
         </div>
         </div>
     </el-dialog>
     </el-dialog>
+
+        <el-dialog title="发货人信息" :visible.sync="dialogSelectVisible" width="50%">
+            <!--工具条-->
+            <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
+                <el-form :inline="true" :model="consignerQuery">
+                    <el-form-item>
+                        <el-input v-model="consignerQuery.companyName" placeholder="关键字查询"></el-input>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" v-on:click="consignerSelect()">查询</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-col>
+            <el-table v-loading="listLoading" :data="consignerList" stripe style="font-size: 12px"
+                      border >
+                <el-table-column type="selection" width="55">
+                </el-table-column>
+                <el-table-column label="序号" type="index">
+                </el-table-column>
+                <el-table-column prop="companyName" label="发货人公司"  >
+                </el-table-column>
+                <el-table-column prop="conCity" label="发货人城市"  >
+                </el-table-column>
+                <el-table-column prop="country" label="发货人国家代码"  >
+                </el-table-column>
+                <el-table-column prop="conPhone" label="发货人电话"  >
+                </el-table-column>
+                <el-table-column prop="enterprise" label="发货人企业代码"  >
+                </el-table-column>
+                <el-table-column label="操作">
+                    <template slot-scope="scope">
+                        <el-button type="success" @click="consignerClick(scope.row)">选择</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <pagination background layout="total, prev, pager, next" v-show="consignerQuery.total>0" :total="consignerQuery.total" :page.sync="consignerQuery.pageSize" :limit.sync="consignerQuery.limitSize"
+                        @pagination="consignerSelect()"/>
+        </el-dialog>
+        <el-dialog title="收货人信息" :visible.sync="dialogNeeVisible" width="50%">
+            <!--工具条-->
+            <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
+                <el-form :inline="true" :model="consignerQuery">
+                    <el-form-item>
+                        <el-input v-model="consigneeQuery.companyName" placeholder="关键字查询"></el-input>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" v-on:click="consigneeSelect()">查询</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-col>
+            <el-table v-loading="listLoading" :data="consigneeList" stripe style="font-size: 12px"
+                      border >
+                <el-table-column type="selection" width="55">
+                </el-table-column>
+                <el-table-column label="序号" type="index">
+                </el-table-column>
+                <el-table-column prop="companyName" label="收货人公司"  >
+                </el-table-column>
+                <el-table-column prop="conCity" label="收货人城市"  >
+                </el-table-column>
+                <el-table-column prop="country" label="收货人国家代码"  >
+                </el-table-column>
+                <el-table-column prop="conPhone" label="收货人电话"  >
+                </el-table-column>
+                <el-table-column prop="enterprise" label="收货人企业代码"  >
+                </el-table-column>
+                <el-table-column label="操作">
+                    <template slot-scope="scope">
+                        <el-button type="success" @click="consigneeClick(scope.row)">选择</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <pagination background layout="total, prev, pager, next" v-show="consigneeQuery.total>0" :total="consigneeQuery.total" :page.sync="consigneeQuery.pageSize" :limit.sync="consigneeQuery.limitSize"
+                        @pagination="consignerSelect()"/>
+        </el-dialog>
+
     </div>
     </div>
 </template>
 </template>
 <script>
 <script>
@@ -659,6 +730,8 @@
     } from '@/api/exitPre'
     } from '@/api/exitPre'
     import {Message} from "element-ui";
     import {Message} from "element-ui";
     import {getResponseForParam} from '@/api/responseDetail'
     import {getResponseForParam} from '@/api/responseDetail'
+    import { getList} from '../../api/consigner/consigner';
+    import { getList as neeList} from '../../api/consigner/consignee';
     import {
     import {
         validAwb,
         validAwb,
         validAlphabets,
         validAlphabets,
@@ -706,6 +779,22 @@
                 func: treeToArray,
                 func: treeToArray,
                 total: 1,
                 total: 1,
                 isAdmin: false,
                 isAdmin: false,
+                consignerList: [],
+                dialogNeeVisible: false,
+                consigneeList: [],
+                consignerQuery: {
+                    companyName: '',
+                    total: 0,
+                    pageSize: 1,
+                    limitSize: 5,
+                },
+                consigneeQuery: {
+                    companyName: '',
+                    total: 0,
+                    pageSize: 1,
+                    limitSize: 5,
+                },
+                dialogSelectVisible: false,
                 preQuery: {
                 preQuery: {
                     pageSize: 1,
                     pageSize: 1,
                     limitSize: 30,
                     limitSize: 30,
@@ -1103,9 +1192,9 @@
                 this.listLoading = true
                 this.listLoading = true
                 if (this.preQuery.awba !== undefined && this.preQuery.awba !== '') {
                 if (this.preQuery.awba !== undefined && this.preQuery.awba !== '') {
                     getMt2201ListForParam(this.preQuery).then(res => {
                     getMt2201ListForParam(this.preQuery).then(res => {
-                        this.preData = res.data.dataList
-                        this.total = res.data.count
-                        if (res.data.dataList.length > 0) {
+                        this.preData = res.data.data.list
+                        this.total = res.data.data.total
+                        if (res.data.data.list.length > 0) {
                             this.preQuery.carrier = this.preData[0].carrier
                             this.preQuery.carrier = this.preData[0].carrier
                             this.preQuery.flightno = this.preData[0].flightno
                             this.preQuery.flightno = this.preData[0].flightno
                             this.preQuery.flightdate = this.preData[0].flightdate
                             this.preQuery.flightdate = this.preData[0].flightdate
@@ -1119,9 +1208,9 @@
                     })
                     })
                 } else {
                 } else {
                     getMt2201ListForParam(this.preQuery).then(res => {
                     getMt2201ListForParam(this.preQuery).then(res => {
-                        this.preData = res.data.dataList
+                        this.preData = res.data.data.list
 
 
-                        this.total = res.data.count
+                        this.total = res.data.data.total
                         setTimeout(() => {
                         setTimeout(() => {
                             this.listLoading = false
                             this.listLoading = false
                         }, 1500)
                         }, 1500)
@@ -1228,6 +1317,77 @@
             handleSelectionChange() {
             handleSelectionChange() {
 
 
             },
             },
+            // 远程获取发货人信息
+            consignerSelect(){
+                this.dialogSelectVisible = true;
+                this.listLoading = true;
+                let para = {
+                    pageSize: this.consignerQuery.pageSize,
+                    limitSize: this.consignerQuery.limitSize,
+                    companyName: this.consignerQuery.companyName
+                };
+                getList(para).then((res) => {
+                    this.consignerQuery.total = res.data.data.total;
+                    this.consignerList = res.data.data.list;
+                    this.listLoading = false;
+                }).catch((error) => {
+                    this.listLoading = false;
+                    if(null!= error.response && error.response!==undefined){
+                        let status= error.response.status;
+                        let msg = error.response.statusText;
+                        alert(status+msg);
+                    }else {
+                        alert(error);
+                    }
+
+                });
+            },
+            // 远程获取收货人信息
+            consigneeSelect(){
+                this.dialogNeeVisible = true;
+                this.listLoading = true;
+                let para = {
+                    pageSize: this.consigneeQuery.pageSize,
+                    limitSize: this.consigneeQuery.limitSize,
+                    companyName: this.consigneeQuery.companyName
+                };
+                neeList(para).then((res) => {
+                    this.consigneeQuery.total = res.data.data.total;
+                    this.consigneeList = res.data.data.list;
+                    this.listLoading = false;
+                }).catch((error) => {
+                    this.listLoading = false;
+                    if(null!= error.response && error.response!==undefined){
+                        let status= error.response.status;
+                        let msg = error.response.statusText;
+                        alert(status+msg);
+                    }else {
+                        alert(error);
+                    }
+
+                });
+            },
+            // 发货人信息赋值
+            consignerClick(val){
+                this.preModel.awbinfo.shprname=val.conName;
+                this.preModel.awbinfo.shpraddress=val.conAddress;
+                this.preModel.awbinfo.scityid=val.conCity;
+                this.preModel.awbinfo.shprtel=val.conPhone;
+                this.preModel.awbinfo.shpaeocode=val.conAeo;
+                this.preModel.awbinfo.shprcountyr=val.country;
+                this.dialogSelectVisible = false;
+            },
+            // 收货人信息赋值
+            consigneeClick(val){
+                console.log(val);
+                this.preModel.awbinfo.cnsnname=val.conName;
+                this.preModel.awbinfo.cnsnaddress=val.conAddress;
+                this.preModel.awbinfo.ecityid=val.conCity;
+                this.preModel.awbinfo.cnsntel=val.conPhone;
+                this.preModel.awbinfo.cnsaeocode=val.conAeo;
+                this.preModel.awbinfo.cnscountyr=val.country;
+                this.dialogNeeVisible = false;
+            },
             // >>>>>>>>>>>>>>>>搜索<<<<<<<<<<<<<<<<<<
             // >>>>>>>>>>>>>>>>搜索<<<<<<<<<<<<<<<<<<
             handleSerach() {
             handleSerach() {
                 // this.preQuery.flightno = undefined
                 // this.preQuery.flightno = undefined
@@ -1535,6 +1695,7 @@
                     let residuePiece = 0
                     let residuePiece = 0
                     let residueWeight = 0
                     let residueWeight = 0
                     const childrenList = res.data.dataList[0].children
                     const childrenList = res.data.dataList[0].children
+
                     if (childrenList.length < 1) {
                     if (childrenList.length < 1) {
                         this.awbPiece = res.data.dataList[0].piece
                         this.awbPiece = res.data.dataList[0].piece
                         this.awbWeight = res.data.dataList[0].weight
                         this.awbWeight = res.data.dataList[0].weight

@@ -585,9 +585,9 @@
                 //根据是否有主单号 来给查询条件赋值
                 //根据是否有主单号 来给查询条件赋值
                 if (this.tidyQuery.awba !== undefined && this.tidyQuery.awba !== '') {
                 if (this.tidyQuery.awba !== undefined && this.tidyQuery.awba !== '') {
                     getMt520XListForParam(this.tidyQuery).then(res => {
                     getMt520XListForParam(this.tidyQuery).then(res => {
-                        this.tidyData = res.data.dataList
-                        this.total = res.data.count
-                        if (res.data.dataList.length > 0) {
+                        this.tidyData = res.data.data.list;
+                        this.total = res.data.data.total
+                        if (res.data.data.list.length > 0) {
                             this.tidyQuery.carrier = this.tidyData[0].carrier
                             this.tidyQuery.carrier = this.tidyData[0].carrier
                             this.tidyQuery.flightno = this.tidyData[0].flightno
                             this.tidyQuery.flightno = this.tidyData[0].flightno
                             this.tidyQuery.flightdate = this.tidyData[0].flightdate
                             this.tidyQuery.flightdate = this.tidyData[0].flightdate
@@ -601,8 +601,8 @@
                     })
                     })
                 } else {
                 } else {
                     getMt520XListForParam(this.tidyQuery).then(res => {
                     getMt520XListForParam(this.tidyQuery).then(res => {
-                        this.tidyData = res.data.dataList
-                        this.total = res.data.count
+                        this.tidyData = res.data.data.list;
+                        this.total = res.data.data.total;
                         setTimeout(() => {
                         setTimeout(() => {
                             this.listLoading = false
                             this.listLoading = false
                         }, 1500)
                         }, 1500)