|
|
@ -76,10 +76,10 @@ |
|
|
|
<ListBox.ItemTemplate> |
|
|
|
<DataTemplate> |
|
|
|
<Grid Width="{Binding ActualWidth,ElementName=listbox_order,Converter={StaticResource widthConverter},ConverterParameter=-0}" |
|
|
|
MinHeight="68"> |
|
|
|
> |
|
|
|
<Grid.RowDefinitions> |
|
|
|
<RowDefinition Height="30"/> |
|
|
|
<RowDefinition MinHeight="68"/> |
|
|
|
<RowDefinition /> |
|
|
|
</Grid.RowDefinitions> |
|
|
|
<Grid Background="#F2F2F2" > |
|
|
|
<Grid.ColumnDefinitions> |
|
|
@ -104,11 +104,39 @@ |
|
|
|
<Grid Grid.Column="1"> |
|
|
|
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding SealBoxTotalCount}"/> |
|
|
|
</Grid> |
|
|
|
<!--<Grid Grid.Column="2"> |
|
|
|
<c:BButton Style="{StaticResource LinkButton}" Content="修改"/> |
|
|
|
</Grid>--> |
|
|
|
|
|
|
|
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="2" |
|
|
|
Visibility="{Binding SealBoxRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}" |
|
|
|
> |
|
|
|
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" |
|
|
|
Visibility="{Binding IsSealBoxOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}" |
|
|
|
> |
|
|
|
<TextBlock Text="剩余: " /> |
|
|
|
<TextBlock Text="{Binding SealBoxRemainTime}"/> |
|
|
|
</StackPanel> |
|
|
|
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" |
|
|
|
Visibility="{Binding IsSealBoxOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}" |
|
|
|
> |
|
|
|
<TextBlock Foreground="Red" Text="超时: "/> |
|
|
|
<TextBlock Foreground="Red" Text="{Binding SealBoxRemainTime}"/> |
|
|
|
</StackPanel> |
|
|
|
</StackPanel> |
|
|
|
|
|
|
|
<Grid Grid.Column="3"> |
|
|
|
<c:BButton Style="{StaticResource LinkButton}" Content="修改" Command="{Binding DataContext.UpdateSealBoxConfiguredCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding}"/> |
|
|
|
</Grid> |
|
|
|
|
|
|
|
<c:BButton Grid.Column="0" Grid.ColumnSpan="6" Background="Transparent" HorizontalAlignment="Stretch" BorderThickness="0" Panel.ZIndex="-1" |
|
|
|
Command="{Binding DataContext.LoadSealBoxSkuDataCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" |
|
|
|
CommandParameter="{Binding}" |
|
|
|
/> |
|
|
|
<Grid Grid.Column="4" Panel.ZIndex="-2"> |
|
|
|
<TextBlock Style="{StaticResource middleTextBlock}" HorizontalAlignment="Right" Margin="0 0 20 0" Text="{Binding IsHideSealbox,Converter={StaticResource objConverter},ConverterParameter=true:∧:∨}" FontWeight="Bold" |
|
|
|
Foreground="{StaticResource Text.Link.Color}" FontSize="18" |
|
|
|
/> |
|
|
|
</Grid> |
|
|
|
</Grid> |
|
|
|
<Grid Grid.Row="1"> |
|
|
|
<Grid Grid.Row="1" Visibility="{Binding IsHideSealbox,Converter={StaticResource objConverter},ConverterParameter=true:Collapsed:Visible}" > |
|
|
|
<Grid.ColumnDefinitions> |
|
|
|
<ColumnDefinition Width="400"/> |
|
|
|
<ColumnDefinition Width="100"/> |
|
|
@ -120,21 +148,26 @@ |
|
|
|
ItemsSource="{Binding SealBoxConfigureTasks}" |
|
|
|
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" |
|
|
|
BorderBrush="{StaticResource Border.Brush}" |
|
|
|
BorderThickness="0,0,0,0" |
|
|
|
BorderThickness="0,0,0,0" Grid.ColumnSpan="2" Grid.Column="0" |
|
|
|
Foreground="{StaticResource Text.Color}" |
|
|
|
> |
|
|
|
<ListBox.ItemTemplate> |
|
|
|
<DataTemplate> |
|
|
|
<Grid MinHeight="68" Width="{Binding ActualWidth,ElementName=listbox_orerSku}"> |
|
|
|
<Grid.ColumnDefinitions> |
|
|
|
<ColumnDefinition Width="400"/> |
|
|
|
<ColumnDefinition/> |
|
|
|
</Grid.ColumnDefinitions> |
|
|
|
<Grid> |
|
|
|
|
|
|
|
<Grid.ColumnDefinitions> |
|
|
|
<ColumnDefinition Width="62"/> |
|
|
|
<ColumnDefinition Width="80"/> |
|
|
|
<ColumnDefinition/> |
|
|
|
<ColumnDefinition/> |
|
|
|
</Grid.ColumnDefinitions> |
|
|
|
<c:BAsyncImage UrlSource="{Binding Logo}" |
|
|
|
Width="48" DecodePixelWidth="48" |
|
|
|
VerticalAlignment="Top" Margin="14,10,0,10" |
|
|
|
<c:BAsyncImage UrlSource="{Binding Logo}" VerticalContentAlignment="Center" |
|
|
|
Width="70" HorizontalAlignment="Center" |
|
|
|
|
|
|
|
Cursor="Hand"> |
|
|
|
<b:Interaction.Triggers> |
|
|
|
<b:EventTrigger EventName="PreviewMouseLeftButtonDown"> |
|
|
@ -165,11 +198,20 @@ |
|
|
|
</TextBlock.ToolTip> |
|
|
|
<Run Text="SKU名称:"/> |
|
|
|
<Run Text="{Binding SkuName}"/> |
|
|
|
</TextBlock> |
|
|
|
</TextBlock> |
|
|
|
|
|
|
|
<StackPanel Orientation="Horizontal" Margin="0 13 0 0 "> |
|
|
|
<TextBlock Foreground="{StaticResource Text.Gray}"> |
|
|
|
<Run Text="发布日期:" /> |
|
|
|
</TextBlock> |
|
|
|
<TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd }" VerticalAlignment="Center" Margin="5,0,0,0"/> |
|
|
|
|
|
|
|
</StackPanel> |
|
|
|
|
|
|
|
</StackPanel> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,10,0,10"> |
|
|
|
<StackPanel Orientation="Horizontal" Margin="0 0 0 13"> |
|
|
|
<TextBlock Text="任务ID:" Style="{StaticResource middleTextBlock}" /> |
|
|
@ -182,36 +224,25 @@ |
|
|
|
<Run Text="任务状态:"/> |
|
|
|
<Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待排单|待包装:Red:black}" Text="{Binding TaskState}"/> |
|
|
|
</TextBlock> |
|
|
|
|
|
|
|
</StackPanel> |
|
|
|
|
|
|
|
</Grid> |
|
|
|
|
|
|
|
<Grid MinHeight="68" Grid.Column="1" Width="{Binding ActualWidth,ElementName=listbox_skuCount}"> |
|
|
|
<Grid Grid.Column="1"> |
|
|
|
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding WareHourseCount}"/> |
|
|
|
</Grid> |
|
|
|
<Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/> |
|
|
|
</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 Grid.Column="1" Name="listbox_skuCount" |
|
|
|
ItemsSource="{Binding SealBoxConfigureTasks}" |
|
|
|
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" |
|
|
|
BorderBrush="{StaticResource Border.Brush}" |
|
|
|
BorderThickness="0,0,0,0" |
|
|
|
Foreground="{StaticResource Text.Color}" |
|
|
|
> |
|
|
|
<ListBox.ItemTemplate> |
|
|
|
<DataTemplate> |
|
|
|
<Grid MinHeight="68" Grid.Column="1" Width="{Binding ActualWidth,ElementName=listbox_skuCount}"> |
|
|
|
<Grid Grid.Column="1"> |
|
|
|
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding WareHourseCount}"/> |
|
|
|
</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" |
|
|
@ -237,7 +268,7 @@ |
|
|
|
</Grid> |
|
|
|
|
|
|
|
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/> |
|
|
|
|
|
|
|
|
|
|
|
<Grid Grid.Column="4" > |
|
|
|
|
|
|
|
</Grid> |
|
|
|