From 350e05dc3d4e08e0a2f9056e512275714d325181 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 10 七月 2024 17:20:31 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
index 5db92a2..5824665 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
@@ -97,7 +97,7 @@
<table >
<thead>
<tr class="title-s">
- <th colspan="13">
+ <th colspan="9">
<h1>
{{company.companyName}}
</h1>
@@ -131,7 +131,7 @@
<tr v-if="index===0">
<th style="width: 6%;">搴忓彿</th>
<th style="width: 20%;">妤煎眰缂栧彿</th>
- <th style="width: 20%;" colspan="2">瀹絏楂�</th>
+ <th style="width: 20%;" colspan="1">瀹絏楂�</th>
<th style="width: 10%;">鏁伴噺</th>
<th style="width: 10%;">闈㈢Н</th>
<th style="width: 10%;">鍗曚环</th>
@@ -139,17 +139,18 @@
<th style="width: 12%;" colspan="2">鍔犲伐瑕佹眰</th>
</tr>
+
+ </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="3">瀵规柟鍗曞彿:</td>
+ <td style="font-size: 15px;text-align: left" colspan="2">瀵规柟鍗曞彿:</td>
<td style="font-size: 15px;text-align: left" colspan="3">璁㈠崟缂栧彿:<span>{{item.DeliveryDetail.orderDetail.orderId}}</span></td>
</tr>
- </thead>
<tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1">
<td>{{items.order_number}}</td>
<td>{{items.buildingNumber}}</td>
- <td colspan="2" style="font-size: 15px;font-weight: bold;">{{items.width}}x{{items.height}}</td>
+ <td colspan="1" style="font-size: 15px;font-weight: bold;">{{items.width}}x{{items.height}}</td>
<td>{{items.quantity}}</td>
<td>{{items.area}}</td>
<td>{{items.price}}</td>
@@ -157,22 +158,22 @@
<td colspan="2">{{items.processingNote}}</td>
</tr>
<tr class="day-in" >
- <td style="font-size: 15px;" colspan="4">灏忚:</td>
+ <td style="font-size: 15px;" colspan="3">灏忚:</td>
<td>{{item.DeliveryDetail.quantity}}</td>
<td>{{item.DeliveryDetail.area}}</td>
<td></td>
<td>{{item.DeliveryDetail.money}}</td>
- <td></td>
+ <td colspan="2"></td>
</tr>
</template>
<tr class="day-in">
- <td style="font-size: 15px;" colspan="4">鍚堣:</td>
+ <td style="font-size: 15px;" colspan="3">鍚堣:</td>
<td>{{delivery.quantity}}</td>
<td>{{delivery.area}}</td>
<td></td>
<td>{{delivery.money-otherMoneys-delivery.freight}}</td>
- <td></td>
+ <td colspan="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="4">
@@ -405,9 +406,6 @@
<style scoped>
-#child{
- margin-top: 20px;
-}
h1,h3{
left:0;
right:0;
@@ -420,6 +418,7 @@
}
h3{
font-size: 1.2rem;
+ font-weight: bolder;
}
@@ -442,6 +441,13 @@
.title-s,.title-s th{
border:0
}
+
+.hr-border{
+ height: 2px;
+ width: 100%;
+ background-color: black;
+ color: black;
+}
table {
border-collapse: collapse;
width: 100%;
@@ -450,13 +456,6 @@
td > table {
margin: 0;
padding: 0;
-}
-
-.hr-border{
- height: 2px;
- width: 100%;
- background-color: black;
- color: black;
}
@page {
size: auto;
--
Gitblit v1.8.0