正在显示
15 个修改的文件
包含
25 行增加
和
54 行删除
| @@ -223,7 +223,7 @@ | @@ -223,7 +223,7 @@ | ||
| 223 | if(response.code=='200'){ | 223 | if(response.code=='200'){ |
| 224 | this.centerDialogVisible=true; | 224 | this.centerDialogVisible=true; |
| 225 | this.msg=response.msg; | 225 | this.msg=response.msg; |
| 226 | - this.$router.push({path:'/queryAircraft',query:{airwayCode:JSON.stringify(this.aircraft.airwayCode)}}); | 226 | + this.$router.push({path:'/queryAircraft',query:{airwayCode:this.aircraft.airwayCode,aircraftNo:this.aircraft.aircraftNo}}); |
| 227 | }else{ | 227 | }else{ |
| 228 | this.msg=response.msg; | 228 | this.msg=response.msg; |
| 229 | } | 229 | } |
| @@ -237,7 +237,7 @@ | @@ -237,7 +237,7 @@ | ||
| 237 | //加载默认值 | 237 | //加载默认值 |
| 238 | defaultData(){ | 238 | defaultData(){ |
| 239 | if(this.$route.query!=null){ | 239 | if(this.$route.query!=null){ |
| 240 | - let ob=Object.assign(this.aircraft, this.$route.query); | 240 | + Object.assign(this.aircraft, this.$route.query); |
| 241 | /*有时分秒时用fecha | 241 | /*有时分秒时用fecha |
| 242 | this.flight.flightDate=ob.flightDate; | 242 | this.flight.flightDate=ob.flightDate; |
| 243 | this.flight.currentLandingTime=fecha.parse(ob.currentLandingTime,'yyyyMMddHHmm'); | 243 | this.flight.currentLandingTime=fecha.parse(ob.currentLandingTime,'yyyyMMddHHmm'); |
| @@ -218,7 +218,7 @@ | @@ -218,7 +218,7 @@ | ||
| 218 | //加载默认值 | 218 | //加载默认值 |
| 219 | defaultData(){ | 219 | defaultData(){ |
| 220 | if(this.$route.query!=null){ | 220 | if(this.$route.query!=null){ |
| 221 | - let ob=Object.assign(this.arrival, this.$route.query); | 221 | + Object.assign(this.arrival, this.$route.query); |
| 222 | } | 222 | } |
| 223 | }, | 223 | }, |
| 224 | // 过滤中英文 | 224 | // 过滤中英文 |
| @@ -121,7 +121,7 @@ | @@ -121,7 +121,7 @@ | ||
| 121 | //加载默认值 | 121 | //加载默认值 |
| 122 | defaultData(){ | 122 | defaultData(){ |
| 123 | if(this.$route.query!=null){ | 123 | if(this.$route.query!=null){ |
| 124 | - let ob=Object.assign(this.configure, this.$route.query); | 124 | + Object.assign(this.configure, this.$route.query); |
| 125 | } | 125 | } |
| 126 | }, | 126 | }, |
| 127 | }, | 127 | }, |
| @@ -191,7 +191,7 @@ | @@ -191,7 +191,7 @@ | ||
| 191 | //加载默认值 | 191 | //加载默认值 |
| 192 | defaultData(){ | 192 | defaultData(){ |
| 193 | if(this.$route.query!=null){ | 193 | if(this.$route.query!=null){ |
| 194 | - let ob=Object.assign(this.confirmatory, this.$route.query); | 194 | + Object.assign(this.confirmatory, this.$route.query); |
| 195 | } | 195 | } |
| 196 | }, | 196 | }, |
| 197 | // 过滤中英文 | 197 | // 过滤中英文 |
| @@ -165,7 +165,7 @@ | @@ -165,7 +165,7 @@ | ||
| 165 | //加载默认值 | 165 | //加载默认值 |
| 166 | defaultData(){ | 166 | defaultData(){ |
| 167 | if(this.$route.query!=null){ | 167 | if(this.$route.query!=null){ |
| 168 | - let ob=Object.assign(this.declare, this.$route.query); | 168 | + Object.assign(this.declare, this.$route.query); |
| 169 | } | 169 | } |
| 170 | }, | 170 | }, |
| 171 | // 过滤中英文 | 171 | // 过滤中英文 |
| @@ -184,7 +184,7 @@ | @@ -184,7 +184,7 @@ | ||
| 184 | //加载默认值 | 184 | //加载默认值 |
| 185 | defaultData(){ | 185 | defaultData(){ |
| 186 | if(this.$route.query!=null){ | 186 | if(this.$route.query!=null){ |
| 187 | - let ob=Object.assign(this.departure, this.$route.query); | 187 | + Object.assign(this.departure, this.$route.query); |
| 188 | } | 188 | } |
| 189 | }, | 189 | }, |
| 190 | // 过滤中英文 | 190 | // 过滤中英文 |
| @@ -407,7 +407,7 @@ | @@ -407,7 +407,7 @@ | ||
| 407 | methods:{ | 407 | methods:{ |
| 408 | //航线信息查询 | 408 | //航线信息查询 |
| 409 | selectAirline(){ | 409 | selectAirline(){ |
| 410 | - let params={currentPage:this.currentPage,pageSize:this.pageSize,aircraftNo:this.flight.aircraftNo}; | 410 | + let params={currentPage:this.currentPage,pageSize:this.pageSize,aircraftNo:this.flight.aircraftNo,flightNo:this.flight.flightNo}; |
| 411 | this.dialogTableVisible=true; | 411 | this.dialogTableVisible=true; |
| 412 | this.tableloading=true; | 412 | this.tableloading=true; |
| 413 | selectRoute(params).then(res=>{ | 413 | selectRoute(params).then(res=>{ |
| @@ -463,38 +463,8 @@ | @@ -463,38 +463,8 @@ | ||
| 463 | //加载默认值 | 463 | //加载默认值 |
| 464 | defaultData(){ | 464 | defaultData(){ |
| 465 | if(this.$route.query!=null){ | 465 | if(this.$route.query!=null){ |
| 466 | - this.flight.uuid=JSON.parse(this.$route.query.uuid); | ||
| 467 | - this.flight.airwayCode=JSON.parse(this.$route.query.airwayCode); | ||
| 468 | - this.flight.airwayNameEn=JSON.parse(this.$route.query.airwayNameEn); | ||
| 469 | - this.flight.airwayNameCn=JSON.parse(this.$route.query.airwayNameCn); | ||
| 470 | - this.flight.transportAgentCode=JSON.parse(this.$route.query.transportAgentCode); | ||
| 471 | - this.flight.groundAgentCode=JSON.parse(this.$route.query.groundAgentCode); | ||
| 472 | - this.flight.flightNo=JSON.parse(this.$route.query.flightNo); | ||
| 473 | - this.flight.shareFlightNo=JSON.parse(this.$route.query.shareFlightNo); | ||
| 474 | - this.flight.linesType=JSON.parse(this.$route.query.linesType); | ||
| 475 | - this.flight.std=fecha.parse(JSON.parse(this.$route.query.std),'HHmmss'); | ||
| 476 | - this.flight.sta=fecha.parse(JSON.parse(this.$route.query.sta),'HHmmss'); | ||
| 477 | - this.flight.effStartdate=JSON.parse(this.$route.query.effStartdate); | ||
| 478 | - this.flight.effEnddate=JSON.parse(this.$route.query.effEnddate); | ||
| 479 | - this.flight.flightType=JSON.parse(this.$route.query.flightType); | ||
| 480 | - this.flight.cancelFlag=JSON.parse(this.$route.query.cancelFlag); | ||
| 481 | - this.flight.departurePort=JSON.parse(this.$route.query.departurePort); | ||
| 482 | - this.flight.arrivalPort=JSON.parse(this.$route.query.arrivalPort); | ||
| 483 | - this.flight.departureCustomNo=JSON.parse(this.$route.query.departureCustomNo); | ||
| 484 | - this.flight.arrivalCustomNo=JSON.parse(this.$route.query.arrivalCustomNo); | ||
| 485 | - this.flight.plan=JSON.parse(this.$route.query.plan); | ||
| 486 | - this.flight.remark=JSON.parse(this.$route.query.remark); | ||
| 487 | - this.flight.createTime=JSON.parse(this.$route.query.createTime); | ||
| 488 | - this.flight.createBy=JSON.parse(this.$route.query.createBy); | ||
| 489 | - this.flight.updateTime=JSON.parse(this.$route.query.updateTime); | ||
| 490 | - this.flight.updateBy=JSON.parse(this.$route.query.updateBy); | ||
| 491 | - this.flight.isDelete=JSON.parse(this.$route.query.isDelete); | ||
| 492 | - this.flight.serialno=JSON.parse(this.$route.query.serialno); | ||
| 493 | - this.flight.status=JSON.parse(this.$route.query.status); | ||
| 494 | - this.flight.statusMsg=JSON.parse(this.$route.query.statusMsg); | ||
| 495 | - this.flight.messageid=JSON.parse(this.$route.query.messageid); | 466 | + Object.assign(this.flight, this.$route.query); |
| 496 | } | 467 | } |
| 497 | - | ||
| 498 | }, | 468 | }, |
| 499 | // 过滤中英文 | 469 | // 过滤中英文 |
| 500 | inputMe(e){ | 470 | inputMe(e){ |
| @@ -222,7 +222,7 @@ | @@ -222,7 +222,7 @@ | ||
| 222 | //加载默认值 | 222 | //加载默认值 |
| 223 | defaultData(){ | 223 | defaultData(){ |
| 224 | if(this.$route.query.uuid!=null){ | 224 | if(this.$route.query.uuid!=null){ |
| 225 | - let ob=Object.assign(this.flight, this.$route.query); | 225 | + Object.assign(this.flight, this.$route.query); |
| 226 | /*this.flight.currentLandingTime=fecha.parse(ob.currentLandingTime,'yyyyMMddHHmm'); | 226 | /*this.flight.currentLandingTime=fecha.parse(ob.currentLandingTime,'yyyyMMddHHmm'); |
| 227 | this.flight.currentTakeoffTime=fecha.parse(ob.currentTakeoffTime,'yyyyMMddHHmm');*/ | 227 | this.flight.currentTakeoffTime=fecha.parse(ob.currentTakeoffTime,'yyyyMMddHHmm');*/ |
| 228 | } | 228 | } |
| @@ -121,7 +121,7 @@ | @@ -121,7 +121,7 @@ | ||
| 121 | //加载默认值 | 121 | //加载默认值 |
| 122 | defaultData(){ | 122 | defaultData(){ |
| 123 | if(this.$route.query!=null){ | 123 | if(this.$route.query!=null){ |
| 124 | - let ob=Object.assign(this.outConfigure, this.$route.query); | 124 | + Object.assign(this.outConfigure, this.$route.query); |
| 125 | } | 125 | } |
| 126 | }, | 126 | }, |
| 127 | }, | 127 | }, |
| @@ -232,8 +232,10 @@ | @@ -232,8 +232,10 @@ | ||
| 232 | }, | 232 | }, |
| 233 | //获取默认值 | 233 | //获取默认值 |
| 234 | defaultData() { | 234 | defaultData() { |
| 235 | - this.airwayCode = JSON.parse(this.$route.query.airwayCode); | ||
| 236 | - this.aircraftNo = JSON.parse(this.$route.query.aircraftNo); | 235 | + Object.assign(this.queryAircraft, this.$route.query); |
| 236 | + | ||
| 237 | + // this.airwayCode = JSON.parse(this.$route.query.airwayCode); | ||
| 238 | + // this.aircraftNo = JSON.parse(this.$route.query.aircraftNo); | ||
| 237 | }, | 239 | }, |
| 238 | //编辑通用航空器 | 240 | //编辑通用航空器 |
| 239 | handleEdit(index,row){ | 241 | handleEdit(index,row){ |
| @@ -358,11 +358,7 @@ | @@ -358,11 +358,7 @@ | ||
| 358 | }, | 358 | }, |
| 359 | //获取默认值 | 359 | //获取默认值 |
| 360 | defaultData(){ | 360 | defaultData(){ |
| 361 | - if(this.$route.query.aircraftNo!=null){ | ||
| 362 | - this.queryBill.flightNo=JSON.parse(this.$route.query.flightNo); | ||
| 363 | - this.queryBill.aircraftNo=JSON.parse(this.$route.query.aircraftNo); | ||
| 364 | - this.queryBill.flightDate=JSON.parse(this.$route.query.flightDate); | ||
| 365 | - } | 361 | + Object.assign(this.queryBill, this.$route.query); |
| 366 | }, | 362 | }, |
| 367 | //编辑单据查询 | 363 | //编辑单据查询 |
| 368 | handleEdit(index,row){ | 364 | handleEdit(index,row){ |
| @@ -211,8 +211,9 @@ | @@ -211,8 +211,9 @@ | ||
| 211 | }, | 211 | }, |
| 212 | //获取默认值 | 212 | //获取默认值 |
| 213 | defaultData(){ | 213 | defaultData(){ |
| 214 | - this.flightNo = JSON.parse(this.$route.query.flightNo); | ||
| 215 | - this.aircraftNo = JSON.parse(this.$route.query.aircraftNo); | 214 | + Object.assign(this.queryFlight, this.$route.query); |
| 215 | + // this.flightNo = JSON.parse(this.$route.query.flightNo); | ||
| 216 | + // this.aircraftNo = JSON.parse(this.$route.query.aircraftNo); | ||
| 216 | }, | 217 | }, |
| 217 | //列表删除功能 | 218 | //列表删除功能 |
| 218 | handleDel(index,row){ | 219 | handleDel(index,row){ |
| @@ -178,7 +178,7 @@ | @@ -178,7 +178,7 @@ | ||
| 178 | }, | 178 | }, |
| 179 | //获取默认值 | 179 | //获取默认值 |
| 180 | defaultData(){ | 180 | defaultData(){ |
| 181 | - let ob=Object.assign(this.queryRoute, this.$route.query); | 181 | + Object.assign(this.queryRoute, this.$route.query); |
| 182 | }, | 182 | }, |
| 183 | //列表删除功能 | 183 | //列表删除功能 |
| 184 | handleDelete(index,row){ | 184 | handleDelete(index,row){ |
| @@ -234,8 +234,10 @@ | @@ -234,8 +234,10 @@ | ||
| 234 | }, | 234 | }, |
| 235 | //获取默认值 | 235 | //获取默认值 |
| 236 | defaultData() { | 236 | defaultData() { |
| 237 | - this.airwayCode = JSON.parse(this.$route.query.airwayCode); | ||
| 238 | - this.aircraftNo = JSON.parse(this.$route.query.aircraftNo); | 237 | + Object.assign(this.queryRouteaircraft, this.$route.query); |
| 238 | + | ||
| 239 | + // this.airwayCode = JSON.parse(this.$route.query.airwayCode); | ||
| 240 | + // this.aircraftNo = JSON.parse(this.$route.query.aircraftNo); | ||
| 239 | }, | 241 | }, |
| 240 | //编辑航线航空器 | 242 | //编辑航线航空器 |
| 241 | handleEdit(index,row){ | 243 | handleEdit(index,row){ |
| @@ -237,7 +237,7 @@ | @@ -237,7 +237,7 @@ | ||
| 237 | //加载默认值 | 237 | //加载默认值 |
| 238 | defaultData(){ | 238 | defaultData(){ |
| 239 | if(this.$route.query!=null){ | 239 | if(this.$route.query!=null){ |
| 240 | - let ob=Object.assign(this.aircraft, this.$route.query); | 240 | + Object.assign(this.aircraft, this.$route.query); |
| 241 | } | 241 | } |
| 242 | }, | 242 | }, |
| 243 | }, | 243 | }, |
-
请 注册 或 登录 后发表评论