From 2e1553e8a7120c2d38d69a8f400dcca2557b09fb Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 26 十二月 2025 15:59:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetTwoColumn.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 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/PrintSheetTwoColumn.vue
similarity index 98%
rename from north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet3.vue
rename to north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetTwoColumn.vue
index 61707e9..75b108b 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet3.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetTwoColumn.vue
@@ -283,7 +283,7 @@
             </tr>
             <tr class="day-in">
               <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;">
+                <div style="display: flex;font-size: 14px;text-align: center;">
                   <span style="width: 25%;font-weight: bold;font-size: 12px">鍔犲伐璐圭敤</span>&nbsp;
                   <span  style="width: 25%;font-weight: bold;font-size: 12px">鍗曚环</span>&nbsp;
                   <span  style="width: 25%;font-weight: bold;font-size: 12px">鏁伴噺</span>&nbsp;
@@ -294,7 +294,7 @@
             </tr>
             <tr class="day-in">
               <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">
+                <div style="display: flex;font-size: 14px;text-align: center" v-for="(item, index2) in itme1.otherMoney1" :key="index2">
                   <span style="width: 25%">{{item.DeliveryDetailOtherMoney.alias}}</span>&nbsp;
                   <span  style="width: 25%">{{item.DeliveryDetailOtherMoney.price}}</span>&nbsp;
                   <span  style="width: 25%">{{item.DeliveryDetailOtherMoney.count}}</span>&nbsp;

--
Gitblit v1.8.0