From 3d9e0ec1c1e457ed3fd2b334cf4c4dd66c10eead Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 23 十二月 2025 11:09:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 64a6757..5ffc88d 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -170,13 +170,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;
-
}
+
}
//姣忎釜搴忓彿鍛ㄩ暱
@@ -326,7 +328,7 @@
<div id="bj" v-else style="float: right;font-size: 28px"></div>
<div>{{ company.companyName }}</div>
<div>
- 鐢熶骇娴佺▼鍗�<span style="font-weight: bold" v-if="printProject!=null">({{ printProject }})</span>
+ ({{itemFlow.order_type}})鐢熶骇娴佺▼鍗�<span style="font-weight: bold" v-if="printProject!=null">({{ printProject }})</span>
<span style="font-weight: bold" v-if="props.compound!=null">({{ props.compound }}灞傚悓鏋�)</span>
</div>
<div style="font-weight: bolder;display: flex;justify-content:space-between">
@@ -367,7 +369,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 +598,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