拍单功能继续优化
This commit is contained in:
1 parent
29042424dc
commit
34c51c6fcd
64 files changed
+7138
-305
No files matched your search
@@ -19,9 +19,10 @@
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
<RowDefinition Height="40"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid x:Name="gridSearch" Margin="8,0">
|
||||
<Grid x:Name="gridSearch" Margin="8,0,8,0">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
@@ -29,67 +30,58 @@
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
<ColumnDefinition x:Name="grid12" Width="*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
</Grid.ColumnDefinitions>
|
||||
<usercontrols:UcWaterMarkTextBox x:Name="txtOrderId" WaterMark="111" DataContext="{Binding ElementName=txtOrderId,Path=DataContext}" Grid.Column="0" Margin="0,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28" VerticalContentAlignment="Center"
|
||||
Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
|
||||
<TextBlock Text="店铺单号" Grid.Column="0" Margin="4,0,4,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" Visibility="{Binding ElementName=txtOrderId,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
|
||||
|
||||
<usercontrols:UcWaterMarkTextBox x:Name="txtOrderId" WaterMark="" DataContext="{Binding ElementName=txtOrderId,Path=DataContext}" Grid.Column="1" Margin="0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28" VerticalContentAlignment="Center"
|
||||
Style="{StaticResource BaseRoundCornerTextBoxStyle}" Grid.ColumnSpan="1" />
|
||||
<TextBlock Text="店铺单号" Grid.Column="1" Margin="4,0,4,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" Visibility="{Binding ElementName=txtOrderId,Path=Text,Converter={StaticResource NotHasTextVisibility}}" Grid.ColumnSpan="1"></TextBlock>
|
||||
|
||||
|
||||
<usercontrols:UcWaterMarkTextBox x:Name="txtShopName" Grid.Column="1" Margin="8,0,-4,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28" VerticalContentAlignment="Center"
|
||||
Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
|
||||
<TextBlock Text="全部店铺" Grid.Column="1" Margin="12,0,8,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" Visibility="{Binding ElementName=txtShopName,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
|
||||
<Button Grid.Column="2" x:Name="btnMultiShopChoice" Style="{StaticResource BasePageButtonStyle}" Margin="-4,0,0,0" Grid.Row="4" Content=" ... " Width="28" Height="28" Click="btnMultiShopChoice_Click"></Button>
|
||||
<TextBox x:Name="txtGoodsName" Grid.Column="3" Margin="8,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28" VerticalContentAlignment="Center"
|
||||
<usercontrols:UcWaterMarkTextBox x:Name="txtShopName" Grid.Column="2" Margin="8,0,20,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28"
|
||||
VerticalContentAlignment="Center" Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>
|
||||
<TextBlock Text="全部店铺" Grid.Column="2" Margin="12,0,24,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray"
|
||||
Visibility="{Binding ElementName=txtShopName,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
|
||||
<Button Grid.Column="2" x:Name="btnMultiShopChoice" Style="{StaticResource BasePageButtonStyle}" HorizontalAlignment="Right" Margin="0" Content=" ... " Width="28" Height="28" Click="btnMultiShopChoice_Click"/>
|
||||
|
||||
<TextBox x:Name="txtGoodsName" Grid.Column="4" Margin="8,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28" VerticalContentAlignment="Center"
|
||||
Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>
|
||||
<TextBlock Text="商品标题" Grid.Column="3" Margin="12,0,0,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" Visibility="{Binding ElementName=txtGoodsName,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
|
||||
<TextBlock Text="商品标题" Grid.Column="4" Margin="12,0,0,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" Visibility="{Binding ElementName=txtGoodsName,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
|
||||
|
||||
<ComboBox Grid.Column="5" x:Name="cmbUserNameMobile" Margin="12,0,4,0" VerticalContentAlignment="Center" Style="{StaticResource BaseComboBoxStyle}" Width="70" Height="28" Text="成交时间"/>
|
||||
<Border Grid.Column="5" Margin="8,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="4,0,0,4"/>
|
||||
<Border Grid.Column="6" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="0,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="0,0,0,0"/>
|
||||
<DatePicker x:Name="dateStart" Grid.Column="6" Margin="0,0,4,0" VerticalAlignment="Center" BorderThickness="0" />
|
||||
|
||||
<Border Grid.Column="7" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="0,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="0,4,4,0"/>
|
||||
<DatePicker x:Name="dateEnd" Grid.Column="7" Margin="0,0,4,0" VerticalAlignment="Center" BorderThickness="0" />
|
||||
|
||||
<ComboBox Grid.Column="4" x:Name="cmbUserNameMobile" Margin="12,0,4,0" VerticalContentAlignment="Center" Style="{StaticResource BaseComboBoxStyle}" Width="70" Height="28" Text="成交时间"/>
|
||||
<Border Grid.Column="4" Margin="8,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="4,0,0,4"/>
|
||||
<Border Grid.Column="5" Margin="0,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="0,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="0,0,0,0"/>
|
||||
<DatePicker x:Name="dateStart" Grid.Column="5" Margin="0,0,4,0" VerticalAlignment="Center" BorderThickness="0" />
|
||||
|
||||
<Border Grid.Column="6" Margin="0,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="0,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="0,4,4,0"/>
|
||||
<DatePicker x:Name="dateEnd" Grid.Column="6" Margin="0,0,4,0" VerticalAlignment="Center" BorderThickness="0" />
|
||||
|
||||
<Button Grid.Column="11" x:Name="btnFilter" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,0,0" Grid.Row="4" Content="过滤" Width="48" Height="24" Click="btnFilter_Click"></Button>
|
||||
<Button Grid.Column="12" x:Name="btnSearch" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,4,0" Grid.Row="4" Content="读单" Width="48" Height="24" Click="btnSearch_Click"></Button>
|
||||
<Image Grid.Column="13" Source="{StaticResource loading_pic}" Width="20" Height="20">
|
||||
<Button Grid.Column="8" x:Name="btnFilter" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,0,0" Content="过滤" Width="48" Height="24" Click="btnFilter_Click"/>
|
||||
<Button Grid.Column="9" x:Name="btnSearch" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,4,0" Content="读单" Width="48" Height="24" Click="btnSearch_Click"/>
|
||||
<Image x:Name="imgLoading" Grid.Column="10" Source="{StaticResource loading_pic}" Width="20" Height="20" Margin="0,15,0,15">
|
||||
<!--<Image.Triggers>
|
||||
<EventTrigger RoutedEvent="Image.Loaded">
|
||||
<BeginStoryboard>
|
||||
<Storyboard>
|
||||
<DoubleAnimation
|
||||
Storyboard.TargetName="myElement"
|
||||
Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
|
||||
To="360"
|
||||
Duration="0:0:5"
|
||||
RepeatBehavior="Forever"/>
|
||||
<EventTrigger RoutedEvent="Image.Loaded">
|
||||
<BeginStoryboard>
|
||||
<Storyboard>
|
||||
<DoubleAnimation
|
||||
Storyboard.TargetName="myElement"
|
||||
Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
|
||||
To="360"
|
||||
Duration="0:0:5"
|
||||
RepeatBehavior="Forever"/>
|
||||
</Storyboard>
|
||||
</BeginStoryboard>
|
||||
</EventTrigger>
|
||||
</Image.Triggers>-->
|
||||
</Image>
|
||||
|
||||
</Grid>
|
||||
|
||||
<Grid x:Name="gridListHeader" Margin="12,0" Grid.Row="1">
|
||||
<Grid.ColumnDefinitions>
|
||||
<!--<ColumnDefinition Width="40"></ColumnDefinition>
|
||||
<ColumnDefinition Width="100*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="50*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="50*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="100*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="50*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="50*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="50*"></ColumnDefinition>-->
|
||||
</Grid.ColumnDefinitions>
|
||||
<TabControl x:Name="tabOrderType" Height="24" FontSize="16" VerticalAlignment="Bottom" SelectionChanged="tabOrderType_SelectionChanged" >
|
||||
<TabItem Header="待采购">
|
||||
<Grid Background="#FF33E5E5"/>
|
||||
@@ -98,17 +90,17 @@
|
||||
<Grid Background="#FFE5E5E5"/>
|
||||
</TabItem>
|
||||
<TabItem Header="待收货">
|
||||
<Grid Background="#FFE5E5E5"/>
|
||||
<Border Background="#FFE5E5E5" CornerRadius="5"/>
|
||||
</TabItem>
|
||||
<TabItem Header="退款单">
|
||||
<TabItem Header="退款单" Foreground="#FF6666">
|
||||
<Grid Background="#FFE5E5E5"/>
|
||||
</TabItem>
|
||||
<TabItem Header="全部订单">
|
||||
<Grid Background="#FFE5E5E5"/>
|
||||
</TabItem>
|
||||
<TabItem Header="发货异常">
|
||||
<!--<TabItem Header="发货异常">
|
||||
<Grid Background="#FFE5E5E5"/>
|
||||
</TabItem>
|
||||
</TabItem>-->
|
||||
</TabControl>
|
||||
</Grid>
|
||||
<Grid x:Name="lstTitle" Grid.Row="2" Margin="12,0,16,0" Background="{StaticResource ListHeadBackColorBrush}">
|
||||
@@ -168,15 +160,15 @@
|
||||
<!--此处绑定将数据源传递给子自定义控件OrderListRowCtrl-->
|
||||
<local:OrderListRowCtrl DataContext="{Binding}" VerticalAlignment="Center" VerticalContentAlignment="Center"></local:OrderListRowCtrl>
|
||||
</DataTemplate>
|
||||
|
||||
|
||||
</ListBox.ItemTemplate>
|
||||
</ListBox>
|
||||
<Grid x:Name="gridFooter" Grid.Row="4">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="100*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="100*"></ColumnDefinition>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBox x:Name="txtFilterCount" Text="共计 0 条" Grid.Column="1" Grid.Row="2" Margin="8,0" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
|
||||
<TextBox x:Name="txtFilterCount" Text="共计 0 条" Grid.Column="0" Grid.Row="2" Margin="8,0" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</UserControl>
|
||||
Reference in new issue
Block a user