From a26e834d87b2f03dd7768fddb1c3ba946a08c314 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 05 七月 2024 18:20:25 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
index 26bd38a..bac71f4 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
@@ -115,7 +115,7 @@
<th class="title-1">璁㈠崟绫诲瀷</th>
<th colspan="4">{{data.order.orderType}}</th>
<th class="title-1">璺熷崟鍛�</th>
- <th colspan="3">{{data.order.creator}}</th>
+ <th colspan="3">{{data.order.salesman}}</th>
</tr>
<tr>
<th>纾ㄨ竟</th>
@@ -141,8 +141,7 @@
<th>鍗婂緞</th>
<th>妤煎彿</th>
<th>鍔犲伐瑕佹眰</th>
- <th>澶囨敞</th>
- <th>搴忓彿</th>
+ <th colspan="2">澶囨敞</th>
<th>澶囨敞1</th>
<th>澶囨敞2</th>
<th>澶囨敞3</th>
@@ -168,8 +167,7 @@
<td>{{item1.bendRadius}}</td>
<td>{{item1.buildingNumber}}</td>
<td>{{item1.processingNote}}</td>
- <td>{{item1.remarks}}</td>
- <td></td>
+ <td colspan="2">{{item1.remarks}}</td>
<td>{{((item1.otherColumns?.S04)?item1.otherColumns.S04:'')}}</td>
<td>{{((item1.otherColumns?.S05)?item1.otherColumns.S05:'')}}</td>
<td>{{((item1.otherColumns?.S06)?item1.otherColumns.S06:'')}}</td>
--
Gitblit v1.8.0