From 8bcd0cc77b0c7aa2c00ffd926ee87f1f09a3a3b5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 11 八月 2025 10:07:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue
index dcea140..fb30922 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue
@@ -23,7 +23,8 @@
 let filterData = ref({})
 
 const data = ref({
-  printList: []
+  printList: [],
+  isRepeat:false
 })
 
 let props = defineProps({
@@ -95,6 +96,7 @@
 
 //淇敼鐩稿悓浜у搧鍚嶇О鏍囩
 const updateProductName = (event, index,id) => {
+  console.log(id,index)
   // 鍒涘缓鏄犲皠瀵硅薄
   const propertyMapping = {};
   labelList.forEach(item => {
@@ -120,6 +122,7 @@
   // 閬嶅巻 lastList 骞舵洿鏂板搴旂殑灞炴��
   props.lastList.forEach(obj => {
     // 鑾峰彇鍓嶇紑鍜� orderId
+    console.log(index)
     const prefix = props.lastList[id].processId.substring(0, 11);
     const orderId = obj.orderId;
     const glassNumber=props.lastList[id].glassNumber
@@ -172,7 +175,7 @@
 <template>
   <div id="print" class="printFlowCard_semi">
 
-      <template v-for="(item1,id) in props.lastList">
+      <template v-for="(item1,index) in props.lastList">
         <div class="entirety_semi">
       <div class="row4">{{ faceOrientation }}</div>
       <div  v-for="(item,id) in labelList" class="contentRow">

--
Gitblit v1.8.0