朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 77fae0fe0b528b4c47302c8e60856ebd62b3bf6b 2 个父辈 7bcd348b 6de24f81

合并分支 'nmms-import-dev' 到 'master' 

更改服务名,更新国家代码关区等



查看合并请求 !6
内嵌 并排对比
正在显示 3 个修改的文件 包含 35 行增加 和 22 行删除
... ... @@ -39,7 +39,7 @@
</el-form-item>
<el-form-item label="运抵到达" prop="turnunloading">
<el-col :span="24">
<el-select v-model="ruleForm.turnunloading" placeholder="请选择运抵到达地" style="width:100%">
<el-select v-model="ruleForm.turnunloading" placeholder="请选择运抵到达地" style="width:100%">
<el-option v-for="item in options" :key="item.value" :label="item.label"
:value="item.value" ></el-option>
</el-select>
... ... @@ -118,9 +118,9 @@
customcode: [
{ required: true, message: '请选择海关关区', trigger: 'change' }
],
turnunLoading: [
turnunloading: [
{ required: true, message: '请选择分拨到达地', trigger: 'change' }
],
]
},
options2: [
{
... ...
... ... @@ -115,9 +115,9 @@
customcode: [
{ required: true, message: '请选择海关关区', trigger: 'change' }
],
turnunLoading: [
turnunloading: [
{ required: true, message: '请选择分拨到达地', trigger: 'change' }
],
]
},
options2: [
{
... ...
... ... @@ -100,7 +100,7 @@
width="135">
<template slot-scope="scope">
<el-button
v-if="scope.row.rcfdep=='MT1201'"
v-if="scope.row.stype=='MT1201'"
@click="handleClick(scope.row)" type="text" size="small">原始舱单</el-button>
<el-button
v-else
... ... @@ -109,9 +109,11 @@
</template>
</el-table-column>
<el-table-column
prop="carrierno"
label="航班号"
width="75">
<template slot-scope="scope">
<span>{{scope.row.carrier}}{{scope.row.flightno}}</span>
</template>
</el-table-column>
<el-table-column
prop="flightdate"
... ... @@ -119,10 +121,11 @@
width="95">
</el-table-column>
<el-table-column
prop="segment"
label="航段"
width="85"
>
width="90">
<template slot-scope="scope">
<span>{{scope.row.originstation}}-{{scope.row.destinationstation}}</span>
</template>
</el-table-column>
<el-table-column
prop="awba"
... ... @@ -138,7 +141,7 @@
<el-table-column
prop="piece"
label="件数"
width="50">
width="60">
</el-table-column>
<el-table-column
prop="weight"
... ... @@ -177,11 +180,11 @@
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage4"
:current-page="currentPage"
:page-sizes="[100, 200, 300, 400]"
:page-size="100"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="400">
:total="total">
</el-pagination>
</div>
</el-col>
... ... @@ -245,7 +248,9 @@
}],
tableData: [],
multipleSelection: [],
currentPage4: 4
currentPage:1,
pageSize:10,
total:0
}
},
methods:{
... ... @@ -256,25 +261,33 @@
console.log(row);
},
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.pageSize=val;
this.QueryData();
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.currentPage=val;
this.QueryData();
},
//条件查询方法
QueryData(){
QueryData(this.defaultQuery).then(res =>{
//console.log(res);
let params={currentPage:this.currentPage,pageSize:this.pageSize,awba:this.defaultQuery.awba,carrier:this.defaultQuery.carrier,
flightno:this.defaultQuery.flightno,flightdate:this.defaultQuery.flightdate,status:this.defaultQuery.status,messageType:this.defaultQuery.messageType};
this.listLoading = true;
QueryData(params).then(res =>{
let response=res.data.data;
this.tableData=response;
this.tableData=response.list;
this.total=response.total;
this.listLoading = false;
});
},
//点击进入原始页面
handleClick(row){
this.$router.push({name:'进港原始舱单',params:{flightno:row.carrierno,destinationstation:row.destinationstation,awba:row.awba,flightdate:row.flightdate,originstation:row.originstation}});
this.$router.push({name:'进港原始舱单',params:{flightno:row.carrier+row.flightno,destinationstation:row.destinationstation,awba:row.awba,flightdate:row.flightdate,originstation:row.originstation}});
},
//点击进入理货页面
handleTally(row){},
handleTally(row){
this.$router.push({name:'进港理货舱单',params:{flightno:row.carrier+row.flightno,destinationstation:row.destinationstation,awba:row.awba,flightdate:row.flightdate,originstation:row.originstation}});
},
//table显示时间转换
timestampToTime(timestamp) {
var date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
... ...