diff --git a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
index 5d27a64..08b0b0b 100644
--- a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
+++ b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
@@ -183,6 +183,7 @@
           <el-button v-if="!editBatchVisible" type="primary" @click="editBatchModel">批量编辑</el-button>
           <el-button v-if="!editBatchVisible" type="success" @click="addMaterialModal">新增</el-button>
           <el-button v-if="editBatchVisible" type="primary" @click="batchModel" :loading="saveLoading">批量保存</el-button>
+          <el-button v-if="editBatchVisible" type="info" @click="editBatchVisible = false">取消编辑</el-button>
         </el-form>
         <el-table
           :data="dataList3"
@@ -260,6 +261,22 @@
               </span>
             </template>
           </el-table-column>
+          <el-table-column
+            prop="warehouseName"
+            header-align="center"
+            align="left"
+            min-width="180"
+            label="领料仓库">
+            <template slot-scope="scope">
+              <span v-if="editBatchVisible">
+                <el-button type="text" @click="chooseWareHouse(scope.row)" style="width:18%;padding: 3px 0px">选择</el-button>
+                <el-input v-model="scope.row.warehouseName" readonly style="width:77%"></el-input>
+              </span>
+              <span v-else>
+                <span>{{scope.row.warehouseName}}</span>
+              </span>
+            </template>
+          </el-table-column>
           <el-table-column
             v-for="(item,index) in columnList3s" :key="index"
             :sortable="item.columnSortable"
@@ -419,10 +436,10 @@
       </el-footer>
     </el-dialog>
 
-    <el-dialog title="新建领料申请单" :close-on-click-modal="false" v-drag :visible.sync="createNotifyFlag" width="300px">
+    <el-dialog title="新建领料申请单" :close-on-click-modal="false" v-drag :visible.sync="createNotifyFlag" width="500px">
       <el-form :inline="true" :model="notifyData" :rules="notifyRules" ref="notifyForm" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-row :gutter="20">
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item :label="'工厂_BU'" prop="bu" style="width: 97%">
               <el-select v-model="notifyData.bu" placeholder="请选择" style="width: 100%">
                 <el-option
@@ -438,7 +455,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item :label="'车间'" prop="workCenterNo">
               <el-select v-model="notifyData.workCenterNo" clearable placeholder="请选择" style="width: 100%">
                 <el-option
@@ -450,10 +467,22 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item :label="'出库类别'">
+              <el-select v-model="notifyData.category" clearable placeholder="请选择" style="width: 100%">
+                <el-option
+                  v-for="item in categoryList"
+                  :key="item.crdcode"
+                  :label="item.crdcode + '-' + item.crdname"
+                  :value="item.crdcode">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="24">
-            <el-form-item :label="'备注'" style="width: 97%">
+            <el-form-item :label="'备注'" style="width: 98%">
               <el-input
                 type="textarea"
                 :rows="3"
@@ -1109,6 +1138,7 @@
   import {saveIssueNoOrderDetail} from "../../../../api/orderIssure/soIssueNotify";
   import {
     getOutboundDetail2, // 获取出库明细
+    getOutboundCategoryList, // 查询出库类别列表
   } from "@/api/qc/outbound_notification.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
   import {verifyData} from "@/api/chooselist/chooselist.js"
@@ -1191,8 +1221,10 @@
           userDisplay: '',
           remark: '',
           planIssueDate: '',
-          workCenterNo: ''
+          workCenterNo: '',
+          category: '' // 出库类别
         },
+        categoryList: [], // 出库类别列表
         pageIndex: 1,
         pageSize: 100,
         totalPage: 0,
@@ -1330,7 +1362,7 @@
             status: true,
             fixed: '',
             columnWidth: 120
-          },{
+          },          {
             userId: this.$store.state.user.name,
             functionId: 701002,
             serialNumber: '701002Table1Status',
@@ -1347,6 +1379,23 @@
             status: true,
             fixed: '',
             columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1Category',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "category",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "出库类别",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
           },{
             userId: this.$store.state.user.name,
             functionId: 701002,
@@ -1702,23 +1751,6 @@
             status: true,
             fixed: '',
             columnWidth: 100
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701002,
-            serialNumber: '701002Table3OutboundWarehouseId',
-            tableId: "701002Table3",
-            tableName: "申请单材料明细表",
-            columnProp: "warehouseName",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "领料仓库",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
           },
           {
             userId: this.$store.state.user.name,
@@ -2629,6 +2661,7 @@
         ],
         editBatchVisible: false,
         saveLoading: false,
+        tempWareHouseRow: {}, // 临时存储编辑仓库的行
       }
     },
     computed: {
@@ -3051,8 +3084,10 @@
           userDisplay: '',
           remark: '',
           planIssueDate: '',
-          workCenterNo: ''
+          workCenterNo: '',
+          category: '' // 出库类别
         }
+        this.loadCategoryList() // 加载出库类别列表
         this.createNotifyFlag = true
       },
 
@@ -3100,6 +3135,7 @@
             userName: this.$store.state.user.name,
             remark: this.notifyData.remark,
             workCenterNo: this.notifyData.workCenterNo,
+            category: this.notifyData.category, // 出库类别
           }
           createNotify(inData).then(({data})=>{
             if (data.code === 0) {
@@ -3989,6 +4025,12 @@
         });
       },
 
+      // 选择仓库
+      chooseWareHouse (row) {
+        this.tempWareHouseRow = row
+        this.getBaseList(20)
+      },
+
       // 获取基础数据列表S
       getBaseList (val, type) {
         this.tagNo = val
@@ -3999,6 +4041,10 @@
             strVal = this.newMaterialData.componentPartNo
             this.$refs.baseList.init(val, strVal)
           }
+          if (val === 20) {
+            strVal = this.tempWareHouseRow.warehouseId
+            this.$refs.baseList.init(val, strVal)
+          }
         })
       },
 
@@ -4009,6 +4055,19 @@
           this.newMaterialData.partDesc = val.PartDescription
           this.newMaterialData.warehouseId = val.outbound_warehouse_id
         }
+        if (this.tagNo === 20) {
+          this.tempWareHouseRow.warehouseId = val.WareHouseID
+          this.tempWareHouseRow.warehouseName = val.WareHouseName
+        }
+      },
+
+      // 加载出库类别列表
+      loadCategoryList () {
+        getOutboundCategoryList({}).then(({data}) => {
+          if (data && data.code === 0) {
+            this.categoryList = data.rows || []
+          }
+        })
       },
 
       // 输入校验