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

1

AddValidOverTime
506583276@qq.com 2 years ago
parent
383b5e5ec7
commit
300f0cd3ab
3 changed files with 229 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      BBWY.Client/Models/Enums.cs
  2. 7
      BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs
  3. 278
      BBWY.Client/Views/PackTask/PackDetailWindow.xaml

8
BBWY.Client/Models/Enums.cs
View File

@ -537,4 +537,12 @@
封箱ID=1
}
/// <summary>
/// 推荐工序=0,自定义工序=1
/// </summary>
public enum PackProcessType
{
推荐工序 = 0, 自定义工序 = 1
}
}

7
BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs
View File

@ -29,6 +29,11 @@ namespace BBWY.Client.ViewModels.PackTask
public class PackDetailViewModel : BaseVM
{
private PackProcessType packProcessType;
/// <summary>
/// 推荐工序=0,自定义工序=1
/// </summary>
public PackProcessType PackProcessType { get => packProcessType; set { Set(ref packProcessType, value); } }
private decimal allFees;
/// <summary>
@ -78,8 +83,6 @@ namespace BBWY.Client.ViewModels.PackTask
catch
{
CustomProcessSinglePrice = null;
}
}

278
BBWY.Client/Views/PackTask/PackDetailWindow.xaml
View File

@ -21,16 +21,6 @@
RightButtonGroupMargin="0,5,5,0">
<!--ResizeMode="NoResize"-->
<Window.Resources>
<Style TargetType="ComboBox">
<Style.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries >
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Style.Resources>
</Style>
<DrawingBrush x:Key="DashBorderBrush">
<DrawingBrush.Drawing>
<GeometryDrawing Brush="Transparent">
@ -43,6 +33,41 @@
</GeometryDrawing>
</DrawingBrush.Drawing>
</DrawingBrush>
<Style TargetType="RadioButton">
<Setter Property="IsChecked" Value="False" />
<Setter Property="Background" Value="#8080FF" />
<Setter Property="Foreground" Value="Black" />
<!--<Setter Property="Content" Value="{Binding ElementName=txt,Path=Text}"/>-->
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="RadioButton">
<Grid Background="#F2F2F2" >
<Rectangle x:Name="_Rect" Fill="#F2F2F2" HorizontalAlignment="Center" Height="35" VerticalAlignment="Center" Width="{TemplateBinding Width}" RenderTransformOrigin="0.5,0.5">
<Rectangle.RenderTransform>
<TransformGroup>
<ScaleTransform ScaleY="-1"/>
<SkewTransform/>
<RotateTransform/>
<TranslateTransform/>
</TransformGroup>
</Rectangle.RenderTransform>
</Rectangle>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Height="35">
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Content}" />
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Tag}" Foreground="{StaticResource Text.Pink}" Margin="5 0 0 0" />
</StackPanel>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="true">
<Setter TargetName="_Rect" Property="Fill" Value="#8080FF" />
<Setter Property="Foreground" Value="white"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</Window.Resources>
<Grid>
@ -81,78 +106,196 @@
<ScrollViewer x:Name="scrolls" Grid.Row="0" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled" Height="740">
<ScrollViewer.Content>
<StackPanel Orientation="Vertical" Grid.Row="1">
<StackPanel Orientation="Horizontal" Background="{StaticResource Border.Background}" Height="32">
<StackPanel.Resources>
<Style TargetType="RadioButton">
<Setter Property="IsChecked" Value="False" />
<Setter Property="Background" Value="#8080FF" />
<Setter Property="Foreground" Value="Black" />
<!--<Setter Property="Content" Value="{Binding ElementName=txt,Path=Text}"/>-->
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="RadioButton">
<Grid Background="#F2F2F2" >
<Rectangle x:Name="_Rect" Fill="#F2F2F2" HorizontalAlignment="Center" Height="32" VerticalAlignment="Center" Width="{TemplateBinding Width}" RenderTransformOrigin="0.5,0.5">
<Rectangle.RenderTransform>
<TransformGroup>
<ScaleTransform ScaleY="-1"/>
<SkewTransform/>
<RotateTransform/>
<TranslateTransform/>
</TransformGroup>
</Rectangle.RenderTransform>
</Rectangle>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Height="35">
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Content}" />
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Tag}" Foreground="{StaticResource Text.Pink}" Margin="5 0 0 0" />
</StackPanel>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="true">
<Setter TargetName="_Rect" Property="Fill" Value="white" />
<Setter Property="Foreground" Value="#8080FF"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</StackPanel.Resources>
<RadioButton Height="35" Width="110" VerticalAlignment="Center" IsChecked="True" Content="推荐工序" Command="{Binding SetTaskStateCommand}" />
<RadioButton Height="35" Width="110" VerticalAlignment="Center" Content="自定义工序" Command="{Binding SetTaskStateCommand}" />
</StackPanel>
<Grid Margin="20 10 20 10" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="60"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="打包工序" Margin="0 0 5 0" Style="{StaticResource middleTextBlock}" />
<TextBlock Text="包装工序" Margin="0 0 5 0" Style="{StaticResource middleTextBlock}" />
<Border Background="Black" Grid.Column="1" VerticalAlignment="Center" Height="1"/>
</Grid>
<!--推荐工序-->
<StackPanel>
<Grid Margin="20 5 20 0">
<Grid Margin="20 5 20 0">
<Grid Height="80" >
<Grid.RowDefinitions>
<RowDefinition Height="40"/>
<RowDefinition Height="40"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="56"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="80"/>
</Grid.ColumnDefinitions>
<TextBlock Text="耐摔等级:" Style="{StaticResource middleTextBlock}"/>
<!--<Border Margin="5" Grid.Column="1" CornerRadius="0" Grid.ColumnSpan="3" Background="{StaticResource Border.Brush}">
<ComboBox Margin="1" BorderThickness="0" Grid.Row="1" ItemsSource="{Binding ProductResistantList}" Text="{Binding SelectProductResistant}" />
</Border>-->
<Grid Margin="5" Grid.Column="1" Grid.ColumnSpan="3">
<Rectangle Stroke="{StaticResource Border.Brush}" StrokeThickness="1"/>
<ComboBox Margin="1" BorderThickness="0" Grid.Row="1" ItemsSource="{Binding ProductResistantList}" Text="{Binding SelectProductResistant}" />
<Grid Height="60" >
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition Height="30"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition MinWidth="84"/>
<ColumnDefinition Width="66"/>
<ColumnDefinition Width="66"/>
</Grid.ColumnDefinitions>
<TextBlock Background="{StaticResource Border.Background}" Grid.ColumnSpan="4"/>
<TextBlock Text="工序类型" Style="{StaticResource middleTextBlock}" />
<TextBlock Text="套餐类型" Style="{StaticResource middleTextBlock}" Grid.Column="1" />
<TextBlock Text="工序单价" Style="{StaticResource middleTextBlock}" Grid.Column="2" />
<TextBlock Text="任务量" Style="{StaticResource middleTextBlock}" Grid.Column="3"/>
</Grid>
<TextBlock Grid.Row="1" Text="套餐类型:" Style="{StaticResource middleTextBlock}"/>
<Grid Grid.Column="1" Grid.Row="1" Margin="5">
<Rectangle Stroke="{StaticResource Border.Brush}" StrokeThickness="1"/>
<ComboBox Margin="1" BorderThickness="0" Grid.Row="1" Grid.Column="1" ItemsSource="{Binding ProcessComboList}" DisplayMemberPath="ProcessComboName"
SelectedValuePath="ProcessComboId" SelectedValue="{Binding SelectProcessComboId}"
Text="{Binding SelectProcessCombo}"/>
</Grid>
<!--<Border Margin="5" Grid.Column="1" Grid.Row="1" Background="{StaticResource Border.Brush}" >
<ComboBox Margin="1" BorderThickness="0" Grid.Row="1" Grid.Column="1" ItemsSource="{Binding ProcessComboList}" DisplayMemberPath="ProcessComboName"
SelectedValuePath="ProcessComboId" SelectedValue="{Binding SelectProcessComboId}"
Text="{Binding SelectProcessCombo}"/>
</Border>-->
<TextBlock Grid.Row="1" Text="任务量:" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
<c:BTextBox Margin="5 5 5 5" Grid.Column="3" Grid.Row="1"/>
</Grid>
<Border VerticalAlignment="Top" Grid.ColumnSpan="4" Height="1" Background="{StaticResource Border.Brush}" Grid.Row="0" />
<Border VerticalAlignment="Bottom" Grid.ColumnSpan="4" Height="1" Background="{StaticResource Border.Brush}" />
<Border VerticalAlignment="Bottom" Grid.ColumnSpan="4" Height="1" Background="{StaticResource Border.Brush}" Grid.Row="1"/>
<Border HorizontalAlignment="Left" Grid.Column="0" Width="1" Background="{StaticResource Border.Brush}" Grid.RowSpan="2"/>
<Border HorizontalAlignment="Left" Grid.Column="1" Width="1" Background="{StaticResource Border.Brush}" Grid.RowSpan="2"/>
<Border HorizontalAlignment="Left" Grid.Column="2" Width="1" Background="{StaticResource Border.Brush}" Grid.RowSpan="2"/>
<Border HorizontalAlignment="Left" Grid.Column="3" Width="1" Background="{StaticResource Border.Brush}" Grid.RowSpan="2"/>
<Border HorizontalAlignment="Right" Grid.Column="3" Width="1" Background="{StaticResource Border.Brush}" Grid.RowSpan="2"/>
<ComboBox Margin="1" BorderThickness="0" Grid.Row="1" ItemsSource="{Binding ProcessTypeList}" Text="{Binding SelectProcessType}" />
<ComboBox Margin="1" BorderThickness="0" Grid.Row="1" Grid.Column="1" ItemsSource="{Binding ProcessComboList}" DisplayMemberPath="ProcessComboName"
</Grid>
<Grid Margin="20,10,20,10">
<Rectangle Height="40" StrokeDashArray="8,4" StrokeThickness="1" Stroke="{StaticResource Border.Brush}" >
</Rectangle>
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource middleTextBlock}" Margin="10 0 0 0">
<Run Text="工序单价:"/>
<Run Text="{Binding PackFees}"/>
</TextBlock>
<TextBlock Style="{StaticResource middleTextBlock}" Margin="30 0 0 0">
<Run Text="原价:"/>
<Run Text="{Binding PackFees}"/>
</TextBlock>
<TextBlock Style="{StaticResource middleTextBlock}" Margin="30 0 0 0">
<Run Text="折扣系数:"/>
<Run Text="{Binding DiscountFactory}"/>
</TextBlock>
<TextBlock Style="{StaticResource middleTextBlock}" Margin="30 0 0 0">
<Run Text="折后价:"/>
<Run Text="{Binding PackDiscountFees}"/>
</TextBlock>
</StackPanel>
</Grid>
<!--<Border BorderThickness="1" Height="40" Margin="20,10,20,10" BorderBrush="{StaticResource Border.Brush}">
</Border>-->
</StackPanel>
<!--自定义工序-->
<StackPanel Visibility="Collapsed">
<Grid Margin="20 5 20 0">
<Grid Height="60" >
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition Height="30"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition MinWidth="84"/>
<ColumnDefinition Width="66"/>
<ColumnDefinition Width="66"/>
</Grid.ColumnDefinitions>
<TextBlock Background="{StaticResource Border.Background}" Grid.ColumnSpan="4"/>
<TextBlock Text="工序类型" Style="{StaticResource middleTextBlock}" />
<TextBlock Text="套餐类型" Style="{StaticResource middleTextBlock}" Grid.Column="1" />
<TextBlock Text="工序单价" Style="{StaticResource middleTextBlock}" Grid.Column="2" />
<TextBlock Text="任务量" Style="{StaticResource middleTextBlock}" Grid.Column="3"/>
<Border VerticalAlignment="Top" Grid.ColumnSpan="4" Height="1" Background="{StaticResource Border.Brush}" Grid.Row="0" />
<Border VerticalAlignment="Bottom" Grid.ColumnSpan="4" Height="1" Background="{StaticResource Border.Brush}" />
<Border VerticalAlignment="Bottom" Grid.ColumnSpan="4" Height="1" Background="{StaticResource Border.Brush}" Grid.Row="1"/>
<Border HorizontalAlignment="Left" Grid.Column="0" Width="1" Background="{StaticResource Border.Brush}" Grid.RowSpan="2"/>
<Border HorizontalAlignment="Left" Grid.Column="1" Width="1" Background="{StaticResource Border.Brush}" Grid.RowSpan="2"/>
<Border HorizontalAlignment="Left" Grid.Column="2" Width="1" Background="{StaticResource Border.Brush}" Grid.RowSpan="2"/>
<Border HorizontalAlignment="Left" Grid.Column="3" Width="1" Background="{StaticResource Border.Brush}" Grid.RowSpan="2"/>
<Border HorizontalAlignment="Right" Grid.Column="3" Width="1" Background="{StaticResource Border.Brush}" Grid.RowSpan="2"/>
<ComboBox Margin="1" BorderThickness="0" Grid.Row="1" ItemsSource="{Binding ProcessTypeList}" Text="{Binding SelectProcessType}" />
<ComboBox Margin="1" BorderThickness="0" Grid.Row="1" Grid.Column="1" ItemsSource="{Binding ProcessComboList}" DisplayMemberPath="ProcessComboName"
SelectedValuePath="ProcessComboId" SelectedValue="{Binding SelectProcessComboId}"
Text="{Binding SelectProcessCombo}"/>
<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>
<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}" />
<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>
</Grid>
<Border BorderThickness="1" Height="40" Margin="20,10,20,10" BorderBrush="{StaticResource Border.Brush}">
</Grid>
<Border BorderThickness="1" Height="40" Margin="20,10,20,10" BorderBrush="{StaticResource Border.Brush}">
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource middleTextBlock}" Margin="10 0 0 0">
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource middleTextBlock}" Margin="10 0 0 0">
<Run Text="原价:"/>
<Run Text="{Binding PackFees}"/>
</TextBlock>
<TextBlock Style="{StaticResource middleTextBlock}" Margin="30 0 0 0">
</TextBlock>
<TextBlock Style="{StaticResource middleTextBlock}" Margin="30 0 0 0">
<Run Text="折扣系数:"/>
<Run Text="{Binding DiscountFactory}"/>
</TextBlock>
<TextBlock Style="{StaticResource middleTextBlock}" Margin="30 0 0 0">
</TextBlock>
<TextBlock Style="{StaticResource middleTextBlock}" Margin="30 0 0 0">
<Run Text="折后价:"/>
<Run Text="{Binding PackDiscountFees}"/>
</TextBlock>
</StackPanel>
</Border>
</TextBlock>
</StackPanel>
</Border>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="20 0 0 10">
@ -169,7 +312,7 @@
<ColumnDefinition Width="60"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="打包人" Margin="0 0 5 0" Style="{StaticResource middleTextBlock}" />
<TextBlock Text="包装员" Margin="0 0 5 0" Style="{StaticResource middleTextBlock}" />
<Border Background="Black" Grid.Column="1" VerticalAlignment="Center" Height="1"/>
</Grid>
@ -321,7 +464,7 @@
<TextBox Margin="1" BorderThickness="0" VerticalContentAlignment="Center" Grid.Column="3" Height="30" Text="{Binding TaskCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" />
<c:BButton Foreground="Blue" BorderBrush="{StaticResource Border.Brush}" Background="Transparent" HorizontalAlignment="Stretch"
Command="{Binding DeleteServiceCommand}"
Visibility="{Binding DataContext.IsConsumableTypeListEnable,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type c:BWindow}},Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
Visibility="{Binding DataContext.IsConsumableTypeListEnable,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type c:BWindow}},Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListBox}, Path=ItemsSource}" Content="删除" Grid.Column="4"/>
<Border HorizontalAlignment="Left" Margin="-1 0 0 0" Grid.Column="1" Width="1" Background="{StaticResource Border.Brush}"/>
@ -340,8 +483,10 @@
</StackPanel>
</Grid>
<Border BorderThickness="1" Height="40" Margin="20,10,20,10" BorderBrush="{StaticResource Border.Brush}">
<Grid Margin="20,10,20,10">
<Rectangle Height="40" StrokeDashArray="8,4" StrokeThickness="1" Stroke="{StaticResource Border.Brush}" >
</Rectangle>
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource middleTextBlock}" Margin="10 0 0 0">
<Run Text="耗材收费:"/>
@ -349,7 +494,17 @@
</TextBlock>
</StackPanel>
</Border>
</Grid>
<!--<Border BorderThickness="1" Height="40" Margin="20,10,20,10" BorderBrush="{StaticResource Border.Brush}">
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource middleTextBlock}" Margin="10 0 0 0">
<Run Text="耗材收费:"/>
<Run Text="{Binding ConsumableFees}"/>
</TextBlock>
</StackPanel>
</Border>-->
<Grid Margin="20 10 20 0" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="60"/>
@ -360,14 +515,13 @@
</Grid>
<Grid Grid.Row="1" HorizontalAlignment="Stretch" Margin="20 10 20 10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="45"/>
<ColumnDefinition/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
<TextBlock Text="打印机: " VerticalAlignment="Center" HorizontalAlignment="Right"/>
<Border BorderThickness="1" CornerRadius="0" Grid.Column="1" BorderBrush="{StaticResource Border.Brush}" Height="30" >
<ComboBox Name="cbPrintName" BorderThickness="0" Width="270" Height="30" HorizontalAlignment="Stretch" ItemsSource="{Binding PrintList}" Text="{Binding PrintName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<ComboBox Name="cbPrintName" BorderThickness="0" Height="30" HorizontalAlignment="Stretch" ItemsSource="{Binding PrintList}" Text="{Binding PrintName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</Border>
<c:BButton Grid.Column="2" Content="打印" HorizontalAlignment="Right" Width="100" VerticalAlignment="Stretch"

Write Preview
Loading…
Cancel
Save