From 25cc86fd8a2fb3b2bb6b385cba0adaf89ff3dcdc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 十二月 2025 16:39:32 +0800
Subject: [PATCH] 流程卡进度打印部分代码

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue |   81 +++++++++++++++++++++++++++-------------
 1 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue
index abcf06b..f58e730 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue
@@ -33,33 +33,62 @@
 const type = route.query.type
 const faceOrientation = route.query.faceOrientation
 const lableType = route.query.lableType
+const printType=route.query.printType
 
 onMounted(() => {
-      request.post(`/processCard/getSelectPrintCustomLabel/${type}/1`, data.value).then((res) => {
-        if (res.code == 200) {
-          produceList.value = deepClone(res.data.title)
-          list.value = deepClone(res.data.data)
-          const data = produceList.value[0].value
-          dataList = JSON.parse(`[${data}]`);
-          labelList = dataList[0]
-          for (let i = 0; i < list.value.length; i++) {
-            let count= list.value[i].data.length
-            for (let j = 0; j < count; j++) {
-              for (let k = 0; k < list.value[i].data[j].quantity; k++){
-                lastList.value.push(list.value[i].data[j])
-              }
+  if (localStorage.getItem('hasRefreshed')=="false") {
+    localStorage.setItem('hasRefreshed', 'true');
+    location.reload();
+  }else{
+    localStorage.setItem('hasRefreshed', 'false');
+  }
+  if(printType==1){
+    request.post(`/processCard/getSelectPrintCustomLabel2/${type}/1`, data.value).then((res) => {
+      if (res.code == 200) {
+        produceList.value = deepClone(res.data.title)
+        list.value = deepClone(res.data.data)
+        const data = produceList.value[0].value
+        dataList = JSON.parse(`[${data}]`);
+        labelList = dataList[0]
+        for (let i = 0; i < list.value.length; i++) {
+          let count= list.value[i].data.length
+          for (let j = 0; j < count; j++) {
+            for (let k = 0; k < list.value[i].data[j].quantity; k++){
+              lastList.value.push(list.value[i].data[j])
             }
           }
-          console.log(lastList.value)
-        } else {
-          ElMessage.warning(res.msg)
-          router.push("/login")
         }
-      })
+      } else {
+        ElMessage.warning(res.msg)
+        router.push("/login")
+      }
+    })
+  }else if(printType==2){
+    request.post(`/processCard/getSelectPrintCustomLabelDetails/${type}/1`, data.value).then((res) => {
+      if (res.code == 200) {
+        produceList.value = deepClone(res.data.title)
+        list.value = deepClone(res.data.data)
+        const data = produceList.value[0].value
+        dataList = JSON.parse(`[${data}]`);
 
-    }
+        labelList = dataList[0]
 
-)
+        for (let i = 0; i < list.value.length; i++) {
+          let count = list.value[i].data.length
+          for (let j = 0; j < count; j++) {
+            for (let k = 0; k < list.value[i].data[j].quantity; k++) {
+              lastList.value.push(list.value[i].data[j])
+            }
+          }
+        }
+      } else {
+        ElMessage.warning(res.msg)
+      }
+    })
+  }
+
+
+})
 
 
 // 鎵撳嵃鏂规硶
@@ -119,7 +148,7 @@
       <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
       <div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>
       <div class="row5">
-        <span>{{item.remarks}}</span>&nbsp;
+        <span>{{item.filmNumber}}</span>&nbsp;
         <span>{{ item.processingNote }}</span>
       </div>
     </div>
@@ -171,7 +200,7 @@
 .row3 {
   margin-top: -5px;
   height: 30px;
-  font-size: 20pt;
+  font-size: 22pt;
   font-weight: bolder;
 }
 
@@ -183,15 +212,15 @@
   margin-left: 40px;
 }
 .row1 span{
-  font-size: 15pt;
+  font-size: 17pt;
 }
 
 .row2 span{
-  font-size: 15pt;
+  font-size: 17pt;
 }
 
 .row5 span{
-  font-size: 15pt;
+  font-size: 17pt;
 }
 
 .row6 {
@@ -210,7 +239,7 @@
   }
   @page {
     size: auto;  /* auto is the initial value */
-    margin: 12mm 4mm 2mm 6mm;  /* this affects the margin in the printer settings */
+    margin: 12mm 4mm 2mm 6mm !important;  /* this affects the margin in the printer settings */
 
   }
 }

--
Gitblit v1.8.0