From 679a6d3c908a016d19d38929961538457582e32b Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Sat, 29 Dec 2018 09:34:42 +0800
Subject: [PATCH 1/3] bug

---
 src/views/MarketingCenter/DeliveryManagement/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/MarketingCenter/DeliveryManagement/index.vue b/src/views/MarketingCenter/DeliveryManagement/index.vue
index cd3b38dc..44e1d23b 100644
--- a/src/views/MarketingCenter/DeliveryManagement/index.vue
+++ b/src/views/MarketingCenter/DeliveryManagement/index.vue
@@ -1276,6 +1276,7 @@ export default {
       this.invoiceNum = row.发货单编号
       this.DeliveryVisiable = true
       selectDelivery(this.invoiceNum).then(response => {
+        console.log(response)
         this.table = response.data
         this.装箱单名称 = response.data[0].装箱单名称
         this.发货单号 = response.data[0].发货单号
@@ -1315,7 +1316,7 @@ export default {
       const printNode = $(htmlNode)
       body.append(printNode)
       window.print()
-      body.children().show()
+      body.children().not('script').show()
       printNode.remove()
     },
     callOffDownLoadDelivery() {

From 654e9b7527a306329daf0412d5a709ef45161720 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sat, 29 Dec 2018 10:06:32 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=87=E6=96=99=E5=88=B0=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MaterialArrivalManagement/index.vue                | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
index 0f256c41..b8f4377f 100644
--- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
@@ -59,6 +59,7 @@ import { searchtable, searchtable2, edit, handlechange } from '@/api/Manufacturi
 export default {
   data() {
     return {
+      num: 0,
       arrest: [],
       all: false,
       partName: '',
@@ -114,9 +115,12 @@ export default {
         this.$message.warning('请选择零件')
       } else {
         for (let i = 0; i < this.arrest.length; i++) {
-          edit(this.arrest[i].工艺计划流水号)
-          handlechange(this.arrest[i].工序流水号, '0000')
-          if (i === this.arrest.length - 1) {
+          edit(this.arrest[i].工艺计划流水号).then(() => {
+            handlechange(this.arrest[i].工序流水号, '0000').then(response => {
+              this.num = this.num + response.data[0].result
+            })
+          })
+          if (this.num === this.arrest.length) {
             this.searchTable()
           }
         }

From 29ab3b42804d6ad837c49b24c853ada0238de690 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Sat, 29 Dec 2018 10:58:08 +0800
Subject: [PATCH 3/3] bug

---
 src/views/MarketingCenter/DeliveryManagement/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/MarketingCenter/DeliveryManagement/index.vue b/src/views/MarketingCenter/DeliveryManagement/index.vue
index 68d47390..b6523571 100644
--- a/src/views/MarketingCenter/DeliveryManagement/index.vue
+++ b/src/views/MarketingCenter/DeliveryManagement/index.vue
@@ -255,7 +255,7 @@
                 </el-table-column>
               </el-table>
             </el-tab-pane>
-            <el-tab-pane label="随即技术文件" name="third">
+            <el-tab-pane label="随机技术文件" name="third">
               <el-table
                 v-loading="tableData3Loading"
                 :data="tableData3"