From b3a4243739344b92af9339171e72829001b56fdf Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 30 十月 2025 15:01:34 +0800
Subject: [PATCH] 上片模块、钢化前大理片笼新增进页面接口，隐藏中空线预览任务按钮
---
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 163 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 137 insertions(+), 26 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index 035f2e7..502f199 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.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">
@@ -47,11 +47,13 @@
</div>
<!-- 鍔ㄦ�佽〃鏍� -->
<el-table
+ height="630"
:data="tab.tableDataa"
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
>
<el-table-column prop="flowCardId" :label="$t('hellow.flowCardId')" align="center" />
<el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" />
+ <el-table-column prop="slot" :label="$t('film.slot')" align="center" />
<el-table-column prop="hollowSequence" :label="$t('hellow.order')" align="center" />
<el-table-column prop="thickness" :label="$t('hellow.thickness')" align="center" />
<el-table-column prop="layer" :label="$t('hellow.layer')" align="center" />
@@ -321,7 +323,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>
@@ -362,6 +364,7 @@
</el-dialog>
<!-- 缂虹墖璇︽儏 -->
<el-dialog v-model="dialogFormVisibleb" top="7vh" width="70%" height="500">
+ <div v-loading="isLoading" class="loading-container" :element-loading-text="$t('searchOrder.loadingText')" >
<div style="margin-top: -20px;text-align: center;margin-left: 400px;">
<el-form-item :label="$t('hellow.cardnumbera')" style="width: 14vw">
{{ currentRow.flowCardId }}
@@ -369,20 +372,36 @@
</div>
<el-table ref="table" style="margin-top: 20px;height: 400px;" :data="tableDatac"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
+ <el-table-column prop="flowCardId" align="center" :label="$t('hellow.flowCardId')" min-width="100" />
+ <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="100" />
+ <el-table-column prop="layer" align="center" :label="$t('hellow.layer')" min-width="80" />
+ <el-table-column prop="glassType" align="center" :label="$t('reportmanage.number')" min-width="80" />
<el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="80" />
<el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="80" />
<el-table-column prop="height" align="center" :label="$t('hellow.height')" min-width="80" />
<el-table-column prop="width" align="center" :label="$t('hellow.width')" min-width="80" />
- <!-- <el-table-column prop="totalCount" align="center" :label="$t('hellow.totalnumber')" min-width="80"/> -->
- <el-table-column prop="lackCount" align="center" :label="$t('hellow.missingnumber')" min-width="80" />
- <!-- <el-table-column prop="damageCount" align="center" :label="$t('hellow.brokenpieces')" min-width="80"/> -->
+ <el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="80" />
+ <el-table-column prop="workingProcedure" align="center" :label="$t('reportmanage.process')" min-width="80" />
+ <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center">
+ <template #default="scope">
+ <el-button type="text" plain @click="handleBroke(scope.row)">{{ $t('order.dilapidation') }}</el-button>
+ </template>
+ </el-table-column>
<div style="float: right;margin-bottom: 5px;">
<el-pagination layout="prev, pager, next" :total="50" />
</div>
</el-table>
- <div style="display: flex;margin-left: 40%;margin-top: 10px;">
- <el-pagination background size="large" layout="prev, pager, next" :total="30" :current-page.sync="currentPage2"
- @current-change="handlePageChange2" />
+ <div class="custom-page-buttons">
+ <button
+ v-for="page in pageList"
+ :key="page"
+ @click="switchPage(page)"
+ :class="{ 'active-page': currentPage === page }"
+ class="page-btn"
+ >
+ {{ page }}
+ </button>
+ </div>
</div>
</el-dialog>
<!-- 寮�濮嬩换鍔� -->
@@ -504,6 +523,8 @@
const blindb = ref(false)
const blindc = ref(false)
const mulan = ref(false)
+const isSubmitting = ref(false)
+const isLoading = ref(true)
const activeTab = ref('')
const tabList = ref([])
const internalInstance = getCurrentInstance()
@@ -527,7 +548,6 @@
const pairTotal = ref()
const productName = ref('')
const customerName = ref('')
-const flowCardId = ref('')
const freetwo = ref('#911005');
const dialogFormVisiblea = ref(false)
const dialogFormVisibleb = ref(false)
@@ -536,7 +556,10 @@
const dialogFormVisiblee = ref(false)
const add = ref(false)
const adda = ref(false)
-const currentPage2 = ref(1)
+const pageList = ref([]);
+const allData = ref({});
+const currentData = ref([]);
+const flowCardId = ref('')
const currentRow = reactive({});
const formattedProcessType = ref([]);
const selectedFormulaName = ref('');
@@ -593,19 +616,21 @@
const handlePageChange1 = (newPage) => {
currentPage.value = newPage;
};
-const handlePageChange2 = (newPage) => {
- currentPage2.value = newPage;
- fetchFlowBind(currentRow.flowCardId, currentPage2.value);
-};
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;
+ }else {
+ activeTab.value = '';
}
internalInstance.ctx.$forceUpdate();
try {
@@ -711,16 +736,18 @@
};
// 缂虹墖璇︽儏
const handleBindRack = (row) => {
- currentPage2.value = 1;
+ let currentPageLack = window.localStorage.getItem('currentPageLack')
const { flowCardId } = row;
currentRow.flowCardId = row.flowCardId;
+ isLoading.value = true;
dialogFormVisibleb.value = true;
- fetchFlowBind(flowCardId, currentPage2.value);
+ fetchFlowBind(currentRow.flowCardId);
};
// 棰嗗彇浠诲姟
const handletake = (row) => {
window.localStorage.setItem('flowCardId', row.flowCardId)
dialogFormVisiblec.value = true;
+ isSubmitting.value = false
fetchmulan()
};
// 寮哄埗鍑虹墖
@@ -971,18 +998,30 @@
};
});
};
-const fetchFlowBind = async (flowCardId, page) => {
+const fetchFlowBind = async (flowCardId) => {
try {
- var url = "/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId=" + flowCardId + "&layer=" + 1;
- const response = await request.post(url)
- if (response.code == 200) {
- tableDatac.value = response.data[page];
- ElMessage.success(response.message);
+ const url = `/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId=${flowCardId}`;
+ const response = await request.post(url);
+ if (response.code === 200) {
+ isLoading.value = false;
+ allData.value = response.data;
+ // 鎻愬彇骞舵帓搴忛〉鐮�
+ pageList.value = Object.keys(response.data)
+ .map(Number)
+ .sort((a, b) => a - b);
+ // 鍒濆鍖栫涓�椤垫暟鎹�
+ currentPage.value = pageList.value[0];
+ tableDatac.value = response.data[pageList.value[0]] || [];
} else {
}
} catch (error) {
}
-}
+};
+// 椤甸潰鍒囨崲澶勭悊
+const switchPage = (page) => {
+ currentPage.value = page;
+ tableDatac.value = allData.value[page] || []; // 鍒囨崲鏁版嵁
+};
// 寮�濮嬩换鍔�
const handlea = async () => {
try {
@@ -1045,6 +1084,10 @@
ElMessage.error(t('hellow.phollowformula'))
return
}
+ if (isSubmitting.value) {
+ return
+ }
+ isSubmitting.value = true
try {
var url = "/hollowGlass/hollowGlassOutRelationInfo/receiveTask?cell=" + 931 + "&flowCardId=" + flowCardId + "&totalPairQuantity=" + totalPairQuantity.value + "&formulaId=" + id;
const response = await request.post(url)
@@ -1054,9 +1097,48 @@
cell.value = '';
formulaName.value = '';
totalPairQuantity.value = '';
+ isSubmitting.value = true
} else {
+ ElMessage.error(response.message);
+ isSubmitting.value = true
}
} catch (error) {
+ ElMessage.error(response.message);
+ }
+}
+
+// 缂虹墖璇︽儏-鐮存崯
+const handleBroke = async (row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.broke'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ const response = await request.post('/hollowGlass/hollowGlassRelationInfo/hollowBigStorageGlassDamage', {
+ flowCardId: row.flowCardId,
+ glassType: row.glassType,
+ glassId: row.glassId,
+ layer: row.layer,
+ state: 8,
+ line: 1,
+ workingProcedure: '涓┖',
+ remark: '涓┖'
+ })
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ const { flowCardId } = row;
+ fetchFlowBind(currentRow.flowCardId);
+ fetchFlowCardId()
+ } else {
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ console.error(error);
}
}
// 寮哄埗鍑虹墖
@@ -1160,7 +1242,6 @@
text-align: center;
margin-top: -5px;
}
-
#dotClass {
display: flex;
margin-left: 20px;
@@ -1168,8 +1249,38 @@
margin-top: 20px;
margin-bottom: 10px;
}
-
::v-deep(.row-red-background) {
background-color: rgb(224.6, 242.8, 215.6) !important;
}
+.custom-page-buttons {
+ display: flex;
+ gap: 10px;
+ margin: 20px 0;
+ flex-wrap: wrap;
+}
+.page-btn {
+ padding: 8px 16px;
+ min-width: 40px;
+ border: 1px solid #dcdfe6;
+ border-radius: 4px;
+ background: #f5f7fa;
+ cursor: pointer;
+ transition: all 0.3s;
+}
+.page-btn:hover {
+ background: #e6f1ff;
+}
+.page-btn.active-page {
+ background: #409eff;
+ color: white;
+ border-color: #409eff;
+}
+.loading-container {
+ position: relative;
+ height: 100%;
+}
+/* 纭繚閬僵灞傚湪鏈�椤跺眰 */
+.el-loading-mask {
+ z-index: 2000 !important;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0