合并

BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs

@@ -109,7 +109,7 @@ namespace BBWY.Client.ViewModels
         private void PayPurchaseOrder(object obj)
         {
 
-            MessageBoxResult result = MessageBox.Show("确定支付订单?", "提示",
+            MessageBoxResult result = MessageBox.Show("确定支付货款?", "提示",
                                              MessageBoxButton.YesNo,
                                              MessageBoxImage.Warning);
             if (result != MessageBoxResult.Yes) return;

BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml

@@ -251,7 +251,7 @@
                                             <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"/>
+                                            <Border Height="1"  VerticalAlignment="Bottom" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="5" Margin="0,0,2,0"/>
                                         </Grid>
                                     </DataTemplate>
                                 </ListBox.ItemTemplate>
@@ -262,6 +262,7 @@
                             <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 }"/>
+                            <Border Height="1"   VerticalAlignment="Bottom" Background="{StaticResource Border.Brush}" Grid.Column="2" Margin="-2,0,2,0"/>
                         </Grid>
                     </DataTemplate>
                 </ListBox.ItemTemplate>

BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml

@@ -369,7 +369,7 @@
                                 <Border Width="1" Grid.Column="5" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
 
                                 <StackPanel Visibility="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待付款:Visible:Collapsed }" Orientation="Vertical" Grid.Column="6" VerticalAlignment="Center">
-                                    <c:BButton x:Name="payOrder" Content="支付订单" Style="{StaticResource LinkButton}"
+                                    <c:BButton x:Name="payOrder" Content="支付货款" Style="{StaticResource LinkButton}"
                                            Margin="5,0,0,10">
                                         <b:Interaction.Triggers>
                                             <b:EventTrigger EventName="PreviewMouseLeftButtonDown">