From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 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 4063bc1..5ffc88d 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -168,7 +168,19 @@
//姣忎釜搴忓彿闈㈢Н
collection.total_area = parseFloat((collection.width * collection.height * collection.quantity / 1000000).toFixed(2))
totalArea = add(totalArea, collection.total_area)
- totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
+ //鏍规嵁鏈夊嚑灞傝绠楅噸閲�
+ for (let j = 0; j < produceList.value[i].detail.length; j++) {
+ 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;
+ }
+
+ }
+
//姣忎釜搴忓彿鍛ㄩ暱
collection.perimeter = parseFloat(((collection.width * 2 + collection.height * 2) * collection.quantity / 1000).toFixed(3))
});
@@ -316,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">
@@ -346,26 +358,29 @@
</tr>
<tr v-for="(items,index) in item.detail" :key="index">
<td class="tdNowrap">瀹㈡埛鍚嶇О锛�</td>
- <td colspan="2">{{ items.customer_name }}</td>
+ <td colspan="4">{{ items.customer_name }}</td>
<td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
- <td colspan="4" style="min-width: 250px;">{{ items.projectBatch }}</td>
+ <td colspan="3" style="min-width: 250px;">{{ items.projectBatch }}</td>
<td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
<td :colspan="2+item.processList.length*2" style="width: 500px">{{ items.process }}</td>
</tr>
<tr v-for="(itemTr,index) in item.detail" :key="index">
<td class="tdNowrap">纾ㄨ竟绫诲瀷锛�</td>
- <td v-if="name=='澶╂触鍖楃幓鐜荤拑宸ヤ笟鎶�鏈湁闄愬叕鍙革紙TJBB-QR7.1-01锛�'" colspan="2">{{ itemTr.other_remarks }}</td>
- <td v-else colspan="2">{{ itemTr.edging_type }}</td>
+ <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="4">{{ 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 :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
+
+ <td v-if="!company.processFontSize" :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
+ <td v-else :colspan="2+item.processList.length*2" style="font-size: 18px;">{{ itemTr.product_name }}</td>
</tr>
<tr>
<td rowspan='2'>搴忓彿</td>
<td rowspan='2'>鍥惧彿</td>
<td rowspan='2'>缂栧彿</td>
- <td rowspan="2">灏忕墖椤哄簭</td>
+ <td rowspan="2">灞傚彿</td>
<td rowspan='2' style="width: 90px">瀹�(寮ч暱)*楂�</td>
<td rowspan='2' >鏁伴噺</td>
<td rowspan='2'>闈㈢Н</td>
@@ -386,7 +401,7 @@
<tr v-for="(itemDatile,index) in item.detailList" :key="index">
<td>{{ itemDatile.order_number }}</td>
<td>{{ itemDatile.mapNumber }}</td>
- <td v-if="name=='閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃'">{{ itemDatile.building_number }}</td>
+ <td v-if="name=='閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃' || name=='娴欐睙宸ㄦ槦鍢夋嘲鏂版潗鏂欐湁闄愬叕鍙�' ">{{ itemDatile.building_number }}</td>
<td v-else>{{ itemDatile.s01Value }}</td>
<td>{{ itemDatile.technology_number }}</td>
<td>{{ itemDatile.child_width }}</td>
@@ -419,7 +434,7 @@
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
- <td colspan="2"></td>
+ <td colspan="1"></td>
<template v-for=" n in item.processList.length">
<td colspan="2"></td>
</template>
@@ -430,7 +445,7 @@
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
- <td colspan="2"></td>
+ <td colspan="1"></td>
<template v-for=" n in item.processList.length">
<td colspan="2"></td>
</template>
@@ -475,7 +490,9 @@
<tr v-for="(itemtextareas,index) in item.detail" :key="index">
<td colspan="31" style="width: 480px;height: 150px ">
- <div style="width: 100%;height: 100%;text-align: left"><textarea style="height: 99%;width: 99%;border: none;;font-size: 16px;font-weight: bold;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
+ <div style="width: 100%;height: 100%;text-align: left">
+ <textarea v-if="!company.processFontSize" style="height: 99%;width: 99%;border: none;;font-size: 14px;font-weight: bold;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
+ <textarea v-else style="height: 99%;width: 99%;border: none;;font-size: 36px;font-weight: bold;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
</div>
</td>
</tr>
@@ -565,9 +582,26 @@
@media print {
+ /* 绂佺敤 Chrome 鑷姩椤电爜瑙﹀彂鏉′欢 */
+ * {
+ overflow: visible !important;
+ transform: none !important;
+ filter: none !important;
+ }
+
+ [style*="position: fixed"],
+ .fixed,
+ .header-fixed {
+ position: absolute !important;
+ }
+
+
@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