From 8bcd0cc77b0c7aa2c00ffd926ee87f1f09a3a3b5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 11 八月 2025 10:07:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue b/north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue
index f86b513..f518f15 100644
--- a/north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue
+++ b/north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue
@@ -200,7 +200,7 @@
                 </div>
               </div>
               <div style="display:flex;">
-                <div style="width: 100%"><span style="font-weight: bold">宸ョ▼鍚嶇О</span>锛歿{page[0].customer.project}}</div>
+                <div style="width: 100%"><span style="font-weight: bold">宸ョ▼鍚嶇О</span>锛歿{page[0].customer.project}}({{page[0].customer.batch}})</div>
               </div>
               <div style="display:flex;">
                 <div style="width: 50%"><span style="font-weight: bold">璁㈠崟鍙�</span>锛歿{page[0].customer.order_id}}</div>
@@ -338,16 +338,16 @@
 
 @media print {
   @page {
-    size: auto;  /* auto is the initial value */
+    size: B5;  /* auto is the initial value */
     margin: 4mm 5mm 0mm 5mm  /* this affects the margin in the printer settings */
 
   }
   .pages{
-    height: 95%;
+    height: 94vh;
   }
   #footsum{
     position: absolute;
-    bottom: 1cm;
+    bottom: 0cm;
     width: 100%; /* 鎴栬�呰缃垚鍏蜂綋鐨勫搴� */
   }
   #sticky-footer {

--
Gitblit v1.8.0