朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 4c7fbcf1569894c9e8a97733dd72d6a31bc29f9f 1 个父辈 afde6fee

运输工具测试

内嵌 并排对比
正在显示 20 个修改的文件 包含 162 行增加 和 126 行删除
@@ -340,74 +340,74 @@ let routes = [ @@ -340,74 +340,74 @@ let routes = [
340 // 340 //
341 // ] 341 // ]
342 // }, 342 // },
343 - // {  
344 - // path: '/airtransport',  
345 - // component: Home,  
346 - // name: '通用业务申报',  
347 - // iconCls:'el-icon-goods',  
348 - // children:[  
349 - // {path:'/route',component:Route,name:'航线申报'},  
350 - // {path:'/bill',component:Bill,name:'单据申报'},  
351 - // {path:'/flights',component:Flight,name:'航班申报'},  
352 - // {path:'/flightplan',component:Flightplan,name:'当日飞行计划'},  
353 - // {path:'/aircraft',component:Aircraft,name:'通用航空器申报'},  
354 - // {path:'/routeaircraft',component:Routeaircraft,name:'航线航空器申报'},  
355 - // ]  
356 - // },  
357 - // {  
358 - // path: '/querytransport',  
359 - // component: Home,  
360 - // name: '通用业务查询',  
361 - // iconCls:'el-icon-goods',  
362 - // children:[  
363 - // {path:'/queryRoute',component:queryRoute,name:'航线查询'},  
364 - // {path:'/queryBill',component:queryBill,name:'单据查询'},  
365 - // {path:'/queryFlights',component:queryFlight,name:'航班查询'},  
366 - // {path:'/queryFlightplan',component:queryFlightplan,name:'当日飞行计划查询'},  
367 - // {path:'/queryAircraft',component:queryAircraft,name:'通用航空器查询'},  
368 - // {path:'/queryRouteaircraft',component:queryRouteaircraft,name:'航线航空器查询'},  
369 - // ]  
370 - // },  
371 - // {  
372 - // path: '/input',  
373 - // component: Home,  
374 - // name: '进港航班申报',  
375 - // iconCls:'el-icon-goods',  
376 - // children:[  
377 - // {path:'/arrival',component:arrival,name:'进港预报申报'},  
378 - // {path:'/confirmatory',component:confirmatory,name:'进港确报申报'},  
379 - // {path:'/queryArrival',component:queryArrival,name:'进港预报查询'},  
380 - // {path:'/queryConfirmatory',component:queryConfirmatory,name:'进港确报查询'},  
381 - // {path:'/configure',component:configure,name:'进港航班配置'},  
382 - // {path:'/queryConfigure',component:queryConfigure,name:'航班配置查询'},  
383 - // ]  
384 - // },  
385 { 343 {
386 - path: '/con', 344 + path: '/airtransport',
387 component: Home, 345 component: Home,
388 - name: '收发货人管理', 346 + name: '通用业务申报',
389 iconCls:'el-icon-goods', 347 iconCls:'el-icon-goods',
390 children:[ 348 children:[
391 - {path:'/consigner',component:Consigner,name:'发货人管理'},  
392 - {path:'/consignee',component:Consignee,name:'收货人管理'},  
393 - {path:'/transport',component:Transport,name:'转运申请'},  
394 - 349 + {path:'/route',component:Route,name:'航线申报'},
  350 + {path:'/bill',component:Bill,name:'单据申报'},
  351 + {path:'/flights',component:Flight,name:'航班申报'},
  352 + {path:'/flightplan',component:Flightplan,name:'当日飞行计划'},
  353 + {path:'/aircraft',component:Aircraft,name:'通用航空器申报'},
  354 + {path:'/routeaircraft',component:Routeaircraft,name:'航线航空器申报'},
  355 + ]
  356 + },
  357 + {
  358 + path: '/querytransport',
  359 + component: Home,
  360 + name: '通用业务查询',
  361 + iconCls:'el-icon-goods',
  362 + children:[
  363 + {path:'/queryRoute',component:queryRoute,name:'航线查询'},
  364 + {path:'/queryBill',component:queryBill,name:'单据查询'},
  365 + {path:'/queryFlights',component:queryFlight,name:'航班查询'},
  366 + {path:'/queryFlightplan',component:queryFlightplan,name:'当日飞行计划查询'},
  367 + {path:'/queryAircraft',component:queryAircraft,name:'通用航空器查询'},
  368 + {path:'/queryRouteaircraft',component:queryRouteaircraft,name:'航线航空器查询'},
  369 + ]
  370 + },
  371 + {
  372 + path: '/input',
  373 + component: Home,
  374 + name: '进港航班申报',
  375 + iconCls:'el-icon-goods',
  376 + children:[
  377 + {path:'/arrival',component:arrival,name:'进港预报申报'},
  378 + {path:'/confirmatory',component:confirmatory,name:'进港确报申报'},
  379 + {path:'/queryArrival',component:queryArrival,name:'进港预报查询'},
  380 + {path:'/queryConfirmatory',component:queryConfirmatory,name:'进港确报查询'},
  381 + {path:'/configure',component:configure,name:'进港航班配置'},
  382 + {path:'/queryConfigure',component:queryConfigure,name:'航班配置查询'},
395 ] 383 ]
396 }, 384 },
397 // { 385 // {
398 - // path: '/out', 386 + // path: '/con',
399 // component: Home, 387 // component: Home,
400 - // name: '出港申报', 388 + // name: '收发货人管理',
401 // iconCls:'el-icon-goods', 389 // iconCls:'el-icon-goods',
402 // children:[ 390 // children:[
403 - // {path:'/departure',component:departure,name:'出港预报申报'},  
404 - // {path:'/declare',component:declare,name:'出港确报申报'},  
405 - // {path:'/queryDeparture',component:queryDeparture,name:'出港预报查询'},  
406 - // {path:'/queryDeclare',component:queryDeclare,name:'出港确报查询'},  
407 - // {path:'/outConfigure',component:outConfigure,name:'出港航班配置'},  
408 - // {path:'/queryFlightConfigure',component:queryFlightConfigure,name:'航班配置查询'}, 391 + // {path:'/consigner',component:Consigner,name:'发货人管理'},
  392 + // {path:'/consignee',component:Consignee,name:'收货人管理'},
  393 + // {path:'/transport',component:Transport,name:'转运申请'},
  394 + //
409 // ] 395 // ]
410 // }, 396 // },
  397 + {
  398 + path: '/out',
  399 + component: Home,
  400 + name: '出港航班申报',
  401 + iconCls:'el-icon-goods',
  402 + children:[
  403 + {path:'/departure',component:departure,name:'出港预报申报'},
  404 + {path:'/declare',component:declare,name:'出港确报申报'},
  405 + {path:'/queryDeparture',component:queryDeparture,name:'出港预报查询'},
  406 + {path:'/queryDeclare',component:queryDeclare,name:'出港确报查询'},
  407 + {path:'/outConfigure',component:outConfigure,name:'出港航班配置'},
  408 + {path:'/queryFlightConfigure',component:queryFlightConfigure,name:'航班配置查询'},
  409 + ]
  410 + },
411 411
412 // { 412 // {
413 // path: '/express-system', 413 // path: '/express-system',
@@ -230,4 +230,4 @@ @@ -230,4 +230,4 @@
230 this.defaultData(); 230 this.defaultData();
231 } 231 }
232 } 232 }
233 -</script>  
  233 +</script>
@@ -329,8 +329,8 @@ background-color: white; @@ -329,8 +329,8 @@ background-color: white;
329 if(response.code=='200'){ 329 if(response.code=='200'){
330 this.centerDialogVisible=true; 330 this.centerDialogVisible=true;
331 this.msg=response.msg; 331 this.msg=response.msg;
332 - this.$router.push({path:'/queryBill',query:{aircraftNo:JSON.stringify(this.bill.aircraftNo),flightNo:JSON.stringify(this.bill.flightNo),  
333 - flightDate:JSON.stringify(this.bill.flightDate)}}); 332 + this.$router.push({path:'/queryBill',query:{aircraftNo:this.bill.aircraftNo,flightNo:this.bill.flightNo,
  333 + flightDate:this.bill.flightDate}});
334 }else{ 334 }else{
335 this.msg=response.msg; 335 this.msg=response.msg;
336 } 336 }
@@ -361,4 +361,4 @@ background-color: white; @@ -361,4 +361,4 @@ background-color: white;
361 this.defaultData(); 361 this.defaultData();
362 } 362 }
363 } 363 }
364 -</script>  
  364 +</script>
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 </style> 69 </style>
70 <script> 70 <script>
71 import { addSchedule} from "../../api/transport"; 71 import { addSchedule} from "../../api/transport";
72 - 72 + import loginUserInfo from '@/api/base.js'
73 export default { 73 export default {
74 data(){ 74 data(){
75 return{ 75 return{
@@ -77,8 +77,10 @@ @@ -77,8 +77,10 @@
77 flightNo:undefined, 77 flightNo:undefined,
78 ietype:undefined, 78 ietype:undefined,
79 reamrk:undefined, 79 reamrk:undefined,
80 - accessFlag:'1' 80 + accessFlag:'1',
  81 + username:''
81 }, 82 },
  83 + LoginUserInfo: loginUserInfo,
82 rules: { 84 rules: {
83 flightNo: [ 85 flightNo: [
84 {required: true, message: '请输入', trigger: 'blur'} 86 {required: true, message: '请输入', trigger: 'blur'}
@@ -100,10 +102,14 @@ @@ -100,10 +102,14 @@
100 methods:{ 102 methods:{
101 //新增进港确报申报（保存按钮） 103 //新增进港确报申报（保存按钮）
102 submitForm(formName) { 104 submitForm(formName) {
  105 + let _this = this;
103 this.$refs[formName].validate((valid) => { 106 this.$refs[formName].validate((valid) => {
104 if (valid) { 107 if (valid) {
  108 + this.configure.username=_this.LoginUserInfo.username
  109 + console.log(this.configure.flightNo)
105 addSchedule(this.configure).then(res=>{ 110 addSchedule(this.configure).then(res=>{
106 let response=res.data; 111 let response=res.data;
  112 + console.log(response)
107 if(response.code=='200'){ 113 if(response.code=='200'){
108 this.centerDialogVisible=true; 114 this.centerDialogVisible=true;
109 this.msg=response.msg; 115 this.msg=response.msg;
@@ -129,4 +135,4 @@ @@ -129,4 +135,4 @@
129 this.defaultData(); 135 this.defaultData();
130 } 136 }
131 } 137 }
132 -</script>  
  138 +</script>
@@ -135,7 +135,7 @@ @@ -135,7 +135,7 @@
135 {required: true, message: '请输入', trigger: 'blur'} 135 {required: true, message: '请输入', trigger: 'blur'}
136 ], 136 ],
137 flightDate: [ 137 flightDate: [
138 - {type: 'date',required: true, message: '请选择', trigger: 'change'} 138 + {required: true, message: '请选择', trigger: 'change'}
139 ], 139 ],
140 departurePort: [ 140 departurePort: [
141 {required: true, message: '请输入(三字码)', trigger: 'blur'}, 141 {required: true, message: '请输入(三字码)', trigger: 'blur'},
@@ -196,4 +196,4 @@ @@ -196,4 +196,4 @@
196 this.defaultData(); 196 this.defaultData();
197 } 197 }
198 } 198 }
199 -</script>  
  199 +</script>
@@ -426,7 +426,7 @@ @@ -426,7 +426,7 @@
426 if(response.code=='200'){ 426 if(response.code=='200'){
427 this.centerDialogVisible=true; 427 this.centerDialogVisible=true;
428 this.msg=response.msg; 428 this.msg=response.msg;
429 - this.$router.push({path:'/queryFlights',query:{flightNo:JSON.stringify(this.flight.flightNo),flightDate:JSON.stringify(this.flight.flightDate)}}); 429 + this.$router.push({path:'/queryFlights',query:{flightNo:this.flight.flightNo,flightDate:this.flight.flightDate}});
430 this.centerDialogVisible=false; 430 this.centerDialogVisible=false;
431 }else{ 431 }else{
432 this.centerDialogVisible=true; 432 this.centerDialogVisible=true;
@@ -476,4 +476,4 @@ @@ -476,4 +476,4 @@
476 this.defaultData(); 476 this.defaultData();
477 } 477 }
478 } 478 }
479 -</script>  
  479 +</script>
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <el-row> 10 <el-row>
11 <el-form :label-position="labelPosition" :model="queryAircraft" :rules="rules" ref="queryAircraft" 11 <el-form :label-position="labelPosition" :model="queryAircraft" :rules="rules" ref="queryAircraft"
12 label-width="130px" class="demo-ruleForm"> 12 label-width="130px" class="demo-ruleForm">
13 - <el-col :span="8"> 13 + <el-col :span="8" style="margin-left: 10px">
14 <el-form-item label="航空器所有人代码:" prop="airwayCode" label-width="130px"> 14 <el-form-item label="航空器所有人代码:" prop="airwayCode" label-width="130px">
15 <el-input v-model="queryAircraft.airwayCode" style="width:190px"></el-input> 15 <el-input v-model="queryAircraft.airwayCode" style="width:190px"></el-input>
16 </el-form-item> 16 </el-form-item>
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
30 <el-table 30 <el-table
31 :data="tableData" 31 :data="tableData"
32 border 32 border
  33 + height="500"
33 v-loading="tableloading" 34 v-loading="tableloading"
34 style="width: 100%;margin-bottom: 10px"> 35 style="width: 100%;margin-bottom: 10px">
35 <el-table-column 36 <el-table-column
@@ -15,12 +15,12 @@ @@ -15,12 +15,12 @@
15 <el-input v-model="queryArrival.flightNo" style="width:190px"></el-input> 15 <el-input v-model="queryArrival.flightNo" style="width:190px"></el-input>
16 </el-form-item> 16 </el-form-item>
17 </el-col> 17 </el-col>
18 - <el-col :span="6" > 18 + <el-col :span="7" >
19 <el-form-item label="航班日期:" prop="flightDate" label-width="90px"> 19 <el-form-item label="航班日期:" prop="flightDate" label-width="90px">
20 <el-date-picker 20 <el-date-picker
21 v-model="queryArrival.flightDate" 21 v-model="queryArrival.flightDate"
22 type="date" 22 type="date"
23 - format="yyyyMMdd" 23 + value-format="yyyyMMdd"
24 style="width:190px" 24 style="width:190px"
25 placeholder="选择日期"> 25 placeholder="选择日期">
26 </el-date-picker> 26 </el-date-picker>
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
36 <el-table 36 <el-table
37 :data="tableData" 37 :data="tableData"
38 border 38 border
  39 + height="500"
39 v-loading="tableloading" 40 v-loading="tableloading"
40 style="width: 100%;margin-bottom: 10px"> 41 style="width: 100%;margin-bottom: 10px">
41 <el-table-column 42 <el-table-column
@@ -236,7 +237,6 @@ @@ -236,7 +237,6 @@
236 //获取默认值 237 //获取默认值
237 defaultData() { 238 defaultData() {
238 Object.assign(this.queryArrival, this.$route.query); 239 Object.assign(this.queryArrival, this.$route.query);
239 -  
240 // this.flightNo = JSON.parse(this.$route.query.flightNo); 240 // this.flightNo = JSON.parse(this.$route.query.flightNo);
241 // this.flightDate = JSON.parse(this.$route.query.flightDate); 241 // this.flightDate = JSON.parse(this.$route.query.flightDate);
242 }, 242 },
@@ -252,4 +252,4 @@ @@ -252,4 +252,4 @@
252 this.submitForm(); 252 this.submitForm();
253 } 253 }
254 } 254 }
255 -</script>  
  255 +</script>
@@ -10,35 +10,35 @@ @@ -10,35 +10,35 @@
10 <el-row> 10 <el-row>
11 <el-form :label-position="labelPosition" :model="queryBill" :rules="rules" ref="queryBill" 11 <el-form :label-position="labelPosition" :model="queryBill" :rules="rules" ref="queryBill"
12 class="demo-ruleForm"> 12 class="demo-ruleForm">
13 - <el-col :span="5">  
14 - <el-form-item label="航班号:" prop="flightNo" label-width="70px">  
15 - <el-input v-model="queryBill.flightNo"></el-input> 13 + <el-col :span="6" style="margin-left: 10px">
  14 + <el-form-item label="航班号:" prop="flightNo">
  15 + <el-input v-model="queryBill.flightNo" style="width: 180px"></el-input>
16 </el-form-item> 16 </el-form-item>
17 </el-col> 17 </el-col>
18 - <el-col :span="5" >  
19 - <el-form-item label="航空器注册号:" prop="aircraftNo" label-width="110px" >  
20 - <el-input v-model="queryBill.aircraftNo"></el-input> 18 + <el-col :span="7" >
  19 + <el-form-item label="航空器注册号:" prop="aircraftNo">
  20 + <el-input v-model="queryBill.aircraftNo" style="width: 180px"></el-input>
21 </el-form-item> 21 </el-form-item>
22 </el-col> 22 </el-col>
23 - <el-col :span="5" >  
24 - <el-form-item label="进出港:" prop="accessFlag" label-width="70px">  
25 - <el-input v-model="queryBill.accessFlag"></el-input> 23 + <el-col :span="6" >
  24 + <el-form-item label="进出港:" prop="accessFlag">
  25 + <el-input v-model="queryBill.accessFlag" style="width: 180px"></el-input>
26 </el-form-item> 26 </el-form-item>
27 </el-col> 27 </el-col>
28 - <el-col :span="5" >  
29 - <el-form-item label="航班日期:" prop="flightDate" label-width="80px" > 28 + <el-col :span="6" >
  29 + <el-form-item label="航班日期:" prop="flightDate">
30 <el-date-picker 30 <el-date-picker
31 v-model="queryBill.flightDate" 31 v-model="queryBill.flightDate"
32 type="date" 32 type="date"
33 value-format="yyyyMMdd" 33 value-format="yyyyMMdd"
34 format="yyyyMMdd" 34 format="yyyyMMdd"
35 - placeholder="选择日期"> 35 + placeholder="选择日期" style="width: 180px">
36 </el-date-picker> 36 </el-date-picker>
37 </el-form-item> 37 </el-form-item>
38 </el-col> 38 </el-col>
39 39
40 - <el-col :span="2" >  
41 - <el-button type="primary" @click="submitForm()" style="padding-left:10px">查询</el-button> 40 + <el-col :span="3" >
  41 + <el-button type="primary" @click="submitForm()" >查询</el-button>
42 </el-col> 42 </el-col>
43 </el-form> 43 </el-form>
44 </el-row> 44 </el-row>
@@ -47,8 +47,9 @@ @@ -47,8 +47,9 @@
47 <el-table 47 <el-table
48 :data="tableData" 48 :data="tableData"
49 border 49 border
  50 + height="500"
50 v-loading="tableloading" 51 v-loading="tableloading"
51 - style="width: 100%;margin-bottom: 10px"> 52 + style="margin-bottom: 10px">
52 <el-table-column 53 <el-table-column
53 fixed="left" 54 fixed="left"
54 label="操作" 55 label="操作"
@@ -74,11 +75,13 @@ @@ -74,11 +75,13 @@
74 </el-table-column> 75 </el-table-column>
75 <el-table-column 76 <el-table-column
76 prop="flightDate" 77 prop="flightDate"
77 - label="航班日期"> 78 + label="航班日期"
  79 + width="120">
78 </el-table-column> 80 </el-table-column>
79 <el-table-column 81 <el-table-column
80 prop="accessFlag" 82 prop="accessFlag"
81 - label="进出港标识"> 83 + label="进出港标识"
  84 + width="120">
82 </el-table-column> 85 </el-table-column>
83 <el-table-column 86 <el-table-column
84 prop="departureAirport" 87 prop="departureAirport"
@@ -86,7 +89,8 @@ @@ -86,7 +89,8 @@
86 </el-table-column> 89 </el-table-column>
87 <el-table-column 90 <el-table-column
88 prop="departuredatetime" 91 prop="departuredatetime"
89 - label="出发时间"> 92 + label="出发时间"
  93 + width="120">
90 </el-table-column> 94 </el-table-column>
91 <el-table-column 95 <el-table-column
92 prop="arrivalAirport" 96 prop="arrivalAirport"
@@ -94,7 +98,8 @@ @@ -94,7 +98,8 @@
94 </el-table-column> 98 </el-table-column>
95 <el-table-column 99 <el-table-column
96 prop="arrivaldatetime" 100 prop="arrivaldatetime"
97 - label="到达时间"> 101 + label="到达时间"
  102 + width="120">
98 </el-table-column> 103 </el-table-column>
99 <el-table-column 104 <el-table-column
100 prop="statusMsg" 105 prop="statusMsg"
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
26 <el-table 26 <el-table
27 :data="tableData" 27 :data="tableData"
28 border 28 border
  29 + height="500"
29 v-loading="tableloading" 30 v-loading="tableloading"
30 style="width: 100%;margin-bottom: 10px"> 31 style="width: 100%;margin-bottom: 10px">
31 <el-table-column 32 <el-table-column
@@ -44,7 +45,7 @@ @@ -44,7 +45,7 @@
44 label="用户名"> 45 label="用户名">
45 </el-table-column> 46 </el-table-column>
46 <el-table-column 47 <el-table-column
47 - prop="flightno" 48 + prop="flightNo"
48 label="航班号"> 49 label="航班号">
49 </el-table-column> 50 </el-table-column>
50 <el-table-column 51 <el-table-column
@@ -229,4 +230,4 @@ @@ -229,4 +230,4 @@
229 this.submitForm(); 230 this.submitForm();
230 } 231 }
231 } 232 }
232 -</script>  
  233 +</script>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <el-date-picker 20 <el-date-picker
21 v-model="queryConfirmatory.flightDate" 21 v-model="queryConfirmatory.flightDate"
22 type="date" 22 type="date"
23 - format="yyyyMMdd" 23 + value-format="yyyyMMdd"
24 style="width:190px" 24 style="width:190px"
25 placeholder="选择日期"> 25 placeholder="选择日期">
26 </el-date-picker> 26 </el-date-picker>
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
36 <el-table 36 <el-table
37 :data="tableData" 37 :data="tableData"
38 border 38 border
  39 + height="500"
39 v-loading="tableloading" 40 v-loading="tableloading"
40 style="width: 100%;margin-bottom: 10px"> 41 style="width: 100%;margin-bottom: 10px">
41 <el-table-column 42 <el-table-column
@@ -250,4 +251,4 @@ @@ -250,4 +251,4 @@
250 this.submitForm(); 251 this.submitForm();
251 } 252 }
252 } 253 }
253 -</script>  
  254 +</script>
@@ -25,6 +25,8 @@ @@ -25,6 +25,8 @@
25 <el-date-picker 25 <el-date-picker
26 v-model="queryDeclare.flightDate" 26 v-model="queryDeclare.flightDate"
27 type="date" 27 type="date"
  28 + value-format="yyyyMMdd"
  29 + format="yyyyMMdd"
28 style="width:190px" 30 style="width:190px"
29 placeholder="选择日期"> 31 placeholder="选择日期">
30 </el-date-picker> 32 </el-date-picker>
@@ -45,6 +47,7 @@ @@ -45,6 +47,7 @@
45 <el-table-column 47 <el-table-column
46 fixed="left" 48 fixed="left"
47 label="操作" 49 label="操作"
  50 + height="500"
48 width="100"> 51 width="100">
49 <template slot-scope="scope"> 52 <template slot-scope="scope">
50 <el-button 53 <el-button
@@ -59,7 +62,8 @@ @@ -59,7 +62,8 @@
59 </el-table-column> 62 </el-table-column>
60 <el-table-column 63 <el-table-column
61 prop="flightDate" 64 prop="flightDate"
62 - label="航班日期"> 65 + label="航班日期"
  66 + width="120">
63 </el-table-column> 67 </el-table-column>
64 <el-table-column 68 <el-table-column
65 prop="aircraftNo" 69 prop="aircraftNo"
@@ -251,4 +255,4 @@ @@ -251,4 +255,4 @@
251 this.submitForm(); 255 this.submitForm();
252 } 256 }
253 } 257 }
254 -</script>  
  258 +</script>
@@ -25,6 +25,8 @@ @@ -25,6 +25,8 @@
25 <el-date-picker 25 <el-date-picker
26 v-model="queryDeparture.flightDate" 26 v-model="queryDeparture.flightDate"
27 type="date" 27 type="date"
  28 + value-format="yyyyMMdd"
  29 + format="yyyyMMdd"
28 style="width:190px" 30 style="width:190px"
29 placeholder="选择日期"> 31 placeholder="选择日期">
30 </el-date-picker> 32 </el-date-picker>
@@ -40,6 +42,7 @@ @@ -40,6 +42,7 @@
40 <el-table 42 <el-table
41 :data="tableData" 43 :data="tableData"
42 border 44 border
  45 + height="500"
43 v-loading="tableloading" 46 v-loading="tableloading"
44 style="width: 100%;margin-bottom: 10px"> 47 style="width: 100%;margin-bottom: 10px">
45 <el-table-column 48 <el-table-column
@@ -249,4 +252,4 @@ @@ -249,4 +252,4 @@
249 this.submitForm(); 252 this.submitForm();
250 } 253 }
251 } 254 }
252 -</script>  
  255 +</script>
@@ -10,17 +10,17 @@ @@ -10,17 +10,17 @@
10 <el-row> 10 <el-row>
11 <el-form :label-position="labelPosition" :model="queryFlight" :rules="rules" ref="queryFlight" 11 <el-form :label-position="labelPosition" :model="queryFlight" :rules="rules" ref="queryFlight"
12 label-width="130px" class="demo-ruleForm"> 12 label-width="130px" class="demo-ruleForm">
13 - <el-col :span="8" >  
14 - <el-form-item label="航班号：" prop="aircraftNo" label-width="80px">  
15 - <el-input v-model="queryFlight.aircraftNo" style="width:190px"></el-input> 13 + <el-col :span="7" style="margin-left: 10px">
  14 + <el-form-item label="航班号：" prop="flightNo">
  15 + <el-input v-model="queryFlight.flightNo" style="width:180px;margin-left: -60px"></el-input>
16 </el-form-item> 16 </el-form-item>
17 </el-col> 17 </el-col>
18 - <el-col :span="8">  
19 - <el-form-item label="航空公司代码：" prop="flightNo" label-width="110px">  
20 - <el-input v-model="queryFlight.flightNo" style="width:190px"></el-input> 18 + <el-col :span="7">
  19 + <el-form-item label="航空公司代码：" prop="aircraftNo" label-width="110px">
  20 + <el-input v-model="queryFlight.aircraftNo" style="width:180px"></el-input>
21 </el-form-item> 21 </el-form-item>
22 </el-col> 22 </el-col>
23 - <el-col :span="6" > 23 + <el-col :span="3" >
24 <el-button type="primary" @click="submitForm()">查询</el-button> 24 <el-button type="primary" @click="submitForm()">查询</el-button>
25 </el-col> 25 </el-col>
26 </el-form> 26 </el-form>
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
30 <el-table 30 <el-table
31 :data="tableData" 31 :data="tableData"
32 border 32 border
  33 + height="500"
33 v-loading="tableloading" 34 v-loading="tableloading"
34 style="width: 100%;margin-bottom: 10px"> 35 style="width: 100%;margin-bottom: 10px">
35 <el-table-column 36 <el-table-column
@@ -49,19 +50,23 @@ @@ -49,19 +50,23 @@
49 </el-table-column> 50 </el-table-column>
50 <el-table-column 51 <el-table-column
51 prop="airwayCode" 52 prop="airwayCode"
52 - label="航空公司代码"> 53 + label="航空公司代码"
  54 + width="150">
53 </el-table-column> 55 </el-table-column>
54 <el-table-column 56 <el-table-column
55 prop="flightDate" 57 prop="flightDate"
56 - label="航空公司中文"> 58 + label="航空公司中文"
  59 + width="150">
57 </el-table-column> 60 </el-table-column>
58 <el-table-column 61 <el-table-column
59 prop="transportAgentCode" 62 prop="transportAgentCode"
60 - label="传输代理人"> 63 + label="传输代理人"
  64 + width="120">
61 </el-table-column> 65 </el-table-column>
62 <el-table-column 66 <el-table-column
63 prop="groundAgentCode" 67 prop="groundAgentCode"
64 - label="地面代理人"> 68 + label="地面代理人"
  69 + width="120">
65 </el-table-column> 70 </el-table-column>
66 <el-table-column 71 <el-table-column
67 prop="linesType" 72 prop="linesType"
@@ -73,7 +78,8 @@ @@ -73,7 +78,8 @@
73 </el-table-column> 78 </el-table-column>
74 <el-table-column 79 <el-table-column
75 prop="shareFlightNo" 80 prop="shareFlightNo"
76 - label="共享航班号"> 81 + label="共享航班号"
  82 + width="120">
77 </el-table-column> 83 </el-table-column>
78 <el-table-column 84 <el-table-column
79 prop="statusMsg" 85 prop="statusMsg"
@@ -239,4 +245,4 @@ @@ -239,4 +245,4 @@
239 this.submitForm(); 245 this.submitForm();
240 } 246 }
241 } 247 }
242 -</script>  
  248 +</script>
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
26 <el-table 26 <el-table
27 :data="tableData" 27 :data="tableData"
28 border 28 border
  29 + height="500"
29 v-loading="tableloading" 30 v-loading="tableloading"
30 style="width: 100%;margin-bottom: 10px"> 31 style="width: 100%;margin-bottom: 10px">
31 <el-table-column 32 <el-table-column
@@ -227,4 +228,4 @@ @@ -227,4 +228,4 @@
227 this.submitForm(); 228 this.submitForm();
228 } 229 }
229 } 230 }
230 -</script>  
  231 +</script>
@@ -10,9 +10,9 @@ @@ -10,9 +10,9 @@
10 <el-row> 10 <el-row>
11 <el-form :label-position="labelPosition" :model="queryFlightplan" ref="queryFlightplan" 11 <el-form :label-position="labelPosition" :model="queryFlightplan" ref="queryFlightplan"
12 label-width="130px" class="demo-ruleForm"> 12 label-width="130px" class="demo-ruleForm">
13 - <el-col :span="6" >  
14 - <el-form-item label="承运人:" prop="awcd" label-width="110px">  
15 - <el-input v-model="queryFlightplan.aircraftNo" style="width:190px"></el-input> 13 + <el-col :span="6" style="margin-left: 10px">
  14 + <el-form-item label="承运人:" prop="awcd" label-width="70px">
  15 + <el-input v-model="queryFlightplan.awcd" style="width:190px"></el-input>
16 </el-form-item> 16 </el-form-item>
17 </el-col> 17 </el-col>
18 <el-col :span="6"> 18 <el-col :span="6">
@@ -43,6 +43,7 @@ @@ -43,6 +43,7 @@
43 <el-table 43 <el-table
44 :data="tableData" 44 :data="tableData"
45 border 45 border
  46 + height="500"
46 style="width: 100%;margin-bottom: 10px"> 47 style="width: 100%;margin-bottom: 10px">
47 <el-table-column 48 <el-table-column
48 fixed="left" 49 fixed="left"
@@ -57,11 +58,13 @@ @@ -57,11 +58,13 @@
57 </el-table-column> 58 </el-table-column>
58 <el-table-column 59 <el-table-column
59 prop="flightNo" 60 prop="flightNo"
60 - label="航班号"> 61 + label="航班号"
  62 + width="120">
61 </el-table-column> 63 </el-table-column>
62 <el-table-column 64 <el-table-column
63 prop="flightDate" 65 prop="flightDate"
64 - label="航班日期"> 66 + label="航班日期"
  67 + width="120">
65 </el-table-column> 68 </el-table-column>
66 <el-table-column 69 <el-table-column
67 prop="departurePort" 70 prop="departurePort"
@@ -170,9 +173,10 @@ @@ -170,9 +173,10 @@
170 data(){ 173 data(){
171 return{ 174 return{
172 queryFlightplan:{ 175 queryFlightplan:{
173 - flightNo:undefined,  
174 - flightDate:undefined, 176 + flightNo:'',
  177 + flightDate:'',
175 aircraftNo:undefined, 178 aircraftNo:undefined,
  179 + awcd:''
176 }, 180 },
177 labelPosition:'left', 181 labelPosition:'left',
178 currentPage: 1, 182 currentPage: 1,
@@ -208,11 +212,13 @@ @@ -208,11 +212,13 @@
208 submitForm() { 212 submitForm() {
209 let params = { 213 let params = {
210 currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryFlightplan.flightNo, 214 currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryFlightplan.flightNo,
211 - aircraftNo: this.queryFlightplan.aircraftNo, flightDate: this.queryFlightplan.flightDate 215 + awcd: this.queryFlightplan.awcd, flightDate: this.queryFlightplan.flightDate
212 }; 216 };
  217 + console.log(params)
213 this.tableloading = true; 218 this.tableloading = true;
214 selectFlightPlan(params).then(res => { 219 selectFlightPlan(params).then(res => {
215 let response = res.data.data; 220 let response = res.data.data;
  221 + console.log(response)
216 this.tableData = response.list; 222 this.tableData = response.list;
217 this.tableloading = false; 223 this.tableloading = false;
218 this.total = response.total; 224 this.total = response.total;
@@ -8,9 +8,9 @@ @@ -8,9 +8,9 @@
8 </el-row> 8 </el-row>
9 <el-row> 9 <el-row>
10 <el-form :model="queryRoute" ref="serialNo" label-width="130px" > 10 <el-form :model="queryRoute" ref="serialNo" label-width="130px" >
11 - <el-col :span="6"> 11 + <el-col :span="8">
12 <el-form-item label="航线序号" prop="serialNo" label-width="130px"> 12 <el-form-item label="航线序号" prop="serialNo" label-width="130px">
13 - <el-input v-model="queryRoute.serialNo" placeholder="请输入"></el-input> 13 + <el-input v-model="queryRoute.serialNo" placeholder="请输入" style="width: 180px"></el-input>
14 </el-form-item> 14 </el-form-item>
15 </el-col> 15 </el-col>
16 <el-col :span="3"> <el-button type="primary" @click="submitForm()">查 询</el-button></el-col> 16 <el-col :span="3"> <el-button type="primary" @click="submitForm()">查 询</el-button></el-col>
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
23 <el-table 23 <el-table
24 :data="tableData" 24 :data="tableData"
25 border 25 border
  26 + height="500"
26 v-loading="tableloading" 27 v-loading="tableloading"
27 style="width:100%;margin-bottom: 10px"> 28 style="width:100%;margin-bottom: 10px">
28 <el-table-column 29 <el-table-column
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <el-row> 10 <el-row>
11 <el-form :label-position="labelPosition" :model="queryRouteaircraft" ref="queryRouteaircraft" 11 <el-form :label-position="labelPosition" :model="queryRouteaircraft" ref="queryRouteaircraft"
12 label-width="130px" class="demo-ruleForm"> 12 label-width="130px" class="demo-ruleForm">
13 - <el-col :span="8"> 13 + <el-col :span="8" style="margin-left: 10px">
14 <el-form-item label="航空器所有人代码:" prop="airwayCode" label-width="130px"> 14 <el-form-item label="航空器所有人代码:" prop="airwayCode" label-width="130px">
15 <el-input v-model="queryRouteaircraft.airwayCode" style="width:190px"></el-input> 15 <el-input v-model="queryRouteaircraft.airwayCode" style="width:190px"></el-input>
16 </el-form-item> 16 </el-form-item>
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
30 <el-table 30 <el-table
31 :data="tableData" 31 :data="tableData"
32 border 32 border
  33 + height="500"
33 v-loading="tableloading" 34 v-loading="tableloading"
34 style="width: 100%;margin-bottom: 10px"> 35 style="width: 100%;margin-bottom: 10px">
35 <el-table-column 36 <el-table-column
@@ -350,4 +350,4 @@ @@ -350,4 +350,4 @@
350 this.defaultData(); 350 this.defaultData();
351 } 351 }
352 } 352 }
353 -</script>  
  353 +</script>
@@ -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:'/queryRouteaircraft',query:{airwayCode:JSON.stringify(this.aircraft.airwayCode),aircraftNo:JSON.stringify(this.aircraft.aircraftNo)},}); 226 + this.$router.push({path:'/queryRouteaircraft',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 }
@@ -245,4 +245,4 @@ @@ -245,4 +245,4 @@
245 this.defaultData(); 245 this.defaultData();
246 } 246 }
247 } 247 }
248 -</script>  
  248 +</script>