diff --git a/BBWY.Client/Models/MappingProfile.cs b/BBWY.Client/Models/MappingProfile.cs index 6c871dd9..adfde434 100644 --- a/BBWY.Client/Models/MappingProfile.cs +++ b/BBWY.Client/Models/MappingProfile.cs @@ -32,6 +32,8 @@ namespace BBWY.Client.Models CreateMap(); CreateMap(); CreateMap(); + CreateMap(); + CreateMap(); } } } diff --git a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs index 49a28a17..0839dce2 100644 --- a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs +++ b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs @@ -1,7 +1,6 @@ using BBWY.Client.APIServices; using BBWY.Client.Models; using BBWY.Client.Views.BatchPurchase; -using BBWY.Client.Views.ServiceOrder; using BBWY.Common.Extensions; using BBWY.Common.Models; using BBWY.Controls; diff --git a/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml index 395651f2..c409998f 100644 --- a/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml +++ b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml @@ -11,6 +11,7 @@ xmlns:sys="clr-namespace:System;assembly=mscorlib" d:DesignHeight="1080" d:DesignWidth="1920" Title="BatchPurchaseOrderList" + Foreground="{StaticResource Text.Color}" DataContext="{Binding BatchPurchaseOrderListVM,Source={StaticResource Locator}}"> 0 @@ -155,7 +156,7 @@ - + @@ -175,12 +176,197 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BBWY.Client/Views/Order/OrderListControl.xaml b/BBWY.Client/Views/Order/OrderListControl.xaml index 9c9d1301..3903100b 100644 --- a/BBWY.Client/Views/Order/OrderListControl.xaml +++ b/BBWY.Client/Views/Order/OrderListControl.xaml @@ -114,7 +114,8 @@ + ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" + Foreground="{StaticResource Text.Color}">