From 4aff3b8d0640e9a84f7408100551e740bacaa2a0 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 09 八月 2024 11:24:28 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 98 +++++++++++++++++++++++++-----------------------
1 files changed, 51 insertions(+), 47 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 fa14919..b344787 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -189,30 +189,20 @@
<table v-for="(item,id) in produceList" id="contentTable" :key="id">
<thead>
<tr v-for="(itemFlow,index) in item.detail" :key="index">
- <td v-if="like='1'" colspan="26">
+ <td colspan="29">
<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>
<div>鐢熶骇娴佺▼鍗�</div>
- <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
+ <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">
+ {{itemFlow.otherRemarks}}
+ 娴佺▼鍗″彿锛� {{
itemFlow.process_id
}}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ flowCardCount }} 鏋�
</div>
- <div v-else style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
- itemFlow.process_id
- }}/{{ itemFlow.technologyNumber }} 鍏� {{ flowCardCount }} 鏋�
- </div>
- </td>
- <td v-else colspan="24">
- <div style="float: left;"><input style="border: none;font-size: 28px;width: 70px "/></div>
- <div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
- <div>{{ company.companyName }}</div>
- <div>鐢熶骇娴佺▼鍗�</div>
- <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
- itemFlow.process_id
- }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ flowCardCount }} 鏋�
- </div>
- <div v-else style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
+ <div v-else style="text-align: right;font-weight: bolder">
+ {{itemFlow.otherRemarks}}
+ 娴佺▼鍗″彿锛� {{
itemFlow.process_id
}}/{{ itemFlow.technologyNumber }} 鍏� {{ flowCardCount }} 鏋�
</div>
@@ -224,8 +214,7 @@
<td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
<td colspan="2">{{ items.project }}</td>
<td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
- <td colspan="19" v-if="like='1'" style="width: 500px">{{ items.process }}</td>
- <td colspan="17" v-else 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>
@@ -233,15 +222,13 @@
<td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
<td colspan="2">{{ itemTr.glass_child }}</td>
<td class="tdNowrap">浜у搧鍚嶇О锛�</td>
- <td v-if="like=='1'" colspan="19">{{ itemTr.product_name }}</td>
- <td v-else colspan="17">{{ itemTr.product_name }}</td>
+ <td colspan="22">{{ itemTr.product_name }}</td>
</tr>
<tr>
<td rowspan='2'>搴忓彿</td>
<td rowspan='2'>缂栧彿</td>
- <td v-if="like!=null" rowspan="2">灏忕墖椤哄簭</td>
- <td v-else style="display: none;" 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>
@@ -267,6 +254,10 @@
<td>{{ company.printLabel.printFlowCard.lackOf }}</td>
<td>{{ company.printLabel.printFlowCard.patch }}</td>
<td>{{ company.printLabel.printFlowCard.lackOf }}</td>
+ <td>{{ company.printLabel.printFlowCard.patch }}</td>
+ <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
+ <td>{{ company.printLabel.printFlowCard.patch }}</td>
+ <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
</tr>
</thead>
<tbody>
@@ -274,11 +265,10 @@
<tr v-for="(itemDatile,index) in item.detailList" :key="index">
<td>{{ itemDatile.order_number }}</td>
<td>{{ itemDatile.s01Value }}</td>
- <td v-if="like=='1'">{{ itemDatile.technology_number }}</td>
- <td v-else style="display: none"></td>
+ <td>{{ itemDatile.technology_number }}</td>
<td>{{ itemDatile.child_width }}</td>
<td class="item" style="width: 5%;height: 100%;">
- <el-input v-model="itemDatile.quantity" style="border: none" @keyup="handleSummary()"></el-input>
+ <input v-model="itemDatile.quantity" style="width: 100%;height: 100%" @keyup="handleSummary()"/>
</td>
<td>{{ itemDatile.total_area }}</td>
<td>{{ itemDatile.perimeter }}</td>
@@ -300,11 +290,15 @@
<td></td>
<td></td>
<td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
</tr>
</tbody>
<tfoot>
<tr style="height: 14px">
- <td v-for="(itemsum,index) in item.detail" :key="index" colspan="26">
+ <td v-for="(itemsum,index) in item.detail" :key="index" colspan="29">
鏁伴噺锛�
<label>{{ itemsum.quantity }}</label>
闈㈢Н锛�
@@ -314,17 +308,12 @@
</td>
</tr>
<tr v-for="(itemtextarea,index) in item.detail" :key="index">
- <td v-if="like='1'" colspan="4" rowspan="6" style="width: 480px;height: 100px ">
- <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 11px">{{itemtextarea.otherRemarks}}</textarea>
- </div>
- </td>
- <td v-else colspan="6" rowspan="2" style="width: 480px;height: 100px ">
- <!-- <div style="width: 100%;height: 100%"><textarea style="height: 99%;width: 99%;font-size: 11px">{{ itemtextarea.processing_note }}</textarea>-->
- <!-- </div>-->
- <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 11px">{{itemtextarea.otherRemarks}}</textarea>
- </div>
- </td>
+
<td>瀹屽伐绛惧悕</td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
@@ -348,9 +337,17 @@
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
</tr>
<tr>
<td>璐ㄦ绛惧悕</td>
+ <td colspan="2"></td>
+ <td colspan="2">鐢熶骇绛惧悕</td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
@@ -364,10 +361,10 @@
</tr>
<tr>
<td>鍘熺墖绠卞彿</td>
- <td colspan="20"></td>
+ <td colspan="28"></td>
</tr>
<tr v-for="(qrCodeItem,index) in item.detail" :key="index">
- <td colspan="23">
+ <td colspan="29">
<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;">
@@ -380,6 +377,12 @@
</span>
</td>
+ </tr>
+ <tr v-for="(itemtextareas,index) in item.detail" :key="index">
+ <td colspan="29" rowspan="6" style="width: 480px;height: 150px ">
+ <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 12px">{{itemtextareas.processing_note}}</textarea>
+ </div>
+ </td>
</tr>
</tfoot>
</table>
@@ -423,12 +426,10 @@
}
#contentTable tbody {
- white-space: nowrap;
}
.tdNowrap {
- white-space: nowrap;
}
@@ -438,17 +439,20 @@
}
input{
- font-weight: bolder;
+ border: none;
+ background: none;
}
-@page {
- size: auto; /* auto is the initial value */
- margin: 2mm 2mm 0mm 1mm /* this affects the margin in the printer settings */
-}
@media print {
+ @page {
+ size: auto; /* auto is the initial value */
+ margin: 4mm 5mm 5mm 5mm /* this affects the margin in the printer settings */
+
+ }
+
table {
page-break-before: always;
page-break-inside: auto;
--
Gitblit v1.8.0