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/PrintCustomLabelSemi2.vue |   54 ++++++++++++++++++++++++++++++++----------------------
 1 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
index fa995a8..a6e3674 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
@@ -45,6 +45,7 @@
   }else{
     localStorage.setItem('hasRefreshed', 'false');
   }
+  //宸ョ▼鎵撳嵃鎴愬搧鏍囩
   if(projectNo.value!=null){
     request.post(`/processCard/getSelectPrintLabel/${projectNo.value}/${type.value}`).then((res) => {
       if (res.code == 200) {
@@ -57,6 +58,7 @@
 
   }else{
     data.value.printList = JSON.parse(route.query.printList)
+    //娴佺▼鍗＄紪杈戞墦鍗版爣绛� 甯稿窞
     if (printType == 1) {
       request.post(`/processCard/getSelectPrintLabel1`, data.value).then((res) => {
         if (res.code == 200) {
@@ -76,7 +78,9 @@
         }
       })
 
-    }else if(printType==2){
+    }
+    //鏄庣粏鍒嗘灦鎵撳嵃鏍囩 甯稿窞
+    else if(printType==2){
       request.post(`/processCard/getSelectPrintLabelDetails`, data.value).then((res) => {
         if (res.code == 200) {
           produceList.value = deepClone(res.data.data)
@@ -149,36 +153,42 @@
     <template v-for="(item,id) in labelList">
     <div id="entirety" >
 
-      <div class="row1" v-if="item.heat_layout_id!=null">
-        <div class="cell" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
+      <div class="row1" v-if="item.customer_name!==undefined">
         <span>{{ item.customer_name }}</span>&nbsp;
         <span>{{ item.order_id }}</span>&nbsp;
-        <span v-if="item.process.includes('澶硅兌')">鑳剁墖</span>
+        <span v-if="item.process.includes('澶硅兌')||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="row6" v-else>
-        <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="row2">
+
+      <div class="row2" v-if="item.customer_name!==undefined">
         <span>{{item.project}}</span>&nbsp;
         <span>{{ item.building_number }}</span>
         <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
       </div>
-      <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)"> <span>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</span>&nbsp;</div>
-      <div class="row3" v-else><span>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</span></div>
-      <div class="row5">
+      <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">
+        <span v-if="item.heat_layout_id!==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">
+              {{ item.stock_id }}/{{ item.polys_id }}
+        </span>
+        {{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;">
+          ({{ 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">
+              {{ item.stock_id }}/{{ item.polys_id }}
+        </span>
+        {{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}
+      </div>
+      <div class="row5" v-if="item.customer_name!==undefined">
         <span>{{item.glass_child}}</span>&nbsp;
         <span>{{item.processing_note}}</span>
       </div>
@@ -240,7 +250,7 @@
 .row3 {
   margin-top: -5px;
   height: 35px;
-  font-size: 22pt;
+  font-size: 20pt;
   font-weight: bolder;
   line-height: 35px;
 }
@@ -258,12 +268,12 @@
 }
 
 .row6 {
-  height: 20px;
+  height: 25px;
   font-weight: bold;
   font-size: 10pt;
 }
 .row6 span {
-  font-size: 17pt;
+  font-size: 16pt;
 }
 
 .cell{

--
Gitblit v1.8.0