diff --git a/src/api/wms/wms.js b/src/api/wms/wms.js
index 9687fe0..b6a77b7 100644
--- a/src/api/wms/wms.js
+++ b/src/api/wms/wms.js
@@ -10,3 +10,5 @@ export const deletePoPartLabelData = data => createAPI(`wmsPrint/deletePoPartLab
 export const getKuCunLabelData = data => createAPI(`wmsPrint/getKuCunLabelData`,'POST',data)
 // 更新库存标签属性
 export const updateInventoryStockAttribute = data => createAPI(`wmsPrint/updateInventoryStockAttribute`,'POST',data)
+// 获取仓库列表
+export const getWarehouseList = data => createAPI(`wmsPrint/getWarehouseList`,'POST',data)
diff --git a/src/views/modules/print/rePrintPoPart.vue b/src/views/modules/print/rePrintPoPart.vue
index 4f2be18..b14772a 100644
--- a/src/views/modules/print/rePrintPoPart.vue
+++ b/src/views/modules/print/rePrintPoPart.vue
@@ -1,53 +1,54 @@
 <template>
   <div class="mod-config">
-
-    <el-form label-position="top" style=""  :inline="true"
-             >
-      <el-row >
-        <el-form-item label="标签条码">
-          <el-input v-model="searchData.rollNo" clearable>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="物料编码">
-          <el-input v-model="searchData.partNo" clearable>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="物料名称">
-          <el-input v-model="searchData.partDescription" clearable>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="仓库号">
-          <el-input v-model="searchData.warehouseId" clearable>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="库位号">
-          <el-input v-model="searchData.locationId" clearable>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="批次号">
-          <el-input v-model="searchData.batchNo" clearable>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="批次号">
-          <el-select v-model="searchData.status" >
-            <el-option label="全部" value=""></el-option>
-            <el-option label="待检" value="待检"></el-option>
-            <el-option label="待入" value="待入"></el-option>
-            <el-option label="在库" value="在库"></el-option>
-            <el-option label="在途" value="在途"></el-option>
-            <el-option label="出库" value="出库"></el-option>
-            <el-option label="冻结" value="冻结"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-row>
-      <el-row >
-        <el-form-item style="margin-top: 5px">
-          <el-button @click="getMainData()" type="primary">查询</el-button>
-          <el-button @click="printLabelModel()" type="primary">打印</el-button>
-          <el-button @click="openAttributeChangeDialog()" type="warning">属性变动</el-button>
-        </el-form-item>
-      </el-row>
+    <el-form :inline="true" label-position="top" :model="searchData">
+      <el-form-item label="标签条码">
+        <el-input v-model="searchData.rollNo" clearable style="width: 120px">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="物料编码">
+        <el-input v-model="searchData.partNo" clearable style="width: 120px">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="物料名称">
+        <el-input v-model="searchData.partDescription" clearable style="width: 200px">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="仓库">
+        <el-select v-model="searchData.warehouseIdList" style="width: 200px" multiple collapse-tags clearable placeholder="请选择仓库">
+          <el-option
+            v-for="item in warehouseList"
+            :key="item.warehouseId"
+            :label="item.warehouseName"
+            :value="item.warehouseId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="库位号">
+        <el-input v-model="searchData.locationId" clearable style="width: 100px">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="批次号">
+        <el-input v-model="searchData.batchNo" clearable style="width: 100px">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="状态">
+        <el-select v-model="searchData.statusList" style="width: 200px" multiple collapse-tags clearable placeholder="请选择状态">
+          <el-option label="待检" value="待检"></el-option>
+          <el-option label="待入" value="待入"></el-option>
+          <el-option label="在库" value="在库"></el-option>
+          <el-option label="在途" value="在途"></el-option>
+          <el-option label="冻结" value="冻结"></el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" :model="searchData">
+      <el-form-item style="margin-top: 5px">
+        <el-button @click="getMainData()" type="primary">查询</el-button>
+        <el-button @click="printLabelModel()" type="primary">打印</el-button>
+        <el-button @click="openAttributeChangeDialog()" type="warning">属性变动</el-button>
+      </el-form-item>
     </el-form>
+
     <el-table
       :height="height"
       :data="dataList"
@@ -73,8 +74,7 @@
         :label="item.columnLabel">
         <template slot-scope="scope">
           <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                             style="width: 100px; height: 80px"/></span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
 
@@ -150,7 +150,7 @@
 
 import {getCRollInfoList} from '@/api/crollinfo/crollinfo.js'
 import {rollPrint} from '@/api/finishedProductWarehouse/rollPrint.js'
-import {getInboundQcResultData, getKuCunLabelData, updateInventoryStockAttribute} from '../../../api/wms/wms'
+import {getInboundQcResultData, getKuCunLabelData, updateInventoryStockAttribute, getWarehouseList} from '../../../api/wms/wms'
 import {kuCunLabelPrint} from '../clodopLabel/kuCunLabel'
 
 export default {
@@ -158,17 +158,18 @@ export default {
     return {
       height: 450,
       searchData: {
-        site:this.$store.state.user.site,
+        userName: this.$store.state.user.name,
         partNo:'',
         partDescription:'',
-        warehouseId:'',
+        warehouseIdList:[],
         locationId:'',
         rollNo:'',
-        status:'',
+        statusList:['在库'],
         batchNo:'',
         page: 1,
         limit: 10,
       },
+      warehouseList: [],
       pageIndex: 1,
       pageSize: 50,
       totalPage: 0,
@@ -590,9 +591,10 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      this.height = window.innerHeight - 220;
+      this.height = window.innerHeight - 200;
     })
-
+    // 加载仓库列表
+    this.getWarehouseList();
   },
   activated() {
     //  this.getDataList()
@@ -615,6 +617,18 @@ export default {
       this.selectionDataList = val
       console.log(this.selectionDataList)
     },
+
+    // 获取仓库列表
+    getWarehouseList(){
+      let params = {
+        userName: this.$store.state.user.name
+      };
+      getWarehouseList(params).then(({data}) => {
+        if (data.code === 0) {
+          this.warehouseList = data.rows || [];
+        }
+      });
+    },
     getMainData(){
       this.searchData.limit = this.pageSize
       this.searchData.page = this.pageIndex