From e9e776e4ad2f191496defcca1a0250b2c49c9f4f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 26 二月 2025 16:55:01 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
index 62ae223..dc4add1 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
@@ -171,8 +171,8 @@
<tr v-if="index===0">
<th style="width: 6%;font-weight: bold;">搴�</th>
<th style="width: 15%;font-weight: bold;" >妤煎眰缂栧彿</th>
- <th style="width: 20%;font-weight: bold;" colspan="3">瀹絏楂�</th>
- <th style="width: 12%;font-weight: bold;">鏁伴噺</th>
+ <th style="width: 25%;font-weight: bold;" colspan="3">瀹絏楂�</th>
+ <th style="width: 8%;font-weight: bold;">鏁伴噺</th>
<th style="width: 12%;font-weight: bold;">闈㈢Н</th>
<th style="width: 17%;font-weight: bold;" colspan="2">鍔犲伐瑕佹眰</th>
</tr>
@@ -189,9 +189,9 @@
<td>{{items.orderNumber}}</td>
<td>{{items.buildingNumber}}</td>
<td colspan="3" style="font-size: 20px;font-weight: bold;" v-if="items.otherColumns?.S02">{{items.otherColumns?.S02}}</td>
- <td colspan="3" style="font-size: 20px;font-weight: bold;" v-else-if="items.differentSize===1 && items.bendRadius==null">
+ <td colspan="3" style="font-size: 17px;white-space:nowrap;font-weight: bold;" v-else-if="items.differentSize===1 && items.bendRadius==null">
<template v-for="(orderGlassDetail, index1) in items.orderGlassDetails" >
- ({{orderGlassDetail.childWidth}}x{{orderGlassDetail.childHeight}})
+ ({{orderGlassDetail.childWidth}}x{{orderGlassDetail.childHeight}})
</template>
</td>
<td colspan="3" style="font-size: 20px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
--
Gitblit v1.8.0