From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整
---
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 499eaaf..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
@@ -100,13 +100,12 @@
}
// 閬嶅巻 lastList 骞舵洿鏂板搴旂殑灞炴��
- console.log(lastList.value,id)
- console.log(lastList.value[index].glassNumber)
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;
@@ -115,9 +114,12 @@
if (propertyName === 'project' && orderId === obj.orderId) {
obj.project = result;
}
- if (propertyName === 'productName' && glassNumber === obj.glassNumber){
+ if (propertyName === 'productName' && prefix === obj.processId.substring(0, 11)){
obj.productName = result;
}
+ if (propertyName === 'customerName' && orderId === obj.orderId){
+ obj.customerName = result;
+ }
});
}
--
Gitblit v1.8.0