From 664df90a747e5a97b4e1131a5f958ded3176250c Mon Sep 17 00:00:00 2001
From: z8018 <1282578289@qq.com>
Date: 星期四, 25 十二月 2025 11:23:35 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215

---
 项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue"
index c7c216f..d5e94f0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue"
@@ -109,7 +109,7 @@
                                     </div>
                                     <div class="column-preview">
                                         <span class="label-preview">鏁伴噺/鎬绘暟</span>
-                                        <span class="value-preview full-width">{{ item.quantityTotal }}</span>
+                                        <span class="value-preview full-width">{{ item.quantity }}</span>
                                     </div>
                                 </div>
 
@@ -192,6 +192,7 @@
                         return
                     }
 
+  
                     printWindow.document.write(`
             <!DOCTYPE html>
             <html>
@@ -235,27 +236,40 @@
                     margin: 0 !important;
                     padding: 0 !important;
                   }
-                  
-                  body {
+
+                  html {
+                    height: auto !important;
                     width: 80mm !important;
-                    height: 60mm !important;
                     margin: 0 !important;
                     padding: 0 !important;
                     background: white !important;
                   }
-                  
+
+                  body {
+                    height: auto !important;
+                    width: 80mm !important;
+                    margin: 0 !important;
+                    padding: 0 !important;
+                    background: white !important;
+                    overflow: visible !important;
+                    min-height: 0 !important;
+                    max-height: none !important;
+                  }
+
                   .print-page {
                     width: 80mm !important;
                     height: 60mm !important;
-                    page-break-after: always !important;
                     margin: 0 !important;
                     padding: 1mm !important;
                     display: block !important;
                     background: white !important;
+                    page-break-inside: avoid !important;
+                    position: relative !important;
+                    page-break-after: always !important;
                   }
-                  
+
                   .print-page:last-child {
-                    page-break-after: avoid !important;
+                    page-break-after: auto !important;
                   }
                   
                   .material-card {
@@ -285,7 +299,6 @@
                   }
                   
                   .content {
-                    height: calc(100% - 10mm) !important;
                     position: relative !important;
                   }
                   

--
Gitblit v1.9.3