7 changed files with 369 additions and 25 deletions
@ -0,0 +1,42 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Text; |
|||
|
|||
namespace BBWY.Client.Models.APIModel |
|||
{ |
|||
public class SearchOverTimeTaskResponse |
|||
{ |
|||
public int TotalCount { get; set; } |
|||
public IList<OverTimeTaskResponse> OverTimeTaskResponses { get; set; } |
|||
} |
|||
|
|||
public class OverTimeTaskResponse:NotifyObject |
|||
{ |
|||
/// <summary>
|
|||
/// 超时日期
|
|||
/// </summary>
|
|||
public DateTime OverTimeDate { get; set; } |
|||
/// <summary>
|
|||
/// 任务信息(任务id 或者封箱id)
|
|||
/// </summary>
|
|||
public string TaskMessage { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 任务类型
|
|||
/// </summary>
|
|||
public TaskState TaskState { get; set; } |
|||
/// <summary>
|
|||
/// 任务人
|
|||
/// </summary>
|
|||
public string TaskUserName { get; set; } |
|||
/// <summary>
|
|||
/// 超时时间
|
|||
/// </summary>
|
|||
public string OverTime { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 备注
|
|||
/// </summary>
|
|||
public string RemarkMessage { get; set; } |
|||
} |
|||
} |
@ -0,0 +1,185 @@ |
|||
<UserControl x:Class="BBWY.Client.Views.TaskOverTime.WareTaskOverTimeControl" |
|||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" |
|||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
|||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" |
|||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" |
|||
xmlns:local="clr-namespace:BBWY.Client.Views.TaskOverTime" |
|||
xmlns:hc="https://handyorg.github.io/handycontrol" |
|||
xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls" |
|||
xmlns:ctr="clr-namespace:BBWY.Client.Converters" |
|||
xmlns:cmodel="clr-namespace:BBWY.Client.Models" |
|||
xmlns:b="http://schemas.microsoft.com/xaml/behaviors" |
|||
xmlns:sys="clr-namespace:System;assembly=mscorlib" |
|||
DataContext="{Binding WareHouseList,Source={StaticResource Locator}}" |
|||
mc:Ignorable="d" Background="White" |
|||
d:DesignHeight="450" d:DesignWidth="2048" |
|||
> |
|||
|
|||
<Grid> |
|||
<c:RoundWaitProgress Play="{Binding IsLoading}" Panel.ZIndex="999"/> |
|||
<Grid Margin="5,0"> |
|||
<Grid.RowDefinitions> |
|||
<RowDefinition Height="50"/> |
|||
<RowDefinition Height="*"/> |
|||
</Grid.RowDefinitions> |
|||
<Grid Background="{StaticResource Border.Background}" HorizontalAlignment="Stretch" Panel.ZIndex="999" Margin="0,5,0,0" > |
|||
<StackPanel Orientation="Horizontal" Margin="0,0,0,0" Height="30" > |
|||
<StackPanel.Resources> |
|||
<Style TargetType="DatePickerTextBox"> |
|||
<Setter Property="IsReadOnly" Value="True"/> |
|||
</Style> |
|||
</StackPanel.Resources> |
|||
<TextBlock Text="超时时间:" VerticalAlignment="Center" Margin="11,0,0,0"/> |
|||
<DatePicker SelectedDate="{Binding StartTime}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="10,0,0,0"/> |
|||
<DatePicker SelectedDate="{Binding EndTime}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="10,0,0,0"/> |
|||
|
|||
<TextBlock Text="任务类型:" VerticalAlignment="Center" Margin="10,0,0,0"/> |
|||
<Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="30" CornerRadius="0"> |
|||
<ComboBox BorderThickness="0" Width="140" Height="30" Text="{Binding OverTimeTaskState}" ItemsSource="{Binding OverTimeTaskTypeList}"> |
|||
<ComboBox.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> |
|||
</ComboBox.Resources> |
|||
|
|||
</ComboBox> |
|||
</Border> |
|||
<Grid > |
|||
|
|||
<c:BButton Content="搜索" Width="100" VerticalAlignment="Stretch" Margin="30,0,0,0" |
|||
Command="{Binding SearchTaskCommand}" |
|||
Background="{StaticResource Button.Selected.Background}" BorderThickness="0" Foreground="White"/> |
|||
</Grid> |
|||
</StackPanel> |
|||
|
|||
</Grid> |
|||
|
|||
<Border Grid.Row="1" Margin="0,50, 0,0" BorderBrush="{StaticResource Border.Brush}" BorderThickness="0 1 0 0" > |
|||
|
|||
<Grid > |
|||
<Grid.RowDefinitions> |
|||
<RowDefinition Height="35"/> |
|||
<RowDefinition /> |
|||
</Grid.RowDefinitions> |
|||
<Grid> |
|||
<Grid.ColumnDefinitions> |
|||
<ColumnDefinition Width="154"/> |
|||
<ColumnDefinition Width="204"/> |
|||
<ColumnDefinition Width="150"/> |
|||
<ColumnDefinition Width="260"/> |
|||
<ColumnDefinition Width="150"/> |
|||
<ColumnDefinition /> |
|||
</Grid.ColumnDefinitions> |
|||
<TextBlock Text="日期" Style="{StaticResource middleTextBlock}"/> |
|||
<TextBlock Text="任务信息" Grid.Column="1" Style="{StaticResource middleTextBlock}"/> |
|||
<TextBlock Text="任务类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/> |
|||
<TextBlock Text="任务人" Grid.Column="3" Style="{StaticResource middleTextBlock}"/> |
|||
<TextBlock Text="超时时间" Grid.Column="4" Style="{StaticResource middleTextBlock}"/> |
|||
<TextBlock Text="备注" Grid.Column="5" Style="{StaticResource middleTextBlock}"/> |
|||
|
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="2"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="3"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="4"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="5"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="6"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="7"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="8"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="9"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="10"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="11"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="12"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/> |
|||
</Grid> |
|||
<!--ItemsSource="{Binding OrderList}"--> |
|||
<ListBox x:Name="listbox_order" |
|||
Grid.Row="7" |
|||
ItemsSource="{Binding OverTimeTaskList}" |
|||
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" |
|||
BorderBrush="{StaticResource Border.Brush}" |
|||
BorderThickness="1,1,1,0" |
|||
Foreground="{StaticResource Text.Color}"> |
|||
<ListBox.ItemTemplate> |
|||
<DataTemplate> |
|||
<Grid Width="{Binding ActualWidth,ElementName=listbox_order,Converter={StaticResource widthConverter},ConverterParameter=-0}" |
|||
MinHeight="30"> |
|||
<Grid > |
|||
<Grid.ColumnDefinitions> |
|||
<ColumnDefinition Width="154"/> |
|||
<ColumnDefinition Width="204"/> |
|||
<ColumnDefinition Width="150"/> |
|||
<ColumnDefinition Width="260"/> |
|||
<ColumnDefinition Width="150"/> |
|||
<ColumnDefinition /> |
|||
</Grid.ColumnDefinitions> |
|||
|
|||
<Grid Grid.Column="0" > |
|||
<StackPanel> |
|||
<TextBlock Text="{Binding OverTimeDate}" Style="{StaticResource middleTextBlock}"/> |
|||
</StackPanel> |
|||
</Grid> |
|||
<Grid Grid.Column="1" > |
|||
<StackPanel> |
|||
<TextBlock Text="{Binding TaskMessage}" Style="{StaticResource middleTextBlock}"/> |
|||
</StackPanel> |
|||
</Grid> |
|||
<Grid Grid.Column="2" > |
|||
<StackPanel> |
|||
<TextBlock Text="{Binding TaskState}" Style="{StaticResource middleTextBlock}"/> |
|||
</StackPanel> |
|||
</Grid> |
|||
<Grid Grid.Column="3" > |
|||
<StackPanel> |
|||
<TextBlock Text="{Binding TaskUserName}" Style="{StaticResource middleTextBlock}"/> |
|||
</StackPanel> |
|||
</Grid> |
|||
<Grid Grid.Column="4" > |
|||
<StackPanel> |
|||
<TextBlock Text="{Binding OverTime}" Style="{StaticResource middleTextBlock}"/> |
|||
</StackPanel> |
|||
</Grid> |
|||
<Grid Grid.Column="5" > |
|||
<StackPanel> |
|||
<TextBlock Text="{Binding RemarkMessage}" Style="{StaticResource middleTextBlock}"/> |
|||
</StackPanel> |
|||
</Grid> |
|||
|
|||
|
|||
<!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>--> |
|||
<!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>--> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1" Margin="-1 0 0 0"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="2" Margin="-1 0 0 0"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="3" Margin="-1 0 0 0"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="4" Margin="-1 0 0 0"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="5" Margin="-1 0 0 0"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="6" Margin="-1 0 0 0"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="7" Margin="-1 0 0 0"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="8" Margin="-1 0 0 0"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="9" Margin="-1 0 0 0"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="10" Margin="-1 0 0 0"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="11" Margin="-1 0 0 0"/> |
|||
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="12" Margin="-1 0 0 0"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/> |
|||
|
|||
</Grid> |
|||
<Border Grid.Row="1" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/> |
|||
</Grid> |
|||
|
|||
</DataTemplate> |
|||
</ListBox.ItemTemplate> |
|||
</ListBox> |
|||
</Grid> |
|||
</Border> |
|||
|
|||
|
|||
|
|||
|
|||
|
|||
|
|||
</Grid> |
|||
</Grid> |
|||
</UserControl> |
@ -0,0 +1,26 @@ |
|||
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.Navigation; |
|||
using System.Windows.Shapes; |
|||
|
|||
namespace BBWY.Client.Views.TaskOverTime |
|||
{ |
|||
/// <summary>
|
|||
/// WareTaskOverTimeControl.xaml 的交互逻辑
|
|||
/// </summary>
|
|||
public partial class WareTaskOverTimeControl : UserControl |
|||
{ |
|||
public WareTaskOverTimeControl() |
|||
{ |
|||
InitializeComponent(); |
|||
} |
|||
} |
|||
} |
Loading…
Reference in new issue