From 43e115a7de2c763c36d79e610a3abb1d833ea892 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 05 八月 2024 10:21:52 +0800
Subject: [PATCH] 修改发货报表

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue
index c9067f7..3575b3e 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue
@@ -77,7 +77,11 @@
   style.innerHTML =
       "body>#" +
       printId +
-      "{display:none}@media print{body>:not(#" +
+      "{display:none}@media print{" +
+      "@page {" +
+      "    size: auto; " +
+      "    margin: 13mm 4mm 0mm 4mm; " +
+      "  }body>:not(#" +
       printId +
       "){display:none !important}body>#" +
       printId +
@@ -110,7 +114,7 @@
         <span>{{ item.project }}</span>&nbsp;
         <span>{{ item.buildingNumber }}</span>
       </div>
-      <div class="row3" v-if="item.other_columns==null||JSON.parse(item.other_columns).S02==null">{{item.width}}*{{item.height}}={{item.quantity}}</div>
+      <div class="row3" v-if="item.other_columns==null||JSON.parse(item.other_columns).S02==null">{{item.width}}x{{item.height}}={{item.quantity}}</div>
       <div class="row3" v-else>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
       <div class="row5">
         <span>{{item.remarks}}</span>&nbsp;
@@ -144,6 +148,7 @@
   width: 185px;
   height: 87px;
   margin-bottom: 10px;
+  overflow: hidden;
 }
 
 .row1 {
@@ -151,11 +156,17 @@
   font-weight: bold;
   height: 20px;
 }
+.row1 span {
+  font-size: 10pt;
+}
 
 .row2 {
   font-size: 8pt;
   font-weight: bold;
   height: 20px;
+}
+.row2 span {
+  font-size: 10pt;
 }
 span {
   font-size: 10pt;
@@ -182,16 +193,19 @@
 
 
 
-@page {
-  size: auto;  /* auto is the initial value */
-  margin: 13mm 4mm 0mm 6mm  /* this affects the margin in the printer settings */
 
-}
+
+
 
 @media print {
   div {
     page-break-inside: avoid;
   }
+  @page {
+    size: auto;  /* auto is the initial value */
+    margin: 13mm 4mm 0mm 4mm;  /* this affects the margin in the printer settings */
+
+  }
 }
 
 </style>
\ No newline at end of file

--
Gitblit v1.8.0