From 5985a3693d4d902455b9fd46b052362417b044d7 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 16 八月 2024 16:32:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/UnLoadGlass/PrintFlow.vue | 87 ++++++++++++++++++++++---------------------
1 files changed, 44 insertions(+), 43 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
index 26a1a9f..235e147 100644
--- a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
+++ b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
@@ -69,54 +69,56 @@
}
-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();
+// 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 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);
+// // 鏍峰紡鎺у埗涓庢墦鍗版棤鍏崇殑鍏冪礌闅愯棌
+// 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);
-}
+// // 涓巗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:props.printFlowCardId,
layer:props.printLayer
});
if (response.code == 200) {
+
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
produceList.value = response.data;
ElMessage.success(response.message);
@@ -209,11 +211,11 @@
</tr>
<tr>
<td rowspan='2'>搴忓彿</td>
+ <td rowspan='2'>缂栧彿</td>
<td v-if="like!=null" rowspan="2">灏忕墖椤哄簭</td>
<td v-else style="display: none;" rowspan="2">灏忕墖椤哄簭</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>
@@ -244,7 +246,7 @@
<tr v-for="(itemDatile,index) in item.detailList" :key="index">
<td>{{ itemDatile.order_number }}</td>
- <!-- <td>{{ itemDatile.s01Value }}</td> -->
+ <td>{{ itemDatile.s01Value }}</td>
<td v-if="like=='1'">{{ itemDatile.technology_number }}</td>
<td v-else style="display: none"></td>
<td>{{ itemDatile.child_width }}</td>
@@ -252,10 +254,9 @@
<!-- <el-input v-model="itemDatile.quantity" style="border: none" @keyup="handleSummary()"></el-input> -->
{{ itemDatile.quantity }}
</td>
- <td class="item" style="width: 5%;height: 100%;">
- <!-- <el-input v-model="itemDatile.quantity" style="border: none" @keyup="handleSummary()"></el-input> -->
+ <!-- <td class="item" style="width: 5%;height: 100%;">
{{ itemDatile.quantity1 }}
- </td>
+ </td> -->
<td>{{ itemDatile.total_area }}</td>
<td>{{ itemDatile.perimeter }}</td>
<td>{{ itemDatile.bend_radius }}</td>
@@ -415,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