Browse Source

添加按工序类型计费方式

AddValidOverTime
506583276@qq.com 2 years ago
parent
commit
383b5e5ec7
  1. 2
      BBWY.Client/APIServices/QiKu/ConsumableService.cs
  2. 6
      BBWY.Client/Models/APIModel/Request/ConsumableRequest.cs
  3. 10
      BBWY.Client/Models/APIModel/Response/PackTask/GetConsumableTypeResponse.cs
  4. 29
      BBWY.Client/Models/PackTask/ConsumableModel.cs
  5. 15
      BBWY.Client/ViewModels/PackTask/ConsumableViewModel.cs
  6. 198
      BBWY.Client/ViewModels/PackTask/EditConsumableViewModel.cs
  7. 5
      BBWY.Client/Views/PackTask/Consumable.xaml
  8. 9
      BBWY.Client/Views/PackTask/EditConsumable.xaml
  9. 106
      BBWY.Client/Views/PackTask/MinFeesExcelControl.xaml.cs
  10. 40
      BBWY.Client/Views/PackTask/PackDetailWindow.xaml

2
BBWY.Client/APIServices/QiKu/ConsumableService.cs

@ -51,7 +51,7 @@ namespace BBWY.Client.APIServices
public ApiResponse<ConsumableResponse> Search(ConsumableSearchRequest consumable)
{
return SendRequest<ConsumableResponse>(globalContext.QKApiHost, "api/Consumable/Search",
return SendRequest<ConsumableResponse>(globalContext.QKApiHost, "api/Consumable/SearchConsumableList",
consumable
, null, HttpMethod.Post);
}

6
BBWY.Client/Models/APIModel/Request/ConsumableRequest.cs

@ -9,8 +9,8 @@ namespace BBWY.Client.Models.APIModel.Request
public class ConsumableResponse
{
public int OrderCount { get; set; }
public ConsumableModel[] Consumables { get; set; }
public int TotalCount { get; set; }
public ConsumableModel[] SearchConsumableList { get; set; }
}
public class ConsumableSearchRequest
@ -67,6 +67,6 @@ namespace BBWY.Client.Models.APIModel.Request
/// <summary>
/// 耗材归属
/// </summary>
public long ConsumableTypeId { get; set; }
public long? ConsumableTypeId { get; set; }
}
}

10
BBWY.Client/Models/APIModel/Response/PackTask/GetConsumableTypeResponse.cs

@ -6,8 +6,14 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
{
public class GetConsumableTypeResponse:NotifyObject
{
public string ConsumableTypeName { get; set; }
public long ConsumableTypeId { get; set; }
private string consumableTypeName;
public string ConsumableTypeName { get => consumableTypeName; set { Set(ref consumableTypeName, value); } }
private long consumableTypeId;
public long ConsumableTypeId { get => consumableTypeId; set { Set(ref consumableTypeId, value); } }
}
}

29
BBWY.Client/Models/PackTask/ConsumableModel.cs

@ -27,9 +27,14 @@ namespace BBWY.Client.Models.PackTask
};
public ObservableCollection<GetConsumableTypeResponse> ConsumableTypeList { get => consumableTypeList; set { Set(ref consumableTypeList, value); } }
private ConsumableType? consumableType;
public ConsumableType? ConsumableType
{ get => consumableType; set { Set(ref consumableType, value); } }
private string consumableTypeName;
public string ConsumableTypeName
{ get => consumableTypeName; set { Set(ref consumableTypeName, value); } }
private string addConsumableTypeName;
public string AddConsumableTypeName
{ get => addConsumableTypeName; set { Set(ref addConsumableTypeName, value); } }
@ -37,6 +42,7 @@ namespace BBWY.Client.Models.PackTask
public ICommand EditConsumableCommand { get; set; }
public ICommand DeletedConsumableCommand { get; set; }
public ICommand SaveConsumableCommand { get; set; }
public ICommand AddConsumableTypeCommand { get; set; }
public Action ReflashDatas { get; set; }
public ConsumableModel(ConsumableService consumableService)
@ -50,8 +56,17 @@ namespace BBWY.Client.Models.PackTask
{
GetConsumableTypeList();
}
AddConsumableTypeCommand= new RelayCommand(AddConsumableType);
}
private void AddConsumableType()
{
var res = consumableService.AddConsumableType(AddConsumableTypeName);
if (res.Success)
{
GetConsumableTypeList();
}
}
private long consumableTypeId;
public long ConsumableTypeId
@ -85,6 +100,7 @@ namespace BBWY.Client.Models.PackTask
Weigth = Weigth,
Width = Width,
ConsumableTypeId = ConsumableTypeId,
});
}
@ -154,7 +170,7 @@ namespace BBWY.Client.Models.PackTask
public void EditConsumable()
{
GetConsumableTypeList();
//GetConsumableTypeList();
EditConsumable add = new EditConsumable(new ConsumableModel(consumableService)
{
Heigth = this.Heigth,
@ -165,8 +181,9 @@ namespace BBWY.Client.Models.PackTask
Remark = this.Remark,
Width = this.Width,
Price = this.Price,
ConsumableType = this.ConsumableType,
ConsumableTypeList = this.ConsumableTypeList
ConsumableTypeList = this.ConsumableTypeList,
ConsumableTypeName=this.ConsumableTypeName,
ConsumableTypeId = this.ConsumableTypeId,
});

15
BBWY.Client/ViewModels/PackTask/ConsumableViewModel.cs

@ -52,6 +52,7 @@ namespace BBWY.Client.ViewModels.PackTask
public ICommand TaskPageIndexChangedCommand { get; set; }
public ICommand AddConsumableCommand { get; set; }
public ICommand SearchConsumableCommand { get; set; }
private readonly ConsumableService consumableService;
public ConsumableViewModel(ConsumableService consumableService)
@ -68,7 +69,11 @@ namespace BBWY.Client.ViewModels.PackTask
LoadIndex(p.PageIndex);
});
SearchConsumable();
}
private void LoadIndex(int pageIndex)
{
PageIndex = pageIndex;//
@ -90,10 +95,10 @@ namespace BBWY.Client.ViewModels.PackTask
if (res.Success)
{
ConsumableList = new ObservableCollection<ConsumableModel>();
if (res.Data != null && res.Data.Consumables != null && res.Data.Consumables.Count() > 0)
if (res.Data != null && res.Data.SearchConsumableList != null && res.Data.SearchConsumableList.Count() > 0)
{
OrderCount = res.Data.OrderCount;
foreach (var item in res.Data.Consumables)
OrderCount = res.Data.TotalCount;
foreach (var item in res.Data.SearchConsumableList)
{
App.Current.Dispatcher.Invoke(() =>
{
@ -107,8 +112,8 @@ namespace BBWY.Client.ViewModels.PackTask
Remark = item.Remark,
Weigth = item.Weigth,
Width = item.Width,
ConsumableType = item.ConsumableType,
ConsumableTypeName =item.ConsumableTypeName,
ConsumableTypeId = item.ConsumableTypeId,
});
});
}

198
BBWY.Client/ViewModels/PackTask/EditConsumableViewModel.cs

@ -1,11 +1,207 @@
using BBWY.Common.Models;
using BBWY.Client.APIServices;
using BBWY.Client.Models.APIModel.Request;
using BBWY.Client.Models;
using BBWY.Client.Models.PackTask;
using BBWY.Client.Views.PackTask;
using BBWY.Common.Models;
using GalaSoft.MvvmLight.Command;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Text;
using System.Windows;
using System.Windows.Input;
using BBWY.Client.Models.APIModel.Response.PackTask;
namespace BBWY.Client.ViewModels.PackTask
{
public class EditConsumableViewModel:BaseVM,IDenpendency
{
public ObservableCollection<GetConsumableTypeResponse> consumableTypeList = new ObservableCollection<GetConsumableTypeResponse>()
{
};
public ObservableCollection<GetConsumableTypeResponse> ConsumableTypeList { get => consumableTypeList; set { Set(ref consumableTypeList, value); } }
private string consumableTypeName;
public string ConsumableTypeName
{ get => consumableTypeName; set { Set(ref consumableTypeName, value); } }
private string addConsumableTypeName;
public string AddConsumableTypeName
{ get => addConsumableTypeName; set { Set(ref addConsumableTypeName, value); } }
public ConsumableService consumableService;
public ICommand EditConsumableCommand { get; set; }
public ICommand DeletedConsumableCommand { get; set; }
public ICommand SaveConsumableCommand { get; set; }
public ICommand AddConsumableTypeCommand { get; set; }
public Action ReflashDatas { get; set; }
public EditConsumableViewModel(ConsumableService consumableService)
{
this.consumableService = consumableService;
EditConsumableCommand = new RelayCommand(EditConsumable);
DeletedConsumableCommand = new RelayCommand<ObservableCollection<ConsumableModel>>(DeletedConsumable);
SaveConsumableCommand = new RelayCommand<object>(SaveConsumable);
if (consumableService != null)
{
GetConsumableTypeList();
}
AddConsumableTypeCommand = new RelayCommand(AddConsumableType);
}
private void AddConsumableType()
{
var res = consumableService.AddConsumableType(AddConsumableTypeName);
if (res.Success)
{
GetConsumableTypeList();
}
}
private long consumableTypeId;
public long ConsumableTypeId
{ get => consumableTypeId; set { Set(ref consumableTypeId, value); } }
public void SaveConsumable(object obj)
{
if (string.IsNullOrEmpty(Name))
{
new TipsWindow("耗材品名不能为空!").Show();
return;
}
if (this.Price == null)
{
new TipsWindow("价格不能为空!").Show();
return;
}
ApiResponse<object> res = null;
if (Id > 0)//修改
{
res = consumableService.Edit(new ConsuableRequest
{
Id = Id,
Heigth = Heigth,
Length = Length,
Name = Name,
Price = Price.Value,
Remark = Remark,
Weigth = Weigth,
Width = Width,
ConsumableTypeId = ConsumableTypeId,
});
}
else
{
res = consumableService.Add(new ConsuableRequest
{
Heigth = Heigth,
Length = Length,
Name = Name,
Price = Price.Value,
Remark = Remark,
Weigth = Weigth,
Width = Width,
ConsumableTypeId = ConsumableTypeId,
});
}
if (res != null && res.Success)
{
var win = obj as System.Windows.Window;
ViewModelLocator viewModel = new ViewModelLocator();
var con = viewModel.Consumable;
con.SearchConsumable();
//if (ReflashDatas != null) ReflashDatas();
win.Close();
}
else
{
if (res != null)
new TipsWindow(res.Msg).Show();
}
}
public ConsumableModel model;
public void DeletedConsumable(ObservableCollection<ConsumableModel> list)
{
MessageBoxResult result = System.Windows.MessageBox.Show("是否删除?", "提示",
MessageBoxButton.YesNo,
MessageBoxImage.Warning);
if (result != MessageBoxResult.Yes) return;
var res = consumableService.Deleted(Id);
if (res.Success)
{
ViewModelLocator viewModel = new ViewModelLocator();
var con = viewModel.Consumable;
con.SearchConsumable();
list.Remove(model);
}
}
void GetConsumableTypeList()
{
var res = consumableService.GetConsumableTypeList();
if (res.Success && res.Data != null)
{
ConsumableTypeList = res.Data;
}
}
public void EditConsumable()
{
GetConsumableTypeList();
EditConsumable add = new EditConsumable(new ConsumableModel(consumableService)
{
Heigth = this.Heigth,
Length = this.Length,
Id = this.Id,
Name = this.Name,
Weigth = this.Weigth,
Remark = this.Remark,
Width = this.Width,
Price = this.Price,
ConsumableTypeId = this.ConsumableTypeId,
ConsumableTypeList = this.ConsumableTypeList,
ConsumableTypeName = this.ConsumableTypeName,
});
add.ShowDialog();
}
private long id;
public long Id { get => id; set { Set(ref id, value); } }
private string name;
public string Name { get => name; set { Set(ref name, value); } }
private decimal? price;
public decimal? Price { get => price; set { Set(ref price, value); } }
private double? weigth;
public double? Weigth { get => weigth; set { Set(ref weigth, value); } }
private double? length;
public double? Length { get => length; set { Set(ref length, value); } }
private double? width;
public double? Width { get => width; set { Set(ref width, value); } }
private double? heigth;
public double? Heigth { get => heigth; set { Set(ref heigth, value); } }
private string remark;
public string Remark { get => remark; set { Set(ref remark, value); } }
}
}

5
BBWY.Client/Views/PackTask/Consumable.xaml

@ -50,6 +50,9 @@
Background="{StaticResource Button.Selected.Background}" BorderThickness="0" Foreground="White">
</c:BButton>
<TextBlock Text="耗材品名:" VerticalAlignment="Center" Margin="16,0,0,0"/>
<c:BTextBox Visibility="Hidden" Width="150" Height="30" />
<!--<TextBlock Text="耗材类型:" VerticalAlignment="Center" Margin="16,0,0,0"/>
<ComboBox Width="100" Height="30" />-->
</StackPanel>
<Button Content="搜索" Height="35" Width="66" VerticalAlignment="Stretch" Margin="5,0,10,0"
@ -118,7 +121,7 @@
<Grid Grid.Column="0">
<TextBlock
Text="{Binding ConsumableType}"
Text="{Binding ConsumableTypeName}"
TextWrapping="Wrap"
VerticalAlignment="Center" HorizontalAlignment="Center"
/>

9
BBWY.Client/Views/PackTask/EditConsumable.xaml

@ -14,7 +14,6 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib"
CloseButtonVisibility="Visible"
WindowStartupLocation="CenterScreen"
DataContext="{Binding Consumable,Source={StaticResource Locator}}"
CloseButtonColor="{StaticResource WindowButtonColor}"
MinButtonVisibility="Collapsed"
MaxButtonVisibility="Collapsed"
@ -45,12 +44,12 @@
<TextBlock Text="所属分类:" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30 0 5 0" />
<Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}">
<ComboBox BorderThickness="0" Width="88" VerticalContentAlignment="Center" ItemsSource="{Binding ConsumableTypeList}"
DisplayMemberPath="ConsumableTypeName"
SelectedValuePath="ConsumableTypeId" SelectedValue="{Binding ConsumableTypeId}"
<ComboBox BorderThickness="0" Width="88" VerticalContentAlignment="Center" ItemsSource="{Binding ConsumableTypeList}"
DisplayMemberPath="ConsumableTypeName"
SelectedValuePath="ConsumableTypeId" SelectedValue="{Binding ConsumableTypeId}" Text="{Binding ConsumableTypeName}"
/>
</Border>
<c:BTextBox Margin="30 0 5 0" Width="100" Text="{Binding ConsumableTypeName}"/>
<c:BTextBox Margin="30 0 5 0" Width="100" Text="{Binding AddConsumableTypeName}"/>
<c:BButton Content="添加分类" Width="80" Command="{Binding AddConsumableTypeCommand}"/>
</StackPanel>

106
BBWY.Client/Views/PackTask/MinFeesExcelControl.xaml.cs

@ -26,39 +26,6 @@ namespace BBWY.Client.Views.PackTask
InitializeComponent();
}
/// <summary>
/// 是否仓库端
/// </summary>
public bool IsWareHouse
{
get { return (bool)GetValue(IsWareHouseProperty); }
set
{
SetValue(IsWareHouseProperty, value);
}
}
public static readonly DependencyProperty IsWareHouseProperty =
DependencyProperty.Register("IsWareHouse", typeof(bool), typeof(MinFeesExcelControl), new PropertyMetadata(true, ChangedProperty1));
/// <summary>
/// 价格
/// </summary>
//public decimal FeesPrice
//{
// get { return (decimal)GetValue(FeesPriceProperty); }
// set
// {
// SetValue(FeesPriceProperty, value);
// }
//}
//public static readonly DependencyProperty FeesPriceProperty =
// DependencyProperty.Register("FeesPrice", typeof(decimal), typeof(FeesExcelControl), new PropertyMetadata(ChangedProperty2));
public bool IsMin
{
@ -109,18 +76,11 @@ namespace BBWY.Client.Views.PackTask
// control.Str
var newValue = e.NewValue as FeesItemResponse;
control.FeesItem = newValue;
if (control.IsWareHouse)
{
control.LoadData(false);
}
else
{
control.LoadData(true);
}
control.LoadData();
}
string xaml = @" <Grid xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation"">
<Grid.ColumnDefinitions >
[:Columns:]
@ -153,10 +113,6 @@ namespace BBWY.Client.Views.PackTask
[:ListData:]
</Grid>";
/// <summary>
/// index 从1开始 0+1 增值服务 和打包耗材
/// </summary>
@ -171,9 +127,6 @@ namespace BBWY.Client.Views.PackTask
<TextBlock Text=""[:ServiceCount:]"" Grid.Row=""1"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
</Grid>";
string incrementConsumableStr = @" <Grid Grid.Column=""[:index:]"" MinWidth=""84"" Grid.Row=""1"" Grid.RowSpan=""3"" >
<Grid.RowDefinitions>
<RowDefinition Height=""2*""/>
@ -184,16 +137,6 @@ namespace BBWY.Client.Views.PackTask
<TextBlock Text=""[:ServiceCount:]"" Grid.Row=""1"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
</Grid>";
//string totalIncrementConsumableStr = @" <Grid Grid.Column=""[:index:]"" MinWidth=""84"" Grid.Row=""1"" Grid.RowSpan=""3"" >
// <Grid.RowDefinitions>
// <RowDefinition Height=""2*""/>
// <RowDefinition Height=""*""/>
// </Grid.RowDefinitions>
// <Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.RowSpan=""2"" BorderThickness=""0,0,1,0""/>
// <TextBlock Text=""小计"" Grid.Row=""0"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
// <TextBlock Text=""[:Price:]"" Grid.Row=""1"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
//</Grid>";
string basicPackStr = @" <Grid Grid.Column=""[:index:]"" MinWidth=""84"" Grid.Row=""1"" Grid.RowSpan=""3"" >
<Grid.RowDefinitions>
<RowDefinition />
@ -261,8 +204,6 @@ namespace BBWY.Client.Views.PackTask
<Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.RowSpan=""3"" BorderThickness=""0,0,1,0""/>
</Grid>";
string FeesModeStr = @"<Grid Grid.Column=""[:index:]"" MinWidth=""84"" Grid.Row=""1"" Grid.RowSpan=""3"" >
<Grid.RowDefinitions>
<RowDefinition Height=""2*""/>
@ -282,40 +223,16 @@ namespace BBWY.Client.Views.PackTask
<TextBlock Text="" "" Grid.Row=""0"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
<TextBlock Text=""[:DiscountFactor:]"" Grid.Row=""1"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
</Grid>";
//string processFeesStr = @"
//<Grid Grid.Column=""[:index:]"" MinWidth=""84"" Grid.Row=""1"" Grid.RowSpan=""3"" >
// <Grid.RowDefinitions>
// <RowDefinition Height=""2*""/>
// <RowDefinition Height=""*""/>
// </Grid.RowDefinitions>
// <Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.RowSpan=""2"" BorderThickness=""0,0,1,0""/>
// <TextBlock Text=""小计"" Grid.Row=""0"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
// <TextBlock Text=""[:PackFees:]"" Grid.Row=""1"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
//</Grid>";
string columnStr = "<ColumnDefinition Width=\"auto\"/>";
//string increateService = @" <TextBlock Text=""增值服务"" Grid.Column=""1"" Grid.ColumnSpan=""2"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
// <Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.Column=""[:1+IncreateCount:]"" Grid.Row=""0"" Grid.RowSpan=""4"" BorderThickness=""1,0,0,0""/>";
string workProcess = "<TextBlock Text=\"打包服务\" Grid.Column=\"[:1+IncreateCount:]\" Grid.ColumnSpan=\"[:ProcessCount:]\" VerticalAlignment=\"Center\" HorizontalAlignment=\"Center\"/>\r\n <Border Width=\"1\" HorizontalAlignment=\"Left\" BorderBrush=\"#D7D7D7\" Grid.Column=\"[:1+IncreateCount+ProcessCount:]\" Grid.Row=\"0\" Grid.RowSpan=\"4\" BorderThickness=\"1,0,0,0\"/>\r\n ";
string consumableService = "<TextBlock Text=\"打包耗材\" Grid.Column=\"[:1+IncreateCount+ProcessCount:]\" Grid.ColumnSpan=\"[:ConsumableCount:]\" VerticalAlignment=\"Center\" HorizontalAlignment=\"Center\"/>\r\n <Border Width=\"1\" HorizontalAlignment=\"Left\" BorderBrush=\"#D7D7D7\" Grid.Column=\"[:1+IncreateCount+ProcessCount:+ConsumableCount]\" Grid.Row=\"0\" Grid.RowSpan=\"4\" BorderThickness=\"1,0,0,0\"/>\r\n ";
private void LoadData(bool isPrice)
private void LoadData()
{
isPrice = false;
if (FeesItem == null || FeesItem.ServiceList.Count <= 0)
{
return;
@ -346,22 +263,9 @@ namespace BBWY.Client.Views.PackTask
var consumableList = FeesItem.ConsumableList;
if (packserviceCount > 0) packserviceCount += 2;
var processCount = packserviceCount;
var consumableCount = consumableList.Count();
var columnCount = consumableCount + processCount + 1;
StringBuilder columns = new StringBuilder();
for (int i = 0; i < columnCount; i++)

40
BBWY.Client/Views/PackTask/PackDetailWindow.xaml

@ -89,9 +89,9 @@
<TextBlock Text="打包工序" Margin="0 0 5 0" Style="{StaticResource middleTextBlock}" />
<Border Background="Black" Grid.Column="1" VerticalAlignment="Center" Height="1"/>
</Grid>
<Grid Margin="20 5 20 0">
<Grid Height="60" >
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
@ -126,15 +126,15 @@
<Grid Grid.Row="1" Grid.Column="2" Margin="1 0 1 1" Background="{StaticResource Border.Background}" >
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding ProcessPrice}" />
</Grid>
<TextBox BorderBrush="Transparent" BorderThickness="0" Margin="1" Grid.Row="1" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding ProcessTaskCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" />
</Grid>
</Grid>
<Border BorderThickness="1" Height="40" Margin="20,10,20,10" BorderBrush="{StaticResource Border.Brush}">
@ -154,14 +154,14 @@
</StackPanel>
</Border>
<StackPanel Orientation="Horizontal" Margin="20 0 0 10">
<TextBlock Style="{StaticResource middleTextBlock}" Text="定制工序单价:"/>
<Border BorderThickness="1" CornerRadius="0" BorderBrush="{StaticResource Border.Brush}">
<TextBox BorderThickness="0" Width="100" Text="{Binding DirectionalSingleFees,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</Border>
<c:BButton Content="确定" Width="60" Command="{Binding SetCustomProcessPriceCommand}"/>
</StackPanel>
<Grid Margin="20 10 20 0" >
@ -172,7 +172,7 @@
<TextBlock Text="打包人" Margin="0 0 5 0" Style="{StaticResource middleTextBlock}" />
<Border Background="Black" Grid.Column="1" VerticalAlignment="Center" Height="1"/>
</Grid>
<TextBlock Margin="20 10 20 10">
<Run Text="推荐打包人:"/>
@ -187,7 +187,7 @@
</Grid.RowDefinitions>
<Grid Height="30" Background="{StaticResource Border.Background}" >
<Grid.ColumnDefinitions>
<ColumnDefinition MinWidth="80"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="80"/>
@ -224,7 +224,7 @@
<ColumnDefinition Width="80"/>
</Grid.ColumnDefinitions>
<ComboBox BorderThickness="0" VerticalContentAlignment="Center" Grid.Column="0" ItemsSource="{Binding MemberList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" DisplayMemberPath="UserName" SelectedValuePath="Id" SelectedValue="{Binding SelectUserId}" Height="30"/>
<TextBox BorderThickness="0" VerticalContentAlignment="Center" Grid.Column="1" Height="30" Text="{Binding TaskCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" />
<c:BButton Foreground="Blue" BorderBrush="{StaticResource Border.Brush}" Background="Transparent" HorizontalAlignment="Stretch"
@ -275,7 +275,7 @@
<Border HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Width="1" Grid.Column="3"/>
<Border HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Width="1" Grid.Column="4"/>
<Border HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Width="1" Grid.Column="4"/>
<TextBlock Grid.Column="0" Text="耗材类型" Style="{StaticResource middleTextBlock}"/>
<TextBlock Grid.Column="1" Text="耗材型号" Style="{StaticResource middleTextBlock}"/>
<TextBlock Grid.Column="2" Text="单价" Style="{StaticResource middleTextBlock}"/>
@ -330,6 +330,7 @@
<Border HorizontalAlignment="Left" Margin="-1 0 0 0" Grid.Column="4" Width="1" Background="{StaticResource Border.Brush}"/>
<Border Visibility="Visible" VerticalAlignment="Bottom" Grid.ColumnSpan="5" Height="1" Background="{StaticResource Border.Brush}" />
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
@ -337,7 +338,7 @@
Visibility="{Binding IsConsumableTypeListEnable,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}" Command="{Binding AddConsumableCommand}"
/>
</StackPanel>
</Grid>
<Border BorderThickness="1" Height="40" Margin="20,10,20,10" BorderBrush="{StaticResource Border.Brush}">
@ -346,7 +347,7 @@
<Run Text="耗材收费:"/>
<Run Text="{Binding ConsumableFees}"/>
</TextBlock>
</StackPanel>
</Border>
<Grid Margin="20 10 20 0" >
@ -376,15 +377,6 @@
</StackPanel>
</ScrollViewer.Content>
</ScrollViewer>
</Grid>

Loading…
Cancel
Save