朱兆平 / vue_cli · 提交

转到一个项目

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

运输工具测试

内嵌 并排对比
正在显示 20 个修改的文件 包含 162 行增加 和 126 行删除
... ... @@ -340,74 +340,74 @@ let routes = [
//
// ]
// },
// {
// path: '/airtransport',
// component: Home,
// name: '通用业务申报',
// iconCls:'el-icon-goods',
// children:[
// {path:'/route',component:Route,name:'航线申报'},
// {path:'/bill',component:Bill,name:'单据申报'},
// {path:'/flights',component:Flight,name:'航班申报'},
// {path:'/flightplan',component:Flightplan,name:'当日飞行计划'},
// {path:'/aircraft',component:Aircraft,name:'通用航空器申报'},
// {path:'/routeaircraft',component:Routeaircraft,name:'航线航空器申报'},
// ]
// },
// {
// path: '/querytransport',
// component: Home,
// name: '通用业务查询',
// iconCls:'el-icon-goods',
// children:[
// {path:'/queryRoute',component:queryRoute,name:'航线查询'},
// {path:'/queryBill',component:queryBill,name:'单据查询'},
// {path:'/queryFlights',component:queryFlight,name:'航班查询'},
// {path:'/queryFlightplan',component:queryFlightplan,name:'当日飞行计划查询'},
// {path:'/queryAircraft',component:queryAircraft,name:'通用航空器查询'},
// {path:'/queryRouteaircraft',component:queryRouteaircraft,name:'航线航空器查询'},
// ]
// },
// {
// path: '/input',
// component: Home,
// name: '进港航班申报',
// iconCls:'el-icon-goods',
// children:[
// {path:'/arrival',component:arrival,name:'进港预报申报'},
// {path:'/confirmatory',component:confirmatory,name:'进港确报申报'},
// {path:'/queryArrival',component:queryArrival,name:'进港预报查询'},
// {path:'/queryConfirmatory',component:queryConfirmatory,name:'进港确报查询'},
// {path:'/configure',component:configure,name:'进港航班配置'},
// {path:'/queryConfigure',component:queryConfigure,name:'航班配置查询'},
// ]
// },
{
path: '/con',
path: '/airtransport',
component: Home,
name: '收发货人管理',
name: '通用业务申报',
iconCls:'el-icon-goods',
children:[
{path:'/consigner',component:Consigner,name:'发货人管理'},
{path:'/consignee',component:Consignee,name:'收货人管理'},
{path:'/transport',component:Transport,name:'转运申请'},
{path:'/route',component:Route,name:'航线申报'},
{path:'/bill',component:Bill,name:'单据申报'},
{path:'/flights',component:Flight,name:'航班申报'},
{path:'/flightplan',component:Flightplan,name:'当日飞行计划'},
{path:'/aircraft',component:Aircraft,name:'通用航空器申报'},
{path:'/routeaircraft',component:Routeaircraft,name:'航线航空器申报'},
]
},
{
path: '/querytransport',
component: Home,
name: '通用业务查询',
iconCls:'el-icon-goods',
children:[
{path:'/queryRoute',component:queryRoute,name:'航线查询'},
{path:'/queryBill',component:queryBill,name:'单据查询'},
{path:'/queryFlights',component:queryFlight,name:'航班查询'},
{path:'/queryFlightplan',component:queryFlightplan,name:'当日飞行计划查询'},
{path:'/queryAircraft',component:queryAircraft,name:'通用航空器查询'},
{path:'/queryRouteaircraft',component:queryRouteaircraft,name:'航线航空器查询'},
]
},
{
path: '/input',
component: Home,
name: '进港航班申报',
iconCls:'el-icon-goods',
children:[
{path:'/arrival',component:arrival,name:'进港预报申报'},
{path:'/confirmatory',component:confirmatory,name:'进港确报申报'},
{path:'/queryArrival',component:queryArrival,name:'进港预报查询'},
{path:'/queryConfirmatory',component:queryConfirmatory,name:'进港确报查询'},
{path:'/configure',component:configure,name:'进港航班配置'},
{path:'/queryConfigure',component:queryConfigure,name:'航班配置查询'},
]
},
// {
// path: '/out',
// path: '/con',
// component: Home,
// name: '出港申报',
// name: '收发货人管理',
// iconCls:'el-icon-goods',
// children:[
// {path:'/departure',component:departure,name:'出港预报申报'},
// {path:'/declare',component:declare,name:'出港确报申报'},
// {path:'/queryDeparture',component:queryDeparture,name:'出港预报查询'},
// {path:'/queryDeclare',component:queryDeclare,name:'出港确报查询'},
// {path:'/outConfigure',component:outConfigure,name:'出港航班配置'},
// {path:'/queryFlightConfigure',component:queryFlightConfigure,name:'航班配置查询'},
// {path:'/consigner',component:Consigner,name:'发货人管理'},
// {path:'/consignee',component:Consignee,name:'收货人管理'},
// {path:'/transport',component:Transport,name:'转运申请'},
//
// ]
// },
{
path: '/out',
component: Home,
name: '出港航班申报',
iconCls:'el-icon-goods',
children:[
{path:'/departure',component:departure,name:'出港预报申报'},
{path:'/declare',component:declare,name:'出港确报申报'},
{path:'/queryDeparture',component:queryDeparture,name:'出港预报查询'},
{path:'/queryDeclare',component:queryDeclare,name:'出港确报查询'},
{path:'/outConfigure',component:outConfigure,name:'出港航班配置'},
{path:'/queryFlightConfigure',component:queryFlightConfigure,name:'航班配置查询'},
]
},
// {
// path: '/express-system',
... ...
... ... @@ -230,4 +230,4 @@
this.defaultData();
}
}
</script>
\ No newline at end of file
</script>
... ...
... ... @@ -329,8 +329,8 @@ background-color: white;
if(response.code=='200'){
this.centerDialogVisible=true;
this.msg=response.msg;
this.$router.push({path:'/queryBill',query:{aircraftNo:JSON.stringify(this.bill.aircraftNo),flightNo:JSON.stringify(this.bill.flightNo),
flightDate:JSON.stringify(this.bill.flightDate)}});
this.$router.push({path:'/queryBill',query:{aircraftNo:this.bill.aircraftNo,flightNo:this.bill.flightNo,
flightDate:this.bill.flightDate}});
}else{
this.msg=response.msg;
}
... ... @@ -361,4 +361,4 @@ background-color: white;
this.defaultData();
}
}
</script>
\ No newline at end of file
</script>
... ...
... ... @@ -69,7 +69,7 @@
</style>
<script>
import { addSchedule} from "../../api/transport";
import loginUserInfo from '@/api/base.js'
export default {
data(){
return{
... ... @@ -77,8 +77,10 @@
flightNo:undefined,
ietype:undefined,
reamrk:undefined,
accessFlag:'1'
accessFlag:'1',
username:''
},
LoginUserInfo: loginUserInfo,
rules: {
flightNo: [
{required: true, message: '请输入', trigger: 'blur'}
... ... @@ -100,10 +102,14 @@
methods:{
//新增进港确报申报（保存按钮）
submitForm(formName) {
let _this = this;
this.$refs[formName].validate((valid) => {
if (valid) {
this.configure.username=_this.LoginUserInfo.username
console.log(this.configure.flightNo)
addSchedule(this.configure).then(res=>{
let response=res.data;
console.log(response)
if(response.code=='200'){
this.centerDialogVisible=true;
this.msg=response.msg;
... ... @@ -129,4 +135,4 @@
this.defaultData();
}
}
</script>
\ No newline at end of file
</script>
... ...
... ... @@ -135,7 +135,7 @@
{required: true, message: '请输入', trigger: 'blur'}
],
flightDate: [
{type: 'date',required: true, message: '请选择', trigger: 'change'}
{required: true, message: '请选择', trigger: 'change'}
],
departurePort: [
{required: true, message: '请输入(三字码)', trigger: 'blur'},
... ... @@ -196,4 +196,4 @@
this.defaultData();
}
}
</script>
\ No newline at end of file
</script>
... ...
... ... @@ -426,7 +426,7 @@
if(response.code=='200'){
this.centerDialogVisible=true;
this.msg=response.msg;
this.$router.push({path:'/queryFlights',query:{flightNo:JSON.stringify(this.flight.flightNo),flightDate:JSON.stringify(this.flight.flightDate)}});
this.$router.push({path:'/queryFlights',query:{flightNo:this.flight.flightNo,flightDate:this.flight.flightDate}});
this.centerDialogVisible=false;
}else{
this.centerDialogVisible=true;
... ... @@ -476,4 +476,4 @@
this.defaultData();
}
}
</script>
\ No newline at end of file
</script>
... ...
... ... @@ -10,7 +10,7 @@
<el-row>
<el-form :label-position="labelPosition" :model="queryAircraft" :rules="rules" ref="queryAircraft"
label-width="130px" class="demo-ruleForm">
<el-col :span="8">
<el-col :span="8" style="margin-left: 10px">
<el-form-item label="航空器所有人代码:" prop="airwayCode" label-width="130px">
<el-input v-model="queryAircraft.airwayCode" style="width:190px"></el-input>
</el-form-item>
... ... @@ -30,6 +30,7 @@
<el-table
:data="tableData"
border
height="500"
v-loading="tableloading"
style="width: 100%;margin-bottom: 10px">
<el-table-column
... ...
... ... @@ -15,12 +15,12 @@
<el-input v-model="queryArrival.flightNo" style="width:190px"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" >
<el-col :span="7" >
<el-form-item label="航班日期:" prop="flightDate" label-width="90px">
<el-date-picker
v-model="queryArrival.flightDate"
type="date"
format="yyyyMMdd"
value-format="yyyyMMdd"
style="width:190px"
placeholder="选择日期">
</el-date-picker>
... ... @@ -36,6 +36,7 @@
<el-table
:data="tableData"
border
height="500"
v-loading="tableloading"
style="width: 100%;margin-bottom: 10px">
<el-table-column
... ... @@ -236,7 +237,6 @@
//获取默认值
defaultData() {
Object.assign(this.queryArrival, this.$route.query);
// this.flightNo = JSON.parse(this.$route.query.flightNo);
// this.flightDate = JSON.parse(this.$route.query.flightDate);
},
... ... @@ -252,4 +252,4 @@
this.submitForm();
}
}
</script>
\ No newline at end of file
</script>
... ...
... ... @@ -10,35 +10,35 @@
<el-row>
<el-form :label-position="labelPosition" :model="queryBill" :rules="rules" ref="queryBill"
class="demo-ruleForm">
<el-col :span="5">
<el-form-item label="航班号:" prop="flightNo" label-width="70px">
<el-input v-model="queryBill.flightNo"></el-input>
<el-col :span="6" style="margin-left: 10px">
<el-form-item label="航班号:" prop="flightNo">
<el-input v-model="queryBill.flightNo" style="width: 180px"></el-input>
</el-form-item>
</el-col>
<el-col :span="5" >
<el-form-item label="航空器注册号:" prop="aircraftNo" label-width="110px" >
<el-input v-model="queryBill.aircraftNo"></el-input>
<el-col :span="7" >
<el-form-item label="航空器注册号:" prop="aircraftNo">
<el-input v-model="queryBill.aircraftNo" style="width: 180px"></el-input>
</el-form-item>
</el-col>
<el-col :span="5" >
<el-form-item label="进出港:" prop="accessFlag" label-width="70px">
<el-input v-model="queryBill.accessFlag"></el-input>
<el-col :span="6" >
<el-form-item label="进出港:" prop="accessFlag">
<el-input v-model="queryBill.accessFlag" style="width: 180px"></el-input>
</el-form-item>
</el-col>
<el-col :span="5" >
<el-form-item label="航班日期:" prop="flightDate" label-width="80px" >
<el-col :span="6" >
<el-form-item label="航班日期:" prop="flightDate">
<el-date-picker
v-model="queryBill.flightDate"
type="date"
value-format="yyyyMMdd"
format="yyyyMMdd"
placeholder="选择日期">
placeholder="选择日期" style="width: 180px">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="2" >
<el-button type="primary" @click="submitForm()" style="padding-left:10px">查询</el-button>
<el-col :span="3" >
<el-button type="primary" @click="submitForm()" >查询</el-button>
</el-col>
</el-form>
</el-row>
... ... @@ -47,8 +47,9 @@
<el-table
:data="tableData"
border
height="500"
v-loading="tableloading"
style="width: 100%;margin-bottom: 10px">
style="margin-bottom: 10px">
<el-table-column
fixed="left"
label="操作"
... ... @@ -74,11 +75,13 @@
</el-table-column>
<el-table-column
prop="flightDate"
label="航班日期">
label="航班日期"
width="120">
</el-table-column>
<el-table-column
prop="accessFlag"
label="进出港标识">
label="进出港标识"
width="120">
</el-table-column>
<el-table-column
prop="departureAirport"
... ... @@ -86,7 +89,8 @@
</el-table-column>
<el-table-column
prop="departuredatetime"
label="出发时间">
label="出发时间"
width="120">
</el-table-column>
<el-table-column
prop="arrivalAirport"
... ... @@ -94,7 +98,8 @@
</el-table-column>
<el-table-column
prop="arrivaldatetime"
label="到达时间">
label="到达时间"
width="120">
</el-table-column>
<el-table-column
prop="statusMsg"
... ...
... ... @@ -26,6 +26,7 @@
<el-table
:data="tableData"
border
height="500"
v-loading="tableloading"
style="width: 100%;margin-bottom: 10px">
<el-table-column
... ... @@ -44,7 +45,7 @@
label="用户名">
</el-table-column>
<el-table-column
prop="flightno"
prop="flightNo"
label="航班号">
</el-table-column>
<el-table-column
... ... @@ -229,4 +230,4 @@
this.submitForm();
}
}
</script>
\ No newline at end of file
</script>
... ...
... ... @@ -20,7 +20,7 @@
<el-date-picker
v-model="queryConfirmatory.flightDate"
type="date"
format="yyyyMMdd"
value-format="yyyyMMdd"
style="width:190px"
placeholder="选择日期">
</el-date-picker>
... ... @@ -36,6 +36,7 @@
<el-table
:data="tableData"
border
height="500"
v-loading="tableloading"
style="width: 100%;margin-bottom: 10px">
<el-table-column
... ... @@ -250,4 +251,4 @@
this.submitForm();
}
}
</script>
\ No newline at end of file
</script>
... ...
... ... @@ -25,6 +25,8 @@
<el-date-picker
v-model="queryDeclare.flightDate"
type="date"
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width:190px"
placeholder="选择日期">
</el-date-picker>
... ... @@ -45,6 +47,7 @@
<el-table-column
fixed="left"
label="操作"
height="500"
width="100">
<template slot-scope="scope">
<el-button
... ... @@ -59,7 +62,8 @@
</el-table-column>
<el-table-column
prop="flightDate"
label="航班日期">
label="航班日期"
width="120">
</el-table-column>
<el-table-column
prop="aircraftNo"
... ... @@ -251,4 +255,4 @@
this.submitForm();
}
}
</script>
\ No newline at end of file
</script>
... ...
... ... @@ -25,6 +25,8 @@
<el-date-picker
v-model="queryDeparture.flightDate"
type="date"
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width:190px"
placeholder="选择日期">
</el-date-picker>
... ... @@ -40,6 +42,7 @@
<el-table
:data="tableData"
border
height="500"
v-loading="tableloading"
style="width: 100%;margin-bottom: 10px">
<el-table-column
... ... @@ -249,4 +252,4 @@
this.submitForm();
}
}
</script>
\ No newline at end of file
</script>
... ...
... ... @@ -10,17 +10,17 @@
<el-row>
<el-form :label-position="labelPosition" :model="queryFlight" :rules="rules" ref="queryFlight"
label-width="130px" class="demo-ruleForm">
<el-col :span="8" >
<el-form-item label="航班号：" prop="aircraftNo" label-width="80px">
<el-input v-model="queryFlight.aircraftNo" style="width:190px"></el-input>
<el-col :span="7" style="margin-left: 10px">
<el-form-item label="航班号：" prop="flightNo">
<el-input v-model="queryFlight.flightNo" style="width:180px;margin-left: -60px"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="航空公司代码：" prop="flightNo" label-width="110px">
<el-input v-model="queryFlight.flightNo" style="width:190px"></el-input>
<el-col :span="7">
<el-form-item label="航空公司代码：" prop="aircraftNo" label-width="110px">
<el-input v-model="queryFlight.aircraftNo" style="width:180px"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" >
<el-col :span="3" >
<el-button type="primary" @click="submitForm()">查询</el-button>
</el-col>
</el-form>
... ... @@ -30,6 +30,7 @@
<el-table
:data="tableData"
border
height="500"
v-loading="tableloading"
style="width: 100%;margin-bottom: 10px">
<el-table-column
... ... @@ -49,19 +50,23 @@
</el-table-column>
<el-table-column
prop="airwayCode"
label="航空公司代码">
label="航空公司代码"
width="150">
</el-table-column>
<el-table-column
prop="flightDate"
label="航空公司中文">
label="航空公司中文"
width="150">
</el-table-column>
<el-table-column
prop="transportAgentCode"
label="传输代理人">
label="传输代理人"
width="120">
</el-table-column>
<el-table-column
prop="groundAgentCode"
label="地面代理人">
label="地面代理人"
width="120">
</el-table-column>
<el-table-column
prop="linesType"
... ... @@ -73,7 +78,8 @@
</el-table-column>
<el-table-column
prop="shareFlightNo"
label="共享航班号">
label="共享航班号"
width="120">
</el-table-column>
<el-table-column
prop="statusMsg"
... ... @@ -239,4 +245,4 @@
this.submitForm();
}
}
</script>
\ No newline at end of file
</script>
... ...
... ... @@ -26,6 +26,7 @@
<el-table
:data="tableData"
border
height="500"
v-loading="tableloading"
style="width: 100%;margin-bottom: 10px">
<el-table-column
... ... @@ -227,4 +228,4 @@
this.submitForm();
}
}
</script>
\ No newline at end of file
</script>
... ...
... ... @@ -10,9 +10,9 @@
<el-row>
<el-form :label-position="labelPosition" :model="queryFlightplan" ref="queryFlightplan"
label-width="130px" class="demo-ruleForm">
<el-col :span="6" >
<el-form-item label="承运人:" prop="awcd" label-width="110px">
<el-input v-model="queryFlightplan.aircraftNo" style="width:190px"></el-input>
<el-col :span="6" style="margin-left: 10px">
<el-form-item label="承运人:" prop="awcd" label-width="70px">
<el-input v-model="queryFlightplan.awcd" style="width:190px"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
... ... @@ -43,6 +43,7 @@
<el-table
:data="tableData"
border
height="500"
style="width: 100%;margin-bottom: 10px">
<el-table-column
fixed="left"
... ... @@ -57,11 +58,13 @@
</el-table-column>
<el-table-column
prop="flightNo"
label="航班号">
label="航班号"
width="120">
</el-table-column>
<el-table-column
prop="flightDate"
label="航班日期">
label="航班日期"
width="120">
</el-table-column>
<el-table-column
prop="departurePort"
... ... @@ -170,9 +173,10 @@
data(){
return{
queryFlightplan:{
flightNo:undefined,
flightDate:undefined,
flightNo:'',
flightDate:'',
aircraftNo:undefined,
awcd:''
},
labelPosition:'left',
currentPage: 1,
... ... @@ -208,11 +212,13 @@
submitForm() {
let params = {
currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryFlightplan.flightNo,
aircraftNo: this.queryFlightplan.aircraftNo, flightDate: this.queryFlightplan.flightDate
awcd: this.queryFlightplan.awcd, flightDate: this.queryFlightplan.flightDate
};
console.log(params)
this.tableloading = true;
selectFlightPlan(params).then(res => {
let response = res.data.data;
console.log(response)
this.tableData = response.list;
this.tableloading = false;
this.total = response.total;
... ...
... ... @@ -8,9 +8,9 @@
</el-row>
<el-row>
<el-form :model="queryRoute" ref="serialNo" label-width="130px" >
<el-col :span="6">
<el-col :span="8">
<el-form-item label="航线序号" prop="serialNo" label-width="130px">
<el-input v-model="queryRoute.serialNo" placeholder="请输入"></el-input>
<el-input v-model="queryRoute.serialNo" placeholder="请输入" style="width: 180px"></el-input>
</el-form-item>
</el-col>
<el-col :span="3"> <el-button type="primary" @click="submitForm()">查 询</el-button></el-col>
... ... @@ -23,6 +23,7 @@
<el-table
:data="tableData"
border
height="500"
v-loading="tableloading"
style="width:100%;margin-bottom: 10px">
<el-table-column
... ...
... ... @@ -10,7 +10,7 @@
<el-row>
<el-form :label-position="labelPosition" :model="queryRouteaircraft" ref="queryRouteaircraft"
label-width="130px" class="demo-ruleForm">
<el-col :span="8">
<el-col :span="8" style="margin-left: 10px">
<el-form-item label="航空器所有人代码:" prop="airwayCode" label-width="130px">
<el-input v-model="queryRouteaircraft.airwayCode" style="width:190px"></el-input>
</el-form-item>
... ... @@ -30,6 +30,7 @@
<el-table
:data="tableData"
border
height="500"
v-loading="tableloading"
style="width: 100%;margin-bottom: 10px">
<el-table-column
... ...
... ... @@ -350,4 +350,4 @@
this.defaultData();
}
}
</script>
\ No newline at end of file
</script>
... ...
... ... @@ -223,7 +223,7 @@
if(response.code=='200'){
this.centerDialogVisible=true;
this.msg=response.msg;
this.$router.push({path:'/queryRouteaircraft',query:{airwayCode:JSON.stringify(this.aircraft.airwayCode),aircraftNo:JSON.stringify(this.aircraft.aircraftNo)},});
this.$router.push({path:'/queryRouteaircraft',query:{airwayCode:this.aircraft.airwayCode,aircraftNo:this.aircraft.aircraftNo},});
}else{
this.msg=response.msg;
}
... ... @@ -245,4 +245,4 @@
this.defaultData();
}
}
</script>
\ No newline at end of file
</script>
... ...