From 8ce47f78ee5547d02d1f058676c16c771c89a43f Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 13 Jul 2022 11:30:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=96=B7=E9=9B=BE=E5=B7=A5=E5=BA=8F=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=89=93=E5=8D=B0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/xinrui/production/ProcessSpray.vue         | 11 +++++++++++
 .../xinrui/storage/settings/ChengPinBarrelPrint.vue  | 12 +++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/pages/xinrui/production/ProcessSpray.vue b/src/pages/xinrui/production/ProcessSpray.vue
index 3f9819e..8adca8b 100644
--- a/src/pages/xinrui/production/ProcessSpray.vue
+++ b/src/pages/xinrui/production/ProcessSpray.vue
@@ -81,6 +81,7 @@
       <button class="btn submit-button" :class="{'btn-disabled': pkId === ''}" :disabled="disabled2" @click="_issuePW('下发')">下发</button>
       <button class="btn submit-button" :class="{'btn-disabled': pkId === ''}" :disabled="disabled3" @click="_moveFinish('过料完成')">过料完成</button>
       <button class="btn submit-button" :class="{'btn-disabled': pkId === '' || val3 === '' || val4 === '' || active === ''}" :disabled="disabled4" @click="_movePWVehicle('下料混合')">下料混合</button>
+      <button class="btn submit-button" :class="{'btn-disabled': pkId === ''}" @click="toPrint1">打印桶码</button>
       <button class="btn submit-button" :class="{'btn-disabled': pkId === ''}" @click="groupDisk">组盘</button>
       <button class="btn submit-button" :class="{'btn-disabled': pkId === ''}" :disabled="disabled5" @click="_sendLK">发送立库</button>
       <button class="btn submit-button" :class="{'btn-disabled': pkId === ''}" :disabled="disabled1" @click="_updateWorkStatus('99', '结束')">结束</button>
@@ -302,6 +303,16 @@ export default {
       } catch (e) {
         this.disabled5 = false
       }
+    },
+    /** 打印桶码 */
+    toPrint1 () {
+      if (this.pkId) {
+        this.$store.dispatch('materObj1', this.pkObj)
+        this.$router.push({
+          path: '/ChengPinBarrelPrint',
+          query: {url: 'ProcessSpray'}
+        })
+      }
     }
   }
 }
diff --git a/src/pages/xinrui/storage/settings/ChengPinBarrelPrint.vue b/src/pages/xinrui/storage/settings/ChengPinBarrelPrint.vue
index 010c977..bc99255 100644
--- a/src/pages/xinrui/storage/settings/ChengPinBarrelPrint.vue
+++ b/src/pages/xinrui/storage/settings/ChengPinBarrelPrint.vue
@@ -1,6 +1,7 @@
 <template>
   <section>
-    <nav-bar title="成品组桶标签打印"></nav-bar>
+    <nav-bar v-if="$route.query.url !== '' && $route.query.url !== undefined" :inner2="true" @goIn="goIn" title="成品组桶标签打印"></nav-bar>
+    <nav-bar v-else title="成品组桶标签打印"></nav-bar>
     <section class="content mgt186" ref="content">
       <div class="filter-wraper">
         <search-box
@@ -212,6 +213,9 @@ export default {
           record_order: this.val6,
           is_offline_hand: this.option[this.active].value
         }
+        if (this.$route.query.url === 'ProcessSpray') {
+          newObj = Object.assign({}, newObj, this.$store.getters.materObj1)
+        }
         let res = await endProductconfirmGroupBucket(newObj)
         if (res.code === '1') {
           this.toast(res.desc)
@@ -256,6 +260,12 @@ export default {
       } catch (e) {
         this.disabled2 = false
       }
+    },
+    goIn () {
+      if (this.$route.query.url === 'ProcessSpray') {
+        this.$store.dispatch('materObj1', {})
+        this.$router.push('/ProcessSpray')
+      }
     }
   }
 }