From 924ce82faeec6d896fcdc360b279215e84b69fb9 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 11 九月 2025 11:44:44 +0800
Subject: [PATCH] 1、代码补充提交
---
UI-Project/src/views/UnLoadGlass/PrintFlow.vue | 426 +++++++++++++++++++++++-----------------------------
1 files changed, 189 insertions(+), 237 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
index 709f477..51fd3e6 100644
--- a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
+++ b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
@@ -1,19 +1,23 @@
<script setup>
import { useI18n } from 'vue-i18n'
- const { t } = useI18n()
- let language = ref(localStorage.getItem('lang') || 'zh')
-import {Search} from "@element-plus/icons-vue";
-import {useRouter} from "vue-router"
+const { t } = useI18n()
+let language = ref(localStorage.getItem('lang') || 'zh')
+import { Search } from "@element-plus/icons-vue";
+import { useRouter } from "vue-router"
const router = useRouter()
import request from "@/utils/request"
-import { WebSocketHost ,host} from '@/utils/constants'
-import { ref, onMounted , onBeforeUnmount, reactive, computed,onUnmounted } from "vue";
+import { WebSocketHost, host } from '@/utils/constants'
+import { ref, onMounted, onBeforeUnmount, reactive, computed, onUnmounted } from "vue";
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
import { ElMessage, ElMessageBox } from 'element-plus'
import companyInfo from "@/lang/companyInfo";
import QRCode from "qrcode";
-
+const currentTime = new Date();
+const formattedTime = currentTime.getFullYear()
+ + '-' + (currentTime.getMonth() + 1) + '-'
+ + currentTime.getDate() + ' ' + currentTime.getHours() + ':'
+ + currentTime.getMinutes();formattedTime
const company = companyInfo()
const printMerge = null
let props = defineProps({
@@ -47,67 +51,82 @@
for (let i = 0; i < produceList.value.length; i++) {
//鏁伴噺
let totalQuantity = 0;
+ //钀芥灦鏁伴噺
+ let totalQuantity1 = 0;
//闈㈢Н
let totalArea = 0;
+ //钀芥灦闈㈢Н
+ let totalArea1 = 0;
//閲嶉噺
let totalWeight = 0;
+ //钀芥灦閲嶉噺
+ let totalWeight1 = 0;
// 瀵规瘡涓泦鍚堜腑鐨� detailList 杩涜璁＄畻
produceList.value[i].detailList.forEach(collection => {
totalQuantity += collection.quantity * 1;
+ totalQuantity1 += collection.quantity1 * 1;
//姣忎釜搴忓彿闈㈢Н
collection.total_area = parseFloat((collection.width * collection.height * collection.quantity / 1000000).toFixed(2))
totalArea += collection.total_area * 1;
+
+ collection.total_area1 = parseFloat((collection.width * collection.height * collection.quantity1 / 1000000).toFixed(2))
+ totalArea1 += collection.total_area1 * 1;
+
totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
+ totalWeight1 += collection.width * collection.height * collection.quantity1 / 1000000 * collection.separation * 2.5 * 1;
//姣忎釜搴忓彿鍛ㄩ暱
collection.perimeter = parseFloat(((collection.width * 2 + collection.height * 2) * collection.quantity / 1000).toFixed(3))
});
// 杈撳嚭姣忎釜闆嗗悎涓殑鎬绘暟閲�
produceList.value[i].detail[0].quantity = totalQuantity
+ produceList.value[i].detail[0].quantity1 = totalQuantity1
produceList.value[i].detail[0].gross_area = totalArea
+ produceList.value[i].detail[0].gross_area1 = totalArea1
produceList.value[i].detail[0].weight = totalWeight
+ produceList.value[i].detail[0].weight1 = totalWeight1
}
}
onMounted(async () => {
- console.log(props.printFlowCardId,props.printLayer)
+ console.log(props.printFlowCardId, props.printLayer)
try {
-
- const response = await request.post('/unLoadGlass/downGlassInfo/downGlassPrint',{
- flowCardId:props.printFlowCardId,
- layer:props.printLayer
+
+ const response = await request.post('/unLoadGlass/downGlassInfo/downGlassPrint', {
+ flowCardId: props.printFlowCardId,
+ layer: props.printLayer
});
if (response.code == 200) {
-
+
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
produceList.value = response.data;
ElMessage.success(response.message);
for (let j = 0; j < produceList.value.length; j++) {
- let sumWeight = 0
- produceList.value[j].detailList.forEach((item, index) => {
- // 瑙ｆ瀽 separation 瀛楁鐨� JSON 瀛楃涓�
- let separationObj = JSON.parse(item.separation);
+ let sumWeight = 0
+ produceList.value[j].detailList.forEach((item, index) => {
+ // 瑙ｆ瀽 separation 瀛楁鐨� JSON 瀛楃涓�
+ let separationObj = JSON.parse(item.separation);
- // 鑾峰彇 thickness 鐨勫師濮嬪��
- let thicknessValue = separationObj.thickness;
+ // 鑾峰彇 thickness 鐨勫師濮嬪��
+ let thicknessValue = separationObj.thickness;
- // 鍘婚櫎 'mm' 鍗曚綅
- let thicknessWithoutUnit = thicknessValue.replace('mm', '');
+ // 鍘婚櫎 'mm' 鍗曚綅
+ let thicknessWithoutUnit = thicknessValue.replace('mm', '');
- item.separation = thicknessWithoutUnit
+ item.separation = thicknessWithoutUnit
- sumWeight += item.width * item.height * item.quantity / 1000000 * item.separation * 2.5 * 1;
+ sumWeight += item.width * item.height * item.quantity / 1000000 * item.separation * 2.5 * 1;
- });
- produceList.value[j].detail[0].weight = sumWeight
- }
- handleGetQRCode()
- handleSummary()
- // printFlowCard();
+ });
+ produceList.value[j].detail[0].weight = sumWeight
+ }
+ handleGetQRCode()
+ handleSummary()
+ // printFlowCard();
-
-
+
+
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
@@ -119,206 +138,147 @@
});
</script>
<template>
- <div id="printFlowCard">
- <table v-for="(item,id) in produceList" id="contentTable" :key="id">
+ <div id="printFlowCard">
+ <table v-for="(item, id) in produceList" id="contentTable" :key="id">
<thead>
- <tr v-for="(itemFlow,index) in item.detail" :key="index">
- <td colspan="29">
- <div style="float: left;"><input style="border: none;font-size: 28px;width: 70px;margin: 5px "/></div>
- <div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
- <div>{{ company.companyName }}</div>
- <div>鐢熶骇娴佺▼鍗�</div>
- <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">
- {{itemFlow.otherRemarks}}
- 娴佺▼鍗″彿锛� {{
- itemFlow.process_id
- }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ flowCardCount }} 鏋�
+ <tr v-for="(itemFlow, index) in item.detail" :key="index">
+ <td colspan="29">
+ <div style="float: left;"><input style="border: none;font-size: 28px;width: 70px;margin: 5px " /></div>
+ <div id="bj" style="float: right;font-size: 28px">{{ props.printLayer }}</div>
+ <div>{{ company.companyName }}</div>
+ <div>鐢熶骇娴佺▼鍗�</div>
+ <div style="font-weight: bolder;display: flex;justify-content:space-between">
+ <div>
+ 鏃堕棿锛歿{formattedTime}}
+
+ </div>
+ <div>{{itemFlow.rack}}
+ 娴佺▼鍗″彿锛� {{
+ itemFlow.process_id
+ }}/{{ props.printLayer }}
+ </div>
</div>
- <div v-else style="text-align: right;font-weight: bolder">
- {{itemFlow.otherRemarks}}
- 娴佺▼鍗″彿锛� {{
- itemFlow.process_id
- }}/{{ itemFlow.technologyNumber }} 鍏� {{ flowCardCount }} 鏋�
- </div>
- </td>
- </tr>
- <tr v-for="(items,index) in item.detail" :key="index">
- <td class="tdNowrap">瀹㈡埛鍚嶇О锛�</td>
- <td colspan="2">{{ items.customer_name }}</td>
- <td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
- <td colspan="2">{{ items.project }}</td>
- <td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
- <td colspan="22" style="width: 500px">{{ items.process }}</td>
+ </td>
+ </tr>
+ <tr v-for="(items,index) in item.detail" :key="index">
+ <td class="tdNowrap" style="width: 75px">瀹㈡埛鍚嶇О锛�</td>
+ <td colspan="1" style="width: 150px;font-size: 17px">{{ items.customer_name }}</td>
+ <td class="tdNowrap" style="min-width: 75px">纾ㄨ竟绫诲瀷锛�</td>
+ <td colspan="1" style="min-width: 50px">{{ items.edging_type }}</td>
+ <td colspan="2" style="min-width: 150px" class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
+ <td :colspan="item.processList.length*2" style="width: 500px">{{ items.process }}</td>
</tr>
<tr v-for="(itemTr,index) in item.detail" :key="index">
- <td class="tdNowrap">纾ㄨ竟绫诲瀷锛�</td>
- <td colspan="2">{{ itemTr.edging_type }}</td>
+ <td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
+ <td colspan="1" style="font-size: 17px">{{ itemTr.project }}</td>
<td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
- <td colspan="2">{{ itemTr.glass_child }}</td>
- <td class="tdNowrap">浜у搧鍚嶇О锛�</td>
- <td colspan="22">{{ itemTr.product_name }}</td>
+ <td colspan="1">{{ itemTr.glass_child }}</td>
+ <td colspan="2" class="tdNowrap">浜у搧鍚嶇О锛�</td>
+ <td :colspan="item.processList.length*2">{{ itemTr.product_name }}</td>
</tr>
- <tr>
- <td rowspan='2'>搴忓彿</td>
- <td rowspan='2'>缂栧彿</td>
- <td rowspan="2">灏忕墖椤哄簭</td>
- <td rowspan='2' style="width: 90px">瀹�*楂�</td>
- <td rowspan='2'>鏁伴噺</td>
- <td rowspan='2'>闈㈢Н</td>
- <td rowspan='2'>鍛ㄩ暱</td>
- <td rowspan='2'>鍗婂緞</td>
- <td rowspan='2'>澶囨敞</td>
- <td v-for="(itemPr,index) in item.processList" :key="index" colspan="2">{{ itemPr.process }}</td>
- </tr>
- <tr>
-
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
- </tr>
+ <tr>
+ <td rowspan='2'>搴忓彿</td>
+ <!-- <td rowspan='2'>缂栧彿</td> -->
+ <td rowspan='4' style="width: 90px">瀹�*楂�</td>
+ <td rowspan='2'>鏁伴噺</td>
+ <td rowspan='2'>钀芥灦</td>
+ <td rowspan='2'>闈㈢Н</td>
+ <!-- <td rowspan='2'>鍛ㄩ暱</td>
+ <td rowspan='2'>鍗婂緞</td> -->
+ <td rowspan='2'>澶囨敞</td>
+ <td v-for="(itemPr, index) in item.processList" :key="index" colspan="2">{{ itemPr.process }}</td>
+ </tr>
+ <tr>
+ <template v-for=" n in item.processList.length">
+ <td colspan='2'>姝ｅ搧</td>
+ </template>
+ </tr>
</thead>
<tbody>
- <tr v-for="(itemDatile,index) in item.detailList" :key="index">
- <td>{{ itemDatile.order_number }}</td>
- <td>{{ itemDatile.s01Value }}</td>
- <td>{{ itemDatile.technology_number }}</td>
- <td>{{ itemDatile.child_width }}</td>
- <td class="item" style="width: 5%;height: 100%;">
- <input v-model="itemDatile.quantity" style="width: 100%;height: 100%" @keyup="handleSummary()"/>
- </td>
- <td>{{ itemDatile.total_area }}</td>
- <td>{{ itemDatile.perimeter }}</td>
- <td>{{ itemDatile.bend_radius }}</td>
- <td>{{ itemDatile.remarks }}</td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- </tr>
+ <tr v-for="(itemDatile, index) in item.detailList" :key="index">
+ <td>{{ itemDatile.order_number }}</td>
+ <!-- <td>{{ itemDatile.s01Value }}</td> -->
+ <!-- <td>{{ itemDatile.technology_number }}</td> -->
+ <td>{{ itemDatile.child_width }}</td>
+ <td class="item" style="width: 5%;height: 100%;">
+ {{ itemDatile.quantity }}
+ <!-- <input v-model="itemDatile.quantity" style="width: 100%;height: 100%" @keyup="handleSummary()"/> -->
+ </td>
+ <td>{{ itemDatile.quantity1 }}</td>
+ <td>{{ itemDatile.total_area }}</td>
+ <!-- <td>{{ itemDatile.perimeter }}</td>
+ <td>{{ itemDatile.bend_radius }}</td> -->
+ <td>{{ itemDatile.remarks }}</td>
+ <template v-for=" n in item.processList.length">
+ <td colspan='2'></td>
+ </template>
+ </tr>
+
+
+ <tr style="height: 14px">
+ <td v-for="(itemsum, index) in item.detail" :key="index" colspan="29">
+ 鏁伴噺锛�
+ <label>{{ itemsum.quantity }}</label>
+ 钀芥灦鏁伴噺锛�
+ <label>{{ itemsum.quantity1 }}</label>
+ 闈㈢Н锛�
+ <label>{{ parseFloat(itemsum.gross_area.toFixed(2)) }}</label>
+ 钀芥灦闈㈢Н锛�
+ <label>{{ parseFloat(itemsum.gross_area1.toFixed(2)) }}</label>
+ 閲嶉噺锛�
+ <label>{{ parseFloat(itemsum.weight.toFixed(2)) }}</label>
+ 钀芥灦閲嶉噺锛�
+ <label>{{ parseFloat(itemsum.weight1.toFixed(2)) }}</label>
+ </td>
+ </tr>
+ <tr>
+ <td>瀹屽伐绛惧悕</td>
+ <td colspan="1"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <template v-for=" n in item.processList.length">
+ <td colspan="2"></td>
+ </template>
+ </tr>
+ <tr>
+ <td>璐ㄦ绛惧悕</td>
+ <td colspan="1"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <template v-for=" n in item.processList.length">
+ <td colspan="2"></td>
+ </template>
+ </tr>
+
+ <tr v-for="(qrCodeItem, index) in item.detail" :key="index">
+ <td colspan="29">
+ <span style="display: flex;">
+ <span v-for="(qrCodeItems, index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 35%">
+ <div class='qrCode' style="width: 80px;height: 80px;">
+ <img :src=qrCodeItems.qrcode>
+ </div>
+ <span style="float: left;font-weight: bolder">{{
+ qrCodeItem.process_id + "/" + qrCodeItems.technologyNumber
+ }}</span>
+ </span>
+ </span>
+ </td>
+
+ </tr>
+
+ <!-- <tfoot> -->
+ <tr v-for="(itemtextareas, index) in item.detail" :key="index">
+ <td colspan="29" rowspan="6" style="width: 480px;height: 150px ">
+ <div style="width: 100%;height: 100%;"><textarea
+ style="height: 99%;width: 99%;border: none;;font-size: 12px;overflow: hidden;">{{
+ itemtextareas.processing_note }}</textarea>
+ </div>
+ </td>
+ </tr>
</tbody>
- <tfoot>
- <tr style="height: 14px">
- <td v-for="(itemsum,index) in item.detail" :key="index" colspan="29">
- 鏁伴噺锛�
- <label>{{ itemsum.quantity }}</label>
- 闈㈢Н锛�
- <label>{{ parseFloat(itemsum.gross_area.toFixed(2)) }}</label>
- 閲嶉噺锛�
- <label>{{ parseFloat(itemsum.weight.toFixed(2)) }}</label>
- </td>
- </tr>
- <tr v-for="(itemtextarea,index) in item.detail" :key="index">
-
- <td>瀹屽伐绛惧悕</td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- </tr>
- <tr>
- <td>鐢熶骇鏃ユ湡</td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- </tr>
- <tr>
- <td>璐ㄦ绛惧悕</td>
- <td colspan="2"></td>
- <td colspan="2">鐢熶骇绛惧悕</td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- </tr>
- <tr>
- <td>鍘熺墖绠卞彿</td>
- <td colspan="28"></td>
- </tr>
- <tr v-for="(qrCodeItem,index) in item.detail" :key="index">
- <td colspan="29">
- <span style="display: flex;">
- <span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 35%">
- <div class='qrCode' style="width: 80px;height: 80px;">
- <img :src=qrCodeItems.qrcode>
- </div>
- <span style="float: left;font-weight: bolder">{{
- qrCodeItem.process_id + "/" + qrCodeItems.technologyNumber
- }}</span>
- </span>
- </span>
- </td>
-
- </tr>
- <tr v-for="(itemtextareas,index) in item.detail" :key="index">
- <td colspan="29" rowspan="6" style="width: 480px;height: 150px ">
- <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 12px;overflow: hidden;">{{itemtextareas.processing_note}}</textarea>
- </div>
- </td>
- </tr>
- </tfoot>
+ <!-- </tfoot> -->
</table>
</div>
</template>
@@ -332,7 +292,7 @@
#printFlowCard {
text-align: center;
-//font-weight: bolder; height: 600px;
+ //font-weight: bolder; height: 600px;
}
#contentTable {
@@ -357,20 +317,16 @@
font-weight: bolder;
}
-#contentTable tbody {
+#contentTable tbody {}
-}
-
-.tdNowrap {
-
-}
+.tdNowrap {}
#contentTable tfoot {
font-size: 12px;
font-weight: bolder;
}
-input{
+input {
border: none;
background: none;
}
@@ -380,9 +336,8 @@
@media print {
@page {
- size: auto;
- margin: 4mm 5mm 5mm 5mm
-
+ size: auto;
+ margin: 4mm 5mm 5mm 5mm
}
table {
@@ -390,8 +345,8 @@
page-break-inside: auto;
}
- #contentTable thead {
- display: table-header-group;
+ #contentTable thead {
+ display: table-header-group;
}
tfoot {
@@ -404,7 +359,4 @@
width: 100%;
height: 100%;
}
-
-
-
</style>
\ No newline at end of file
--
Gitblit v1.8.0