506583276@qq.com
2 years ago
32 changed files with 1650 additions and 589 deletions
@ -0,0 +1,41 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Text; |
|||
|
|||
namespace BBWY.Client.Helpers |
|||
{ |
|||
public class OverTimeHelper |
|||
{ |
|||
|
|||
public static string GetTimeString(TimeSpan timespan) |
|||
{ |
|||
if (timespan.TotalMilliseconds > 0) |
|||
{ |
|||
if (timespan.Days > 0) |
|||
{ |
|||
return $"{timespan.Days}天{timespan.Hours}小时{timespan.Minutes}分"; |
|||
} |
|||
|
|||
if (timespan.Hours > 0) |
|||
{ |
|||
return $"{timespan.Hours}小时{timespan.Minutes}分"; |
|||
} |
|||
return $"{timespan.Minutes}分钟"; |
|||
} |
|||
else |
|||
{ |
|||
if (-timespan.Days > 0) |
|||
{ |
|||
return $"{-timespan.Days}天{-timespan.Hours}小时{-timespan.Minutes}分"; |
|||
} |
|||
|
|||
if (-timespan.Hours > 0) |
|||
{ |
|||
return $"{-timespan.Hours}小时{-timespan.Minutes}分"; |
|||
} |
|||
return $"{-timespan.Minutes}分钟"; |
|||
} |
|||
|
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,56 @@ |
|||
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 OverTimeTaskType? OverTimeTaskType { get; set; } |
|||
/// <summary>
|
|||
/// 任务人
|
|||
/// </summary>
|
|||
public string TaskUserName { get; set; } |
|||
/// <summary>
|
|||
/// 超时时间
|
|||
/// </summary>
|
|||
public string OverTime { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 备注
|
|||
/// </summary>
|
|||
public string RemarkMessage { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 任务类型(任务ID = 0,封箱ID = 1)
|
|||
/// </summary>
|
|||
public TaskMessageType TaskMessageType { get; set; } |
|||
/// <summary>
|
|||
/// 任务id 或者 封箱id
|
|||
/// </summary>
|
|||
public long Id { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 任务状态/或者封箱状态
|
|||
/// </summary>
|
|||
public string TaskState { get; set; } |
|||
} |
|||
} |
|||
@ -0,0 +1,50 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Text; |
|||
|
|||
namespace BBWY.Client.Models.APIModel |
|||
{ |
|||
public class GetWareWaitCompletedResponse |
|||
{ |
|||
/// <summary>
|
|||
/// 数量
|
|||
/// </summary>
|
|||
public int TotalCount { get; set; } |
|||
|
|||
public List<WareWaitCompleted> WareWaitCompleteds { get; set; } |
|||
} |
|||
|
|||
public class WareWaitCompleted:NotifyObject |
|||
{ |
|||
public long SealBoxId { get; set; } |
|||
/// <summary>
|
|||
/// 店铺Id
|
|||
/// </summary>
|
|||
public string ShopId { get; set; } |
|||
/// <summary>
|
|||
/// 店铺名称
|
|||
/// </summary>
|
|||
public string ShopName { get; set; } |
|||
/// <summary>
|
|||
/// 仓库名
|
|||
/// </summary>
|
|||
public string WareName { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 团队名称
|
|||
/// </summary>
|
|||
public string DepartmentName { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 对接人(同团队下)
|
|||
/// </summary>
|
|||
public string AcceptUserNames { get; set; } |
|||
|
|||
|
|||
/// <summary>
|
|||
/// sku列表
|
|||
/// </summary>
|
|||
public List<WaitTransportSku> WaitTransportSkus { get; set; } |
|||
|
|||
} |
|||
} |
|||
@ -0,0 +1,301 @@ |
|||
<UserControl x:Class="BBWY.Client.Views.PackTask.ShopWaitCompletedControl" |
|||
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.PackTask" |
|||
mc:Ignorable="d" |
|||
xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls" |
|||
xmlns:ctr="clr-namespace:BBWY.Client.Converters" |
|||
xmlns:sys="clr-namespace:System;assembly=mscorlib" |
|||
xmlns:cmodel="clr-namespace:BBWY.Client.Models" |
|||
DataContext="{Binding TaskList,Source={StaticResource Locator}}" |
|||
xmlns:b="http://schemas.microsoft.com/xaml/behaviors" |
|||
d:DesignHeight="450" d:DesignWidth="1500"> |
|||
<UserControl.Resources> |
|||
<ObjectDataProvider x:Key="storageTypeProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}"> |
|||
<ObjectDataProvider.MethodParameters> |
|||
<x:Type TypeName="cmodel:StorageType"/> |
|||
</ObjectDataProvider.MethodParameters> |
|||
</ObjectDataProvider> |
|||
<ctr:OrderStorageTypeOptionConverter x:Key="ostConverter"/> |
|||
<ctr:ProfitRatioConverter x:Key="profitRatioConverter"/> |
|||
<ctr:WaybillNoConverter x:Key="waybillConverter"/> |
|||
<ctr:MultiParameterTransferConverter x:Key="mptConverter"/> |
|||
<ctr:SaleGrossProfitConverter x:Key="sgpcConverter"/> |
|||
</UserControl.Resources> |
|||
<Grid> |
|||
<Grid.RowDefinitions> |
|||
<RowDefinition Height="35"/> |
|||
<RowDefinition /> |
|||
</Grid.RowDefinitions> |
|||
|
|||
|
|||
<Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1,1,1,0" |
|||
Background="#F2F2F2"> |
|||
<Grid> |
|||
<Grid.ColumnDefinitions> |
|||
<ColumnDefinition Width="400"/> |
|||
<ColumnDefinition Width="80"/> |
|||
<ColumnDefinition Width="0"/> |
|||
<ColumnDefinition Width="0"/> |
|||
<ColumnDefinition MinWidth="80"/> |
|||
<ColumnDefinition Width="0"/> |
|||
</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="Right" Background="{StaticResource Border.Brush}"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/> |
|||
<!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>--> |
|||
<!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="8"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="9"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>--> |
|||
|
|||
<!--<Border Height="1" VerticalAlignment="Top" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="6"/>--> |
|||
</Grid> |
|||
</Border> |
|||
<ListBox x:Name="listbox_order" |
|||
Grid.Row="7" |
|||
ItemsSource="{Binding WaitCompletedList}" |
|||
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="100"> |
|||
<Grid.RowDefinitions> |
|||
<RowDefinition Height="30"/> |
|||
<RowDefinition MinHeight="90"/> |
|||
</Grid.RowDefinitions> |
|||
<Grid Background="#F2F2F2" > |
|||
<Grid.ColumnDefinitions> |
|||
<ColumnDefinition Width="400"/> |
|||
<ColumnDefinition Width="80"/> |
|||
<ColumnDefinition Width="80"/> |
|||
<ColumnDefinition Width="0"/> |
|||
<ColumnDefinition MinWidth="80"/> |
|||
<ColumnDefinition Width="100"/> |
|||
</Grid.ColumnDefinitions> |
|||
<StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11"> |
|||
<TextBlock VerticalAlignment="Center" Text="封箱ID:" Margin="16,0,0,0" /> |
|||
<c:BButton Content="{Binding SealBoxId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" |
|||
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" |
|||
CommandParameter="{Binding SealBoxId}" |
|||
Margin=" 5,0,7,0"/> |
|||
<!--<TextBlock Text="店铺:" Style="{StaticResource middleTextBlock}" Margin="10 0 0 0"/> |
|||
<c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" |
|||
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" |
|||
CommandParameter="{Binding ShopName}" |
|||
Margin=" 5,0,7,0"/>--> |
|||
|
|||
|
|||
<TextBlock VerticalAlignment="Center" Text="仓库:" Margin="16,0,0,0" /> |
|||
<c:BButton Content="{Binding WareName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" |
|||
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" |
|||
CommandParameter="{Binding WareName}" |
|||
Margin=" 5,0,7,0"/> |
|||
|
|||
|
|||
<TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" /> |
|||
<c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" |
|||
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" |
|||
CommandParameter="{Binding DepartmentName}" |
|||
Margin=" 5,0,0,0"/> |
|||
|
|||
<TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" /> |
|||
<TextBlock VerticalAlignment="Center" Text="{Binding AcceptUserNames}" Margin="5,0,0,0" /> |
|||
</StackPanel> |
|||
|
|||
</Grid> |
|||
<Grid Grid.Row="1"> |
|||
<Grid.ColumnDefinitions> |
|||
<ColumnDefinition Width="400"/> |
|||
<ColumnDefinition Width="80"/> |
|||
<ColumnDefinition Width="0"/> |
|||
<ColumnDefinition Width="0"/> |
|||
<ColumnDefinition MinWidth="80"/> |
|||
<ColumnDefinition Width="0"/> |
|||
</Grid.ColumnDefinitions> |
|||
|
|||
<ListBox x:Name="listbox_orerSku" ItemsSource="{Binding WaitTransportSkus}" |
|||
Style="{StaticResource NoScrollViewListBoxStyle}" |
|||
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" > |
|||
<ListBox.ItemTemplate> |
|||
<DataTemplate> |
|||
<Grid MinHeight="100" Width="{Binding ActualWidth,ElementName=listbox_orerSku}"> |
|||
<Grid> |
|||
<Grid.ColumnDefinitions> |
|||
<ColumnDefinition Width="90"/> |
|||
<ColumnDefinition/> |
|||
<ColumnDefinition/> |
|||
</Grid.ColumnDefinitions> |
|||
|
|||
<!--{Binding Logo}--> |
|||
<c:BAsyncImage UrlSource="{Binding Logo}" |
|||
Width="80" DecodePixelWidth="80" |
|||
VerticalAlignment="Top" Margin="11,10,0,10" |
|||
Cursor="Hand"> |
|||
<b:Interaction.Triggers> |
|||
<b:EventTrigger EventName="PreviewMouseLeftButtonDown"> |
|||
<b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"> |
|||
<b:InvokeCommandAction.CommandParameter> |
|||
<MultiBinding Converter="{StaticResource mptConverter}"> |
|||
<Binding Path="SkuId"/> |
|||
</MultiBinding> |
|||
</b:InvokeCommandAction.CommandParameter> |
|||
</b:InvokeCommandAction> |
|||
</b:EventTrigger> |
|||
</b:Interaction.Triggers> |
|||
</c:BAsyncImage> |
|||
|
|||
<StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,15,0,10"> |
|||
<StackPanel Orientation="Horizontal" Margin="0 0 0 13"> |
|||
<TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" /> |
|||
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" |
|||
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" |
|||
CommandParameter="{Binding SkuId}" |
|||
Margin=" 5,0,0,0"/> |
|||
</StackPanel> |
|||
<TextBlock Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis"> |
|||
<TextBlock.ToolTip> |
|||
<ToolTip Style="{StaticResource OrderCouponToolipStyle}"> |
|||
<TextBlock Text="{Binding SkuTitle,Mode=TwoWay}"/> |
|||
</ToolTip> |
|||
</TextBlock.ToolTip> |
|||
<Run Text="SKU名称:"/> |
|||
<Run Text="{Binding SkuTitle}"/> |
|||
</TextBlock> |
|||
<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,13,0 0"> |
|||
<Run Text="品名:"/> |
|||
<Run Text="{Binding BrandName}"/> |
|||
</TextBlock> |
|||
|
|||
|
|||
|
|||
|
|||
</StackPanel> |
|||
<StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,15,0,10"> |
|||
<!--<StackPanel Orientation="Horizontal" > |
|||
<TextBlock Foreground="{StaticResource Text.Gray}"> |
|||
<Run Text="货号:" /> |
|||
</TextBlock> |
|||
<c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top" |
|||
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" |
|||
CommandParameter="{Binding ProductNo}" |
|||
Margin=" 5,0,0,0"/> |
|||
</StackPanel>--> |
|||
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,5"> |
|||
<TextBlock Foreground="{StaticResource Text.Gray}"> |
|||
<Run Text="任务ID:" /> |
|||
</TextBlock> |
|||
<c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top" |
|||
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" |
|||
CommandParameter="{Binding TaskId}" |
|||
Margin=" 5,0,0,0"/> |
|||
</StackPanel> |
|||
<!--<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0"> |
|||
<Run Text="任务状态:"/> |
|||
<Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待打包:Red:black}" Text="{Binding TaskState}"/> |
|||
</TextBlock>--> |
|||
|
|||
</StackPanel> |
|||
|
|||
</Grid> |
|||
|
|||
<Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/> |
|||
</Grid> |
|||
</DataTemplate> |
|||
</ListBox.ItemTemplate> |
|||
</ListBox> |
|||
|
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/> |
|||
<ListBox x:Name="listbox_skuCount" ItemsSource="{Binding WaitTransportSkus}" |
|||
Style="{StaticResource NoScrollViewListBoxStyle}" Grid.Column="1" |
|||
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" > |
|||
<ListBox.ItemTemplate> |
|||
<DataTemplate> |
|||
<Grid MinHeight="100" Width="{Binding ActualWidth,ElementName=listbox_skuCount}"> |
|||
<Grid> |
|||
<TextBlock x:Name="txt_storeName" |
|||
Text="{Binding WareHourseSkuCount}" |
|||
TextWrapping="Wrap" |
|||
HorizontalAlignment="Center" VerticalAlignment="Center" |
|||
/> |
|||
</Grid> |
|||
|
|||
<Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/> |
|||
</Grid> |
|||
|
|||
</DataTemplate> |
|||
</ListBox.ItemTemplate> |
|||
</ListBox> |
|||
|
|||
|
|||
|
|||
|
|||
<!--<Grid Grid.Column="2" > |
|||
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"> |
|||
|
|||
|
|||
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding SealBoxCount}"/> |
|||
|
|||
|
|||
|
|||
</StackPanel> |
|||
</Grid>--> |
|||
|
|||
|
|||
<!--<Grid Grid.Column="5" > |
|||
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"> |
|||
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Content="完成" |
|||
Command="{Binding DataContext.CompeteWaitCompletedCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" |
|||
CommandParameter="{Binding}" |
|||
|
|||
> |
|||
|
|||
</c:BButton> |
|||
--><!-- Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}" --><!-- |
|||
|
|||
|
|||
</StackPanel> |
|||
</Grid>--> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3" Margin="0 0 0 0"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4" Margin="0 0 2 0"/> |
|||
<!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>--> |
|||
<!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="8"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="9"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="13"/>--> |
|||
|
|||
</Grid> |
|||
<Border Grid.Row="1" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/> |
|||
</Grid> |
|||
|
|||
</DataTemplate> |
|||
</ListBox.ItemTemplate> |
|||
</ListBox> |
|||
</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.PackTask |
|||
{ |
|||
/// <summary>
|
|||
/// ShopWaitCompletedControl.xaml 的交互逻辑
|
|||
/// </summary>
|
|||
public partial class ShopWaitCompletedControl : UserControl |
|||
{ |
|||
public ShopWaitCompletedControl() |
|||
{ |
|||
InitializeComponent(); |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,301 @@ |
|||
<UserControl x:Class="BBWY.Client.Views.PackTask.WaitCompletedControl" |
|||
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.PackTask" |
|||
mc:Ignorable="d" |
|||
xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls" |
|||
xmlns:ctr="clr-namespace:BBWY.Client.Converters" |
|||
xmlns:sys="clr-namespace:System;assembly=mscorlib" |
|||
xmlns:cmodel="clr-namespace:BBWY.Client.Models" |
|||
DataContext="{Binding WareHouseList,Source={StaticResource Locator}}" |
|||
xmlns:b="http://schemas.microsoft.com/xaml/behaviors" |
|||
d:DesignHeight="450" d:DesignWidth="1500"> |
|||
<UserControl.Resources> |
|||
<ObjectDataProvider x:Key="storageTypeProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}"> |
|||
<ObjectDataProvider.MethodParameters> |
|||
<x:Type TypeName="cmodel:StorageType"/> |
|||
</ObjectDataProvider.MethodParameters> |
|||
</ObjectDataProvider> |
|||
<ctr:OrderStorageTypeOptionConverter x:Key="ostConverter"/> |
|||
<ctr:ProfitRatioConverter x:Key="profitRatioConverter"/> |
|||
<ctr:WaybillNoConverter x:Key="waybillConverter"/> |
|||
<ctr:MultiParameterTransferConverter x:Key="mptConverter"/> |
|||
<ctr:SaleGrossProfitConverter x:Key="sgpcConverter"/> |
|||
</UserControl.Resources> |
|||
<Grid> |
|||
<Grid.RowDefinitions> |
|||
<RowDefinition Height="35"/> |
|||
<RowDefinition /> |
|||
</Grid.RowDefinitions> |
|||
|
|||
|
|||
<Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1,1,1,0" |
|||
Background="#F2F2F2"> |
|||
<Grid> |
|||
<Grid.ColumnDefinitions> |
|||
<ColumnDefinition Width="400"/> |
|||
<ColumnDefinition Width="80"/> |
|||
<ColumnDefinition Width="0"/> |
|||
<ColumnDefinition Width="0"/> |
|||
<ColumnDefinition MinWidth="80"/> |
|||
<ColumnDefinition Width="100"/> |
|||
</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="Right" Background="{StaticResource Border.Brush}"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/> |
|||
<!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>--> |
|||
<!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="8"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="9"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>--> |
|||
|
|||
<!--<Border Height="1" VerticalAlignment="Top" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="6"/>--> |
|||
</Grid> |
|||
</Border> |
|||
<ListBox x:Name="listbox_order" |
|||
Grid.Row="7" |
|||
ItemsSource="{Binding WaitCompletedList}" |
|||
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="100"> |
|||
<Grid.RowDefinitions> |
|||
<RowDefinition Height="30"/> |
|||
<RowDefinition MinHeight="90"/> |
|||
</Grid.RowDefinitions> |
|||
<Grid Background="#F2F2F2" > |
|||
<Grid.ColumnDefinitions> |
|||
<ColumnDefinition Width="400"/> |
|||
<ColumnDefinition Width="80"/> |
|||
<ColumnDefinition Width="80"/> |
|||
<ColumnDefinition Width="0"/> |
|||
<ColumnDefinition MinWidth="80"/> |
|||
<ColumnDefinition Width="100"/> |
|||
</Grid.ColumnDefinitions> |
|||
<StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11"> |
|||
<TextBlock VerticalAlignment="Center" Text="封箱ID:" Margin="16,0,0,0" /> |
|||
<c:BButton Content="{Binding SealBoxId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" |
|||
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" |
|||
CommandParameter="{Binding SealBoxId}" |
|||
Margin=" 5,0,7,0"/> |
|||
<TextBlock Text="店铺:" Style="{StaticResource middleTextBlock}" Margin="10 0 0 0"/> |
|||
<c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" |
|||
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" |
|||
CommandParameter="{Binding ShopName}" |
|||
Margin=" 5,0,7,0"/> |
|||
|
|||
|
|||
<TextBlock VerticalAlignment="Center" Text="仓库:" Margin="16,0,0,0" /> |
|||
<c:BButton Content="{Binding WareName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" |
|||
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" |
|||
CommandParameter="{Binding WareName}" |
|||
Margin=" 5,0,7,0"/> |
|||
|
|||
|
|||
<TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" /> |
|||
<c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" |
|||
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" |
|||
CommandParameter="{Binding DepartmentName}" |
|||
Margin=" 5,0,0,0"/> |
|||
|
|||
<TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" /> |
|||
<TextBlock VerticalAlignment="Center" Text="{Binding AcceptUserNames}" Margin="5,0,0,0" /> |
|||
</StackPanel> |
|||
|
|||
</Grid> |
|||
<Grid Grid.Row="1"> |
|||
<Grid.ColumnDefinitions> |
|||
<ColumnDefinition Width="400"/> |
|||
<ColumnDefinition Width="80"/> |
|||
<ColumnDefinition Width="0"/> |
|||
<ColumnDefinition Width="0"/> |
|||
<ColumnDefinition MinWidth="80"/> |
|||
<ColumnDefinition Width="100"/> |
|||
</Grid.ColumnDefinitions> |
|||
|
|||
<ListBox x:Name="listbox_orerSku" ItemsSource="{Binding WaitTransportSkus}" |
|||
Style="{StaticResource NoScrollViewListBoxStyle}" |
|||
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" > |
|||
<ListBox.ItemTemplate> |
|||
<DataTemplate> |
|||
<Grid MinHeight="100" Width="{Binding ActualWidth,ElementName=listbox_orerSku}"> |
|||
<Grid> |
|||
<Grid.ColumnDefinitions> |
|||
<ColumnDefinition Width="90"/> |
|||
<ColumnDefinition/> |
|||
<ColumnDefinition/> |
|||
</Grid.ColumnDefinitions> |
|||
|
|||
<!--{Binding Logo}--> |
|||
<c:BAsyncImage UrlSource="{Binding Logo}" |
|||
Width="80" DecodePixelWidth="80" |
|||
VerticalAlignment="Top" Margin="11,10,0,10" |
|||
Cursor="Hand"> |
|||
<b:Interaction.Triggers> |
|||
<b:EventTrigger EventName="PreviewMouseLeftButtonDown"> |
|||
<b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"> |
|||
<b:InvokeCommandAction.CommandParameter> |
|||
<MultiBinding Converter="{StaticResource mptConverter}"> |
|||
<Binding Path="SkuId"/> |
|||
</MultiBinding> |
|||
</b:InvokeCommandAction.CommandParameter> |
|||
</b:InvokeCommandAction> |
|||
</b:EventTrigger> |
|||
</b:Interaction.Triggers> |
|||
</c:BAsyncImage> |
|||
|
|||
<StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,15,0,10"> |
|||
<StackPanel Orientation="Horizontal" Margin="0 0 0 13"> |
|||
<TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" /> |
|||
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" |
|||
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" |
|||
CommandParameter="{Binding SkuId}" |
|||
Margin=" 5,0,0,0"/> |
|||
</StackPanel> |
|||
<TextBlock Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis"> |
|||
<TextBlock.ToolTip> |
|||
<ToolTip Style="{StaticResource OrderCouponToolipStyle}"> |
|||
<TextBlock Text="{Binding SkuTitle,Mode=TwoWay}"/> |
|||
</ToolTip> |
|||
</TextBlock.ToolTip> |
|||
<Run Text="SKU名称:"/> |
|||
<Run Text="{Binding SkuTitle}"/> |
|||
</TextBlock> |
|||
<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,13,0 0"> |
|||
<Run Text="品名:"/> |
|||
<Run Text="{Binding BrandName}"/> |
|||
</TextBlock> |
|||
|
|||
|
|||
|
|||
|
|||
</StackPanel> |
|||
<StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,15,0,10"> |
|||
<!--<StackPanel Orientation="Horizontal" > |
|||
<TextBlock Foreground="{StaticResource Text.Gray}"> |
|||
<Run Text="货号:" /> |
|||
</TextBlock> |
|||
<c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top" |
|||
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" |
|||
CommandParameter="{Binding ProductNo}" |
|||
Margin=" 5,0,0,0"/> |
|||
</StackPanel>--> |
|||
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,5"> |
|||
<TextBlock Foreground="{StaticResource Text.Gray}"> |
|||
<Run Text="任务ID:" /> |
|||
</TextBlock> |
|||
<c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top" |
|||
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" |
|||
CommandParameter="{Binding TaskId}" |
|||
Margin=" 5,0,0,0"/> |
|||
</StackPanel> |
|||
<!--<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0"> |
|||
<Run Text="任务状态:"/> |
|||
<Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待打包:Red:black}" Text="{Binding TaskState}"/> |
|||
</TextBlock>--> |
|||
|
|||
</StackPanel> |
|||
|
|||
</Grid> |
|||
|
|||
<Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/> |
|||
</Grid> |
|||
</DataTemplate> |
|||
</ListBox.ItemTemplate> |
|||
</ListBox> |
|||
|
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/> |
|||
<ListBox x:Name="listbox_skuCount" ItemsSource="{Binding WaitTransportSkus}" |
|||
Style="{StaticResource NoScrollViewListBoxStyle}" Grid.Column="1" |
|||
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" > |
|||
<ListBox.ItemTemplate> |
|||
<DataTemplate> |
|||
<Grid MinHeight="100" Width="{Binding ActualWidth,ElementName=listbox_skuCount}"> |
|||
<Grid> |
|||
<TextBlock x:Name="txt_storeName" |
|||
Text="{Binding WareHourseSkuCount}" |
|||
TextWrapping="Wrap" |
|||
HorizontalAlignment="Center" VerticalAlignment="Center" |
|||
/> |
|||
</Grid> |
|||
|
|||
<Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/> |
|||
</Grid> |
|||
|
|||
</DataTemplate> |
|||
</ListBox.ItemTemplate> |
|||
</ListBox> |
|||
|
|||
|
|||
|
|||
|
|||
<!--<Grid Grid.Column="2" > |
|||
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"> |
|||
|
|||
|
|||
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding SealBoxCount}"/> |
|||
|
|||
|
|||
|
|||
</StackPanel> |
|||
</Grid>--> |
|||
|
|||
|
|||
<Grid Grid.Column="5" > |
|||
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"> |
|||
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Content="完成" |
|||
Command="{Binding DataContext.CompeteWaitCompletedCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" |
|||
CommandParameter="{Binding}" |
|||
|
|||
> |
|||
|
|||
</c:BButton> |
|||
<!-- Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}" --> |
|||
|
|||
|
|||
</StackPanel> |
|||
</Grid> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3" Margin="0 0 0 0"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4" Margin="0 0 2 0"/> |
|||
<!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>--> |
|||
<!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="8"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="9"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/> |
|||
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="13"/>--> |
|||
|
|||
</Grid> |
|||
<Border Grid.Row="1" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/> |
|||
</Grid> |
|||
|
|||
</DataTemplate> |
|||
</ListBox.ItemTemplate> |
|||
</ListBox> |
|||
</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.PackTask |
|||
{ |
|||
/// <summary>
|
|||
/// UserControl.xaml 的交互逻辑
|
|||
/// </summary>
|
|||
public partial class WaitCompletedControl : UserControl |
|||
{ |
|||
public WaitCompletedControl() |
|||
{ |
|||
InitializeComponent(); |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,196 @@ |
|||
<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> |
|||
<Grid > |
|||
<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" ItemsSource="{Binding OverTimeTaskTypeList}" Text="{Binding OverTimeTaskState,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"> |
|||
<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="150"/> |
|||
<ColumnDefinition Width="150"/> |
|||
<ColumnDefinition Width="150"/> |
|||
<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}"/> |
|||
<TextBlock Text="备注" Grid.Column="6" 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="150"/> |
|||
<ColumnDefinition Width="150"/> |
|||
<ColumnDefinition Width="150"/> |
|||
<ColumnDefinition Width="150"/> |
|||
<ColumnDefinition Width="260"/> |
|||
<ColumnDefinition Width="150"/> |
|||
<ColumnDefinition /> |
|||
</Grid.ColumnDefinitions> |
|||
|
|||
<Grid Grid.Column="0" VerticalAlignment="Center"> |
|||
<StackPanel> |
|||
<TextBlock Text="{Binding OverTimeDate,StringFormat=yyyy-MM-dd}" Style="{StaticResource middleTextBlock}"/> |
|||
</StackPanel> |
|||
</Grid> |
|||
<Grid Grid.Column="1" VerticalAlignment="Center"> |
|||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center"> |
|||
<TextBlock Text="{Binding TaskMessageType,StringFormat=\{0\}:}" Style="{StaticResource middleTextBlock}"/> |
|||
<c:BButton Content="{Binding Id}" Style="{StaticResource LinkButton}" |
|||
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" |
|||
CommandParameter="{Binding Id}" |
|||
/> |
|||
</StackPanel> |
|||
</Grid> |
|||
<Grid Grid.Column="2" VerticalAlignment="Center"> |
|||
<StackPanel> |
|||
<TextBlock Text="{Binding OverTimeTaskType}" Style="{StaticResource middleTextBlock}"/> |
|||
</StackPanel> |
|||
</Grid> |
|||
<Grid Grid.Column="3" VerticalAlignment="Center"> |
|||
<StackPanel> |
|||
<TextBlock Text="{Binding TaskState}" Style="{StaticResource middleTextBlock}"/> |
|||
</StackPanel> |
|||
</Grid> |
|||
<Grid Grid.Column="4" VerticalAlignment="Center"> |
|||
<StackPanel> |
|||
<TextBlock Text="{Binding TaskUserName}" Style="{StaticResource middleTextBlock}"/> |
|||
</StackPanel> |
|||
</Grid> |
|||
<Grid Grid.Column="5" VerticalAlignment="Center"> |
|||
<StackPanel> |
|||
<TextBlock Text="{Binding OverTime}" Style="{StaticResource middleTextBlock}"/> |
|||
</StackPanel> |
|||
</Grid> |
|||
<Grid Grid.Column="6" VerticalAlignment="Center"> |
|||
<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