From c46cb6a71c35f38c7f23a2d01ad686f46a3d0e0b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 六月 2024 15:14:44 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue
index 8186af5..285aaeb 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue
@@ -148,6 +148,7 @@
<tr>
+ <th>搴忓彿</th>
<th class="title-1">{{company.columnName}}</th>
<th>褰╅噳鍥惧彿</th>
<th>缂栧彿</th>
@@ -157,8 +158,7 @@
<th>寤剁背</th>
<th>妤煎彿</th>
<th>鍔犲伐瑕佹眰</th>
- <th>浜よ揣鏃ユ湡</th>
- <th>搴忓彿</th>
+ <th>澶囨敞</th>
<th>澶囨敞1</th>
<th>澶囨敞2</th>
<th>澶囨敞3</th>
@@ -172,6 +172,7 @@
<td colspan="3"></td>
</tr>
<tr v-for="(item1,index1) in item.productDetail" :key="index1">
+ <td>{{item1.orderNumber}}</td>
<td>{{ item1.otherColumns?.S02}}</td>
<td>{{ item1.otherColumns?.S03}}</td>
<td>{{ item1.otherColumns?.S01}}</td>
@@ -181,8 +182,7 @@
<td>{{item1.perimeter}}</td>
<td>{{item1.buildingNumber}}</td>
<td>{{item1.processingNote}}</td>
- <td></td>
- <td>{{item1.orderNumber}}</td>
+ <td>{{item1.remarks}}</td>
<td>
{{ ((item1.otherColumns?.S04)?item1.otherColumns.S04:'')}}
--
Gitblit v1.8.0