From 12ee7baa78483a3077ac55cc6d11a0ebc543daf4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 12 十一月 2025 11:14:06 +0800
Subject: [PATCH] 1、中空避免不出片调度修改 2、钢化指定的工程，自动取消指定规则变更 3、中空打印标签修改为只打印配对玻璃的标签
---
UI-Project/src/views/hollow/hollowequipmenthree.vue | 417 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 328 insertions(+), 89 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipmenthree.vue b/UI-Project/src/views/hollow/hollowequipmenthree.vue
index 8352dd2..c58eea5 100644
--- a/UI-Project/src/views/hollow/hollowequipmenthree.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenthree.vue
@@ -8,16 +8,12 @@
<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') }}
- </el-button>
- <el-button style="margin-left: 10px;" id="searchButton" type="info" @click="handleBindd">{{
- $t('hellow.taskdet')
- }}
</el-button>
<el-button style="margin-left: 10px;" id="searchButton" type="warning" @click="handleBindc">{{
$t('hellow.stopproject')
@@ -30,22 +26,46 @@
<i :style="{ marginTop: '2px', backgroundColor: freethree, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
</div>
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
- <el-table height="650" ref="table" :data="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="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"/>
- <el-table-column prop="filmsId" :label="$t('hellow.coatingtypes')" align="center"/>
- <el-table-column prop="height" :label="$t('hellow.height')" align="center"/>
- <el-table-column prop="width" :label="$t('hellow.width')" align="center"/>
+ <el-tabs v-model="activeTab" type="card">
+ <el-tab-pane
+ v-for="tab in tabList"
+ :key="tab.title"
+ :label="tab.title"
+ :name="tab.title"
+ >
+ <div style="margin-bottom: 10px;">
+ <el-button style="margin-left: 10px;" type="info" @click="handleDelete(tab.title)">{{
+ $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
+ 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" />
+ <el-table-column prop="filmsId" :label="$t('hellow.coatingtypes')" align="center" />
+ <el-table-column prop="height" :label="$t('hellow.height')" align="center" />
+ <el-table-column prop="width" :label="$t('hellow.width')" align="center" />
<el-table-column prop="state" :label="$t('hellow.state')" align="center">
<template #default="scope">
- {{ scope.row.state == -1 ? "绛夊緟鍑虹墖" : "鍑虹墖瀹屾垚" }}
+ {{ scope.row.state == -1 ? $t('hellow.waitingout') : $t('hellow.finishout') }}
</template>
</el-table-column>
- </el-table>
+ </el-table>
+ </el-tab-pane>
+ </el-tabs>
<!-- <div style="display: flex;margin-left: 40%;margin-top: 10px;">
<div style="margin-top: 5px;margin-right: 5px;">{{ $t('hellow.line') }}</div>
<el-pagination
@@ -302,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>
@@ -362,6 +382,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,27 +390,37 @@
</div>
<el-table ref="table" style="margin-top: 20px;height: 400px;"
:data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <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="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="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>
+ <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>
<!-- 寮�濮嬩换鍔� -->
<el-dialog v-model="blinda" top="30vh" width="25%" :title="$t('hellow.pstarttask')">
@@ -413,17 +444,30 @@
</div>
</template>
</el-dialog>
- <!-- 鍒犻櫎浠诲姟 -->
- <el-dialog v-model="blindd" top="30vh" width="25%" :title="$t('hellow.hollowtaskdet')">
- <template #footer>
- <div id="dialog-footer">
- <el-button type="primary" @click="handled">
- {{ $t('basicData.confirm') }}
- </el-button>
- <el-button @click="blindd = false">{{ $t('basicData.cancel') }}</el-button>
- </div>
- </template>
- </el-dialog>
+ <!-- 鎵撳嵃鏍囩 -->
+ <el-dialog v-model="blinde" top="30vh" width="25%" :title="$t('searchOrder.printlabels')">
+ <template #footer>
+ <div id="dialog-footer">
+ <el-select v-model="tag" filterable clearable :placeholder="$t('hellow.projectMsg2')" @change="changeTag"
+ style="width: 220px" @input="handleInputChange">
+ <el-option v-for="(tag, index) in tags" :key="index" :label="tag.name" :value="tag" />
+ </el-select>
+ <el-select v-model="stateValue" filterable clearable :placeholder="$t('screendisplay.pchoice')"
+ style="width: 220px" @input="handleInputChange">
+ <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value" />
+ </el-select>
+ <el-button type="primary" @click="labelPrint = true">
+ {{ $t('processCard.printing') }}
+ </el-button>
+ <el-button @click="blinde = false">{{ $t('basicData.cancel') }}</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ <el-dialog v-model="labelPrint" style="width: 80%; " destroy-on-close>
+ <el-button :icon="Printer" circle @click="printOrder(1)">{{ $t('processCard.printing') }}</el-button>
+ <print-custom-label-x-j id="childLabel" :faceOrientation="stateValue" :lableType="1" :list="listFlow"
+ :lastList='lastList' :type="tag.name" style="width: 100%;height: 100%" />
+ </el-dialog>
<!-- 棰勮 -->
<el-dialog v-model="dialogFormVisiblee" top="24vh" width="25%" :title="$t('hellow.reviewproject')" >
<div style="margin-left: 50px;margin-bottom: 10px;">
@@ -432,7 +476,7 @@
v-model="selectedProjectNo"
filterable
clearable
- :placeholder="$t('basicData.plselectproject')"
+ :placeholder="$t('hellow.plselectproject')"
style="width: 260px"
>
<el-option
@@ -499,7 +543,7 @@
</template>
<script setup>
import { ElMessage, ElMessageBox } from 'element-plus'
-import {onBeforeUnmount, onMounted, onUnmounted, ref, reactive, watch, computed} from "vue";
+import {onBeforeUnmount, onMounted, onUnmounted, ref, reactive, watch, computed, getCurrentInstance} from "vue";
import request from "@/utils/request"
import {host, WebSocketHost} from '@/utils/constants'
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
@@ -508,8 +552,12 @@
const blinda = ref(false)
const blindb = ref(false)
const blindc = ref(false)
-const blindd = ref(false)
const mulan = ref(false)
+const isLoading = ref(true)
+const isSubmitting = ref(false)
+const activeTab = ref('')
+const tabList = ref([])
+const internalInstance = getCurrentInstance()
const tableDataa = ref([])
const tableDatab = ref([])
const tableDatac = ref([])
@@ -527,7 +575,6 @@
const rightRemove = ref('')
const topRemove = ref('')
const filmsId = ref('')
-const flowCardId = ref('')
const pairTotal = ref()
const productName = ref('')
const customerName = ref('')
@@ -539,7 +586,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([]);
let selectedFormulaId = ref(null);
@@ -575,13 +625,24 @@
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 {
- tableDataa.value = data.queueInfo[0];
const allPageData = data;
const currentPageKeyValue = currentPageKey.value;
const currentPageData = allPageData[currentPageKeyValue];
@@ -628,10 +689,30 @@
const handleBindc = (row) => {
blindc.value = true;
};
-// 鍒犻櫎浠诲姟
-const handleBindd = (row) => {
- blindd.value = true;
-};
+// 鍒犻櫎浠诲姟
+const handleDelete = async (flowCardId) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('hellow.hollowtaskdet'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ var url = "/hollowGlass/hollowGlassOutRelationInfo/deleteHollowTaskDetails?flowCardId=" + flowCardId + "&cell=" + 932;
+ const response = await request.post(url)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.msg);
+ }
+ }
+ } catch (error) {
+ }
+};
const removalMethodMap = {
1: t('Mounting.removal'),
0: t('Mounting.noremoval')
@@ -670,16 +751,18 @@
};
// 缂虹墖璇︽儏
const handleBindRack = (row) => {
- currentPage2.value = 1;
- const { flowCardId} = row;
- currentRow.flowCardId = row.flowCardId;
+ 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()
};
// 寮哄埗鍑虹墖
@@ -851,7 +934,7 @@
// 棰勮
const handleup = async () => {
if (!selectedProjectNo.value) {
- ElMessage.error(t('basicData.plselectproject'))
+ ElMessage.error(t('hellow.plselectproject'))
return
}
try {
@@ -881,57 +964,88 @@
};
});
};
-const fetchFlowBind = async (flowCardId, page) => {
+
+// 缂虹墖璇︽儏-鐮存崯
+const handleBroke = async (row) => {
try {
- var url="/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId="+flowCardId + "&layer=" + 1;
- const response = await request.post(url)
+ 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) {
- tableDatac.value = response.data[page];
ElMessage.success(response.message);
+ const { flowCardId } = row;
+ fetchFlowBind(currentRow.flowCardId);
+ fetchFlowCardId()
+ } else {
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ console.error(error);
+ }
+}
+const fetchFlowBind = async (flowCardId) => {
+ try {
+ 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 {
- let flowCardId = window.localStorage.getItem('flowCardId')
- if (flowCardId !== '') {
- var url="/hollowGlass/hollowGlassOutRelationInfo/startTask?flowCardId="+flowCardId + "&cell=" + 932;
+ var url = "/hollowGlass/hollowGlassOutRelationInfo/startTask?cell=" + 932 ;
const response = await request.post(url)
if (response.code == 200) {
ElMessage.success(response.message);
blinda.value = false;
} else {
}
- } else {
- ElMessage({
- type: 'info',
- message: t('basicData.infonull'),
- })
- }
} catch (error) {
}
}
// 鏆傚仠浠诲姟
const handlec = async () => {
try {
- let flowCardId = window.localStorage.getItem('flowCardId')
- if (flowCardId !== '') {
- var url="/hollowGlass/hollowGlassOutRelationInfo/pauseTask?flowCardId="+flowCardId + "&cell=" + 932;
+ var url = "/hollowGlass/hollowGlassOutRelationInfo/pauseTask?cell=" + 932;
const response = await request.post(url)
if (response.code == 200) {
ElMessage.success(response.message);
blindc.value = false;
} else {
}
- } else {
- ElMessage({
- type: 'info',
- message: t('basicData.infonull'),
- })
- }
} catch (error) {
}
}
@@ -964,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)
@@ -973,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);
}
}
// 寮哄埗鍑虹墖
@@ -1002,6 +1124,92 @@
onBeforeUnmount(() => {
closeWebSocket();
});
+
+import requestErp from "@/utils/requestErp";
+import { hiprint } from "vue-plugin-hiprint";
+import PrintCustomLabelXJ from './PrintCustomLabelTwo.vue'
+const listFlow = ref([])
+let hiprintTemplate = ref()
+const stateValue = ref('')
+const stateOptions = [
+ {
+ value: t('processCard.thisIsTheIndoorSurface'),
+ label: t('processCard.thisIsTheIndoorSurface'),
+ },
+ {
+ value: t('processCard.thisSideIsOutsideTheRoom'),
+ label: t('processCard.thisSideIsOutsideTheRoom'),
+ },
+]
+const blinde = ref(false)
+const labelPrint = ref(false);
+const handleBinde = (flowCard) => {
+ const summary = flowCard
+ .filter(item => item.isPair !== 0)
+ .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();
+};
+const changeTag = () => {
+ hiprintTemplate.value = new hiprint.PrintTemplate({});
+ const json = JSON.parse(tag.value.value)
+ hiprintTemplate.value.update(json)
+}
+
+const getTags = async () => {
+ try {
+ const response = await requestErp.get('tagStyle/getTagList')
+ if (response.code == 200) {
+ tags.value = response.data
+ ElMessage.success(response.message);
+ }
+ } catch (error) {
+ }
+}
+
+
+
+const printOrder = (type) => {
+ const list = hiprintTemplate.value.getJson()
+ list.panels[0].printElements.forEach(element => {
+ element.options.fontFamily = 'Arial'
+ })
+ console.log(lastList.value)
+ let object = lastList.value
+ //鍒ゆ柇鏄惁涓鸿〃鏍�
+ let columnsNum = null
+ if (list.panels[0].printElements[0].options.field === 'table') {
+ object = { table: lastList.value }
+ columnsNum = (list.panels[0].printElements[0].options.gridColumns || 1)
+ }
+ hiprintTemplate.value.print(object)
+
+}
+let lastList = ref([])
+const tags = ref([])
+
+const tag = ref({
+ id: null,
+ name: null,
+ type: 1,
+ tagWidth: null,
+ tagHeight: null,
+ value: null,
+ size: null
+})
</script>
<style scoped>
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
@@ -1020,4 +1228,35 @@
::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