From c076e24dff4ce758caa4aececdad174003806b86 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Sun, 23 Jul 2023 18:23:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=9A=E5=8A=A1=E7=AB=AF?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/BBWYAppSettings.json              |  4 +-
 BBWY.Client/GlobalContext.cs                  |  2 +-
 .../ViewModels/PackTask/TaskListViewModel.cs  |  4 +-
 .../PackTask/WareHouseListViewModel.cs        |  2 +-
 .../Views/PackTask/PackDetailWindow.xaml      |  2 +-
 BBWY.Client/Views/PackTask/ServiceWindow.xaml |  2 +-
 .../PackTask/ShopWaitPackageControl.xaml      | 23 ++++++----
 .../Views/PackTask/TaskListControl.xaml       | 42 +++++++++++--------
 8 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/BBWY.Client/BBWYAppSettings.json b/BBWY.Client/BBWYAppSettings.json
index e1b3dcff..ef760e08 100644
--- a/BBWY.Client/BBWYAppSettings.json
+++ b/BBWY.Client/BBWYAppSettings.json
@@ -4,6 +4,6 @@
   "MDSApiHost": "http://mdsapi.qiyue666.com",
   "JOSApiHost": "",
   "1688ApiHost": "",
-  "QKApiHost": "http://localhost:8080"
-  //"QKApiHost": "http://qiku.qiyue666.com"
+  // "QKApiHost": "http://localhost:8080"
+  "QKApiHost": "http://qiku.qiyue666.com"
 }
\ No newline at end of file
diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index 5ab36187..a16db80b 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 = "10153";
+            ClientVersion = "10154";
         }
 
         private User user;
diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
index 090af060..e6d58a6a 100644
--- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
@@ -613,8 +613,8 @@ namespace BBWY.Client.ViewModels.PackTask
                                 if (item.FeesItemResponse != null)
                                 {
                                     data.FeesItemResponse = item.FeesItemResponse;
-                                    data.FeesMoney = item.FeesItemResponse.SingleFees;
-                                    data.IsShowFees = data.FeesMoney > 0 ? true : false;
+                                    data.FeesMoney = item.FeesItemResponse.AllFees;
+                                    data.IsShowFees = item.FeesItemResponse.AllFees > 0 ? true : false;
                                     data.FeesItemResponse.DiscountSingleFees = item.FeesItemResponse.SingleFees * item.FeesItemResponse.disCount;
                                     data.FeesItemResponse.DiscountAllFees = item.FeesItemResponse.AllFees * item.FeesItemResponse.disCount;
 
diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
index dbbdb1fb..5536e8a6 100644
--- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
@@ -777,7 +777,7 @@ namespace BBWY.Client.ViewModels.PackTask
         {
             var model = (PackTaskModel)obj;
 
-            if (model == null || model.FeesItemResponse == null || model.FeesItemResponse.DiscountAllFees == 0)
+            if (model == null || model.FeesItemResponse == null || model.FeesItemResponse.AllFees == 0)
             {
                 System.Windows.MessageBox.Show("请先设置打包费用!");
                 return;
diff --git a/BBWY.Client/Views/PackTask/PackDetailWindow.xaml b/BBWY.Client/Views/PackTask/PackDetailWindow.xaml
index 29b70200..5c25b243 100644
--- a/BBWY.Client/Views/PackTask/PackDetailWindow.xaml
+++ b/BBWY.Client/Views/PackTask/PackDetailWindow.xaml
@@ -538,7 +538,7 @@
 
 
 
-        <Grid Grid.Row="1" Grid.Column="1"  Visibility="Visible">
+        <Grid Grid.Row="1" Grid.Column="1"  Visibility="Hidden">
             <StackPanel Orientation="Vertical" Name="printArea"  Width="1065" Height="800">
 
                 <StackPanel Orientation="Horizontal">
diff --git a/BBWY.Client/Views/PackTask/ServiceWindow.xaml b/BBWY.Client/Views/PackTask/ServiceWindow.xaml
index 9f312214..7cea7a55 100644
--- a/BBWY.Client/Views/PackTask/ServiceWindow.xaml
+++ b/BBWY.Client/Views/PackTask/ServiceWindow.xaml
@@ -421,7 +421,7 @@
 
 
 
-        <Grid Grid.Row="1" Grid.Column="1"  Visibility="Visible">
+        <Grid Grid.Row="1" Grid.Column="1"  Visibility="Hidden">
             <StackPanel Orientation="Vertical" Name="printArea"  Width="1065" Height="800">
 
                 <StackPanel Orientation="Horizontal">
diff --git a/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml b/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
index 11890a9f..1127140f 100644
--- a/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
+++ b/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
@@ -399,8 +399,10 @@
 
            
                             <Grid Grid.Column="7">
-                                <StackPanel Margin="20,0,0,0" Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Left" >
-                                    <TextBlock  Text="收费:"/>
+                                <StackPanel Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Center"
+                                                Visibility="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible   }"
+                                                >
+                                    <TextBlock  Text="收费: "/>
                                     <TextBlock 
                                                Text="{Binding FeesItemResponse.AllFees, StringFormat={}{0:F2}}" 
                                                TextWrapping="Wrap"
@@ -408,19 +410,22 @@
                                                />
                                     <Path x:Name="path_fees_name" 
                                               Style="{StaticResource path_question}" 
-                                              Width="14" Margin="0,0,0,0" Fill="{StaticResource Text.Pink}"
-                                              ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="20000"
-                                              Visibility="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible   }"
+                                              Width="14"  Fill="{StaticResource Text.Pink}"
+                                              ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="30000"
                                               >
-
                                         <Path.ToolTip>
                                             <ToolTip  Style="{StaticResource OrderCouponToolipStyle}">
-                                                <local:FeesExcelControl  IsWareHouse="True"  FeesItem="{Binding FeesItemResponse,Mode=TwoWay,NotifyOnSourceUpdated=True,UpdateSourceTrigger=PropertyChanged}" 
-                                                                               />
+                                                <Grid>
+                                                    <local:FeesExcelControl    FeesItem="{Binding FeesItemResponse,Mode=TwoWay,NotifyOnSourceUpdated=True,UpdateSourceTrigger=PropertyChanged}" 
+                                                                                 Visibility="{Binding PackProcessType,Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}"
+                                                                                 />
+                                                    <local:FeesExcelV2Control    FeesItem="{Binding FeesItemResponse,Mode=TwoWay,NotifyOnSourceUpdated=True,UpdateSourceTrigger=PropertyChanged}" 
+                                                                                 Visibility="{Binding PackProcessType,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                                                                 />
+                                                </Grid>
                                             </ToolTip>
                                         </Path.ToolTip>
                                     </Path>
-
                                 </StackPanel>
                             </Grid>
                             <!--<Grid Grid.Column="8" >
diff --git a/BBWY.Client/Views/PackTask/TaskListControl.xaml b/BBWY.Client/Views/PackTask/TaskListControl.xaml
index 55bb3f12..717b87e0 100644
--- a/BBWY.Client/Views/PackTask/TaskListControl.xaml
+++ b/BBWY.Client/Views/PackTask/TaskListControl.xaml
@@ -369,30 +369,36 @@
                             </Grid>-->
                             <Grid Grid.Column="8" >
                                 <Grid   >
-                                    <StackPanel  Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Center" 
-                                                  Visibility="{Binding IsShowFees,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
-                                                 >
-                                        <TextBlock  TextWrapping="Wrap"
-                                            TextAlignment="Center"   VerticalAlignment="Center" HorizontalAlignment="Center" >
-                                            <Run Text="收费:"/>
-                                            <Run Text="{Binding FeesItemResponse.DiscountAllFees,StringFormat=0.00}" 
-                                              />
-                                        </TextBlock>
-                                        <Path x:Name="path_purchaseAmount_question" 
+
+                                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Center"
+                                                Visibility="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible   }"
+                                                >
+                                        <TextBlock  Text="收费: "/>
+                                        <TextBlock 
+                                               Text="{Binding FeesItemResponse.AllFees, StringFormat={}{0:F2}}" 
+                                               TextWrapping="Wrap"
+                                               HorizontalAlignment="Center" 
+                                               />
+                                        <Path x:Name="path_fees_name" 
                                               Style="{StaticResource path_question}" 
-                                              Width="14" Margin="5,0,0,0" Fill="{StaticResource Text.Pink}"
-                                              ToolTipService.InitialShowDelay="0"
-                                              
-                                              ToolTipService.ShowDuration="20000">
+                                              Width="14"  Fill="{StaticResource Text.Pink}"
+                                              ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="30000"
+                                              >
                                             <Path.ToolTip>
-                                                <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
-                                                    <local:FeesExcelControl   FeesItem="{Binding FeesItemResponse,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                                                             />
+                                                <ToolTip  Style="{StaticResource OrderCouponToolipStyle}">
+                                                    <Grid>
+                                                        <local:FeesExcelControl    FeesItem="{Binding FeesItemResponse,Mode=TwoWay,NotifyOnSourceUpdated=True,UpdateSourceTrigger=PropertyChanged}" 
+                                                                                 Visibility="{Binding PackProcessType,Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}"
+                                                                                 />
+                                                        <local:FeesExcelV2Control    FeesItem="{Binding FeesItemResponse,Mode=TwoWay,NotifyOnSourceUpdated=True,UpdateSourceTrigger=PropertyChanged}" 
+                                                                                 Visibility="{Binding PackProcessType,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                                                                 />
+                                                    </Grid>
                                                 </ToolTip>
                                             </Path.ToolTip>
                                         </Path>
-
                                     </StackPanel>
+                                   
                                 </Grid>
                             </Grid>
                             <Grid Grid.Column="9" >