diff --git a/BBWY.Client/APIServices/PackPurchaseTaskService.cs b/BBWY.Client/APIServices/PackPurchaseTaskService.cs index dc395cb9..1c7b1f3e 100644 --- a/BBWY.Client/APIServices/PackPurchaseTaskService.cs +++ b/BBWY.Client/APIServices/PackPurchaseTaskService.cs @@ -111,8 +111,5 @@ namespace BBWY.Client.APIServices return SendRequest(globalContext.QKApiHost, $"api/Barcode/SearchBarCodeBySkuId?skuId={skuId}", null, null, HttpMethod.Get); } - - - } } diff --git a/BBWY.Client/Models/PackTask/PackTaskModel.cs b/BBWY.Client/Models/PackTask/PackTaskModel.cs index ff2e2911..ba02fbdc 100644 --- a/BBWY.Client/Models/PackTask/PackTaskModel.cs +++ b/BBWY.Client/Models/PackTask/PackTaskModel.cs @@ -121,6 +121,10 @@ namespace BBWY.Client.Models //加载数据 ViewModelLocator viewModelLocator = new ViewModelLocator(); var serviceViewModel = viewModelLocator.PackServiceList; + + serviceViewModel.PackTaskModel = this; + serviceViewModel.PackTaskList = new System.Collections.ObjectModel.ObservableCollection { this}; + serviceViewModel.TaskCount = SkuCount; serviceViewModel.TaskId = TaskId; serviceViewModel.OrderId= OrderId; diff --git a/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs b/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs index 44df899e..17eba481 100644 --- a/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs @@ -29,6 +29,16 @@ namespace BBWY.Client.ViewModels.PackTask { + private ObservableCollection packTaskList; + /// + /// 动态数据表 + /// + public ObservableCollection PackTaskList { get => packTaskList; set { Set(ref packTaskList, value); } } + + + private PackTaskModel packTaskModel; + + public PackTaskModel PackTaskModel { get => packTaskModel; set { Set(ref packTaskModel, value); } } // public ICommand AddPackServiceCommand { get; set; } diff --git a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs index 295452a3..6174e294 100644 --- a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs @@ -609,7 +609,7 @@ namespace BBWY.Client.ViewModels.PackTask return; } SaveTask = "保存"; - Logo = model.ItemList[0].Logo; + Logo = model.ItemList[0].Logo.Replace("80x80","200x200"); SearchSkuId = model.SkuId; SkuId = model.SkuId; SkuCount = model.SkuCount; diff --git a/BBWY.Client/Views/PackTask/ServiceWindow.xaml b/BBWY.Client/Views/PackTask/ServiceWindow.xaml index 18dc36e5..eac79660 100644 --- a/BBWY.Client/Views/PackTask/ServiceWindow.xaml +++ b/BBWY.Client/Views/PackTask/ServiceWindow.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:BBWY.Client.Views.PackTask" mc:Ignorable="d" - Title="TipsWindow" Height="820" Width="360" + Title="TipsWindow" Height="820" Width="1560" xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls" xmlns:b="http://schemas.microsoft.com/xaml/behaviors" xmlns:ctr="clr-namespace:BBWY.Client.Converters" @@ -20,6 +20,10 @@ RightButtonGroupMargin="0,5,5,0"> + + + + @@ -126,7 +130,7 @@ ItemsSource="{Binding PackList}" MaxHeight="100" ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" BorderBrush="{StaticResource Border.Brush}" - BorderThickness="1,1,1,0" + BorderThickness="1,1,1,1" Foreground="{StaticResource Text.Color}" ScrollViewer.VerticalScrollBarVisibility="Auto" > @@ -222,16 +226,318 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BBWY.Client/Views/QualityTask/QualityWindow.xaml b/BBWY.Client/Views/QualityTask/QualityWindow.xaml index 030267de..c9964776 100644 --- a/BBWY.Client/Views/QualityTask/QualityWindow.xaml +++ b/BBWY.Client/Views/QualityTask/QualityWindow.xaml @@ -112,7 +112,7 @@ - + @@ -260,7 +260,7 @@ - + + + diff --git a/BBWY.Client/Views/TotalPackTask/PrintTaskWindow.xaml.cs b/BBWY.Client/Views/TotalPackTask/PrintTaskWindow.xaml.cs new file mode 100644 index 00000000..eb152485 --- /dev/null +++ b/BBWY.Client/Views/TotalPackTask/PrintTaskWindow.xaml.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Shapes; + +namespace BBWY.Client.Views.TotalPackTask +{ + /// + /// PrintTaskWindow.xaml 的交互逻辑 + /// + public partial class PrintTaskWindow : Window + { + public PrintTaskWindow() + { + InitializeComponent(); + } + } +}