From 5af5cfaab5aa3c11ae1a4cb22dfaf808e12ed5e9 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 04 三月 2025 11:03:32 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
index f432d1d..2ceed2b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
@@ -122,7 +122,7 @@
         "{display:none}@media print{" +
         "@page {" +
         "    size: auto; " +
-        "    margin: 13mm 4mm 2mm 4mm; " +
+        "    margin: 13mm 4mm 0mm 4mm; " +
         "  }body>:not(#" +
         printId +
         "){display:none !important}body>#" +
@@ -156,8 +156,8 @@
   <el-input v-if="!company.showDeliveryCreator" v-model="remarks" style="background-color: transparent;border: none;margin-top: -20px;width: 100px"/>
   <div id="printFlowCard" >
 <!--     鍗婃垚鍝佹爣绛�-->
-    <div v-if="type!=='3'" id="entirety" v-for="(item,id) in labelList" >
-
+    <template v-for="(item,id) in labelList">
+    <div v-if="type!=='3'" id="entirety" >
       <div class="row1" >
 <!--閽㈠寲鐗堝浘搴忓彿锛岄挗鍖栫増鍥鹃噷鐨勯『搴�-->
 <!--        <div class="cell" v-if="item.heat_layout_id!==undefined">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>-->
@@ -205,6 +205,8 @@
       </div>
 
     </div>
+    <div class="element-to-break-after" v-if="(id+1)%44==0"></div>
+    </template>
 
 
 
@@ -251,6 +253,7 @@
           <span style="font-size: 10pt">{{item.glass_child}}</span>&nbsp;
         </div>
       </div>
+      <div class="element-to-break-after" v-if="(id+1)%44==0"></div>
     </template>
 
   </div>
@@ -360,6 +363,10 @@
   font-size: 6pt;
 }
 
+.element-to-break-after {
+  page-break-after: always;
+}
+
 
 
 

--
Gitblit v1.8.0