From aac77d7ee28cc59aebce251b3c52243e3df6f003 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 19 八月 2024 15:18:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/UnLoadGlass/PrintFlow.vue | 162 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 144 insertions(+), 18 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
index 4c1358e..235e147 100644
--- a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
+++ b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
@@ -10,21 +10,142 @@
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 company = companyInfo()
+const printMerge = null
+let props = defineProps({
+ printFlowCardId: null,
+ printLayer: null,
+})
let produceList = ref([])
-let flowCardList = ref([])
+const handleGetQRCode = async () => {
+ for (let i = 0; i < produceList.value.length; i++) {
+ const technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
+ produceList.value[i].detail[0]["qrcodeList"] = []; // 鍒濆鍖栦竴涓┖鏁扮粍鐢ㄦ潵瀛樺偍 QR Code
-const searchout = async () => {
+ for (let j = 0; j < technologyNumber.length; j++) {
+ const processId = produceList.value[i].detail[0].process_id;
+ const url = `${processId}/${technologyNumber[j]}`;
+
+ // 鐢熸垚 QR Code 骞跺瓨鍌ㄥ埌鏁扮粍涓�
+ const qrcodeData = await QRCode.toDataURL(url);
+ produceList.value[i].detail[0]["qrcodeList"].push({
+ qrcode: qrcodeData,
+ technologyNumber: technologyNumber[j]
+ });
+
+ }
+ }
+};
+
+
+//鏍规嵁杈撳叆鐨勬暟閲忛噸鏂版眹鎬�
+const handleSummary = () => {
+ for (let i = 0; i < produceList.value.length; i++) {
+ //鏁伴噺
+ let totalQuantity = 0;
+ //闈㈢Н
+ let totalArea = 0;
+ //閲嶉噺
+ let totalWeight = 0;
+ // 瀵规瘡涓泦鍚堜腑鐨� detailList 杩涜璁＄畻
+ produceList.value[i].detailList.forEach(collection => {
+ totalQuantity += collection.quantity * 1;
+ //姣忎釜搴忓彿闈㈢Н
+ collection.total_area = parseFloat((collection.width * collection.height * collection.quantity / 1000000).toFixed(2))
+ totalArea += collection.total_area * 1;
+ totalWeight += collection.width * collection.height * collection.quantity / 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].gross_area = totalArea
+ produceList.value[i].detail[0].weight = totalWeight
+ }
+}
+
+
+// const printFlowCard = () => {
+// // 闇�瑕佹墦鍗扮殑灞�閮ㄥ尯鍩熻祴浜�"print-wrap"鐨刬d
+// let el = document.getElementById("printFlowCard");
+// let doc = document;
+// let body = doc.body || doc.getElementsByTagName("body")[0];
+// let printId = "print-" + Date.now();
+
+// // 鍒涘缓鏃犲壇浣滅敤鐨勬墦鍗板鍣�(鍥犱笉纭畾椤甸潰鐨勬墦鍗板厓绱犳湁鏃犲叾瀹冩牱寮�)
+// let content = doc.createElement("div");
+// content.id = printId;
+
+// // 鏍峰紡鎺у埗涓庢墦鍗版棤鍏崇殑鍏冪礌闅愯棌
+// let style = doc.createElement("style");
+// style.innerHTML =
+// "body>#" +
+// printId +
+// "{display:none}@media print{" +
+// "@page {" +
+// " size: auto; " +
+// " margin: 5mm 5mm 5mm 5mm; " +
+// " }body>:not(#" +
+// printId +
+// "){display:none !important}body>#" +
+// printId +
+// "{display:block;padding-top:1px}}";
+// //
+// content.innerHTML = el.outerHTML;
+// // // console.log("el.outerHTML", el.outerHTML);
+// body.appendChild(style);
+
+// // 涓巗tyle鍏冪礌璁剧疆鐨勬牱寮忕浉閰嶅悎
+// // 鎶婃墦鍗板唴瀹圭殑鍏冪礌娣诲姞鍒癰ody(浣滀负body鐨勫瓙鍏冪礌锛屽彲鐢╞ody鐨勫瓙閫夋嫨鍣� '>' 鎺у埗鎵撳嵃鏍峰紡)
+// body.appendChild(content);
+// setTimeout(() => {
+// window.print();
+// body.removeChild(content);
+// body.removeChild(style);
+// }, 20);
+// }
+
+onMounted(async () => {
+ console.log(props.printFlowCardId,props.printLayer)
try {
+
const response = await request.post('/unLoadGlass/downGlassInfo/downGlassPrint',{
- flowCardId:"NG24070506A001",
- layer:1
+ flowCardId:props.printFlowCardId,
+ layer:props.printLayer
});
if (response.code == 200) {
+
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
- produceList.value = response.data.projectInfo;
- flowCardList.value = response.data.flowCardList;
+ 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);
+
+ // 鑾峰彇 thickness 鐨勫師濮嬪��
+ let thicknessValue = separationObj.thickness;
+
+ // 鍘婚櫎 'mm' 鍗曚綅
+ let thicknessWithoutUnit = thicknessValue.replace('mm', '');
+
+ item.separation = thicknessWithoutUnit
+
+ sumWeight += item.width * item.height * item.quantity / 1000000 * item.separation * 2.5 * 1;
+
+ });
+ produceList.value[j].detail[0].weight = sumWeight
+ }
+ handleGetQRCode()
+ handleSummary()
+ // printFlowCard();
+
+
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
@@ -34,7 +155,7 @@
// 澶勭悊閿欒
console.error(error);
}
-};
+});
</script>
<template>
<div id="printFlowCard">
@@ -46,13 +167,13 @@
<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">娴佺▼鍗″彿锛� {{
+ <div v-if="itemFlow.technologyNumber!=''" style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
itemFlow.process_id
- }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ flowCardCount }} 鏋�
+ }}/{{ itemFlow.technologyNumber }}
</div>
<div v-else style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
itemFlow.process_id
- }}/{{ itemFlow.technologyNumber }} 鍏� {{ flowCardCount }} 鏋�
+ }}/{{ itemFlow.technologyNumber }}
</div>
</td>
<td v-else colspan="24">
@@ -60,9 +181,9 @@
<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">娴佺▼鍗″彿锛� {{
+ <div v-if="itemFlow.technologyNumber!=''" style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
itemFlow.process_id
- }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ flowCardCount }} 鏋�
+ }}/{{ itemFlow.technologyNumber }} 鍏� {{ flowCardCount }} 鏋�
</div>
<div v-else style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
itemFlow.process_id
@@ -130,8 +251,12 @@
<td v-else style="display: none"></td>
<td>{{ itemDatile.child_width }}</td>
<td class="item" style="width: 5%;height: 100%;">
- <el-input v-model="itemDatile.quantity" style="border: none" @keyup="handleSummary()"></el-input>
+ <!-- <el-input v-model="itemDatile.quantity" style="border: none" @keyup="handleSummary()"></el-input> -->
+ {{ itemDatile.quantity }}
</td>
+ <!-- <td class="item" style="width: 5%;height: 100%;">
+ {{ itemDatile.quantity1 }}
+ </td> -->
<td>{{ itemDatile.total_area }}</td>
<td>{{ itemDatile.perimeter }}</td>
<td>{{ itemDatile.bend_radius }}</td>
@@ -176,7 +301,7 @@
<div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 11px">{{itemtextarea.otherRemarks}}</textarea>
</div>
</td>
- <td>瀹屽伐绛惧悕</td>
+ <td colspan="2">瀹屽伐绛惧悕</td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
@@ -189,7 +314,7 @@
<td colspan="2"></td>
</tr>
<tr>
- <td>鐢熶骇鏃ユ湡</td>
+ <td colspan="2">鐢熶骇鏃ユ湡</td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
@@ -202,7 +327,7 @@
<td colspan="2"></td>
</tr>
<tr>
- <td>璐ㄦ绛惧悕</td>
+ <td colspan="2">璐ㄦ绛惧悕</td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
@@ -243,7 +368,8 @@
#printFlowCard {
text-align: center;
-//font-weight: bolder; height: 600px;
+font-weight: bolder;
+ height: 600px;
}
#contentTable {
@@ -290,7 +416,7 @@
@page {
size: auto; /* auto is the initial value */
- margin: 2mm 2mm 0mm 1mm /* this affects the margin in the printer settings */
+ margin: 10mm 2mm 10mm 1mm; /* this affects the margin in the printer settings */
}
--
Gitblit v1.8.0