朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 6d43c1bff033cdf4150f5f50367c4803b3ce0b5b 1 个父辈 345113bc

20200623-trans

内嵌 并排对比
正在显示 15 个修改的文件 包含 25 行增加 和 54 行删除
... ... @@ -223,7 +223,7 @@
if(response.code=='200'){
this.centerDialogVisible=true;
this.msg=response.msg;
this.$router.push({path:'/queryAircraft',query:{airwayCode:JSON.stringify(this.aircraft.airwayCode)}});
this.$router.push({path:'/queryAircraft',query:{airwayCode:this.aircraft.airwayCode,aircraftNo:this.aircraft.aircraftNo}});
}else{
this.msg=response.msg;
}
... ... @@ -237,7 +237,7 @@
//加载默认值
defaultData(){
if(this.$route.query!=null){
let ob=Object.assign(this.aircraft, this.$route.query);
Object.assign(this.aircraft, this.$route.query);
/*有时分秒时用fecha
this.flight.flightDate=ob.flightDate;
this.flight.currentLandingTime=fecha.parse(ob.currentLandingTime,'yyyyMMddHHmm');
... ...
... ... @@ -218,7 +218,7 @@
//加载默认值
defaultData(){
if(this.$route.query!=null){
let ob=Object.assign(this.arrival, this.$route.query);
Object.assign(this.arrival, this.$route.query);
}
},
// 过滤中英文
... ...
... ... @@ -121,7 +121,7 @@
//加载默认值
defaultData(){
if(this.$route.query!=null){
let ob=Object.assign(this.configure, this.$route.query);
Object.assign(this.configure, this.$route.query);
}
},
},
... ...
... ... @@ -191,7 +191,7 @@
//加载默认值
defaultData(){
if(this.$route.query!=null){
let ob=Object.assign(this.confirmatory, this.$route.query);
Object.assign(this.confirmatory, this.$route.query);
}
},
// 过滤中英文
... ...
... ... @@ -165,7 +165,7 @@
//加载默认值
defaultData(){
if(this.$route.query!=null){
let ob=Object.assign(this.declare, this.$route.query);
Object.assign(this.declare, this.$route.query);
}
},
// 过滤中英文
... ...
... ... @@ -184,7 +184,7 @@
//加载默认值
defaultData(){
if(this.$route.query!=null){
let ob=Object.assign(this.departure, this.$route.query);
Object.assign(this.departure, this.$route.query);
}
},
// 过滤中英文
... ...
... ... @@ -407,7 +407,7 @@
methods:{
//航线信息查询
selectAirline(){
let params={currentPage:this.currentPage,pageSize:this.pageSize,aircraftNo:this.flight.aircraftNo};
let params={currentPage:this.currentPage,pageSize:this.pageSize,aircraftNo:this.flight.aircraftNo,flightNo:this.flight.flightNo};
this.dialogTableVisible=true;
this.tableloading=true;
selectRoute(params).then(res=>{
... ... @@ -463,38 +463,8 @@
//加载默认值
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);
Object.assign(this.flight, this.$route.query);
}
},
// 过滤中英文
inputMe(e){
... ...
... ... @@ -222,7 +222,7 @@
//加载默认值
defaultData(){
if(this.$route.query.uuid!=null){
let ob=Object.assign(this.flight, this.$route.query);
Object.assign(this.flight, this.$route.query);
/*this.flight.currentLandingTime=fecha.parse(ob.currentLandingTime,'yyyyMMddHHmm');
this.flight.currentTakeoffTime=fecha.parse(ob.currentTakeoffTime,'yyyyMMddHHmm');*/
}
... ...
... ... @@ -121,7 +121,7 @@
//加载默认值
defaultData(){
if(this.$route.query!=null){
let ob=Object.assign(this.outConfigure, this.$route.query);
Object.assign(this.outConfigure, this.$route.query);
}
},
},
... ...
... ... @@ -232,8 +232,10 @@
},
//获取默认值
defaultData() {
this.airwayCode = JSON.parse(this.$route.query.airwayCode);
this.aircraftNo = JSON.parse(this.$route.query.aircraftNo);
Object.assign(this.queryAircraft, this.$route.query);
// this.airwayCode = JSON.parse(this.$route.query.airwayCode);
// this.aircraftNo = JSON.parse(this.$route.query.aircraftNo);
},
//编辑通用航空器
handleEdit(index,row){
... ...
... ... @@ -358,11 +358,7 @@
},
//获取默认值
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);
}
Object.assign(this.queryBill, this.$route.query);
},
//编辑单据查询
handleEdit(index,row){
... ...
... ... @@ -211,8 +211,9 @@
},
//获取默认值
defaultData(){
this.flightNo = JSON.parse(this.$route.query.flightNo);
this.aircraftNo = JSON.parse(this.$route.query.aircraftNo);
Object.assign(this.queryFlight, this.$route.query);
// this.flightNo = JSON.parse(this.$route.query.flightNo);
// this.aircraftNo = JSON.parse(this.$route.query.aircraftNo);
},
//列表删除功能
handleDel(index,row){
... ...
... ... @@ -178,7 +178,7 @@
},
//获取默认值
defaultData(){
let ob=Object.assign(this.queryRoute, this.$route.query);
Object.assign(this.queryRoute, this.$route.query);
},
//列表删除功能
handleDelete(index,row){
... ...
... ... @@ -234,8 +234,10 @@
},
//获取默认值
defaultData() {
this.airwayCode = JSON.parse(this.$route.query.airwayCode);
this.aircraftNo = JSON.parse(this.$route.query.aircraftNo);
Object.assign(this.queryRouteaircraft, this.$route.query);
// this.airwayCode = JSON.parse(this.$route.query.airwayCode);
// this.aircraftNo = JSON.parse(this.$route.query.aircraftNo);
},
//编辑航线航空器
handleEdit(index,row){
... ...
... ... @@ -237,7 +237,7 @@
//加载默认值
defaultData(){
if(this.$route.query!=null){
let ob=Object.assign(this.aircraft, this.$route.query);
Object.assign(this.aircraft, this.$route.query);
}
},
},
... ...