From 85aa4497849d485aa2e7ae01976ddc572f7022cc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 04 七月 2024 13:13:06 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
index 05ac23c..8d2d6ca 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
@@ -106,6 +106,10 @@
value: `${company.printLabel.labelValue}`,
label: `${company.printLabel.labelType}`,
},
+ {
+ value: `${company.printLabel.labelValue3}`,
+ label: `${company.printLabel.labelType3}`,
+ },
]
//鍚堢墖娴佺▼鍗℃墦鍗颁笅鎷夐�夐」
@@ -225,7 +229,7 @@
{field: 'quantity', title: t('order.quantity'),},
{field: 'total_area', title: t('order.area'),},
{field: 'product_name', title: t('order.product'),},
- {field: 'glass_child', title: t('reportingWorks.glassChild'),},
+ {field: 'glass_child', title: t('reportingWorks.glassChild'),filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
{field: 'founder', title: t('processCard.founder'),},
{field: 'splitFrame_time', title: t('processCard.splitFrameTime'),},
],//琛ㄥご鎸夐挳
@@ -360,9 +364,12 @@
router.push({path: '/main/processCard/PrintCustomLabel', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes, printList: JSON.stringify(selectRecords)}})
}
- else {
+ else if (lableTypes==2) {
router.push({path: '/main/processCard/PrintCustomLabelSemi', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes, printList: JSON.stringify(selectRecords)}})
+ }else if (lableTypes==3) {
+ router.push({path: '/main/processCard/PrintLabel1', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes, printList: JSON.stringify(selectRecords)}})
+
}
--
Gitblit v1.8.0