From 8b7d4b9527b9e196df4b9ac7cf113f06798f7941 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 15 八月 2024 15:01:00 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue | 6 ++----
1 files changed, 2 insertions(+), 4 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..2c7bebb 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,8 +100,6 @@
}
// 閬嶅巻 lastList 骞舵洿鏂板搴旂殑灞炴��
- console.log(lastList.value,id)
- console.log(lastList.value[index].glassNumber)
lastList.value.forEach(obj => {
// 鑾峰彇鍓嶇紑鍜� orderId
const prefix = obj.processId.substring(0, 11);
--
Gitblit v1.8.0