From 3bfff48245e0eb8affcbf2a16fb2c75eb1cff8bb Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 14 四月 2025 11:10:40 +0800
Subject: [PATCH] 模拟计算发送数据处理

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 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 f432d1d..24d4451 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,16 +41,19 @@
       }else{
         localStorage.setItem('hasRefreshed', 'false');
       }
+  //宸ョ▼鎵撳嵃
   if(projectNo.value!=null){
     request.post(`/processCard/getSelectPrintLabel/${projectNo.value}/${type.value}`).then((res) => {
       if (res.code == 200) {
         labelList.value = deepClone(res.data.data)
+        console.log(res.data.data)
       } else {
         ElMessage.warning(res.msg)
         router.push("/login")
       }
     })
   }else{
+    //娴佺▼鍗＄紪杈戞墦鍗版爣绛� 甯稿窞
     if (printType == 1) {
       data.value.printList = JSON.parse(route.query.printList)
       request.post(`/processCard/getSelectPrintLabel1`,data.value).then((res) => {
@@ -72,7 +75,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) {
@@ -122,7 +127,7 @@
         "{display:none}@media print{" +
         "@page {" +
         "    size: auto; " +
-        "    margin: 13mm 4mm 2mm 4mm; " +
+        "    margin: 13mm 4mm 0mm 4mm; " +
         "  }body>:not(#" +
         printId +
         "){display:none !important}body>#" +
@@ -156,9 +161,9 @@
   <el-input v-if="!company.showDeliveryCreator" v-model="remarks" style="background-color: transparent;border: none;margin-top: -20px;width: 100px"/>
   <div id="printFlowCard" >
 <!--     鍗婃垚鍝佹爣绛�-->
-    <div v-if="type!=='3'" id="entirety" v-for="(item,id) in labelList" >
-
-      <div class="row1" >
+    <template v-for="(item,id) in labelList">
+    <div v-if="type!=='3'" id="entirety" >
+      <div v-if="item.customer_name!==undefined" class="row1" >
 <!--閽㈠寲鐗堝浘搴忓彿锛岄挗鍖栫増鍥鹃噷鐨勯『搴�-->
 <!--        <div class="cell" v-if="item.heat_layout_id!==undefined">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>-->
         <span>{{ item.customer_name }}</span>&nbsp;
@@ -182,7 +187,7 @@
         {{JSON.parse(item.other_columns).S02}}={{item.quantity}}
       </div>
       <div class="row3" v-else>
-        <span v-if="item.heat_layout_id!==undefined && company.showDeliveryCreator"  style="font-size: 7pt;">
+        <span v-if="item.heat_layout_sort!==undefined && company.showDeliveryCreator"  style="font-size: 7pt;">
           ({{ item.stock_id }}) {{ item.heat_layout_id }}/{{ item.heat_layout_sort }}
         </span>
         <span v-if="item.stock_id!==undefined && !company.showDeliveryCreator"  style="font-size: 7pt">
@@ -190,12 +195,12 @@
         </span>
         {{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}
       </div>
-      <div class="row5">
+      <div v-if="item.customer_name!==undefined" class="row5">
         <span>{{item.project}}</span>&nbsp;
         <span>{{item.building_number?item.building_number.replace(/\r|\n|\s/g,''):''}}</span>&nbsp;
         <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>&nbsp;
       </div>
-      <div class="row6">
+      <div v-if="item.customer_name!==undefined" class="row6">
         <span>{{item.glass_child}}</span>&nbsp;
         <span v-if="company.showDeliveryCreator" style="font-size: 10pt" >{{item.processing_note}}</span>
         <span v-else style="font-size: 6pt">{{item.processing_note}}</span>
@@ -205,6 +210,8 @@
       </div>
 
     </div>
+    <div class="element-to-break-after" v-if="(id+1)%44==0"></div>
+    </template>
 
 
 
@@ -218,7 +225,7 @@
           <span style="font-size: 8pt">{{ item.customer_name }}</span>&nbsp;
 
         </div>
-        <div class="row2" v-else>
+        <div class="row1" v-else>
           <span style="font-size: 8pt">{{ item.customer_name }}</span>&nbsp;
         </div>
         <div class="row2" style="font-size: 8pt" >{{item.order_id}}
@@ -251,6 +258,7 @@
           <span style="font-size: 10pt">{{item.glass_child}}</span>&nbsp;
         </div>
       </div>
+      <div class="element-to-break-after" v-if="(id+1)%44==0"></div>
     </template>
 
   </div>
@@ -360,6 +368,10 @@
   font-size: 6pt;
 }
 
+.element-to-break-after {
+  page-break-after: always;
+}
+
 
 
 

--
Gitblit v1.8.0