作者 xudada

Merge remote-tracking branch 'origin/master'

... ... @@ -88,14 +88,12 @@
fixed="right"
prop=""
label="报文操作"
width="150">
width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
@click="handleEdit(scope.$index, scope.row)">查看</el-button>
</template>
<template slot-scope="scope">
type="primary"
@click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
<el-button
size="mini"
type="danger"
... ... @@ -117,6 +115,16 @@
</el-pagination>
</div>
</el-row>
<!--查看回执弹框-->
<el-dialog title="回执明细" :visible.sync="dialogTableVisible">
<el-table :data="gridData">
<el-table-column property="sendtime" label="操作时间" ></el-table-column>
<el-table-column property="createBy" label="操作人" ></el-table-column>
<el-table-column property="flightNo" label="航班号"></el-table-column>
<el-table-column property="flightDate" label="航班日期" ></el-table-column>
<el-table-column property="receiptContent" label="回执内容" ></el-table-column>
</el-table>
</el-dialog>
</el-main>
</el-container>
</template>
... ... @@ -139,7 +147,7 @@
</style>
<script>
import {selectAircraft, editAircraft} from "../../api/transport";
import {selectAircraft, editAircraft, selectReturnMsg} from "../../api/transport";
export default {
data(){
... ... @@ -154,11 +162,23 @@
pageSize:10,
total:0,
tableData:[],
tableloading:false
tableloading:false,
gridData:[],
dialogTableVisible: false,
}
},
methods: {
//查询回执列表
selectDetail(index,row){
this.gridData=[];
this.dialogTableVisible=true;
let params={messageid:row.messageid};
selectReturnMsg(params).then(res=>{
let response=res.data.data;
console.log(response)
this.gridData=response;
});
},
//分页
handleSizeChange(val) {
this.pageSize=val;
... ...
... ... @@ -90,14 +90,13 @@
<el-table-column
fixed="right"
prop=""
label="报文操作">
label="报文操作"
width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
@click="handleEdit(scope.$index, scope.row)">查看</el-button>
</template>
<template slot-scope="scope">
type="primary"
@click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
<el-button
size="mini"
type="danger"
... ... @@ -119,6 +118,16 @@
</el-pagination>
</div>
</el-row>
<!--查看回执弹框-->
<el-dialog title="回执明细" :visible.sync="dialogTableVisible">
<el-table :data="gridData">
<el-table-column property="sendtime" label="操作时间" ></el-table-column>
<el-table-column property="createBy" label="操作人" ></el-table-column>
<el-table-column property="flightNo" label="航班号"></el-table-column>
<el-table-column property="flightDate" label="航班日期" ></el-table-column>
<el-table-column property="receiptContent" label="回执内容" ></el-table-column>
</el-table>
</el-dialog>
</el-main>
</el-container>
</template>
... ... @@ -141,7 +150,7 @@
</style>
<script>
import {editPrediction, selectPrediction} from "../../api/transport";
import {editPrediction, selectPrediction, selectReturnMsg} from "../../api/transport";
export default {
data(){
... ... @@ -156,10 +165,23 @@
pageSize:10,
total:0,
tableData:[],
tableloading:false
tableloading:false,
gridData:[],
dialogTableVisible: false,
}
},
methods: {
//查询回执列表
selectDetail(index,row){
this.gridData=[];
this.dialogTableVisible=true;
let params={messageid:row.messageid};
selectReturnMsg(params).then(res=>{
let response=res.data.data;
console.log(response)
this.gridData=response;
});
},
//分页
handleSizeChange(val) {
this.pageSize=val;
... ...
... ... @@ -100,12 +100,12 @@
fixed="right"
prop=""
label="报文操作"
width="150">
width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
@click="selectDetail(scope.$index,scope.row)">查看</el-button>
type="primary"
@click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
<el-button
size="mini"
type="danger"
... ... @@ -127,7 +127,7 @@
</el-pagination>
</div>
</el-row>
<!--//查看回执弹框-->
<!--查看回执弹框-->
<el-dialog title="回执明细" :visible.sync="dialogTableVisible">
<el-table :data="gridData">
<el-table-column property="sendtime" label="操作时间" ></el-table-column>
... ...
... ... @@ -58,7 +58,7 @@
<el-table-column
prop="createtime"
label="创建时间"
width="120">
width="130">
</el-table-column>
<el-table-column
prop="updateby"
... ... @@ -67,20 +67,18 @@
<el-table-column
prop="updatetime"
label="更新时间"
width="120">
width="130">
</el-table-column>
<el-table-column
fixed="right"
prop=""
label="报文操作"
width="150">
width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
@click="handleEdit(scope.$index, scope.row)">查看</el-button>
</template>
<template slot-scope="scope">
type="primary"
@click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
<el-button
size="mini"
type="danger"
... ... @@ -102,6 +100,16 @@
</el-pagination>
</div>
</el-row>
<!--查看回执弹框-->
<el-dialog title="回执明细" :visible.sync="dialogTableVisible">
<el-table :data="gridData">
<el-table-column property="sendtime" label="操作时间" ></el-table-column>
<el-table-column property="createBy" label="操作人" ></el-table-column>
<el-table-column property="flightNo" label="航班号"></el-table-column>
<el-table-column property="flightDate" label="航班日期" ></el-table-column>
<el-table-column property="receiptContent" label="回执内容" ></el-table-column>
</el-table>
</el-dialog>
</el-main>
</el-container>
</template>
... ... @@ -124,7 +132,7 @@
</style>
<script>
import {editSchedule, selectSchedule} from "../../api/transport";
import {editSchedule, selectReturnMsg, selectSchedule} from "../../api/transport";
export default {
data(){
... ... @@ -137,10 +145,23 @@
pageSize:10,
total:0,
tableloading:false,
tableData:[]
tableData:[],
gridData:[],
dialogTableVisible: false,
}
},
methods: {
//查询回执列表
selectDetail(index,row){
this.gridData=[];
this.dialogTableVisible=true;
let params={messageid:row.messageid};
selectReturnMsg(params).then(res=>{
let response=res.data.data;
console.log(response)
this.gridData=response;
});
},
//分页
handleSizeChange(val) {
this.pageSize=val;
... ...
... ... @@ -92,14 +92,12 @@
fixed="right"
prop=""
label="报文操作"
width="150">
width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
@click="handleEdit(scope.$index, scope.row)">查看</el-button>
</template>
<template slot-scope="scope">
type="primary"
@click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
<el-button
size="mini"
type="danger"
... ... @@ -121,6 +119,16 @@
</el-pagination>
</div>
</el-row>
<!--查看回执弹框-->
<el-dialog title="回执明细" :visible.sync="dialogTableVisible">
<el-table :data="gridData">
<el-table-column property="sendtime" label="操作时间" ></el-table-column>
<el-table-column property="createBy" label="操作人" ></el-table-column>
<el-table-column property="flightNo" label="航班号"></el-table-column>
<el-table-column property="flightDate" label="航班日期" ></el-table-column>
<el-table-column property="receiptContent" label="回执内容" ></el-table-column>
</el-table>
</el-dialog>
</el-main>
</el-container>
</template>
... ... @@ -143,7 +151,7 @@
</style>
<script>
import {editConfirm, selectConfirm} from "../../api/transport";
import {editConfirm, selectConfirm, selectReturnMsg} from "../../api/transport";
export default {
data(){
... ... @@ -157,10 +165,23 @@
pageSize:10,
total:0,
tableloading:false,
tableData:[]
tableData:[],
gridData:[],
dialogTableVisible: false,
}
},
methods: {
//查询回执列表
selectDetail(index,row){
this.gridData=[];
this.dialogTableVisible=true;
let params={messageid:row.messageid};
selectReturnMsg(params).then(res=>{
let response=res.data.data;
console.log(response)
this.gridData=response;
});
},
//分页
handleSizeChange(val) {
this.pageSize=val;
... ...
... ... @@ -55,13 +55,11 @@
</el-table-column>
<el-table-column
prop="flightNo"
label="航班号"
width="80">
label="航班号">
</el-table-column>
<el-table-column
prop="flightDate"
label="航班日期"
width="120">
label="航班日期">
</el-table-column>
<el-table-column
prop="aircraftNo"
... ... @@ -70,28 +68,23 @@
</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="120">
label="运输计划">
</el-table-column>
<el-table-column
prop="departuredatetime"
label="离港时间"
width="120">
label="离港时间">
</el-table-column>
<el-table-column
prop="statusMsg"
... ... @@ -101,14 +94,12 @@
<el-table-column
prop=""
label="报文操作"
width="150">
width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
@click="handleEdit(scope.$index, scope.row)">查看</el-button>
</template>
<template slot-scope="scope">
type="primary"
@click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
<el-button
size="mini"
type="danger"
... ... @@ -130,6 +121,16 @@
</el-pagination>
</div>
</el-row>
<!--查看回执弹框-->
<el-dialog title="回执明细" :visible.sync="dialogTableVisible">
<el-table :data="gridData">
<el-table-column property="sendtime" label="操作时间" ></el-table-column>
<el-table-column property="createBy" label="操作人" ></el-table-column>
<el-table-column property="flightNo" label="航班号"></el-table-column>
<el-table-column property="flightDate" label="航班日期" ></el-table-column>
<el-table-column property="receiptContent" label="回执内容" ></el-table-column>
</el-table>
</el-dialog>
</el-main>
</el-container>
</template>
... ... @@ -152,7 +153,7 @@
</style>
<script>
import {editConfirm, selectConfirm} from "../../api/transport";
import {editConfirm, selectConfirm, selectReturnMsg} from "../../api/transport";
export default {
data(){
... ... @@ -167,10 +168,23 @@
pageSize:10,
total:0,
tableloading:false,
tableData:[]
tableData:[],
gridData:[],
dialogTableVisible: false,
}
},
methods: {
//查询回执列表
selectDetail(index,row){
this.gridData=[];
this.dialogTableVisible=true;
let params={messageid:row.messageid};
selectReturnMsg(params).then(res=>{
let response=res.data.data;
console.log(response)
this.gridData=response;
});
},
//分页
handleSizeChange(val) {
this.pageSize=val;
... ...
... ... @@ -55,13 +55,11 @@
</el-table-column>
<el-table-column
prop="flightNo"
label="航班号"
width="80">
label="航班号">
</el-table-column>
<el-table-column
prop="flightDate"
label="航班日期"
width="120">
label="航班日期">
</el-table-column>
<el-table-column
prop="aircraftNo"
... ... @@ -70,45 +68,37 @@
</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"
label="离港时间"
width="120">
label="离港时间">
</el-table-column>
<el-table-column
prop="statusMsg"
label="海关回执"
width="150">
label="海关回执">
</el-table-column>
<el-table-column
prop=""
label="报文操作"
width="150">
width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
@click="handleEdit(scope.$index, scope.row)">查看</el-button>
</template>
<template slot-scope="scope">
type="primary"
@click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
<el-button
size="mini"
type="danger"
... ... @@ -130,6 +120,16 @@
</el-pagination>
</div>
</el-row>
<!--查看回执弹框-->
<el-dialog title="回执明细" :visible.sync="dialogTableVisible">
<el-table :data="gridData">
<el-table-column property="sendtime" label="操作时间" ></el-table-column>
<el-table-column property="createBy" label="操作人" ></el-table-column>
<el-table-column property="flightNo" label="航班号"></el-table-column>
<el-table-column property="flightDate" label="航班日期" ></el-table-column>
<el-table-column property="receiptContent" label="回执内容" ></el-table-column>
</el-table>
</el-dialog>
</el-main>
</el-container>
</template>
... ... @@ -152,7 +152,7 @@
</style>
<script>
import {editPrediction, selectPrediction} from "../../api/transport";
import {editPrediction, selectPrediction, selectReturnMsg} from "../../api/transport";
export default {
data(){
... ... @@ -166,10 +166,23 @@
pageSize:10,
total:0,
tableData:[],
tableloading:false
tableloading:false,
gridData:[],
dialogTableVisible: false,
}
},
methods: {
//查询回执列表
selectDetail(index,row){
this.gridData=[];
this.dialogTableVisible=true;
let params={messageid:row.messageid};
selectReturnMsg(params).then(res=>{
let response=res.data.data;
console.log(response)
this.gridData=response;
});
},
//分页
handleSizeChange(val) {
this.pageSize=val;
... ...
... ... @@ -83,14 +83,12 @@
fixed="right"
prop=""
label="报文操作"
width="150">
width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
@click="handleEdit(scope.$index, scope.row)">查看</el-button>
</template>
<template slot-scope="scope">
type="primary"
@click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
<el-button
size="mini"
type="danger"
... ... @@ -112,6 +110,16 @@
</el-pagination>
</div>
</el-row>
<!--查看回执弹框-->
<el-dialog title="回执明细" :visible.sync="dialogTableVisible">
<el-table :data="gridData">
<el-table-column property="sendtime" label="操作时间" ></el-table-column>
<el-table-column property="createBy" label="操作人" ></el-table-column>
<el-table-column property="flightNo" label="航班号"></el-table-column>
<el-table-column property="flightDate" label="航班日期" ></el-table-column>
<el-table-column property="receiptContent" label="回执内容" ></el-table-column>
</el-table>
</el-dialog>
</el-main>
</el-container>
</template>
... ... @@ -134,7 +142,7 @@
</style>
<script>
import {editFlight, selectFlight} from "../../api/transport";
import {editFlight, selectFlight, selectReturnMsg} from "../../api/transport";
export default {
data(){
... ... @@ -151,11 +159,23 @@
pageSize:10,
total:0,
tableData:[],
tableloading:false
tableloading:false,
gridData:[],
dialogTableVisible: false,
}
},
methods: {
//查询回执列表
selectDetail(index,row){
this.gridData=[];
this.dialogTableVisible=true;
let params={messageid:row.messageid};
selectReturnMsg(params).then(res=>{
let response=res.data.data;
console.log(response)
this.gridData=response;
});
},
//分页方法
handleSizeChange(val) {
this.pageSize=val;
... ...
... ... @@ -58,7 +58,7 @@
<el-table-column
prop="createtime"
label="创建时间"
width="120">
width="130">
</el-table-column>
<el-table-column
prop="updateby"
... ... @@ -67,20 +67,18 @@
<el-table-column
prop="updatetime"
label="更新时间"
width="120">
width="130">
</el-table-column>
<el-table-column
fixed="right"
prop=""
label="报文操作"
width="150">
width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
@click="handleEdit(scope.$index, scope.row)">查看</el-button>
</template>
<template slot-scope="scope">
type="primary"
@click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
<el-button
size="mini"
type="danger"
... ... @@ -102,6 +100,16 @@
</el-pagination>
</div>
</el-row>
<!--查看回执弹框-->
<el-dialog title="回执明细" :visible.sync="dialogTableVisible">
<el-table :data="gridData">
<el-table-column property="sendtime" label="操作时间" ></el-table-column>
<el-table-column property="createBy" label="操作人" ></el-table-column>
<el-table-column property="flightNo" label="航班号"></el-table-column>
<el-table-column property="flightDate" label="航班日期" ></el-table-column>
<el-table-column property="receiptContent" label="回执内容" ></el-table-column>
</el-table>
</el-dialog>
</el-main>
</el-container>
</template>
... ... @@ -124,7 +132,7 @@
</style>
<script>
import {editSchedule, selectSchedule} from "../../api/transport";
import {editSchedule, selectReturnMsg, selectSchedule} from "../../api/transport";
export default {
data(){
... ... @@ -137,10 +145,23 @@
pageSize:10,
total:0,
tableloading:false,
tableData:[]
tableData:[],
gridData:[],
dialogTableVisible: false,
}
},
methods: {
//查询回执列表
selectDetail(index,row){
this.gridData=[];
this.dialogTableVisible=true;
let params={messageid:row.messageid};
selectReturnMsg(params).then(res=>{
let response=res.data.data;
console.log(response)
this.gridData=response;
});
},
//分页
handleSizeChange(val) {
this.pageSize=val;
... ...
... ... @@ -111,7 +111,7 @@
<el-button
size="mini"
type="primary"
@click="dialogTableVisible = true">查看回执</el-button>
@click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
<el-button
size="mini"
type="danger"
... ... @@ -140,7 +140,7 @@
<el-table-column property="createBy" label="操作人" ></el-table-column>
<el-table-column property="flightNo" label="航班号" ></el-table-column>
<el-table-column property="flightDate" label="航班日期" ></el-table-column>
<el-table-column property="receiptContent" label="回执内容" fixed="right" width="400"></el-table-column>
<el-table-column property="receiptContent" label="回执内容" fixed="right" width="300"></el-table-column>
</el-table>
</el-dialog>
</el-main>
... ... @@ -165,7 +165,7 @@
</style>
<script>
import {selectFlightPlan, editFlightPlan} from "../../api/transport";
import {selectFlightPlan, editFlightPlan, selectReturnMsg} from "../../api/transport";
export default {
data(){
return{
... ... @@ -185,6 +185,17 @@
}
},
methods: {
//查询回执列表
selectDetail(index,row){
this.gridData=[];
this.dialogTableVisible=true;
let params={messageid:row.messageid};
selectReturnMsg(params).then(res=>{
let response=res.data.data;
console.log(response)
this.gridData=response;
});
},
//分页
handleSizeChange(val) {
this.pageSize=val;
... ...
... ... @@ -91,14 +91,12 @@
fixed="right"
prop=""
label="报文操作"
width="150">
width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
@click="handleEdit(scope.$index, scope.row)">查看</el-button>
</template>
<template slot-scope="scope">
type="primary"
@click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
<el-button
size="mini"
type="danger"
... ... @@ -120,6 +118,16 @@
</el-pagination>
</div>
</el-row>
<!--查看回执弹框-->
<el-dialog title="回执明细" :visible.sync="dialogTableVisible">
<el-table :data="gridData">
<el-table-column property="sendtime" label="操作时间" ></el-table-column>
<el-table-column property="createBy" label="操作人" ></el-table-column>
<el-table-column property="flightNo" label="航班号"></el-table-column>
<el-table-column property="flightDate" label="航班日期" ></el-table-column>
<el-table-column property="receiptContent" label="回执内容" ></el-table-column>
</el-table>
</el-dialog>
</el-main>
</el-container>
</template>
... ... @@ -142,7 +150,7 @@
</style>
<script>
import {editAirLineAircraft, selectAirLineAircraft} from "../../api/transport";
import {editAirLineAircraft, selectAirLineAircraft, selectReturnMsg} from "../../api/transport";
export default {
data(){
... ... @@ -156,10 +164,23 @@
pageSize:10,
total:0,
tableData:[],
tableloading:false
tableloading:false,
gridData:[],
dialogTableVisible: false,
}
},
methods: {
//查询回执列表
selectDetail(index,row){
this.gridData=[];
this.dialogTableVisible=true;
let params={messageid:row.messageid};
selectReturnMsg(params).then(res=>{
let response=res.data.data;
console.log(response)
this.gridData=response;
});
},
//分页
handleSizeChange(val) {
this.pageSize=val;
... ...