Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/airtransport/queryFlightplan.vue

@@ -208,7 +208,7 @@
                             if(response.code=='200'){
                             if(response.code=='200'){
                                 this.centerDialogVisible=true;
                                 this.centerDialogVisible=true;
                                 this.msg=response.msg;
                                 this.msg=response.msg;
-                                this.$router.push({path:'/queryFlightplan',query:{flightNo:JSON.stringify(this.flight.flightNo)}});
+                                this.$router.push({path:'/queryFlightplan',query:{flightNo:this.flight.flightNo,flightDate:this.flight.flightDate,aircraftNo:this.flight.aircraftNo}});
                             }else{
                             }else{
                                 this.msg=response.msg;
                                 this.msg=response.msg;
                             }
                             }
@@ -223,8 +223,8 @@
             defaultData(){
             defaultData(){
                 if(this.$route.query.uuid!=null){
                 if(this.$route.query.uuid!=null){
                     let ob=Object.assign(this.flight, this.$route.query);
                     let ob=Object.assign(this.flight, this.$route.query);
-                    this.flight.currentLandingTime=fecha.parse(ob.currentLandingTime,'yyyyMMddHHmm');
-                    this.flight.currentTakeoffTime=fecha.parse(ob.currentTakeoffTime,'yyyyMMddHHmm');
+                    /*this.flight.currentLandingTime=fecha.parse(ob.currentLandingTime,'yyyyMMddHHmm');
+                    this.flight.currentTakeoffTime=fecha.parse(ob.currentTakeoffTime,'yyyyMMddHHmm');*/
                 }
                 }
             },
             },
         },
         },

@@ -27,6 +27,7 @@
                                     v-model="queryFlightplan.flightDate"
                                     v-model="queryFlightplan.flightDate"
                                     type="date"
                                     type="date"
                                     format="yyyyMMdd"
                                     format="yyyyMMdd"
+                                    value-format="yyyyMMdd"
                                     style="width:190px"
                                     style="width:190px"
                                     placeholder="选择日期">
                                     placeholder="选择日期">
                             </el-date-picker>
                             </el-date-picker>
@@ -227,16 +228,13 @@
             },
             },
             //获取默认值
             //获取默认值
             defaultData() {
             defaultData() {
-                if(this.$route.query.flightNo!=null){
-                    this.queryFlightplan.flightNo = JSON.parse(this.$route.query.flightNo);
-                    this.queryFlightplan.flightDate = JSON.parse(this.$route.query.flightDate);
-                    this.queryFlightplan.aircraftNo = JSON.parse(this.$route.query.aircraftNo);
-                }
+                Object.assign(this.queryFlightplan, this.$route.query);
             },
             },
             //编辑当日飞行计划
             //编辑当日飞行计划
             handleEdit(index,row){
             handleEdit(index,row){
                 this.$router.push({path:'/flightplan',query: row})
                 this.$router.push({path:'/flightplan',query: row})
         },
         },
+
       },
       },
         //渲染方法
         //渲染方法
         mounted(){
         mounted(){