From c97bea8edbe5f24873a8b49b7988405cae8c0f9a Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 15 九月 2025 13:50:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
index e55a558..b73d50a 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
@@ -138,7 +138,8 @@
<thead>
<tr v-if="index===0">
<th style="width: 6%;">搴忓彿</th>
- <th style="width: 20%;">妤煎眰缂栧彿(绠卞彿)</th>
+ <th style="width: 10%;">妤煎眰缂栧彿</th>
+ <th style="width: 10%;">绠卞彿</th>
<th style="width: 20%;" colspan="2">瀹絏楂�</th>
<th style="width: 10%;">鏁伴噺</th>
<th style="width: 10%;">闈㈢Н</th>
@@ -148,15 +149,15 @@
</thead>
<tr>
- <td style="font-size: 15px;text-align: left" colspan="4">浜у搧鍚嶇О:<span>{{item.DeliveryDetail.orderDetail.productName}}</span></td>
- <td style="font-size: 15px;text-align: left" colspan="2">璁㈣揣鏃ユ湡:<span>{{item.DeliveryDetail.order.contractId}}</span></td>
+ <td style="font-size: 15px;text-align: left" colspan="5">浜у搧鍚嶇О:<span>{{item.DeliveryDetail.orderDetail.productName}}</span></td>
+ <td v-if="company.showDeliveryCreator" style="font-size: 15px;text-align: left" colspan="2">璁㈣揣鏃ユ湡:<span>{{item.DeliveryDetail.order.contractId}}</span></td>
<td style="font-size: 15px;text-align: left" colspan="3">璁㈠崟缂栧彿:<span>{{item.DeliveryDetail.orderDetail.orderId}}</span></td>
</tr>
<tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1">
<td>{{items.order_number}}</td>
- <td v-if="items.box_no!=null&&items.box_no!=''">{{items.buildingNumber}}({{items.box_no}})</td>
- <td v-else>{{items.buildingNumber}}</td>
+ <td >{{items.buildingNumber}}</td>
+ <td >{{items.box_no}}</td>
<!-- <td colspan="2" style="font-size: 15px;font-weight: bold;" v-if="items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null && company.companyName==='閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃')">{{JSON.parse(items.other_columns).S02}}</td>-->
<td colspan="2" style="font-size: 15px;font-weight: bold;" >
{{items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null )?"("+JSON.parse(items.other_columns).S02+")":''}}
@@ -167,14 +168,14 @@
<td colspan="3">{{items.processingNote}}</td>
</tr>
<tr class="day-in" >
- <td style="font-size: 15px;" colspan="4">灏忚:</td>
+ <td style="font-size: 15px;" colspan="5">灏忚:</td>
<td>{{item.DeliveryDetail.quantity}}</td>
<td>{{item.DeliveryDetail.area}}</td>
</tr>
</template>
<tr class="day-in">
- <td style="font-size: 15px;" colspan="4">鍚堣:</td>
+ <td style="font-size: 15px;" colspan="5">鍚堣:</td>
<td>{{itme1.delivery.quantity}}</td>
<td>{{itme1.delivery.area}}</td>
</tr>
--
Gitblit v1.8.0