From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示

---
 north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue
index a091c67..6367be4 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue
@@ -37,10 +37,10 @@
 const route = currentRoute.value
 let type = props.type
 let faceOrientation = props.faceOrientation
-if (type==="鑻辨枃鏍囩" && faceOrientation==="姝ら潰涓哄鍐呴潰"){
+if (type.indexOf("鑻辨枃")>-1 && faceOrientation==="姝ら潰涓哄鍐呴潰"){
   faceOrientation='INSIDE'
 }
-else if (type==="鑻辨枃鏍囩" && faceOrientation==="姝ら潰涓哄澶栭潰"){
+else if (type.indexOf("鑻辨枃")>-1 && faceOrientation==="姝ら潰涓哄澶栭潰"){
   faceOrientation='OUTSIDE'
 }
 let lableType = props.lableType
@@ -76,7 +76,7 @@
 
 
 //淇敼鐩稿悓浜у搧鍚嶇О鏍囩
-const updateProductName = (event, index) => {
+const updateProductName = (event, index,id) => {
   // 鍒涘缓鏄犲皠瀵硅薄
   const propertyMapping = {};
   labelList.forEach(item => {
@@ -102,9 +102,10 @@
   // 閬嶅巻 lastList 骞舵洿鏂板搴旂殑灞炴��
   lastList.value.forEach(obj => {
     // 鑾峰彇鍓嶇紑鍜� orderId
-    const prefix = obj.processId.substring(0, 11);
+    const prefix = lastList.value[id].processId.substring(0, 11);
     const orderId = obj.orderId;
-
+    const glassNumber=lastList.value[id].glassNumber
+    const customerName = obj.customerName
     // 鏍规嵁 propertyName 鏇存柊灞炴��
     if (propertyName === 'productAbbreviation' && prefix === obj.processId.substring(0, 11)) {
       obj.productAbbreviation = result;
@@ -112,6 +113,12 @@
 
     if (propertyName === 'project' && orderId === obj.orderId) {
       obj.project = result;
+    }
+    if (propertyName === 'productName' && prefix === obj.processId.substring(0, 11)){
+      obj.productName = result;
+    }
+    if (propertyName === 'customerName' && orderId === obj.orderId){
+      obj.customerName = result;
     }
   });
 }
@@ -122,10 +129,10 @@
 
 <template>
     <div id="print" :class="company.printLabel.className.custom.printFlowCardName()">
-      <div v-for="(item1,id) in lastList" :class="company.printLabel.className.custom.entiretyName()">
+      <div v-for="(item1,index) in lastList" :class="company.printLabel.className.custom.entiretyName()">
         <div class="row4">{{ faceOrientation }}</div>
         <div v-for="(item,id) in labelList" :class="company.printLabel.className.custom.contentRowName()">
-          <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row1"  contenteditable="true" @input="updateProductName($event, id)" v-text="item.title+'锛�'+item1[item.name]"></div>
+          <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row1"  contenteditable="true" @input="updateProductName($event, id,index)" v-text="item.title+'锛�'+item1[item.name]"></div>
 <!--          <div class="row2" style="width: 100%;"><input class="contentRow2" v-model="item1[item.name]"  @keyup="updataProductName()" style="border: none;"/></div>-->
 <!--          <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row2" style="width: 100%;" contenteditable="true" @input="updateProductName($event, id)" v-text="item1[item.name]"></div>-->
         </div>

--
Gitblit v1.8.0