From 54c2f0fda44123782e5241ff7d1ad6e81c95f2b2 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 12 十一月 2024 15:52:32 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 55 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 32 insertions(+), 23 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 8f61bba..44dccf8 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -41,6 +41,7 @@
if (like == '') {
like = null
}
+let name=company.companyName
data.value.printList = JSON.parse(props.printList)
let flowCardCount = ''
onMounted(() => {
@@ -204,7 +205,7 @@
<table v-for="(item,id) in produceList" id="contentTable" :key="id" style="border-bottom: none">
<thead>
<tr v-for="(itemFlow,index) in item.detail" :key="index">
- <td colspan="29">
+ <td colspan="31">
<div style="float: left;"><input style="border: none;font-size: 28px;width: 70px;margin: 5px "/></div>
<div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
<div>{{ company.companyName }}</div>
@@ -226,7 +227,7 @@
<td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
<td colspan="4">{{ items.project }}</td>
<td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
- <td colspan="20" style="width: 500px">{{ items.process }}</td>
+ <td colspan="22" style="width: 500px">{{ items.process }}</td>
</tr>
<tr v-for="(itemTr,index) in item.detail" :key="index">
<td class="tdNowrap">纾ㄨ竟绫诲瀷锛�</td>
@@ -234,17 +235,18 @@
<td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
<td colspan="4">{{ itemTr.glass_child }}</td>
<td class="tdNowrap">浜у搧鍚嶇О锛�</td>
- <td colspan="20">{{ itemTr.product_name }}</td>
+ <td colspan="22">{{ 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' style="width: 90px">瀹�*楂�</td>
<td rowspan='2'>鏁伴噺</td>
<td rowspan='2'>闈㈢Н</td>
<td rowspan='2'>鍛ㄩ暱</td>
- <td rowspan='2'>鍗婂緞</td>
+ <td rowspan='2'>鍗婂緞/澶囨敞</td>
<td rowspan='2'>澶囨敞</td>
<td v-for="(itemPr,index) in item.processList" :key="index" colspan="2">{{ itemPr.process }}</td>
</tr>
@@ -276,7 +278,9 @@
<tr v-for="(itemDatile,index) in item.detailList" :key="index">
<td>{{ itemDatile.order_number }}</td>
- <td>{{ itemDatile.s01Value }}</td>
+ <td>{{ itemDatile.mapNumber }}</td>
+ <td v-if="name='閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃'">{{ itemDatile.building_number }}</td>
+ <td v-else>{{ itemDatile.s01Value }}</td>
<td>{{ itemDatile.technology_number }}</td>
<td>{{ itemDatile.child_width }}</td>
<td class="item" style="width: 5%;height: 100%;">
@@ -307,10 +311,8 @@
<td></td>
<td></td>
</tr>
- </tbody>
- <tfoot>
<tr style="height: 14px">
- <td v-for="(itemsum,index) in item.detail" :key="index" colspan="29">
+ <td v-for="(itemsum,index) in item.detail" :key="index" colspan="31">
鏁伴噺锛�
<label>{{ itemsum.quantity }}</label>
闈㈢Н锛�
@@ -322,6 +324,7 @@
<tr v-for="(itemtextarea,index) in item.detail" :key="index">
<td>瀹屽伐绛惧悕</td>
+ <td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
@@ -353,14 +356,15 @@
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
+ <td colspan="2"></td>
</tr>
<tr>
<td>鍘熺墖绠卞彿</td>
- <td colspan="28"></td>
+ <td colspan="31"></td>
</tr>
<tr v-for="(qrCodeItem,index) in item.detail" :key="index">
- <td colspan="29">
+ <td colspan="31">
<span style="display: flex;">
<span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 35%">
<div class='qrCode' style="width: 80px;height: 80px;">
@@ -375,28 +379,31 @@
</tr>
<tr v-if="company.remarkSwitch=='1'">
- <td colspan="29">
- <div style="display: flex;flex-wrap: wrap;">
- <div v-for="(itemremark,index) in item.remarkList" :key="index">
+ <td colspan="31">
+ <div style="display: flex;flex-wrap: wrap;">
+ <div class="nuber_xx" v-for="(itemremark,index) in item.remarkList" :key="index">
<span v-if="!(itemremark.S02==null&&itemremark.S03==null&&itemremark.S04==null&&itemremark.S05==null)">
缂栧彿锛歿{itemremark.S01}}
</span>
- <span v-if="itemremark.S02!=null">澶囨敞1锛歿{itemremark.S02}}</span>
- <span v-if="itemremark.S03!=null">澶囨敞2锛歿{itemremark.S03}}</span>
- <span v-if="itemremark.S04!=null">澶囨敞3锛歿{itemremark.S04}}</span>
- <span v-if="itemremark.S05!=null">澶囨敞4锛歿{itemremark.S05}}</span>
- </div>
- </div>
+ <span v-if="itemremark.S02!=null&&itemremark.S02!=''">澶囨敞1锛歿{itemremark.S02}}</span>
+ <span v-if="itemremark.S03!=null&&itemremark.S03!=''">澶囨敞2锛歿{itemremark.S03}}</span>
+ <span v-if="itemremark.S04!=null&&itemremark.S04!=''">澶囨敞3锛歿{itemremark.S04}}</span>
+ <span v-if="itemremark.S05!=null&&itemremark.S05!=''">澶囨敞4锛歿{itemremark.S05}}</span>
+ </div>
+ </div>
</td>
</tr>
+ </tbody>
+ <tfoot>
+
<tr v-for="(itemtextareas,index) in item.detail" :key="index">
- <td colspan="29" style="width: 480px;height: 150px ">
+ <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: 12px;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
</div>
</td>
</tr>
<tr style="border-bottom: none">
- <td colspan="29" style="text-align: left;border-bottom: none;">
+ <td colspan="31" style="text-align: left;border-bottom: none;">
<div>
<span>璐ㄦ绛惧悕锛�</span>
<span style="margin-left: 300px">鐢熶骇绛惧悕锛�</span>
@@ -465,13 +472,15 @@
background: none;
}
-
+.nuber_xx span{
+ font-size: 12px;
+}
@media print {
@page {
size: auto; /* auto is the initial value */
- margin: 4mm 5mm 5mm 5mm /* this affects the margin in the printer settings */
+ margin: 4mm 5mm 10mm 5mm /* this affects the margin in the printer settings */
}
--
Gitblit v1.8.0