YiWuProject.git

			@@ -780,7 +780,7 @@
			<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>
			<el-button type="text" plain :disabled="scope.row.glassId==null" @click="handleBroke(scope.row)">{{ $t('order.dilapidation') }}{{ }}</el-button>
			</template>
			</el-table-column>
			<div style="float: right;margin-bottom: 5px;">
			@@ -994,7 +994,6 @@
			import { ElMessage, ElMessageBox } from 'element-plus'
			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';
			import { useI18n } from 'vue-i18n'
			const { t } = useI18n()
			@@ -1084,7 +1083,7 @@
			}
			]
			let socket = null;
			const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/HollowGlassOne`;
			const socketUrl = `ws://${window.ipConfig.serverUrl}/api/hollowGlass/api/talk/HollowGlassOne`;
			const currentPage = ref(parseInt(window.localStorage.getItem('currentPage')) \|\| 1);
			watch(() => currentPage.value, (newVal) => {
			window.localStorage.setItem('currentPage', newVal);
			@@ -1885,7 +1884,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] = {
			@@ -1898,6 +1899,7 @@
			return map;
			}, {});
			listFlow.value = Object.values(summary);
			console.log(listFlow.value)
			blinde.value = true;
			getTags();
			hiprint.init();