朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 6b552697d551139b5ea2935024146065781f309f 2 个父辈 6a39c088 5eaf39b8

Merge remote-tracking branch 'origin/master'

内嵌 并排对比
正在显示 1 个修改的文件 包含 33 行增加 和 42 行删除
@@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
67 </el-form-item> 67 </el-form-item>
68 </el-col> 68 </el-col>
69 <el-col :span="24" style="margin-bottom: 20px"> 69 <el-col :span="24" style="margin-bottom: 20px">
70 - <div class="grid-content content">航线信息<el-button type="primary" size="mini" @click="dialogTableVisible = true" style="margin-left:50px">航线信息查询</el-button></div> 70 + <div class="grid-content content">航线信息<el-button type="primary" size="mini" @click="selectAirline()" style="margin-left:50px">航线信息查询</el-button></div>
71 </el-col> 71 </el-col>
72 72
73 <el-col :span="6"> 73 <el-col :span="6">
@@ -166,6 +166,7 @@ @@ -166,6 +166,7 @@
166 <el-dialog title="航线信息" :visible.sync="dialogTableVisible" width="90%"> 166 <el-dialog title="航线信息" :visible.sync="dialogTableVisible" width="90%">
167 <el-table 167 <el-table
168 :data="tableData" 168 :data="tableData"
  169 + v-loading="tableloading"
169 border 170 border
170 style="width: 100%;margin-bottom: 10px"> 171 style="width: 100%;margin-bottom: 10px">
171 <el-table-column 172 <el-table-column
@@ -180,70 +181,48 @@ @@ -180,70 +181,48 @@
180 </template> 181 </template>
181 </el-table-column> 182 </el-table-column>
182 <el-table-column 183 <el-table-column
183 - fixed  
184 prop="serialNo" 184 prop="serialNo"
185 - label="航线序号"  
186 - width="80"> 185 + label="航线序号">
187 </el-table-column> 186 </el-table-column>
188 <el-table-column 187 <el-table-column
189 - fixed  
190 prop="departurePort" 188 prop="departurePort"
191 - label="出发港"  
192 - width="80"> 189 + label="出发港">
193 </el-table-column> 190 </el-table-column>
194 <el-table-column 191 <el-table-column
195 - fixed  
196 prop="departureCustomNo" 192 prop="departureCustomNo"
197 - label="出发港关区代码"  
198 - width="150"> 193 + label="出发港关区代码">
199 </el-table-column> 194 </el-table-column>
200 <el-table-column 195 <el-table-column
201 - fixed  
202 prop="arrivalPort" 196 prop="arrivalPort"
203 - label="目的港"  
204 - width="80"> 197 + label="目的港">
205 </el-table-column> 198 </el-table-column>
206 <el-table-column 199 <el-table-column
207 - fixed  
208 prop="arrivalCustomNo" 200 prop="arrivalCustomNo"
209 - label="目的港关区代码"  
210 - width="150"> 201 + label="目的港关区代码">
211 </el-table-column> 202 </el-table-column>
212 <el-table-column 203 <el-table-column
213 - fixed  
214 prop="std" 204 prop="std"
215 - label="长期离港时间"  
216 - width="150"> 205 + label="长期离港时间">
217 </el-table-column> 206 </el-table-column>
218 <el-table-column 207 <el-table-column
219 - fixed  
220 prop="sta" 208 prop="sta"
221 - label="长期抵港时间"  
222 - width="150"> 209 + label="长期抵港时间">
223 </el-table-column> 210 </el-table-column>
224 <el-table-column 211 <el-table-column
225 - fixed  
226 prop="effStartdate" 212 prop="effStartdate"
227 - label="有效期起始时间"  
228 - width="150"> 213 + label="有效期起始时间">
229 </el-table-column> 214 </el-table-column>
230 <el-table-column 215 <el-table-column
231 - fixed  
232 prop="effEnddate" 216 prop="effEnddate"
233 - label="有效期结束时间"  
234 - width="150"> 217 + label="有效期结束时间">
235 </el-table-column> 218 </el-table-column>
236 <el-table-column 219 <el-table-column
237 - fixed  
238 prop="plan" 220 prop="plan"
239 - label="每周执行情况"  
240 - width="150"> 221 + label="每周执行情况">
241 </el-table-column> 222 </el-table-column>
242 <el-table-column 223 <el-table-column
243 - fixed  
244 prop="remark" 224 prop="remark"
245 - label="备注"  
246 - width="150"> 225 + label="备注">
247 </el-table-column> 226 </el-table-column>
248 </el-table> 227 </el-table>
249 </el-dialog> 228 </el-dialog>
@@ -283,8 +262,9 @@ @@ -283,8 +262,9 @@
283 .el-col{margin-right: 0px;} 262 .el-col{margin-right: 0px;}
284 </style> 263 </style>
285 <script> 264 <script>
286 - import {addFlight} from "../../api/transport"; 265 + import {addFlight, selectRoute} from "../../api/transport";
287 const fecha = require('fecha'); 266 const fecha = require('fecha');
  267 + import loginUserInfo from '../../api/base';
288 export default { 268 export default {
289 data(){ 269 data(){
290 return{ 270 return{
@@ -378,7 +358,10 @@ @@ -378,7 +358,10 @@
378 ] 358 ]
379 359
380 }, 360 },
381 - 361 + airLine:{
  362 + createBy:loginUserInfo.username,
  363 + serialno:''
  364 + },
382 flightTypes:[ 365 flightTypes:[
383 {value:'',label:'请选择'}, 366 {value:'',label:'请选择'},
384 {value:'1',label:'来自关境外'}, 367 {value:'1',label:'来自关境外'},
@@ -402,15 +385,23 @@ @@ -402,15 +385,23 @@
402 centerDialogVisible:false, 385 centerDialogVisible:false,
403 currentPage4:4, 386 currentPage4:4,
404 msg:undefined, 387 msg:undefined,
405 - tableData: [{  
406 - std: '161146',  
407 - sta: '161146',  
408 - effStartdate: '20160502',  
409 - effEnddate: '20160503'  
410 - }], 388 + tableData: [],
  389 + tableloading:true,
411 } 390 }
412 }, 391 },
413 methods:{ 392 methods:{
  393 + //航线信息查询
  394 + selectAirline(){
  395 + let params={currentPage:this.currentPage,pageSize:this.pageSize,createBy:this.airLine.createBy};
  396 + this.dialogTableVisible=true;
  397 + this.tableloading=true;
  398 + selectRoute(params).then(res=>{
  399 + let response=res.data.data;
  400 + this.tableData=response.list;
  401 + this.tableloading=false;
  402 + this.total=response.total;
  403 + });
  404 + },
414 //新增航班方法（保存按钮） 405 //新增航班方法（保存按钮）
415 submitForm(formName) { 406 submitForm(formName) {
416 this.$refs[formName].validate((valid) => { 407 this.$refs[formName].validate((valid) => {