From 12f2fd73462da331478fabc7eaa79fc35b1a59b3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 19 七月 2024 16:41:17 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue
index 6258d27..8acc7c9 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue
@@ -111,7 +111,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;
@@ -175,10 +175,18 @@
   height: 25px;
   font-weight: bold;
   font-size: 15pt;
+  margin-left: 40px;
+}
+.row1 span{
+  font-size: 15pt;
+}
+
+.row2 span{
+  font-size: 15pt;
 }
 
 .row5 span{
-  font-size: 10pt;
+  font-size: 15pt;
 }
 
 .row6 {
@@ -189,16 +197,17 @@
 
 
 
-@page {
-  size: auto;  /* auto is the initial value */
-  margin: 12mm 4mm 2mm 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: 12mm 4mm 2mm 6mm  /* this affects the margin in the printer settings */
+
+  }
 }
 
 </style>
\ No newline at end of file

--
Gitblit v1.8.0