From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/UnLoadGlass/PrintFlow.vue | 63 +++++++------------------------
1 files changed, 15 insertions(+), 48 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
index fa5a0e8..94f7c26 100644
--- a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
+++ b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
@@ -12,8 +12,6 @@
import { ElMessage, ElMessageBox } from 'element-plus'
import companyInfo from "@/lang/companyInfo";
import QRCode from "qrcode";
-
-
const company = companyInfo()
const printMerge = null
let props = defineProps({
@@ -25,23 +23,18 @@
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
-
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++) {
@@ -51,8 +44,12 @@
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;
@@ -60,30 +57,30 @@
//姣忎釜搴忓彿闈㈢Н
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 = 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)
try {
-
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);
@@ -92,26 +89,18 @@
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 {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
@@ -176,7 +165,6 @@
<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>
@@ -200,7 +188,6 @@
</tr>
</thead>
<tbody>
-
<tr v-for="(itemDatile,index) in item.detailList" :key="index">
<td>{{ itemDatile.order_number }}</td>
<!-- <td>{{ itemDatile.s01Value }}</td> -->
@@ -242,16 +229,19 @@
<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 v-for="(itemtextarea,index) in item.detail" :key="index">
-
<td>瀹屽伐绛惧悕</td>
<td colspan="2"></td>
<td colspan="2"></td>
@@ -319,7 +309,6 @@
</span>
</span>
</td>
-
</tr>
<tr v-for="(itemtextareas,index) in item.detail" :key="index">
<td colspan="29" rowspan="6" style="width: 480px;height: 150px ">
@@ -337,83 +326,61 @@
padding: 0;
text-align: center;
}
-
-
#printFlowCard {
text-align: center;
//font-weight: bolder; height: 600px;
}
-
#contentTable {
border-collapse: collapse;
border: 1px solid black;
width: 100%;
}
-
#contentTable thead {
font-size: 13px;
font-weight: bolder;
}
-
#contentTable thead div {
font-size: 15px;
font-weight: bolder;
}
-
#contentTable tr td {
border: 1px solid black;
height: 18px;
font-weight: bolder;
}
-
#contentTable tbody {
}
-
.tdNowrap {
}
-
#contentTable tfoot {
font-size: 12px;
font-weight: bolder;
}
-
input{
border: none;
background: none;
}
-
-
-
-
@media print {
@page {
size: auto;
margin: 4mm 5mm 5mm 5mm
-
}
-
table {
page-break-before: always;
page-break-inside: auto;
}
-
#contentTable thead {
display: table-header-group;
}
-
tfoot {
display: table-footer-group;
page-break-inside: avoid;
}
}
-
.qrCode img {
width: 100%;
height: 100%;
}
-
-
-
</style>
\ No newline at end of file
--
Gitblit v1.8.0