From 3a60ee203ba55ff9df9bcc81b465cfaeb5faf05b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 23 九月 2025 15:08:16 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

---
 UI-Project/src/views/hollow/hollowequipment.vue |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index ef2b32a..420f5dc 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -24,11 +24,6 @@
           $t('hellow.stopproject')
         }}
         </el-button>
-        <el-button style="margin-left: 10px;" :disabled="listFlow.length > 0 ? false : true" id="searchButton" type="warning"
-          @click="handleBinde">{{
-            $t('searchOrder.printlabels')
-          }}
-        </el-button>
       </div>
       <div id="dotClass">
         <!-- <div style="margin-bottom: -5px;margin-left: 5px;"> -->
@@ -77,6 +72,11 @@
           $t('hellow.taskdet')
         }}
         </el-button> 
+        <el-button style="margin-left: 10px;" id="searchButton" type="warning"
+          @click="handleBinde(tab.tableDataa)">{{
+            $t('searchOrder.printlabels')
+          }}
+        </el-button>
   </div>  
       <!-- 鍔ㄦ�佽〃鏍� -->
       <el-table 
@@ -1654,19 +1654,6 @@
       dialogFormVisiblee.value = false
       selectedProjectNo.value = ''
       closeWebSocket(socket);
-      const summary = response.data.reduce((map, item) => {
-        const key = `${item.hollowSequence}`;
-        if (!map[key]) {
-          map[key] = {
-            printQuantity: 1,
-            order_number: item.glassType,
-            processId: item.flowCardId,
-            orderId:item.flowCardId.slice(0, 10)
-          };
-        }
-        return map;
-      }, {});
-      listFlow.value = Object.values(summary);
     } else {
     }
   } catch (error) {
@@ -1820,7 +1807,20 @@
 ]
 const blinde = ref(false)
 const labelPrint = ref(false);
-const handleBinde = (row) => {
+const handleBinde = (flowCard) => {
+  const summary = flowCard.reduce((map, item) => {
+        const key = `${item.hollowSequence}`;
+        if (!map[key]) {
+          map[key] = {
+            printQuantity: 1,
+            order_number: item.glassType,
+            processId: item.flowCardId,
+            orderId:item.flowCardId.slice(0, 10)
+          };
+        }
+        return map;
+      }, {});
+      listFlow.value = Object.values(summary);
   blinde.value = true;
   getTags();
   hiprint.init();

--
Gitblit v1.8.0