From 9f61a46ea6d95be91d26cb36d23437b522104456 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Thu, 6 Jul 2023 18:52:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=BB=E5=AD=97=E4=B8=8A=E6=96=99=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/modules/lettering/lettering-load.vue     | 14 +++++++-------
 .../modules/lettering/temporary-lettering-load.vue |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/pages/modules/lettering/lettering-load.vue b/src/pages/modules/lettering/lettering-load.vue
index 89d3634..78558c0 100644
--- a/src/pages/modules/lettering/lettering-load.vue
+++ b/src/pages/modules/lettering/lettering-load.vue
@@ -35,8 +35,8 @@
                     </div>
                 </div>
                 <div class="search-item_3">
-                    <button class="button button--primary" :disabled="disabled2" :class="{'button--defalut': value2 === ''}" @click="_kzunload">卸料</button>
-                    <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': qty === '' || value2 === ''}" @click="toSure">余料上料</button>
+                    <button class="button button--primary" :disabled="disabled2" :class="{'button--defalut': qty === '' || value2 === ''}" @click="_kzunload">卸料</button>
+                    <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': value2 === ''}" @click="toSure">余料上料</button>
                 </div>
             </div>
         </div>
@@ -83,12 +83,12 @@ export default {
     // 余料上料
     async toSure () {
       this.disabled1 = true
-      if (this.qty === '' || this.value2 === '') {
+      if (this.value2 === '') {
         this.disabled1 = false
         return
       }
       try {
-        let res = await kzresidue(this.qty, this.value2)
+        let res = await kzresidue(this.value2)
         this.toast(res.message)
         this.value1 = ''
         this.qty = ''
@@ -98,15 +98,15 @@ export default {
         this.disabled1 = false
       }
     },
-    // 补空框
+    // 卸料
     async _kzunload () {
       this.disabled2 = true
-      if (this.value2 === '') {
+      if (this.qty === '' || this.value2 === '') {
         this.disabled2 = false
         return
       }
       try {
-        let res = await kzunload(this.value2)
+        let res = await kzunload(this.qty, this.value2)
         this.toast(res.message)
         this.value1 = ''
         this.qty = ''
diff --git a/src/pages/modules/lettering/temporary-lettering-load.vue b/src/pages/modules/lettering/temporary-lettering-load.vue
index a9ec5f1..a5ac122 100644
--- a/src/pages/modules/lettering/temporary-lettering-load.vue
+++ b/src/pages/modules/lettering/temporary-lettering-load.vue
@@ -3,8 +3,8 @@
         <div class="search-confirm-wrap">
             <div class="search-wrap">
                 <div class="search-item_3">
-                    <button class="button button--primary" :disabled="disabled2" @click="_tmpsendVechile">刻字上料</button>
-                    <button class="button button--primary" :disabled="disabled1" @click="toSure">空框搬回</button>
+                    <button class="button button--primary" :disabled="disabled1" @click="toSure">刻字上料</button>
+                    <button class="button button--primary" :disabled="disabled2" @click="_tmpsendVechile">空框搬回</button>
                 </div>
             </div>
         </div>
@@ -23,7 +23,7 @@ export default {
   created () {
   },
   methods: {
-    // 空框搬回
+    // 1刻字上料
     async toSure () {
       this.disabled1 = true
       try {
@@ -34,7 +34,7 @@ export default {
         this.disabled1 = false
       }
     },
-    // 刻字上料
+    // 2空框回库
     async _tmpsendVechile () {
       this.disabled2 = true
       if (this.value2 === '') {