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/PrintCustomLabelSemi2.vue |   36 ++++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
index cef81b4..af129c0 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
@@ -75,7 +75,11 @@
   style.innerHTML =
       "body>#" +
       printId +
-      "{display:none}@media print{body>:not(#" +
+      "{display:none}@media print{" +
+      "@page {" +
+      "    size: auto; " +
+      "    margin: 2mm 2mm 2mm 2mm;  " +
+      "  }body>:not(#" +
       printId +
       "){display:none !important}body>#" +
       printId +
@@ -99,7 +103,8 @@
 <template>
   <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>
   <div id="printFlowCard" >
-    <div id="entirety" v-for="(item,id) in labelList" >
+    <template v-for="(item,id) in labelList">
+    <div id="entirety" >
       <div class="row1">
         <span>{{ item.customer_name }}</span>&nbsp;
         <span>{{ item.order_id }}</span>&nbsp;
@@ -113,13 +118,15 @@
         <span>{{ item.building_number }}</span>
         <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
       </div>
-      <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
-      <div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>
+      <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)"> <span>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</span>&nbsp;</div>
+      <div class="row3" v-else><span>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</span></div>
       <div class="row5">
         <span>{{item.glass_child}}</span>&nbsp;
         <span>{{item.processing_note}}</span>
       </div>
     </div>
+      <div style="width: 20px" v-if="id%2===0"></div>
+    </template>
   </div>
 
 </template>
@@ -139,14 +146,15 @@
   display: flex;
   justify-content: left;
   flex-wrap: wrap;
-  width: 450px;
+  width: 500px;
 }
 
 #entirety{
   text-align: center;
-  width: 50%;
-  height: 140px;
+  width: 48%;
+  height: 160px;
   border: black 1px;
+  word-wrap: break-word;
 }
 
 .row1 {
@@ -160,7 +168,7 @@
 .row2 {
   font-size: 12pt;
   font-weight: bold;
-  height: 30px;
+  height: 35px;
 }
 .row2 span {
   font-size: 14pt;
@@ -172,14 +180,17 @@
 
 .row3 {
   margin-top: -5px;
-  height: 30px;
+  height: 35px;
   font-size: 22pt;
   font-weight: bolder;
-  line-height: 30px;
+  line-height: 35px;
+}
+.row3 span{
+  font-size: 22pt;
 }
 
 .row5 {
-  height: 40px;
+  height: 50px;
   font-weight: bold;
   font-size: 14pt;
 }
@@ -203,9 +214,10 @@
   }
   @page {
     size: auto;  /* auto is the initial value */
-    margin: 2mm 2mm 2mm 2mm;  /* this affects the margin in the printer settings */
+    margin: 13mm 4mm 0mm 4mm;  /* this affects the margin in the printer settings */
 
   }
+
 }
 
 </style>
\ No newline at end of file

--
Gitblit v1.8.0