diff --git a/src/views/foodManage/pickManage/materialPicking/index.vue b/src/views/foodManage/pickManage/materialPicking/index.vue
index 712a5857..e59b920c 100644
--- a/src/views/foodManage/pickManage/materialPicking/index.vue
+++ b/src/views/foodManage/pickManage/materialPicking/index.vue
@@ -301,8 +301,7 @@ export default {
             let param = {
                 "pageNum": this.queryParams.pageNum, 
                 "pageSize": this.queryParams.pageSize,  
-                "fetchMaterialId": this.queryParams.fetchMaterialId,  
-                "fetchMaterialCode": this.queryParams.fetchMaterialCode,     
+                "fetchMaterialId": this.queryParams.fetchMaterialId,   
                 "areaId": this.queryParams.areaId,  
                 "canteenId": this.queryParams.canteenId,  
                 "stallId": this.queryParams.stallId,  
diff --git a/src/views/foodManage/stockManage/warehouseOut/edit.vue b/src/views/foodManage/stockManage/warehouseOut/edit.vue
index 2167d6fb..e425ca9e 100644
--- a/src/views/foodManage/stockManage/warehouseOut/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseOut/edit.vue
@@ -53,6 +53,7 @@
                 </div>
                 <div style="display: flex;align-items: center;">
                     <el-button type="primary" plain @click="addMaterial">添加货品</el-button>
+                    <el-button type="primary" plain @click="importMaterial">导入领料单</el-button>
                     <el-button type="danger" plain @click="delMaterial">删除</el-button>
                 </div>
             </div>
@@ -85,7 +86,7 @@
             <el-button @click="jumpList">返回</el-button>
         </div>
  
-        <!-- 选择菜品 -->
+        <!-- 选择货品 -->
         <el-dialog title="选择货品" :visible.sync="openDialog" width="65%" append-to-body >
             <div style="width: 100%;height:620px;">
                 <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
@@ -145,6 +146,50 @@
                 <el-button @click="openDialog=false">取 消</el-button>
             </div>
         </el-dialog> 
+
+        <!-- 选择货品 -->
+        <el-dialog title="导入采购订单" :visible.sync="openImportDialog" width="70%" append-to-body >
+            <div style="width: 100%;height:620px;">
+                <el-form :model="queryParams2" ref="queryForm2" size="small" :inline="true" label-width="90px"> 
+                    <el-form-item label="领料单标题" prop="title">
+                        <el-input v-model="queryParams2.title" placeholder="请输入领料单标题" maxlength="20" clearable style="width: 240px"/>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                    </el-form-item>
+                </el-form>
+                <el-table v-loading="loading2" :data="tableListData2" ref="multipleTable2" height="520" :row-key="(row)=>{return row.fetchMaterialId}" @selection-change="handleSelectionChange3">
+                    <el-table-column type="selection" width="50" align="center" :reserve-selection="true" />
+                    <el-table-column label="序号" align="center" width="80" type="index">
+                        <template slot-scope="scope">
+                        <span>{{(queryParams2.pageNum - 1) * queryParams2.pageSize + scope.$index + 1}}</span>
+                        </template>
+                    </el-table-column>
+                    <!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" />  -->
+                    <el-table-column label="领料单号" align="center" prop="fetchMaterialCode" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="领料标题" align="center" prop="title" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" />
+                    <el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="所属档口" align="center" prop="stallName" :show-overflow-tooltip="true" />   
+                    <el-table-column label="货品数量" align="center" prop="totalNum" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" />  
+                    <el-table-column label="领料日期" align="center" prop="fetchMaterialTime" :show-overflow-tooltip="true" width="150"/>
+                    
+                </el-table>
+                <pagination
+                    v-show="total2>0"
+                    :total="total2"
+                    :page.sync="queryParams2.pageNum"
+                    :limit.sync="queryParams2.pageSize"
+                    @pagination="getList2"
+                /> 
+            </div>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="">确 定</el-button>
+                <el-button @click="openImportDialog=false">取 消</el-button>
+            </div>
+        </el-dialog> 
     </div>
 </template>
   
@@ -154,6 +199,7 @@ import { systemAreaTreeApi } from "@/api/base/stall";
 import { systemMaterialTreeApi,getStockMaterialListApi,drpWareHousePageApi } from "@/api/foodManage/stockManage";  
 import { getWarehouseOutInfoApi,addWarehouseOutApi,editWarehouseOutApi } from "@/api/foodManage/stockManage";
 //warehouseOutPageApi getWarehouseOutInfoApi addWarehouseOutApi editWarehouseOutApi delWarehouseOutApi
+import { fetchMaterialPageApi } from "@/api/foodManage/pickManage";
 export default {
     name: "WarehouseOutEdit",
     dicts: [],
@@ -213,7 +259,14 @@ export default {
         tableListData: [],//货品弹窗-货品表格数据
         batchChosenMaterial:[],//货品弹窗-货品表格-选中的货品数组
         noMaterial:false, 
-        
+        openImportDialog:false,
+        queryParams2: { // 货品弹窗-货品表格-查询参数
+            pageNum: 1,
+            pageSize: 10, 
+        }, 
+        loading2:false,
+        total2: 0, // 总条数
+        tableListData2: [],//导入弹窗-表格数据
       };
     },
     created() {
@@ -320,8 +373,7 @@ export default {
                 },300) 
             }else{
                 this.$modal.msgError("请先选择区域，仓库");
-            }
-           
+            } 
         }, 
         /** 搜索按钮操作 */
         handleQuery() {
@@ -482,6 +534,47 @@ export default {
             });
         },
 
+
+        importMaterial(){
+            if(this.baseInfo.areaId!=undefined||this.baseInfo.warehouseId!=undefined){
+                this.openImportDialog=true 
+                this.resetQuery2()
+                setTimeout(()=>{
+                    this.$refs.multipleTable2.clearSelection() 
+                },300) 
+            }else{
+                this.$modal.msgError("请先选择区域，仓库");
+            }  
+        },
+          /** 搜索按钮操作 */
+        handleQuery2() {
+            this.queryParams2.pageNum = 1;
+            this.getList2();
+        },
+        /** 重置按钮操作 */
+        resetQuery2() { 
+            this.resetForm("queryForm2");
+            this.handleQuery2();
+        },
+        /** 查询列表 */
+        getList2() {
+            this.loading2 = true;
+            let param = {
+                "pageSize": this.queryParams2.pageSize,
+                "pageNum": this.queryParams2.pageNum,
+                "areaId": this.baseInfo.areaId, 
+                "warehouseId": this.baseInfo.warehouseId
+            }
+            fetchMaterialPageApi(param).then(response => {
+                this.tableListData2 = response.rows;
+                this.total2 = Number(response.total);
+                this.loading2 = false;
+            });
+        },
+        handleSelectionChange3(selection) {
+            
+        },
+
         //日期
         formatDate(date) {
             // 格式化为 YYYY-MM-DD