diff --git a/src/views/nmms_import/WaybillQuery.vue b/src/views/nmms_import/WaybillQuery.vue index 703f17d..63e83ce 100644 --- a/src/views/nmms_import/WaybillQuery.vue +++ b/src/views/nmms_import/WaybillQuery.vue @@ -10,13 +10,28 @@ <el-row> <el-form :label-position="labelPosition" :model="form" ref="queryFlight" label-width="130px" class="demo-ruleForm"> - <el-col :span="7" > + <el-col :span="5" > <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> @@ -93,6 +108,20 @@ </el-table-column> </el-table> </el-row> + <!--分页模块--> + <el-row style="float: right;margin-top: 20px"> + <div class="block"> + <el-pagination + @size-change="handleSizeChange" + @current-change="handleCurrentChange" + :current-page="pageNum" + :page-sizes="[10, 20, 30, 40]" + :page-size="pageSize" + layout="total, sizes, prev, pager, next, jumper" + :total="total"> + </el-pagination> + </div> + </el-row> <el-dialog title="运单明细" :visible.sync="dialogFormVisible" width="65%"> <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="labelPosition" size="mini"> <el-row class="flightInfo"> @@ -241,8 +270,12 @@ data(){ return{ form:{ - awba:'' + awba:'', + status:'' }, + pageNum:1, + pageSize:100, + total:0, ruleForm:{ stockpre:'', stockno:'', @@ -274,6 +307,15 @@ } }, methods:{ + /*分页方法*/ + handleSizeChange(val) { + this.pageSize=val; + this.getList(); + }, + handleCurrentChange(val) { + this.currentPage=val; + this.getList(); + }, // 获取消息标签列表 getList() { const _this = this