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/components/pp/PrintProcess.vue |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
index bfb2ece..222227b 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -92,6 +92,7 @@
         //娴佺▼鍗�
         request.post(`/processCard/getSelectPrinting/${merge}/${like}/${merges}/${props.flashback}/${compound}/${props.landingSequence}`, data.value).then((res) => {
           if (res.code == 200) {
+            console.log(res.data.data)
             load(res.data.data)
           } else {
             ElMessage.warning(res.msg)
@@ -170,13 +171,15 @@
       totalArea = add(totalArea, collection.total_area)
       //鏍规嵁鏈夊嚑灞傝绠楅噸閲�
       for (let j = 0; j < produceList.value[i].detail.length; j++) {
-        if (produceList.value[i].detail[j].technologyNumber.length>1){
-          totalWeight += collection.weight * collection.quantity  * 1;
-
+       let ceng = produceList.value[i].detail[j].technologyNumber.length
+        if (produceList.value[i].processName!=""){
+          for (let k = 0; k < produceList.value[i].detail[j].technologyNumber.length; k++) {
+            totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
+          }
         }else {
           totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
-
         }
+
       }
 
       //姣忎釜搴忓彿鍛ㄩ暱
@@ -367,7 +370,8 @@
       <td v-if="name=='澶╂触鍖楃幓鐜荤拑宸ヤ笟鎶�鏈湁闄愬叕鍙革紙TJBB-QR7.1-01锛�'"  colspan="4">{{ itemTr.other_remarks }}</td>
       <td v-else colspan="4">{{ itemTr.edging_type }}</td>
       <td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
-      <td colspan="3">{{ itemTr.glass_child }}</td>
+      <td v-if="!company.processFontSize" colspan="3">{{ itemTr.glass_child }}</td>
+      <td v-else colspan="3" style="font-size: 18px;">{{ itemTr.glass_child }}</td>
       <td class="tdNowrap">浜у搧鍚嶇О锛�</td>
 
       <td v-if="!company.processFontSize" :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
@@ -595,7 +599,10 @@
 
   @page {
     size: auto;  /* auto is the initial value */
-    margin: 4mm 5mm 10mm 5mm  /* this affects the margin in the printer settings */
+    margin: 4mm 5mm 10mm 5mm;  /* this affects the margin in the printer settings */
+    @top-right {
+      content: none !important;
+    }
 
   }
 

--
Gitblit v1.8.0