运输工具通用查询

@@ -411,7 +411,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:'/queryFlight',query:{flightNo:JSON.stringify(this.flight.flightNo),aircraftNo:JSON.stringify(this.flight.aircraftNo)}});
+                                this.$router.push({path:'/queryFlights',query:{flightNo:this.flight.flightNo,aircraftNo:this.flight.aircraftNo}});
                                 this.centerDialogVisible=false;
                                 this.centerDialogVisible=false;
                             }else{
                             }else{
                                 this.centerDialogVisible=true;
                                 this.centerDialogVisible=true;
@@ -446,37 +446,14 @@
             },
             },
             //加载默认值
             //加载默认值
             defaultData(){
             defaultData(){
-                if(this.$route.query!=null){
-                    this.flight.uuid=JSON.parse(this.$route.query.uuid);
-                    this.flight.airwayCode=JSON.parse(this.$route.query.airwayCode);
-                    this.flight.airwayNameEn=JSON.parse(this.$route.query.airwayNameEn);
-                    this.flight.airwayNameCn=JSON.parse(this.$route.query.airwayNameCn);
-                    this.flight.transportAgentCode=JSON.parse(this.$route.query.transportAgentCode);
-                    this.flight.groundAgentCode=JSON.parse(this.$route.query.groundAgentCode);
-                    this.flight.flightNo=JSON.parse(this.$route.query.flightNo);
-                    this.flight.shareFlightNo=JSON.parse(this.$route.query.shareFlightNo);
-                    this.flight.linesType=JSON.parse(this.$route.query.linesType);
-                    this.flight.std=fecha.parse(JSON.parse(this.$route.query.std),'HHmmss');
-                    this.flight.sta=fecha.parse(JSON.parse(this.$route.query.sta),'HHmmss');
-                    this.flight.effStartdate=JSON.parse(this.$route.query.effStartdate);
-                    this.flight.effEnddate=JSON.parse(this.$route.query.effEnddate);
-                    this.flight.flightType=JSON.parse(this.$route.query.flightType);
-                    this.flight.cancelFlag=JSON.parse(this.$route.query.cancelFlag);
-                    this.flight.departurePort=JSON.parse(this.$route.query.departurePort);
-                    this.flight.arrivalPort=JSON.parse(this.$route.query.arrivalPort);
-                    this.flight.departureCustomNo=JSON.parse(this.$route.query.departureCustomNo);
-                    this.flight.arrivalCustomNo=JSON.parse(this.$route.query.arrivalCustomNo);
-                    this.flight.plan=JSON.parse(this.$route.query.plan);
-                    this.flight.remark=JSON.parse(this.$route.query.remark);
-                    this.flight.createTime=JSON.parse(this.$route.query.createTime);
-                    this.flight.createBy=JSON.parse(this.$route.query.createBy);
-                    this.flight.updateTime=JSON.parse(this.$route.query.updateTime);
-                    this.flight.updateBy=JSON.parse(this.$route.query.updateBy);
-                    this.flight.isDelete=JSON.parse(this.$route.query.isDelete);
-                    this.flight.serialno=JSON.parse(this.$route.query.serialno);
-                    this.flight.status=JSON.parse(this.$route.query.status);
-                    this.flight.statusMsg=JSON.parse(this.$route.query.statusMsg);
-                    this.flight.messageid=JSON.parse(this.$route.query.messageid);
+                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');
+                    }
                 }
                 }
 
 
             },
             },

@@ -11,13 +11,13 @@
                 <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-col :span="8">
-                        <el-form-item label="航空公司代码：" prop="flightNo" label-width="110px">
-                            <el-input v-model="queryFlight.flightNo" style="width:190px"></el-input>
+                        <el-form-item label="航空公司代码：" prop="aircraftNo" label-width="110px">
+                            <el-input v-model="queryFlight.aircraftNo" style="width:190px"></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="aircraftNo" label-width="80px">
-                            <el-input v-model="queryFlight.aircraftNo" style="width:190px"></el-input>
+                        <el-form-item label="航班号：" prop="flightNo" label-width="80px">
+                            <el-input v-model="queryFlight.flightNo" style="width:190px"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="6" >
                     <el-col :span="6" >
@@ -184,24 +184,11 @@
             },
             },
             //编辑航班查询功能
             //编辑航班查询功能
             handleEdit(index,row){
             handleEdit(index,row){
-                this.$router.push({path:'/flights',query:{uuid:JSON.stringify(row.uuid),airwayCode:JSON.stringify(row.airwayCode)
-                        ,airwayNameEn:JSON.stringify(row.airwayNameEn), airwayNameCn:JSON.stringify(row.airwayNameCn),
-                        transportAgentCode:JSON.stringify(row.transportAgentCode),groundAgentCode:JSON.stringify(row.groundAgentCode),
-                        flightNo:JSON.stringify(row.flightNo),shareFlightNo:JSON.stringify(row.shareFlightNo),linesType:JSON.stringify(row.linesType),
-                        std:JSON.stringify(row.std), sta:JSON.stringify(row.sta),effStartdate:JSON.stringify(row.effStartdate),
-                        effEnddate:JSON.stringify(row.effEnddate),plan:JSON.stringify(row.plan), remark:JSON.stringify(row.remark),
-                        createTime:JSON.stringify(row.createTime),createBy:JSON.stringify(row.createBy),updateTime:JSON.stringify(row.updateTime),
-                        updateBy:JSON.stringify(row.updateBy),isDelete:JSON.stringify(row.isDelete),flightType:JSON.stringify(row.flightType), cancelFlag:JSON.stringify(row.cancelFlag),
-                        departurePort:JSON.stringify(row.departurePort),arrivalPort:JSON.stringify(row.arrivalPort),departureCustomNo:JSON.stringify(row.departureCustomNo),
-                        arrivalCustomNo:JSON.stringify(row.arrivalCustomNo),serialno:JSON.stringify(row.serialno),status:JSON.stringify(row.status),
-                        statusMsg:JSON.stringify(row.statusMsg),messageid:JSON.stringify(row.messageid)
-                    }})
+                this.$router.push({path:'/flights',query:row})
             },
             },
             //获取默认值
             //获取默认值
              defaultData(){
              defaultData(){
-                 this.flightNo=JSON.parse(this.$route.query.flightNo);
-                 this.aircraftNo=JSON.parse(this.$route.query.aircraftNo);
-
+                 Object.assign(this.queryFlight, this.$route.query);
              },
              },
             //列表删除功能
             //列表删除功能
             handleDel(index,row){
             handleDel(index,row){

@@ -181,8 +181,7 @@
             },
             },
             //获取默认值
             //获取默认值
             defaultData(){
             defaultData(){
-                let ob=Object.assign(this.queryRoute, this.$route.query);
-
+                Object.assign(this.queryRoute, this.$route.query);
             },
             },
             //列表删除功能
             //列表删除功能
             handleDelete(index,row){
             handleDelete(index,row){