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/PrintCustomLabel1.vue |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 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 fb067f9..abcf06b 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
@@ -35,7 +35,6 @@
 const lableType = route.query.lableType
 
 onMounted(() => {
-  console.log(lableType)
       request.post(`/processCard/getSelectPrintCustomLabel/${type}/1`, data.value).then((res) => {
         if (res.code == 200) {
           produceList.value = deepClone(res.data.title)
@@ -80,7 +79,11 @@
   style.innerHTML =
       "body>#" +
       printId +
-      "{display:none}@media print{body>:not(#" +
+      "{display:none}@media print{" +
+      "@page {" +
+      "    size: auto; " +
+      "    margin: 12mm 4mm 2mm 6mm; " +
+      "  }body>:not(#" +
       printId +
       "){display:none !important}body>#" +
       printId +
@@ -113,7 +116,8 @@
         <span>{{ item.project }}</span>&nbsp;
         <span>{{ item.buildingNumber }}</span>
       </div>
-      <div class="row3">{{item.width}}*{{item.height}}={{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.processingNote }}</span>
@@ -176,10 +180,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 {
@@ -190,16 +202,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