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/PrintCustomLabelSemi2.vue |   40 ++++++++++++++++++++++++----------------
 1 files changed, 24 insertions(+), 16 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 66e682a..cef81b4 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
@@ -47,7 +47,6 @@
 
         }
       }
-      console.log(labelList.value)
     } else {
       ElMessage.warning(res.msg)
       router.push("/login")
@@ -112,9 +111,10 @@
       <div class="row2">
         <span>{{item.project}}</span>&nbsp;
         <span>{{ item.building_number }}</span>
+        <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
       </div>
-      <div class="row3" v-if="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.glass_child}}</span>&nbsp;
         <span>{{item.processing_note}}</span>
@@ -139,25 +139,31 @@
   display: flex;
   justify-content: left;
   flex-wrap: wrap;
-  margin-left: 5px;
+  width: 450px;
 }
 
 #entirety{
   text-align: center;
   width: 50%;
-  height: 105px;
+  height: 140px;
+  border: black 1px;
 }
 
 .row1 {
   font-size: 12pt;
   font-weight: bold;
-  height: 25px;
+  height: 35px;
 }
-
+.row1 span {
+  font-size: 14pt;
+}
 .row2 {
   font-size: 12pt;
   font-weight: bold;
-  height: 25px;
+  height: 30px;
+}
+.row2 span {
+  font-size: 14pt;
 }
 span {
   font-size: 12pt;
@@ -167,17 +173,18 @@
 .row3 {
   margin-top: -5px;
   height: 30px;
-  font-size: 20pt;
+  font-size: 22pt;
   font-weight: bolder;
+  line-height: 30px;
 }
 
 .row5 {
-  height: 25px;
+  height: 40px;
   font-weight: bold;
-  font-size: 12pt;
+  font-size: 14pt;
 }
 .row5 span {
-  font-size: 10pt;
+  font-size: 14pt;
 }
 
 .row6 {
@@ -188,16 +195,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