From 10ca931a094e4fcb34e61b74d5d5c3f0ec642227 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 08 十二月 2025 11:28:51 +0800
Subject: [PATCH] 1、中空大理片笼信息查询修改为条件查询时只显示符合的数据
---
UI-Project/src/views/hollow/hollowequipmenthree.vue | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipmenthree.vue b/UI-Project/src/views/hollow/hollowequipmenthree.vue
index f6d3d9c..e98ff56 100644
--- a/UI-Project/src/views/hollow/hollowequipmenthree.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenthree.vue
@@ -8,9 +8,9 @@
<el-button id="searchButton" type="primary" @click="handlezhiban">
{{ $t('hellow.createtask') }}
</el-button>
- <el-button type="primary" @click="selectproject">
+ <!-- <el-button type="primary" @click="selectproject">
{{ $t('hellow.reviewproject') }}
- </el-button>
+ </el-button> -->
<el-button style="margin-left: 10px;" id="searchButton" type="primary" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
<el-button style="margin-left: 10px;" id="searchButton" type="success" @click="handleBinda">
{{ $t('hellow.starttask') }}
@@ -322,7 +322,7 @@
</div>
<template #footer>
<div id="dialog-footer">
- <el-button type="primary" @click="finisha">
+ <el-button type="primary" @click="finisha" :disabled="isSubmitting">
{{ $t('reportWork.sure') }}
</el-button>
<el-button @click="dialogFormVisiblec = false">{{ $t('reportWork.cancel') }}</el-button>
@@ -554,6 +554,7 @@
const blindc = ref(false)
const mulan = ref(false)
const isLoading = ref(true)
+const isSubmitting = ref(false)
const activeTab = ref('')
const tabList = ref([])
const internalInstance = getCurrentInstance()
@@ -615,7 +616,7 @@
}
]
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/HollowGlassThree`;
+const socketUrl = `ws://${window.ipConfig.serverUrl}/api/hollowGlass/api/talk/HollowGlassThree`;
const currentPage = ref(parseInt(window.localStorage.getItem('currentPage')) || 1);
watch(() => currentPage.value, (newVal) => {
window.localStorage.setItem('currentPage', newVal);
@@ -625,14 +626,20 @@
currentPage.value = newPage;
};
const handleMessage = (data) => {
+ if (data.queueInfo[0] != null) {
const rawData = data.queueInfo[0]
const formattedData = Object.entries(rawData).map(([key, data]) => ({
title: key,
tableDataa: Array.isArray(data) ? data : [data]
}));
tabList.value = formattedData;
+}else{
+ tabList.value = [];
+ }
if (tabList.value.length > 0) {
- activeTab.value = tabList.value[0].title;
+ activeTab.value = tabList.value[0].title;
+ }else {
+ activeTab.value = '';
}
internalInstance.ctx.$forceUpdate();
try {
@@ -755,6 +762,7 @@
const handletake = (row) => {
window.localStorage.setItem('flowCardId', row.flowCardId)
dialogFormVisiblec.value = true;
+ isSubmitting.value = false
fetchmulan()
};
// 寮哄埗鍑虹墖
@@ -1070,6 +1078,10 @@
ElMessage.error(t('hellow.cpairQuantity'))
return
}
+ if (isSubmitting.value) {
+ return
+ }
+ isSubmitting.value = true
try {
var url="/hollowGlass/hollowGlassOutRelationInfo/receiveTask?cell="+ 932 + "&flowCardId=" + flowCardId + "&totalPairQuantity=" + totalPairQuantity.value+ "&formulaId=" + -1;
const response = await request.post(url)
@@ -1079,9 +1091,13 @@
cell.value = '';
formulaName.value = '';
totalPairQuantity.value = '';
+ isSubmitting.value = true
} else {
+ ElMessage.error(response.message);
+ isSubmitting.value = true
}
} catch (error) {
+ ElMessage.error(response.message);
}
}
// 寮哄埗鍑虹墖
@@ -1128,7 +1144,9 @@
const blinde = ref(false)
const labelPrint = ref(false);
const handleBinde = (flowCard) => {
- const summary = flowCard.reduce((map, item) => {
+ const summary = flowCard
+ .filter(item => item.isPair !== 0)
+ .reduce((map, item) => {
const key = `${item.hollowSequence}`;
if (!map[key]) {
map[key] = {
@@ -1213,16 +1231,9 @@
.custom-page-buttons {
display: flex;
gap: 10px;
- margin-top: 20px;
-}
-
-.custom-page-buttons {
- display: flex;
- gap: 10px;
margin: 20px 0;
flex-wrap: wrap;
}
-
.page-btn {
padding: 8px 16px;
min-width: 40px;
@@ -1232,11 +1243,9 @@
cursor: pointer;
transition: all 0.3s;
}
-
.page-btn:hover {
background: #e6f1ff;
}
-
.page-btn.active-page {
background: #409eff;
color: white;
--
Gitblit v1.8.0