From 82a5de6d2ec80b45660149c84be28734032562f6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 11 十月 2024 15:21:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue |   72 ++++++++++++++++++++++++------------
 1 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue
index 0c942ff..242b651 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue
@@ -32,32 +32,56 @@
 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 (printType == 1) {
+    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])
             }
           }
-        } 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)
+      }
+    })
+  }
+
+})
 
 
 // 鎵撳嵃鏂规硶
@@ -117,7 +141,7 @@
       <div class="row3" v-if="item.other_columns==null||JSON.parse(item.other_columns).S02==null">{{item.width}}x{{item.height}}={{item.quantity}}</div>
       <div class="row3" v-else>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
       <div class="row5">
-        <span>{{item.remarks}}</span>&nbsp;
+        <span>{{item.filmNumber}}</span>&nbsp;
         <span>{{ item.processingNote }}</span>
       </div>
     </div>
@@ -159,7 +183,7 @@
   height: 20px;
 }
 .row1 span {
-  font-size: 10pt;
+  font-size: 12pt;
 }
 
 .row2 {
@@ -168,7 +192,7 @@
   height: 20px;
 }
 .row2 span {
-  font-size: 10pt;
+  font-size: 12pt;
 }
 span {
   font-size: 10pt;
@@ -178,7 +202,7 @@
 .row3 {
   margin-top: -5px;
   height: 28px;
-  font-size: 15pt;
+  font-size: 17pt;
   font-weight: bolder;
 }
 
@@ -189,7 +213,7 @@
 }
 
 .row5 span {
-  font-size: 8pt;
+  font-size: 10pt;
 }
 
 

--
Gitblit v1.8.0