From 7ba23e6e4870465855d80d026cf31490e0f8d427 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 22 九月 2025 11:20:47 +0800
Subject: [PATCH] 中空一线、二线。三线页面改造
---
UI-Project/src/views/hollow/hollowequipmenthree.vue | 259 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 184 insertions(+), 75 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipmenthree.vue b/UI-Project/src/views/hollow/hollowequipmenthree.vue
index d6511c4..f02aeb0 100644
--- a/UI-Project/src/views/hollow/hollowequipmenthree.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenthree.vue
@@ -15,10 +15,6 @@
<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,44 @@
<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;" :disabled="listFlow.length > 0 ? false : true" id="searchButton" type="warning" @click="handleBinde">{{
+ $t('searchOrder.printlabels')
+ }}
+ </el-button>
+ </div>
+ <!-- 鍔ㄦ�佽〃鏍� -->
+ <el-table
+ :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="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
@@ -413,17 +431,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 +463,7 @@
v-model="selectedProjectNo"
filterable
clearable
- :placeholder="$t('basicData.plselectproject')"
+ :placeholder="$t('hellow.plselectproject')"
style="width: 260px"
>
<el-option
@@ -499,7 +530,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 +539,10 @@
const blinda = ref(false)
const blindb = ref(false)
const blindc = ref(false)
-const blindd = ref(false)
const mulan = ref(false)
+const activeTab = ref('')
+const tabList = ref([])
+const internalInstance = getCurrentInstance()
const tableDataa = ref([])
const tableDatab = ref([])
const tableDatac = ref([])
@@ -580,8 +613,17 @@
fetchFlowBind(currentRow.flowCardId, currentPage2.value);
};
const handleMessage = (data) => {
+ const rawData = data.queueInfo[0]
+ const formattedData = Object.entries(rawData).map(([key, data]) => ({
+ title: key,
+ tableDataa: Array.isArray(data) ? data : [data]
+ }));
+ tabList.value = formattedData;
+ if (tabList.value.length > 0) {
+ activeTab.value = tabList.value[0].title;
+ }
+ internalInstance.ctx.$forceUpdate();
try {
- tableDataa.value = data.queueInfo[0];
const allPageData = data;
const currentPageKeyValue = currentPageKey.value;
const currentPageData = allPageData[currentPageKeyValue];
@@ -628,10 +670,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=" + 930;
+ 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')
@@ -702,10 +764,8 @@
tableDatab.value = response.data;
pairTotal.value = response.data[0].pairTotalCount;
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
function tableRowClassName({ row }) {
@@ -732,10 +792,8 @@
tableDatab.value = response.data;
pairTotal.value = response.data[0].pairTotalCount;
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
// 涓┖閰嶆柟
@@ -748,10 +806,8 @@
tableDatax.value = response.data;
titleformulaName.value = response.data.map(item => ({ formulaId: item.id, formulaName: item.formulaName }));
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
const handleFormulaChange = (value) => {
@@ -786,10 +842,8 @@
topRemove.value = '';
fetchmulan()
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
const removalMethodMapa = {
@@ -812,10 +866,8 @@
adda.value = false
fetchmulan()
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
// 涓┖閰嶆柟鍒犻櫎
@@ -837,7 +889,6 @@
ElMessage.success(response.message);
fetchmulan()
} else {
- ElMessage.error(response.msg);
}
}
} catch (error) {
@@ -855,16 +906,14 @@
}));
titleSelectJson.value.processType = processTypes;
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
// 棰勮
const handleup = async () => {
if (!selectedProjectNo.value) {
- ElMessage.error(t('basicData.plselectproject'))
+ ElMessage.error(t('hellow.plselectproject'))
return
}
try {
@@ -877,11 +926,22 @@
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 {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
const parseData = (rawData) => {
@@ -904,7 +964,6 @@
tableDatac.value = response.data[page];
ElMessage.success(response.message);
} else {
- ElMessage.error(response.message);
}
} catch (error) {
}
@@ -912,44 +971,26 @@
// 寮�濮嬩换鍔�
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 {
- ElMessage.error(response.message);
}
- } 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 {
- ElMessage.error(response.message);
}
- } else {
- ElMessage({
- type: 'info',
- message: t('basicData.infonull'),
- })
- }
} catch (error) {
}
}
@@ -964,7 +1005,6 @@
ElMessage.success(response.message);
blindd.value = false;
} else {
- ElMessage.error(response.message);
}
} else {
ElMessage({
@@ -993,7 +1033,6 @@
formulaName.value = '';
totalPairQuantity.value = '';
} else {
- ElMessage.error(response.message);
}
} catch (error) {
}
@@ -1015,7 +1054,6 @@
cella.value = '';
totalPairQuantitya.value = '';
} else {
- ElMessage.error(response.message);
}
} catch (error) {
}
@@ -1023,6 +1061,77 @@
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 = (row) => {
+ 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;}
--
Gitblit v1.8.0