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 |    5 +++--
 1 files changed, 3 insertions(+), 2 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 390c9b0..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
@@ -50,6 +50,7 @@
               }
             }
           }
+          console.log(lastList.value)
         } else {
           ElMessage.warning(res.msg)
           router.push("/login")
@@ -115,8 +116,8 @@
         <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}}x{{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.processingNote }}</span>

--
Gitblit v1.8.0