From 26e9c031fa405e43bc1f4e84417e4d1cbc5d3ce3 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Thu, 21 Dec 2023 01:16:16 +0800
Subject: [PATCH] 10226

---
 BBWY.Client/GlobalContext.cs          |  2 +-
 BBWY.Client/Views/Ware/WareStock.xaml | 30 +++++++++++++++++++--------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index 5f6652fa..a327c10d 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10225";
+            ClientVersion = "10226";
         }
 
 
diff --git a/BBWY.Client/Views/Ware/WareStock.xaml b/BBWY.Client/Views/Ware/WareStock.xaml
index a200de87..214d5bff 100644
--- a/BBWY.Client/Views/Ware/WareStock.xaml
+++ b/BBWY.Client/Views/Ware/WareStock.xaml
@@ -43,7 +43,7 @@
                     <ColumnDefinition Width="60"/>
                     <ColumnDefinition Width="60"/>
                     <ColumnDefinition Width="60"/>
-                    <ColumnDefinition Width="50"/>
+                    <ColumnDefinition Width="60"/>
                     <ColumnDefinition Width="60"/>
                     <!--<ColumnDefinition Width="60"/>-->
                     <ColumnDefinition Width="80"/>
@@ -111,7 +111,7 @@
                     <ColumnDefinition Width="60"/>
                     <ColumnDefinition Width="60"/>
                     <ColumnDefinition Width="60"/>
-                    <ColumnDefinition Width="50"/>
+                    <ColumnDefinition Width="60"/>
                     <ColumnDefinition Width="60"/>
                     <!--<ColumnDefinition Width="60"/>-->
                     <ColumnDefinition Width="80"/>
@@ -212,7 +212,7 @@
                         <ColumnDefinition Width="60"/>
                         <ColumnDefinition Width="60"/>
                         <ColumnDefinition Width="60"/>
-                        <ColumnDefinition Width="50"/>
+                        <ColumnDefinition Width="60"/>
                         <ColumnDefinition Width="60"/>
                         <ColumnDefinition Width="60"/>
                         <ColumnDefinition Width="80"/>
@@ -244,7 +244,7 @@
                       <TextBlock Style="{StaticResource middleTextBlock}" TextAlignment="Center">
                           <Run Text="采购运"/>
                           <LineBreak/>
-                          <Run Text="单价"/>
+                          <Run Text="费单价"/>
                       </TextBlock>
                         <Path Style="{StaticResource path_question}"
                               Width="14" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
@@ -363,11 +363,23 @@
                             </Path.ToolTip>
                         </Path>
                     </StackPanel>
-                    <TextBlock Grid.Column="12" Style="{StaticResource middleTextBlock}" TextAlignment="Center">
-                          <Run Text="单件"/>
-                           <LineBreak/>
-                           <Run Text="总成本"/>
-                    </TextBlock>
+                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
+                                Grid.Column="12">
+                        <TextBlock Style="{StaticResource middleTextBlock}" TextAlignment="Center">
+                            <Run Text="单件"/>
+                            <LineBreak/>
+                            <Run Text="总成本"/>
+                        </TextBlock>
+                        <Path Style="{StaticResource path_question}"
+                              Width="14" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
+                            <Path.ToolTip>
+                                <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                    <TextBlock Text="合计前列各项成本"/>
+                                </ToolTip>
+                            </Path.ToolTip>
+                        </Path>
+                    </StackPanel>
+                   
 
                     <TextBlock Text="库存" Grid.Column="13" Style="{StaticResource middleTextBlock}"/>
                     <TextBlock Text="剩余库存" Grid.Column="14"  Style="{StaticResource middleTextBlock}"/>