From 4520e2f65a96abe56fe1adbe29d0ae2a450098e9 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Thu, 13 Apr 2023 19:08:40 +0800
Subject: [PATCH] 1

---
 .../BatchPurchaseCreateNewOrderViewModel.cs   |  8 ++
 .../BatchCreateNewPurchaseOrder.xaml          | 77 +++++++++++++++++--
 .../BatchPurchaseAddProductSku.xaml           |  2 +-
 3 files changed, 81 insertions(+), 6 deletions(-)

diff --git a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs
index 58e02c81..6221c2b4 100644
--- a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs
+++ b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs
@@ -62,6 +62,7 @@ namespace BBWY.Client.ViewModels
         public ICommand FastCreateOrderCommand { get; set; }
         public ICommand PreviewOrderCommand { get; set; }
         public ICommand AddProductSkuCommand { get; set; }
+        public ICommand DeleteProductSkuWithSchemeCommand { get; set; }
 
         public BatchPurchaseCreateNewOrderViewModel(PurchaseProductAPIService purchaseProductAPIService, PurchaseService purchaseService, GlobalContext globalContext)
         {
@@ -73,6 +74,7 @@ namespace BBWY.Client.ViewModels
             FastCreateOrderCommand = new RelayCommand(FastCreateOrder);
             PreviewOrderCommand = new RelayCommand(PreviewOrder);
             AddProductSkuCommand = new RelayCommand(AddProductSku);
+            DeleteProductSkuWithSchemeCommand = new RelayCommand<ProductSkuWithScheme>(DeleteProductSkuWithScheme);
 
             this.delayTrigger = new DelayTrigger();
             this.delayTrigger.OnExecute = OnDelayTriggerExecute;
@@ -284,5 +286,11 @@ namespace BBWY.Client.ViewModels
             Console.WriteLine($"OnItemTotalChanged {DateTime.Now} {itemTotal}");
             this.delayTrigger.SetKey(Guid.NewGuid().ToString());
         }
+
+        private void DeleteProductSkuWithScheme(ProductSkuWithScheme productSkuWithScheme)
+        {
+            ProductSkuWithSchemeList.Remove(productSkuWithScheme);
+            this.delayTrigger.SetKey(Guid.NewGuid().ToString());
+        }
     }
 }
diff --git a/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml b/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml
index 724f69b2..40925521 100644
--- a/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml
+++ b/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml
@@ -43,23 +43,37 @@
                         <ColumnDefinition Width="380"/>
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="80"/>
+                        <ColumnDefinition Width="90"/>
+                        <ColumnDefinition Width="70"/>
                         <ColumnDefinition Width="80"/>
                         <ColumnDefinition Width="80"/>
                     </Grid.ColumnDefinitions>
                     <TextBlock Text="店铺商品信息" Style="{StaticResource middleTextBlock}"/>
                     <TextBlock Text="采购商品信息" Style="{StaticResource middleTextBlock}" Grid.Column="1"/>
 
-                    <TextBlock Text="组合配置" Style="{StaticResource middleTextBlock}" Grid.Column="2"/>
+                    <StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal">
+                        <TextBlock Text="组合配置"/>
+                        <Path Style="{StaticResource path_question}"
+                                          Width="14" Margin="5,0,0,0" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
+                            <Path.ToolTip>
+                                <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                    <TextBlock Text="该数量为组合配置比例,非实际采购数量"/>
+                                </ToolTip>
+                            </Path.ToolTip>
+                        </Path>
+                    </StackPanel>
+                    
                     <TextBlock Text="数量" Style="{StaticResource middleTextBlock}" Grid.Column="3"/>
                     <TextBlock Text="单价" Style="{StaticResource middleTextBlock}" Grid.Column="4"/>
                     <TextBlock Text="总额" Style="{StaticResource middleTextBlock}" Grid.Column="5"/>
+                    <TextBlock Text="操作" Style="{StaticResource middleTextBlock}" Grid.Column="6"/>
 
                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
                 </Grid>
             </Border>
 
@@ -74,6 +88,7 @@
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="380"/>
                                 <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="80"/>
                             </Grid.ColumnDefinitions>
                             <Grid>
                                 <Grid.ColumnDefinitions>
@@ -118,6 +133,8 @@
                                 </StackPanel>
                             </Grid>
 
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+
                             <ListBox x:Name="listbox_PurchaseSchemeProductSkuList" Grid.Column="1"
                                      ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
                                      Style="{StaticResource NoScrollViewListBoxStyle}"
@@ -128,8 +145,8 @@
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="1*"/>
                                                 <ColumnDefinition Width="80"/>
-                                                <ColumnDefinition Width="80"/>
-                                                <ColumnDefinition Width="80"/>
+                                                <ColumnDefinition Width="90"/>
+                                                <ColumnDefinition Width="70"/>
                                                 <ColumnDefinition Width="80"/>
                                             </Grid.ColumnDefinitions>
 
@@ -141,7 +158,7 @@
 
                                                 <c:BAsyncImage UrlSource="{Binding Logo}"
                                                            Width="80" DecodePixelWidth="80"
-                                                           VerticalAlignment="Top" Margin="0,5,0,0"
+                                                           VerticalAlignment="Top" Margin="0,5,0,5"
                                                            Cursor="Hand"/>
 
                                                 <StackPanel Grid.Column="1" Orientation="Vertical" VerticalAlignment="Top" Margin="0,5,0,0">
@@ -168,6 +185,11 @@
                                                             <Run Text="{Binding DataContext.PurchasePlatform,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}}"/>
                                                         </TextBlock>
                                                         <TextBlock Margin="10,0,0,0">
+                                                            <TextBlock.ToolTip>
+                                                                <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                                    <TextBlock Text="{Binding DataContext.PurchaserName,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}}"/>
+                                                                </ToolTip>
+                                                            </TextBlock.ToolTip>
                                                             <Run Text="采购商:"/>
                                                             <Run Text="{Binding DataContext.PurchaserName,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}}"/>
                                                         </TextBlock>
@@ -175,10 +197,55 @@
 
                                                 </StackPanel>
                                             </Grid>
+
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Margin="0,0,2,0"/>
+
+                                            <TextBlock Text="1" Style="{StaticResource middleTextBlock}" Grid.Column="1" Margin="0,0,0,25"/>
+                                            <c:BButton Content="修改" Grid.Column="1" VerticalAlignment="Bottom"
+                                                       Background="White"
+                                                       Foreground="{StaticResource Text.Color}"/>
+                                            <Border Grid.Column="1" Height="1" Background="{StaticResource Border.Brush}" VerticalAlignment="Bottom" Margin="-2,0,2,30"/>
+
+
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Margin="0,0,2,0" Grid.Column="1"/>
+                                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Column="2" Margin="0,0,5,0">
+                                                <c:BButton Content="-" Background="White" Foreground="Black"
+                                                    BorderBrush="{StaticResource Border.Brush}"
+                                                    BorderThickness="1"
+                                                    Width="15"
+                                                    Height="18"
+                                                    Command="{Binding DataContext.SubtractQuantityCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGrid}}}"
+                                                    CommandParameter="{Binding }"/>
+                                                <c:BTextBox Text="{Binding ItemTotal}" Margin="5,0" VerticalAlignment="Center"
+                                                    Width="40"
+                                                    DisableBgColor="{StaticResource TextBox.Disable.BgColor}"/>
+                                                <c:BButton Content="+" Background="White" Foreground="Black"
+                                                    BorderBrush="{StaticResource Border.Brush}"
+                                                    BorderThickness="1"
+                                                    Width="15"
+                                                    Height="18"
+                                                    Command="{Binding DataContext.AddQuantityCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGrid}}}"
+                                                    CommandParameter="{Binding }"/>
+                                            </StackPanel>
+
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Margin="0,0,2,0" Grid.Column="2"/>
+
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Margin="0,0,2,0" Grid.Column="3"/>
+                                            <TextBlock Grid.Column="3" Text="{Binding Price}" Style="{StaticResource middleTextBlock}"/>
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Margin="0,0,2,0" Grid.Column="4"/>
+                                            <TextBlock Grid.Column="4" Text="{Binding SkuAmount}" Style="{StaticResource middleTextBlock}"/>
+
+                                            <Border Height="1" VerticalAlignment="Bottom" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="5" Margin="0,0,2,0"/>
                                         </Grid>
                                     </DataTemplate>
                                 </ListBox.ItemTemplate>
                             </ListBox>
+
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1" Margin="0,0,2,0"/>
+
+                            <c:BButton Content="删除" Style="{StaticResource LinkButton}" Grid.Column="2" VerticalAlignment="Top" Margin="0,30,0,0"
+                                       Command="{Binding DataContext.DeleteProductSkuWithSchemeCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Window}}}"
+                                       CommandParameter="{Binding }"/>
                         </Grid>
                     </DataTemplate>
                 </ListBox.ItemTemplate>
diff --git a/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml b/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml
index 75bbc381..76a5268c 100644
--- a/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml
+++ b/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml
@@ -131,7 +131,7 @@
                                         </TextBlock>
                                         <TextBlock Margin="10,0,0,0">
                                             <Run Text="采购商:"/>
-                                            <Run Text="{Binding PurchaseName}"/>
+                                            <Run Text="{Binding PurchaserName}"/>
                                         </TextBlock>
                                     </StackPanel>