From 24d32a37ff3fe4102ccbc3cc014019c631be644c Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Sun, 5 Nov 2023 16:06:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=85=E8=80=97=E6=9D=90=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=96=B0=E5=A2=9E=E8=87=AA=E5=AE=9A=E4=B9=89=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/App.xaml.cs | 3 +- BBWY.Client/GlobalContext.cs | 2 +- .../APIModel/Request/SetPackDetailRequest.cs | 5 ++++ BBWY.Client/Models/PackTask/PackItemModel.cs | 5 ++++ .../PackTask/PackDetailViewModel.cs | 29 ++++++++++++++++++- .../Views/PackTask/PackDetailWindow.xaml | 22 +++++++------- .../PackerPackCompletedControl.xaml | 25 +++++++++++----- .../PackerTask/PackerWaitPackageControl.xaml | 25 +++++++++++----- 8 files changed, 89 insertions(+), 27 deletions(-) diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs index 16af79ef..5ab027b8 100644 --- a/BBWY.Client/App.xaml.cs +++ b/BBWY.Client/App.xaml.cs @@ -72,7 +72,8 @@ namespace BBWY.Client //齐越琳琳 - //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjY4NDI2OTQyNTY0NTM2MzIwIiwidGVhbUlkIjoiMTUxNjcxNTM3MjQ0NTcwMDA5NiIsInNvblRlYW1JZHMiOiIxNzE4NTQxMDYzMzk3ODM4ODQ4LDE1MTY3MTUzNzI0NDU3MDAwOTYiLCJleHAiOjE3MzAyODcxNjh9.6vXadZWQfhnxbR3320RloKv3LqqbNdZ7wDDfO3tY_5U"; + + userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjY4NDI2OTQyNTY0NTM2MzIwIiwidGVhbUlkIjoiMTUxNjcxNTM3MjQ0NTcwMDA5NiIsInNvblRlYW1JZHMiOiIxNzE4NTQxMDYzMzk3ODM4ODQ4LDE1MTY3MTUzNzI0NDU3MDAwOTYiLCJleHAiOjE3MzAyODcxNjh9.6vXadZWQfhnxbR3320RloKv3LqqbNdZ7wDDfO3tY_5U"; #else //var uid = e.Args.Count() > 0 ? e.Args.LastOrDefault(args => args.StartsWith("uid:")) : string.Empty; //if (string.IsNullOrEmpty(uid)) diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 8b89fb91..74a3ba08 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -13,7 +13,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10197"; + ClientVersion = "10198"; } diff --git a/BBWY.Client/Models/APIModel/Request/SetPackDetailRequest.cs b/BBWY.Client/Models/APIModel/Request/SetPackDetailRequest.cs index ffc62455..68414b4b 100644 --- a/BBWY.Client/Models/APIModel/Request/SetPackDetailRequest.cs +++ b/BBWY.Client/Models/APIModel/Request/SetPackDetailRequest.cs @@ -92,6 +92,11 @@ namespace BBWY.Client.Models /// 耗材类型 /// public string ConsumableTypeName { get; set; } + + /// + /// 耗材是否存入配置 (添加的耗材) + /// + public bool? IsSaveConfig { get; set; } = true; } public class PackUserModelRequest { diff --git a/BBWY.Client/Models/PackTask/PackItemModel.cs b/BBWY.Client/Models/PackTask/PackItemModel.cs index 49b64298..e3664ce1 100644 --- a/BBWY.Client/Models/PackTask/PackItemModel.cs +++ b/BBWY.Client/Models/PackTask/PackItemModel.cs @@ -15,6 +15,11 @@ namespace BBWY.Client.Models.PackTask { public class PackItemModel : NotifyObject { + + private bool isHideDelete=false; + public bool IsHideDelete { get => isHideDelete; set { Set(ref isHideDelete, value); } } + + private string itemName; public string ItemName { get => itemName; set { Set(ref itemName, value); } } diff --git a/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs b/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs index e9317963..028b07f9 100644 --- a/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs @@ -812,8 +812,35 @@ namespace BBWY.Client.ViewModels.PackTask condate.ConsumablePrice = con.ConsumablePrice; condate.SelectId = con.ConsumableId; condate.TaskCount = con.TaskCount; + condate.IsHideDelete = true; }); + else + { + ObservableCollection consumableTypeList = new ObservableCollection(); + + foreach (var item in ConsumableTypeList) + { + consumableTypeList.Add(item.ConsumableTypeName); + } + + App.Current.Dispatcher.Invoke(() => + { + ConsumableServiceList.Add(new PackItemModel + { + + ConsumableTypeList = consumableTypeList, + AllConsumableTypeList = ConsumableTypeList, + TotalConsumableFees = ToTalConsumableFees, + ConsumableType = con.ConsumableTypeName, + ConsumablePrice = con.ConsumablePrice, + SelectId = con.ConsumableId, + TaskCount = con.TaskCount + }); + + }); + + } } } @@ -986,7 +1013,7 @@ namespace BBWY.Client.ViewModels.PackTask ConsumableFees = ConsumableFees, TaskId = TaskId, PackUserList = PackUserModelList?.Select(p => new PackUserModelRequest { TaskCount = p.TaskCount, UserId = p.SelectUserId }).ToList(), - ConsumableList = ConsumableServiceList?.Select(c => new ConsumableRequest { ConsumableId = c.SelectId.Value, TaskCount = c.TaskCount, ConsumableTypeName = c.ConsumableType, ConsumablePrice = c.ConsumablePrice }).ToList(), + ConsumableList = ConsumableServiceList?.Select(c => new ConsumableRequest { ConsumableId = c.SelectId.Value, TaskCount = c.TaskCount, ConsumableTypeName = c.ConsumableType, ConsumablePrice = c.ConsumablePrice,IsSaveConfig=c.IsHideDelete }).ToList(), DiscountFactory = DiscountFactory, PackDiscountPrice = PackDiscountFees, PackPrice = PackFees, diff --git a/BBWY.Client/Views/PackTask/PackDetailWindow.xaml b/BBWY.Client/Views/PackTask/PackDetailWindow.xaml index 746b409d..56529189 100644 --- a/BBWY.Client/Views/PackTask/PackDetailWindow.xaml +++ b/BBWY.Client/Views/PackTask/PackDetailWindow.xaml @@ -14,10 +14,10 @@ xmlns:hc="https://handyorg.github.io/handycontrol" CloseButtonVisibility="Visible" WindowStartupLocation="CenterScreen" - CloseButtonColor="{StaticResource WindowButtonColor}" + CloseButtonColor="White" DataContext="{Binding PackDetailVM,Source={StaticResource Locator}}" MinButtonVisibility="Collapsed" - MaxButtonVisibility="Collapsed" + MaxButtonVisibility="Collapsed" RightButtonGroupMargin="0,5,5,0"> @@ -82,8 +82,8 @@ - + Background="{StaticResource Button.Background}"> + @@ -347,7 +347,7 @@ ItemsSource="{Binding PackUserModelList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" BorderBrush="{StaticResource Border.Brush}" - BorderThickness="1,1,1,1" + BorderThickness="1 0 1 0 " Foreground="{StaticResource Text.Color}" ScrollViewer.VerticalScrollBarVisibility="Auto" > @@ -375,7 +375,7 @@ - @@ -432,7 +432,7 @@ ItemsSource="{Binding ConsumableServiceList}" ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" BorderBrush="{StaticResource Border.Brush}" - BorderThickness="1,1,1,0" + BorderThickness="1,0,1,0" Foreground="{StaticResource Text.Color}" ScrollViewer.VerticalScrollBarVisibility="Auto" > @@ -458,7 +458,7 @@ @@ -471,9 +471,11 @@ - + diff --git a/BBWY.Client/Views/PackerTask/PackerPackCompletedControl.xaml b/BBWY.Client/Views/PackerTask/PackerPackCompletedControl.xaml index 554f0717..e4ca9861 100644 --- a/BBWY.Client/Views/PackerTask/PackerPackCompletedControl.xaml +++ b/BBWY.Client/Views/PackerTask/PackerPackCompletedControl.xaml @@ -172,7 +172,7 @@ - + @@ -230,7 +230,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -400,13 +400,24 @@ TextWrapping="Wrap" - + + + + + + + - - - + + + + + + + + diff --git a/BBWY.Client/Views/PackerTask/PackerWaitPackageControl.xaml b/BBWY.Client/Views/PackerTask/PackerWaitPackageControl.xaml index 61453521..7b38d4a9 100644 --- a/BBWY.Client/Views/PackerTask/PackerWaitPackageControl.xaml +++ b/BBWY.Client/Views/PackerTask/PackerWaitPackageControl.xaml @@ -173,7 +173,7 @@ - + @@ -229,12 +229,12 @@ + + + - - - - + @@ -263,7 +263,7 @@ - + @@ -402,10 +402,21 @@ TextWrapping="Wrap" - + + + + + + + + + + + +