作者 小范

2个进港运单查询优化

@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <el-row> 10 <el-row>
11 <el-form :label-position="labelPosition" :model="form" ref="queryFlight" 11 <el-form :label-position="labelPosition" :model="form" ref="queryFlight"
12 label-width="130px" class="demo-ruleForm"> 12 label-width="130px" class="demo-ruleForm">
13 - <el-col :span="5" > 13 + <el-col :span="6" >
14 <el-form-item label="" prop="awba" label-width="70px"> 14 <el-form-item label="" prop="awba" label-width="70px">
15 <el-input v-model="form.awba" style="width:250px"> 15 <el-input v-model="form.awba" style="width:250px">
16 <template slot="prepend">主单号</template> 16 <template slot="prepend">主单号</template>
@@ -48,27 +48,8 @@ @@ -48,27 +48,8 @@
48 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"> 48 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
49 <el-table-column 49 <el-table-column
50 label="主单号" 50 label="主单号"
51 - prop="awba" 51 + prop="stockpre"
52 width="180"> 52 width="180">
53 - <template slot-scope="scope">  
54 - <span v-if="scope.row.stocktypeid=='AWBA'">  
55 - {{scope.row.stockpre}}-{{scope.row.stockno}}  
56 - </span>  
57 - <span v-else>  
58 - {{scope.row.stockpre}}  
59 - </span>  
60 - </template>  
61 - </el-table-column>  
62 - <el-table-column  
63 - label="分单号"  
64 - width="150">  
65 - <template slot-scope="scope">  
66 - <span v-if="scope.row.stocktypeid=='AWBA'">  
67 - </span>  
68 - <span v-else>  
69 - {{scope.row.stockno}}  
70 - </span>  
71 - </template>  
72 </el-table-column> 53 </el-table-column>
73 <el-table-column 54 <el-table-column
74 label="件数" 55 label="件数"
@@ -96,7 +77,6 @@ @@ -96,7 +77,6 @@
96 </el-table-column> 77 </el-table-column>
97 <el-table-column 78 <el-table-column
98 fixed="right" 79 fixed="right"
99 - prop=""  
100 label="报文操作" 80 label="报文操作"
101 width="120"> 81 width="120">
102 <template slot-scope="scope"> 82 <template slot-scope="scope">
@@ -263,7 +243,7 @@ @@ -263,7 +243,7 @@
263 </template> 243 </template>
264 244
265 <script> 245 <script>
266 - import { selectAwbList } from '../../api/wayDeclaration' 246 + import { getAWBM1List,selectAwbList } from '../../api/wayDeclaration'
267 247
268 export default { 248 export default {
269 name: "WaybillQuerys", 249 name: "WaybillQuerys",
@@ -329,7 +309,7 @@ @@ -329,7 +309,7 @@
329 // 获取列表数据 309 // 获取列表数据
330 _this.tableData = res.data.list; 310 _this.tableData = res.data.list;
331 // 获取列表的总记录数 311 // 获取列表的总记录数
332 - // _this.total = res.total 312 + _this.total = res.total
333 this.tableloading = false; 313 this.tableloading = false;
334 _this.$message.success('获取消息收发记录,成功!') 314 _this.$message.success('获取消息收发记录,成功!')
335 }).catch(error => { 315 }).catch(error => {
@@ -343,10 +323,10 @@ @@ -343,10 +323,10 @@
343 trnList(index, row){ 323 trnList(index, row){
344 this.dialogFormVisible = true; 324 this.dialogFormVisible = true;
345 this.ruleForm=row; 325 this.ruleForm=row;
346 - if(row.stocktypeid=="AWBA"){  
347 - this.ruleForm.stockpre=row.stockpre+"-"+row.stockno;  
348 - this.ruleForm.stockno="";  
349 - } 326 + // if(row.stocktypeid=="AWBA"){
  327 + // this.ruleForm.stockpre=row.stockpre+"-"+row.stockno;
  328 + // this.ruleForm.stockno="";
  329 + // }
350 }, 330 },
351 } 331 }
352 } 332 }
@@ -10,28 +10,13 @@ @@ -10,28 +10,13 @@
10 <el-row> 10 <el-row>
11 <el-form :label-position="labelPosition" :model="form" ref="queryFlight" 11 <el-form :label-position="labelPosition" :model="form" ref="queryFlight"
12 label-width="130px" class="demo-ruleForm"> 12 label-width="130px" class="demo-ruleForm">
13 - <el-col :span="5" > 13 + <el-col :span="8" >
14 <el-form-item label="" prop="awba" label-width="70px"> 14 <el-form-item label="" prop="awba" label-width="70px">
15 <el-input v-model="form.awba" style="width:250px"> 15 <el-input v-model="form.awba" style="width:250px">
16 <template slot="prepend">主单号</template> 16 <template slot="prepend">主单号</template>
17 </el-input> 17 </el-input>
18 </el-form-item> 18 </el-form-item>
19 </el-col> 19 </el-col>
20 - <el-col :span="8" >  
21 - <el-form-item label="" prop="status" label-width="70px">  
22 -<!-- <el-input v-model="form.status" style="width:250px">-->  
23 -<!-- <template slot="prepend">运单状态</template>-->  
24 -<!-- </el-input>-->  
25 - <div style="display: inline-block;background-color: #6F8294;color: white;  
26 - border-top-left-radius: 4px;margin-right: -4px;padding-right: 14px;font-size: 12px;  
27 - border-bottom-left-radius:4px;padding-left: 14px">运单状态</div>  
28 - <el-select v-model="form.status" style="width:250px">  
29 - <el-option label="正常" value="30"></el-option>  
30 - <el-option label="未理货" value="31"></el-option>  
31 - <el-option label="无原始" value="33"></el-option>  
32 - </el-select>  
33 - </el-form-item>  
34 - </el-col>  
35 <el-col :span="5" > 20 <el-col :span="5" >
36 <el-button type="primary" @click="getList()">查询</el-button> 21 <el-button type="primary" @click="getList()">查询</el-button>
37 </el-col> 22 </el-col>
@@ -271,7 +256,7 @@ @@ -271,7 +256,7 @@
271 return{ 256 return{
272 form:{ 257 form:{
273 awba:'', 258 awba:'',
274 - status:'' 259 + // status:''
275 }, 260 },
276 pageNum:1, 261 pageNum:1,
277 pageSize:100, 262 pageSize:100,