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/hollowequipmenthree.vue | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipmenthree.vue b/UI-Project/src/views/hollow/hollowequipmenthree.vue
index f02aeb0..479fc43 100644
--- a/UI-Project/src/views/hollow/hollowequipmenthree.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenthree.vue
@@ -38,7 +38,7 @@
$t('hellow.taskdet')
}}
</el-button>
- <el-button style="margin-left: 10px;" :disabled="listFlow.length > 0 ? false : true" id="searchButton" type="warning" @click="handleBinde">{{
+ <el-button style="margin-left: 10px;" id="searchButton" type="warning" @click="handleBinde(tab.tableDataa)">{{
$t('searchOrder.printlabels')
}}
</el-button>
@@ -683,7 +683,7 @@
}
);
if (confirmResult === 'confirm') {
- var url = "/hollowGlass/hollowGlassOutRelationInfo/deleteHollowTaskDetails?flowCardId=" + flowCardId + "&cell=" + 930;
+ var url = "/hollowGlass/hollowGlassOutRelationInfo/deleteHollowTaskDetails?flowCardId=" + flowCardId + "&cell=" + 932;
const response = await request.post(url)
if (response.code === 200) {
ElMessage.success(response.message);
@@ -926,19 +926,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) {
@@ -1080,7 +1067,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