From 77e6370cf2476a7c32fdd88df94cff0b042abd43 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 27 三月 2025 10:37:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
index 3f7f816..6d5c173 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
@@ -459,6 +459,7 @@
let lableTitle = lableType.text
if ($grid) {
switch (code) {
+ //鎵撳嵃娴佺▼鍗�
case 'print': {
if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -480,7 +481,7 @@
dialogTableVisible.value = true
break
}
-
+ //鏍囩鎵撳嵃 甯稿窞
case 'printLabel': {
if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -502,6 +503,7 @@
break
}
+ //鏍囩鎵撳嵃2 甯稿窞
case 'printLabel2': {
if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -551,6 +553,7 @@
})
break
}
+ //鑷畾涔夋垚鍝佹爣绛炬墦鍗�
case 'customLabel': {
if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -569,6 +572,7 @@
id += selectRecords[i].id + "|"
}
}
+ //鎴愬搧鏍囩1
if (lableTypes == 1) {
labelRow.value.list = JSON.stringify(selectRecords)
labelRow.value.faceOrientation = faceOrientation
@@ -577,7 +581,9 @@
lastList.value = []
if (company.label === 1) {
dialogTableVisibleLabel.value = true
- } else if (company.label === 2) {
+ }
+ //甯稿窞椤圭洰
+ else if (company.label === 2) {
router.push({
path: '/main/processCard/PrintCustomLabelCZ',
query: {
@@ -590,7 +596,9 @@
})
}
- } else if (lableTypes == 2) {
+ }
+ //鎴愬搧鏍囩2
+ else if (lableTypes == 2) {
labelRow.value.list = JSON.stringify(selectRecords)
labelRow.value.faceOrientation = faceOrientation
labelRow.value.type = type
@@ -598,7 +606,9 @@
lastList.value = []
if (company.label === 1) {
dialogTableVisibleCustomLabel.value = true
- } else if (company.label === 2) {
+ }
+ //甯稿窞椤圭洰
+ else if (company.label === 2) {
router.push({
path: '/main/processCard/PrintCustomLabelSemiCZ',
query: {
@@ -610,7 +620,9 @@
}
})
}
- } else if (lableTypes == 3) {
+ }
+ //鎴愬搧鏍囩3
+ else if (lableTypes == 3) {
router.push({
path: '/main/processCard/PrintLabel1',
query: {
--
Gitblit v1.8.0