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/PrintLabel.vue |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
index 2ceed2b..2ae9c9d 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
@@ -41,6 +41,7 @@
       }else{
         localStorage.setItem('hasRefreshed', 'false');
       }
+  //宸ョ▼鎵撳嵃
   if(projectNo.value!=null){
     request.post(`/processCard/getSelectPrintLabel/${projectNo.value}/${type.value}`).then((res) => {
       if (res.code == 200) {
@@ -51,6 +52,7 @@
       }
     })
   }else{
+    //娴佺▼鍗$紪杈戞墦鍗版爣绛� 甯稿窞
     if (printType == 1) {
       data.value.printList = JSON.parse(route.query.printList)
       request.post(`/processCard/getSelectPrintLabel1`,data.value).then((res) => {
@@ -72,7 +74,9 @@
           router.push("/login")
         }
       })
-    }else if(printType==2){
+    }
+    //鏄庣粏鍒嗘灦鎵撳嵃鏍囩 甯稿窞
+    else if(printType==2){
       data.value.printList = JSON.parse(route.query.printList)
       request.post(`/processCard/getSelectPrintLabelDetails`, data.value).then((res) => {
         if (res.code == 200) {

--
Gitblit v1.8.0