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/PrintReworkProcess.vue | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue
index 05dcd79..44c12f2 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue
@@ -193,7 +193,7 @@
<table v-for="(item,id) in produceList" id="contentTable" :key="id">
<thead>
<tr v-for="(itemFlow,index) in item.detail" :key="index">
- <td colspan="33">
+ <td colspan="34">
<div style="float: left;">杩旂墖鍗曞彿锛歿{itemFlow.patch_id}}</div>
<div id="bj" style="float: right;font-size: 28px">杩� {{ id + 1 }}</div>
<div>{{ company.companyName }}</div>
@@ -215,7 +215,7 @@
<td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
<td colspan="8">{{ items.project }}</td>
<td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
- <td colspan="20" style="width: 500px">{{ items.process }}</td>
+ <td colspan="21" style="width: 500px">{{ items.process }}</td>
</tr>
<tr v-for="(itemTr,index) in item.detail" :key="index">
<td class="tdNowrap">纾ㄨ竟绫诲瀷锛�</td>
@@ -223,7 +223,7 @@
<td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
<td colspan="8">{{ itemTr.glass_child }}</td>
<td class="tdNowrap">浜у搧鍚嶇О锛�</td>
- <td colspan="20">{{ itemTr.product_name }}</td>
+ <td colspan="21">{{ itemTr.product_name }}</td>
</tr>
<tr>
<td rowspan='2'>搴忓彿</td>
@@ -238,6 +238,7 @@
<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>
@@ -282,7 +283,9 @@
<td>{{ itemDatile.patch_reason }}</td>
<td>{{ itemDatile.patch_processes }}</td>
<td>{{ itemDatile.responsible_team }}</td>
+ <td>{{ itemDatile.responsible_personnel }}</td>
<td>{{ itemDatile.remarks }}</td>
+ <td></td>
<td></td>
<td></td>
<td></td>
@@ -307,7 +310,7 @@
</tbody>
<tfoot>
<tr style="height: 14px">
- <td v-for="(itemsum,index) in item.detail" :key="index" colspan="33">
+ <td v-for="(itemsum,index) in item.detail" :key="index" colspan="34">
鏁伴噺锛�
<label>{{ itemsum.quantity }}</label>
闈㈢Н锛�
@@ -324,6 +327,7 @@
</td>
<td>瀹屽伐绛惧悕</td>
+ <td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
@@ -355,6 +359,7 @@
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
+ <td colspan="2"></td>
</tr>
<tr>
<td>璐ㄦ绛惧悕</td>
@@ -372,13 +377,14 @@
<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="29"></td>
</tr>
<tr v-for="(qrCodeItem,index) in item.detail" :key="index">
- <td colspan="29">
+ <td colspan="30">
<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;">
@@ -392,7 +398,7 @@
</td>
</tr>
<tr v-for="(itemtextareas,index) in item.detail" :key="index">
- <td colspan="33" rowspan="6" style="width: 99%;height: 150px ">
+ <td colspan="34" rowspan="6" style="width: 99%;height: 150px ">
<div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 12px;text-align: left">{{itemtextareas.processing_note}}</textarea>
</div>
</td>
@@ -457,6 +463,10 @@
font-size: 12px;
font-weight: bolder;
}
+input{
+ border: none;
+ background: none;
+}
@page {
size: auto; /* auto is the initial value */
--
Gitblit v1.8.0