From 76bf2824bf55e8f4c3ccbc14b3b2719bf8fb219f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 03 九月 2024 10:10:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 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 2c7bebb..16cc8d4 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue
@@ -105,6 +105,7 @@
const prefix = obj.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;
@@ -113,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