2个进港运单查询优化

@@ -10,7 +10,7 @@
             <el-row>
                 <el-form :label-position="labelPosition" :model="form"  ref="queryFlight"
                          label-width="130px" class="demo-ruleForm">
-                    <el-col :span="5" >
+                    <el-col :span="6" >
                         <el-form-item label="" prop="awba" label-width="70px">
                             <el-input v-model="form.awba" style="width:250px">
                                 <template slot="prepend">主单号</template>
@@ -48,27 +48,8 @@
                         :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
                     <el-table-column
                             label="主单号"
-                            prop="awba"
+                            prop="stockpre"
                             width="180">
-                        <template slot-scope="scope">
-                            <span v-if="scope.row.stocktypeid=='AWBA'">
-                                {{scope.row.stockpre}}-{{scope.row.stockno}}
-                            </span>
-                            <span v-else>
-                                {{scope.row.stockpre}}
-                             </span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                            label="分单号"
-                            width="150">
-                        <template slot-scope="scope">
-                            <span v-if="scope.row.stocktypeid=='AWBA'">
-                            </span>
-                            <span v-else>
-                                {{scope.row.stockno}}
-                            </span>
-                        </template>
                     </el-table-column>
                     <el-table-column
                             label="件数"
@@ -96,7 +77,6 @@
                     </el-table-column>
                     <el-table-column
                             fixed="right"
-                            prop=""
                             label="报文操作"
                             width="120">
                         <template slot-scope="scope">
@@ -263,7 +243,7 @@
 </template>
 
 <script>
-    import { selectAwbList } from '../../api/wayDeclaration'
+    import { getAWBM1List,selectAwbList } from '../../api/wayDeclaration'
 
     export default {
         name: "WaybillQuerys",
@@ -329,7 +309,7 @@
                     // 获取列表数据
                     _this.tableData = res.data.list;
                     // 获取列表的总记录数
-                    // _this.total = res.total
+                    _this.total = res.total
                     this.tableloading = false;
                     _this.$message.success('获取消息收发记录，成功！')
                 }).catch(error => {
@@ -343,10 +323,10 @@
             trnList(index, row){
                 this.dialogFormVisible = true;
                 this.ruleForm=row;
-                if(row.stocktypeid=="AWBA"){
-                    this.ruleForm.stockpre=row.stockpre+"-"+row.stockno;
-                    this.ruleForm.stockno="";
-                }
+                // if(row.stocktypeid=="AWBA"){
+                //     this.ruleForm.stockpre=row.stockpre+"-"+row.stockno;
+                //     this.ruleForm.stockno="";
+                // }
             },
         }
     }

@@ -10,28 +10,13 @@
             <el-row>
                 <el-form :label-position="labelPosition" :model="form"  ref="queryFlight"
                          label-width="130px" class="demo-ruleForm">
-                    <el-col :span="5" >
+                    <el-col :span="8" >
                         <el-form-item label="" prop="awba" label-width="70px">
                             <el-input v-model="form.awba" style="width:250px">
                                 <template slot="prepend">主单号</template>
                             </el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8" >
-                        <el-form-item label="" prop="status" label-width="70px">
-<!--                            <el-input v-model="form.status" style="width:250px">-->
-<!--                                <template slot="prepend">运单状态</template>-->
-<!--                            </el-input>-->
-                            <div style="display: inline-block;background-color: #6F8294;color: white;
-                            border-top-left-radius: 4px;margin-right: -4px;padding-right: 14px;font-size: 12px;
-                            border-bottom-left-radius:4px;padding-left: 14px">运单状态</div>
-                            <el-select v-model="form.status" style="width:250px">
-                                <el-option label="正常" value="30"></el-option>
-                                <el-option label="未理货" value="31"></el-option>
-                                <el-option label="无原始" value="33"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
                     <el-col :span="5" >
                         <el-button type="primary" @click="getList()">查询</el-button>
                     </el-col>
@@ -271,7 +256,7 @@
             return{
                 form:{
                     awba:'',
-                    status:''
+                    // status:''
             },
                 pageNum:1,
                 pageSize:100,