From eba3314826d53ff0f7e5679d185baaff84e50354 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 04 十二月 2025 10:07:56 +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/PrintSheet4.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet4.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet4.vue
index bc0b5ce..80ce45d 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet4.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet4.vue
@@ -215,11 +215,13 @@
<template v-for="(item, index) in itme1.data" :key="index" >
<thead>
<tr v-if="index===0">
- <th style="width: 14%;" colspan="3">瀹絏楂�</th>
+ <th style="width: 9%;">妤煎眰缂栧彿</th>
+ <th style="width: 14%;" colspan="2">瀹絏楂�</th>
<th style="width: 8%;">鏁伴噺</th>
<th style="width: 9%;">闈㈢Н</th>
<th style="width: 1%;"></th>
- <th style="width: 14%;" colspan="3">瀹絏楂�</th>
+ <th style="width: 9%;">妤煎眰缂栧彿</th>
+ <th style="width: 14%;" colspan="2">瀹絏楂�</th>
<th style="width: 8%;">鏁伴噺</th>
<th style="width: 9%;">闈㈢Н</th>
</tr>
@@ -234,7 +236,8 @@
<tr class="day-in" v-for="(group, groupIndex) in item.groupedDeliveryDetails" :key="groupIndex">
<!-- 绗竴鍒楁暟鎹紙缁勫唴绗竴鏉★級 -->
- <td style="font-size: 15px;font-weight: bold;" colspan="3">
+ <td>{{ group[0].buildingNumber }}</td>
+ <td style="font-size: 15px;font-weight: bold;" colspan="2">
{{ group[0].parsedOtherColumns?.S02 ? `(${group[0].parsedOtherColumns.S02})` : '' }}
{{ group[0].width }}x{{ group[0].height }}
</td>
@@ -243,7 +246,8 @@
<td></td> <!-- 鍒嗛殧鍒� -->
<!-- 绗簩鍒楁暟鎹紙缁勫唴绗簩鏉★紝鑻ュ瓨鍦級 -->
- <td style="font-size: 15px;font-weight: bold;" colspan="3" v-if="group[1]">
+ <td v-if="group[1]">{{ group[1].buildingNumber }}</td>
+ <td style="font-size: 15px;font-weight: bold;" colspan="2" v-if="group[1]">
{{ group[1].parsedOtherColumns?.S02 ? `(${group[1].parsedOtherColumns.S02})` : '' }}
{{ group[1].width }}x{{ group[1].height }}
</td>
--
Gitblit v1.8.0