作者 小范

Merge remote-tracking branch 'origin/master'

... ... @@ -67,7 +67,7 @@
</el-form-item>
</el-col>
<el-col :span="24" style="margin-bottom: 20px">
<div class="grid-content content">航线信息<el-button type="primary" size="mini" @click="dialogTableVisible = true" style="margin-left:50px">航线信息查询</el-button></div>
<div class="grid-content content">航线信息<el-button type="primary" size="mini" @click="selectAirline()" style="margin-left:50px">航线信息查询</el-button></div>
</el-col>
<el-col :span="6">
... ... @@ -166,6 +166,7 @@
<el-dialog title="航线信息" :visible.sync="dialogTableVisible" width="90%">
<el-table
:data="tableData"
v-loading="tableloading"
border
style="width: 100%;margin-bottom: 10px">
<el-table-column
... ... @@ -180,70 +181,48 @@
</template>
</el-table-column>
<el-table-column
fixed
prop="serialNo"
label="航线序号"
width="80">
label="航线序号">
</el-table-column>
<el-table-column
fixed
prop="departurePort"
label="出发港"
width="80">
label="出发港">
</el-table-column>
<el-table-column
fixed
prop="departureCustomNo"
label="出发港关区代码"
width="150">
label="出发港关区代码">
</el-table-column>
<el-table-column
fixed
prop="arrivalPort"
label="目的港"
width="80">
label="目的港">
</el-table-column>
<el-table-column
fixed
prop="arrivalCustomNo"
label="目的港关区代码"
width="150">
label="目的港关区代码">
</el-table-column>
<el-table-column
fixed
prop="std"
label="长期离港时间"
width="150">
label="长期离港时间">
</el-table-column>
<el-table-column
fixed
prop="sta"
label="长期抵港时间"
width="150">
label="长期抵港时间">
</el-table-column>
<el-table-column
fixed
prop="effStartdate"
label="有效期起始时间"
width="150">
label="有效期起始时间">
</el-table-column>
<el-table-column
fixed
prop="effEnddate"
label="有效期结束时间"
width="150">
label="有效期结束时间">
</el-table-column>
<el-table-column
fixed
prop="plan"
label="每周执行情况"
width="150">
label="每周执行情况">
</el-table-column>
<el-table-column
fixed
prop="remark"
label="备注"
width="150">
label="备注">
</el-table-column>
</el-table>
</el-dialog>
... ... @@ -283,8 +262,9 @@
.el-col{margin-right: 0px;}
</style>
<script>
import {addFlight} from "../../api/transport";
import {addFlight, selectRoute} from "../../api/transport";
const fecha = require('fecha');
import loginUserInfo from '../../api/base';
export default {
data(){
return{
... ... @@ -378,7 +358,10 @@
]
},
airLine:{
createBy:loginUserInfo.username,
serialno:''
},
flightTypes:[
{value:'',label:'请选择'},
{value:'1',label:'来自关境外'},
... ... @@ -402,15 +385,23 @@
centerDialogVisible:false,
currentPage4:4,
msg:undefined,
tableData: [{
std: '161146',
sta: '161146',
effStartdate: '20160502',
effEnddate: '20160503'
}],
tableData: [],
tableloading:true,
}
},
methods:{
//航线信息查询
selectAirline(){
let params={currentPage:this.currentPage,pageSize:this.pageSize,createBy:this.airLine.createBy};
this.dialogTableVisible=true;
this.tableloading=true;
selectRoute(params).then(res=>{
let response=res.data.data;
this.tableData=response.list;
this.tableloading=false;
this.total=response.total;
});
},
//新增航班方法(保存按钮)
submitForm(formName) {
this.$refs[formName].validate((valid) => {
... ...