From f94dec7ddbd0aa96f642f04d41d0f74ca0edfdc7 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 25 六月 2024 18:22:30 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue
index 6e6c272..3490e2c 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue
@@ -42,7 +42,7 @@
           labelList = dataList[0]
           for (let i = 0; i < list.value.length; i++) {
             let count= list.value[i].data.length
-            for (let j = 0; j < 1; j++) {
+            for (let j = 0; j < count; j++) {
               for (let k = 0; k < list.value[i].data[j].quantity; k++){
                 lastList.value.push(list.value[i].data[j])
               }
@@ -104,12 +104,12 @@
         <div class="row4">{{faceOrientation}}</div>
         <div v-for="(item,id) in labelList"  class="contentRow">
           <div class="row1">{{ item.title }}:</div>
-          <div class="row2">{{ item1.order[item.name] }}</div>
+          <div class="row2">{{ item1[item.name] }}</div>
 
         </div>
         <div class="row3">
           <label>W:{{ item1.width }}</label>
-          &nbsp;&nbsp;
+          &nbsp;&nbsp;&nbsp;
           <label>H:{{ item1.height }}</label>
         </div>
 

--
Gitblit v1.8.0