From acaf8ca38cd32bc474bb46b593db2a8d75b9bfdd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 08:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 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 fd39ab0..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,19 +193,15 @@
<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>
<div>鐢熶骇娴佺▼鍗�</div>
- <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
- itemFlow.process_id
- }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ flowCardCount }} 鏋�
- </div>
<div style="font-weight: bolder;display: flex;justify-content:space-between">
<div>鎵撳嵃浜猴細{{user.user.userName}}</div>
<div>
- {{itemFlow.otherRemarks}}
+ <span style="font-size: 10px">{{itemFlow.otherRemarks}}</span>
娴佺▼鍗″彿锛� {{
itemFlow.process_id
}}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�
@@ -219,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>
@@ -227,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>
@@ -242,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>
@@ -286,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>
@@ -311,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>
闈㈢Н锛�
@@ -323,15 +322,12 @@
<tr v-for="(itemtextarea,index) in item.detail" :key="index">
<td colspan="4" rowspan="5" style="width: 480px;height: 100px ">
<div>
- 娆＄牬绫诲瀷锛歿{itemtextarea.breakage_type}}
- 娆＄牬鍘熷洜锛歿{itemtextarea.breakage_reason}}
- 璐ｄ换宸ュ簭锛歿{itemtextarea.responsible_process}}
- 璐ｄ换鐝粍锛歿{itemtextarea.responsible_team}}
- <span v-if="itemtextarea.responsible_personnel!=null">璐ｄ换淇℃伅锛歿{itemtextarea.responsible_personnel}}</span>
+
</div>
</td>
<td>瀹屽伐绛惧悕</td>
+ <td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
@@ -363,6 +359,7 @@
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
+ <td colspan="2"></td>
</tr>
<tr>
<td>璐ㄦ绛惧悕</td>
@@ -380,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;">
@@ -400,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>
@@ -465,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