pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

在线采购

qianyi
shanji 3 years ago
parent
7d134d6b20
commit
0039f4cead
6 changed files with 155 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      BBWY.Client/App.xaml.cs
  2. 74
      BBWY.Client/Resources/Themes/Generic.xaml
  3. 8
      BBWY.Client/ViewModels/BaseVM.cs
  4. 6
      BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs
  5. 8
      BBWY.Client/ViewModels/Order/OrderListViewModel.cs
  6. 58
      BBWY.Client/Views/Order/ChoosePurchaseScheme.xaml

34
BBWY.Client/App.xaml.cs
View File

@ -27,24 +27,24 @@ namespace BBWY.Client
{ {
var gl = new GlobalContext(); var gl = new GlobalContext();
string userToken = string.Empty; string userToken = string.Empty;
#if DEBUG //#if DEBUG
userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDA1MTUxNjE5NTk0NTg4MTYwIiwidGVhbUlkIjoiMTQzOTg5OTEyMzk1NTI3MzcyOCIsImV4cCI6MTY3MTkwMTU1NH0.UaUubqP442qxVc6ppQt7FO0jcFs3w6KR6q1OeBuL1i8"; //齐越小一 userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDA1MTUxNjE5NTk0NTg4MTYwIiwidGVhbUlkIjoiMTQzOTg5OTEyMzk1NTI3MzcyOCIsImV4cCI6MTY3MTkwMTU1NH0.UaUubqP442qxVc6ppQt7FO0jcFs3w6KR6q1OeBuL1i8"; //齐越小一
#else //#else
var uid = e.Args.Count() > 0 ? e.Args.LastOrDefault(args => args.StartsWith("uid:")) : string.Empty; // var uid = e.Args.Count() > 0 ? e.Args.LastOrDefault(args => args.StartsWith("uid:")) : string.Empty;
if (string.IsNullOrEmpty(uid)) // if (string.IsNullOrEmpty(uid))
{ // {
MessageBox.Show("缺少启动参数", "提示"); // MessageBox.Show("缺少启动参数", "提示");
Environment.Exit(0); // Environment.Exit(0);
} // }
var tokenResult = ReadMMF(uid); // var tokenResult = ReadMMF(uid);
if (tokenResult.isOk) // if (tokenResult.isOk)
userToken = tokenResult.content; // userToken = tokenResult.content;
else // else
{ // {
MessageBox.Show($"读取内存数据失败\r\n{tokenResult.content}", "提示"); // MessageBox.Show($"读取内存数据失败\r\n{tokenResult.content}", "提示");
Environment.Exit(0); // Environment.Exit(0);
} // }
#endif //#endif
gl.UserToken = userToken; gl.UserToken = userToken;
#region 注册全局异常 #region 注册全局异常

74
BBWY.Client/Resources/Themes/Generic.xaml
View File

@ -279,4 +279,78 @@
<Setter Property="HorizontalAlignment" Value="Center"/> <Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/> <Setter Property="VerticalAlignment" Value="Center"/>
</Style> </Style>
<Style TargetType="DataGrid">
<Setter Property="AutoGenerateColumns" Value="False"/>
<Setter Property="IsReadOnly" Value="True"/>
<Setter Property="RowHeaderWidth" Value="0"/>
<Setter Property="ColumnHeaderHeight" Value="30"/>
<Setter Property="RowHeight" Value="30"/>
<Setter Property="CanUserAddRows" Value="False"/>
<Setter Property="CanUserDeleteRows" Value="False"/>
<Setter Property="CanUserResizeRows" Value="False"/>
<Setter Property="CanUserSortColumns" Value="False"/>
<Setter Property="BorderBrush" Value="#E3F3FF"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="HorizontalGridLinesBrush" Value="{StaticResource Border.Brush}"/>
<Setter Property="VerticalGridLinesBrush" Value="{StaticResource Border.Brush}"/>
</Style>
<Style TargetType="DataGridRow">
<Setter Property="Background" Value="Transparent"/>
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="{StaticResource Item.Selected}"/>
<Setter Property="Foreground" Value="{StaticResource Text.Color}"/>
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="{StaticResource Item.MouseOver}"/>
<Setter Property="Foreground" Value="{StaticResource Text.Color}"/>
</Trigger>
</Style.Triggers>
</Style>
<Style TargetType="DataGridCell">
<Setter Property="Background" Value="Transparent"/>
<Setter Property="Margin" Value="0"/>
<Setter Property="Padding" Value="0"/>
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="{StaticResource Item.Selected}"/>
<Setter Property="Foreground" Value="{StaticResource Text.Color}"/>
<Setter Property="BorderThickness" Value="0"/>
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="{StaticResource Item.MouseOver}"/>
<Setter Property="Foreground" Value="{StaticResource Text.Color}"/>
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="ColumnHeaderStyle_Center" TargetType="DataGridColumnHeader">
<Setter Property="SnapsToDevicePixels" Value="True" />
<Setter Property="BorderThickness" Value="0,0,1,0"/>
<Setter Property="BorderBrush" Value="{StaticResource Border.Brush}"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="DataGridColumnHeader">
<Border x:Name="BackgroundBorder"
BorderThickness="{TemplateBinding BorderThickness}"
BorderBrush="{TemplateBinding BorderBrush}"
Background="{TemplateBinding Background}"
Width="{TemplateBinding Width}">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<ContentPresenter Margin="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<Path x:Name="SortArrow" Visibility="Collapsed" Data="M0,0 L1,0 0.5,1 z" Stretch="Fill" Grid.Column="2" Width="8" Height="6" Fill="White" Margin="0,0,50,0"
VerticalAlignment="Center" RenderTransformOrigin="1,1" />
</Grid>
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary> </ResourceDictionary>

8
BBWY.Client/ViewModels/BaseVM.cs
View File

@ -10,15 +10,23 @@ namespace BBWY.Client.ViewModels
public ICommand LoadCommand { get; set; } public ICommand LoadCommand { get; set; }
public ICommand UnloadCommand { get; set; }
public BaseVM() public BaseVM()
{ {
VMId = Guid.NewGuid(); VMId = Guid.NewGuid();
LoadCommand = new RelayCommand(Load); LoadCommand = new RelayCommand(Load);
UnloadCommand = new RelayCommand(Unload);
} }
protected virtual void Load() protected virtual void Load()
{ {
} }
protected virtual void Unload()
{
}
} }
} }

6
BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs
View File

@ -41,5 +41,11 @@ namespace BBWY.Client.ViewModels
}); });
}); });
} }
protected override void Unload()
{
this.SkuId = string.Empty;
PurchaseSchemeList.Clear();
}
} }
} }

8
BBWY.Client/ViewModels/Order/OrderListViewModel.cs
View File

@ -21,6 +21,7 @@ namespace BBWY.Client.ViewModels
{ {
private OrderService orderService; private OrderService orderService;
private StatisticsService statisticsService; private StatisticsService statisticsService;
private ChoosePurchaseSchemeViewModel choosePurchaseSchemeViewModel;
private bool isLoading; private bool isLoading;
@ -91,12 +92,13 @@ namespace BBWY.Client.ViewModels
public ICommand OutStockCommand { get; set; } public ICommand OutStockCommand { get; set; }
public OrderListViewModel(OrderService orderService, StatisticsService statisticsService, GlobalContext globalContext) public OrderListViewModel(OrderService orderService, StatisticsService statisticsService, GlobalContext globalContext, ChoosePurchaseSchemeViewModel choosePurchaseSchemeViewModel)
{ {
random = new Random(); random = new Random();
this.globalContext = globalContext; this.globalContext = globalContext;
this.orderService = orderService; this.orderService = orderService;
this.statisticsService = statisticsService; this.statisticsService = statisticsService;
this.choosePurchaseSchemeViewModel = choosePurchaseSchemeViewModel;
OrderList = new ObservableCollection<Order>(); OrderList = new ObservableCollection<Order>();
EndDate = DateTime.Now; EndDate = DateTime.Now;
StartDate = DateTime.Now.Date.AddDays(-29); StartDate = DateTime.Now.Date.AddDays(-29);
@ -260,7 +262,9 @@ namespace BBWY.Client.ViewModels
} }
else if (chooseDFType.DFType == DFType.在线采购) else if (chooseDFType.DFType == DFType.在线采购)
{ {
choosePurchaseSchemeViewModel.SkuId = order.ItemList[0].Id;
var choosePurchaseScheme = new ChoosePurchaseScheme();
choosePurchaseScheme.ShowDialog();
} }
} }
} }

58
BBWY.Client/Views/Order/ChoosePurchaseScheme.xaml
View File

@ -1,16 +1,25 @@
<c:BWindow x:Class="BBWY.Client.Views.Order.ChoosePurchaseScheme" <c:BWindow x:Class="BBWY.Client.Views.Order.ChoosePurchaseScheme"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:BBWY.Client.Views.Order" xmlns:local="clr-namespace:BBWY.Client.Views.Order"
xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls" xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
mc:Ignorable="d" xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
Title="ChoosePurchaseScheme" Height="200" Width="800" mc:Ignorable="d"
Style="{StaticResource bwstyle}" Title="ChoosePurchaseScheme" Height="200" Width="600"
MinButtonVisibility="Collapsed" Style="{StaticResource bwstyle}"
MaxButtonVisibility="Collapsed" MinButtonVisibility="Collapsed"
MaxButtonVisibility="Collapsed"
DataContext="{Binding ChoosePurchaseScheme,Source={StaticResource Locator}}"> DataContext="{Binding ChoosePurchaseScheme,Source={StaticResource Locator}}">
<b:Interaction.Triggers>
<b:EventTrigger EventName="Loaded">
<b:InvokeCommandAction Command="{Binding LoadCommand}"/>
</b:EventTrigger>
<b:EventTrigger EventName="Unloaded">
<b:InvokeCommandAction Command="{Binding UnloadCommand}"/>
</b:EventTrigger>
</b:Interaction.Triggers>
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="30"/> <RowDefinition Height="30"/>
@ -24,9 +33,30 @@
<DataGrid Grid.Row="1" <DataGrid Grid.Row="1"
ItemsSource="{Binding PurchaseSchemeList}"> ItemsSource="{Binding PurchaseSchemeList}">
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Binding="{Binding PurchaserName}"/> <DataGridTextColumn Binding="{Binding PurchaserName}" Header="采购商" Width="1*"
<DataGridTextColumn Binding="{Binding PurchaserLocation}"/> HeaderStyle="{StaticResource ColumnHeaderStyle_Center}"
<DataGridTextColumn Binding="{Binding PurchaserLocation}"/> ElementStyle="{StaticResource middleTextBlock}"/>
<DataGridTextColumn Binding="{Binding PurchaserLocation}" Header="发货地" Width="120" HeaderStyle="{StaticResource ColumnHeaderStyle_Center}"
ElementStyle="{StaticResource middleTextBlock}"/>
<DataGridTemplateColumn Header="操作" Width="120" HeaderStyle="{StaticResource ColumnHeaderStyle_Center}">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<c:BButton Content="下单" HorizontalAlignment="Stretch"
Background="#1CC2A2"/>
<c:BButton Content="编辑" Grid.Column="1" HorizontalAlignment="Stretch"
Background="#02A7F0"/>
<c:BButton Content="删除" Grid.Column="2" HorizontalAlignment="Stretch"
Background="#EC808D"/>
</Grid>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
</Grid> </Grid>

Write Preview
Loading…
Cancel
Save