From 28bdb8b9c8940019fd24260f67a574fb26e952eb Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 10 Aug 2023 10:51:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=88=B6=E4=B8=8B=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/modules/clean/cleaning-cutting.vue | 10 +++++-----
 src/style/reset.css                          |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/modules/clean/cleaning-cutting.vue b/src/pages/modules/clean/cleaning-cutting.vue
index 421eddd..6671d6b 100644
--- a/src/pages/modules/clean/cleaning-cutting.vue
+++ b/src/pages/modules/clean/cleaning-cutting.vue
@@ -33,7 +33,7 @@
                     <button class="button button--primary" :disabled="disabled2" :class="{'button--defalut': pkId === ''}" @click="_washWashFinish('1')">确认下料</button>
                     <button class="button button--primary" :disabled="disabled3" :class="{'button--defalut': pkId === ''}" @click="_washWashTaskFinish('2')">强制完成</button>
                     <button class="button button--primary" :disabled="disabled5" @click="_bcpInCallVehicle">呼叫空框</button>
-                    <button class="button button--primary" :disabled="disabled4" :class="{'button--defalut': pkId === ''}" @click="_washWashQzFinish('3')">强制下料</button>
+                    <button class="button button--primary" :disabled="disabled4" @click="_washWashQzFinish('3')">强制下料</button>
                 </div>
             </div>
         </div>
@@ -206,10 +206,10 @@ export default {
     // 强制下料
     async _washWashQzFinish (type) {
       this.disabled4 = true
-      if (this.pkId === '') {
-        this.disabled4 = false
-        return
-      }
+      // if (this.pkId === '') {
+      //   this.disabled4 = false
+      //   return
+      // }
       if (this.pkObj.sep_on !== this.sep_on) {
         this.type = type
         this.$refs.child.active = true
diff --git a/src/style/reset.css b/src/style/reset.css
index 4b8f67b..1a298ed 100644
--- a/src/style/reset.css
+++ b/src/style/reset.css
@@ -56,7 +56,7 @@ li {
 }
  
 ::-webkit-scrollbar {
-     width: 15px;
+     width: 45px;
      height: 15px;
 }