朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 42d88262c981bce15c5f2b0fcf5a51064ac9d6ce 1 个父辈 5e82c1ad

20200623-trans

内嵌 并排对比
正在显示 4 个修改的文件 包含 2068 行增加 和 36 行删除
... ... @@ -102,6 +102,23 @@ let routes = [
]
},
// { path: '/test', component: Main },
// 货运系统--航班预配
{
path: '/domdep',
component: Home,
name: '国内出港',
iconCls: 'el-icon-setting',
children: [
{ path: '/Page4', component: Page4, name: '航班预配' },
// { path: '/role', component: Role, name: '组织机构' },
// { path: '/perm', component: Perm, name: '权限管理' },
// { path: '/log', component: LOG, name: '系统日志' },
// { path: '/department', component: Department, name: '部门管理' },
// { path: '/company', component: Company, name: '公司管理'},
// { path: '/group', component: Group, name: '集团管理'}
]
},
{
path: '/admin',
component: Home,
... ...
... ... @@ -196,18 +196,7 @@
},
//编辑航班查询功能
handleEdit(index,row){
this.$router.push({path:'/flights',query:{uuid:JSON.stringify(row.uuid),airwayCode:JSON.stringify(row.airwayCode)
,airwayNameEn:JSON.stringify(row.airwayNameEn), airwayNameCn:JSON.stringify(row.airwayNameCn),
transportAgentCode:JSON.stringify(row.transportAgentCode),groundAgentCode:JSON.stringify(row.groundAgentCode),
flightNo:JSON.stringify(row.flightNo),shareFlightNo:JSON.stringify(row.shareFlightNo),linesType:JSON.stringify(row.linesType),
std:JSON.stringify(row.std), sta:JSON.stringify(row.sta),effStartdate:JSON.stringify(row.effStartdate),
effEnddate:JSON.stringify(row.effEnddate),plan:JSON.stringify(row.plan), remark:JSON.stringify(row.remark),
createTime:JSON.stringify(row.createTime),createBy:JSON.stringify(row.createBy),updateTime:JSON.stringify(row.updateTime),
updateBy:JSON.stringify(row.updateBy),isDelete:JSON.stringify(row.isDelete),flightType:JSON.stringify(row.flightType), cancelFlag:JSON.stringify(row.cancelFlag),
departurePort:JSON.stringify(row.departurePort),arrivalPort:JSON.stringify(row.arrivalPort),departureCustomNo:JSON.stringify(row.departureCustomNo),
arrivalCustomNo:JSON.stringify(row.arrivalCustomNo),serialno:JSON.stringify(row.serialno),status:JSON.stringify(row.status),
statusMsg:JSON.stringify(row.statusMsg),messageid:JSON.stringify(row.messageid)
}})
this.$router.push({path:'/flights',query:row})
},
//获取默认值
defaultData(){
... ...
<template>
<div>
<h1>vuex 测试</h1>
Clicked: {{ getCount }} times
<button @click="increment">+</button>
<button @click="decrement">-</button>
</div>
</template>
<el-container>
<el-main>
<el-row>
<el-col :span="24">
<div class="grid-content content">航班预配</div>
</el-col>
</el-row>
<!-- 搜索区域-->
<el-row>
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-col :span="5">
<el-form-item label="航班号">
<el-input v-model="formInline.user" placeholder="请输入航班号"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<el-select v-model="formInline.value" placeholder="航班操作" style="margin-left: 50px">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-form>
</el-row>
<!-- 表单区域①-->
<el-row>
<el-table
ref="multipleTable"
:data="tableData"
tooltip-effect="dark"
style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
label="运单号">
<template slot-scope="scope">{{ scope.row.date }}</template>
</el-table-column>
<el-table-column
prop="name"
label="件数">
</el-table-column>
<el-table-column
prop="address"
label="重量">
</el-table-column>
<el-table-column
prop="name"
label="体积">
</el-table-column>
<el-table-column
prop="address"
label="品名">
</el-table-column>
</el-table>
<div style="margin-top:5px;margin-left: 1000px">
<el-button type="primary" >配上</el-button>
<el-button type="success" @click="dialogFormVisible = true">新增</el-button>
<el-button type="warning" @click="dialogFormsVisible = true">导入</el-button>
</div>
</el-row>
<!-- 表单①新增按钮弹框-->
<el-row>
<el-dialog title="新增页面" :visible.sync="dialogFormVisible">
<el-form :model="form">
<el-row>
<el-col :span="10">
<el-form-item label="运单号" :label-width="formLabelWidth">
<el-input v-model="form.name" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="目的站" :label-width="formLabelWidth">
<el-input v-model="form.name" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="件数" :label-width="formLabelWidth">
<el-input v-model="form.name" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="重量" :label-width="formLabelWidth">
<el-input v-model="form.name" autocomplete="off" placeholder="单位：KG"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="体积" :label-width="formLabelWidth">
<el-input v-model="form.name" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="品名" :label-width="formLabelWidth">
<el-select v-model="form.region" placeholder="请选择品名">
<el-option label="品名一" value="品名一"></el-option>
<el-option label="品名二" value="品名二"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="特货代码" :label-width="formLabelWidth">
<el-input v-model="form.name" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="代理人" :label-width="formLabelWidth">
<el-input v-model="form.name" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="优先级" :label-width="formLabelWidth">
<el-input v-model="form.name" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="备注" :label-width="formLabelWidth">
<el-input v-model="form.name" autocomplete="off"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogFormVisible = false">保 存</el-button>
</div>
</el-dialog>
</el-row>
<!-- 表单①导入按钮弹框-->
<el-row>
<el-dialog title="批量导入" :visible.sync="dialogFormsVisible">
<el-form :model="form1" >
<el-row>
<el-col :span="5">
<el-form-item>
<el-form-item label="ULD" :label-width="formsLabelWidths">
<el-input v-model="form1.name" autocomplete="off"></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
</el-row>
<!-- 表单区域②-->
<el-row>
<el-table
ref="multipleTable"
:data="tableData"
tooltip-effect="dark"
style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column
label="ULD类型">
<template slot-scope="scope">{{ scope.row.date }}</template>
</el-table-column>
<el-table-column
prop="name"
label="件数">
</el-table-column>
<el-table-column
prop="address"
label="机仓位">
</el-table-column>
</el-table>
<div style="margin-top:5px;margin-left: 1000px">
<el-button type="primary" >拉下</el-button>
<el-button type="success" @click="dialogFormVisibles = true">新增</el-button>
<el-button type="danger" >删除</el-button>
</div>
</el-row>
<!-- 表单②新增按钮弹框-->
<el-row>
<el-dialog title="新增页面" :visible.sync="dialogFormVisibles">
<el-form :model="forms">
<el-row>
<el-col :span="10">
<el-form-item label="ULD" :label-width="formLabelWidths">
<el-input v-model="forms.name" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="件数" :label-width="formLabelWidths">
<el-input v-model="forms.name" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="机仓位" :label-width="formLabelWidths">
<el-select v-model="forms.region" placeholder="请选择机仓位">
<el-option label="仓位一" value="仓位一"></el-option>
<el-option label="仓位二" value="仓位二"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="板位" :label-width="formLabelWidths">
<el-select v-model="forms.region" placeholder="请选择板位">
<el-option label="板位一" value="板位一"></el-option>
<el-option label="板位二" value="板位二"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="板型" :label-width="formLabelWidths">
<el-select v-model="forms.region" placeholder="请选择板型">
<el-option label="板型一" value="板型一"></el-option>
<el-option label="板型二" value="板型二"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisibles = false">取 消</el-button>
<el-button type="primary" @click="dialogFormVisibles = false">保 存</el-button>
</div>
</el-dialog>
</el-row>
</el-main>
</el-container>
</template>
<script>
import { mapGetters } from 'vuex'
import { mapActions } from 'vuex'
export default {
computed: {
// 使用对象展开运算符将 getters 混入 computed 对象中
...mapGetters([
'getCount'
// ...
])
data() {
return {
formInline: {
user: '',
value: ''
},
tableData:[],
multipleSelection: [],
options: [{
value: '操作1',
label: '操作1'
}, {
value: '操作2',
label: '操作2'
}],
dialogFormVisible: false,
dialogFormVisibles: false,
dialogFormsVisible: false,
form: {},
form1: {},
forms: {},
formLabelWidth: '120px',
formLabelWidths: '120px',
}
},
methods: {
...mapActions([
'increment', // 映射 this.increment() 为 this.$store.dispatch('increment')
'decrement'
])
//...mapActions({
// add: 'increment' // 映射 this.add() 为 this.$store.dispatch('increment')
//})
onSubmit() {
console.log('submit!');
},
handleSelectionChange(val) {
this.multipleSelection = val;
}
}
}
</script>
\ No newline at end of file
... ...
Index: src/views/airtransport/queryFlight.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/views/airtransport/queryFlight.vue (revision 6b552697d551139b5ea2935024146065781f309f)
+++ src/views/airtransport/queryFlight.vue (date 1592464752790)
@@ -10,18 +10,18 @@
<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="flightNo" label-width="110px">
- <el-input v-model="queryFlight.flightNo" style="width:190px"></el-input>
+ <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-form-item>
</el-col>
- <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="8">
+ <el-form-item label="航空公司代码：" prop="flightNo" label-width="110px">
+ <el-input v-model="queryFlight.flightNo" style="width:190px"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" >
- <el-button type="primary" @click="submitForm('queryFlight')">查询</el-button>
+ <el-button type="primary" @click="submitForm()">查询</el-button>
</el-col>
</el-form>
</el-row>
@@ -45,50 +45,42 @@
</el-table-column>
<el-table-column
prop="flightNo"
- label="航班号"
- width="80">
+ label="航班号">
</el-table-column>
<el-table-column
prop="airwayCode"
- label="航空公司代码"
- width="120">
+ label="航空公司代码">
</el-table-column>
<el-table-column
prop="flightDate"
- label="航空公司中文"
- width="150">
+ label="航空公司中文">
</el-table-column>
<el-table-column
prop="transportAgentCode"
- label="传输代理人"
- width="120">
+ label="传输代理人">
</el-table-column>
<el-table-column
prop="groundAgentCode"
- label="地面代理人"
- width="120">
+ label="地面代理人">
</el-table-column>
<el-table-column
prop="linesType"
- label="运输计划"
- width="150">
+ label="运输计划">
</el-table-column>
<el-table-column
prop="flightType"
- label="航班性质"
- width="80">
+ label="航班性质">
</el-table-column>
<el-table-column
prop="shareFlightNo"
- label="共享航班号"
- width="150">
+ label="共享航班号">
</el-table-column>
<el-table-column
prop="statusMsg"
- label="海关回执"
- width="150">
+ label="海关回执">
</el-table-column>
<el-table-column
+ fixed="right"
prop=""
label="报文操作"
width="150">
@@ -199,9 +191,8 @@
},
//获取默认值
defaultData(){
- this.flightNo=JSON.parse(this.$route.query.flightNo);
- this.aircraftNo=JSON.parse(this.$route.query.aircraftNo);
-
+ this.flightNo = JSON.parse(this.$route.query.flightNo);
+ this.aircraftNo = JSON.parse(this.$route.query.aircraftNo);
},
//列表删除功能
handleDel(index,row){
Index: src/views/airtransport/flight.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/views/airtransport/flight.vue (revision 6b552697d551139b5ea2935024146065781f309f)
+++ src/views/airtransport/flight.vue (date 1592465156817)
@@ -225,6 +225,19 @@
label="备注">
</el-table-column>
</el-table>
+ <el-row>
+ <div class="block">
+ <el-pagination
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="currentPage"
+ :page-sizes="[10, 20, 30, 40]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="total">
+ </el-pagination>
+ </div>
+ </el-row>
</el-dialog>
</el-row>
<el-row>
@@ -383,7 +396,9 @@
],
dialogTableVisible:false,
centerDialogVisible:false,
- currentPage4:4,
+ currentPage: 1,
+ pageSize:10,
+ total:0,
msg:undefined,
tableData: [],
tableloading:true,
@@ -392,7 +407,7 @@
methods:{
//航线信息查询
selectAirline(){
- let params={currentPage:this.currentPage,pageSize:this.pageSize,createBy:this.airLine.createBy};
+ let params={currentPage:this.currentPage,pageSize:this.pageSize,aircraftNo:this.flight.aircraftNo};
this.dialogTableVisible=true;
this.tableloading=true;
selectRoute(params).then(res=>{
@@ -411,7 +426,7 @@
if(response.code=='200'){
this.centerDialogVisible=true;
this.msg=response.msg;
- this.$router.push({path:'/queryFlight',query:{flightNo:JSON.stringify(this.flight.flightNo),aircraftNo:JSON.stringify(this.flight.aircraftNo)}});
+ this.$router.push({path:'/queryFlights',query:{flightNo:JSON.stringify(this.flight.flightNo),flightDate:JSON.stringify(this.flight.flightDate)}});
this.centerDialogVisible=false;
}else{
this.centerDialogVisible=true;
@@ -426,10 +441,11 @@
},
//分页方法
handleSizeChange(val) {
- console.log(`每页 ${val} 条`);
+ this.pageSize=val;
},
handleCurrentChange(val) {
- console.log(`当前页: ${val}`);
+ this.currentPage=val;
+ this.submitForm();
},
//航线信息查询选择功能
handleEdit(index,row){
Index: src/views/airtransport/queryArrival.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/views/airtransport/queryArrival.vue (revision 6b552697d551139b5ea2935024146065781f309f)
+++ src/views/airtransport/queryArrival.vue (date 1592550089820)
@@ -11,11 +11,6 @@
<el-form :label-position="labelPosition" :model="queryArrival" :rules="rules" ref="queryFlight"
label-width="130px" class="demo-ruleForm">
<el-col :span="6" >
- <el-form-item label="承运人：" prop="awcd" label-width="80px">
- <el-input v-model="queryArrival.awcd" style="width:190px"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6" >
<el-form-item label="航班号：" prop="flightNo" label-width="80px">
<el-input v-model="queryArrival.flightNo" style="width:190px"></el-input>
</el-form-item>
@@ -25,13 +20,14 @@
<el-date-picker
v-model="queryArrival.flightDate"
type="date"
+ format="yyyyMMdd"
style="width:190px"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5" >
- <el-button type="primary" @click="submitForm('queryArrival')">查询</el-button>
+ <el-button type="primary" @click="submitForm()">查询</el-button>
</el-col>
</el-form>
</el-row>
@@ -40,6 +36,7 @@
<el-table
:data="tableData"
border
+ v-loading="tableloading"
style="width: 100%;margin-bottom: 10px">
<el-table-column
fixed="left"
@@ -54,8 +51,7 @@
</el-table-column>
<el-table-column
prop="flightNo"
- label="航班号"
- width="80">
+ label="航班号">
</el-table-column>
<el-table-column
prop="flightDate"
@@ -64,28 +60,23 @@
</el-table-column>
<el-table-column
prop="aircraftNo"
- label="航空器注册编码"
- width="120">
+ label="航空器注册编码">
</el-table-column>
<el-table-column
prop="departurePort"
- label="出发港"
- width="80">
+ label="出发港">
</el-table-column>
<el-table-column
prop="arrivalPort"
- label="目的港"
- width="80">
+ label="目的港">
</el-table-column>
<el-table-column
prop="customDistrictNo"
- label="关区代码"
- width="80">
+ label="关区代码">
</el-table-column>
<el-table-column
prop="transportflag"
- label="运输计划"
- width="150">
+ label="运输计划">
</el-table-column>
<el-table-column
prop="departuredatetime"
@@ -94,13 +85,12 @@
</el-table-column>
<el-table-column
prop="statusMsg"
- label="海关回执"
- width="150">
+ label="海关回执">
</el-table-column>
<el-table-column
+ fixed="right"
prop=""
- label="报文操作"
- width="150">
+ label="报文操作">
<template slot-scope="scope">
<el-button
size="mini"
@@ -122,10 +112,10 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
- :page-sizes="[100, 200, 300, 400]"
- :page-size="100"
+ :page-sizes="[10, 20, 30, 40]"
+ :page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
- :total="400">
+ :total="total">
</el-pagination>
</div>
</el-row>
@@ -151,37 +141,91 @@
</style>
<script>
+ import {editPrediction, selectPrediction} from "../../api/transport";
+
export default {
data(){
return{
queryArrival:{
- awcd:undefined,
flightNo:undefined,
flightDate:undefined,
},
- rules:{
- awcd: [
- {required: true, message: '请输入', trigger: 'blur'}
- ],
- flightNo: [
- {required: true, message: '请输入', trigger: 'blur'}
- ],
- flightDate: [
- {required: true, message: '请选择', trigger: 'change'}
- ],
- },
+ rules: {},
labelPosition:'left',
- currentPage: 4,
- tableData:[]
+ currentPage: 1,
+ pageSize:10,
+ total:0,
+ tableData:[],
+ tableloading:false
}
},
methods: {
+ //分页
handleSizeChange(val) {
- console.log(`每页 ${val} 条`);
+ this.pageSize=val;
},
handleCurrentChange(val) {
- console.log(`当前页: ${val}`);
- }
+ this.currentPage=val;
+ this.submitForm();
+ },
+ //获取进港预报查询列表
+ submitForm() {
+ let params = {
+ currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryArrival.flightNo,
+ flightDate: this.queryArrival.flightDate
+ };
+ this.tableloading = true;
+ selectPrediction(params).then(res => {
+ let response = res.data.data;
+ this.tableData = response.list;
+ this.tableloading = false;
+ this.total = response.total;
+ });
+ },
+ //列表删除功能
+ handleDel(index, row) {
+ this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ editPrediction(row).then(res => {
+ let response = res.data;
+ if (response.code == '200') {
+ this.$message({
+ type: 'info',
+ message: '删除成功'
+ });
+ this.submitForm();
+ } else {
+ this.$message({
+ type: 'info',
+ message: '删除失败'
+ });
+ }
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消删除'
+ });
+ });
+ },
+ //获取默认值
+ defaultData() {
+ this.flightNo = JSON.parse(this.$route.query.flightNo);
+ this.flightDate = JSON.parse(this.$route.query.flightDate);
+ },
+ //编辑进港预报
+ handleEdit(index,row){
+ this.$router.push({path:'/arrival',query: row})
+ },
+
},
+ //渲染方法
+ mounted(){
+ this.defaultData();
+ this.submitForm();
+ }
}
</script>
\ No newline at end of file
Index: src/views/airtransport/arrival.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/views/airtransport/arrival.vue (revision 6b552697d551139b5ea2935024146065781f309f)
+++ src/views/airtransport/arrival.vue (date 1592287678205)
@@ -23,6 +23,8 @@
<el-date-picker
v-model="arrival.flightDate"
type="date"
+ value-format="yyyyMMdd"
+ format="yyyyMMdd"
style="width:275px"
placeholder="选择日期">
</el-date-picker>
@@ -30,22 +32,32 @@
</el-col>
<el-col :span="8">
<el-form-item label="出发港" prop="departurePort" label-width="120px">
- <el-input v-model="arrival.departurePort"></el-input>
+ <el-input v-model="arrival.departurePort" @input="e => arrival.departurePort=inputMe(e)"
+ maxLength='3'></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="目的港" prop="arrivalPort" label-width="120px">
- <el-input v-model="arrival.arrivalPort"></el-input>
+ <el-input v-model="arrival.arrivalPort" @input="e => arrival.arrivalPort=inputMe(e)"
+ maxLength='3'></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="关区代码" prop="customDistrictNo" label-width="120px">
- <el-input v-model="arrival.customDistrictNo"></el-input>
+ <el-input v-model="arrival.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')"
+ maxLength='4'></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px">
- <el-input v-model="arrival.departuredatetime"></el-input>
+ <el-date-picker
+ v-model="arrival.departuredatetime"
+ type="date"
+ format="yyyyMMdd"
+ value-format="yyyyMMdd"
+ style="width:100%"
+ placeholder="任意时间点">
+ </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -55,12 +67,26 @@
</el-col>
<el-col :span="6">
<el-form-item label="完成装卸时间" prop="dischargecompleteddatetime" label-width="120px">
- <el-input v-model="arrival.dischargecompleteddatetime"></el-input>
+ <el-date-picker
+ v-model="arrival.dischargecompleteddatetime"
+ type="date"
+ format="yyyyMMdd"
+ value-format="yyyyMMdd"
+ style="width:100%"
+ placeholder="任意时间点">
+ </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="预计抵港时间" prop="arrivaldatetime" label-width="140px">
- <el-input v-model="arrival.arrivaldatetime"></el-input>
+ <el-date-picker
+ v-model="arrival.arrivaldatetime"
+ type="date"
+ format="yyyyMMdd"
+ value-format="yyyyMMdd"
+ style="width:100%"
+ placeholder="任意时间点">
+ </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
@@ -74,6 +100,20 @@
<el-col :span="24"> <el-button type="primary" @click="submitForm('arrival')">保 存</el-button>
<el-button type="success">保存并发送</el-button></el-col>
</el-row>
+ <!--对话提示框-->
+ <el-row>
+ <el-dialog
+ title="系统提示"
+ :visible.sync="centerDialogVisible"
+ width="30%"
+ center>
+ <span>{{msg}}</span>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="centerDialogVisible = false">取 消</el-button>
+ <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+ </span>
+ </el-dialog>
+ </el-row>
</el-main>
</el-container>
</template>
@@ -96,6 +136,8 @@
.el-col{margin-right: 0px;}
</style>
<script>
+ import {addPrediction} from "../../api/transport";
+
export default {
data(){
return{
@@ -121,7 +163,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'},
@@ -135,7 +177,7 @@
{required: true, message: '请选择', trigger: 'blur'}
],
departuredatetime: [
- {required: true, message: '请选择', trigger: 'blur'}
+ {required: true, message: '请选择', trigger: 'change'}
],
stayid: [
{required: true, message: '请输入', trigger: 'blur'}
@@ -147,31 +189,45 @@
{required: true, message: '请选择', trigger: 'blur'}
],
},
- tableData:[]
+ tableData:[],
+ centerDialogVisible:false,
+ msg:undefined,
}
},
methods:{
+ //新增进港预报申报（保存按钮）
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- alert('submit!');
- } else {
- console.log('error submit!!');
- return false;
- }
- });
- },
- submitPerson(formName){
- this.$refs[formName].validate((valid) => {
- if (valid) {
- alert('submit!');
+ addPrediction(this.arrival).then(res=>{
+ let response=res.data;
+ if(response.code=='200'){
+ this.centerDialogVisible=true;
+ this.msg=response.msg;
+ this.$router.push({path:'/queryArrival',query:{flightNo:JSON.stringify(this.arrival.flightNo),flightDate:JSON.stringify(this.arrival.flightDate)},});
+ }else{
+ this.msg=response.msg;
+ }
+ });
} else {
console.log('error submit!!');
return false;
}
});
},
-
+ //加载默认值
+ defaultData(){
+ if(this.$route.query!=null){
+ let ob=Object.assign(this.arrival, this.$route.query);
+ }
+ },
+ // 过滤中英文
+ inputMe(e){
+ return e.replace(/[^a-zA-Z]/g,'').toUpperCase();
+ }
+ },
+ mounted(){
+ this.defaultData();
}
}
</script>
\ No newline at end of file
Index: src/views/airtransport/confirmatory.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/views/airtransport/confirmatory.vue (revision 6b552697d551139b5ea2935024146065781f309f)
+++ src/views/airtransport/confirmatory.vue (date 1592445000186)
@@ -23,6 +23,8 @@
<el-date-picker
v-model="confirmatory.flightDate"
type="date"
+ value-format="yyyyMMdd"
+ format="yyyyMMdd"
style="width:275px"
placeholder="选择日期">
</el-date-picker>
@@ -30,22 +32,38 @@
</el-col>
<el-col :span="8">
<el-form-item label="离港时间" prop="departuredatetime" label-width="120px">
- <el-input v-model="confirmatory.departuredatetime"></el-input>
+ <el-date-picker
+ v-model="confirmatory.departuredatetime"
+ type="date"
+ value-format="yyyyMMdd"
+ format="yyyyMMdd"
+ style="width:100%"
+ placeholder="任意时间点">
+ </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="目的港" prop="arrivalPort" label-width="120px">
- <el-input v-model="confirmatory.arrivalPort"></el-input>
+ <el-input v-model="confirmatory.arrivalPort" @input="e => confirmatory.arrivalPort=inputMe(e)"
+ maxLength='3'></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="关区代码" prop="customDistrictNo" label-width="120px">
- <el-input v-model="confirmatory.customDistrictNo"></el-input>
+ <el-input v-model="confirmatory.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')"
+ maxLength='4'></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="抵港时间" prop="arrivaldatetime" label-width="120px">
- <el-input v-model="confirmatory.arrivaldatetime"></el-input>
+ <el-date-picker
+ v-model="confirmatory.arrivaldatetime"
+ type="date"
+ value-format="yyyyMMdd"
+ format="yyyyMMdd"
+ style="width:100%"
+ placeholder="任意时间点">
+ </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -63,6 +81,20 @@
<el-row style="margin-left: 120px">
<el-col :span="24"> <el-button type="primary" @click="submitForm('confirmatory')">保 存</el-button>
<el-button type="success">保存并发送</el-button></el-col>
+ </el-row>
+ <!--对话提示框-->
+ <el-row>
+ <el-dialog
+ title="系统提示"
+ :visible.sync="centerDialogVisible"
+ width="30%"
+ center>
+ <span>{{msg}}</span>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="centerDialogVisible = false">取 消</el-button>
+ <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+ </span>
+ </el-dialog>
</el-row>
</el-main>
</el-container>
@@ -86,6 +118,8 @@
.el-col{margin-right: 0px;}
</style>
<script>
+ import {addConfirm} from "../../api/transport";
+
export default {
data(){
return{
@@ -128,31 +162,45 @@
{required: true, message: '请选择', trigger: 'blur'}
],
},
- tableData:[]
+ tableData:[],
+ msg:undefined,
+ centerDialogVisible:false,
}
},
methods:{
+ //新增进港确报申报（保存按钮）
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- alert('submit!');
- } else {
- console.log('error submit!!');
- return false;
- }
- });
- },
- submitPerson(formName){
- this.$refs[formName].validate((valid) => {
- if (valid) {
- alert('submit!');
+ addConfirm(this.confirmatory).then(res=>{
+ let response=res.data;
+ if(response.code=='200'){
+ this.centerDialogVisible=true;
+ this.msg=response.msg;
+ this.$router.push({path:'/queryConfirmatory',query:{flightNo:JSON.stringify(this.confirmatory.flightNo),flightDate:JSON.stringify(this.confirmatory.flightDate)},});
+ }else{
+ this.msg=response.msg;
+ }
+ });
} else {
console.log('error submit!!');
return false;
}
});
},
-
+ //加载默认值
+ defaultData(){
+ if(this.$route.query!=null){
+ let ob=Object.assign(this.confirmatory, this.$route.query);
+ }
+ },
+ // 过滤中英文
+ inputMe(e){
+ return e.replace(/[^a-zA-Z]/g,'').toUpperCase();
+ }
+ },
+ mounted(){
+ this.defaultData();
}
}
</script>
\ No newline at end of file
Index: src/views/airtransport/queryFlightConfigure.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/views/airtransport/queryFlightConfigure.vue (revision 6b552697d551139b5ea2935024146065781f309f)
+++ src/views/airtransport/queryFlightConfigure.vue (date 1592272006035)
@@ -40,23 +40,19 @@
</el-table-column>
<el-table-column
prop="username"
- label="用户名"
- width="120">
+ label="用户名">
</el-table-column>
<el-table-column
prop="flightno"
- label="航班号"
- width="80">
+ label="航班号">
</el-table-column>
<el-table-column
prop="ietype"
- label="进出港"
- width="80">
+ label="进出港">
</el-table-column>
<el-table-column
prop="createby"
- label="创建人"
- width="120">
+ label="创建人">
</el-table-column>
<el-table-column
prop="createtime"
@@ -65,8 +61,7 @@
</el-table-column>
<el-table-column
prop="updateby"
- label="更新人"
- width="120">
+ label="更新人">
</el-table-column>
<el-table-column
prop="updatetime"
@@ -74,6 +69,7 @@
width="120">
</el-table-column>
<el-table-column
+ fixed="right"
prop=""
label="报文操作"
width="150">
Index: src/views/airtransport/outConfigure.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/views/airtransport/outConfigure.vue (revision 6b552697d551139b5ea2935024146065781f309f)
+++ src/views/airtransport/outConfigure.vue (date 1592795864525)
@@ -61,6 +61,7 @@
flightNo:undefined,
ietype:undefined,
reamrk:undefined,
+ accessFlag:'2'
},
rules: {
flightNo: [
Index: src/views/airtransport/queryConfigure.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/views/airtransport/queryConfigure.vue (revision 6b552697d551139b5ea2935024146065781f309f)
+++ src/views/airtransport/queryConfigure.vue (date 1592363277619)
@@ -8,7 +8,7 @@
</el-row>
<!-- 搜索区域-->
<el-row>
- <el-form :label-position="labelPosition" :model="queryConfigure" :rules="rules" ref="queryFlight"
+ <el-form :label-position="labelPosition" :model="queryConfigure" ref="queryFlight"
label-width="130px" class="demo-ruleForm">
<el-col :span="6" >
@@ -17,7 +17,7 @@
</el-form-item>
</el-col>
<el-col :span="5" >
- <el-button type="primary" @click="submitForm('queryConfigure')">查询</el-button>
+ <el-button type="primary" @click="submitForm()">查询</el-button>
</el-col>
</el-form>
</el-row>
@@ -26,6 +26,7 @@
<el-table
:data="tableData"
border
+ v-loading="tableloading"
style="width: 100%;margin-bottom: 10px">
<el-table-column
fixed="left"
@@ -40,23 +41,19 @@
</el-table-column>
<el-table-column
prop="username"
- label="用户名"
- width="120">
+ label="用户名">
</el-table-column>
<el-table-column
prop="flightno"
- label="航班号"
- width="80">
+ label="航班号">
</el-table-column>
<el-table-column
prop="ietype"
- label="进出港"
- width="80">
+ label="进出港">
</el-table-column>
<el-table-column
prop="createby"
- label="创建人"
- width="120">
+ label="创建人">
</el-table-column>
<el-table-column
prop="createtime"
@@ -65,8 +62,7 @@
</el-table-column>
<el-table-column
prop="updateby"
- label="更新人"
- width="120">
+ label="更新人">
</el-table-column>
<el-table-column
prop="updatetime"
@@ -74,6 +70,7 @@
width="120">
</el-table-column>
<el-table-column
+ fixed="right"
prop=""
label="报文操作"
width="150">
@@ -98,10 +95,10 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
- :page-sizes="[100, 200, 300, 400]"
- :page-size="100"
+ :page-sizes="[10, 20, 30, 40]"
+ :page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
- :total="400">
+ :total="total">
</el-pagination>
</div>
</el-row>
@@ -127,29 +124,86 @@
</style>
<script>
+ import {editSchedule, selectSchedule} from "../../api/transport";
+
export default {
data(){
return{
queryConfigure:{
flightNo:undefined,
},
- rules:{
- flightNo: [
- {required: true, message: '请输入', trigger: 'blur'}
- ],
- },
labelPosition:'left',
- currentPage: 4,
+ currentPage: 1,
+ pageSize:10,
+ total:0,
+ tableloading:false,
tableData:[]
}
},
methods: {
+ //分页
handleSizeChange(val) {
- console.log(`每页 ${val} 条`);
+ this.pageSize=val;
},
handleCurrentChange(val) {
- console.log(`当前页: ${val}`);
- }
+ this.currentPage=val;
+ this.submitForm();
+ },
+ //获取进港航班配置查询列表
+ submitForm() {
+ let params = {
+ currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryConfigure.flightNo,
+ };
+ this.tableloading = true;
+ selectSchedule(params).then(res => {
+ let response = res.data.data;
+ this.tableData = response.list;
+ this.tableloading = false;
+ this.total = response.total;
+ });
+ },
+ //列表删除功能
+ handleDel(index, row) {
+ this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ editSchedule(row).then(res => {
+ let response = res.data;
+ if (response.code == '200') {
+ this.$message({
+ type: 'info',
+ message: '删除成功'
+ });
+ this.submitForm();
+ } else {
+ this.$message({
+ type: 'info',
+ message: '删除失败'
+ });
+ }
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消删除'
+ });
+ });
+ },
+ //获取默认值
+ defaultData() {
+ this.flightNo = JSON.parse(this.$route.query.flightNo);
+ },
+ //编辑进港航班配置
+ handleEdit(index,row){
+ this.$router.push({path:'/configure',query: row})
+ },
},
+ //渲染方法
+ mounted(){
+ this.defaultData();
+ this.submitForm();
+ }
}
</script>
\ No newline at end of file
Index: src/views/airtransport/configure.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/views/airtransport/configure.vue (revision 6b552697d551139b5ea2935024146065781f309f)
+++ src/views/airtransport/configure.vue (date 1592795805280)
@@ -29,8 +29,22 @@
</el-form>
</el-row>
<el-row style="margin-left: 120px">
- <el-col :span="24"> <el-button type="primary" @click="submitForm('confirmatory')">保 存</el-button>
+ <el-col :span="24"> <el-button type="primary" @click="submitForm('configure')">保 存</el-button>
</el-col>
+ </el-row>
+ <!--对话提示框-->
+ <el-row>
+ <el-dialog
+ title="系统提示"
+ :visible.sync="centerDialogVisible"
+ width="30%"
+ center>
+ <span>{{msg}}</span>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="centerDialogVisible = false">取 消</el-button>
+ <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+ </span>
+ </el-dialog>
</el-row>
</el-main>
</el-container>
@@ -54,6 +68,8 @@
.el-col{margin-right: 0px;}
</style>
<script>
+ import { addSchedule} from "../../api/transport";
+
export default {
data(){
return{
@@ -75,31 +91,42 @@
{value:'1',label:'进港'},
{value:'2',label:'出港'}
],
- tableData:[]
+ tableData:[],
+ msg:undefined,
+ centerDialogVisible:false,
+ accessFlag:'1'
}
},
methods:{
+ //新增进港确报申报（保存按钮）
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- alert('submit!');
- } else {
- console.log('error submit!!');
- return false;
- }
- });
- },
- submitPerson(formName){
- this.$refs[formName].validate((valid) => {
- if (valid) {
- alert('submit!');
+ addSchedule(this.configure).then(res=>{
+ let response=res.data;
+ if(response.code=='200'){
+ this.centerDialogVisible=true;
+ this.msg=response.msg;
+ this.$router.push({path:'/queryConfigure',query:{flightNo:JSON.stringify(this.queryConfigure.flightNo)},});
+ }else{
+ this.msg=response.msg;
+ }
+ });
} else {
console.log('error submit!!');
return false;
}
});
},
-
+ //加载默认值
+ defaultData(){
+ if(this.$route.query!=null){
+ let ob=Object.assign(this.configure, this.$route.query);
+ }
+ },
+ },
+ mounted(){
+ this.defaultData();
}
}
</script>
\ No newline at end of file
Index: src/views/airtransport/queryConfirmatory.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/views/airtransport/queryConfirmatory.vue (revision 6b552697d551139b5ea2935024146065781f309f)
+++ src/views/airtransport/queryConfirmatory.vue (date 1592290243601)
@@ -8,14 +8,9 @@
</el-row>
<!-- 搜索区域-->
<el-row>
- <el-form :label-position="labelPosition" :model="queryConfirmatory" :rules="rules" ref="queryFlight"
+ <el-form :label-position="labelPosition" :model="queryConfirmatory" ref="queryFlight"
label-width="130px" class="demo-ruleForm">
<el-col :span="6" >
- <el-form-item label="承运人：" prop="awcd" label-width="80px">
- <el-input v-model="queryConfirmatory.awcd" style="width:190px"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6" >
<el-form-item label="航班号：" prop="flightNo" label-width="80px">
<el-input v-model="queryConfirmatory.flightNo" style="width:190px"></el-input>
</el-form-item>
@@ -25,13 +20,14 @@
<el-date-picker
v-model="queryConfirmatory.flightDate"
type="date"
+ format="yyyyMMdd"
style="width:190px"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5" >
- <el-button type="primary" @click="submitForm('queryConfirmatory')">查询</el-button>
+ <el-button type="primary" @click="submitForm()">查询</el-button>
</el-col>
</el-form>
</el-row>
@@ -40,6 +36,7 @@
<el-table
:data="tableData"
border
+ v-loading="tableloading"
style="width: 100%;margin-bottom: 10px">
<el-table-column
fixed="left"
@@ -54,8 +51,7 @@
</el-table-column>
<el-table-column
prop="flightNo"
- label="航班号"
- width="80">
+ label="航班号">
</el-table-column>
<el-table-column
prop="flightDate"
@@ -64,23 +60,19 @@
</el-table-column>
<el-table-column
prop="aircraftNo"
- label="航空器注册编码"
- width="120">
+ label="航空器注册编码">
</el-table-column>
<el-table-column
prop="arrivalPort"
- label="目的港"
- width="80">
+ label="目的港">
</el-table-column>
<el-table-column
prop="customDistrictNo"
- label="关区代码"
- width="80">
+ label="关区代码">
</el-table-column>
<el-table-column
prop="transportflag"
- label="运输计划"
- width="80">
+ label="运输计划">
</el-table-column>
<el-table-column
prop="departuredatetime"
@@ -94,10 +86,10 @@
</el-table-column>
<el-table-column
prop="statusMsg"
- label="海关回执"
- width="150">
+ label="海关回执">
</el-table-column>
<el-table-column
+ fixed="right"
prop=""
label="报文操作"
width="150">
@@ -122,10 +114,10 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
- :page-sizes="[100, 200, 300, 400]"
- :page-size="100"
+ :page-sizes="[10, 20, 30, 40]"
+ :page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
- :total="400">
+ :total="total">
</el-pagination>
</div>
</el-row>
@@ -151,37 +143,88 @@
</style>
<script>
+ import {editConfirm, selectConfirm} from "../../api/transport";
+
export default {
data(){
return{
queryConfirmatory:{
- awcd:undefined,
flightNo:undefined,
flightDate:undefined,
},
- rules:{
- awcd: [
- {required: true, message: '请输入', trigger: 'blur'}
- ],
- flightNo: [
- {required: true, message: '请输入', trigger: 'blur'}
- ],
- flightDate: [
- {required: true, message: '请选择', trigger: 'change'}
- ],
- },
labelPosition:'left',
- currentPage: 4,
+ currentPage: 1,
+ pageSize:10,
+ total:0,
+ tableloading:false,
tableData:[]
}
},
methods: {
+ //分页
handleSizeChange(val) {
- console.log(`每页 ${val} 条`);
+ this.pageSize=val;
},
handleCurrentChange(val) {
- console.log(`当前页: ${val}`);
- }
+ this.currentPage=val;
+ this.submitForm();
+ },
+ //获取进港确报查询列表
+ submitForm() {
+ let params = {
+ currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryConfirmatory.flightNo,
+ flightDate: this.queryConfirmatory.flightDate
+ };
+ this.tableloading = true;
+ selectConfirm(params).then(res => {
+ let response = res.data.data;
+ this.tableData = response.list;
+ this.tableloading = false;
+ this.total = response.total;
+ });
+ },
+ //列表删除功能
+ handleDel(index, row) {
+ this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ editConfirm(row).then(res => {
+ let response = res.data;
+ if (response.code == '200') {
+ this.$message({
+ type: 'info',
+ message: '删除成功'
+ });
+ this.submitForm();
+ } else {
+ this.$message({
+ type: 'info',
+ message: '删除失败'
+ });
+ }
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消删除'
+ });
+ });
+ },
+ //获取默认值
+ defaultData() {
+ this.flightNo = JSON.parse(this.$route.query.flightNo);
+ },
+ //编辑进港确报
+ handleEdit(index,row){
+ this.$router.push({path:'/confirmatory',query: row})
+ },
},
+ //渲染方法
+ mounted(){
+ this.defaultData();
+ this.submitForm();
+ }
}
</script>
\ No newline at end of file
Index: src/views/airtransport/queryRouteaircraft.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/views/airtransport/queryRouteaircraft.vue (revision 6b552697d551139b5ea2935024146065781f309f)
+++ src/views/airtransport/queryRouteaircraft.vue (date 1592466018902)
@@ -8,7 +8,7 @@
</el-row>
<!-- 搜索区域-->
<el-row>
- <el-form :label-position="labelPosition" :model="queryRouteaircraft" :rules="rules" ref="queryRouteaircraft"
+ <el-form :label-position="labelPosition" :model="queryRouteaircraft" ref="queryRouteaircraft"
label-width="130px" class="demo-ruleForm">
<el-col :span="8">
<el-form-item label="航空器所有人代码:" prop="airwayCode" label-width="130px">
@@ -45,60 +45,50 @@
</el-table-column>
<el-table-column
prop=ownerCo"
- label="航空器所有人代码"
- width="120">
+ label="航空器所有人代码">
</el-table-column>
<el-table-column
prop="airwayNameEn"
- label="所有人英文名称"
- width="120">
+ label="所有人英文名称">
</el-table-column>
<el-table-column
prop="airwayNameCn"
- label="所有人中文名称"
- width="150">
+ label="所有人中文名称">
</el-table-column>
<el-table-column
prop="aircraftNo"
- label="航空器注册编号"
- width="120">
+ label="航空器注册编号">
</el-table-column>
<el-table-column
prop="certNo"
- label="国际证书编号"
- width="120">
+ label="国际证书编号">
</el-table-column>
<el-table-column
prop="owner"
- label="航空器所有人"
- width="120">
+ label="航空器所有人">
</el-table-column>
<el-table-column
prop="areoNationality"
- label="国籍"
- width="80">
+ label="国籍">
</el-table-column>
<el-table-column
prop="areoModel"
- label="机型"
- width="80">
+ label="机型">
</el-table-column>
<el-table-column
prop="deliverDate"
- label="交付日期"
- width="120">
+ label="交付日期">
</el-table-column>
<el-table-column
prop="statusMsg"
- label="海关回执"
- width="120">
+ label="海关回执">
</el-table-column>
<el-table-column
prop="supervisoryProperty"
- label="所有权监管"
- width="120">
+ label="所有权监管">
</el-table-column>
<el-table-column
+ fixed="right"
prop=""
label="报文操作"
width="150">
@@ -235,7 +225,7 @@
this.defaultData();
this.submitForm();
}
- }
+ },
}
</script>
Index: src/api/transport.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/api/transport.js (revision 6b552697d551139b5ea2935024146065781f309f)
+++ src/api/transport.js (date 1592362588742)
@@ -94,9 +94,12 @@
//查询列表
export const selectSchedule=params=>{return http.get(`${baseUrlSchedule}/selectSchedule`, params);};
+
+
//查询长期计划查询列表
export const selectLongTimePlan=params=>{return http.get(`${baseUrlLongtimeplan}/selectLongTimePlan`, params);};
+
//机组人员
//新增方法
export const addBillPerson = params => { return http.post(`${baseUrlBillperson}/addBillPerson`, params); };
Index: src/views/airtransport/queryFlightplan.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/views/airtransport/queryFlightplan.vue (revision 6b552697d551139b5ea2935024146065781f309f)
+++ src/views/airtransport/queryFlightplan.vue (date 1592464640954)
@@ -8,7 +8,7 @@
</el-row>
<!-- 搜索区域-->
<el-row>
- <el-form :label-position="labelPosition" :model="queryFlightplan" :rules="rules" ref="queryFlightplan"
+ <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">
@@ -56,60 +56,52 @@
</el-table-column>
<el-table-column
prop="flightNo"
- label="航班号"
- width="80">
+ label="航班号">
</el-table-column>
<el-table-column
prop="flightDate"
- label="航班日期"
- width="150">
+ label="航班日期">
</el-table-column>
<el-table-column
prop="departurePort"
- label="出发港"
- width="80">
+ label="出发港">
</el-table-column>
<el-table-column
prop="departureCustomNo"
- label="关区代码"
- width="80">
+ label="关区代码">
</el-table-column>
<el-table-column
prop="arrivalPort"
- label="目的港"
- width="80">
+ label="目的港">
</el-table-column>
<el-table-column
prop="arrivalCustomNo"
- label="关区代码"
- width="80">
+ label="关区代码">
</el-table-column>
<el-table-column
prop="currentTakeoffTime"
label="离港时间"
- width="150">
+ width="120">
</el-table-column>
<el-table-column
prop="currentLandingTime"
label="抵港时间"
- width="150">
+ width="120">
</el-table-column>
<el-table-column
prop="transportflag"
- label="进出港"
- width="80">
+ label="进出港">
</el-table-column>
<el-table-column
prop="linesType"
- label="执行任务类型"
- width="150">
+ label="执行任务类型">
</el-table-column>
<el-table-column
prop="statusMsg"
- label="海关回执"
- width="150">
+ label="海关回执">
</el-table-column>
<el-table-column
+ fixed="right"
prop=""
label="报文操作"
width="150">
@@ -172,7 +164,6 @@
flightDate:undefined,
aircraftNo:undefined,
},
- rules:{},
labelPosition:'left',
currentPage: 1,
pageSize:10,
Index: src/views/airtransport/queryRoute.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/views/airtransport/queryRoute.vue (revision 6b552697d551139b5ea2935024146065781f309f)
+++ src/views/airtransport/queryRoute.vue (date 1592461576457)
@@ -27,8 +27,7 @@
style="width:100%;margin-bottom: 10px">
<el-table-column
fixed="left"
- label="操作"
- width="100">
+ label="操作">
<template slot-scope="scope">
<el-button
size="mini"
@@ -38,59 +37,53 @@
</el-table-column>
<el-table-column
prop="serialNo"
- label="航线序号"
- width="80">
+ label="航线序号">
</el-table-column>
<el-table-column
prop="departurePort"
- label="出发港"
- width="80">
+ label="出发港">
</el-table-column>
<el-table-column
prop="departureCustomNo"
label="出发港关区代码"
- width="150">
+ width="120">
</el-table-column>
<el-table-column
prop="arrivalPort"
- label="目的港"
- width="80">
+ label="目的港">
</el-table-column>
<el-table-column
prop="arrivalCustomNo"
label="目的港关区代码"
- width="150">
+ width="120">
</el-table-column>
<el-table-column
prop="std"
- label="长期离港时间"
- width="150">
+ label="长期离港时间">
</el-table-column>
<el-table-column
prop="sta"
- label="长期抵港时间"
- width="150">
+ label="长期抵港时间">
</el-table-column>
<el-table-column
prop="effStartdate"
label="有效期起始时间"
- width="150">
+ width="120">
</el-table-column>
<el-table-column
prop="effEnddate"
label="有效期结束时间"
- width="150">
+ width="120">
</el-table-column>
<el-table-column
prop="plan"
- label="每周执行情况"
- width="150">
+ label="每周执行情况">
</el-table-column>
<el-table-column
-
+ fixed="right"
prop="remark"
label="报文操作"
- width="250">
+ width="200">
<template slot-scope="scope">
<el-button
size="mini"
@@ -182,7 +175,6 @@
//获取默认值
defaultData(){
let ob=Object.assign(this.queryRoute, this.$route.query);
-
},
//列表删除功能
handleDelete(index,row){
Index: src/views/airtransport/aircraft.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/views/airtransport/aircraft.vue (revision 6b552697d551139b5ea2935024146065781f309f)
+++ src/views/airtransport/aircraft.vue (date 1592465449586)
@@ -210,6 +210,7 @@
],
},
centerDialogVisible:false,
+ msg:undefined
}
},
methods:{
Index: src/views/airtransport/routeaircraft.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/views/airtransport/routeaircraft.vue (revision 6b552697d551139b5ea2935024146065781f309f)
+++ src/views/airtransport/routeaircraft.vue (date 1592467020642)
@@ -134,7 +134,7 @@
.el-col{margin-right: 0px;}
</style>
<script>
- import {addFlightPlan} from "../../api/transport";
+ import {addAirLineAircraft} from "../../api/transport";
export default {
data(){
@@ -210,6 +210,7 @@
],
},
centerDialogVisible:false,
+ msg:undefined
}
},
methods:{
@@ -217,12 +218,12 @@
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- addFlightPlan(this.aircraft).then(res=>{
+ addAirLineAircraft(this.aircraft).then(res=>{
let response=res.data;
if(response.code=='200'){
this.centerDialogVisible=true;
this.msg=response.msg;
- this.$router.push({path:'/queryRouteaircraft',query:{airwayCode:JSON.stringify(this.aircraft.airwayCode)},});
+ this.$router.push({path:'/queryRouteaircraft',query:{airwayCode:JSON.stringify(this.aircraft.airwayCode),aircraftNo:JSON.stringify(this.aircraft.aircraftNo)},});
}else{
this.msg=response.msg;
}
@@ -236,7 +237,7 @@
//加载默认值
defaultData(){
if(this.$route.query!=null){
- let ob=Object.assign(this.airwayCode, this.$route.query);
+ let ob=Object.assign(this.aircraft, this.$route.query);
}
},
},
Index: src/views/airtransport/route.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/views/airtransport/route.vue (revision 6b552697d551139b5ea2935024146065781f309f)
+++ src/views/airtransport/route.vue (date 1592376292274)
@@ -22,7 +22,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="目的港" prop="arrivalPort" label-width="120px">
- <el-input @input="e => airline.arrivalPort=inputMe(e)" v-model="airline.arrivalPort"
+ <el-input v-model="airline.arrivalPort" @input="e => airline.arrivalPort=inputMe(e)"
maxLength='3'></el-input>
</el-form-item>
</el-col>
@@ -317,7 +317,7 @@
},
handleCurrentChange(val) {
this.currentPage=val;
- this.selectLongtimeplan();
+ this.submitForm();
},
//长期飞行计划选择功能
handleEdit(index,row){
Index: src/views/airtransport/queryAircraft.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/views/airtransport/queryAircraft.vue (revision 6b552697d551139b5ea2935024146065781f309f)
+++ src/views/airtransport/queryAircraft.vue (date 1592214204577)
@@ -45,43 +45,35 @@
</el-table-column>
<el-table-column
prop=airwayCode"
- label="航空器所有人代码"
- width="120">
+ label="航空器所有人代码">
</el-table-column>
<el-table-column
prop="airwayNameEn"
- label="所有人英文名称"
- width="120">
+ label="所有人英文名称">
</el-table-column>
<el-table-column
prop="airwayNameCn"
- label="所有人中文名称"
- width="150">
+ label="所有人中文名称">
</el-table-column>
<el-table-column
prop="aircraftNo"
- label="航空器注册编号"
- width="120">
+ label="航空器注册编号">
</el-table-column>
<el-table-column
prop="certNo"
- label="国际证书编号"
- width="120">
+ label="国际证书编号">
</el-table-column>
<el-table-column
prop="ownerCo"
- label="航空器所有人"
- width="120">
+ label="航空器所有人">
</el-table-column>
<el-table-column
prop="areoNationality"
- label="国籍"
- width="80">
+ label="国籍">
</el-table-column>
<el-table-column
prop="areoModel"
- label="机型"
- width="80">
+ label="机型">
</el-table-column>
<el-table-column
prop="deliverDate"
@@ -90,10 +82,10 @@
</el-table-column>
<el-table-column
prop="statusMsg"
- label="海关回执"
- width="120">
+ label="海关回执">
</el-table-column>
<el-table-column
+ fixed="right"
prop=""
label="报文操作"
width="150">
... ...