订单任务，现已修改成全局任务列表 包括 订单任务和礼品单任务

订单列表动态展示礼品单状态

29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml

@@ -2,22 +2,29 @@
 	x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderTaskDialogView"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:comn="clr-namespace:_29WxOrderWpf.Common"
 	xmlns:converters="clr-namespace:_29WxOrderWpf.Converters"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	xmlns:wpf="clr-namespace:_29WxOrderWpf.Common"
-	xmlns:wpf1="WPFCommon"
+	xmlns:md="clr-namespace:Work.KJDServer.API.Models;assembly=29WxOrderWork"
+	xmlns:wpf="WPFCommon"
+	xmlns:wpfex="clr-namespace:WPFCommon.Extensions;assembly=WPFCommon"
+	comn:DialogWindowProperty.Height="600"
+	comn:DialogWindowProperty.ResizeMode="CanResizeWithGrip"
+	comn:DialogWindowProperty.ShowMinButton="False"
+	comn:DialogWindowProperty.Width="1300"
 	d:Background="White"
 	d:DataContext="{d:DesignInstance Type=local:OrderTaskDialogViewModel}"
 	d:DesignHeight="600"
 	d:DesignWidth="1300"
-	wpf:DialogWindowProperty.Height="600"
-	wpf:DialogWindowProperty.ResizeMode="CanResizeWithGrip"
-	wpf:DialogWindowProperty.ShowMinButton="False"
-	wpf:DialogWindowProperty.Width="1300"
 	mc:Ignorable="d">
 	<UserControl.Resources>
+
+		<Style BasedOn="{StaticResource TitleContentBaseStyle}" TargetType="wpf:TitleContent">
+			<Setter Property="Placement" Value="Left" />
+			<Setter Property="TitleVerticalAlignment" Value="Center" />
+		</Style>
 		<!--  单元格文字居中  -->
 		<Style x:Key="CenterCellTextStyle" TargetType="TextBlock">
 			<Setter Property="TextAlignment" Value="Center" />
@@ -98,14 +105,30 @@
 					<ColumnDefinition Width="*" />
 					<ColumnDefinition Width="Auto" />
 				</Grid.ColumnDefinitions>
-				<StackPanel Orientation="Horizontal">
-					<TextBlock Style="{StaticResource PanelTitleStyle}" Text="订单同步任务列表" />
-					<CheckBox
-						Margin="20,0,0,0"
-						VerticalAlignment="Center"
-						Content="查看全部"
-						IsChecked="{Binding IsShowAll}" />
-				</StackPanel>
+				<wpf:SpacingStackPanel HorizontalSpacing="10" Orientation="Horizontal">
+					<wpf:TitleContent Title="开始时间:">
+						<DatePicker
+							Width="100"
+							BorderBrush="{StaticResource pageColorBrush}"
+							Text="{Binding StartDate}" />
+					</wpf:TitleContent>
+					<wpf:TitleContent Title="结束时间:">
+						<DatePicker
+							Width="100"
+							BorderBrush="{StaticResource pageColorBrush}"
+							Text="{Binding EndDate}" />
+					</wpf:TitleContent>
+					<wpf:TitleContent Title="任务类型:">
+						<ComboBox
+							Width="100"
+							wpf:EnumBindingExtension.SelectedEnum="{Binding SelectedTaskType}"
+							ItemsSource="{wpf:EnumBindingMarkup EnumType=md:TaskType,
+							                                    Converter={StaticResource EnumDisplayConverter}}" />
+					</wpf:TitleContent>
+					<wpf:TitleContent Title="所有状态:" VerticalContentAlignment="Center">
+						<CheckBox VerticalAlignment="Center" IsChecked="{Binding IsShowAll}" />
+					</wpf:TitleContent>
+				</wpf:SpacingStackPanel>
 				<!--<StackPanel Grid.Column="1" Orientation="Horizontal">
 					<Button
 						Command="{Binding ClearFinishedCommand}"
@@ -122,7 +145,7 @@
 		<!--  ============ 任务列表 ============  -->
 		<DataGrid
 			Grid.Row="1"
-			Margin="10,10,10,0"
+			Margin="10,10,10,10"
 			d:ItemsSource="{d:SampleData ItemCount=10}"
 			AlternatingRowBackground="#FAFAFA"
 			AutoGenerateColumns="False"
@@ -141,7 +164,7 @@
 			HorizontalGridLinesBrush="#EEEEEE"
 			IsReadOnly="True"
 			ItemsSource="{Binding TasksView}"
-			RowHeight="40"
+			RowHeight="35"
 			ScrollViewer.CanContentScroll="True"
 			ScrollViewer.HorizontalScrollBarVisibility="Auto"
 			ScrollViewer.VerticalScrollBarVisibility="Auto"
@@ -153,9 +176,9 @@
 				<DataGridTextColumn
 					Width="1.5*"
 					MinWidth="120"
-					Binding="{Binding TaskDescribe}"
+					Binding="{Binding TaskType, Converter={StaticResource EnumDisplayConverter}}"
 					ElementStyle="{StaticResource CenterCellTextStyle}"
-					Header="任务描述" />
+					Header="任务类型" />
 				<!--  店铺  -->
 				<DataGridTextColumn
 					Width="1*"
@@ -164,7 +187,12 @@
 					ElementStyle="{StaticResource CenterCellTextStyle}"
 					Header="店铺" />
 
-
+				<DataGridTextColumn
+					Width="2*"
+					MinWidth="100"
+					Binding="{Binding ObjectIds}"
+					ElementStyle="{StaticResource CenterCellTextStyle}"
+					Header="订单号" />
 				<!--  状态  -->
 				<DataGridTemplateColumn
 					Width="1*"
@@ -236,8 +264,8 @@
 			<Grid VerticalAlignment="Center">
 				<TextBlock
 					HorizontalAlignment="Right"
-					d:Text="距离下次刷新10秒"
-					Text="{Binding RefreshTime, StringFormat='距离下次刷新：{0}秒'}" />
+					d:Text="刷新10秒"
+					Text="{Binding RefreshTime, StringFormat='刷新：{0}秒'}" />
 			</Grid>
 		</Border>
 	</Grid>