From ed3ce5c8f6e1f7ac1aad3218ab5e518fc95cdb0f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 10 九月 2024 10:26:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet5.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet5.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet5.vue
index d845417..d99358b 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet5.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet5.vue
@@ -35,7 +35,6 @@
perimeter: 0
})
const getData = () => {
- console.log(selectedValues.value)
request.post(`/order/printOrderProductGlassDetailMonolithic/${props.orderId}`,selectedValues.value).then(res => {
data.value= res.data
productIdData.value=data.value.orderDetail
@@ -140,7 +139,7 @@
<table style="border-style: none;" >
<thead>
<tr class="title-s">
- <th colspan="13">
+ <th colspan="9">
<h1>
{{ company.companyName }}
</h1>
@@ -178,8 +177,8 @@
<tr v-if="index===0">
<th style="width: 6%;font-weight: bold;">搴�</th>
<th style="width: 10%;font-weight: bold;" >妤煎眰缂栧彿</th>
- <th style="width: 20%;font-weight: bold;" colspan="1">瀹�(寮ч暱)X楂�</th>
- <th style="width: 20%;font-weight: bold;" colspan="2">鍒囧壊瀹�(寮ч暱)*楂�</th>
+ <th style="width: 15%;font-weight: bold;" colspan="1">瀹�(寮ч暱)X楂�</th>
+ <th style="width: 20%;font-weight: bold;" colspan="1">鍒囧壊瀹�(寮ч暱)*楂�</th>
<th style="width: 10%;font-weight: bold;">鏁伴噺</th>
<th style="width: 10%;font-weight: bold;">闈㈢Н</th>
<th style="width: 10%;font-weight: bold;">鍛ㄩ暱</th>
@@ -204,14 +203,14 @@
<td>{{items2.order_number}}/{{items2.technology_number}}</td>
<td>{{items2.building_number}}</td>
<td colspan="1" style="font-size: 15px;font-weight: bold;" >{{items2.width}}x{{items2.height}}</td>
- <td colspan="2" style="font-size: 15px;font-weight: bold;" >{{items2.child_width}}x{{items2.child_height}}/R={{items2.bend_radius}}</td>
+ <td colspan="1" style="font-size: 15px;font-weight: bold;" >{{items2.child_width}}x{{items2.child_height}}/R={{items2.bend_radius}}</td>
<td>{{items2.quantity}}</td>
<td>{{items2.gross_area.toFixed(2)}}</td>
<td>{{parseFloat(items2.perimeter).toFixed(2)}}</td>
<td colspan="2">{{items2.processing_note}}</td>
</tr>
<tr class="day-in" >
- <td style="font-size: 15px;font-weight: bold;" colspan="5">灏忚:</td>
+ <td style="font-size: 15px;font-weight: bold;" colspan="4">灏忚:</td>
<td>{{getQuantity(items.orderGlassDetails)}}</td>
<td>{{getArea(items.orderGlassDetails)}}</td>
<td>{{getPerimeter(items.orderGlassDetails)}}</td>
@@ -222,11 +221,11 @@
</template>
<tr class="day-in">
- <td style="font-size: 15px;font-weight: bold;" colspan="5">鍚堣:</td>
+ <td style="font-size: 15px;font-weight: bold;" colspan="4">鍚堣:</td>
<td>{{grossNum.quantity}}</td>
<td>{{grossNum.grossArea}}</td>
<td>{{grossNum.perimeter}}</td>
- <td colspan="3"></td>
+ <td colspan="2"></td>
</tr>
<tr class="day-in">
<td style="text-align: left;border-width: 0 0 0 0; border-style: solid; border-color: #d3dce6" colspan="9">
@@ -339,6 +338,11 @@
margin: 0;
padding: 0;
}
+@media print {
+ @page {
+ margin: 5mm 5mm 10mm 5mm;
+ }
+}
--
Gitblit v1.8.0