From 60fa5f13dea89dbf74f0030c1fa2a618eeb017ef Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 13 Jul 2022 19:02:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=96=B7=E9=9B=BE=E5=B7=A5=E5=BA=8F=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/Home.vue                      |  5 ++--
 .../storage/settings/ChengPinBarrelPrint.vue  | 24 +++++++++++++++----
 .../storage/settings/SoftWasteBagPrint.vue    |  5 ++++
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/pages/login/Home.vue b/src/pages/login/Home.vue
index 09ad04e..125f4f5 100644
--- a/src/pages/login/Home.vue
+++ b/src/pages/login/Home.vue
@@ -21,7 +21,7 @@
           <img src="../../images/xinrui/menu/password.png" alt="">
           <p class="fxcol">修改密码</p>
         </div>
-        <div class="menu-col fxrow" @click="goInner('/MaintainExecution')"><p class="fxcol">设备保养执行-维修工</p></div>
+        <!-- <div class="menu-col fxrow" @click="goInner('/MaintainExecution')"><p class="fxcol">设备保养执行-维修工</p></div>
         <div class="menu-col fxrow" @click="goInner('/MaintainConfirm')"><p class="fxcol">设备保养确认-生产员</p></div>
         <div class="menu-col fxrow" @click="goInner('/EquipRepair')"><p class="fxcol">设备报修</p></div>
         <div class="menu-col fxrow" @click="goInner('/EquipRepairExecute')"><p class="fxcol">设备维修执行</p></div>
@@ -29,7 +29,7 @@
         <div class="menu-col fxrow" @click="goInner('/SparePartInstore')"><p class="fxcol">备件入库</p></div>
         <div class="menu-col fxrow" @click="goInner('/SparePartOutstore')"><p class="fxcol">备件出库</p></div>
         <div class="menu-col fxrow" @click="goInner('/UseReturn')"><p class="fxcol">领用还回</p></div>
-        <div class="menu-col fxrow" @click="goInner('/RunLogFill')"><p class="fxcol">运行记录填报</p></div>
+        <div class="menu-col fxrow" @click="goInner('/RunLogFill')"><p class="fxcol">运行记录填报</p></div> -->
         <!-- <div class="menu-col fxrow" @click="goInner('/ProcessMakePowder')"><p class="fxcol">配粉工序</p></div>
         <div class="menu-col fxrow" @click="goInner('/ProcessGrindBall')"><p class="fxcol">球磨工序</p></div>
         <div class="menu-col fxrow" @click="goInner('/ProcessSpray')"><p class="fxcol">喷雾工序</p></div>
@@ -106,6 +106,7 @@ export default {
   },
   mounted () {
     this.$store.dispatch('materObj', {})
+    this.$store.dispatch('materObj1', {})
     document.getElementsByTagName('body')[0].className = 'bgwhite'
   },
   created () {
diff --git a/src/pages/xinrui/storage/settings/ChengPinBarrelPrint.vue b/src/pages/xinrui/storage/settings/ChengPinBarrelPrint.vue
index 5fc88d9..fd5dca3 100644
--- a/src/pages/xinrui/storage/settings/ChengPinBarrelPrint.vue
+++ b/src/pages/xinrui/storage/settings/ChengPinBarrelPrint.vue
@@ -114,10 +114,25 @@ export default {
     next()
   },
   activated () {
-    this.val2 = this.$store.getters.materObj.material_code
-    this.materialId = this.$store.getters.materObj.material_id
-    if (this.$store.getters.materObj.standard_weight) {
-      this.val4 = Number(this.$store.getters.materObj.standard_weight).toFixed(3) + ''
+    if (JSON.stringify(this.$store.getters.materObj1) !== '{}') {
+      if (JSON.stringify(this.$store.getters.materObj) === '{}') {
+        this.val2 = this.$store.getters.materObj1.material_code
+        this.materialId = this.$store.getters.materObj1.material_id
+        this.val3 = this.$store.getters.materObj1.pcsn
+        this.val4 = '50.000'
+      }
+      if (JSON.stringify(this.$store.getters.materObj) !== '{}') {
+        this.val2 = this.$store.getters.materObj.material_code
+        this.materialId = this.$store.getters.materObj.material_id
+        this.val4 = Number(this.$store.getters.materObj.standard_weight).toFixed(3) + ''
+      }
+    }
+    if (JSON.stringify(this.$store.getters.materObj1) === '{}') {
+      if (JSON.stringify(this.$store.getters.materObj) !== '{}') {
+        this.val2 = this.$store.getters.materObj.material_code
+        this.materialId = this.$store.getters.materObj.material_id
+        this.val4 = Number(this.$store.getters.materObj.standard_weight).toFixed(3) + ''
+      }
     }
   },
   methods: {
@@ -264,6 +279,7 @@ export default {
     goIn () {
       if (this.$route.query.url === 'ProcessSpray') {
         this.$store.dispatch('materObj1', {})
+        this.$store.dispatch('materObj', {})
         this.$store.dispatch('setKeepAlive', ['ProcessSpray'])
         this.$router.push('/ProcessSpray')
       }
diff --git a/src/pages/xinrui/storage/settings/SoftWasteBagPrint.vue b/src/pages/xinrui/storage/settings/SoftWasteBagPrint.vue
index ceeea25..e60eca0 100644
--- a/src/pages/xinrui/storage/settings/SoftWasteBagPrint.vue
+++ b/src/pages/xinrui/storage/settings/SoftWasteBagPrint.vue
@@ -254,6 +254,11 @@ export default {
     /** 打印 */
     async _bagPrint () {
       this.disabled2 = true
+      if (parseFloat(this.val4) <= 0 || isNaN(parseFloat(this.val4))) {
+        this.toast('重量必须大于0')
+        this.disabled2 = false
+        return
+      }
       if (this.val2 === '' || this.val2 === undefined) {
         this.toast('粉料编码不能为空')
         this.disabled2 = false