Merge remote-tracking branch 'origin/master'

@@ -3855,6 +3855,11 @@
       "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
       "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
       "dev": true
       "dev": true
     },
     },
+    "fecha": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.0.tgz",
+      "integrity": "sha512-aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg=="
+    },
     "figures": {
     "figures": {
       "version": "3.0.0",
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-3.0.0.tgz",
       "resolved": "https://registry.npmjs.org/figures/-/figures-3.0.0.tgz",

@@ -14,6 +14,7 @@
     "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",
+    "fecha": "^4.2.0",
     "file-saver": "^2.0.2",
     "file-saver": "^2.0.2",
     "font-awesome": "^4.7.0",
     "font-awesome": "^4.7.0",
     "html2canvas": "^1.0.0-rc.5",
     "html2canvas": "^1.0.0-rc.5",

+import http from './http.js'
+let baseUrl = 'air-server-transport/transport/route'
+let baseUrlBill = 'air-server-transport/transport/bill'
+let baseUrlFlight = 'air-server-transport/transport/flight'
+let baseUrlFlightPlan = 'air-server-transport/transport/flightplan'
+let baseUrlAircraft = 'air-server-transport/transport/aircraft'
+let baseUrlAirLineAircraft = 'air-server-transport/transport/airlineaircraft'
+let baseUrlPrediction = 'air-server-transport/transport/prediction'
+let baseUrlConfirm = 'air-server-transport/transport/confirm'
+let baseUrlSchedule = 'air-server-transport/transport/schedule'
+let baseUrlLongtimeplan = 'air-server-transport/transport/longtimeplan'
+let baseUrlBillperson = 'air-server-transport/transport/billperson'
+
+
+
+
+
+//航线申报
+//新增方法
+export const addRoute = params => { return http.post(`${baseUrl}/addRoute`,  params); };
+//查询列表
+export const selectRoute=params=>{return http.get(`${baseUrl}/selectRoute`,  params);};
+//删除方法
+export const editRoute=params=>{return http.put(`${baseUrl}/editRoute`,  params);};
+
+
+
+
+//单据申报
+//新增方法
+export const addBill = params => { return http.post(`${baseUrlBill}/addBill`,  params); };
+//查询列表
+export const selectBill=params=>{return http.get(`${baseUrlBill}/selectBill`,  params);};
+//删除方法
+export const editBill=params=>{return http.put(`${baseUrlBill}/editBill`,  params);};
+
+
+//航班申报
+//新增方法
+export const addFlight = params => { return http.post(`${baseUrlFlight}/addFlight`,  params); };
+//查询列表
+export const selectFlight=params=>{return http.get(`${baseUrlFlight}/selectFlight`,  params);};
+//删除方法
+export const editFlight=params=>{return http.put(`${baseUrlFlight}/editFlight`,  params);};
+
+//航班当日计划申报
+//新增方法
+export const addFlightPlan = params => { return http.post(`${baseUrlFlightPlan}/addFlightPlan`,  params); };
+//查询列表
+export const selectFlightPlan=params=>{return http.get(`${baseUrlFlightPlan}/selectFlightPlan`,  params);};
+//删除方法
+export const editFlightPlan=params=>{return http.put(`${baseUrlFlightPlan}/editFlightPlan`,  params);};
+
+//通用航空器申报
+//新增方法
+export const addAircraft = params => { return http.post(`${baseUrlAircraft}/addAircraft`,  params); };
+//查询列表
+export const selectAircraft=params=>{return http.get(`${baseUrlAircraft}/selectAircraft`,  params);};
+//删除方法
+export const editAircraft=params=>{return http.put(`${baseUrlAircraft}/editAircraft`,  params);};
+
+//航线航空器申报
+//新增方法
+export const addAirLineAircraft = params => { return http.post(`${baseUrlAirLineAircraft}/addAirLineAircraft`,  params); };
+//删除方法
+export const editAirLineAircraft=params=>{return http.put(`${baseUrlAirLineAircraft}/editAirLineAircraft`,  params);};
+//查询列表
+export const selectAirLineAircraft=params=>{return http.get(`${baseUrlAirLineAircraft}/selectAirLineAircraft`,  params);};
+
+
+//进港预报申报prediction
+//新增方法
+export const addPrediction = params => { return http.post(`${baseUrlPrediction}/addPrediction`,  params); };
+//删除方法
+export const editPrediction=params=>{return http.put(`${baseUrlPrediction}/editPrediction`,  params);};
+//查询列表
+export const selectPrediction=params=>{return http.get(`${baseUrlPrediction}/selectPrediction`,  params);};
+
+
+//进港确报申报confirm
+//新增方法
+export const addConfirm = params => { return http.post(`${baseUrlConfirm}/addConfirm`,  params); };
+//删除方法
+export const editConfirm=params=>{return http.put(`${baseUrlConfirm}/editConfirm`,  params);};
+//查询列表
+export const selectConfirm=params=>{return http.get(`${baseUrlConfirm}/selectConfirm`,  params);};
+
+
+//进港航班配置
+//新增方法
+export const addSchedule = params => { return http.post(`${baseUrlSchedule}/addSchedule`,  params); };
+//删除方法
+export const editSchedule=params=>{return http.put(`${baseUrlSchedule}/editSchedule`,  params);};
+//查询列表
+export const selectSchedule=params=>{return http.get(`${baseUrlSchedule}/selectSchedule`,  params);};
+
+//查询长期计划查询列表
+export const selectLongTimePlan=params=>{return http.get(`${baseUrlLongtimeplan}/selectLongTimePlan`,  params);};
+
+//机组人员
+//新增方法
+export const addBillPerson = params => { return http.post(`${baseUrlBillperson}/addBillPerson`,  params); };
+//删除方法
+export const editBillPerson=params=>{return http.put(`${baseUrlBillperson}/editBillPerson`,  params);};
+//查询列表
+export const selectBillPerson=params=>{return http.get(`${baseUrlBillperson}/selectBillPerson`,  params);};

@@ -216,7 +216,7 @@ let routes = [
     {
     {
         path: '/input',
         path: '/input',
         component: Home,
         component: Home,
-        name: '进港业务申报',
+        name: '进港航班申报',
         iconCls:'el-icon-goods',
         iconCls:'el-icon-goods',
         children:[
         children:[
             {path:'/arrival',component:arrival,name:'进港预报申报'},
             {path:'/arrival',component:arrival,name:'进港预报申报'},
@@ -230,7 +230,7 @@ let routes = [
     {
     {
         path: '/out',
         path: '/out',
         component: Home,
         component: Home,
-        name: '出港业务申报',
+        name: '出港航班申报',
         iconCls:'el-icon-goods',
         iconCls:'el-icon-goods',
         children:[
         children:[
             {path:'/departure',component:departure,name:'出港预报申报'},
             {path:'/departure',component:departure,name:'出港预报申报'},

@@ -14,12 +14,12 @@
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
-                        <el-form-item label="航空公司英文名称" prop="airwayNameEn" label-width="130px">
+                        <el-form-item label="航空公司英文名称" prop="airwayNameEn" label-width="140px">
                             <el-input v-model="aircraft.airwayNameEn" placeholder="请输入"></el-input>
                             <el-input v-model="aircraft.airwayNameEn" placeholder="请输入"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
-                        <el-form-item label="航空公司中文名称" prop="airwayNameCn" label-width="130px">
+                        <el-form-item label="航空公司中文名称" prop="airwayNameCn" label-width="140px">
                             <el-input v-model="aircraft.airwayNameCn" placeholder="请输入"></el-input>
                             <el-input v-model="aircraft.airwayNameCn" placeholder="请输入"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
@@ -52,12 +52,12 @@
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="最大起飞重量" prop="grossWeight" label-width="130px">
                         <el-form-item label="最大起飞重量" prop="grossWeight" label-width="130px">
-                            <el-input v-model="aircraft.grossWeight" placeholder="请输入重量（单位：KG）"></el-input>
+                            <el-input v-model="aircraft.grossWeight" placeholder="请输入重量（单位：KG）"  oninput="value=value.replace(/[^\d]/g,'')"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="标客舱载客人数" prop="passengerLimit" label-width="130px">
                         <el-form-item label="标客舱载客人数" prop="passengerLimit" label-width="130px">
-                            <el-input v-model="aircraft.passengerLimit" placeholder="请输入数量（单位：人）"></el-input>
+                            <el-input v-model="aircraft.passengerLimit" placeholder="请输入数量（单位：人）"  oninput="value=value.replace(/[^\d]/g,'')"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
@@ -66,7 +66,7 @@
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
-                        <el-form-item label="航空器所有人代码" prop="ownerCo" label-width="130px">
+                        <el-form-item label="航空器所有人代码" prop="ownerCo" label-width="140px">
                             <el-input v-model="aircraft.ownerCo" placeholder="请输入数量（单位：人）"></el-input>
                             <el-input v-model="aircraft.ownerCo" placeholder="请输入数量（单位：人）"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
@@ -80,6 +80,8 @@
                             <el-date-picker
                             <el-date-picker
                                     v-model="aircraft.deliverDate"
                                     v-model="aircraft.deliverDate"
                                     type="date"
                                     type="date"
+                                    value-format="yyyyMMdd"
+                                    format="yyyyMMdd"
                                     style="width:100%"
                                     style="width:100%"
                                     placeholder="选择日期">
                                     placeholder="选择日期">
                             </el-date-picker>
                             </el-date-picker>
@@ -96,6 +98,20 @@
                 <el-col :span="24">   <el-button type="primary" @click="submitForm('aircraft')">保 存</el-button>
                 <el-col :span="24">   <el-button type="primary" @click="submitForm('aircraft')">保 存</el-button>
                     <el-button type="success">保存并发送</el-button></el-col>
                     <el-button type="success">保存并发送</el-button></el-col>
             </el-row>
             </el-row>
+            <!--对话提示框-->
+            <el-row>
+                <el-dialog
+                        title="系统提示"
+                        :visible.sync="centerDialogVisible"
+                        width="30%"
+                        center>
+                    <span>{{msg}}</span>
+                    <span slot="footer" class="dialog-footer">
+                          <el-button @click="centerDialogVisible = false">取 消</el-button>
+                        <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+                      </span>
+                </el-dialog>
+            </el-row>
         </el-main>
         </el-main>
     </el-container>
     </el-container>
 </template>
 </template>
@@ -118,6 +134,8 @@
     .el-col{margin-right: 0px;}
     .el-col{margin-right: 0px;}
 </style>
 </style>
 <script>
 <script>
+    const fecha = require('fecha');
+    import {addAircraft} from "../../api/transport";
     export default {
     export default {
         data(){
         data(){
             return{
             return{
@@ -148,10 +166,86 @@
                     messageid:undefined
                     messageid:undefined
                 },
                 },
                 rules:{
                 rules:{
-
-                }
+                    airwayCode: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    airwayNameEn: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    airwayNameCn: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    areoNationality: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    aircraftNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    credentialType: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    credentialNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    areoModel: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    grossWeight: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    passengerLimit: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    useRelation: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    ownerCo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    certNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    deliverDate: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                },
+                centerDialogVisible:false,
             }
             }
         },
         },
-        methods(){}
+        methods:{
+            //新增当日飞行计划（保存按钮）
+            submitForm(formName) {
+                this.$refs[formName].validate((valid) => {
+                    if (valid) {
+                        addAircraft(this.aircraft).then(res=>{
+                            let response=res.data;
+                            if(response.code=='200'){
+                                this.centerDialogVisible=true;
+                                this.msg=response.msg;
+                                this.$router.push({path:'/queryAircraft',query:{airwayCode:JSON.stringify(this.aircraft.airwayCode)}});
+                            }else{
+                                this.msg=response.msg;
+                            }
+                        });
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                });
+            },
+            //加载默认值
+            defaultData(){
+                if(this.$route.query!=null){
+                    let ob=Object.assign(this.aircraft, this.$route.query);
+                    /*有时分秒时用fecha
+                    this.flight.flightDate=ob.flightDate;
+                    this.flight.currentLandingTime=fecha.parse(ob.currentLandingTime,'yyyyMMddHHmm');
+                    this.flight.currentTakeoffTime=fecha.parse(ob.currentTakeoffTime,'yyyyMMddHHmm');*/
+                }
+            },
+        },
+        mounted(){
+            this.defaultData();
+        }
     }
     }
 </script>
 </script>

+<template>
+    <el-container>
+        <el-main>
+            <el-row class="row-bg">
+                <el-col :span="24">
+                    <div class="grid-content content">进港预报申报</div>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-form :model="arrival" :rules="rules" ref="arrival" label-width="100%" class="demo-ruleForm">
+                    <el-col :span="8">
+                        <el-form-item label="航空器注册编码" prop="aircraftNo" label-width="120px">
+                            <el-input v-model="arrival.aircraftNo"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="航班号" prop="flightNo" label-width="120px">
+                            <el-input v-model="arrival.flightNo"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="航班日期" prop="flightDate" label-width="120px">
+                            <el-date-picker
+                                    v-model="arrival.flightDate"
+                                    type="date"
+                                    style="width:275px"
+                                    placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="出发港" prop="departurePort" label-width="120px">
+                            <el-input v-model="arrival.departurePort"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="目的港" prop="arrivalPort" label-width="120px">
+                            <el-input v-model="arrival.arrivalPort"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px">
+                            <el-input v-model="arrival.customDistrictNo"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px">
+                            <el-input v-model="arrival.departuredatetime"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="停靠机坪" prop="stayid" label-width="120px">
+                            <el-input v-model="arrival.stayid"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="完成装卸时间" prop="dischargecompleteddatetime" label-width="120px">
+                            <el-input v-model="arrival.dischargecompleteddatetime"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="预计抵港时间" prop="arrivaldatetime" label-width="140px">
+                            <el-input v-model="arrival.arrivaldatetime"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="备注" prop="meno" label-width="120px">
+                            <el-input v-model="arrival.meno"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <el-row style="margin-left: 120px">
+                <el-col :span="24">   <el-button type="primary" @click="submitForm('arrival')">保 存</el-button>
+                    <el-button type="success">保存并发送</el-button></el-col>
+            </el-row>
+        </el-main>
+    </el-container>
+</template>
+<style scoped>
+    .grid-content {
+        height: 36px;
+        line-height: 36px;
+    }
+    .el-dialog__body{text-align: center}
+    .content {
+        border-left: 4px #409EFF solid;
+        padding-left: 10px;
+        background-color: #f9fafc;
+        margin-bottom: 2px
+    }
+
+    .row-bg{
+        background-color: white;
+    }
+    .el-col{margin-right: 0px;}
+</style>
+<script>
+    export default {
+        data(){
+            return{
+                arrival:{
+                    aircraftNo:undefined,
+                    flightNo:undefined,
+                    flightDate:undefined,
+                    departurePort:undefined,
+                    arrivalPort:undefined,
+                    customDistrictNo:undefined,
+                    departuredatetime:undefined,
+                    stayid:undefined,
+                    dischargecompleteddatetime:undefined,
+                    arrivaldatetime:undefined,
+                    meno:undefined,
+                    accessFlag:'0'
+                },
+                rules: {
+                    aircraftNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    flightNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    flightDate: [
+                        {type: 'date',required: true, message: '请选择', trigger: 'change'}
+                    ],
+                    departurePort: [
+                        {required: true, message: '请输入(三字码)', trigger: 'blur'},
+                        {min: 3, max: 3, message: '长度在 3 个字符', trigger: 'blur'}
+                    ],
+                    arrivalPort: [
+                        {required: true, message: '请输入(三字码)', trigger: 'blur'},
+                        {min: 3, max: 3, message: '长度在 3 个字符', trigger: 'blur'}
+                    ],
+                    customDistrictNo: [
+                        {required: true, message: '请选择', trigger: 'blur'}
+                    ],
+                    departuredatetime: [
+                        {required: true, message: '请选择', trigger: 'blur'}
+                    ],
+                    stayid: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    dischargecompleteddatetime: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    arrivaldatetime: [
+                        {required: true, message: '请选择', trigger: 'blur'}
+                    ],
+                },
+                tableData:[]
+            }
+        },
+        methods:{
+            submitForm(formName) {
+                this.$refs[formName].validate((valid) => {
+                    if (valid) {
+                        alert('submit!');
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                });
+            },
+            submitPerson(formName){
+                this.$refs[formName].validate((valid) => {
+                    if (valid) {
+                        alert('submit!');
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                });
+            },
+
+        }
+    }
+</script>

@@ -10,112 +10,131 @@
                 <el-form :model="bill" :rules="rules" ref="bill" label-width="100%" class="demo-ruleForm">
                 <el-form :model="bill" :rules="rules" ref="bill" label-width="100%" class="demo-ruleForm">
                     <el-col :span="8">
                     <el-col :span="8">
                         <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="120px">
                         <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="120px">
-                            <el-input v-model="bill.aircraftNo"></el-input>
+                            <el-input v-model="bill.aircraftNo" placeholder="请输入"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="8">
                     <el-col :span="8">
                         <el-form-item label="航班号" prop="flightNo" label-width="120px">
                         <el-form-item label="航班号" prop="flightNo" label-width="120px">
-                            <el-input v-model="bill.flightNo"></el-input>
+                            <el-input v-model="bill.flightNo" placeholder="请输入"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="8">
                     <el-col :span="8">
-                        <el-form-item label="航班时间" prop="flightDate" label-width="120px">
-                            <el-input v-model="bill.flightDate"></el-input>
+                        <el-form-item label="航班日期" prop="flightDate" label-width="120px">
+                            <el-date-picker
+                                    v-model="bill.flightDate"
+                                    type="date"
+                                    value-format="yyyyMMdd"
+                                    format="yyyyMMdd"
+                                    style="width:100%"
+                                    placeholder="选择日期">
+                            </el-date-picker>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="进出港标识" prop="accessFlag" label-width="120px">
                         <el-form-item label="进出港标识" prop="accessFlag" label-width="120px">
-                            <el-input v-model="bill.accessFlag"></el-input>
+                            <el-input v-model="bill.accessFlag" placeholder="A/D"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="机组人数" prop="aircrewSum" label-width="120px">
                         <el-form-item label="机组人数" prop="aircrewSum" label-width="120px">
-                            <el-input v-model="bill.aircrewSum"></el-input>
+                            <el-input v-model="bill.aircrewSum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="国际旅客人数" prop="interPassengerSum" label-width="120px">
                         <el-form-item label="国际旅客人数" prop="interPassengerSum" label-width="120px">
-                            <el-input v-model="bill.interPassengerSum"></el-input>
+                            <el-input v-model="bill.interPassengerSum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="国内旅客人数" prop="localePassengerSum" label-width="120px">
                         <el-form-item label="国内旅客人数" prop="localePassengerSum" label-width="120px">
-                            <el-input v-model="bill.localePassengerSum"></el-input>
+                            <el-input v-model="bill.localePassengerSum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="国际行李件数" prop="interBaggageNum" label-width="120px">
                         <el-form-item label="国际行李件数" prop="interBaggageNum" label-width="120px">
-                            <el-input v-model="bill.interBaggageNum"></el-input>
+                            <el-input v-model="bill.interBaggageNum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="国内行李件数" prop="localeBaggageNum" label-width="120px">
                         <el-form-item label="国内行李件数" prop="localeBaggageNum" label-width="120px">
-                            <el-input v-model="bill.localeBaggageNum"></el-input>
+                            <el-input v-model="bill.localeBaggageNum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="货邮件数" prop="goodsNum" label-width="120px">
                         <el-form-item label="货邮件数" prop="goodsNum" label-width="120px">
-                            <el-input v-model="bill.goodsNum"></el-input>
+                            <el-input v-model="bill.goodsNum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="货邮重量(KG)" prop="goodsQuantity" label-width="120px">
                         <el-form-item label="货邮重量(KG)" prop="goodsQuantity" label-width="120px">
-                            <el-input v-model="bill.goodsQuantity"></el-input>
+                            <el-input v-model="bill.goodsQuantity" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="8">
                     <el-col :span="8">
-                        <el-form-item label="抵达港口" prop="arrivalAirport" label-width="120px">
-                            <el-input v-model="bill.arrivalAirport"></el-input>
+                        <el-form-item label="抵达港口" prop="arrivalAirport" label-width="120px" >
+                            <el-input v-model="bill.arrivalAirport" placeholder="请输入"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="8">
                     <el-col :span="8">
                         <el-form-item label="关区代码" prop="arrivalno" label-width="120px">
                         <el-form-item label="关区代码" prop="arrivalno" label-width="120px">
-                            <el-input v-model="bill.arrivalno"></el-input>
+                            <el-input v-model="bill.arrivalno" oninput="value=value.replace(/[^\d]/g,'')" maxLength='4' placeholder="请输入"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="8">
                     <el-col :span="8">
                         <el-form-item label="抵达时间" prop="arrivaldatetime" label-width="120px">
                         <el-form-item label="抵达时间" prop="arrivaldatetime" label-width="120px">
-                            <el-input v-model="bill.arrivaldatetime"></el-input>
+                            <el-date-picker
+                                    v-model="bill.arrivaldatetime"
+                                    value-format="yyyyMMdd"
+                                    format="yyyyMMdd"
+                                    style="width:100%"
+                                    placeholder="请选择">
+                            </el-date-picker>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="8">
                     <el-col :span="8">
                         <el-form-item label="驶离港口" prop="departureAirport" label-width="120px">
                         <el-form-item label="驶离港口" prop="departureAirport" label-width="120px">
-                            <el-input v-model="bill.departureAirport"></el-input>
+                            <el-input v-model="bill.departureAirport" placeholder="请输入"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="8">
                     <el-col :span="8">
                         <el-form-item label="关区代码" prop="departureno" label-width="120px">
                         <el-form-item label="关区代码" prop="departureno" label-width="120px">
-                            <el-input v-model="bill.departureno"></el-input>
+                            <el-input v-model="bill.departureno" oninput="value=value.replace(/[^\d]/g,'')"  maxLength='4' placeholder="请输入"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="8">
                     <el-col :span="8">
                         <el-form-item label="驶离时间" prop="departuredatetime" label-width="120px">
                         <el-form-item label="驶离时间" prop="departuredatetime" label-width="120px">
-                            <el-input v-model="bill.departuredatetime"></el-input>
+                            <el-date-picker
+                                    v-model="bill.departuredatetime"
+                                    value-format="yyyyMMdd"
+                                    format="yyyyMMdd"
+                                    style="width:100%"
+                                    placeholder="请选择">
+                            </el-date-picker>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="货物申报单份数" prop="cargoBillNum" label-width="120px">
                         <el-form-item label="货物申报单份数" prop="cargoBillNum" label-width="120px">
-                            <el-input v-model="bill.cargoBillNum"></el-input>
+                            <el-input v-model="bill.cargoBillNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="旅客名单份数" prop="passengerPage" label-width="120px">
                         <el-form-item label="旅客名单份数" prop="passengerPage" label-width="120px">
-                            <el-input v-model="bill.passengerPage"></el-input>
+                            <el-input v-model="bill.passengerPage" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="机组名单份数" prop="aircrewBillNum" label-width="120px">
                         <el-form-item label="机组名单份数" prop="aircrewBillNum" label-width="120px">
-                            <el-input v-model="bill.aircrewBillNum"></el-input>
+                            <el-input v-model="bill.aircrewBillNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
-                        <el-form-item label="机组物品申报单份数" prop="aircrewCargoBillNum" label-width="140px">
-                            <el-input v-model="bill.aircrewCargoBillNum"></el-input>
+                        <el-form-item label="机组物品申报单份数" prop="aircrewCargoBillNum" label-width="150px">
+                            <el-input v-model="bill.aircrewCargoBillNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="停靠机位" prop="arrivalPosition" label-width="120px">
                         <el-form-item label="停靠机位" prop="arrivalPosition" label-width="120px">
-                            <el-input v-model="bill.arrivalPosition"></el-input>
+                            <el-input v-model="bill.arrivalPosition" placeholder="请输入"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="18">
                     <el-col :span="18">
@@ -128,57 +147,59 @@
                     </el-col>
                     </el-col>
                     <el-col :span="24">
                     <el-col :span="24">
                     <el-form-item label="备注" prop="meno" label-width="120px">
                     <el-form-item label="备注" prop="meno" label-width="120px">
-                        <el-input v-model="bill.meno"></el-input>
+                        <el-input v-model="bill.meno" placeholder="请输入"></el-input>
                     </el-form-item>
                     </el-form-item>
                     </el-col>
                     </el-col>
                 </el-form>
                 </el-form>
             </el-row>
             </el-row>
             <el-row style="margin-left: 120px">
             <el-row style="margin-left: 120px">
-                <el-col :span="24">   <el-button type="primary" @click="submitForm('bill')">保 存</el-button>
-                <el-button type="success">保存并发送</el-button></el-col>
+                <el-col :span="24">
+                    <el-button type="primary" @click="submitForm('bill')">保 存</el-button>
+                    <el-button type="success">保存并发送</el-button></el-col>
             </el-row>
             </el-row>
             <el-row class="row-bg">
             <el-row class="row-bg">
                 <el-col :span="24">
                 <el-col :span="24">
                     <div class="grid-content content">机组名单<el-button type="primary" size="mini" @click="dialogTableVisible = true" style="margin-left:50px">添加机组人员</el-button></div>
                     <div class="grid-content content">机组名单<el-button type="primary" size="mini" @click="dialogTableVisible = true" style="margin-left:50px">添加机组人员</el-button></div>
                 </el-col>
                 </el-col>
             </el-row>
             </el-row>
+            <!--添加机组人员dialog-->
             <el-row>
             <el-row>
                 <el-dialog title="机组人员添加" :visible.sync="dialogTableVisible">
                 <el-dialog title="机组人员添加" :visible.sync="dialogTableVisible">
                     <el-form :model="billperson" :rules="brules" ref="billperson" label-width="100px"  class="demo-ruleForm">
                     <el-form :model="billperson" :rules="brules" ref="billperson" label-width="100px"  class="demo-ruleForm">
                         <el-row>
                         <el-row>
                             <el-col :span="12">
                             <el-col :span="12">
                                 <el-form-item label="姓名" prop="name">
                                 <el-form-item label="姓名" prop="name">
-                                    <el-input v-model="billperson.name"></el-input>
+                                    <el-input v-model="billperson.name" placeholder="请输入"></el-input>
                                 </el-form-item>
                                 </el-form-item>
                             </el-col>
                             </el-col>
                             <el-col :span="12">
                             <el-col :span="12">
                                 <el-form-item label="性别" prop="gender">
                                 <el-form-item label="性别" prop="gender">
-                                    <el-input v-model="billperson.gender"></el-input>
+                                    <el-input v-model="billperson.gender" placeholder="M/F"></el-input>
                                 </el-form-item>
                                 </el-form-item>
                             </el-col>
                             </el-col>
                             <el-col :span="12">
                             <el-col :span="12">
                                 <el-form-item label="证件类型" prop="certType">
                                 <el-form-item label="证件类型" prop="certType">
-                                    <el-input v-model="billperson.certType"></el-input>
+                                    <el-input v-model="billperson.certType" placeholder="请输入"></el-input>
                                 </el-form-item>
                                 </el-form-item>
                             </el-col>
                             </el-col>
                             <el-col :span="12">
                             <el-col :span="12">
                                 <el-form-item label="证件号码" prop="ceterNo">
                                 <el-form-item label="证件号码" prop="ceterNo">
-                                    <el-input v-model="billperson.ceterNo"></el-input>
+                                    <el-input v-model="billperson.ceterNo" placeholder="请输入"></el-input>
                                 </el-form-item>
                                 </el-form-item>
                             </el-col>
                             </el-col>
                             <el-col :span="12">
                             <el-col :span="12">
                                 <el-form-item label="国籍" prop="nationality">
                                 <el-form-item label="国籍" prop="nationality">
-                                    <el-input v-model="billperson.nationality"></el-input>
+                                    <el-input v-model="billperson.nationality" placeholder="请输入"></el-input>
                                 </el-form-item>
                                 </el-form-item>
                             </el-col>
                             </el-col>
                             <el-col :span="12">
                             <el-col :span="12">
                                 <el-form-item label="职务" prop="gareer">
                                 <el-form-item label="职务" prop="gareer">
-                                    <el-input v-model="billperson.gareer"></el-input>
+                                    <el-input v-model="billperson.gareer" placeholder="请输入"></el-input>
                                 </el-form-item>
                                 </el-form-item>
                             </el-col>
                             </el-col>
                             <el-col :span="24">
                             <el-col :span="24">
                                 <el-form-item label="备注" prop="meno">
                                 <el-form-item label="备注" prop="meno">
-                                    <el-input v-model="billperson.meno"></el-input>
+                                    <el-input v-model="billperson.meno" placeholder="请输入"></el-input>
                                 </el-form-item>
                                 </el-form-item>
                             </el-col>
                             </el-col>
                             <el-col :span="24">   <el-button type="primary" @click="submitPerson('billperson')" style="float: right">提 交</el-button></el-col>
                             <el-col :span="24">   <el-button type="primary" @click="submitPerson('billperson')" style="float: right">提 交</el-button></el-col>
@@ -203,49 +224,69 @@
                         </template>
                         </template>
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="name"
                             prop="name"
                             label="姓名"
                             label="姓名"
                             width="150">
                             width="150">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="gender"
                             prop="gender"
                             label="性别"
                             label="性别"
                             width="150">
                             width="150">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="nationality"
                             prop="nationality"
                             label="国籍"
                             label="国籍"
                             width="150">
                             width="150">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="certType"
                             prop="certType"
                             label="证件类型"
                             label="证件类型"
                             width="150">
                             width="150">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="ceterNo"
                             prop="ceterNo"
                             label="证件编辑"
                             label="证件编辑"
                             width="150">
                             width="150">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="gareer"
                             prop="gareer"
                             label="职务"
                             label="职务"
                             width="150">
                             width="150">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="meno"
                             prop="meno"
                             label="备注"
                             label="备注"
                             width="350">
                             width="350">
                     </el-table-column>
                     </el-table-column>
                 </el-table>
                 </el-table>
             </el-row>
             </el-row>
+            <el-row>
+                <div class="block">
+                    <el-pagination
+                            @size-change="handleSizeChange"
+                            @current-change="handleCurrentChange"
+                            :current-page="currentPage"
+                            :page-sizes="[10, 20, 30, 40]"
+                            :page-size="pageSize"
+                            layout="total, sizes, prev, pager, next, jumper"
+                            :total="total">
+                    </el-pagination>
+                </div>
+            </el-row>
+            <!--对话提示框-->
+            <el-row>
+                <el-dialog
+                        title="系统提示"
+                        :visible.sync="centerDialogVisible"
+                        width="30%"
+                        center>
+                    <span>{{msg}}</span>
+                    <span slot="footer" class="dialog-footer">
+                          <el-button @click="centerDialogVisible = false">取 消</el-button>
+                        <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+                      </span>
+                </el-dialog>
+            </el-row>
         </el-main>
         </el-main>
     </el-container>
     </el-container>
 </template>
 </template>
@@ -268,6 +309,9 @@ background-color: white;
 .el-col{margin-right: 0px;}
 .el-col{margin-right: 0px;}
 </style>
 </style>
 <script>
 <script>
+    import {addBill} from '../../api/transport'
+    const fecha = require('fecha');
+    import loginUserInfo from '../../api/base'
     export default {
     export default {
         data(){
         data(){
             return{
             return{
@@ -290,10 +334,10 @@ background-color: white;
                     localeBaggageNum:undefined,
                     localeBaggageNum:undefined,
                     goodsNum:undefined,
                     goodsNum:undefined,
                     goodsQuantity:undefined,
                     goodsQuantity:undefined,
-                    cargoBillNum:undefined,
-                    passengerPage:undefined,
-                    aircrewBillNum:undefined,
-                    aircrewCargoBillNum:undefined,
+                    cargoBillNum:3,
+                    passengerPage:3,
+                    aircrewBillNum:3,
+                    aircrewCargoBillNum:3,
                     arrivalPosition:undefined,
                     arrivalPosition:undefined,
                     bussinessType:undefined,
                     bussinessType:undefined,
                     messageid:undefined,
                     messageid:undefined,
@@ -301,9 +345,9 @@ background-color: white;
                     statusMsg:undefined,
                     statusMsg:undefined,
                     meno:undefined,
                     meno:undefined,
                     createTime:undefined,
                     createTime:undefined,
-                    createBy:undefined,
+                    createBy:loginUserInfo.username,
                     updateTime:undefined,
                     updateTime:undefined,
-                    updateBy:undefined,
+                    updateBy:loginUserInfo.username,
                     isDelete:undefined,
                     isDelete:undefined,
                     remark:undefined,
                     remark:undefined,
                     remark1:undefined,
                     remark1:undefined,
@@ -312,14 +356,71 @@ background-color: white;
                 },
                 },
                 rules: {
                 rules: {
                     aircraftNo: [
                     aircraftNo: [
-                        {required: true, message: '请输入', trigger: 'blur'}
+                        {required: true, message: '请输入编号', trigger: 'blur'}
                     ],
                     ],
                     flightNo: [
                     flightNo: [
-                        {required: true, message: '请输入', trigger: 'blur'}
+                        {required: true, message: '请输入航班号', trigger: 'blur'}
                     ],
                     ],
                     flightDate: [
                     flightDate: [
+                        {required: true, message: '请选择航班日期', trigger: 'blur'}
+                    ],
+                    accessFlag: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    aircrewSum: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    interPassengerSum: [
                         {required: true, message: '请选择', trigger: 'blur'}
                         {required: true, message: '请选择', trigger: 'blur'}
                     ],
                     ],
+                    localePassengerSum: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    interBaggageNum: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    localeBaggageNum: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    goodsNum: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    goodsQuantity: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    arrivalAirport: [
+                        {required: true, message: '请选择', trigger: 'blur'}
+                    ],
+                    arrivalno: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    arrivaldatetime: [
+                        {required: true, message: '请选择', trigger: 'blur'}
+                    ],
+                    departureAirport: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    departureno: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    departuredatetime: [
+                        {required: true, message: '请选择', trigger: 'blur'}
+                    ],
+                    cargoBillNum: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    passengerPage: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    aircrewBillNum: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    aircrewCargoBillNum: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    arrivalPosition: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
                 },
                 },
                 dialogTableVisible:false,
                 dialogTableVisible:false,
                 billperson:{
                 billperson:{
@@ -331,9 +432,9 @@ background-color: white;
                     certType:undefined,
                     certType:undefined,
                     ceterNo:undefined,
                     ceterNo:undefined,
                     createTime:undefined,
                     createTime:undefined,
-                    createBy:undefined,
+                    createBy:loginUserInfo.username,
                     updateTime:undefined,
                     updateTime:undefined,
-                    updateBy:undefined,
+                    updateBy:loginUserInfo.username,
                     meno:undefined,
                     meno:undefined,
                     isDelete:undefined,
                     isDelete:undefined,
                     billsId:undefined
                     billsId:undefined
@@ -358,36 +459,59 @@ background-color: white;
                         {required: true, message: '请输入', trigger: 'blur'}
                         {required: true, message: '请输入', trigger: 'blur'}
                     ],
                     ],
                 },
                 },
-                tableData:[]
+                tableData:[{
+                    arrivaldatetime: '161146',
+                    departuredatetime: '161146',
+                    flightDate: '20160502',
+                }],
+                centerDialogVisible:false,
+                labelPosition:'left',
+                currentPage: 1,
+                pageSize:10,
+                total:0,
+                msg:undefined
             }
             }
         },
         },
         methods:{
         methods:{
+            //新增单据方法（保存按钮）
             submitForm(formName) {
             submitForm(formName) {
                 this.$refs[formName].validate((valid) => {
                 this.$refs[formName].validate((valid) => {
                     if (valid) {
                     if (valid) {
-                        alert('submit!');
+                        addBill(this.bill).then(res=>{
+                            let response=res.data;
+                            if(response.code=='200'){
+                                this.centerDialogVisible=true;
+                                this.msg=response.msg;
+                                this.$router.push({path:'/queryBill',query:{aircraftNo:JSON.stringify(this.bill.aircraftNo),flightNo:JSON.stringify(this.bill.flightNo),
+                                        flightDate:JSON.stringify(this.bill.flightDate)}});
+                            }else{
+                                this.msg=response.msg;
+                            }
+                        });
                     } else {
                     } else {
                         console.log('error submit!!');
                         console.log('error submit!!');
                         return false;
                         return false;
                     }
                     }
                 });
                 });
             },
             },
-            submitPerson(formName){
-                this.$refs[formName].validate((valid) => {
-                    if (valid) {
-                        alert('submit!');
-                    } else {
-                        console.log('error submit!!');
-                        return false;
-                    }
-                });
+            //加载默认值
+            defaultData(){
+                if(this.$route.query.uuid!=null){
+                    let ob=Object.assign(this.bill, this.$route.query);
+                    this.bill.arrivaldatetime=fecha.parse(ob.arrivaldatetime,'HHmmss');
+                }
             },
             },
+            // 分页
             handleSizeChange(val) {
             handleSizeChange(val) {
-                console.log(`每页 ${val} 条`);
+                this.pageSize=val;
             },
             },
             handleCurrentChange(val) {
             handleCurrentChange(val) {
-                console.log(`当前页: ${val}`);
+                this.currentPage=val;
+                this.submitForm();
             }
             }
+        },
+        mounted(){
+            this.defaultData();
         }
         }
     }
     }
 </script>
 </script>

+<template>
+    <el-container>
+        <el-main>
+            <el-row class="row-bg">
+                <el-col :span="24">
+                    <div class="grid-content content">进港航班配置</div>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-form :model="configure" :rules="rules" ref="configure" label-width="100%" class="demo-ruleForm">
+                    <el-col :span="8">
+                        <el-form-item label="航班号" prop="flightNo" label-width="120px">
+                            <el-input v-model="configure.flightNo"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="进出标识" prop="ietype" label-width="120px">
+                            <el-select v-model="configure.ietype" placeholder="" style="display:inline">
+                                <el-option v-for="item in linesTypes" :key="item.value" :label="item.label"
+                                           :value="item.value"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="备注" prop="reamrk" label-width="120px">
+                            <el-input v-model="configure.reamrk"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <el-row style="margin-left: 120px">
+                <el-col :span="24">   <el-button type="primary" @click="submitForm('confirmatory')">保 存</el-button>
+                </el-col>
+            </el-row>
+        </el-main>
+    </el-container>
+</template>
+<style scoped>
+    .grid-content {
+        height: 36px;
+        line-height: 36px;
+    }
+    .el-dialog__body{text-align: center}
+    .content {
+        border-left: 4px #409EFF solid;
+        padding-left: 10px;
+        background-color: #f9fafc;
+        margin-bottom: 2px
+    }
+
+    .row-bg{
+        background-color: white;
+    }
+    .el-col{margin-right: 0px;}
+</style>
+<script>
+    export default {
+        data(){
+            return{
+                configure:{
+                    flightNo:undefined,
+                    ietype:undefined,
+                    reamrk:undefined,
+                },
+                rules: {
+                    flightNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    ietype: [
+                        {required: true, message: '请输入', trigger: 'change'}
+                    ],
+                },
+                linesTypes:[
+                    {value:'',label:'请选择'},
+                    {value:'1',label:'进港'},
+                    {value:'2',label:'出港'}
+                ],
+                tableData:[]
+            }
+        },
+        methods:{
+            submitForm(formName) {
+                this.$refs[formName].validate((valid) => {
+                    if (valid) {
+                        alert('submit!');
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                });
+            },
+            submitPerson(formName){
+                this.$refs[formName].validate((valid) => {
+                    if (valid) {
+                        alert('submit!');
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                });
+            },
+
+        }
+    }
+</script>

+<template>
+    <el-container>
+        <el-main>
+            <el-row class="row-bg">
+                <el-col :span="24">
+                    <div class="grid-content content">进港确报申报</div>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-form :model="confirmatory" :rules="rules" ref="confirmatory" label-width="100%" class="demo-ruleForm">
+                    <el-col :span="8">
+                        <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="120px">
+                            <el-input v-model="confirmatory.aircraftNo"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="进港航班号" prop="flightNo" label-width="120px">
+                            <el-input v-model="confirmatory.flightNo"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="航班日期" prop="flightDate" label-width="120px">
+                            <el-date-picker
+                                    v-model="confirmatory.flightDate"
+                                    type="date"
+                                    style="width:275px"
+                                    placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="离港时间" prop="departuredatetime" label-width="120px">
+                            <el-input v-model="confirmatory.departuredatetime"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="目的港" prop="arrivalPort" label-width="120px">
+                            <el-input v-model="confirmatory.arrivalPort"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px">
+                            <el-input v-model="confirmatory.customDistrictNo"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="抵港时间" prop="arrivaldatetime" label-width="120px">
+                            <el-input v-model="confirmatory.arrivaldatetime"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="停靠机坪" prop="stayid" label-width="120px">
+                            <el-input v-model="confirmatory.stayid"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="备注" prop="meno" label-width="120px">
+                            <el-input v-model="confirmatory.meno"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <el-row style="margin-left: 120px">
+                <el-col :span="24">   <el-button type="primary" @click="submitForm('confirmatory')">保 存</el-button>
+                    <el-button type="success">保存并发送</el-button></el-col>
+            </el-row>
+        </el-main>
+    </el-container>
+</template>
+<style scoped>
+    .grid-content {
+        height: 36px;
+        line-height: 36px;
+    }
+    .el-dialog__body{text-align: center}
+    .content {
+        border-left: 4px #409EFF solid;
+        padding-left: 10px;
+        background-color: #f9fafc;
+        margin-bottom: 2px
+    }
+
+    .row-bg{
+        background-color: white;
+    }
+    .el-col{margin-right: 0px;}
+</style>
+<script>
+    export default {
+        data(){
+            return{
+                confirmatory:{
+                    aircraftNo:undefined,
+                    flightNo:undefined,
+                    flightDate:undefined,
+                    departuredatetime:undefined,
+                    arrivalPort:undefined,
+                    customDistrictNo:undefined,
+                    arrivaldatetime:undefined,
+                    stayid:undefined,
+                    meno:undefined,
+                    accessFlag:'0'
+                },
+                rules: {
+                    aircraftNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    flightNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    flightDate: [
+                        {required: true, message: '请选择', trigger: 'change'}
+                    ],
+                    departuredatetime: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    arrivalPort: [
+                        {required: true, message: '请输入(三字码)', trigger: 'blur'},
+                        {min: 3, max: 3, message: '长度在 3 个字符', trigger: 'blur'}
+                    ],
+                    customDistrictNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    arrivaldatetime: [
+                        {required: true, message: '请选择', trigger: 'blur'}
+                    ],
+                    stayid: [
+                        {required: true, message: '请选择', trigger: 'blur'}
+                    ],
+                },
+                tableData:[]
+            }
+        },
+        methods:{
+            submitForm(formName) {
+                this.$refs[formName].validate((valid) => {
+                    if (valid) {
+                        alert('submit!');
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                });
+            },
+            submitPerson(formName){
+                this.$refs[formName].validate((valid) => {
+                    if (valid) {
+                        alert('submit!');
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                });
+            },
+
+        }
+    }
+</script>

+<template>
+    <el-container>
+        <el-main>
+            <el-row class="row-bg">
+                <el-col :span="24">
+                    <div class="grid-content content">出港确报申报</div>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-form :model="declare" :rules="rules" ref="declare" label-width="100%" class="demo-ruleForm">
+                    <el-col :span="8">
+                        <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="120px">
+                            <el-input v-model="declare.aircraftNo"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="出港航班号" prop="flightNo" label-width="120px">
+                            <el-input v-model="declare.flightNo"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="航班日期" prop="flightDate" label-width="120px">
+                            <el-date-picker
+                                    v-model="declare.flightDate"
+                                    type="date"
+                                    style="width:275px"
+                                    placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="离港时间" prop="departuredatetime" label-width="120px">
+                            <el-input v-model="declare.departuredatetime"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="出发港" prop="departurePort" label-width="120px">
+                            <el-input v-model="declare.departurePort"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px">
+                            <el-input v-model="declare.customDistrictNo"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="备注" prop="meno" label-width="120px">
+                            <el-input v-model="declare.meno"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <el-row style="margin-left: 120px">
+                <el-col :span="24">   <el-button type="primary" @click="submitForm('declare')">保 存</el-button>
+                    <el-button type="success">保存并发送</el-button></el-col>
+            </el-row>
+        </el-main>
+    </el-container>
+</template>
+<style scoped>
+    .grid-content {
+        height: 36px;
+        line-height: 36px;
+    }
+    .el-dialog__body{text-align: center}
+    .content {
+        border-left: 4px #409EFF solid;
+        padding-left: 10px;
+        background-color: #f9fafc;
+        margin-bottom: 2px
+    }
+
+    .row-bg{
+        background-color: white;
+    }
+    .el-col{margin-right: 0px;}
+</style>
+<script>
+    export default {
+        data(){
+            return{
+                declare:{
+                    aircraftNo:undefined,
+                    flightNo:undefined,
+                    flightDate:undefined,
+                    departurePort:undefined,
+                    departuredatetime:undefined,
+                    customDistrictNo:undefined,
+                    meno:undefined,
+                    accessFlag:'1'
+                },
+                rules: {
+                    aircraftNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    flightNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    flightDate: [
+                        {required: true, message: '请选择', trigger: 'change'}
+                    ],
+                    departuredatetime: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    departurePort: [
+                        {required: true, message: '请输入(三字码)', trigger: 'blur'},
+                        {min: 3, max: 3, message: '长度在 3 个字符', trigger: 'blur'}
+                    ],
+                    customDistrictNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+
+                },
+                tableData:[]
+            }
+        },
+        methods:{
+            submitForm(formName) {
+                this.$refs[formName].validate((valid) => {
+                    if (valid) {
+                        alert('submit!');
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                });
+            },
+            submitPerson(formName){
+                this.$refs[formName].validate((valid) => {
+                    if (valid) {
+                        alert('submit!');
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                });
+            },
+
+        }
+    }
+</script>

+<template>
+    <el-container>
+        <el-main>
+            <el-row class="row-bg">
+                <el-col :span="24">
+                    <div class="grid-content content">出港预报申报</div>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-form :model="departure" :rules="rules" ref="departure" label-width="100%" class="demo-ruleForm">
+                    <el-col :span="8">
+                        <el-form-item label="航空器注册编码" prop="aircraftNo" label-width="120px">
+                            <el-input v-model="departure.aircraftNo"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="航班号" prop="flightNo" label-width="120px">
+                            <el-input v-model="departure.flightNo"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="航班日期" prop="flightDate" label-width="120px">
+                            <el-date-picker
+                                    v-model="departure.flightDate"
+                                    type="date"
+                                    style="width:275px"
+                                    placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="出发港" prop="departurePort" label-width="120px">
+                            <el-input v-model="departure.departurePort"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="目的港" prop="arrivalPort" label-width="120px">
+                            <el-input v-model="departure.arrivalPort"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px">
+                            <el-input v-model="departure.customDistrictNo"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px">
+                            <el-input v-model="departure.departuredatetime"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="停靠机坪" prop="stayid" label-width="120px">
+                            <el-input v-model="departure.stayid"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="备注" prop="meno" label-width="120px">
+                            <el-input v-model="departure.meno"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <el-row style="margin-left: 120px">
+                <el-col :span="24">   <el-button type="primary" @click="submitForm('departure')">保 存</el-button>
+                    <el-button type="success">保存并发送</el-button></el-col>
+            </el-row>
+        </el-main>
+    </el-container>
+</template>
+<style scoped>
+    .grid-content {
+        height: 36px;
+        line-height: 36px;
+    }
+    .el-dialog__body{text-align: center}
+    .content {
+        border-left: 4px #409EFF solid;
+        padding-left: 10px;
+        background-color: #f9fafc;
+        margin-bottom: 2px
+    }
+
+    .row-bg{
+        background-color: white;
+    }
+    .el-col{margin-right: 0px;}
+</style>
+<script>
+    export default {
+        data(){
+            return{
+                departure:{
+                    aircraftNo:undefined,
+                    flightNo:undefined,
+                    flightDate:undefined,
+                    departurePort:undefined,
+                    arrivalPort:undefined,
+                    customDistrictNo:undefined,
+                    stayid:undefined,
+                    departuredatetime:undefined,
+                    meno:undefined,
+                    accessFlag:'1'
+                },
+                rules: {
+                    aircraftNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    flightNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    flightDate: [
+                        {type: 'date',required: true, message: '请选择', trigger: 'change'}
+                    ],
+                    departurePort: [
+                        {required: true, message: '请输入(三字码)', trigger: 'blur'},
+                        {min: 3, max: 3, message: '长度在 3 个字符', trigger: 'blur'}
+                    ],
+                    arrivalPort: [
+                        {required: true, message: '请输入(三字码)', trigger: 'blur'},
+                        {min: 3, max: 3, message: '长度在 3 个字符', trigger: 'blur'}
+                    ],
+                    customDistrictNo: [
+                        {required: true, message: '请选择', trigger: 'blur'}
+                    ],
+                    departuredatetime: [
+                        {required: true, message: '请选择', trigger: 'blur'}
+                    ],
+                    stayid: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                },
+                tableData:[]
+            }
+        },
+        methods:{
+            submitForm(formName) {
+                this.$refs[formName].validate((valid) => {
+                    if (valid) {
+                        alert('submit!');
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                });
+            },
+            submitPerson(formName){
+                this.$refs[formName].validate((valid) => {
+                    if (valid) {
+                        alert('submit!');
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                });
+            },
+
+        }
+    }
+</script>

@@ -19,12 +19,12 @@
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
-                        <el-form-item label="航空公司中文名称" prop="airwayNameCn" label-width="130px">
+                        <el-form-item label="航空公司中文名称" prop="airwayNameCn" label-width="140px">
                             <el-input v-model="flight.airwayNameCn"></el-input>
                             <el-input v-model="flight.airwayNameCn"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
-                        <el-form-item label="航空公司英文名称" prop="airwayNameEn" label-width="130px">
+                        <el-form-item label="航空公司英文名称" prop="airwayNameEn" label-width="140px">
                             <el-input v-model="flight.airwayNameEn"></el-input>
                             <el-input v-model="flight.airwayNameEn"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
@@ -67,27 +67,31 @@
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="24" style="margin-bottom: 20px">
                     <el-col :span="24" style="margin-bottom: 20px">
-                        <div class="grid-content content">航线信息<el-button type="primary" size="mini" @click="dialogTableVisible = true" style="margin-left:50px">航线信息查询</el-button></div>
+                        <div class="grid-content content">航线信息<el-button type="primary" size="mini" @click="selectAirline()" style="margin-left:50px">航线信息查询</el-button></div>
                     </el-col>
                     </el-col>
 
 
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="出发港" prop="departurePort" label-width="120px">
                         <el-form-item label="出发港" prop="departurePort" label-width="120px">
-                            <el-input v-model="flight.departurePort"></el-input>
+                            <el-input v-model="flight.departurePort" @input="e => flight.departurePort=inputMe(e)"
+                                      maxLength='3' ></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="出发港关区代码" prop="departureCustomNo" label-width="120px">
                         <el-form-item label="出发港关区代码" prop="departureCustomNo" label-width="120px">
-                            <el-input v-model="flight.departureCustomNo"></el-input>
+                            <el-input v-model="flight.departureCustomNo" oninput="value=value.replace(/[^\d]/g,'')"
+                                      maxLength='4'></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="目的港" prop="arrivalPort" label-width="120px">
                         <el-form-item label="目的港" prop="arrivalPort" label-width="120px">
-                            <el-input v-model="flight.arrivalPort"></el-input>
+                            <el-input v-model="flight.arrivalPort" @input="e => flight.arrivalPort=inputMe(e)"
+                                      maxLength='3'></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="目的港关区代码" prop="arrivalCustomNo" label-width="120px">
                         <el-form-item label="目的港关区代码" prop="arrivalCustomNo" label-width="120px">
-                            <el-input v-model="flight.arrivalCustomNo"></el-input>
+                            <el-input v-model="flight.arrivalCustomNo" oninput="value=value.replace(/[^\d]/g,'')"
+                                      maxLength='4'></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
@@ -102,6 +106,7 @@
                                     :picker-options="{
                                     :picker-options="{
                                     selectableRange: '00:00:00 - 23:59:59'
                                     selectableRange: '00:00:00 - 23:59:59'
                                     }"
                                     }"
+                                    format="HHmmss"
                                     style="width:100%"
                                     style="width:100%"
                                     placeholder="任意时间点">
                                     placeholder="任意时间点">
                             </el-time-picker>
                             </el-time-picker>
@@ -114,6 +119,7 @@
                                     :picker-options="{
                                     :picker-options="{
                                     selectableRange: '00:00:00 - 23:59:59'
                                     selectableRange: '00:00:00 - 23:59:59'
                                     }"
                                     }"
+                                    format="HHmmss"
                                     style="width:100%"
                                     style="width:100%"
                                     placeholder="任意时间点">
                                     placeholder="任意时间点">
                             </el-time-picker>
                             </el-time-picker>
@@ -126,6 +132,8 @@
                             <el-date-picker
                             <el-date-picker
                                     v-model="flight.effStartdate"
                                     v-model="flight.effStartdate"
                                     type="date"
                                     type="date"
+                                    value-format="yyyyMMdd"
+                                    format="yyyyMMdd"
                                     style="width:100%"
                                     style="width:100%"
                                     placeholder="选择日期">
                                     placeholder="选择日期">
                             </el-date-picker>
                             </el-date-picker>
@@ -136,6 +144,8 @@
                             <el-date-picker
                             <el-date-picker
                                     v-model="flight.effEnddate"
                                     v-model="flight.effEnddate"
                                     type="date"
                                     type="date"
+                                    value-format="yyyyMMdd"
+                                    format="yyyyMMdd"
                                     style="width:100%"
                                     style="width:100%"
                                     placeholder="选择日期">
                                     placeholder="选择日期">
                             </el-date-picker>
                             </el-date-picker>
@@ -156,6 +166,7 @@
                 <el-dialog title="航线信息" :visible.sync="dialogTableVisible" width="90%">
                 <el-dialog title="航线信息" :visible.sync="dialogTableVisible" width="90%">
                     <el-table
                     <el-table
                     :data="tableData"
                     :data="tableData"
+                    v-loading="tableloading"
                     border
                     border
                     style="width: 100%;margin-bottom: 10px">
                     style="width: 100%;margin-bottom: 10px">
                     <el-table-column
                     <el-table-column
@@ -170,74 +181,65 @@
                         </template>
                         </template>
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="serialNo"
                             prop="serialNo"
-                            label="航线序号"
-                            width="80">
+                            label="航线序号">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="departurePort"
                             prop="departurePort"
-                            label="出发港"
-                            width="80">
+                            label="出发港">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="departureCustomNo"
                             prop="departureCustomNo"
-                            label="出发港关区代码"
-                            width="150">
+                            label="出发港关区代码">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="arrivalPort"
                             prop="arrivalPort"
-                            label="目的港"
-                            width="80">
+                            label="目的港">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="arrivalCustomNo"
                             prop="arrivalCustomNo"
-                            label="目的港关区代码"
-                            width="150">
+                            label="目的港关区代码">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="std"
                             prop="std"
-                            label="长期离港时间"
-                            width="150">
+                            label="长期离港时间">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="sta"
                             prop="sta"
-                            label="长期抵港时间"
-                            width="150">
+                            label="长期抵港时间">
                     </el-table-column>
                     </el-table-column>
                         <el-table-column
                         <el-table-column
-                                fixed
                                 prop="effStartdate"
                                 prop="effStartdate"
-                                label="有效期起始时间"
-                                width="150">
+                                label="有效期起始时间">
                         </el-table-column>
                         </el-table-column>
                         <el-table-column
                         <el-table-column
-                                fixed
                                 prop="effEnddate"
                                 prop="effEnddate"
-                                label="有效期结束时间"
-                                width="150">
+                                label="有效期结束时间">
                         </el-table-column>
                         </el-table-column>
                         <el-table-column
                         <el-table-column
-                                fixed
                                 prop="plan"
                                 prop="plan"
-                                label="每周执行情况"
-                                width="150">
+                                label="每周执行情况">
                         </el-table-column>
                         </el-table-column>
                         <el-table-column
                         <el-table-column
-                                fixed
                                 prop="remark"
                                 prop="remark"
-                                label="备注"
-                                width="150">
+                                label="备注">
                         </el-table-column>
                         </el-table-column>
                     </el-table>
                     </el-table>
                 </el-dialog>
                 </el-dialog>
             </el-row>
             </el-row>
+            <el-row>
+                <el-dialog
+                        title="系统提示"
+                        :visible.sync="centerDialogVisible"
+                        width="30%"
+                        center>
+                    <span>{{msg}}</span>
+                    <span slot="footer" class="dialog-footer">
+                          <el-button @click="centerDialogVisible = false">取 消</el-button>
+                        <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+                      </span>
+                </el-dialog>
+            </el-row>
         </el-main>
         </el-main>
     </el-container>
     </el-container>
 </template>
 </template>
@@ -260,6 +262,9 @@
     .el-col{margin-right: 0px;}
     .el-col{margin-right: 0px;}
 </style>
 </style>
 <script>
 <script>
+    import {addFlight, selectRoute} from "../../api/transport";
+    const fecha = require('fecha');
+    import loginUserInfo from '../../api/base';
     export default {
     export default {
         data(){
         data(){
             return{
             return{
@@ -272,7 +277,7 @@
                     groundAgentCode:undefined,
                     groundAgentCode:undefined,
                     flightNo:undefined,
                     flightNo:undefined,
                     shareFlightNo:undefined,
                     shareFlightNo:undefined,
-                    linesType:'2',
+                    linesType:'',
                     flightType:'',
                     flightType:'',
                     cancelFlag:undefined,
                     cancelFlag:undefined,
                     departurePort:undefined,
                     departurePort:undefined,
@@ -295,7 +300,68 @@
                     statusMsg:undefined,
                     statusMsg:undefined,
                     messageid:undefined
                     messageid:undefined
                 },
                 },
-                rules:{},
+                rules: {
+                    flightNo: [
+                        {required: true, message: '请输入航班号', trigger: 'blur'}
+                    ],
+                    airwayCode: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    airwayNameEn: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    airwayNameCn: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    transportAgentCode: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    groundAgentCode: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    linesType: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    flightType: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    shareFlightNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    departurePort: [
+                        //{ min: 3, max: 3, message: '长度在3个字符', trigger: 'blur'},
+                        {required: true, message: '请输入(三字码)', trigger: 'blur'},
+                    ],
+                    departureCustomNo: [
+                        {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'}
+                    ],
+                    arrivalPort: [
+                        {required: true, message: '请输入(三字码)', trigger: 'blur'},
+                    ],
+                    arrivalCustomNo: [
+                        {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'}
+                    ],
+                    plan: [
+                        {required: true, message: '请输入', trigger: 'blur'},
+                    ],
+                    std: [
+                        {required: true, message: '请选择时间', trigger: 'blur'}
+                    ],
+                    sta: [
+                        {required: true, message: '请选择时间', trigger: 'blur'},
+                    ],
+                    effStartdate: [
+                        {required: true, message: '请选择时间', trigger: 'blur'}
+                    ],
+                    effEnddate:[
+                        {required: true, message: '请选择时间', trigger: 'blur'}
+                    ]
+
+                },
+                airLine:{
+                    createBy:loginUserInfo.username,
+                    serialno:''
+                },
                 flightTypes:[
                 flightTypes:[
                     {value:'',label:'请选择'},
                     {value:'',label:'请选择'},
                     {value:'1',label:'来自关境外'},
                     {value:'1',label:'来自关境外'},
@@ -316,8 +382,89 @@
                     {value:'8',label:'货包机'}
                     {value:'8',label:'货包机'}
                 ],
                 ],
                 dialogTableVisible:false,
                 dialogTableVisible:false,
-                tableData:[]
+                centerDialogVisible:false,
+                currentPage4:4,
+                msg:undefined,
+                tableData: [],
+                tableloading:true,
+            }
+        },
+        methods:{
+            //航线信息查询
+            selectAirline(){
+                let params={currentPage:this.currentPage,pageSize:this.pageSize,createBy:this.airLine.createBy};
+                this.dialogTableVisible=true;
+                this.tableloading=true;
+                selectRoute(params).then(res=>{
+                    let response=res.data.data;
+                    this.tableData=response.list;
+                    this.tableloading=false;
+                    this.total=response.total;
+                });
+            },
+            //新增航班方法（保存按钮）
+            submitForm(formName) {
+                this.$refs[formName].validate((valid) => {
+                    if (valid) {
+                        addFlight(this.flight).then(res=>{
+                            let response=res.data;
+                            if(response.code=='200'){
+                                this.centerDialogVisible=true;
+                                this.msg=response.msg;
+                                this.$router.push({path:'/queryFlights',query:{flightNo:this.flight.flightNo,aircraftNo:this.flight.aircraftNo}});
+                                this.centerDialogVisible=false;
+                            }else{
+                                this.centerDialogVisible=true;
+                                this.msg=response.msg;
+                            }
+                        });
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                });
+            },
+            //分页方法
+            handleSizeChange(val) {
+                console.log(`每页 ${val} 条`);
+            },
+            handleCurrentChange(val) {
+                console.log(`当前页: ${val}`);
+            },
+            //航线信息查询选择功能
+            handleEdit(index,row){
+                this.flight.std=fecha.parse(row.std,'HHmmss');
+                this.flight.sta=fecha.parse(row.sta,'HHmmss');
+                this.flight.effStartdate=row.effStartdate;
+                this.flight.effEnddate=row.effEnddate;
+                this.flight.departurePort=row.departurePort;
+                this.flight.arrivalPort=row.arrivalPort;
+                this.flight.departureCustomNo=row.departureCustomNo;
+                this.flight.arrivalCustomNo=row.arrivalCustomNo;
+                this.flight.plan=row.plan;
+                this.dialogTableVisible=false;
+            },
+            //加载默认值
+            defaultData(){
+                if(this.$route.query.uuid!=null){
+                    let ob=Object.assign(this.flight,this.$route.query);
+                    if(ob.std!=null && ob.std!=undefined && ob.std!=""){
+                        this.flight.std=fecha.parse(ob.std,'HHmmss');
+                    }
+                    if(ob.sta!=null && ob.sta!=undefined &&ob.sta!=""){
+                        this.flight.sta=fecha.parse(ob.sta,'HHmmss');
+                    }
+                }
+
+            },
+            // 过滤中英文
+            inputMe(e){
+                return e.replace(/[^a-zA-Z]/g,'').toUpperCase();
             }
             }
         },
         },
+        //渲染方法
+        mounted(){
+            this.defaultData();
+        }
     }
     }
 </script>
 </script>

@@ -18,6 +18,8 @@
                             <el-date-picker
                             <el-date-picker
                                     v-model="flight.flightDate"
                                     v-model="flight.flightDate"
                                     type="date"
                                     type="date"
+                                    value-format="yyyyMMdd"
+                                    format="yyyyMMdd"
                                     style="width:100%"
                                     style="width:100%"
                                     placeholder="选择日期">
                                     placeholder="选择日期">
                             </el-date-picker>
                             </el-date-picker>
@@ -25,22 +27,26 @@
                     </el-col>
                     </el-col>
                     <el-col :span="12">
                     <el-col :span="12">
                         <el-form-item label="出发港" prop="departurePort" label-width="120px">
                         <el-form-item label="出发港" prop="departurePort" label-width="120px">
-                            <el-input v-model="flight.departurePort"></el-input>
+                            <el-input v-model="flight.departurePort" @input="e => flight.departurePort=inputMe(e)"
+                                      maxLength='3'></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="12">
                     <el-col :span="12">
                         <el-form-item label="出发港关区代码" prop="departureCustomNo" label-width="120px">
                         <el-form-item label="出发港关区代码" prop="departureCustomNo" label-width="120px">
-                            <el-input v-model="flight.departureCustomNo"></el-input>
+                            <el-input v-model="flight.departureCustomNo" oninput="value=value.replace(/[^\d]/g,'')"
+                                      maxLength='4'></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="12">
                     <el-col :span="12">
                         <el-form-item label="目的港" prop="arrivalPort" label-width="120px">
                         <el-form-item label="目的港" prop="arrivalPort" label-width="120px">
-                            <el-input v-model="flight.arrivalPort"></el-input>
+                            <el-input v-model="flight.arrivalPort" @input="e => flight.departurePort=inputMe(e)"
+                                      maxLength='3'></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="12">
                     <el-col :span="12">
                         <el-form-item label="目的港关区代码" prop="arrivalCustomNo" label-width="120px">
                         <el-form-item label="目的港关区代码" prop="arrivalCustomNo" label-width="120px">
-                            <el-input v-model="flight.arrivalCustomNo"></el-input>
+                            <el-input v-model="flight.arrivalCustomNo" oninput="value=value.replace(/[^\d]/g,'')"
+                                      maxLength='4'></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="12">
                     <el-col :span="12">
@@ -48,8 +54,10 @@
                             <el-date-picker
                             <el-date-picker
                                     v-model="flight.currentTakeoffTime"
                                     v-model="flight.currentTakeoffTime"
                                     type="date"
                                     type="date"
+                                    format="yyyyMMddHHmm"
+                                    value-format="yyyyMMddHHmm"
                                     style="width:100%"
                                     style="width:100%"
-                                    placeholder="选择日期">
+                                    placeholder="任意时间点">
                             </el-date-picker>
                             </el-date-picker>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
@@ -58,8 +66,10 @@
                             <el-date-picker
                             <el-date-picker
                                     v-model="flight.currentLandingTime"
                                     v-model="flight.currentLandingTime"
                                     type="date"
                                     type="date"
+                                    format="yyyyMMddHHmm"
+                                    value-format="yyyyMMddHHmm"
                                     style="width:100%"
                                     style="width:100%"
-                                    placeholder="选择日期">
+                                    placeholder="任意时间点">
                             </el-date-picker>
                             </el-date-picker>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
@@ -80,7 +90,35 @@
             </el-row>
             </el-row>
             <el-row style="margin-left: 120px">
             <el-row style="margin-left: 120px">
                     <el-col :span="24">   <el-button type="primary" @click="submitForm('flight')">保 存</el-button>
                     <el-col :span="24">   <el-button type="primary" @click="submitForm('flight')">保 存</el-button>
-                    <el-button type="success">保存并发送</el-button></el-col>
+                            <el-button type="success">保存并发送</el-button></el-col>
+            </el-row>
+            <!--对话提示框-->
+            <el-row>
+                <el-dialog
+                        title="系统提示"
+                        :visible.sync="centerDialogVisible"
+                        width="30%"
+                        center>
+                    <span>{{msg}}</span>
+                    <span slot="footer" class="dialog-footer">
+                          <el-button @click="centerDialogVisible = false">取 消</el-button>
+                        <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+                      </span>
+                </el-dialog>
+            </el-row>
+            <!--对话提示框-->
+            <el-row>
+                <el-dialog
+                        title="系统提示"
+                        :visible.sync="centerDialogVisible"
+                        width="30%"
+                        center>
+                    <span>{{msg}}</span>
+                    <span slot="footer" class="dialog-footer">
+                          <el-button @click="centerDialogVisible = false">取 消</el-button>
+                        <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+                      </span>
+                </el-dialog>
             </el-row>
             </el-row>
         </el-main>
         </el-main>
     </el-container>
     </el-container>
@@ -104,6 +142,8 @@
     .el-col{margin-right: 0px;}
     .el-col{margin-right: 0px;}
 </style>
 </style>
 <script>
 <script>
+    const fecha = require('fecha');
+    import {addFlightPlan} from "../../api/transport";
     export default {
     export default {
         data(){
         data(){
             return{
             return{
@@ -120,15 +160,82 @@
                     meno:undefined
                     meno:undefined
                 },
                 },
                 rules:{
                 rules:{
-
+                    flightNo: [
+                        {required: true, message: '请输入航班号', trigger: 'blur'}
+                    ],
+                    flightDate: [
+                        {required: true, message: '请选择航班日期', trigger: 'blur'}
+                    ],
+                    departurePort: [
+                        //{ min: 3, max: 3, message: '长度在3个字符', trigger: 'blur'},
+                        {required: true, message: '请输入(三字码)', trigger: 'blur'},
+                    ],
+                    departureCustomNo: [
+                        {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'}
+                    ],
+                    arrivalPort: [
+                        {required: true, message: '请输入(三字码)', trigger: 'blur'},
+                    ],
+                    arrivalCustomNo: [
+                        {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'}
+                    ],
+                    currentTakeoffTime: [
+                        {required: true, message: '请选择日期', trigger: 'blur'}
+                    ],
+                    currentLandingTime: [
+                        {required: true, message: '请选择日期', trigger: 'blur'}
+                    ],
+                    linesType: [
+                        {required: true, message: '请选择', trigger: 'blur'}
+                    ],
                 },
                 },
                 linesTypes:[
                 linesTypes:[
                     {value:'',label:'请选择'},
                     {value:'',label:'请选择'},
                     {value:'1',label:'客运'},
                     {value:'1',label:'客运'},
                     {value:'2',label:'货运'}
                     {value:'2',label:'货运'}
                 ],
                 ],
+                centerDialogVisible:false,
+                msg:undefined
             }
             }
         },
         },
-        methods(){}
+        methods:{
+            //新增当日飞行计划（保存按钮）
+            submitForm(formName) {
+                this.$refs[formName].validate((valid) => {
+                    if (valid) {
+                        addFlightPlan(this.flight).then(res=>{
+                            let response=res.data;
+                            if(response.code=='200'){
+                                this.centerDialogVisible=true;
+                                this.msg=response.msg;
+                                this.$router.push({path:'/queryFlightplan',query:{flightNo:JSON.stringify(this.flight.flightNo)}});
+                            }else{
+                                this.msg=response.msg;
+                            }
+                        });
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                });
+            },
+            //加载默认值
+            defaultData(){
+                if(this.$route.query!=null){
+                    let ob=Object.assign(this.flight, this.$route.query);
+                    /*有时分秒时用fecha
+                    this.flight.flightDate=ob.flightDate;
+                    this.flight.currentLandingTime=fecha.parse(ob.currentLandingTime,'yyyyMMddHHmm');
+                    this.flight.currentTakeoffTime=fecha.parse(ob.currentTakeoffTime,'yyyyMMddHHmm');*/
+                }
+            },
+        },
+        // 过滤中英文
+        inputMe(e){
+            return e.replace(/[^a-zA-Z]/g,'').toUpperCase();
+        },
+        mounted(){
+            this.defaultData();
+        }
     }
     }
 </script>
 </script>

+<template>
+    <el-container>
+        <el-main>
+            <el-row class="row-bg">
+                <el-col :span="24">
+                    <div class="grid-content content">出港航班配置</div>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-form :model="outConfigure" :rules="rules" ref="outConfigure" label-width="100%" class="demo-ruleForm">
+                    <el-col :span="8">
+                        <el-form-item label="航班号" prop="flightNo" label-width="120px">
+                            <el-input v-model="outConfigure.flightNo"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="进出标识" prop="ietype" label-width="120px">
+                            <el-select v-model="outConfigure.ietype" placeholder="" style="display:inline">
+                                <el-option v-for="item in linesTypes" :key="item.value" :label="item.label"
+                                           :value="item.value"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="备注" prop="reamrk" label-width="120px">
+                            <el-input v-model="outConfigure.reamrk"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <el-row style="margin-left: 120px">
+                <el-col :span="24">   <el-button type="primary" @click="submitForm('outConfigure')">保 存</el-button>
+                </el-col>
+            </el-row>
+        </el-main>
+    </el-container>
+</template>
+<style scoped>
+    .grid-content {
+        height: 36px;
+        line-height: 36px;
+    }
+    .el-dialog__body{text-align: center}
+    .content {
+        border-left: 4px #409EFF solid;
+        padding-left: 10px;
+        background-color: #f9fafc;
+        margin-bottom: 2px
+    }
+
+    .row-bg{
+        background-color: white;
+    }
+    .el-col{margin-right: 0px;}
+</style>
+<script>
+    export default {
+        data(){
+            return{
+                outConfigure:{
+                    flightNo:undefined,
+                    ietype:undefined,
+                    reamrk:undefined,
+                },
+                rules: {
+                    flightNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    ietype: [
+                        {required: true, message: '请输入', trigger: 'change'}
+                    ],
+                },
+                linesTypes:[
+                    {value:'',label:'请选择'},
+                    {value:'1',label:'进港'},
+                    {value:'2',label:'出港'}
+                ],
+                tableData:[]
+            }
+        },
+        methods:{
+            submitForm(formName) {
+                this.$refs[formName].validate((valid) => {
+                    if (valid) {
+                        alert('submit!');
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                });
+            },
+            submitPerson(formName){
+                this.$refs[formName].validate((valid) => {
+                    if (valid) {
+                        alert('submit!');
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                });
+            },
+
+        }
+    }
+</script>

@@ -30,6 +30,7 @@
                 <el-table
                 <el-table
                         :data="tableData"
                         :data="tableData"
                         border
                         border
+                        v-loading="tableloading"
                         style="width: 100%;margin-bottom: 10px">
                         style="width: 100%;margin-bottom: 10px">
                     <el-table-column
                     <el-table-column
                             fixed="left"
                             fixed="left"
@@ -43,67 +44,56 @@
                         </template>
                         </template>
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
-                            prop=ownerCo"
+                            prop=airwayCode"
                             label="航空器所有人代码"
                             label="航空器所有人代码"
                             width="120">
                             width="120">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="airwayNameEn"
                             prop="airwayNameEn"
                             label="所有人英文名称"
                             label="所有人英文名称"
                             width="120">
                             width="120">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="airwayNameCn"
                             prop="airwayNameCn"
                             label="所有人中文名称"
                             label="所有人中文名称"
                             width="150">
                             width="150">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="aircraftNo"
                             prop="aircraftNo"
                             label="航空器注册编号"
                             label="航空器注册编号"
                             width="120">
                             width="120">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="certNo"
                             prop="certNo"
                             label="国际证书编号"
                             label="国际证书编号"
                             width="120">
                             width="120">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
-                            prop="owner"
+                            prop="ownerCo"
                             label="航空器所有人"
                             label="航空器所有人"
                             width="120">
                             width="120">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="areoNationality"
                             prop="areoNationality"
                             label="国籍"
                             label="国籍"
                             width="80">
                             width="80">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="areoModel"
                             prop="areoModel"
                             label="机型"
                             label="机型"
                             width="80">
                             width="80">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="deliverDate"
                             prop="deliverDate"
                             label="交付日期"
                             label="交付日期"
                             width="120">
                             width="120">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="statusMsg"
                             prop="statusMsg"
                             label="海关回执"
                             label="海关回执"
                             width="120">
                             width="120">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop=""
                             prop=""
                             label="报文操作"
                             label="报文操作"
                             width="150">
                             width="150">
@@ -128,10 +118,10 @@
                             @size-change="handleSizeChange"
                             @size-change="handleSizeChange"
                             @current-change="handleCurrentChange"
                             @current-change="handleCurrentChange"
                             :current-page="currentPage"
                             :current-page="currentPage"
-                            :page-sizes="[100, 200, 300, 400]"
-                            :page-size="100"
+                            :page-sizes="[10, 20, 30, 40]"
+                            :page-size="pageSize"
                             layout="total, sizes, prev, pager, next, jumper"
                             layout="total, sizes, prev, pager, next, jumper"
-                            :total="400">
+                            :total="total">
                     </el-pagination>
                     </el-pagination>
                 </div>
                 </div>
             </el-row>
             </el-row>
@@ -157,27 +147,90 @@
 
 
 </style>
 </style>
 <script>
 <script>
+    import {selectAircraft, editAircraft} from "../../api/transport";
+
     export default {
     export default {
         data(){
         data(){
             return{
             return{
                 queryAircraft:{
                 queryAircraft:{
-                    flightNo:undefined,
+                    airwayCode:undefined,
                     aircraftNo:undefined,
                     aircraftNo:undefined,
-                    flightDate:undefined,
-                    accessFlag:undefined,
                 },
                 },
                 rules:{},
                 rules:{},
                 labelPosition:'left',
                 labelPosition:'left',
-                currentPage: 4,
-                tableData:[]
+                currentPage: 1,
+                pageSize:10,
+                total:0,
+                tableData:[],
+                tableloading:false
+
             }
             }
         },
         },
         methods: {
         methods: {
+            //分页
             handleSizeChange(val) {
             handleSizeChange(val) {
-                console.log(`每页 ${val} 条`);
+                this.pageSize=val;
             },
             },
             handleCurrentChange(val) {
             handleCurrentChange(val) {
-                console.log(`当前页: ${val}`);
+                this.currentPage=val;
+                this.submitForm();
+            },
+            //获取通用航空器列表
+            submitForm() {
+                let params = {
+                    currentPage: this.currentPage, pageSize: this.pageSize, airwayCode: this.queryAircraft.airwayCode,
+                    aircraftNo: this.queryAircraft.aircraftNo
+                };
+                this.tableloading = true;
+                selectAircraft(params).then(res => {
+                    let response = res.data.data;
+                    this.tableData = response.list;
+                    this.tableloading = false;
+                    this.total = response.total;
+                });
+            },
+            //列表删除功能
+            handleDel(index, row) {
+                this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    editAircraft(row).then(res => {
+                        let response = res.data;
+                        if (response.code == '200') {
+                            this.$message({
+                                type: 'info',
+                                message: '删除成功'
+                            });
+                            this.submitForm();
+                        } else {
+                            this.$message({
+                                type: 'info',
+                                message: '删除失败'
+                            });
+                        }
+                    });
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消删除'
+                    });
+                });
+            },
+            //获取默认值
+            defaultData() {
+                this.airwayCode = JSON.parse(this.$route.query.airwayCode);
+                this.aircraftNo = JSON.parse(this.$route.query.aircraftNo);
+            },
+            //编辑通用航空器
+            handleEdit(index,row){
+                this.$router.push({path:'/aircraft',query: row})
+            },
+            //渲染方法
+            mounted(){
+                this.defaultData();
+                this.submitForm();
             }
             }
         },
         },
     }
     }

+<template>
+    <el-container>
+        <el-main>
+            <el-row class="row-bg">
+                <el-col :span="24">
+                    <div class="grid-content content">航班查询</div>
+                </el-col>
+            </el-row>
+            <!--            搜索区域-->
+            <el-row>
+                <el-form :label-position="labelPosition" :model="queryArrival" :rules="rules" ref="queryFlight"
+                         label-width="130px" class="demo-ruleForm">
+                    <el-col :span="6" >
+                        <el-form-item label="承运人：" prop="awcd" label-width="80px">
+                            <el-input v-model="queryArrival.awcd" style="width:190px"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6" >
+                        <el-form-item label="航班号：" prop="flightNo" label-width="80px">
+                            <el-input v-model="queryArrival.flightNo" style="width:190px"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6" >
+                        <el-form-item label="航班日期:" prop="flightDate" label-width="90px">
+                            <el-date-picker
+                                    v-model="queryArrival.flightDate"
+                                    type="date"
+                                    style="width:190px"
+                                    placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="5" >
+                        <el-button type="primary" @click="submitForm('queryArrival')">查询</el-button>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <!--            表单区域-->
+            <el-row>
+                <el-table
+                        :data="tableData"
+                        border
+                        style="width: 100%;margin-bottom: 10px">
+                    <el-table-column
+                            fixed="left"
+                            label="操作"
+                            width="100">
+                        <template slot-scope="scope">
+                            <el-button
+                                    size="mini"
+                                    type="primary"
+                                    @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="flightNo"
+                            label="航班号"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="flightDate"
+                            label="航班日期"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="aircraftNo"
+                            label="航空器注册编码"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="departurePort"
+                            label="出发港"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="arrivalPort"
+                            label="目的港"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="customDistrictNo"
+                            label="关区代码"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="transportflag"
+                            label="运输计划"
+                            width="150">
+                    </el-table-column>
+                    <el-table-column
+                            prop="departuredatetime"
+                            label="离港时间"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="statusMsg"
+                            label="海关回执"
+                            width="150">
+                    </el-table-column>
+                    <el-table-column
+                            prop=""
+                            label="报文操作"
+                            width="150">
+                        <template slot-scope="scope">
+                            <el-button
+                                    size="mini"
+                                    type="success"
+                                    @click="handleEdit(scope.$index, scope.row)">查看</el-button>
+                        </template>
+                        <template slot-scope="scope">
+                            <el-button
+                                    size="mini"
+                                    type="danger"
+                                    @click="handleDel(scope.$index, scope.row)">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-row>
+            <el-row>
+                <div class="block">
+                    <el-pagination
+                            @size-change="handleSizeChange"
+                            @current-change="handleCurrentChange"
+                            :current-page="currentPage"
+                            :page-sizes="[100, 200, 300, 400]"
+                            :page-size="100"
+                            layout="total, sizes, prev, pager, next, jumper"
+                            :total="400">
+                    </el-pagination>
+                </div>
+            </el-row>
+        </el-main>
+    </el-container>
+</template>
+<style scoped>
+    .grid-content {
+        height: 36px;
+        line-height: 36px;
+    }
+    .el-dialog__body{text-align: center}
+    .content {
+        border-left: 4px #409EFF solid;
+        padding-left: 10px;
+        background-color: #f9fafc;
+        margin-bottom: 2px
+    }
+
+    .row-bg{
+        background-color: white;
+    }
+
+</style>
+<script>
+    export default {
+        data(){
+            return{
+                queryArrival:{
+                    awcd:undefined,
+                    flightNo:undefined,
+                    flightDate:undefined,
+                },
+                rules:{
+                    awcd: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    flightNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    flightDate: [
+                        {required: true, message: '请选择', trigger: 'change'}
+                    ],
+                },
+                labelPosition:'left',
+                currentPage: 4,
+                tableData:[]
+            }
+        },
+        methods: {
+            handleSizeChange(val) {
+                console.log(`每页 ${val} 条`);
+            },
+            handleCurrentChange(val) {
+                console.log(`当前页: ${val}`);
+            }
+        },
+    }
+</script>

@@ -6,45 +6,48 @@
                     <div class="grid-content content">单据查询</div>
                     <div class="grid-content content">单据查询</div>
                 </el-col>
                 </el-col>
             </el-row>
             </el-row>
-            <!--            搜索区域-->
+            <!--搜索区域-->
             <el-row>
             <el-row>
                  <el-form :label-position="labelPosition" :model="queryBill" :rules="rules" ref="queryBill"
                  <el-form :label-position="labelPosition" :model="queryBill" :rules="rules" ref="queryBill"
                      label-width="130px" class="demo-ruleForm">
                      label-width="130px" class="demo-ruleForm">
-                    <el-col :span="6">
+                    <el-col :span="5">
                         <el-form-item label="航班号:" prop="flightNo" label-width="70px">
                         <el-form-item label="航班号:" prop="flightNo" label-width="70px">
                             <el-input v-model="queryBill.flightNo" style="width:190px"></el-input>
                             <el-input v-model="queryBill.flightNo" style="width:190px"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
-                    <el-col :span="6" >
+                    <el-col :span="5" >
                         <el-form-item label="航空器注册号:" prop="aircraftNo" label-width="110px">
                         <el-form-item label="航空器注册号:" prop="aircraftNo" label-width="110px">
                             <el-input v-model="queryBill.aircraftNo" style="width:190px"></el-input>
                             <el-input v-model="queryBill.aircraftNo" style="width:190px"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
-                    <el-col :span="6" >
+                    <el-col :span="5" >
                         <el-form-item label="航班日期:" prop="flightDate" label-width="80px">
                         <el-form-item label="航班日期:" prop="flightDate" label-width="80px">
                             <el-date-picker
                             <el-date-picker
                                     v-model="queryBill.flightDate"
                                     v-model="queryBill.flightDate"
                                     type="date"
                                     type="date"
+                                    value-format="yyyyMMdd"
+                                    format="yyyyMMdd"
                                     style="width:190px"
                                     style="width:190px"
                                     placeholder="选择日期">
                                     placeholder="选择日期">
                             </el-date-picker>
                             </el-date-picker>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
-                    <el-col :span="6" >
+                    <el-col :span="5" >
                         <el-form-item label="进出港:" prop="accessFlag" label-width="70px">
                         <el-form-item label="进出港:" prop="accessFlag" label-width="70px">
                             <el-input v-model="queryBill.accessFlag" style="width:190px"></el-input>
                             <el-input v-model="queryBill.accessFlag" style="width:190px"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
-                    <el-col :span="6" >
-                        <el-button type="primary" @click="submitForm('queryBill')">查询</el-button>
+                    <el-col :span="3" >
+                        <el-button type="primary" @click="submitForm()">查询</el-button>
                     </el-col>
                     </el-col>
                  </el-form>
                  </el-form>
             </el-row>
             </el-row>
-<!--            表单区域-->
+            <!--表单区域-->
             <el-row>
             <el-row>
                 <el-table
                 <el-table
                         :data="tableData"
                         :data="tableData"
                         border
                         border
+                        v-loading="tableloading"
                         style="width: 100%;margin-bottom: 10px">
                         style="width: 100%;margin-bottom: 10px">
                     <el-table-column
                     <el-table-column
                             fixed="left"
                             fixed="left"
@@ -58,61 +61,43 @@
                         </template>
                         </template>
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop=aircraftNo"
                             prop=aircraftNo"
-                            label="航空器注册号"
-                            width="120">
+                            label="航空器注册号">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="flightNo"
                             prop="flightNo"
-                            label="航班号"
-                            width="80">
+                            label="航班号">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="flightDate"
                             prop="flightDate"
-                            label="航班日期"
-                            width="150">
+                            label="航班日期">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="accessFlag"
                             prop="accessFlag"
-                            label="进出港标识"
-                            width="120">
+                            label="进出港标识">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="departureAirport"
                             prop="departureAirport"
-                            label="出发港"
-                            width="80">
+                            label="出发港">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="departuredatetime"
                             prop="departuredatetime"
-                            label="出发时间"
-                            width="150">
+                            label="出发时间">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="arrivalAirport"
                             prop="arrivalAirport"
-                            label="目的港"
-                            width="80">
+                            label="目的港">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="arrivaldatetime"
                             prop="arrivaldatetime"
-                            label="到达时间"
-                            width="150">
+                            label="到达时间">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="statusMsg"
                             prop="statusMsg"
-                            label="海关回执"
-                            width="150">
+                            label="海关回执">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
+                            fixed="right"
                             prop=""
                             prop=""
                             label="报文操作"
                             label="报文操作"
                             width="150">
                             width="150">
@@ -121,8 +106,6 @@
                                     size="mini"
                                     size="mini"
                                     type="success"
                                     type="success"
                                     @click="handleEdit(scope.$index, scope.row)">查看</el-button>
                                     @click="handleEdit(scope.$index, scope.row)">查看</el-button>
-                        </template>
-                        <template slot-scope="scope">
                             <el-button
                             <el-button
                                     size="mini"
                                     size="mini"
                                     type="danger"
                                     type="danger"
@@ -137,10 +120,10 @@
                             @size-change="handleSizeChange"
                             @size-change="handleSizeChange"
                             @current-change="handleCurrentChange"
                             @current-change="handleCurrentChange"
                             :current-page="currentPage"
                             :current-page="currentPage"
-                            :page-sizes="[100, 200, 300, 400]"
-                            :page-size="100"
+                            :page-sizes="[10, 20, 30, 40]"
+                            :page-size="pageSize"
                             layout="total, sizes, prev, pager, next, jumper"
                             layout="total, sizes, prev, pager, next, jumper"
-                            :total="400">
+                            :total="total">
                     </el-pagination>
                     </el-pagination>
                 </div>
                 </div>
             </el-row>
             </el-row>
@@ -166,6 +149,7 @@
 
 
 </style>
 </style>
 <script>
 <script>
+    import {editBill,selectBill} from "../../api/transport";
     export default {
     export default {
         data(){
         data(){
             return{
             return{
@@ -175,19 +159,81 @@
                     flightDate:undefined,
                     flightDate:undefined,
                     accessFlag:undefined,
                     accessFlag:undefined,
                 },
                 },
+                tableloading:false,
                 rules:{},
                 rules:{},
                 labelPosition:'left',
                 labelPosition:'left',
-                currentPage: 4,
+                currentPage: 1,
+                pageSize:10,
+                total:0,
                 tableData:[]
                 tableData:[]
             }
             }
         },
         },
         methods: {
         methods: {
+            //获取单据列表
+            submitForm(){
+                let params={currentPage:this.currentPage,pageSize:this.pageSize,flightNo:this.queryBill.flightNo,
+                    aircraftNo:this.queryBill.aircraftNo,flightDate:this.queryBill.flightDate,accessFlag:this.queryBill.accessFlag};
+                this.tableloading=true;
+                selectBill(params).then(res=>{
+                    let response=res.data.data;
+                    this.tableData=response.list;
+                    this.tableloading=false;
+                    this.total=response.total;
+                });
+            },
+            //列表删除功能
+            handleDel(index,row){
+                this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    editBill(row).then(res=>{
+                        let response=res.data;
+                        if(response.code=='200'){
+                            this.$message({
+                                type: 'info',
+                                message: '删除成功'
+                            });
+                            this.submitForm();
+                        }else{
+                            this.$message({
+                                type: 'info',
+                                message: '删除失败'
+                            });                            }
+                    });
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消删除'
+                    });
+                });
+            },
+            //获取默认值
+            defaultData(){
+                if(this.$route.query.aircraftNo!=null){
+                    this.queryBill.flightNo=JSON.parse(this.$route.query.flightNo);
+                    this.queryBill.aircraftNo=JSON.parse(this.$route.query.aircraftNo);
+                    this.queryBill.flightDate=JSON.parse(this.$route.query.flightDate);
+                }
+            },
+            //编辑单据查询
+            handleEdit(index,row){
+                this.$router.push({path:'/bill',query:row})
+            },
+            //分页
             handleSizeChange(val) {
             handleSizeChange(val) {
-                console.log(`每页 ${val} 条`);
+                this.pageSize=val;
             },
             },
             handleCurrentChange(val) {
             handleCurrentChange(val) {
-                console.log(`当前页: ${val}`);
+                this.currentPage=val;
+                this.submitForm();
             }
             }
         },
         },
+        //渲染方法
+        mounted(){
+            this.defaultData();
+            this.submitForm();
+        }
     }
     }
 </script>
 </script>

+<template>
+    <el-container>
+        <el-main>
+            <el-row class="row-bg">
+                <el-col :span="24">
+                    <div class="grid-content content">进港航班配置查询</div>
+                </el-col>
+            </el-row>
+            <!--            搜索区域-->
+            <el-row>
+                <el-form :label-position="labelPosition" :model="queryConfigure" :rules="rules" ref="queryFlight"
+                         label-width="130px" class="demo-ruleForm">
+
+                    <el-col :span="6" >
+                        <el-form-item label="航班号：" prop="flightNo" label-width="80px">
+                            <el-input v-model="queryConfigure.flightNo" style="width:190px"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="5" >
+                        <el-button type="primary" @click="submitForm('queryConfigure')">查询</el-button>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <!--            表单区域-->
+            <el-row>
+                <el-table
+                        :data="tableData"
+                        border
+                        style="width: 100%;margin-bottom: 10px">
+                    <el-table-column
+                            fixed="left"
+                            label="操作"
+                            width="100">
+                        <template slot-scope="scope">
+                            <el-button
+                                    size="mini"
+                                    type="primary"
+                                    @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="username"
+                            label="用户名"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="flightno"
+                            label="航班号"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="ietype"
+                            label="进出港"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="createby"
+                            label="创建人"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="createtime"
+                            label="创建时间"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="updateby"
+                            label="更新人"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="updatetime"
+                            label="更新时间"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop=""
+                            label="报文操作"
+                            width="150">
+                        <template slot-scope="scope">
+                            <el-button
+                                    size="mini"
+                                    type="success"
+                                    @click="handleEdit(scope.$index, scope.row)">查看</el-button>
+                        </template>
+                        <template slot-scope="scope">
+                            <el-button
+                                    size="mini"
+                                    type="danger"
+                                    @click="handleDel(scope.$index, scope.row)">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-row>
+            <el-row>
+                <div class="block">
+                    <el-pagination
+                            @size-change="handleSizeChange"
+                            @current-change="handleCurrentChange"
+                            :current-page="currentPage"
+                            :page-sizes="[100, 200, 300, 400]"
+                            :page-size="100"
+                            layout="total, sizes, prev, pager, next, jumper"
+                            :total="400">
+                    </el-pagination>
+                </div>
+            </el-row>
+        </el-main>
+    </el-container>
+</template>
+<style scoped>
+    .grid-content {
+        height: 36px;
+        line-height: 36px;
+    }
+    .el-dialog__body{text-align: center}
+    .content {
+        border-left: 4px #409EFF solid;
+        padding-left: 10px;
+        background-color: #f9fafc;
+        margin-bottom: 2px
+    }
+
+    .row-bg{
+        background-color: white;
+    }
+
+</style>
+<script>
+    export default {
+        data(){
+            return{
+                queryConfigure:{
+                    flightNo:undefined,
+                },
+                rules:{
+                    flightNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                },
+                labelPosition:'left',
+                currentPage: 4,
+                tableData:[]
+            }
+        },
+        methods: {
+            handleSizeChange(val) {
+                console.log(`每页 ${val} 条`);
+            },
+            handleCurrentChange(val) {
+                console.log(`当前页: ${val}`);
+            }
+        },
+    }
+</script>

+<template>
+    <el-container>
+        <el-main>
+            <el-row class="row-bg">
+                <el-col :span="24">
+                    <div class="grid-content content">进港确报查询</div>
+                </el-col>
+            </el-row>
+            <!--            搜索区域-->
+            <el-row>
+                <el-form :label-position="labelPosition" :model="queryConfirmatory" :rules="rules" ref="queryFlight"
+                         label-width="130px" class="demo-ruleForm">
+                    <el-col :span="6" >
+                        <el-form-item label="承运人：" prop="awcd" label-width="80px">
+                            <el-input v-model="queryConfirmatory.awcd" style="width:190px"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6" >
+                        <el-form-item label="航班号：" prop="flightNo" label-width="80px">
+                            <el-input v-model="queryConfirmatory.flightNo" style="width:190px"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6" >
+                        <el-form-item label="航班日期:" prop="flightDate" label-width="90px">
+                            <el-date-picker
+                                    v-model="queryConfirmatory.flightDate"
+                                    type="date"
+                                    style="width:190px"
+                                    placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="5" >
+                        <el-button type="primary" @click="submitForm('queryConfirmatory')">查询</el-button>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <!--            表单区域-->
+            <el-row>
+                <el-table
+                        :data="tableData"
+                        border
+                        style="width: 100%;margin-bottom: 10px">
+                    <el-table-column
+                            fixed="left"
+                            label="操作"
+                            width="100">
+                        <template slot-scope="scope">
+                            <el-button
+                                    size="mini"
+                                    type="primary"
+                                    @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="flightNo"
+                            label="航班号"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="flightDate"
+                            label="航班日期"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="aircraftNo"
+                            label="航空器注册编码"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="arrivalPort"
+                            label="目的港"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="customDistrictNo"
+                            label="关区代码"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="transportflag"
+                            label="运输计划"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="departuredatetime"
+                            label="离港时间"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="arrivaldatetime"
+                            label="抵港时间"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="statusMsg"
+                            label="海关回执"
+                            width="150">
+                    </el-table-column>
+                    <el-table-column
+                            prop=""
+                            label="报文操作"
+                            width="150">
+                        <template slot-scope="scope">
+                            <el-button
+                                    size="mini"
+                                    type="success"
+                                    @click="handleEdit(scope.$index, scope.row)">查看</el-button>
+                        </template>
+                        <template slot-scope="scope">
+                            <el-button
+                                    size="mini"
+                                    type="danger"
+                                    @click="handleDel(scope.$index, scope.row)">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-row>
+            <el-row>
+                <div class="block">
+                    <el-pagination
+                            @size-change="handleSizeChange"
+                            @current-change="handleCurrentChange"
+                            :current-page="currentPage"
+                            :page-sizes="[100, 200, 300, 400]"
+                            :page-size="100"
+                            layout="total, sizes, prev, pager, next, jumper"
+                            :total="400">
+                    </el-pagination>
+                </div>
+            </el-row>
+        </el-main>
+    </el-container>
+</template>
+<style scoped>
+    .grid-content {
+        height: 36px;
+        line-height: 36px;
+    }
+    .el-dialog__body{text-align: center}
+    .content {
+        border-left: 4px #409EFF solid;
+        padding-left: 10px;
+        background-color: #f9fafc;
+        margin-bottom: 2px
+    }
+
+    .row-bg{
+        background-color: white;
+    }
+
+</style>
+<script>
+    export default {
+        data(){
+            return{
+                queryConfirmatory:{
+                    awcd:undefined,
+                    flightNo:undefined,
+                    flightDate:undefined,
+                },
+                rules:{
+                    awcd: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    flightNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    flightDate: [
+                        {required: true, message: '请选择', trigger: 'change'}
+                    ],
+                },
+                labelPosition:'left',
+                currentPage: 4,
+                tableData:[]
+            }
+        },
+        methods: {
+            handleSizeChange(val) {
+                console.log(`每页 ${val} 条`);
+            },
+            handleCurrentChange(val) {
+                console.log(`当前页: ${val}`);
+            }
+        },
+    }
+</script>

+<template>
+    <el-container>
+        <el-main>
+            <el-row class="row-bg">
+                <el-col :span="24">
+                    <div class="grid-content content">出港确报查询</div>
+                </el-col>
+            </el-row>
+            <!--            搜索区域-->
+            <el-row>
+                <el-form :label-position="labelPosition" :model="queryDeclare" :rules="rules" ref="queryFlight"
+                         label-width="130px" class="demo-ruleForm">
+                    <el-col :span="6" >
+                        <el-form-item label="承运人：" prop="awcd" label-width="80px">
+                            <el-input v-model="queryDeclare.awcd" style="width:190px"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6" >
+                        <el-form-item label="航班号：" prop="flightNo" label-width="80px">
+                            <el-input v-model="queryDeclare.flightNo" style="width:190px"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6" >
+                        <el-form-item label="航班日期:" prop="flightDate" label-width="90px">
+                            <el-date-picker
+                                    v-model="queryDeclare.flightDate"
+                                    type="date"
+                                    style="width:190px"
+                                    placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="5" >
+                        <el-button type="primary" @click="submitForm('queryDeclare')">查询</el-button>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <!--            表单区域-->
+            <el-row>
+                <el-table
+                        :data="tableData"
+                        border
+                        style="width: 100%;margin-bottom: 10px">
+                    <el-table-column
+                            fixed="left"
+                            label="操作"
+                            width="100">
+                        <template slot-scope="scope">
+                            <el-button
+                                    size="mini"
+                                    type="primary"
+                                    @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="flightNo"
+                            label="航班号"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="flightDate"
+                            label="航班日期"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="aircraftNo"
+                            label="航空器注册编码"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="departurePort"
+                            label="出发港"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="arrivalPort"
+                            label="目的港"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="customDistrictNo"
+                            label="关区代码"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="transportflag"
+                            label="运输计划"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="departuredatetime"
+                            label="离港时间"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="statusMsg"
+                            label="海关回执"
+                            width="150">
+                    </el-table-column>
+                    <el-table-column
+                            prop=""
+                            label="报文操作"
+                            width="150">
+                        <template slot-scope="scope">
+                            <el-button
+                                    size="mini"
+                                    type="success"
+                                    @click="handleEdit(scope.$index, scope.row)">查看</el-button>
+                        </template>
+                        <template slot-scope="scope">
+                            <el-button
+                                    size="mini"
+                                    type="danger"
+                                    @click="handleDel(scope.$index, scope.row)">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-row>
+            <el-row>
+                <div class="block">
+                    <el-pagination
+                            @size-change="handleSizeChange"
+                            @current-change="handleCurrentChange"
+                            :current-page="currentPage"
+                            :page-sizes="[100, 200, 300, 400]"
+                            :page-size="100"
+                            layout="total, sizes, prev, pager, next, jumper"
+                            :total="400">
+                    </el-pagination>
+                </div>
+            </el-row>
+        </el-main>
+    </el-container>
+</template>
+<style scoped>
+    .grid-content {
+        height: 36px;
+        line-height: 36px;
+    }
+    .el-dialog__body{text-align: center}
+    .content {
+        border-left: 4px #409EFF solid;
+        padding-left: 10px;
+        background-color: #f9fafc;
+        margin-bottom: 2px
+    }
+
+    .row-bg{
+        background-color: white;
+    }
+
+</style>
+<script>
+    export default {
+        data(){
+            return{
+                queryDeclare:{
+                    awcd:undefined,
+                    flightNo:undefined,
+                    flightDate:undefined,
+                },
+                rules:{
+                    awcd: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    flightNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    flightDate: [
+                        {required: true, message: '请选择', trigger: 'change'}
+                    ],
+                },
+                labelPosition:'left',
+                currentPage: 4,
+                tableData:[]
+            }
+        },
+        methods: {
+            handleSizeChange(val) {
+                console.log(`每页 ${val} 条`);
+            },
+            handleCurrentChange(val) {
+                console.log(`当前页: ${val}`);
+            }
+        },
+    }
+</script>

+<template>
+    <el-container>
+        <el-main>
+            <el-row class="row-bg">
+                <el-col :span="24">
+                    <div class="grid-content content">出港航班查询</div>
+                </el-col>
+            </el-row>
+            <!--            搜索区域-->
+            <el-row>
+                <el-form :label-position="labelPosition" :model="queryDeparture" :rules="rules" ref="queryFlight"
+                         label-width="130px" class="demo-ruleForm">
+                    <el-col :span="6" >
+                        <el-form-item label="承运人：" prop="awcd" label-width="80px">
+                            <el-input v-model="queryDeparture.awcd" style="width:190px"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6" >
+                        <el-form-item label="航班号：" prop="flightNo" label-width="80px">
+                            <el-input v-model="queryDeparture.flightNo" style="width:190px"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6" >
+                        <el-form-item label="航班日期:" prop="flightDate" label-width="90px">
+                            <el-date-picker
+                                    v-model="queryDeparture.flightDate"
+                                    type="date"
+                                    style="width:190px"
+                                    placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="5" >
+                        <el-button type="primary" @click="submitForm('queryDeparture')">查询</el-button>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <!--            表单区域-->
+            <el-row>
+                <el-table
+                        :data="tableData"
+                        border
+                        style="width: 100%;margin-bottom: 10px">
+                    <el-table-column
+                            fixed="left"
+                            label="操作"
+                            width="100">
+                        <template slot-scope="scope">
+                            <el-button
+                                    size="mini"
+                                    type="primary"
+                                    @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="flightNo"
+                            label="航班号"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="flightDate"
+                            label="航班日期"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="aircraftNo"
+                            label="航空器注册编码"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="departurePort"
+                            label="出发港"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="arrivalPort"
+                            label="目的港"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="customDistrictNo"
+                            label="关区代码"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="transportflag"
+                            label="运输计划"
+                            width="150">
+                    </el-table-column>
+                    <el-table-column
+                            prop="departuredatetime"
+                            label="离港时间"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="statusMsg"
+                            label="海关回执"
+                            width="150">
+                    </el-table-column>
+                    <el-table-column
+                            prop=""
+                            label="报文操作"
+                            width="150">
+                        <template slot-scope="scope">
+                            <el-button
+                                    size="mini"
+                                    type="success"
+                                    @click="handleEdit(scope.$index, scope.row)">查看</el-button>
+                        </template>
+                        <template slot-scope="scope">
+                            <el-button
+                                    size="mini"
+                                    type="danger"
+                                    @click="handleDel(scope.$index, scope.row)">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-row>
+            <el-row>
+                <div class="block">
+                    <el-pagination
+                            @size-change="handleSizeChange"
+                            @current-change="handleCurrentChange"
+                            :current-page="currentPage"
+                            :page-sizes="[100, 200, 300, 400]"
+                            :page-size="100"
+                            layout="total, sizes, prev, pager, next, jumper"
+                            :total="400">
+                    </el-pagination>
+                </div>
+            </el-row>
+        </el-main>
+    </el-container>
+</template>
+<style scoped>
+    .grid-content {
+        height: 36px;
+        line-height: 36px;
+    }
+    .el-dialog__body{text-align: center}
+    .content {
+        border-left: 4px #409EFF solid;
+        padding-left: 10px;
+        background-color: #f9fafc;
+        margin-bottom: 2px
+    }
+
+    .row-bg{
+        background-color: white;
+    }
+
+</style>
+<script>
+    export default {
+        data(){
+            return{
+                queryDeparture:{
+                    awcd:undefined,
+                    flightNo:undefined,
+                    flightDate:undefined,
+                },
+                rules:{
+                    awcd: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    flightNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    flightDate: [
+                        {required: true, message: '请选择', trigger: 'change'}
+                    ],
+                },
+                labelPosition:'left',
+                currentPage: 4,
+                tableData:[]
+            }
+        },
+        methods: {
+            handleSizeChange(val) {
+                console.log(`每页 ${val} 条`);
+            },
+            handleCurrentChange(val) {
+                console.log(`当前页: ${val}`);
+            }
+        },
+    }
+</script>

@@ -6,30 +6,31 @@
                     <div class="grid-content content">航班查询</div>
                     <div class="grid-content content">航班查询</div>
                 </el-col>
                 </el-col>
             </el-row>
             </el-row>
-            <!--            搜索区域-->
+            <!--搜索区域-->
             <el-row>
             <el-row>
                 <el-form :label-position="labelPosition" :model="queryFlight" :rules="rules" ref="queryFlight"
                 <el-form :label-position="labelPosition" :model="queryFlight" :rules="rules" ref="queryFlight"
                          label-width="130px" class="demo-ruleForm">
                          label-width="130px" class="demo-ruleForm">
-                    <el-col :span="8">
-                        <el-form-item label="航空公司代码：" prop="flightNo" label-width="110px">
-                            <el-input v-model="queryFlight.flightNo" style="width:190px"></el-input>
+                    <el-col :span="6">
+                        <el-form-item label="航空公司代码：" prop="aircraftNo" label-width="110px">
+                            <el-input v-model="queryFlight.aircraftNo"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
-                    <el-col :span="8" >
-                        <el-form-item label="航班号：" prop="aircraftNo" label-width="80px">
-                            <el-input v-model="queryFlight.aircraftNo" style="width:190px"></el-input>
+                    <el-col :span="6">
+                        <el-form-item label="航班号：" prop="flightNo" label-width="70px">
+                            <el-input v-model="queryFlight.flightNo"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
-                    <el-col :span="6" >
+                    <el-col :span="3">
                         <el-button type="primary" @click="submitForm('queryFlight')">查询</el-button>
                         <el-button type="primary" @click="submitForm('queryFlight')">查询</el-button>
                     </el-col>
                     </el-col>
                 </el-form>
                 </el-form>
             </el-row>
             </el-row>
-            <!--            表单区域-->
+            <!--表单区域-->
             <el-row>
             <el-row>
                 <el-table
                 <el-table
                         :data="tableData"
                         :data="tableData"
                         border
                         border
+                        v-loading="tableloading"
                         style="width: 100%;margin-bottom: 10px">
                         style="width: 100%;margin-bottom: 10px">
                     <el-table-column
                     <el-table-column
                             fixed="left"
                             fixed="left"
@@ -43,72 +44,51 @@
                         </template>
                         </template>
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="flightNo"
                             prop="flightNo"
-                            label="航班号"
-                            width="80">
+                            label="航班号">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="airwayCode"
                             prop="airwayCode"
-                            label="航空公司代码"
-                            width="120">
+                            label="航空公司代码">
                     </el-table-column>
                     </el-table-column>
-
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="flightDate"
                             prop="flightDate"
-                            label="航空公司中文"
-                            width="150">
+                            label="航空公司中文">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="transportAgentCode"
                             prop="transportAgentCode"
-                            label="传输代理人"
-                            width="120">
+                            label="传输代理人">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="groundAgentCode"
                             prop="groundAgentCode"
-                            label="地面代理人"
-                            width="120">
+                            label="地面代理人">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
-                            prop="departuredatetime"
-                            label="运输计划"
-                            width="150">
+                            prop="linesType"
+                            label="运输计划">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="flightType"
                             prop="flightType"
-                            label="航班性质"
-                            width="80">
+                            label="航班性质">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="shareFlightNo"
                             prop="shareFlightNo"
-                            label="共享航班号"
-                            width="150">
+                            label="共享航班号">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="statusMsg"
                             prop="statusMsg"
                             label="海关回执"
                             label="海关回执"
-                            width="150">
+                            width="180">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
-                            prop=""
+                            fixed="right"
                             label="报文操作"
                             label="报文操作"
-                            width="150">
+                            width="200">
                         <template slot-scope="scope">
                         <template slot-scope="scope">
                             <el-button
                             <el-button
                                     size="mini"
                                     size="mini"
                                     type="success"
                                     type="success"
                                     @click="handleEdit(scope.$index, scope.row)">查看</el-button>
                                     @click="handleEdit(scope.$index, scope.row)">查看</el-button>
-                        </template>
-                        <template slot-scope="scope">
                             <el-button
                             <el-button
                                     size="mini"
                                     size="mini"
                                     type="danger"
                                     type="danger"
@@ -123,10 +103,10 @@
                             @size-change="handleSizeChange"
                             @size-change="handleSizeChange"
                             @current-change="handleCurrentChange"
                             @current-change="handleCurrentChange"
                             :current-page="currentPage"
                             :current-page="currentPage"
-                            :page-sizes="[100, 200, 300, 400]"
-                            :page-size="100"
+                            :page-sizes="[10, 20, 30, 40]"
+                            :page-size="pageSize"
                             layout="total, sizes, prev, pager, next, jumper"
                             layout="total, sizes, prev, pager, next, jumper"
-                            :total="400">
+                            :total="total">
                     </el-pagination>
                     </el-pagination>
                 </div>
                 </div>
             </el-row>
             </el-row>
@@ -149,9 +129,10 @@
     .row-bg{
     .row-bg{
         background-color: white;
         background-color: white;
     }
     }
-
 </style>
 </style>
 <script>
 <script>
+    import {editFlight, selectFlight} from "../../api/transport";
+
     export default {
     export default {
         data(){
         data(){
             return{
             return{
@@ -159,19 +140,79 @@
                     flightNo:undefined,
                     flightNo:undefined,
                     aircraftNo:undefined,
                     aircraftNo:undefined,
                 },
                 },
-                rules:{},
+                rules:{
+
+                },
                 labelPosition:'left',
                 labelPosition:'left',
-                currentPage: 4,
-                tableData:[]
+                currentPage: 1,
+                pageSize:10,
+                total:0,
+                tableData:[],
+                tableloading:false
+
             }
             }
         },
         },
         methods: {
         methods: {
+            //分页方法
             handleSizeChange(val) {
             handleSizeChange(val) {
-                console.log(`每页 ${val} 条`);
+                this.pageSize=val;
             },
             },
             handleCurrentChange(val) {
             handleCurrentChange(val) {
-                console.log(`当前页: ${val}`);
+                this.currentPage=val;
+                this.submitForm();
+            },
+            //获取航班列表
+            submitForm(){
+                let params={currentPage:this.currentPage,pageSize:this.pageSize,flightNo:this.queryFlight.flightNo,aircraftNo:this.queryFlight.aircraftNo};
+                this.tableloading=true;
+                selectFlight(params).then(res=>{
+                    let response=res.data.data;
+                    this.tableData=response.list;
+                    this.tableloading=false;
+                    this.total=response.total;
+                });
+            },
+            //编辑航班查询功能
+            handleEdit(index,row){
+                this.$router.push({path:'/flights',query:row})
+            },
+            //获取默认值
+             defaultData(){
+                 Object.assign(this.queryFlight, this.$route.query);
+             },
+            //列表删除功能
+            handleDel(index,row){
+                this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    editFlight(row).then(res=>{
+                        let response=res.data;
+                        if(response.code=='200'){
+                            this.$message({
+                                type: 'info',
+                                message: '删除成功'
+                            });
+                            this.submitForm();
+                        }else{
+                            this.$message({
+                                type: 'info',
+                                message: '删除失败'
+                            });                            }
+                    });
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消删除'
+                    });
+                });
             }
             }
         },
         },
+        //渲染方法
+        mounted(){
+            this.defaultData();
+            this.submitForm();
+        }
     }
     }
 </script>
 </script>

+<template>
+    <el-container>
+        <el-main>
+            <el-row class="row-bg">
+                <el-col :span="24">
+                    <div class="grid-content content">出港航班配置查询</div>
+                </el-col>
+            </el-row>
+            <!--            搜索区域-->
+            <el-row>
+                <el-form :label-position="labelPosition" :model="queryFlightConfigure" :rules="rules" ref="queryFlight"
+                         label-width="130px" class="demo-ruleForm">
+
+                    <el-col :span="6" >
+                        <el-form-item label="航班号：" prop="flightNo" label-width="80px">
+                            <el-input v-model="queryFlightConfigure.flightNo" style="width:190px"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="5" >
+                        <el-button type="primary" @click="submitForm('queryFlightConfigure')">查询</el-button>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <!--            表单区域-->
+            <el-row>
+                <el-table
+                        :data="tableData"
+                        border
+                        style="width: 100%;margin-bottom: 10px">
+                    <el-table-column
+                            fixed="left"
+                            label="操作"
+                            width="100">
+                        <template slot-scope="scope">
+                            <el-button
+                                    size="mini"
+                                    type="primary"
+                                    @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="username"
+                            label="用户名"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="flightno"
+                            label="航班号"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="ietype"
+                            label="进出港"
+                            width="80">
+                    </el-table-column>
+                    <el-table-column
+                            prop="createby"
+                            label="创建人"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="createtime"
+                            label="创建时间"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="updateby"
+                            label="更新人"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="updatetime"
+                            label="更新时间"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop=""
+                            label="报文操作"
+                            width="150">
+                        <template slot-scope="scope">
+                            <el-button
+                                    size="mini"
+                                    type="success"
+                                    @click="handleEdit(scope.$index, scope.row)">查看</el-button>
+                        </template>
+                        <template slot-scope="scope">
+                            <el-button
+                                    size="mini"
+                                    type="danger"
+                                    @click="handleDel(scope.$index, scope.row)">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-row>
+            <el-row>
+                <div class="block">
+                    <el-pagination
+                            @size-change="handleSizeChange"
+                            @current-change="handleCurrentChange"
+                            :current-page="currentPage"
+                            :page-sizes="[100, 200, 300, 400]"
+                            :page-size="100"
+                            layout="total, sizes, prev, pager, next, jumper"
+                            :total="400">
+                    </el-pagination>
+                </div>
+            </el-row>
+        </el-main>
+    </el-container>
+</template>
+<style scoped>
+    .grid-content {
+        height: 36px;
+        line-height: 36px;
+    }
+    .el-dialog__body{text-align: center}
+    .content {
+        border-left: 4px #409EFF solid;
+        padding-left: 10px;
+        background-color: #f9fafc;
+        margin-bottom: 2px
+    }
+
+    .row-bg{
+        background-color: white;
+    }
+
+</style>
+<script>
+    export default {
+        data(){
+            return{
+                queryFlightConfigure:{
+                    flightNo:undefined,
+                },
+                rules:{
+                    flightNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                },
+                labelPosition:'left',
+                currentPage: 4,
+                tableData:[]
+            }
+        },
+        methods: {
+            handleSizeChange(val) {
+                console.log(`每页 ${val} 条`);
+            },
+            handleCurrentChange(val) {
+                console.log(`当前页: ${val}`);
+            }
+        },
+    }
+</script>

@@ -26,6 +26,7 @@
                             <el-date-picker
                             <el-date-picker
                                     v-model="queryFlightplan.flightDate"
                                     v-model="queryFlightplan.flightDate"
                                     type="date"
                                     type="date"
+                                    format="yyyyMMdd"
                                     style="width:190px"
                                     style="width:190px"
                                     placeholder="选择日期">
                                     placeholder="选择日期">
                             </el-date-picker>
                             </el-date-picker>
@@ -54,73 +55,61 @@
                         </template>
                         </template>
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="flightNo"
                             prop="flightNo"
                             label="航班号"
                             label="航班号"
                             width="80">
                             width="80">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="flightDate"
                             prop="flightDate"
                             label="航班日期"
                             label="航班日期"
                             width="150">
                             width="150">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="departurePort"
                             prop="departurePort"
                             label="出发港"
                             label="出发港"
                             width="80">
                             width="80">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="departureCustomNo"
                             prop="departureCustomNo"
                             label="关区代码"
                             label="关区代码"
                             width="80">
                             width="80">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="arrivalPort"
                             prop="arrivalPort"
                             label="目的港"
                             label="目的港"
                             width="80">
                             width="80">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="arrivalCustomNo"
                             prop="arrivalCustomNo"
                             label="关区代码"
                             label="关区代码"
                             width="80">
                             width="80">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="currentTakeoffTime"
                             prop="currentTakeoffTime"
                             label="离港时间"
                             label="离港时间"
                             width="150">
                             width="150">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="currentLandingTime"
                             prop="currentLandingTime"
                             label="抵港时间"
                             label="抵港时间"
                             width="150">
                             width="150">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="transportflag"
                             prop="transportflag"
                             label="进出港"
                             label="进出港"
                             width="80">
                             width="80">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="linesType"
                             prop="linesType"
                             label="执行任务类型"
                             label="执行任务类型"
                             width="150">
                             width="150">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="statusMsg"
                             prop="statusMsg"
                             label="海关回执"
                             label="海关回执"
                             width="150">
                             width="150">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop=""
                             prop=""
                             label="报文操作"
                             label="报文操作"
                             width="150">
                             width="150">
@@ -145,10 +134,10 @@
                             @size-change="handleSizeChange"
                             @size-change="handleSizeChange"
                             @current-change="handleCurrentChange"
                             @current-change="handleCurrentChange"
                             :current-page="currentPage"
                             :current-page="currentPage"
-                            :page-sizes="[100, 200, 300, 400]"
-                            :page-size="100"
+                            :page-sizes="[10, 20, 30, 40]"
+                            :page-size="pageSize"
                             layout="total, sizes, prev, pager, next, jumper"
                             layout="total, sizes, prev, pager, next, jumper"
-                            :total="400">
+                            :total="total">
                     </el-pagination>
                     </el-pagination>
                 </div>
                 </div>
             </el-row>
             </el-row>
@@ -174,6 +163,7 @@
 
 
 </style>
 </style>
 <script>
 <script>
+    import {selectFlightPlan, editFlightPlan} from "../../api/transport";
     export default {
     export default {
         data(){
         data(){
             return{
             return{
@@ -184,17 +174,81 @@
                 },
                 },
                 rules:{},
                 rules:{},
                 labelPosition:'left',
                 labelPosition:'left',
-                currentPage: 4,
-                tableData:[]
+                currentPage: 1,
+                pageSize:10,
+                total:0,
+                tableData: [],
+                tableloading:false
+
             }
             }
         },
         },
         methods: {
         methods: {
+            //分页
             handleSizeChange(val) {
             handleSizeChange(val) {
-                console.log(`每页 ${val} 条`);
+                this.pageSize=val;
             },
             },
             handleCurrentChange(val) {
             handleCurrentChange(val) {
-                console.log(`当前页: ${val}`);
-            }
+                this.currentPage=val;
+                this.submitForm();
+            },
+            //获取当日飞行计划列表
+            submitForm() {
+                let params = {
+                    currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryFlightplan.flightNo,
+                    aircraftNo: this.queryFlightplan.aircraftNo, flightDate: this.queryFlightplan.flightDate
+                };
+                this.tableloading = true;
+                selectFlightPlan(params).then(res => {
+                    let response = res.data.data;
+                    this.tableData = response.list;
+                    this.tableloading = false;
+                    this.total = response.total;
+                });
+            },
+            //列表删除功能
+            handleDel(index, row) {
+                this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    editFlightPlan(row).then(res => {
+                        let response = res.data;
+                        if (response.code == '200') {
+                            this.$message({
+                                type: 'info',
+                                message: '删除成功'
+                            });
+                            this.submitForm();
+                        } else {
+                            this.$message({
+                                type: 'info',
+                                message: '删除失败'
+                            });
+                        }
+                    });
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消删除'
+                    });
+                });
+            },
+            //获取默认值
+            defaultData() {
+                this.flightNo = JSON.parse(this.$route.query.flightNo);
+                this.flightDate = JSON.parse(this.$route.query.flightDate);
+                this.aircraftNo = JSON.parse(this.$route.query.aircraftNo);
+            },
+            //编辑当日飞行计划
+            handleEdit(index,row){
+                this.$router.push({path:'/flightplan',query: row})
         },
         },
+           //渲染方法
+           mounted(){
+           this.defaultData();
+           this.submitForm();
+       }
+      }
     }
     }
 </script>
 </script>

@@ -7,20 +7,24 @@
                 </el-col>
                 </el-col>
             </el-row>
             </el-row>
             <el-row>
             <el-row>
-                    <el-form :label-position="labelPosition" :model="queryRoute" :rules="rules" ref="queryRoute" label-width="130px" class="demo-ruleForm">
-                        <el-col :span="6">
-                            <el-form-item label="航线序号" prop="seqNo" label-width="70px">
-                                <el-input v-model="queryRoute.seqNo"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="3">   <el-button type="primary" @click="submitForm('queryRoute')">保 存</el-button></el-col>
-                    </el-form>
+                <el-form :model="queryRoute" ref="serialNo" label-width="130px" >
+                    <el-col :span="6">
+                        <el-form-item label="航线序号" prop="serialNo" label-width="80px">
+                            <el-input v-model="queryRoute.serialNo" placeholder="请输入"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">   <el-button type="primary" @click="submitForm()">查 询</el-button></el-col>
+
+                </el-form>
+
             </el-row>
             </el-row>
             <el-row>
             <el-row>
+                <el-col :span="24">
                     <el-table
                     <el-table
                             :data="tableData"
                             :data="tableData"
                             border
                             border
-                            style="width: 100%;margin-bottom: 10px">
+                            v-loading="tableloading"
+                            style="width:100%;margin-bottom: 10px">
                         <el-table-column
                         <el-table-column
                                 fixed="left"
                                 fixed="left"
                                 label="操作"
                                 label="操作"
@@ -29,82 +33,77 @@
                                 <el-button
                                 <el-button
                                         size="mini"
                                         size="mini"
                                         type="primary"
                                         type="primary"
-                                        @click="handleEdit(scope.$index, scope.row)">选择</el-button>
+                                        @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
                             </template>
                             </template>
                         </el-table-column>
                         </el-table-column>
                         <el-table-column
                         <el-table-column
-                                fixed
                                 prop="serialNo"
                                 prop="serialNo"
                                 label="航线序号"
                                 label="航线序号"
                                 width="80">
                                 width="80">
                         </el-table-column>
                         </el-table-column>
                         <el-table-column
                         <el-table-column
-                                fixed
                                 prop="departurePort"
                                 prop="departurePort"
                                 label="出发港"
                                 label="出发港"
                                 width="80">
                                 width="80">
                         </el-table-column>
                         </el-table-column>
                         <el-table-column
                         <el-table-column
-                                fixed
                                 prop="departureCustomNo"
                                 prop="departureCustomNo"
                                 label="出发港关区代码"
                                 label="出发港关区代码"
                                 width="150">
                                 width="150">
                         </el-table-column>
                         </el-table-column>
                         <el-table-column
                         <el-table-column
-                                fixed
                                 prop="arrivalPort"
                                 prop="arrivalPort"
                                 label="目的港"
                                 label="目的港"
                                 width="80">
                                 width="80">
                         </el-table-column>
                         </el-table-column>
                         <el-table-column
                         <el-table-column
-                                fixed
                                 prop="arrivalCustomNo"
                                 prop="arrivalCustomNo"
                                 label="目的港关区代码"
                                 label="目的港关区代码"
                                 width="150">
                                 width="150">
                         </el-table-column>
                         </el-table-column>
                         <el-table-column
                         <el-table-column
-                                fixed
                                 prop="std"
                                 prop="std"
                                 label="长期离港时间"
                                 label="长期离港时间"
                                 width="150">
                                 width="150">
                         </el-table-column>
                         </el-table-column>
                         <el-table-column
                         <el-table-column
-                                fixed
                                 prop="sta"
                                 prop="sta"
                                 label="长期抵港时间"
                                 label="长期抵港时间"
                                 width="150">
                                 width="150">
                         </el-table-column>
                         </el-table-column>
                         <el-table-column
                         <el-table-column
-                                fixed
                                 prop="effStartdate"
                                 prop="effStartdate"
                                 label="有效期起始时间"
                                 label="有效期起始时间"
                                 width="150">
                                 width="150">
                         </el-table-column>
                         </el-table-column>
                         <el-table-column
                         <el-table-column
-                                fixed
                                 prop="effEnddate"
                                 prop="effEnddate"
                                 label="有效期结束时间"
                                 label="有效期结束时间"
                                 width="150">
                                 width="150">
                         </el-table-column>
                         </el-table-column>
                         <el-table-column
                         <el-table-column
-                                fixed
                                 prop="plan"
                                 prop="plan"
                                 label="每周执行情况"
                                 label="每周执行情况"
                                 width="150">
                                 width="150">
                         </el-table-column>
                         </el-table-column>
                         <el-table-column
                         <el-table-column
-                                fixed
+
                                 prop="remark"
                                 prop="remark"
                                 label="报文操作"
                                 label="报文操作"
-                                width="150">
+                                width="250">
                             <template slot-scope="scope">
                             <template slot-scope="scope">
                                 <el-button
                                 <el-button
                                         size="mini"
                                         size="mini"
                                         type="primary"
                                         type="primary"
-                                        @click="handleEdit(scope.$index, scope.row)">选择</el-button>
+                                        @click="handleDetail(scope.$index, scope.row)">查看明细</el-button>
+                                <el-button
+                                        size="mini"
+                                        type="primary"
+                                        @click="handleDelete(scope.$index, scope.row)">删除</el-button>
                             </template>
                             </template>
                         </el-table-column>
                         </el-table-column>
                     </el-table>
                     </el-table>
+                </el-col>
             </el-row>
             </el-row>
             <el-row>
             <el-row>
                 <div class="block">
                 <div class="block">
@@ -112,10 +111,10 @@
                             @size-change="handleSizeChange"
                             @size-change="handleSizeChange"
                             @current-change="handleCurrentChange"
                             @current-change="handleCurrentChange"
                             :current-page="currentPage"
                             :current-page="currentPage"
-                            :page-sizes="[100, 200, 300, 400]"
-                            :page-size="100"
+                            :page-sizes="[10, 20, 30, 40]"
+                            :page-size="pageSize"
                             layout="total, sizes, prev, pager, next, jumper"
                             layout="total, sizes, prev, pager, next, jumper"
-                            :total="400">
+                            :total="total">
                     </el-pagination>
                     </el-pagination>
                 </div>
                 </div>
             </el-row>
             </el-row>
@@ -140,27 +139,83 @@
     }
     }
 </style>
 </style>
 <script>
 <script>
+    import {editRoute, selectRoute} from "../../api/transport";
+
     export default {
     export default {
         data(){
         data(){
             return{
             return{
                 queryRoute:{
                 queryRoute:{
-                    seqNo:undefined
+                    serialNo:undefined,
                 },
                 },
-
-                rules:{},
                 labelPosition:'left',
                 labelPosition:'left',
-                currentPage: 4,
-                tableData:[]
-
+                currentPage: 1,
+                pageSize:10,
+                total:0,
+                tableData:[],
+                tableloading:false,
             }
             }
         },
         },
         methods: {
         methods: {
+            //分页方法
             handleSizeChange(val) {
             handleSizeChange(val) {
-                console.log(`每页 ${val} 条`);
+                this.pageSize=val;
             },
             },
             handleCurrentChange(val) {
             handleCurrentChange(val) {
-                console.log(`当前页: ${val}`);
+                this.currentPage=val;
+                this.submitForm();
+            },
+            //获取航线列表
+            submitForm(){
+                let params={currentPage:this.currentPage,pageSize:this.pageSize,serialNo:this.queryRoute.serialNo};
+                this.tableloading=true;
+                selectRoute(params).then(res=>{
+                    let response=res.data.data;
+                    this.tableData=response.list;
+                    this.tableloading=false;
+                    this.total=response.total;
+                     });
+                },
+            //编辑航线功能
+            handleEdit(index,row){
+                this.$router.push({path:'/route',query:row})
+            },
+            //获取默认值
+            defaultData(){
+                Object.assign(this.queryRoute, this.$route.query);
+            },
+            //列表删除功能
+            handleDelete(index,row){
+                    this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        editRoute(row).then(res=>{
+                            let response=res.data;
+                            if(response.code=='200'){
+                                this.$message({
+                                    type: 'info',
+                                    message: '删除成功'
+                                });
+                                this.submitForm();
+                            }else{
+                                this.$message({
+                                    type: 'info',
+                                    message: '删除失败'
+                                });                            }
+                        });
+                    }).catch(() => {
+                        this.$message({
+                            type: 'info',
+                            message: '已取消删除'
+                        });
+                    });
             }
             }
         },
         },
+        //渲染方法
+        mounted(){
+            this.defaultData();
+            this.submitForm();
+        }
     }
     }
 </script>
 </script>

@@ -8,7 +8,7 @@
             </el-row>
             </el-row>
             <!--            搜索区域-->
             <!--            搜索区域-->
             <el-row>
             <el-row>
-                <el-form :label-position="labelPosition" :model="queryRouteaircraft" :rules="rules" ref="queryAircraft"
+                <el-form :label-position="labelPosition" :model="queryRouteaircraft" :rules="rules" ref="queryRouteaircraft"
                          label-width="130px" class="demo-ruleForm">
                          label-width="130px" class="demo-ruleForm">
                     <el-col :span="8">
                     <el-col :span="8">
                         <el-form-item label="航空器所有人代码:" prop="airwayCode" label-width="130px">
                         <el-form-item label="航空器所有人代码:" prop="airwayCode" label-width="130px">
@@ -21,7 +21,7 @@
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6" >
                     <el-col :span="6" >
-                        <el-button type="primary" @click="submitForm('queryBill')">查询</el-button>
+                        <el-button type="primary" @click="submitForm('queryRouteaircraft')">查询</el-button>
                     </el-col>
                     </el-col>
                 </el-form>
                 </el-form>
             </el-row>
             </el-row>
@@ -30,6 +30,7 @@
                 <el-table
                 <el-table
                         :data="tableData"
                         :data="tableData"
                         border
                         border
+                        v-loading="tableloading"
                         style="width: 100%;margin-bottom: 10px">
                         style="width: 100%;margin-bottom: 10px">
                     <el-table-column
                     <el-table-column
                             fixed="left"
                             fixed="left"
@@ -43,73 +44,61 @@
                         </template>
                         </template>
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop=ownerCo"
                             prop=ownerCo"
                             label="航空器所有人代码"
                             label="航空器所有人代码"
                             width="120">
                             width="120">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="airwayNameEn"
                             prop="airwayNameEn"
                             label="所有人英文名称"
                             label="所有人英文名称"
                             width="120">
                             width="120">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="airwayNameCn"
                             prop="airwayNameCn"
                             label="所有人中文名称"
                             label="所有人中文名称"
                             width="150">
                             width="150">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="aircraftNo"
                             prop="aircraftNo"
                             label="航空器注册编号"
                             label="航空器注册编号"
                             width="120">
                             width="120">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="certNo"
                             prop="certNo"
                             label="国际证书编号"
                             label="国际证书编号"
                             width="120">
                             width="120">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="owner"
                             prop="owner"
                             label="航空器所有人"
                             label="航空器所有人"
                             width="120">
                             width="120">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="areoNationality"
                             prop="areoNationality"
                             label="国籍"
                             label="国籍"
                             width="80">
                             width="80">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="areoModel"
                             prop="areoModel"
                             label="机型"
                             label="机型"
                             width="80">
                             width="80">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="deliverDate"
                             prop="deliverDate"
                             label="交付日期"
                             label="交付日期"
                             width="120">
                             width="120">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="statusMsg"
                             prop="statusMsg"
                             label="海关回执"
                             label="海关回执"
                             width="120">
                             width="120">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop="supervisoryProperty"
                             prop="supervisoryProperty"
                             label="所有权监管"
                             label="所有权监管"
                             width="120">
                             width="120">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
-                            fixed
                             prop=""
                             prop=""
                             label="报文操作"
                             label="报文操作"
                             width="150">
                             width="150">
@@ -134,10 +123,10 @@
                             @size-change="handleSizeChange"
                             @size-change="handleSizeChange"
                             @current-change="handleCurrentChange"
                             @current-change="handleCurrentChange"
                             :current-page="currentPage"
                             :current-page="currentPage"
-                            :page-sizes="[100, 200, 300, 400]"
-                            :page-size="100"
+                            :page-sizes="[10, 20, 30, 40]"
+                            :page-size="pageSize"
                             layout="total, sizes, prev, pager, next, jumper"
                             layout="total, sizes, prev, pager, next, jumper"
-                            :total="400">
+                            :total="total">
                     </el-pagination>
                     </el-pagination>
                 </div>
                 </div>
             </el-row>
             </el-row>
@@ -163,28 +152,90 @@
 
 
 </style>
 </style>
 <script>
 <script>
+    import {editAirLineAircraft, selectAirLineAircraft} from "../../api/transport";
+
     export default {
     export default {
         data(){
         data(){
             return{
             return{
                 queryRouteaircraft:{
                 queryRouteaircraft:{
-                    flightNo:undefined,
+                    airwayCode:undefined,
                     aircraftNo:undefined,
                     aircraftNo:undefined,
-                    flightDate:undefined,
-                    accessFlag:undefined,
                 },
                 },
-                rules:{},
                 labelPosition:'left',
                 labelPosition:'left',
-                currentPage: 4,
-                tableData:[]
+                currentPage: 1,
+                pageSize:10,
+                total:0,
+                tableData:[],
+                tableloading:false
             }
             }
         },
         },
         methods: {
         methods: {
+            //分页
             handleSizeChange(val) {
             handleSizeChange(val) {
-                console.log(`每页 ${val} 条`);
+                this.pageSize=val;
             },
             },
             handleCurrentChange(val) {
             handleCurrentChange(val) {
-                console.log(`当前页: ${val}`);
+                this.currentPage=val;
+                this.submitForm();
+            },
+            //获取航线航空器列表
+            submitForm() {
+                let params = {
+                    currentPage: this.currentPage, pageSize: this.pageSize, airwayCode: this.queryRouteaircraft.airwayCode,
+                    aircraftNo: this.queryRouteaircraft.aircraftNo
+                };
+                this.tableloading = true;
+                selectAirLineAircraft(params).then(res => {
+                    let response = res.data.data;
+                    this.tableData = response.list;
+                    this.tableloading = false;
+                    this.total = response.total;
+                });
+            },
+            //列表删除功能
+            handleDel(index, row) {
+                this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    editAirLineAircraft(row).then(res => {
+                        let response = res.data;
+                        if (response.code == '200') {
+                            this.$message({
+                                type: 'info',
+                                message: '删除成功'
+                            });
+                            this.submitForm();
+                        } else {
+                            this.$message({
+                                type: 'info',
+                                message: '删除失败'
+                            });
+                        }
+                    });
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消删除'
+                    });
+                });
+            },
+            //获取默认值
+            defaultData() {
+                this.airwayCode = JSON.parse(this.$route.query.airwayCode);
+                this.aircraftNo = JSON.parse(this.$route.query.aircraftNo);
+            },
+            //编辑航线航空器
+            handleEdit(index,row){
+                this.$router.push({path:'/routeaircraft',query: row})
+            },
+            //渲染方法
+            mounted(){
+                this.defaultData();
+                this.submitForm();
             }
             }
-        },
+        }
+
     }
     }
 </script>
 </script>

@@ -9,23 +9,27 @@
             <el-row>
             <el-row>
                 <el-form :model="airline" :rules="rules" ref="airline" label-width="100px" class="demo-ruleForm">
                 <el-form :model="airline" :rules="rules" ref="airline" label-width="100px" class="demo-ruleForm">
                     <el-col :span="6">
                     <el-col :span="6">
-                            <el-form-item label="出发港" prop="departurePort" label-width="120px">
-                                <el-input v-model="airline.departurePort"></el-input>
+                                <el-form-item label="出发港" prop="departurePort" label-width="120px">
+                                <el-input @input="e => airline.departurePort=inputMe(e)" v-model="airline.departurePort"
+                                          maxLength='3' ></el-input>
                             </el-form-item>
                             </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="出发港关区" prop="departureCustomNo" label-width="120px">
                         <el-form-item label="出发港关区" prop="departureCustomNo" label-width="120px">
-                            <el-input v-model="airline.departureCustomNo"></el-input>
+                            <el-input v-model="airline.departureCustomNo" oninput="value=value.replace(/[^\d]/g,'')"
+                                      maxLength='4'></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="目的港" prop="arrivalPort" label-width="120px">
                         <el-form-item label="目的港" prop="arrivalPort" label-width="120px">
-                            <el-input v-model="airline.arrivalPort"></el-input>
+                            <el-input @input="e => airline.arrivalPort=inputMe(e)" v-model="airline.arrivalPort"
+                                      maxLength='3'></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="目的港关区" prop="arrivalCustomNo" label-width="120px">
                         <el-form-item label="目的港关区" prop="arrivalCustomNo" label-width="120px">
-                            <el-input v-model="airline.arrivalCustomNo"></el-input>
+                            <el-input v-model="airline.arrivalCustomNo" oninput="value=value.replace(/[^\d]/g,'')"
+                                      maxLength='4'></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="24">
                     <el-col :span="24">
@@ -40,7 +44,7 @@
                     </el-col>
                     </el-col>
                     <el-col :span="24" style="margin-bottom: 20px">
                     <el-col :span="24" style="margin-bottom: 20px">
                             <el-col :span="24">
                             <el-col :span="24">
-                                <div class="grid-content content">长期飞行计划<el-button type="primary" size="mini" @click="dialogTableVisible = true" style="margin-left:25px">长期飞行计划查询</el-button></div>
+                                <div class="grid-content content">长期飞行计划<el-button type="primary" size="mini" @click="selectLongplan()" style="margin-left:25px">长期飞行计划查询</el-button></div>
                             </el-col>
                             </el-col>
                     </el-col>
                     </el-col>
                     <el-col :span="8">
                     <el-col :span="8">
@@ -55,6 +59,7 @@
                                     :picker-options="{
                                     :picker-options="{
                                     selectableRange: '00:00:00 - 23:59:59'
                                     selectableRange: '00:00:00 - 23:59:59'
                                     }"
                                     }"
+                                    format="HHmmss"
                                     style="width:100%"
                                     style="width:100%"
                                     placeholder="任意时间点">
                                     placeholder="任意时间点">
                             </el-time-picker>
                             </el-time-picker>
@@ -67,6 +72,7 @@
                                     :picker-options="{
                                     :picker-options="{
                                     selectableRange: '00:00:00 - 23:59:59'
                                     selectableRange: '00:00:00 - 23:59:59'
                                     }"
                                     }"
+                                    format="HHmmss"
                                     style="width:100%"
                                     style="width:100%"
                                     placeholder="任意时间点">
                                     placeholder="任意时间点">
                             </el-time-picker>
                             </el-time-picker>
@@ -77,6 +83,8 @@
                             <el-date-picker
                             <el-date-picker
                                     v-model="airline.effStartdate"
                                     v-model="airline.effStartdate"
                                     type="date"
                                     type="date"
+                                    value-format="yyyyMMdd"
+                                    format="yyyyMMdd"
                                     style="width:100%"
                                     style="width:100%"
                                     placeholder="选择日期">
                                     placeholder="选择日期">
                             </el-date-picker>
                             </el-date-picker>
@@ -87,6 +95,8 @@
                             <el-date-picker
                             <el-date-picker
                                     v-model="airline.effEnddate"
                                     v-model="airline.effEnddate"
                                     type="date"
                                     type="date"
+                                    value-format="yyyyMMdd"
+                                    format="yyyyMMdd"
                                     style="width:100%"
                                     style="width:100%"
                                     placeholder="选择日期">
                                     placeholder="选择日期">
                             </el-date-picker>
                             </el-date-picker>
@@ -108,6 +118,7 @@
                         <el-table
                         <el-table
                                 :data="tableData"
                                 :data="tableData"
                                 border
                                 border
+                                v-loading="tableloading"
                                 style="width: 100%;margin-bottom: 10px">
                                 style="width: 100%;margin-bottom: 10px">
                             <el-table-column
                             <el-table-column
                                     fixed="left"
                                     fixed="left"
@@ -121,25 +132,21 @@
                                 </template>
                                 </template>
                             </el-table-column>
                             </el-table-column>
                             <el-table-column
                             <el-table-column
-                                    fixed
                                     prop="std"
                                     prop="std"
                                     label="长期离港时间"
                                     label="长期离港时间"
                                     width="150">
                                     width="150">
                             </el-table-column>
                             </el-table-column>
                             <el-table-column
                             <el-table-column
-                                    fixed
                                     prop="sta"
                                     prop="sta"
                                     label="长期抵港时间"
                                     label="长期抵港时间"
                                     width="150">
                                     width="150">
                             </el-table-column>
                             </el-table-column>
                             <el-table-column
                             <el-table-column
-                                    fixed
                                     prop="effStartdate"
                                     prop="effStartdate"
                                     label="有效起始日期"
                                     label="有效起始日期"
                                     width="180">
                                     width="180">
                             </el-table-column>
                             </el-table-column>
                             <el-table-column
                             <el-table-column
-                                    fixed
                                     prop="effEnddate"
                                     prop="effEnddate"
                                     label="有效结束日期"
                                     label="有效结束日期"
                                     width="180">
                                     width="180">
@@ -150,12 +157,26 @@
                                 @current-change="handleCurrentChange"
                                 @current-change="handleCurrentChange"
                                 :current-page="currentPage4"
                                 :current-page="currentPage4"
                                 :page-sizes="[10, 20, 30, 40]"
                                 :page-sizes="[10, 20, 30, 40]"
-                                :page-size="100"
+                                :page-size="pageSize"
                                 layout="total, sizes, prev, pager, next, jumper"
                                 layout="total, sizes, prev, pager, next, jumper"
-                                :total="100">
+                                :total="total">
                         </el-pagination>
                         </el-pagination>
                     </el-dialog>
                     </el-dialog>
             </el-row>
             </el-row>
+            <!--对话提示框-->
+            <el-row>
+                <el-dialog
+                        title="系统提示"
+                        :visible.sync="centerDialogVisible"
+                        width="30%"
+                        center>
+                    <span>{{msg}}</span>
+                    <span slot="footer" class="dialog-footer">
+                          <el-button @click="centerDialogVisible = false">取 消</el-button>
+                        <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+                      </span>
+                </el-dialog>
+            </el-row>
         </el-main>
         </el-main>
     </el-container>
     </el-container>
 </template>
 </template>
@@ -178,6 +199,9 @@
     .el-col{margin-right: 0px;}
     .el-col{margin-right: 0px;}
 </style>
 </style>
 <script>
 <script>
+    const fecha = require('fecha');
+    import {addRoute,selectLongTimePlan} from '../../api/transport'
+    import loginUserInfo from '../../api/base'
     export default {
     export default {
         data(){
         data(){
           return{
           return{
@@ -198,54 +222,132 @@
                   plan:undefined,
                   plan:undefined,
                   remark:undefined,
                   remark:undefined,
                   createTime:undefined,
                   createTime:undefined,
-                  createBy:undefined,
+                  createBy:loginUserInfo.username,
                   updateTime:undefined,
                   updateTime:undefined,
-                  updateBy:undefined,
-                  isDelete:undefined
+                  updateBy:loginUserInfo.username,
+                  isDelete:undefined,
+              },
+              longtimeplan:{
+                  createBy:loginUserInfo.username
               },
               },
               rules: {
               rules: {
                   departurePort: [
                   departurePort: [
+                      //{ min: 3, max: 3, message: '长度在3个字符', trigger: 'blur'},
                       {required: true, message: '请输入(三字码)', trigger: 'blur'},
                       {required: true, message: '请输入(三字码)', trigger: 'blur'},
-                      {min: 3, max: 3, message: '长度在 3 个字符', trigger: 'blur'}
                   ],
                   ],
                   departureCustomNo: [
                   departureCustomNo: [
-                      {required: true, message: '请输入关区代码', trigger: 'blur'}
+                      {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'}
                   ],
                   ],
                   arrivalPort: [
                   arrivalPort: [
                       {required: true, message: '请输入(三字码)', trigger: 'blur'},
                       {required: true, message: '请输入(三字码)', trigger: 'blur'},
-                      {min: 3, max: 3, message: '长度在 3 个字符', trigger: 'blur'}
                   ],
                   ],
                   arrivalCustomNo: [
                   arrivalCustomNo: [
-                      {required: true, message: '请输入关区代码', trigger: 'blur'}
+                      {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'}
+                  ],
+                  serialNo:[
+                      {required: true, message: '请输入航线序号', trigger: 'blur'}
+                  ],
+                  plan: [
+                      {required: true, message: '请输入', trigger: 'blur'},
                   ],
                   ],
+                  std: [
+                      {required: true, message: '请选择时间', trigger: 'blur'}
+                  ],
+                  sta: [
+                      {required: true, message: '请选择时间', trigger: 'blur'},
+                  ],
+                  effStartdate: [
+                      {required: true, message: '请选择时间', trigger: 'blur'}
+                  ],
+                  effEnddate:[
+                      {required: true, message: '请选择时间', trigger: 'blur'}
+                  ]
               },
               },
-              tableData: [{
-                  std: '16:11:46',
-                  sta: '16:11:46',
-                  effStartdate: '2016-05-02',
-                  effEnddate: '2016-05-02'
-              }],
+              tableData: [],
+              //长期飞行计划弹框
               dialogTableVisible:false,
               dialogTableVisible:false,
-              currentPage4:4,
+              //系统提示框
+              centerDialogVisible:false,
+              currentPage4:1,
+              pageSize:10,
+              total:0,
+              msg:undefined,
+              tableloading:false
           }
           }
         },
         },
         methods:{
         methods:{
+            //查询长期飞行计划列表
+            selectLongplan(){
+                this.dialogTableVisible=true;
+                this.tableloading=true;
+                selectLongTimePlan(this.longtimeplan).then(res=>{
+                    let response=res.data.data;
+                    this.tableData=response.list;
+                    this.tableloading=false;
+                    this.total=response.total;
+                });
+            },
+            //新增航线方法（保存按钮）
             submitForm(formName) {
             submitForm(formName) {
+                //重新定义范围域
                 this.$refs[formName].validate((valid) => {
                 this.$refs[formName].validate((valid) => {
                     if (valid) {
                     if (valid) {
-                        alert('submit!');
+                        //重新定义airline
+                        addRoute(this.airline).then(res=>{
+                            let response=res.data;
+                            if(response.code=='200'){
+                                this.centerDialogVisible=true;
+                                this.msg=response.msg;
+                                this.$router.push({path:'/queryRoute',query:{serialNo:this.airline.serialNo}});
+                                this.centerDialogVisible=false;
+                            }else{
+                                this.centerDialogVisible=true;
+                                this.msg=response.msg;
+                            }
+                        });
                     } else {
                     } else {
                         console.log('error submit!!');
                         console.log('error submit!!');
                         return false;
                         return false;
                     }
                     }
                 });
                 });
             },
             },
+            //分页方法
             handleSizeChange(val) {
             handleSizeChange(val) {
-                console.log(`每页 ${val} 条`);
+                this.pageSize=val;
             },
             },
             handleCurrentChange(val) {
             handleCurrentChange(val) {
-                console.log(`当前页: ${val}`);
+                this.currentPage=val;
+                this.selectLongtimeplan();
+            },
+            //长期飞行计划选择功能
+            handleEdit(index,row){
+                this.airline.std=fecha.parse(row.std,'HHmmss');
+                this.airline.sta=fecha.parse(row.sta,'HHmmss');
+                this.airline.effStartdate=row.effStartdate;
+                this.airline.effEnddate=row.effEnddate;
+                this.dialogTableVisible=false;
+            },
+            //加载默认值
+            defaultData(){
+                if(this.$route.query.uuid!=null){
+                    let ob=Object.assign(this.airline, this.$route.query);
+                    if(ob.sta!=null && ob.sta!=undefined && ob.sta!=""){
+                        this.airline.sta=fecha.parse(ob.sta,'HHmmss');
+                    }
+                    if(ob.std!=null && ob.std!=undefined && ob.std!=""){
+                        this.airline.std=fecha.parse(ob.std,'HHmmss');
+                    }
+                }
+            },
+            // 过滤中英文
+            inputMe(e){
+                return e.replace(/[^a-zA-Z]/g,'').toUpperCase();
             }
             }
+        },
+
+        //渲染方法
+        mounted(){
+           this.defaultData();
         }
         }
     }
     }
 </script>
 </script>

@@ -14,12 +14,12 @@
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
-                        <el-form-item label="航空公司英文名称" prop="airwayNameEn" label-width="130px">
+                        <el-form-item label="航空公司英文名称" prop="airwayNameEn" label-width="140px">
                             <el-input v-model="aircraft.airwayNameEn" placeholder="请输入"></el-input>
                             <el-input v-model="aircraft.airwayNameEn" placeholder="请输入"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
-                        <el-form-item label="航空公司中文名称" prop="airwayNameCn" label-width="130px">
+                        <el-form-item label="航空公司中文名称" prop="airwayNameCn" label-width="140px">
                             <el-input v-model="aircraft.airwayNameCn" placeholder="请输入"></el-input>
                             <el-input v-model="aircraft.airwayNameCn" placeholder="请输入"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
@@ -52,12 +52,12 @@
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="最大起飞重量" prop="grossWeight" label-width="130px">
                         <el-form-item label="最大起飞重量" prop="grossWeight" label-width="130px">
-                            <el-input v-model="aircraft.grossWeight" placeholder="请输入重量（单位：KG）"></el-input>
+                            <el-input v-model="aircraft.grossWeight" placeholder="请输入重量（单位：KG）"   oninput="value=value.replace(/[^\d]/g,'')"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
                         <el-form-item label="标客舱载客人数" prop="passengerLimit" label-width="130px">
                         <el-form-item label="标客舱载客人数" prop="passengerLimit" label-width="130px">
-                            <el-input v-model="aircraft.passengerLimit" placeholder="请输入数量（单位：人）"></el-input>
+                            <el-input v-model="aircraft.passengerLimit" placeholder="请输入数量（单位：人）"   oninput="value=value.replace(/[^\d]/g,'')"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
@@ -66,8 +66,8 @@
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
-                        <el-form-item label="航空器所有人代码" prop="ownerCo" label-width="130px">
-                            <el-input v-model="aircraft.ownerCo" placeholder="请输入数量（单位：人）"></el-input>
+                        <el-form-item label="航空器所有人代码" prop="ownerCo" label-width="140px">
+                            <el-input v-model="aircraft.ownerCo" placeholder="请输入" ></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6">
                     <el-col :span="6">
@@ -80,6 +80,8 @@
                             <el-date-picker
                             <el-date-picker
                                     v-model="aircraft.deliverDate"
                                     v-model="aircraft.deliverDate"
                                     type="date"
                                     type="date"
+                                    value-format="yyyyMMdd"
+                                    format="yyyyMMdd"
                                     style="width:100%"
                                     style="width:100%"
                                     placeholder="选择日期">
                                     placeholder="选择日期">
                             </el-date-picker>
                             </el-date-picker>
@@ -96,6 +98,20 @@
                 <el-col :span="24">   <el-button type="primary" @click="submitForm('aircraft')">保 存</el-button>
                 <el-col :span="24">   <el-button type="primary" @click="submitForm('aircraft')">保 存</el-button>
                     <el-button type="success">保存并发送</el-button></el-col>
                     <el-button type="success">保存并发送</el-button></el-col>
             </el-row>
             </el-row>
+            <!--对话提示框-->
+            <el-row>
+                <el-dialog
+                        title="系统提示"
+                        :visible.sync="centerDialogVisible"
+                        width="30%"
+                        center>
+                    <span>{{msg}}</span>
+                    <span slot="footer" class="dialog-footer">
+                          <el-button @click="centerDialogVisible = false">取 消</el-button>
+                        <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+                      </span>
+                </el-dialog>
+            </el-row>
         </el-main>
         </el-main>
     </el-container>
     </el-container>
 </template>
 </template>
@@ -118,6 +134,8 @@
     .el-col{margin-right: 0px;}
     .el-col{margin-right: 0px;}
 </style>
 </style>
 <script>
 <script>
+    import {addFlightPlan} from "../../api/transport";
+
     export default {
     export default {
         data(){
         data(){
             return{
             return{
@@ -148,10 +166,82 @@
                     messageid:undefined
                     messageid:undefined
                 },
                 },
                 rules:{
                 rules:{
-
+                    airwayCode: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    airwayNameEn: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    airwayNameCn: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    areoNationality: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    aircraftNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    credentialType: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    credentialNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    areoModel: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    grossWeight: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    passengerLimit: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    useRelation: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    ownerCo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    certNo: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
+                    deliverDate: [
+                        {required: true, message: '请输入', trigger: 'blur'}
+                    ],
                 },
                 },
+                centerDialogVisible:false,
             }
             }
         },
         },
-        methods(){}
+        methods:{
+            //新增航线航空器（保存按钮）
+            submitForm(formName) {
+                this.$refs[formName].validate((valid) => {
+                    if (valid) {
+                        addFlightPlan(this.aircraft).then(res=>{
+                            let response=res.data;
+                            if(response.code=='200'){
+                                this.centerDialogVisible=true;
+                                this.msg=response.msg;
+                                this.$router.push({path:'/queryRouteaircraft',query:{airwayCode:JSON.stringify(this.aircraft.airwayCode)},});
+                            }else{
+                                this.msg=response.msg;
+                            }
+                        });
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                });
+            },
+            //加载默认值
+            defaultData(){
+                if(this.$route.query!=null){
+                    let ob=Object.assign(this.airwayCode, this.$route.query);
+                }
+            },
+        },
+        mounted(){
+            this.defaultData();
+        }
     }
     }
 </script>
 </script>

@@ -246,7 +246,6 @@
                     this.listLoading = false;
                     this.listLoading = false;
                     //NProgress.done();
                     //NProgress.done();
                 }).catch((error) => {
                 }).catch((error) => {
-
                     this.listLoading = false;
                     this.listLoading = false;
                     if(null!= error.response && error.response!==undefined){
                     if(null!= error.response && error.response!==undefined){
                         let status= error.response.status;
                         let status= error.response.status;
@@ -264,7 +263,7 @@
             getPermList() {
             getPermList() {
                 let para = {
                 let para = {
                     pageNum: 1,
                     pageNum: 1,
-                    pageSize: 200
+                    pageSize: 500
                 };
                 };
                 NProgress.start();
                 NProgress.start();
                 permList(para).then((res) => {
                 permList(para).then((res) => {