作者 朱兆平

Merge branch 'master' of 118.31.66.166:zp260/vue_cli

@@ -118,9 +118,9 @@ @@ -118,9 +118,9 @@
118 customcode: [ 118 customcode: [
119 { required: true, message: '请选择海关关区', trigger: 'change' } 119 { required: true, message: '请选择海关关区', trigger: 'change' }
120 ], 120 ],
121 - turnunLoading: [ 121 + turnunloading: [
122 { required: true, message: '请选择分拨到达地', trigger: 'change' } 122 { required: true, message: '请选择分拨到达地', trigger: 'change' }
123 - ], 123 + ]
124 }, 124 },
125 options2: [ 125 options2: [
126 { 126 {
@@ -115,9 +115,9 @@ @@ -115,9 +115,9 @@
115 customcode: [ 115 customcode: [
116 { required: true, message: '请选择海关关区', trigger: 'change' } 116 { required: true, message: '请选择海关关区', trigger: 'change' }
117 ], 117 ],
118 - turnunLoading: [ 118 + turnunloading: [
119 { required: true, message: '请选择分拨到达地', trigger: 'change' } 119 { required: true, message: '请选择分拨到达地', trigger: 'change' }
120 - ], 120 + ]
121 }, 121 },
122 options2: [ 122 options2: [
123 { 123 {
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
100 width="135"> 100 width="135">
101 <template slot-scope="scope"> 101 <template slot-scope="scope">
102 <el-button 102 <el-button
103 - v-if="scope.row.rcfdep=='MT1201'" 103 + v-if="scope.row.stype=='MT1201'"
104 @click="handleClick(scope.row)" type="text" size="small">原始舱单</el-button> 104 @click="handleClick(scope.row)" type="text" size="small">原始舱单</el-button>
105 <el-button 105 <el-button
106 v-else 106 v-else
@@ -109,9 +109,11 @@ @@ -109,9 +109,11 @@
109 </template> 109 </template>
110 </el-table-column> 110 </el-table-column>
111 <el-table-column 111 <el-table-column
112 - prop="carrierno"  
113 label="航班号" 112 label="航班号"
114 width="75"> 113 width="75">
  114 + <template slot-scope="scope">
  115 + <span>{{scope.row.carrier}}{{scope.row.flightno}}</span>
  116 + </template>
115 </el-table-column> 117 </el-table-column>
116 <el-table-column 118 <el-table-column
117 prop="flightdate" 119 prop="flightdate"
@@ -119,10 +121,11 @@ @@ -119,10 +121,11 @@
119 width="95"> 121 width="95">
120 </el-table-column> 122 </el-table-column>
121 <el-table-column 123 <el-table-column
122 - prop="segment"  
123 label="航段" 124 label="航段"
124 - width="85"  
125 - > 125 + width="90">
  126 + <template slot-scope="scope">
  127 + <span>{{scope.row.originstation}}-{{scope.row.destinationstation}}</span>
  128 + </template>
126 </el-table-column> 129 </el-table-column>
127 <el-table-column 130 <el-table-column
128 prop="awba" 131 prop="awba"
@@ -138,7 +141,7 @@ @@ -138,7 +141,7 @@
138 <el-table-column 141 <el-table-column
139 prop="piece" 142 prop="piece"
140 label="件数" 143 label="件数"
141 - width="50"> 144 + width="60">
142 </el-table-column> 145 </el-table-column>
143 <el-table-column 146 <el-table-column
144 prop="weight" 147 prop="weight"
@@ -177,11 +180,11 @@ @@ -177,11 +180,11 @@
177 <el-pagination 180 <el-pagination
178 @size-change="handleSizeChange" 181 @size-change="handleSizeChange"
179 @current-change="handleCurrentChange" 182 @current-change="handleCurrentChange"
180 - :current-page="currentPage4" 183 + :current-page="currentPage"
181 :page-sizes="[100, 200, 300, 400]" 184 :page-sizes="[100, 200, 300, 400]"
182 - :page-size="100" 185 + :page-size="pageSize"
183 layout="total, sizes, prev, pager, next, jumper" 186 layout="total, sizes, prev, pager, next, jumper"
184 - :total="400"> 187 + :total="total">
185 </el-pagination> 188 </el-pagination>
186 </div> 189 </div>
187 </el-col> 190 </el-col>
@@ -245,7 +248,9 @@ @@ -245,7 +248,9 @@
245 }], 248 }],
246 tableData: [], 249 tableData: [],
247 multipleSelection: [], 250 multipleSelection: [],
248 - currentPage4: 4 251 + currentPage:1,
  252 + pageSize:10,
  253 + total:0
249 } 254 }
250 }, 255 },
251 methods:{ 256 methods:{
@@ -256,25 +261,33 @@ @@ -256,25 +261,33 @@
256 console.log(row); 261 console.log(row);
257 }, 262 },
258 handleSizeChange(val) { 263 handleSizeChange(val) {
259 - console.log(`每页 ${val} 条`); 264 + this.pageSize=val;
  265 + this.QueryData();
260 }, 266 },
261 handleCurrentChange(val) { 267 handleCurrentChange(val) {
262 - console.log(`当前页: ${val}`); 268 + this.currentPage=val;
  269 + this.QueryData();
263 }, 270 },
264 //条件查询方法 271 //条件查询方法
265 QueryData(){ 272 QueryData(){
266 - QueryData(this.defaultQuery).then(res =>{  
267 - //console.log(res); 273 + let params={currentPage:this.currentPage,pageSize:this.pageSize,awba:this.defaultQuery.awba,carrier:this.defaultQuery.carrier,
  274 + flightno:this.defaultQuery.flightno,flightdate:this.defaultQuery.flightdate,status:this.defaultQuery.status,messageType:this.defaultQuery.messageType};
  275 + this.listLoading = true;
  276 + QueryData(params).then(res =>{
268 let response=res.data.data; 277 let response=res.data.data;
269 - this.tableData=response; 278 + this.tableData=response.list;
  279 + this.total=response.total;
  280 + this.listLoading = false;
270 }); 281 });
271 }, 282 },
272 //点击进入原始页面 283 //点击进入原始页面
273 handleClick(row){ 284 handleClick(row){
274 - this.$router.push({name:'进港原始舱单',params:{flightno:row.carrierno,destinationstation:row.destinationstation,awba:row.awba,flightdate:row.flightdate,originstation:row.originstation}}); 285 + this.$router.push({name:'进港原始舱单',params:{flightno:row.carrier+row.flightno,destinationstation:row.destinationstation,awba:row.awba,flightdate:row.flightdate,originstation:row.originstation}});
275 }, 286 },
276 //点击进入理货页面 287 //点击进入理货页面
277 - handleTally(row){}, 288 + handleTally(row){
  289 + this.$router.push({name:'进港理货舱单',params:{flightno:row.carrier+row.flightno,destinationstation:row.destinationstation,awba:row.awba,flightdate:row.flightdate,originstation:row.originstation}});
  290 + },
278 //table显示时间转换 291 //table显示时间转换
279 timestampToTime(timestamp) { 292 timestampToTime(timestamp) {
280 var date = new Date(timestamp);//时间戳为10位需*1000,时间戳为13位的话不需乘1000 293 var date = new Date(timestamp);//时间戳为10位需*1000,时间戳为13位的话不需乘1000