From 1e7833ee7bd9393041a051fe616eb968cc89f1eb Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Tue, 24 Sep 2024 18:35:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?=
 =?UTF-8?q?=201.=20=E5=A4=87=E6=96=99=E6=89=A7=E8=A1=8C=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E4=BF=AE=E6=94=B9=202.=20=E6=95=B4=E7=90=86?=
 =?UTF-8?q?=E7=9B=92=E5=AD=90=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/doKitting.vue | 10 ++++++----
 src/layout/sortBoxs.vue  |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/layout/doKitting.vue b/src/layout/doKitting.vue
index 04ba9a7..b058e56 100644
--- a/src/layout/doKitting.vue
+++ b/src/layout/doKitting.vue
@@ -229,12 +229,14 @@ export default {
             }
             queryFinishByStandAndGoods(request).then(res => {
                 const response = res.data
+                if (response.returnData != null) {
+                    this.workFormEntity.finishedRows = response.returnData.finishedRows
+                    this.workFormEntity.totalRows = response.returnData.totalRows
+                    this.workFormEntity.finishedCounts = response.returnData.finishedCounts
+                    this.workFormEntity.totalCounts = response.returnData.totalCounts
+                }
                 if (response.code == 0) {
                     if (response.returnData != null && response.returnData.tip != '') {
-                        this.workFormEntity.finishedRows = response.returnData.finishedRows
-                        this.workFormEntity.totalRows = response.returnData.totalRows
-                        this.workFormEntity.finishedCounts = response.returnData.finishedCounts
-                        this.workFormEntity.totalCounts = response.returnData.totalCounts
                         this.workFormEntity.tip = response.returnData.tip
                         warningBox(this.workFormEntity.tip)
                     } else {
diff --git a/src/layout/sortBoxs.vue b/src/layout/sortBoxs.vue
index 075b57a..3a47fdf 100644
--- a/src/layout/sortBoxs.vue
+++ b/src/layout/sortBoxs.vue
@@ -37,7 +37,7 @@
                                     </div>
                                     <div style="display: flex; flex-direction: column;">
                                         <div class="display-title-div">
-                                            <span class="display-title-text">数量</span>
+                                            <span class="display-title-text">机器号数量</span>
                                         </div>
                                         <div style="display: flex; margin-top: 20px;">
                                             <div class="display-form-div-left">