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/PrintLabel.vue |   81 ++++++++++++++++++++++++++++++----------
 1 files changed, 61 insertions(+), 20 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 49e64d7..48bceb2 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
@@ -24,8 +24,10 @@
 
 const {currentRoute} = useRouter()
 const route = currentRoute.value
+const printType=route.query.printType
 projectNo.value = route.query.projectNo
 type.value = route.query.type
+
 onMounted(() => {
   if(projectNo.value!=null){
     request.post(`/processCard/getSelectPrintLabel/${projectNo.value}/${type.value}`).then((res) => {
@@ -37,25 +39,47 @@
       }
     })
   }else{
-    data.value.printList = JSON.parse(route.query.printList)
-    request.post(`/processCard/getSelectPrintLabel1`,data.value).then((res) => {
-      if (res.code == 200) {
-        produceList.value = deepClone(res.data.data)
-        for (let i = 0; i < produceList.value.length; i++) {
-         let count= produceList.value[i].data.length
-          for (let j = 0; j < count; j++) {
-            for (let k = 0; k < produceList.value[i].data[j].quantity; k++){
-              labelList.value.push(produceList.value[i].data[j])
+    if (printType == 1) {
+      data.value.printList = JSON.parse(route.query.printList)
+      request.post(`/processCard/getSelectPrintLabel1`,data.value).then((res) => {
+        if (res.code == 200) {
+          produceList.value = deepClone(res.data.data)
+          for (let i = 0; i < produceList.value.length; i++) {
+            let count= produceList.value[i].data.length
+            for (let j = 0; j < count; j++) {
+              for (let k = 0; k < produceList.value[i].data[j].quantity; k++){
+                labelList.value.push(produceList.value[i].data[j])
+              }
+
+
             }
-
-
           }
+        } else {
+          ElMessage.warning(res.msg)
+          router.push("/login")
         }
-      } else {
-        ElMessage.warning(res.msg)
-        router.push("/login")
-      }
-    })
+      })
+    }else if(printType==2){
+      data.value.printList = JSON.parse(route.query.printList)
+      request.post(`/processCard/getSelectPrintLabelDetails`, data.value).then((res) => {
+        if (res.code == 200) {
+          produceList.value = deepClone(res.data.data)
+          for (let i = 0; i < produceList.value.length; i++) {
+            let count = produceList.value[i].data.length
+            for (let j = 0; j < count; j++) {
+              for (let k = 0; k < produceList.value[i].data[j].quantity; k++) {
+                labelList.value.push(produceList.value[i].data[j])
+              }
+
+            }
+          }
+        } else {
+          ElMessage.warning(res.msg)
+          router.push("/login")
+        }
+      })
+    }
+
   }
 
 
@@ -132,12 +156,16 @@
     </div>-->
     <div id="entirety" v-for="(item,id) in labelList" >
         <div class="row1">
+
+          <div class="cell" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
           <span>{{ item.customer_name }}</span>&nbsp;
           <span>{{ item.order_id }}</span>&nbsp;
           <span v-if="item.process.includes('澶硅兌')">鑳剁墖</span>
           <span v-else-if="item.process.includes('涓┖')">涓┖</span>
           <span v-else-if="item.process.includes('鐧惧彾')">鐧惧彾</span>
           <span v-else></span>
+          <div class="cell1" v-if="item.stock_id!=null">{{ item.stock_id }}</div>
+
         </div>
 
         <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>
@@ -190,7 +218,7 @@
   height: 20px;
 }
 .row1 span {
-  font-size: 8pt;
+  font-size: 12pt;
   font-weight: bold;
 }
 
@@ -214,7 +242,7 @@
 .row3 {
   margin-top: -5px;
   height: 25px;
-  font-size: 15pt;
+  font-size: 17pt;
   font-weight: bolder;
 }
 
@@ -224,7 +252,7 @@
   font-size: 8pt;
 }
 .row5 span {
-  font-size: 10pt;
+  font-size: 12pt;
   font-weight: bold;
 }
 
@@ -234,9 +262,22 @@
   font-size: 8pt;
 }
 .row6 span {
-  font-size: 10pt;
+  font-size: 12pt;
   font-weight: bold;
 }
+.cell{
+  position: absolute;
+  font-weight: bold;
+  margin-left: 5px;
+  margin-top: 0px;
+}
+
+.cell1{
+  position: absolute;
+  font-weight: bold;
+  margin-left: 158px;
+  margin-top: -21px;
+}
 
 
 

--
Gitblit v1.8.0