From 65129f3c1d9ca15fb2e575142415b6a9b744a9f5 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 20 十一月 2024 17:07:40 +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 | 81 ++++++++--------------------------------
1 files changed, 17 insertions(+), 64 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 86129b7..2eea661 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -227,7 +227,7 @@
<td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
<td colspan="4" style="min-width: 250px;">{{ items.project }}</td>
<td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
- <td colspan="22" style="width: 500px">{{ items.process }}</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>
@@ -235,7 +235,7 @@
<td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
<td colspan="4">{{ itemTr.glass_child }}</td>
<td class="tdNowrap">浜у搧鍚嶇О锛�</td>
- <td colspan="22">{{ itemTr.product_name }}</td>
+ <td :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
</tr>
<tr>
<td rowspan='2'>搴忓彿</td>
@@ -251,27 +251,10 @@
<td v-for="(itemPr,index) in item.processList" :key="index" colspan="2">{{ itemPr.process }}</td>
</tr>
<tr>
-
- <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>
- <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>
- <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>
- <td>{{ company.printLabel.printFlowCard.patch }}</td>
- <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
+ <template v-for=" n in item.processList.length">
+ <td>{{ company.printLabel.printFlowCard.patch }}</td>
+ <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
+ </template>
</tr>
</thead>
<tbody>
@@ -290,26 +273,10 @@
<td>{{ itemDatile.perimeter }}</td>
<td>{{ itemDatile.bend_radius }}</td>
<td>{{ itemDatile.remarks }}</td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
+ <template v-for=" n in item.processList.length">
+ <td></td>
+ <td></td>
+ </template>
</tr>
<tr style="height: 14px">
<td v-for="(itemsum,index) in item.detail" :key="index" colspan="31">
@@ -329,16 +296,9 @@
<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>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
+ <template v-for=" n in item.processList.length">
+ <td colspan="2"></td>
+ </template>
</tr>
<tr>
<td>鐢熶骇鏃ユ湡</td>
@@ -347,16 +307,9 @@
<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>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
+ <template v-for=" n in item.processList.length">
+ <td colspan="2"></td>
+ </template>
</tr>
<tr>
@@ -398,7 +351,7 @@
<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: 12px;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
+ <div style="width: 100%;height: 100%;text-align: left"><textarea style="height: 99%;width: 99%;border: none;;font-size: 14px;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
</div>
</td>
</tr>
--
Gitblit v1.8.0