diff --git a/src/api/issueNotify/issueNotify.js b/src/api/issueNotify/issueNotify.js
index a0ab87d..b33070b 100644
--- a/src/api/issueNotify/issueNotify.js
+++ b/src/api/issueNotify/issueNotify.js
@@ -10,3 +10,6 @@ export const addBillLading = data => createAPI(`orderIssure/issureNotify/addBill
 export const createBillLading = data => createAPI(`orderIssure/issureNotify/createBillLading`,'post',data)
 
 export const queryPickDetailList = data => createAPI("/orderIssure/issureNotify/pick/detail",'post',data)
+
+// 获取提货单明细
+export const getBillLadingDetail = data => createAPI(`orderIssure/issureNotify/getBillLadingDetail`,'post',data)
diff --git a/src/views/modules/orderIssure/soIssueNotify/issueNotify.vue b/src/views/modules/orderIssure/soIssueNotify/issueNotify.vue
index 92c2e8a..9bc3911 100644
--- a/src/views/modules/orderIssure/soIssueNotify/issueNotify.vue
+++ b/src/views/modules/orderIssure/soIssueNotify/issueNotify.vue
@@ -124,16 +124,85 @@
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
+
+    <el-dialog title="提货单明细" :close-on-click-modal="false" v-drag :visible.sync="billLadingDetailFlag" width="1200px">
+      <el-form :inline="true" label-position="top" :model="billLadingModalData" style="margin-top: 5px;">
+        <el-form-item label="申请单号" prop="notifyNo">
+          <el-input v-model="billLadingModalData.notifyNo" disabled style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="IFS提货单号" prop="ifsPickListNo">
+          <el-input v-model="billLadingModalData.ifsPickListNo" disabled style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="3H订单号" prop="thOrderNo">
+          <el-input v-model="billLadingModalData.thOrderNo" disabled style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="生产订单号" prop="orderNo">
+          <el-input v-model="billLadingModalData.orderNo" disabled style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="' '">
+          <download-excel
+            :fields="fields()"
+            :data="exportData"
+            type="xlsx"
+            :name="exportName"
+            :header="exportHeader"
+            :footer="exportFooter"
+            :fetch="createExportData"
+            :before-generate="startDownload"
+            :before-finish="finishDownload"
+            worksheet="导出信息"
+            class="el-button el-button--primary el-button--medium">
+            {{ "导出" }}
+          </download-excel>
+        </el-form-item>
+      </el-form>
+      <el-table
+        :height="height - 200"
+        :data="billLadingDetailDataList"
+        border
+        style="width: 100%;">
+        <el-table-column
+          v-for="(item, index) in billLadingDetailColumnList" :key="index"
+          :sortable="item.columnSortable"
+          :prop="item.columnProp"
+          :header-align="item.headerAlign"
+          :show-overflow-tooltip="item.showOverflowTooltip"
+          :align="item.align"
+          :fixed="item.fixed === '' ? false : item.fixed"
+          :min-width="item.columnWidth"
+          :label="item.columnLabel">
+          <template slot-scope="scope">
+            <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-footer
+        style="height:35px; margin-top: 20px; padding-bottom:5px; text-align:center"
+      >
+        <el-button type="primary" @click="billLadingDetailFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import {issueNotifyPageSearch, createBillLading, addBillLading} from "../../../../api/issueNotify/issueNotify";
+import {
+  issueNotifyPageSearch,
+  createBillLading,
+  addBillLading,
+  getBillLadingDetail
+} from "../../../../api/issueNotify/issueNotify";
 
 export default {
   name: 'IssureNotifyList',
   data() {
     return {
+      // 导出 start
+      exportData: [],
+      exportName: "提货单明细" + this.dayjs().format('YYYYMMDDHHmmss'),
+      exportHeader: ['提货单明细'],
+      exportFooter: [],
+      exportList:[],
       authSearch: false,
       authSave: false,
       authUpdate: false,
@@ -157,7 +226,15 @@ export default {
       totalPage: 0,
       height: 200,
       modalFlag: false,
-      modalDisableFlag: false,
+      billLadingDetailDataList: [],
+      billLadingDetailFlag: false,
+      billLadingModalData: {
+        site: this.$store.state.user.site,
+        notifyNo: '',
+        ifsPickListNo: '',
+        thOrderNo: '',
+        orderNo: ''
+      },
       modalData: {
         site: this.$store.state.user.site,
         status: '',
@@ -338,6 +415,350 @@ export default {
           fixed: '',
           columnWidth: 90,
         },
+      ],
+      billLadingDetailColumnList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 400002,
+          serialNumber: '400002Table2NeedDate',
+          tableId: '400002Table2',
+          tableName: '领料申请单明细表',
+          columnProp: 'needDate',
+          columnLabel: '车间订单需要日期',
+          headerAlign: 'center',
+          align: 'center',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 110,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 400002,
+          serialNumber: '400002Table2Status',
+          tableId: '400002Table2',
+          tableName: '领料申请单明细表',
+          columnProp: 'status',
+          columnLabel: '车间订单状态',
+          headerAlign: 'center',
+          align: 'left',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 400002,
+          serialNumber: '400002Table2OnhandQty',
+          tableId: '400002Table2',
+          tableName: '领料申请单明细表',
+          columnProp: 'onhandQty',
+          columnLabel: '库存数量_仓库库位',
+          headerAlign: 'center',
+          align: 'right',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 110,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 400002,
+          serialNumber: '400002Table2FgPartDesc',
+          tableId: '400002Table2',
+          tableName: '领料申请单明细表',
+          columnProp: 'fgPartDesc',
+          columnLabel: '成品零件描述',
+          headerAlign: 'center',
+          align: 'left',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 210,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 400002,
+          serialNumber: '400002Table2FgPartNo',
+          tableId: '400002Table2',
+          tableName: '领料申请单明细表',
+          columnProp: 'fgPartNo',
+          columnLabel: '成品零件号',
+          headerAlign: 'center',
+          align: 'left',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 400002,
+          serialNumber: '400002Table2IssueQty',
+          tableId: '400002Table2',
+          tableName: '领料申请单明细表',
+          columnProp: 'issueQty',
+          columnLabel: '下发数量（实时）',
+          headerAlign: 'center',
+          align: 'right',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 400002,
+          serialNumber: '400002Table2Remark',
+          tableId: '400002Table2',
+          tableName: '领料申请单明细表',
+          columnProp: 'remark',
+          columnLabel: '备注',
+          headerAlign: 'center',
+          align: 'left',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 400002,
+          serialNumber: '400002Table2IssueQty',
+          tableId: '400002Table2',
+          tableName: '领料申请单明细表',
+          columnProp: 'issueQty',
+          columnLabel: '已领数量',
+          headerAlign: 'center',
+          align: 'right',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 70,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 400002,
+          serialNumber: '400002Table2Contract',
+          tableId: '400002Table2',
+          tableName: '领料申请单明细表',
+          columnProp: 'contract',
+          columnLabel: '域',
+          headerAlign: 'center',
+          align: 'left',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 40,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 400002,
+          serialNumber: '400002Table2RmPartDesc',
+          tableId: '400002Table2',
+          tableName: '领料申请单明细表',
+          columnProp: 'rmPartDesc',
+          columnLabel: '子件描述',
+          headerAlign: 'center',
+          align: 'left',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 210,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 400002,
+          serialNumber: '400002Table2RmPartNo',
+          tableId: '400002Table2',
+          tableName: '领料申请单明细表',
+          columnProp: 'rmPartNo',
+          columnLabel: '子件号',
+          headerAlign: 'center',
+          align: 'left',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 400002,
+          serialNumber: '400002Table2ThOrderNo',
+          tableId: '400002Table2',
+          tableName: '领料申请单明细表',
+          columnProp: 'thOrderNo',
+          columnLabel: '3H订单号',
+          headerAlign: 'center',
+          align: 'left',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 400002,
+          serialNumber: '400002Table2EngChgLevel',
+          tableId: '400002Table2',
+          tableName: '领料申请单明细表',
+          columnProp: 'engChgLevel',
+          columnLabel: '层级号',
+          headerAlign: 'center',
+          align: 'center',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 50,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 400002,
+          serialNumber: '400002Table2LineItemNo',
+          tableId: '400002Table2',
+          tableName: '领料申请单明细表',
+          columnProp: 'lineItemNo',
+          columnLabel: '车间订单行号',
+          headerAlign: 'center',
+          align: 'center',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 400002,
+          serialNumber: '400002Table2LineNo',
+          tableId: '400002Table2',
+          tableName: '领料申请单明细表',
+          columnProp: 'lineNo',
+          columnLabel: 'Line No',
+          headerAlign: 'center',
+          align: 'center',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 60,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 400002,
+          serialNumber: '400002Table2LocationNo',
+          tableId: '400002Table2',
+          tableName: '领料申请单明细表',
+          columnProp: 'locationNo',
+          columnLabel: '库位号',
+          headerAlign: 'center',
+          align: 'left',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 50,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 400002,
+          serialNumber: '400002Table2OderNo',
+          tableId: '400002Table2',
+          tableName: '领料申请单明细表',
+          columnProp: 'orderNo',
+          columnLabel: '车间订单号',
+          headerAlign: 'center',
+          align: 'left',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 90,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 400002,
+          serialNumber: '400002Table2OrigAssignedQty',
+          tableId: '400002Table2',
+          tableName: '领料申请单明细表',
+          columnProp: 'origAssignedQty',
+          columnLabel: '待领总数量',
+          headerAlign: 'center',
+          align: 'right',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 70,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 400002,
+          serialNumber: '400002Table2PickListNo',
+          tableId: '400002Table2',
+          tableName: '领料申请单明细表',
+          columnProp: 'pickListNo',
+          columnLabel: '提货单号',
+          headerAlign: 'center',
+          align: 'left',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
       ]
     };
   },
@@ -391,7 +812,6 @@ export default {
         needDate: '',
         orderNo: ''
       };
-      this.modalDisableFlag = false;
       this.modalFlag = true;
     },
     createBillLading(row) {
@@ -448,6 +868,56 @@ export default {
         }
       })
     },
+
+    getBillLadingDetail(row){
+      let inData = {
+        site: row.site,
+        ifsPickListNo: row.ifsPickListNo,
+        thOrderNo: row.thOrderNo
+      };
+      getBillLadingDetail(inData).then(({data}) =>
+      {
+        if (data.code === 0) {
+          this.billLadingDetailDataList = data.list;
+          this.billLadingDetailFlag = true;
+          this.billLadingModalData = {
+            site: row.site,
+            notifyNo: row.notifyNo,
+            ifsPickListNo: row.ifsPickListNo,
+            thOrderNo: row.thOrderNo,
+            orderNo: row.orderNo
+          };
+        } else {
+          this.$message.error('获取失败：' + data.msg);
+        }
+      })
+    },
+
+    //导出excel
+    async createExportData () {
+      await getBillLadingDetail(this.billLadingModalData).then(({data}) => {
+        this.exportList = data.list
+      })
+      return this.exportList
+    },
+
+    startDownload () {},
+
+    finishDownload () {},
+
+    fields () {
+      let json = "{"
+      this.billLadingDetailColumnList.forEach((item, index) => {
+        if (index == this.billLadingDetailColumnList.length - 1) {
+          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+        } else {
+          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+        }
+      })
+      json += "}"
+      let s = eval("(" + json + ")")
+      return s
+    },
   }
 };
 </script>
diff --git a/src/views/modules/production/warehousing.vue b/src/views/modules/production/warehousing.vue
index d841e1d..997c343 100644
--- a/src/views/modules/production/warehousing.vue
+++ b/src/views/modules/production/warehousing.vue
@@ -161,7 +161,7 @@
         <el-row :gutter="10">
           <el-col :span="6">
             <el-form-item label="入库数量" prop="quantity" :rules="rules.quantity">
-              <el-input-number :controls="false" v-model="modalData.quantity" style="width: 110px"/>
+              <el-input-number :controls="false" v-model="modalData.quantity" style="width: 110px;margin-top: 3px"/>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -181,7 +181,7 @@
           </el-col>
         </el-row>
 
-        <el-row :gutter="10" style="margin-top: 10px;">
+        <el-row :gutter="10" style="margin-top: 15px;">
           <el-col :span="6" style="margin-top: -5px">
             <el-form-item>
               <el-checkbox v-model="modalData.simplifiedMaterial"
@@ -514,6 +514,10 @@ export default {
           this.pageIndex = data.page.currPage
           this.pageSize = data.page.pageSize
           this.totalPage = data.page.totalCount
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
         }
       })
     },