From e5c6fb8cee9b3abfe052f206a421cc2478c8e37e Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 10 Jan 2019 16:37:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=A4=87=E6=96=99=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreatePreparationBill/index.vue           | 39 ++++++++++++++++---
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index 38eb9858..7e1b5ea0 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -33,6 +33,21 @@
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
+        <el-table-column label="数量" align="center" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.批次数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="材料" align="center" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.材料 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="规格" align="center" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.原材料规格 }}
+          </template>
+        </el-table-column>
         <el-table-column label="备料" align="center">
           <template slot-scope="scope">
             {{ scope.row.工艺要求 }}
@@ -52,25 +67,34 @@
       </div>
     </el-card>
 
-    <div v-show="false" id="BL">
+    <div id="BL">
       <table border cellspacing="0px" style="table-layout: fixed; width: 600px;">
         <colgroup>
-          <col style="width: 100px">
-          <col style="width: 150px">
+          <col style="width: 120px">
+          <col style="width: 180px">
+          <col style="width: 110px">
+          <col style="width: 110px">
+          <col style="width: 110px">
           <col style="width: 450px">
         </colgroup>
         <tr>
-          <th height="60px">GAOJING</th>
-          <th colspan="2" height="60px"><span style="font-weight:bold">备料单</span></th>
+          <th colspan="2" height="60px">GAOJING</th>
+          <th colspan="4" height="60px"><span style="font-weight:bold">备料单</span></th>
         </tr>
         <tr>
           <td align="center">零件名称</td>
           <td align="center">零件图号</td>
+          <td align="center">材料</td>
+          <td align="center">原材料规格</td>
+          <td align="center">批次数量</td>
           <td align="center">备料</td>
         </tr>
         <tr v-for="(list, index) in tableData2" :key="index">
           <td align="center">{{ list.零件名称 }}</td>
           <td align="center">{{ list.零件图号 }}</td>
+          <td align="center">{{ list.材料 }}</td>
+          <td align="center">{{ list.原材料规格 }}</td>
+          <td align="center">{{ list.批次数量 }}</td>
           <td>{{ list.工艺要求 }}</td>
         </tr>
       </table>
@@ -141,7 +165,10 @@ export default {
               零件名称: this.Data[i].零件名称,
               零件图号: this.Data[i].零件图号,
               备料打印: this.Data[i].备料打印,
-              工艺要求: response.data[0].工艺要求
+              工艺要求: response.data[0].工艺要求,
+              材料: this.Data[i].材料,
+              原材料规格: this.Data[i].原材料规格,
+              批次数量: this.Data[i].批次数量
             })
           })
           this.loading = false