From 1e31f9f7fe6f04236e97f72c0df3ce051d5f867e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 24 十一月 2025 16:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 408dba6..b4bfc35 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -346,18 +346,18 @@
</tr>
<tr v-for="(items,index) in item.detail" :key="index">
<td class="tdNowrap">瀹㈡埛鍚嶇О锛�</td>
- <td colspan="2">{{ items.customer_name }}</td>
+ <td colspan="4">{{ items.customer_name }}</td>
<td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
- <td colspan="4" style="min-width: 250px;">{{ items.projectBatch }}</td>
+ <td colspan="3" style="min-width: 250px;">{{ items.projectBatch }}</td>
<td class="tdNowrap">宸ヨ壓娴佺▼锛�</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>
- <td v-if="name=='澶╂触鍖楃幓鐜荤拑宸ヤ笟鎶�鏈湁闄愬叕鍙革紙TJBB-QR7.1-01锛�'" colspan="2">{{ itemTr.other_remarks }}</td>
- <td v-else colspan="2">{{ itemTr.edging_type }}</td>
+ <td v-if="name=='澶╂触鍖楃幓鐜荤拑宸ヤ笟鎶�鏈湁闄愬叕鍙革紙TJBB-QR7.1-01锛�'" colspan="4">{{ itemTr.other_remarks }}</td>
+ <td v-else colspan="4">{{ itemTr.edging_type }}</td>
<td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
- <td colspan="4">{{ itemTr.glass_child }}</td>
+ <td colspan="3">{{ itemTr.glass_child }}</td>
<td class="tdNowrap">浜у搧鍚嶇О锛�</td>
<td :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
</tr>
@@ -365,7 +365,7 @@
<td rowspan='2'>搴忓彿</td>
<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>
@@ -419,7 +419,7 @@
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
- <td colspan="2"></td>
+ <td colspan="1"></td>
<template v-for=" n in item.processList.length">
<td colspan="2"></td>
</template>
@@ -430,7 +430,7 @@
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
- <td colspan="2"></td>
+ <td colspan="1"></td>
<template v-for=" n in item.processList.length">
<td colspan="2"></td>
</template>
@@ -494,7 +494,7 @@
:key="index"
:src="img.imageBase64"
fit="contain"
- style="max-width: 400px;max-lines: 600px"
+ style="max-width: 100%;"
/>
</div>
</div>
--
Gitblit v1.8.0