From edc227277159601c5cb86829f1c5ce14cf7903a4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 24 九月 2024 10:12:55 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue |   53 ++++++++++++++++++++++++++++++++---------------------
 1 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue
index 25343e7..8357450 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue
@@ -78,7 +78,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 +
@@ -102,7 +106,8 @@
 <template>
   <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>
   <div id="printFlowCard" >
-    <div id="entirety" v-for="(item,id) in lastList" >
+    <template v-for="(item,id) in lastList">
+    <div id="entirety" >
       <div class="row1">
         <span>{{ item.customerAbbreviation }}</span>&nbsp;
         <span>{{ item.orderId }}</span>
@@ -111,13 +116,15 @@
         <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-else>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</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="row5">
-        <span>{{item.remarks}}</span>&nbsp;
+        <span>{{item.filmNumber}}</span>&nbsp;
         <span>{{ item.processingNote }}</span>
       </div>
     </div>
+    <div style="width: 20px" v-if="id%2===0"></div>
+    </template>
   </div>
 
 </template>
@@ -137,32 +144,33 @@
   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 {
   font-size: 12pt;
   font-weight: bold;
-  height: 25px;
+  height: 35px;
 }
 .row1 span {
-  font-size: 12pt;
+  font-size: 15pt;
 }
 
 .row2 {
-  font-size: 12pt;
+  font-size: 14pt;
   font-weight: bold;
-  height: 25px;
+  height: 35px;
 }
 .row2 span {
-  font-size: 12pt;
+  font-size: 14pt;
 }
 span {
   font-size: 12pt;
@@ -171,18 +179,20 @@
 
 .row3 {
   margin-top: -5px;
-  height: 30px;
-  font-size: 20pt;
+  height: 35px;
+  font-size: 22pt;
   font-weight: bolder;
+  line-height: 35px;
 }
 
 .row5 {
-  height: 25px;
+  height: 50px;
   font-weight: bold;
   font-size: 12pt;
+  margin-left: 20px;
 }
 .row5 span {
-  font-size: 12pt;
+  font-size: 14pt;
 }
 
 .row6 {
@@ -193,16 +203,17 @@
 
 
 
-@page {
-  size: auto;  /* auto is the initial value */
-  margin: 2mm 2mm 2mm 2mm;  /* this affects the margin in the printer settings */
 
-}
 
 @media print {
   div {
     page-break-inside: avoid;
   }
+  @page {
+    size: auto;  /* auto is the initial value */
+    margin: 2mm 2mm 2mm 2mm;  /* this affects the margin in the printer settings */
+
+  }
 }
 
 </style>
\ No newline at end of file

--
Gitblit v1.8.0