删除不合适的仓库 优化订单和售后单读取
This commit is contained in:
1 parent
6f7aa58ac1
commit
13b68fa64e
53 files changed
+14843
-820
No files matched your search
@@ -62,8 +62,8 @@
|
||||
<DatePicker x:Name="dateEnd" Grid.Column="7" Margin="0,0,4,0" VerticalAlignment="Center" BorderThickness="0" />
|
||||
|
||||
<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 imgLoadingPic}" Width="20" Height="20" Margin="0">
|
||||
<Button Grid.Column="9" x:Name="btnSearch" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,4,0" Content="读单" Width="48" Height="24" Click="btnSearch_Click" IsEnabled="False"/>
|
||||
<Image x:Name="imgLoading" Grid.Column="10" Source="{StaticResource imgLoadingPic}" Width="20" Height="20" Margin="0" IsEnabled="False">
|
||||
<Image.RenderTransform>
|
||||
<RotateTransform Angle="45" CenterX="10" CenterY="10"/>
|
||||
</Image.RenderTransform>
|
||||
@@ -135,8 +135,17 @@
|
||||
</TabControl.Resources>
|
||||
<TabItem Header="待采购" BorderBrush="Transparent" Background="Transparent">
|
||||
<Border BorderBrush="#e0e0e0" BorderThickness="0,0,0,1" Margin="4,0,4,4">
|
||||
<CheckBox Content="未关联拍单" x:Name="chkNoMapProdOnly" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center" Margin="6,8" Checked="chkNoMapProdOnly_Checked" Unchecked="chkNoMapProdOnly_Checked"/>
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
</Grid.ColumnDefinitions>
|
||||
<CheckBox Content="已关联拍单" x:Name="chkMapProdOnly" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center" Margin="6,8" Click="chkMapProdOnly_Click"/>
|
||||
<CheckBox Content="未关联拍单" x:Name="chkNoMapProdOnly" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
|
||||
Grid.Column="1" VerticalAlignment="Center" Margin="6,8" Click="chkNoMapProdOnly_Click"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
</TabItem >
|
||||
<TabItem Header="待发货"></TabItem>
|
||||
@@ -155,7 +164,8 @@
|
||||
ColumnDisplayIndexChanged="dgOrderHeader_ColumnDisplayIndexChanged"
|
||||
LayoutUpdated="dgOrderHeader_LayoutUpdated">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTemplateColumn x:Name="colSelectAll" Header="选择" Width="50" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}">
|
||||
<DataGridTextColumn Width="38" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="序号"/>
|
||||
<DataGridTemplateColumn x:Name="colSelectAll" Header="选择" Width="28" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}">
|
||||
<DataGridTemplateColumn.HeaderTemplate>
|
||||
<DataTemplate>
|
||||
<Grid Width="14" Height="14">
|
||||
@@ -176,9 +186,9 @@
|
||||
</DataGridTemplateColumn>
|
||||
<DataGridTextColumn Width="200*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="店铺单号"/>
|
||||
<DataGridTextColumn Width="100*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="交易时间"/>
|
||||
<DataGridTextColumn Width="100*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="利润"/>
|
||||
<DataGridTextColumn Width="80*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="利润"/>
|
||||
<DataGridTextColumn Width="160*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="状态/地址"/>
|
||||
<DataGridTextColumn Width="100*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="单号"/>
|
||||
<DataGridTextColumn Width="110*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="单号"/>
|
||||
<DataGridTextColumn Width="120*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="备注"/>
|
||||
<DataGridTextColumn Width="82*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header=" 操作"/>
|
||||
</DataGrid.Columns>
|
||||
|
||||
Reference in new issue
Block a user