From d87959a155a4bf7dc7a0866d85c66168adab1419 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 03 十二月 2025 08:35:37 +0800
Subject: [PATCH] 发货一行两列打印新增楼层编号
---
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet3.vue | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet3.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet3.vue
index f81ee54..8992470 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet3.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet3.vue
@@ -215,29 +215,33 @@
<template v-for="(item, index) in itme1.data" :key="index" >
<thead>
<tr v-if="index===0">
+ <th style="width: 9%;">妤煎眰缂栧彿</th>
<th style="width: 14%;" colspan="1">瀹絏楂�</th>
<th style="width: 8%;">鏁伴噺</th>
- <th style="width: 9%;">闈㈢Н</th>
- <th style="width: 9%;">鍗曚环</th>
- <th style="width: 9.5%;">閲戦</th>
+ <th style="width: 6%;">闈㈢Н</th>
+ <th style="width: 6%;">鍗曚环</th>
+ <th style="width: 6.5%;">閲戦</th>
<th style="width: 1%;"></th>
+ <th style="width: 9%;">妤煎眰缂栧彿</th>
<th style="width: 14%;" colspan="1">瀹絏楂�</th>
<th style="width: 8%;">鏁伴噺</th>
- <th style="width: 9%;">闈㈢Н</th>
- <th style="width: 9%;">鍗曚环</th>
- <th style="width: 9.5%;">閲戦</th>
+ <th style="width: 6%;">闈㈢Н</th>
+ <th style="width: 6%;">鍗曚环</th>
+ <th style="width: 6.5%;">閲戦</th>
+ <th style="width: 1%;"></th>
</tr>
</thead>
<tr>
- <td style="font-size: 15px;text-align: left" colspan="5">浜у搧鍚嶇О:<span>{{item.DeliveryDetail.orderDetail.productName}}</span></td>
+ <td style="font-size: 15px;text-align: left" colspan="6">浜у搧鍚嶇О:<span>{{item.DeliveryDetail.orderDetail.productName}}</span></td>
<td style="font-size: 15px;text-align: left" colspan="3">鎵规:<span>{{item.DeliveryDetail.order.batch}}</span></td>
- <td style="font-size: 15px;text-align: left" colspan="3">璁㈠崟缂栧彿:<span>{{item.DeliveryDetail.orderDetail.orderId}}</span></td>
+ <td style="font-size: 15px;text-align: left" colspan="4">璁㈠崟缂栧彿:<span>{{item.DeliveryDetail.orderDetail.orderId}}</span></td>
</tr>
<tr class="day-in" v-for="(group, groupIndex) in item.groupedDeliveryDetails" :key="groupIndex">
<!-- 绗竴鍒楁暟鎹紙缁勫唴绗竴鏉★級 -->
+ <td>{{ group[0].buildingNumber }}</td>
<td style="font-size: 15px;font-weight: bold;">
{{ group[0].parsedOtherColumns?.S02 ? `(${group[0].parsedOtherColumns.S02})` : '' }}
{{ group[0].width }}x{{ group[0].height }}
@@ -249,6 +253,7 @@
<td></td> <!-- 鍒嗛殧鍒� -->
<!-- 绗簩鍒楁暟鎹紙缁勫唴绗簩鏉★紝鑻ュ瓨鍦級 -->
+ <td v-if="group[1]">{{ group[1].buildingNumber }}</td>
<td style="font-size: 15px;font-weight: bold;" v-if="group[1]">
{{ group[1].parsedOtherColumns?.S02 ? `(${group[1].parsedOtherColumns.S02})` : '' }}
{{ group[1].width }}x{{ group[1].height }}
@@ -262,7 +267,7 @@
<td v-else colspan="5"></td>
</tr>
<tr class="day-in" >
- <td style="font-size: 15px;" colspan="7">灏忚:</td>
+ <td style="font-size: 15px;" colspan="9">灏忚:</td>
<td>{{item.DeliveryDetail.quantity}}</td>
<td>{{item.DeliveryDetail.area}}</td>
<td></td>
@@ -271,14 +276,14 @@
</template>
<tr class="day-in">
- <td style="font-size: 15px;" colspan="7">鍚堣:</td>
+ <td style="font-size: 15px;" colspan="9">鍚堣:</td>
<td>{{itme1.delivery.quantity}}</td>
<td>{{itme1.delivery.area}}</td>
<td></td>
<td>{{parseFloat(itme1.sumMoney.toFixed(2))}}</td>
</tr>
<tr class="day-in">
- <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6" colspan="6">
+ <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6" colspan="7">
<div style="display: flex;font-size: 10px;text-align: center;">
<span style="width: 25%;font-weight: bold;font-size: 12px">鍔犲伐璐圭敤</span>
<span style="width: 25%;font-weight: bold;font-size: 12px">鍗曚环</span>
@@ -286,10 +291,10 @@
<span style="width: 25%;font-weight: bold;font-size: 12px">閲戦</span>
</div>
</td>
- <td style="text-align: left;border:none;font-size: 15px;" colspan="5">鎬婚噾棰�: {{itme1.delivery.money}}</td>
+ <td style="text-align: left;border:none;font-size: 15px;" colspan="6">鎬婚噾棰�: {{itme1.delivery.money}}</td>
</tr>
<tr class="day-in">
- <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="6" >
+ <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="7" >
<div style="display: flex;font-size: 10px;text-align: center" v-for="(item, index2) in itme1.otherMoney1" :key="index2">
<span style="width: 25%">{{item.DeliveryDetailOtherMoney.alias}}</span>
<span style="width: 25%">{{item.DeliveryDetailOtherMoney.price}}</span>
@@ -303,7 +308,7 @@
<span style="width: 25%">{{itme1.delivery.freight}}</span>
</div>
</td>
- <td style="text-align: left;border:none;font-size: 15px;" colspan="5">澶у啓閲戦: {{itme1.money}}</td>
+ <td style="text-align: left;border:none;font-size: 15px;" colspan="6">澶у啓閲戦: {{itme1.money}}</td>
</tr>
@@ -317,7 +322,7 @@
</el-row>-->
<tr class="day-in" style="border: 0;" v-if="company.showDeliveryCreator">
- <td colspan="11" style="border: 0">
+ <td colspan="13" style="border: 0">
<div style="display:flex;text-align: left" class="bottom">
<div style="width: 15%">鍒跺崟鍛橈細{{ itme1.delivery.creator }}</div>
<div style="width: 25%">鍒跺崟鏃ユ湡锛歿{ itme1.delivery.createTime }}</div>
@@ -329,7 +334,7 @@
</td>
</tr>
<tr class="day-in" style="border: 0;" v-if="company.showDeliveryCreator">
- <td colspan="11" style="border: 0;">
+ <td colspan="13" style="border: 0;">
<div style="display:flex;" class="bottom">
鏋跺瓙 鍙�
{{takeCare}}
@@ -337,7 +342,7 @@
</td>
</tr>
<tr class="day-in" style="border: 0;">
- <td colspan="11" style="border: 0;">
+ <td colspan="13" style="border: 0;">
<div style="display:flex;text-align: left;border: 0;margin-top: 10px " class="bottom" >
<el-input type="textarea" :autosize="{ minRows: 7, maxRows: 20 }" v-model="remark"/>
</div>
--
Gitblit v1.8.0