From 37228d95e8be6406fad13495cd1512cc81b625aa Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 14 十月 2024 08:12:44 +0800
Subject: [PATCH] 大理片添加指定人工位置下片,下片添加扫码打印标签,添加卧式理片最大尺寸限制

---
 UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue b/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue
index 9e204b5..f4f8340 100644
--- a/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue
+++ b/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue
@@ -36,13 +36,14 @@
 let props = defineProps({
   printFlowCardId: null,
   printLayer: null,
+  printGlassId: null,
 })
 
 onMounted(async () => {
-  console.log(props.printFlowCardId,props.printLayer)
   const response = await request.post('/unLoadGlass/downGlassInfo/downGlassLabelPrint',{
         flowCardId:props.printFlowCardId,
-        layer:props.printLayer
+        layer:props.printLayer,
+        glassId:props.printGlassId
     });
         if (response.code == 200) {
           console.log("lastList.value",response.data)
@@ -127,6 +128,7 @@
       </div>
     </div>
     <div style="width: 20px" v-if="index%2===0"></div>
+    <div class="print-page" v-else></div>
     </template>
   </div>
 
@@ -152,10 +154,11 @@
 
 #entirety{
   text-align: center;
-  width: 48%;
-  height: 160px;
+  width: 46%;
+  height: 170px;
   border: black 1px;
   word-wrap: break-word;
+  margin-left: 10px;
 }
 
 .row1 {
@@ -192,7 +195,7 @@
   height: 50px;
   font-weight: bold;
   font-size: 12pt;
-  margin-left: 20px;
+  /* margin-left: 20px; */
 }
 .row5 span {
   font-size: 12pt;
@@ -209,6 +212,9 @@
 
 
 @media print {
+  .print-page {
+    page-break-after: always; /* 娣诲姞鍒嗛〉绗︼紝鍦ㄦ瘡涓猵rint-page div涔嬪悗鍒嗛〉 */
+  }
   div {
     page-break-inside: avoid;
   }

--
Gitblit v1.8.0