From 95a97594785cf473d251f04fac064df1a846e9ba Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 20 六月 2024 09:51:20 +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 | 10 ++++++----
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue | 10 ++++++----
2 files changed, 12 insertions(+), 8 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 8f4a06a..9080ca3 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
@@ -150,11 +150,12 @@
<th>鐗囨暟</th>
<th>闈㈢Н</th>
<th>寤剁背</th>
+ <th>妤煎彿</th>
+ <th>鍔犲伐瑕佹眰</th>
<th>浜よ揣鏃ユ湡</th>
<th>搴忓彿</th>
<th>绠辨灦鍙�</th>
- <th>澶囨敞1</th>
- <th>澶囨敞2</th>
+
<th>纾ㄨ竟/澶囨敞/鍔犲伐鍐呭</th>
</tr>
<tbody v-for="(item,index) in data.orderProductDetail" :key="index">
@@ -172,11 +173,12 @@
<td>{{item1.quantity}}</td>
<td>{{item1.grossArea}}</td>
<td>{{item1.perimeter}}</td>
+ <td>{{item1.buildingNumber}}</td>
+ <td>{{item1.processingNote}}</td>
<td></td>
<td>{{item1.orderNumber}}</td>
<td></td>
- <td></td>
- <td></td>
+
<td></td>
</tr>
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 140f45c..b6372d1 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
@@ -133,11 +133,12 @@
<th>鐗囨暟</th>
<th>闈㈢Н</th>
<th>寤剁背</th>
+ <th>妤煎彿</th>
+ <th>鍔犲伐瑕佹眰</th>
<th>浜よ揣鏃ユ湡</th>
<th>搴忓彿</th>
<th>绠辨灦鍙�</th>
- <th>澶囨敞1</th>
- <th>澶囨敞2</th>
+
<th>纾ㄨ竟/澶囨敞/鍔犲伐鍐呭</th>
</tr>
<tbody v-for="(item,index) in data.orderDetail" :key="index">
@@ -157,11 +158,12 @@
<td>{{item1.quantity}}</td>
<td>{{item1.grossArea}}</td>
<td>{{item1.perimeter}}</td>
+ <td>{{item1.buildingNumber}}</td>
+ <td>{{item1.processingNote}}</td>
<td>{{}}</td>
<td></td>
<td></td>
- <td></td>
- <td></td>
+
<td></td>
</tr>
--
Gitblit v1.8.0