diff --git a/src/api/Inventory/CreatePickingList.js b/src/api/Inventory/CreatePickingList.js
index 4f509941..b9200298 100644
--- a/src/api/Inventory/CreatePickingList.js
+++ b/src/api/Inventory/CreatePickingList.js
@@ -42,8 +42,8 @@ export function searchTable(...params) {
     data: {
       type: '1',
       name: '车间装配管理_领料单_三表_查询数据',
-      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}`,
-      Pagination: params[4] + '&' + params[5]
+      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&名称_check=${params[4]}&名称=${params[5]}&零件类型=${params[8]}`,
+      Pagination: params[6] + '&' + params[7]
     }
   })
 }
@@ -91,7 +91,7 @@ export function searchListDetail(...params) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间装配管理_领料单明细_查询数据',
+      name: '车间装配管理_领料单明细_查询数据_新',
       param: `领料单流水号=${params[0]}`
     }
   })
@@ -120,3 +120,15 @@ export function dropListDetail(num) {
     }
   })
 }
+// 查询领料单明细详情
+export function searchListDetailMX(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间装配管理_领料单明细_详情_查询数据',
+      param: `领料单流水号=${params[0]}&基本件流水号=${params[1]}&标准件和外购件流水号=${params[2]}`
+    }
+  })
+}
diff --git a/src/api/Inventory/MaterialOut.js b/src/api/Inventory/MaterialOut.js
index b5bf7702..f75a1aac 100644
--- a/src/api/Inventory/MaterialOut.js
+++ b/src/api/Inventory/MaterialOut.js
@@ -54,7 +54,7 @@ export function searchListDetail(...params) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间装配管理_领料单明细_查询数据',
+      name: '车间装配管理_领料单明细_查询数据_新',
       param: `领料单流水号=${params[0]}`
     }
   })
@@ -102,8 +102,8 @@ export function submitOutStore(...params) {
     method: 'post',
     data: {
       type: '2',
-      name: '库存管理_物料出库_出库记录_增加数据',
-      param: `物料流水号=${params[0]}&货位流水号=${params[1]}&出库数量=${params[2]}&出库人流水号=${params[3]}&基本件流水号=${params[4]}&标准件和外购件流水号=${params[5]}&请购单明细流水号=${params[6]}&领料单流水号=${params[7]}&领料人流水号=${params[8]}&仓库流水号=${params[9]}&出库类别=${params[10]}`
+      name: '库存管理_物料出库_出库记录_增加数据_循环',
+      param: `领料单明细水号组=${params[0]}&基本件流水号组=${params[1]}&物料流水号组=${params[2]}&标准件和外购件流水号组=${params[3]}&请购单明细流水号组=${params[4]}&组件流水号组=${params[5]}&机床流水号组=${params[6]}&出库数量组=${params[7]}&出库人流水号=${params[8]}&领料人编号=${params[9]}&出库类别=${params[10]}&领料单流水号=${params[11]}`
     }
   })
 }
diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue
index 7c7a2d3a..ec1b61e9 100644
--- a/src/views/Inventory/CreatePickingList/index.vue
+++ b/src/views/Inventory/CreatePickingList/index.vue
@@ -21,12 +21,28 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
+        <span>名称:</span>
+        <el-input v-model="Name" placeholder="名称" clearable size="small"/>
+        <span>领料情况:</span>
+        <el-select v-model="PickingValue" placeholder="领料情况" size="small" clearable>
+          <el-option
+            v-for="item in Picking"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
         <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent0=1;pageSize0=20;pageCurrent1=1;pageSize1=20;pageCurrent2=1;pageSize2=20;searchTable()">查询</el-button>
       </div>
       <el-tabs v-model="PartType" type="card" @tab-click="searchTable()">
         <el-tab-pane label="标准件" name="标准件">
           <el-table ref="multipleTable" :data="tableData0" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50"/>
+            <el-table-column align="center" label="采购情况" min-width="80px">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.领料单编号==='' || scope.row.领料单编号===null" type="warning" size="small">未领</el-tag>
+                <el-tag v-else type="primary" size="small">已领</el-tag>
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="机床图号" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
@@ -67,6 +83,11 @@
                 {{ scope.row.备件总数量 }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="领料单编号" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.领料单编号 }}
+              </template>
+            </el-table-column>
           </el-table>
           <div class="block" style="float:right;">
             <el-pagination
@@ -83,6 +104,12 @@
         <el-tab-pane label="外购件" name="外购件">
           <el-table ref="multipleTable" :data="tableData1" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50"/>
+            <el-table-column align="center" label="采购情况" min-width="80px">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.领料单编号==='' || scope.row.领料单编号===null" type="warning" size="small">未领</el-tag>
+                <el-tag v-else type="primary" size="small">已领</el-tag>
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="机床图号" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
@@ -118,6 +145,11 @@
                 {{ scope.row.备件总数量 }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="领料单编号" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.领料单编号 }}
+              </template>
+            </el-table-column>
           </el-table>
           <div class="block" style="float:right;">
             <el-pagination
@@ -134,6 +166,12 @@
         <el-tab-pane label="基本件" name="基本件">
           <el-table ref="multipleTable" :data="tableData2" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50"/>
+            <el-table-column align="center" label="采购情况" min-width="80px">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.领料单编号==='' || scope.row.领料单编号===null" type="warning" size="small">未领</el-tag>
+                <el-tag v-else type="primary" size="small">已领</el-tag>
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="机床图号" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
@@ -174,6 +212,11 @@
                 {{ scope.row.备件总数量 }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="领料单编号" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.领料单编号 }}
+              </template>
+            </el-table-column>
           </el-table>
           <div class="block" style="float:right;">
             <el-pagination
@@ -292,7 +335,7 @@
         </el-table-column>
         <el-table-column label="已领数量" align="center" min-width="70">
           <template slot-scope="scope">
-            {{ scope.row.出库数量 }}
+            {{ scope.row.出库数量1 }}
           </template>
         </el-table-column>
         <el-table-column v-if="true" label="备料确认" align="center" width="100">
@@ -303,13 +346,35 @@
         </el-table-column>
         <el-table-column v-if="true" label="领料确认" align="center" width="100">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否领料确认)===1" type="success" size="mini">已领料</el-tag>
-            <el-tag v-else type="warning" size="mini">未领料</el-tag>
+            <el-tag v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领料</el-tag>
+            <el-tag v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">未领完</el-tag>
+            <el-tag v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领料</el-tag>
           </template>
         </el-table-column>
-        <el-table-column v-if="true" label="操作" align="center" width="100">
+        <el-table-column v-if="true" label="操作" align="center" width="230">
           <template slot-scope="scope">
-            <el-button :disabled="!!scope.row.是否出库 || Number(scope.row.是否领料确认)===1" size="mini" plain type="danger" icon="el-icon-delete" @click="dropListDetail(scope.row)">删除</el-button>
+            <el-popover placement="right" width="500" trigger="click">
+              <el-table :data="gridData" highlight-current-row size="mini" show-summary>
+                <el-table-column width="50" align="center" type="index" label="序号"/>
+                <el-table-column min-width="100" align="center" label="姓名">
+                  <template slot-scope="scope">
+                    {{ scope.row.姓名 }}
+                  </template>
+                </el-table-column>
+                <el-table-column min-width="150" align="center" label="领料时间">
+                  <template slot-scope="scope">
+                    {{ scope.row.操作日期 }}
+                  </template>
+                </el-table-column>
+                <el-table-column min-width="100" align="center" label="数量" prop="出库数量">
+                  <template slot-scope="scope">
+                    {{ scope.row.出库数量 }}
+                  </template>
+                </el-table-column>
+              </el-table>
+              <el-button slot="reference" type="primary" size="mini" icon="el-icon-search" plain @click="searchTable02(scope.row)">查看详情</el-button>
+            </el-popover>
+            <el-button :disabled="!!scope.row.是否出库 || Number(scope.row.是否领料确认)===1" size="mini" plain type="danger" icon="el-icon-delete" style="margin-left: 10px" @click="dropListDetail(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -339,7 +404,7 @@
 </template>
 
 <script>
-import { initPickPerson, initMachineProject, searchgroup, searchTable, searchList, createList, dropList, selectIntoList, searchListDetail, dropListDetail } from '@/api/Inventory/CreatePickingList'
+import { initPickPerson, initMachineProject, searchgroup, searchTable, searchList, createList, dropList, selectIntoList, searchListDetail, dropListDetail, searchListDetailMX } from '@/api/Inventory/CreatePickingList'
 import request from '@/utils/request'
 import { mapGetters } from 'vuex'
 export default {
@@ -349,6 +414,16 @@ export default {
       PartType: '基本件',
       machineNumberValue: '',
       machineNumber: [],
+      PickingValue: '',
+      Picking: [{
+        value: 0,
+        label: '未领'
+      }, {
+        value: 1,
+        label: '已领'
+      }],
+      Name: '',
+      gridData: [],
       groupNumberValue: '',
       groupNumber: [],
       tableData0: [],
@@ -472,34 +547,43 @@ export default {
     },
     // 标准件
     searchTable0() {
-      let check1, check2
+      let check1, check2, check3
       this.machineNumberValue ? check1 = 1 : check1 = 0
       this.groupNumberValue ? check2 = 1 : check2 = 0
-      searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1).then(response => {
+      this.Name ? check3 = 1 : check3 = 0
+      searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, this.pageCurrent0, this.pageSize0, 1).then(response => {
+        console.log(response.data.rows)
         this.tableData0 = response.data.rows
         this.total0 = response.data.total
       })
     },
     // 外购件
     searchTable1() {
-      let check1, check2
+      let check1, check2, check3
       this.machineNumberValue ? check1 = 1 : check1 = 0
       this.groupNumberValue ? check2 = 1 : check2 = 0
-      searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2).then(response => {
+      this.Name ? check3 = 1 : check3 = 0
+      searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, this.pageCurrent1, this.pageSize1, 2).then(response => {
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
       })
     },
     // 基本件
     searchTable2() {
-      let check1, check2
+      let check1, check2, check3
       this.machineNumberValue ? check1 = 1 : check1 = 0
       this.groupNumberValue ? check2 = 1 : check2 = 0
-      searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, 3).then(response => {
+      this.Name ? check3 = 1 : check3 = 0
+      searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, this.pageCurrent2, this.pageSize2, 3).then(response => {
         this.tableData2 = response.data.rows
         this.total2 = response.data.total
       })
     },
+    searchTable02(row) {
+      searchListDetailMX(row.领料单流水号, row.基本件流水号, row.标准件和外购件流水号).then(response => {
+        this.gridData = response.data
+      })
+    },
     handleSizeChange0(val) {
       this.pageSize0 = val
       this.pageCurrent0 = 1
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index 5b78fece..012c55c8 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -55,11 +55,11 @@
           <h4>领料单明细：{{ pickingListNumberShow }}</h4>
         </el-col>
         <el-col style="float:left;width: 200px;margin-top:15px">
-          <el-button :disabled="multipleSelection.length===0" size="small" type="warning" @click="prepareConfirm()">备料确认</el-button>
-          <el-button :disabled="multipleSelection.length===0" size="small" type="primary" @click="inputPassword()">领料确认</el-button>
+          <el-button :disabled="SELECTION.length===0" size="small" type="warning" @click="prepareConfirm()">备料确认</el-button>
+          <el-button :disabled="SELECTION.length===0" size="small" type="primary" @click="inputPassword()">领料确认</el-button>
         </el-col>
       </el-row>
-      <el-table :data="pickListTable2" highlight-current-row stripe border style="width: 100%;" size="mini" height="400" @row-click="clickListDetail" @selection-change="handleSelectionChange">
+      <el-table :data="pickListTable2" highlight-current-row stripe border style="width: 100%;" size="mini" height="400" @selection-change="handleSelectionChange">
         <el-table-column type="selection" align="center" width="55"/>
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="名称" align="center" min-width="100">
@@ -97,14 +97,19 @@
             {{ scope.row.备件数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="已领数量" align="center" min-width="50">
+        <el-table-column label="货位存量" align="center" min-width="50">
           <template slot-scope="scope">
-            {{ scope.row.出库数量 }}
+            {{ scope.row.请购单明细流水号 ? scope.row.货位存量 : scope.row.货位存量1 }}
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" width="200">
+        <el-table-column label="已领数量" align="center" min-width="50">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.备注" size="mini" @change="UpdateRemark(scope.row)"/>
+            {{ scope.row.出库数量1 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="出库数量" align="center" width="200">
+          <template slot-scope="scope">
+            <el-input-number v-model="scope.row.出库数量" size="mini"/>
           </template>
         </el-table-column>
         <el-table-column v-if="true" label="备料确认" align="center" width="100">
@@ -115,8 +120,9 @@
         </el-table-column>
         <el-table-column v-if="true" label="领料确认" align="center" width="100">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否领料确认)===1" size="mini" type="success">已领料</el-tag>
-            <el-tag v-else type="warning" size="mini">未领料</el-tag>
+            <el-tag v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领料</el-tag>
+            <el-tag v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">未领完</el-tag>
+            <el-tag v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领料</el-tag>
           </template>
         </el-table-column>
         <!--<el-table-column label="操作" align="center" width="100" fixed="right">-->
@@ -127,65 +133,64 @@
       </el-table>
     </el-card>
 
-    <el-card>
-      <el-row>
-        <el-col :span="12">
-          <h4 style="margin-top:0">物料货位数量信息</h4>
-        </el-col>
-        <el-col :span="12">
-          占用数量：{{ 占用数量 }}
-        </el-col>
-      </el-row>
-      <el-table :data="StockNumberTable" border stripe style="width: 100%;" size="mini" height="300" show-summary>
-        <el-table-column label="序号" align="center" type="index" width="50"/>
-        <el-table-column label="名称" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.物料名称 || scope.row.零件名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="图号或型号" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.物料型号 || scope.row.零件图号 || '—' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="规格" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.物料规格 || scope.row.规格 || '—' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="仓库名称" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.仓库名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="货位名称" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.货位名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="货位存量" align="center" min-width="70" prop="货位存量">
-          <template slot-scope="scope">
-            {{ scope.row.货位存量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="机床图号" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.机床图号 || '—' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="组号" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.组号 || '—' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="200px">
-          <template slot-scope="scope" align="center">
-            <el-button :disabled="审批未通过" size="mini" type="primary" @click="outStore(scope.row)">出库</el-button>
-            <el-button :disabled="审批未通过" size="mini" type="warning" @click="errorRecord(scope.row)">异常记录</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
+    <!--<el-card>-->
+    <!--<el-row>-->
+    <!--<el-col :span="12">-->
+    <!--<h4 style="margin-top:0">物料货位数量信息</h4>-->
+    <!--</el-col>-->
+    <!--<el-col :span="12">-->
+    <!--占用数量：{{ 占用数量 }}-->
+    <!--</el-col>-->
+    <!--</el-row>-->
+    <!--<el-table :data="StockNumberTable" border stripe style="width: 100%;" size="mini" height="300" show-summary>-->
+    <!--<el-table-column label="序号" align="center" type="index" width="50"/>-->
+    <!--<el-table-column label="名称" align="center" min-width="100">-->
+    <!--<template slot-scope="scope">-->
+    <!--{{ scope.row.物料名称 || scope.row.零件名称 }}-->
+    <!--</template>-->
+    <!--</el-table-column>-->
+    <!--<el-table-column label="图号或型号" align="center" min-width="100">-->
+    <!--<template slot-scope="scope">-->
+    <!--{{ scope.row.物料型号 || scope.row.零件图号 || '—' }}-->
+    <!--</template>-->
+    <!--</el-table-column>-->
+    <!--<el-table-column label="规格" align="center" min-width="100">-->
+    <!--<template slot-scope="scope">-->
+    <!--{{ scope.row.物料规格 || scope.row.规格 || '—' }}-->
+    <!--</template>-->
+    <!--</el-table-column>-->
+    <!--<el-table-column label="仓库名称" align="center" min-width="70">-->
+    <!--<template slot-scope="scope">-->
+    <!--{{ scope.row.仓库名称 }}-->
+    <!--</template>-->
+    <!--</el-table-column>-->
+    <!--<el-table-column label="货位名称" align="center" min-width="70">-->
+    <!--<template slot-scope="scope">-->
+    <!--{{ scope.row.货位名称 }}-->
+    <!--</template>-->
+    <!--</el-table-column>-->
+    <!--<el-table-column label="货位存量" align="center" min-width="70" prop="货位存量">-->
+    <!--<template slot-scope="scope">-->
+    <!--{{ scope.row.货位存量 }}-->
+    <!--</template>-->
+    <!--</el-table-column>-->
+    <!--<el-table-column label="机床图号" align="center" min-width="100">-->
+    <!--<template slot-scope="scope">-->
+    <!--{{ scope.row.机床图号 || '—' }}-->
+    <!--</template>-->
+    <!--</el-table-column>-->
+    <!--<el-table-column label="组号" align="center" min-width="70">-->
+    <!--<template slot-scope="scope">-->
+    <!--{{ scope.row.组号 || '—' }}-->
+    <!--</template>-->
+    <!--</el-table-column>-->
+    <!--<el-table-column label="操作" align="center" width="200px">-->
+    <!--<template slot-scope="scope" align="center">-->
+    <!--<el-button :disabled="审批未通过" size="mini" type="primary" @click="outStore(scope.row)">出库</el-button>-->
+    <!--<el-button :disabled="审批未通过" size="mini" type="warning" @click="errorRecord(scope.row)">异常记录</el-button>-->
+    <!--</template>-->
+    <!--</el-table-column>-->
+    <!--</el-table>--><!--</el-card>-->
 
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="物料出库" center width="380px">
       <el-form ref="form1" :model="form1" :rules="rules1" label-position="left">
@@ -255,16 +260,22 @@
 
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="领料确认" center width="380px">
       <el-form ref="form3" :model="form3" :rules="rules3" label-position="left">
-        <el-form-item label="领料人" prop="personName" label-width="100px" size="small">
-          <el-input v-model="form3.personName" readonly size="small" placeholder="领料人" style="width: 200px"/>
+        <el-form-item label="出库类别" prop="outTypeValue" label-width="100px">
+          <el-select v-model="form3.outTypeValue" size="small" placeholder="出库类别" style="width: 200px;margin-right:10px">
+            <el-option
+              v-for="item in outType"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
         </el-form-item>
-        <el-form-item label="密码" prop="password" label-width="100px" size="small">
-          <el-input v-model="form3.password" size="small" placeholder="密码" style="width: 200px"/>
+        <el-form-item label="人员编号" prop="password" label-width="100px" size="small">
+          <el-input v-model="form3.password" size="small" placeholder="人员编号" style="width: 200px"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible3=false">取消</el-button>
-        <el-button type="primary" @click="pickConfirm()">确 定</el-button>
+        <el-button type="primary" @click="pickConfirm1()">确 定</el-button>
       </div>
     </el-dialog>
 
@@ -340,7 +351,7 @@ export default {
         货位流水号: ''
       },
       form3: {
-        personName: '',
+        outTypeValue: '',
         password: ''
       },
       form4: {
@@ -360,7 +371,8 @@ export default {
         reason: [{ required: true, message: '请输入' }]
       },
       rules3: {
-        password: [{ required: true, message: '请输入' }]
+        password: [{ required: true, message: '请输入' }],
+        outTypeValue: [{ required: true, message: '请选择' }]
       },
       rules4: {
         仓库流水号: [{ required: true, message: '请输入' }],
@@ -370,15 +382,16 @@ export default {
       machine: [],
       group: [],
       person: [],
-      materialNum: '', // 中间变量物料流水号
-      machineValue: '', // 中间变量机床流水号
-      groupNumValue: '', // 中间变量组件流水号
-      basePartNum: '', // 中间变量基本件流水号
-      purchaseBillNum: '', // 中间变量请购单明细流水号
-      parchasePartNum: '', // 中间变量标准件和外购件流水号
+      SELECTION: [],
+      materialNum: [], // 中间变量物料流水号
+      machineValue: [], // 中间变量机床流水号
+      groupNumValue: [], // 中间变量组件流水号
+      basePartNum: [], // 中间变量基本件流水号
+      purchaseBillNum: [], // 中间变量请购单明细流水号
+      parchasePartNum: [], // 中间变量标准件和外购件流水号
       inventoryNum: '', // 中间变量仓库流水号
       locationNum: '', // 中间变量货位流水号
-      outNumber: 0, // 中间变量出库数量
+      outNumber: [], // 中间变量出库数量
       inventoryName: [],
       locateName: [],
       物料流水号: '',
@@ -476,13 +489,6 @@ export default {
         }
       })
     },
-    // 多选
-    handleSelectionChange(val) {
-      this.multipleSelection = []
-      val.map(v => {
-        this.multipleSelection.push(v.领料单明细流水号)
-      })
-    },
     // 备料确认
     prepareConfirm() {
       this.$confirm('是否备料确认?', '提示', {
@@ -629,12 +635,39 @@ export default {
         this.pickListTable2 = res.data
       })
     },
+    // 多选
+    handleSelectionChange(val) {
+      console.log(val)
+      this.SELECTION = val
+    },
+    // 提交领料确认
+    pickConfirm1() {
+      for (let i = 0; i < this.SELECTION.length; i++) {
+        this.multipleSelection.push(this.SELECTION[i].领料单明细流水号)
+        this.basePartNum.push(this.SELECTION[i].基本件流水号)
+        this.materialNum.push(this.SELECTION[i].物料流水号)
+        this.parchasePartNum.push(this.SELECTION[i].标准件和外购件流水号)
+        this.purchaseBillNum.push(this.SELECTION[i].请购单明细流水号)
+        this.groupNumValue.push(this.SELECTION[i].组件流水号)
+        this.machineValue.push(this.SELECTION[i].机床流水号)
+        this.outNumber.push(this.SELECTION[i].出库数量)
+      }
+      submitOutStore(this.multipleSelection, this.basePartNum, this.materialNum, this.parchasePartNum, this.purchaseBillNum, this.groupNumValue, this.machineValue, this.outNumber, this.id, this.form3.password, this.form3.outTypeValue, this.pickingListNum).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('出库成功')
+          this.dialogFormVisible3 = false
+          searchListDetail(this.pickingListNum).then(res => {
+            this.pickListTable2 = res.data
+          })
+        } else { this.$message.error('操作失败') }
+      })
+    },
     // 查看领料单明细相关的物料货位数量
     clickListDetail(row) {
       row && row.基本件流水号 ? (this.basePartNum = row.基本件流水号, this.materialNum = null, this.parchasePartNum = null, this.purchaseBillNum = null) : this.basePartNum
       row && row.物料流水号 ? (this.materialNum = row.物料流水号, this.basePartNum = null, this.purchaseBillNum = null) : this.materialNum
       row && row.标准件和外购件流水号 ? (this.parchasePartNum = row.标准件和外购件流水号, this.basePartNum = null, this.purchaseBillNum = null) : this.parchasePartNum
-      row && row.请购单明细流水号 ? (this.purchaseBillNum = row.请购单明细流水号, this.basePartNum = null, this.materialNum = null, this.parchasePartNum = null) : this.parchasePartNum
+      row && row.请购单明细流水号 ? (this.purchaseBillNum = row.请购单明细流水号, this.basePartNum = null, this.materialNum = null, this.parchasePartNum = null) : this.purchaseBillNum
       row && row.机床流水号 ? this.machineValue = row.机床流水号 : this.machineValue
       row && row.组件流水号 ? this.groupNumValue = row.组件流水号 : this.groupNumValue
       row && row.总数量 ? this.outNumber = row.总数量 : this.outNumber
@@ -642,112 +675,14 @@ export default {
         searchStockNumber1(this.materialNum).then(res => {
           this.StockNumberTable = res.data
         })
-        const param = {
-          url: '',
-          method: 'post',
-          data: {
-            type: '3',
-            name: `select 物料名称
-                  ,物料规格
-                  ,物料型号
-                  ,sum(零件数量 * 机床数量) as 占用数量
-                  ,PDM_零件明细表_标准件和外购件.物料流水号
-                  from PDM_零件明细表_标准件和外购件
-                  inner join PDM_组件名称 on PDM_零件明细表_标准件和外购件.组件流水号 = PDM_组件名称.组件流水号
-                  inner join PDM_机床名称 on PDM_组件名称.机床流水号 = PDM_机床名称.机床流水号
-                  inner join 库存管理_物料主文件_基本 on PDM_零件明细表_标准件和外购件.物料流水号 = 库存管理_物料主文件_基本.物料流水号
-                  inner join 车间装配管理_领料单明细 on PDM_零件明细表_标准件和外购件.标准件和外购件流水号 = 车间装配管理_领料单明细.标准件和外购件流水号
-                  where 是否备料确认 = 1 and 是否领料确认 = 0 and PDM_零件明细表_标准件和外购件.物料流水号 = ${this.materialNum}
-                  group by 物料名称
-                  ,物料规格
-                  ,物料型号
-                  ,PDM_零件明细表_标准件和外购件.物料流水号`
-          }
-        }
-        request(param).then(res => {
-          if (res.data.length > 0) {
-            this.占用数量 = res.data[0].占用数量
-          } else {
-            this.占用数量 = 0
-          }
-        })
       } else if (this.basePartNum) {
         searchStockNumber2(this.basePartNum).then(res => {
           this.StockNumberTable = res.data
         })
-        const param = {
-          url: '',
-          method: 'post',
-          data: {
-            type: '3',
-            name: `select 零件名称,零件图号,规格,材料,sum(零件数量 * 机床数量) as 占用数量,PDM_零件明细表_基本件.基本件流水号
-            from PDM_零件明细表_基本件 inner join PDM_组件名称 on PDM_零件明细表_基本件.组件流水号 = PDM_组件名称.组件流水号
-            inner join PDM_机床名称 on PDM_组件名称.机床流水号 = PDM_机床名称.机床流水号
-            inner join PDM_零件明细表_材料 on PDM_零件明细表_基本件.材料流水号 = PDM_零件明细表_材料.材料流水号
-            inner join 车间装配管理_领料单明细 on PDM_零件明细表_基本件.基本件流水号 = 车间装配管理_领料单明细.基本件流水号
-            where 是否备料确认 = 1 and 是否领料确认 = 0 and 车间装配管理_领料单明细.基本件流水号 = ${this.basePartNum}
-            group by 零件名称,零件图号,规格,材料,PDM_零件明细表_基本件.基本件流水号`
-          }
-        }
-        request(param).then(res => {
-          if (res.data.length > 0) {
-            this.占用数量 = res.data[0].占用数量
-          } else {
-            this.占用数量 = 0
-          }
-        })
       } else if (this.purchaseBillNum) {
         searchStockNumber3(this.purchaseBillNum).then(res => {
           this.StockNumberTable = res.data
         })
-        const param = {
-          url: '',
-          method: 'post',
-          data: {
-            type: '3',
-            name: `select
-                  库存管理_物料出库_车间采购_基本件_查询视图.基本件流水号
-                  ,库存管理_物料出库_车间采购_基本件_查询视图.零件图号
-                  ,库存管理_物料出库_车间采购_基本件_查询视图.零件名称
-                  ,库存管理_物料出库_车间采购_基本件_查询视图.规格
-                  ,sum(零件数量 * 机床数量) as 占用数量
-                  from 库存管理_物料出库_车间采购_基本件_查询视图
-                  inner join PDM_零件明细表_基本件 on 库存管理_物料出库_车间采购_基本件_查询视图.基本件流水号 = PDM_零件明细表_基本件.基本件流水号
-                  inner join PDM_组件名称 on PDM_零件明细表_基本件.组件流水号 = PDM_组件名称.组件流水号
-                  inner join PDM_机床名称 on PDM_组件名称.机床流水号 = PDM_机床名称.机床流水号
-                  where 请购单明细流水号 = ${this.purchaseBillNum}
-                  group by 库存管理_物料出库_车间采购_基本件_查询视图.基本件流水号
-                  ,库存管理_物料出库_车间采购_基本件_查询视图.零件图号
-                  ,库存管理_物料出库_车间采购_基本件_查询视图.零件名称
-                  ,库存管理_物料出库_车间采购_基本件_查询视图.规格
-
-                  union
-
-                  select
-                  库存管理_物料出库_车间采购_标准件和外购件_查询视图.物料流水号
-                  ,库存管理_物料出库_车间采购_标准件和外购件_查询视图.物料型号 as 零件图号
-                  ,库存管理_物料出库_车间采购_标准件和外购件_查询视图.物料名称 as 零件名称
-                  ,库存管理_物料出库_车间采购_标准件和外购件_查询视图.物料规格 as 规格
-                  ,sum(零件数量 * 机床数量) as 占用数量
-                  from 库存管理_物料出库_车间采购_标准件和外购件_查询视图
-                  inner join PDM_零件明细表_标准件和外购件 on PDM_零件明细表_标准件和外购件.物料流水号 = 库存管理_物料出库_车间采购_标准件和外购件_查询视图.物料流水号
-                  inner join PDM_组件名称 on 库存管理_物料出库_车间采购_标准件和外购件_查询视图.组件流水号 = PDM_组件名称.组件流水号
-                  inner join PDM_机床名称 on PDM_组件名称.机床流水号 = PDM_机床名称.机床流水号
-                  inner join 库存管理_物料主文件_基本 on 库存管理_物料出库_车间采购_标准件和外购件_查询视图.物料流水号 = 库存管理_物料主文件_基本.物料流水号
-                  where 请购单明细流水号 = ${this.purchaseBillNum}
-                  group by 库存管理_物料出库_车间采购_标准件和外购件_查询视图.物料流水号
-                  ,库存管理_物料出库_车间采购_标准件和外购件_查询视图.物料型号
-                  ,库存管理_物料出库_车间采购_标准件和外购件_查询视图.物料名称
-                  ,库存管理_物料出库_车间采购_标准件和外购件_查询视图.物料规格`
-          }
-        }
-        request(param).then(res => {
-          if (res.data.length > 0) {
-            this.占用数量 = res.data[0].占用数量
-          } else {
-            this.占用数量 = 0
-          }
-        })
       }
     },
     // 出库
diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
index 3fa952ee..eb372cbd 100644
--- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
+++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
@@ -341,6 +341,9 @@ export default {
       }, {
         label: '合同模板2',
         value: 2
+      }, {
+        label: '采购计划',
+        value: 3
       }],
       contractValue: 1,
       contractNum: [], // 合同号
diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
index 7879b4d3..5415f9bc 100644
--- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
@@ -90,7 +90,7 @@
 
     <el-card>
       <div style="width:60%;margin-left: 18%">
-        <el-card>
+        <el-card v-show="type==='1' || type==='2'">
           <table id="1" cellspacing="0px" align="center" border width="100%" style="">
             <tr style="height: 40px">
               <td colspan="2" align="center" style="font-weight: bold">GAOJING</td>
@@ -215,6 +215,49 @@
           <div style="line-height: 25px;margin-top: 10px">签订时间：____年__月__日</div>
           <div style="line-height: 25px">有效期限：____年__月__日至____年__月__日</div>
         </el-card>
+        <el-card v-show="type==='3'">
+          <table cellspacing="0px" align="center" border="1 solid black" width="100%">
+            <tr style="height: 60px">
+              <th colspan="14"><h3>江苏高精机电装备有限公司</h3></th>
+            </tr>
+            <tr style="height: 40px">
+              <th colspan="14"><h4>{{ 采购合同名称 }}</h4></th>
+            </tr>
+            <tr style="height: 40px">
+              <td colspan="2" style="text-align: center;width: 15%">下单单位</td>
+              <td colspan="5" style="text-align: center;width: 35%">{{ supplier }}</td>
+              <td colspan="2" style="text-align: center;width: 15%">单号</td>
+              <td colspan="5" style="text-align: center;width: 35%">{{ contract }}</td>
+            </tr>
+            <tr style="height: 40px">
+              <td colspan="2" style="text-align: center;width: 15%">下单日期</td>
+              <td colspan="5" style="text-align: center;width: 35%">{{ 操作日期 }}</td>
+              <td colspan="2" style="text-align: center;width: 15%">计划完成日期</td>
+              <td colspan="5" style="text-align: center;width: 35%">{{ 规定到货时间 }}</td>
+            </tr>
+          </table>
+          <table cellspacing="0px" align="center" border="1 solid black" width="100%" style="margin-top: 0px">
+            <tr id="tablehead10" style="height: 35px">
+              <td style="text-align: center;width: 7%">序号</td>
+              <td colspan="2" style="text-align: center;width: 20%">物料编码</td>
+              <td colspan="2" style="text-align: center;width: 10%">名称</td>
+              <td colspan="2" style="text-align: center;width: 10%">材料</td>
+              <td colspan="2" style="text-align: center;width: 8%">单位</td>
+              <td colspan="2" style="text-align: center;width: 8%">数量</td>
+              <td colspan="2" style="text-align: center;width: 17%">备注</td>
+            </tr>
+            <tr v-for="(list, index) in returns" :key="index" style="height: 35px">
+              <td style="text-align: center;width: 7%">{{ index + 1 }}</td>
+              <td colspan="2" style="text-align: center;width: 20%">{{ list.图号 }}</td>
+              <td colspan="2" style="text-align: center;width: 10%">{{ list.物料名称 }}</td>
+              <td colspan="2" style="text-align: center;width: 10%">{{ list.规格 }}</td>
+              <td colspan="2" style="text-align: center;width: 8%">{{ list.单位 }}</td>
+              <td colspan="2" style="text-align: center;width: 8%">{{ list.数量 }}</td>
+              <td colspan="2" style="text-align: center;width: 17%">{{ list.备注 }}</td>
+            </tr>
+          </table>
+          <div style="margin-top: 20px">联系人:___________ 联系电话:___________ </div>
+        </el-card>
       </div>
     </el-card>
 
@@ -278,6 +321,7 @@
 
 <script>
 import { initContract, initBuyer, searchTable1, searchTable2, submitApproval } from '@/api/WorkshopProcurement/ProcurementContractApproval'
+import $ from 'jquery'
 import QRCode from 'qrcode'
 
 export default {
@@ -290,6 +334,9 @@ export default {
       check3: 0,
       check4: 0,
       startEndDate: '',
+      采购合同名称: '',
+      规定到货时间: '',
+      操作日期: '',
       contract: '',
       contractNumValue: '',
       contractNum: [],
@@ -436,57 +483,72 @@ export default {
     },
     searchTable2(row) {
       this.type = row.模板类型
-      console.log(row)
+      console.log(this.type)
+      this.规定到货时间 = row.规定到货时间
+      this.操作日期 = row.操作日期
+      this.采购合同名称 = row.采购合同名称
       this.textarea = row.合同文本
       this.supplier = row.供应商名称
       this.contract = row.采购合同编号
       this.taxRate = row.税率
       this.RMB = row.总金额_文本
-      this.TotalAmount = row.总金额
-      this.TotalAmount1 = parseInt((row.含税总金额) * 100) / 100
-      this.RMB1 = row.含税总金额_文本
-      document.getElementById('23').innerText = this.textarea
-      this.contractValue = parseInt(row.采购合同流水号)
-      const opts = {
-        errorCorrectionLevel: 'H',
-        type: 'image/jpeg',
-        rendererOpts: {
-          quality: 0.3
-        }
+      if (row.总金额 === '0') {
+        this.TotalAmount = ''
+        this.TotalAmount1 = ''
+      } else {
+        this.TotalAmount = row.总金额
+        this.TotalAmount1 = parseInt((row.含税总金额) * 100) / 100
       }
-      QRCode.toDataURL(row.采购合同流水号, opts, function(err, url) {
-        if (err) throw err
-        const img = document.getElementById('img')
-        img.src = url
-      })
-      searchTable2(this.contractValue).then(response => {
-        this.returns = response.data
-        const children = document.getElementsByClassName('tableData')
-        const parent = document.getElementById('4')
-        if (children.length !== 0) {
-          for (let i = children.length - 1; i >= 0; i--) {
-            parent.removeChild(children[i])
+      this.RMB1 = row.含税总金额_文本
+      if (this.type === '1' || this.type === '2') {
+        document.getElementById('23').innerText = this.textarea
+        this.contractValue = parseInt(row.采购合同流水号)
+        const opts = {
+          errorCorrectionLevel: 'H',
+          type: 'image/jpeg',
+          rendererOpts: {
+            quality: 0.3
           }
         }
-        const tr = []
-        for (let i = 0; i < this.returns.length; i++) {
-          tr[i] = document.createElement('tr')
-          tr[i].setAttribute('class', 'tableData')
-          tr[i].innerHTML = '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
-            '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
-          document.getElementById('tableHead').after(tr[i])
-        }
-        for (let j = 0; j < this.returns.length; j++) {
-          document.getElementsByClassName('tableData')[j].children[0].innerHTML = response.data[j].图号
-          document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].物料名称
-          document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].规格
-          document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
-          document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].备注
-          document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData')[j].children[7].innerHTML = response.data[j].金额
-        }
-      })
+        QRCode.toDataURL(row.采购合同流水号, opts, function(err, url) {
+          if (err) throw err
+          const img = document.getElementById('img')
+          img.src = url
+        })
+        searchTable2(this.contractValue).then(response => {
+          this.returns = response.data
+          const children = document.getElementsByClassName('tableData')
+          const parent = document.getElementById('4')
+          if (children.length !== 0) {
+            for (let i = children.length - 1; i >= 0; i--) {
+              parent.removeChild(children[i])
+            }
+          }
+          const tr = []
+          for (let i = 0; i < this.returns.length; i++) {
+            tr[i] = document.createElement('tr')
+            tr[i].setAttribute('class', 'tableData')
+            tr[i].innerHTML = '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
+              '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
+            $('#tableHead').after(tr[i])
+          }
+          for (let j = 0; j < this.returns.length; j++) {
+            document.getElementsByClassName('tableData')[j].children[0].innerHTML = response.data[j].图号
+            document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].物料名称
+            document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].规格
+            document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
+            document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].备注
+            document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].数量
+            document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].单价
+            document.getElementsByClassName('tableData')[j].children[7].innerHTML = response.data[j].金额
+          }
+        })
+      } else {
+        this.contractValue = parseInt(row.采购合同流水号)
+        searchTable2(this.contractValue).then(response => {
+          this.returns = response.data
+        })
+      }
     }
   }
 }
diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
index 88d89b5c..ee0d84a3 100644
--- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
@@ -111,11 +111,11 @@
     <el-card>
       <div style="width:900px;margin-left: 350px">
         <el-card>
-          <div id="export">
+          <div v-show="type==='1' || type==='2'" id="export">
             <table id="1" cellspacing="0px" align="center" border width="100%" style="">
               <tr style="height: 40px">
                 <td colspan="2" align="center" style="font-weight: bold">GAOJING</td>
-                <td colspan="5" align="center" style="font-weight: bold">产品销售合同</td>
+                <td colspan="5" align="center" style="font-weight: bold">{{ 采购合同名称 }}</td>
                 <td colspan="1" rowspan="3" style="width: 119px"><img id="img" alt=""></td>
               </tr>
               <tr style="height: 40px">
@@ -237,6 +237,49 @@
             <div style="line-height: 25px;margin-top: 10px">签订时间：____年__月__日</div>
             <div style="line-height: 25px">有效期限：____年__月__日至____年__月__日</div>
           </div>
+          <div v-show="type === '3'" id="WGBLD" style="width: 880px;margin: 0 auto">
+            <table cellspacing="0px" align="center" border="1 solid black" width="100%">
+              <tr style="height: 60px">
+                <th colspan="14"><h3>江苏高精机电装备有限公司</h3></th>
+              </tr>
+              <tr style="height: 40px">
+                <th colspan="14"><h4>{{ 采购合同名称 }}</h4></th>
+              </tr>
+              <tr style="height: 40px">
+                <td colspan="2" style="text-align: center;width: 15%">下单单位</td>
+                <td colspan="5" style="text-align: center;width: 35%">{{ supplier }}</td>
+                <td colspan="2" style="text-align: center;width: 15%">单号</td>
+                <td colspan="5" style="text-align: center;width: 35%">{{ contract }}</td>
+              </tr>
+              <tr style="height: 40px">
+                <td colspan="2" style="text-align: center;width: 15%">下单日期</td>
+                <td colspan="5" style="text-align: center;width: 35%">{{ 操作日期 }}</td>
+                <td colspan="2" style="text-align: center;width: 15%">计划完成日期</td>
+                <td colspan="5" style="text-align: center;width: 35%">{{ 规定到货时间 }}</td>
+              </tr>
+            </table>
+            <table cellspacing="0px" align="center" border="1 solid black" width="100%" style="margin-top: 0px">
+              <tr id="tablehead10" style="height: 35px">
+                <td style="text-align: center;width: 7%">序号</td>
+                <td colspan="2" style="text-align: center;width: 20%">物料编码</td>
+                <td colspan="2" style="text-align: center;width: 10%">名称</td>
+                <td colspan="2" style="text-align: center;width: 10%">材料</td>
+                <td colspan="2" style="text-align: center;width: 8%">单位</td>
+                <td colspan="2" style="text-align: center;width: 8%">数量</td>
+                <td colspan="2" style="text-align: center;width: 17%">备注</td>
+              </tr>
+              <tr v-for="(list, index) in returns" :key="index" style="height: 35px">
+                <td style="text-align: center;width: 7%">{{ index + 1 }}</td>
+                <td colspan="2" style="text-align: center;width: 20%">{{ list.图号 }}</td>
+                <td colspan="2" style="text-align: center;width: 10%">{{ list.物料名称 }}</td>
+                <td colspan="2" style="text-align: center;width: 10%">{{ list.规格 }}</td>
+                <td colspan="2" style="text-align: center;width: 8%">{{ list.单位 }}</td>
+                <td colspan="2" style="text-align: center;width: 8%">{{ list.数量 }}</td>
+                <td colspan="2" style="text-align: center;width: 17%">{{ list.备注 }}</td>
+              </tr>
+            </table>
+            <div style="margin-top: 20px">联系人:___________ 联系电话:___________ </div>
+          </div>
         </el-card>
       </div>
     </el-card>
@@ -300,6 +343,9 @@ export default {
         value: 3,
         label: '未审批'
       }],
+      采购合同名称: '',
+      规定到货时间: '',
+      操作日期: '',
       approvalValue: '',
       RMB: '',
       TotalAmount: '',
@@ -424,15 +470,27 @@ export default {
       })
     },
     exportTable() {
-      const htmlNode = $('#export').html()
-      const body = $('body')
-      body.children().hide()
-      const printNode = $(htmlNode)
-      body.append(printNode)
-      window.print()
-      body.children().not('script').show()
-      body.children().not('#app').hide()
-      printNode.remove()
+      if (this.type === '1' || this.type === '2') {
+        const htmlNode = $('#export').html()
+        const body = $('body')
+        body.children().hide()
+        const printNode = $(htmlNode)
+        body.append(printNode)
+        window.print()
+        body.children().not('script').show()
+        body.children().not('#app').hide()
+        printNode.remove()
+      } else {
+        const htmlNode = $('#WGBLD').html()
+        const body = $('body')
+        body.children().hide()
+        const printNode = $(htmlNode)
+        body.append(printNode)
+        window.print()
+        body.children().not('script').show()
+        body.children().not('#app').hide()
+        printNode.remove()
+      }
     },
     handleSizeChange1(val) {
       this.pageCurrent1 = 1
@@ -446,6 +504,9 @@ export default {
     searchTable2(row) {
       this.type = row.模板类型
       console.log(this.type)
+      this.规定到货时间 = row.规定到货时间
+      this.操作日期 = row.操作日期
+      this.采购合同名称 = row.采购合同名称
       this.textarea = row.合同文本
       this.supplier = row.供应商名称
       this.contract = row.采购合同编号
@@ -459,48 +520,55 @@ export default {
         this.TotalAmount1 = parseInt((row.含税总金额) * 100) / 100
       }
       this.RMB1 = row.含税总金额_文本
-      document.getElementById('23').innerText = this.textarea
-      this.contractValue = parseInt(row.采购合同流水号)
-      const opts = {
-        errorCorrectionLevel: 'H',
-        type: 'image/jpeg',
-        rendererOpts: {
-          quality: 0.3
-        }
-      }
-      QRCode.toDataURL(row.采购合同流水号, opts, function(err, url) {
-        if (err) throw err
-        const img = document.getElementById('img')
-        img.src = url
-      })
-      searchTable2(this.contractValue).then(response => {
-        this.returns = response.data
-        const children = document.getElementsByClassName('tableData')
-        const parent = document.getElementById('4')
-        if (children.length !== 0) {
-          for (let i = children.length - 1; i >= 0; i--) {
-            parent.removeChild(children[i])
+      if (this.type === '1' || this.type === '2') {
+        document.getElementById('23').innerText = this.textarea
+        this.contractValue = parseInt(row.采购合同流水号)
+        const opts = {
+          errorCorrectionLevel: 'H',
+          type: 'image/jpeg',
+          rendererOpts: {
+            quality: 0.3
           }
         }
-        const tr = []
-        for (let i = 0; i < this.returns.length; i++) {
-          tr[i] = document.createElement('tr')
-          tr[i].setAttribute('class', 'tableData')
-          tr[i].innerHTML = '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
+        QRCode.toDataURL(row.采购合同流水号, opts, function(err, url) {
+          if (err) throw err
+          const img = document.getElementById('img')
+          img.src = url
+        })
+        searchTable2(this.contractValue).then(response => {
+          this.returns = response.data
+          const children = document.getElementsByClassName('tableData')
+          const parent = document.getElementById('4')
+          if (children.length !== 0) {
+            for (let i = children.length - 1; i >= 0; i--) {
+              parent.removeChild(children[i])
+            }
+          }
+          const tr = []
+          for (let i = 0; i < this.returns.length; i++) {
+            tr[i] = document.createElement('tr')
+            tr[i].setAttribute('class', 'tableData')
+            tr[i].innerHTML = '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
               '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
-          $('#tableHead').after(tr[i])
-        }
-        for (let j = 0; j < this.returns.length; j++) {
-          document.getElementsByClassName('tableData')[j].children[0].innerHTML = response.data[j].图号
-          document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].物料名称
-          document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].规格
-          document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
-          document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].备注
-          document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData')[j].children[7].innerHTML = response.data[j].金额
-        }
-      })
+            $('#tableHead').after(tr[i])
+          }
+          for (let j = 0; j < this.returns.length; j++) {
+            document.getElementsByClassName('tableData')[j].children[0].innerHTML = response.data[j].图号
+            document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].物料名称
+            document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].规格
+            document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
+            document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].备注
+            document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].数量
+            document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].单价
+            document.getElementsByClassName('tableData')[j].children[7].innerHTML = response.data[j].金额
+          }
+        })
+      } else {
+        this.contractValue = parseInt(row.采购合同流水号)
+        searchTable2(this.contractValue).then(response => {
+          this.returns = response.data
+        })
+      }
       // searchTable3(this.contractValue).then(response => {
       //   this.returns1 = response.data
       //   const children1 = document.getElementsByClassName('tableData1')