拍单信息优化 异常单逻辑优化,异常单直拍(50%)
This commit is contained in:
1 parent
e00209cb24
commit
ac0430f3f7
26 files changed
+1663
-478
No files matched your search
@@ -8,10 +8,10 @@
|
||||
xmlns:converters="clr-namespace:_29WxOrderWpf.Converters"
|
||||
xmlns:usercontrols="clr-namespace:_29WxOrderWpf.UserControls"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="450" d:DesignWidth="1360" Loaded="Window_Loaded">
|
||||
d:DesignHeight="450" d:DesignWidth="1560" Loaded="Window_Loaded">
|
||||
|
||||
|
||||
<Grid Background="{StaticResource ListCtrlBackColorBrush}">
|
||||
<Grid Background="{StaticResource ListCtrlBackColorBrush}" x:Name="gridOrderListCtrl">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="45"></RowDefinition>
|
||||
<RowDefinition Height="auto"></RowDefinition>
|
||||
@@ -43,15 +43,17 @@
|
||||
|
||||
<usercontrols:UcWaterMarkTextBox Grid.Column="1" x:Name="txtSearchAll" Margin="0,0,8,0" Height="28" WaterMark="买手/仓库/退货物流 采购/退款单号" TextChanged="txtSearchAll_TextChanged"/>
|
||||
|
||||
|
||||
<usercontrols:UcWaterMarkTextBox Grid.Column="2" x:Name="txtGoodsName" Margin="0,0,8,0" Height="28" WaterMark="商品标题" />
|
||||
|
||||
<usercontrols:UcWaterMarkTextBox x:Name="txtShopName" Grid.Column="3" Margin="0,0,-6,0" Height="28" WaterMark="全部店铺" TextWrapping="NoWrap"/>
|
||||
<Button Grid.Column="4" x:Name="btnMultiShopChoice" Style="{StaticResource BasePageButtonLeftSquareStyle}" HorizontalAlignment="Left" VerticalAlignment="Center"
|
||||
Margin="0,0,8,0" Content=" ... " Width="28" Height="28" Click="btnMultiShopChoice_Click"/>
|
||||
|
||||
<ComboBox Grid.Column="5" x:Name="cmbUserNameMobile" Margin="4,0,4,0" VerticalContentAlignment="Center" BorderBrush="Transparent" Style="{StaticResource RoundedComboBox}"
|
||||
Width="70" Height="28" Text="成交时间" SelectedIndex="0">
|
||||
<ComboBox Grid.Column="5" x:Name="cmbTimeType" Margin="4,0,4,0" VerticalContentAlignment="Center" BorderBrush="Transparent" Style="{StaticResource RoundedComboBox}"
|
||||
Width="70" Height="28" Text="更新时间" SelectedIndex="0">
|
||||
<ComboBoxItem>
|
||||
<TextBlock>更新时间</TextBlock>
|
||||
</ComboBoxItem>
|
||||
<ComboBoxItem>
|
||||
<TextBlock>成交时间</TextBlock>
|
||||
</ComboBoxItem>
|
||||
@@ -206,21 +208,28 @@
|
||||
<ColumnDefinition Width="auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
</Grid.ColumnDefinitions>
|
||||
<CheckBox Grid.Column="0" Content="买手待申请售后" x:Name="chkEmergencyBuyerWaitAfterSale" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyBuyerAfterSale_Click"/>
|
||||
<CheckBox Grid.Column="1" Content="买手待退货" x:Name="chkEmergencyBuyerWaitSendBack" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyBuyerAfterSale_Click"/>
|
||||
<CheckBox Grid.Column="2" Content="买手已寄出待商家退款" x:Name="chkEmergencyBuyerWaitSupplierRefund" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyBuyerAfterSale_Click"/>
|
||||
<CheckBox Grid.Column="3" Content="买手退款失败" x:Name="chkEmergencyBuyerRefundFail" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyBuyerAfterSale_Click"/>
|
||||
<Polyline Grid.Column="4" Width="10" Margin="5,0" StrokeThickness="2" Stroke="{StaticResource mainColorBrush}" Points="5,0 5,8 5,0" VerticalAlignment="Center"/>
|
||||
<Button Grid.Column="1" x:Name="btnBatchRefund" Style="{StaticResource BasePageButtonStyle}" Margin="0,0,0,0" Content="批量申请买手售后" MinWidth="48" Height="20" Click="btnBatchRefund_Click" Padding="4,0" FontSize="12"/>
|
||||
|
||||
<CheckBox Grid.Column="5" Content="店铺客户有退货单号" x:Name="chkEmergencyShopCustomRefundHasWaybill" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyShopCustomRefundWaybill_Click"/>
|
||||
<CheckBox Grid.Column="6" Content="店铺客户无退货单号" x:Name="chkEmergencyShopCustomRefundNoWaybill" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyShopCustomRefundWaybill_Click"/>
|
||||
<Polyline Grid.Column="7" Width="10" Margin="5,0" StrokeThickness="2" Stroke="{StaticResource mainColorBrush}" Points="5,0 5,8 5,0" VerticalAlignment="Center"/>
|
||||
<CheckBox Grid.Column="2" Content="买手待退货" x:Name="chkEmergencyBuyerWaitSendBack" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyBuyerAfterSale_Click"/>
|
||||
<CheckBox Grid.Column="3" Content="买手已寄出待商家退款" x:Name="chkEmergencyBuyerWaitSupplierRefund" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyBuyerAfterSale_Click"/>
|
||||
<CheckBox Grid.Column="4" Content="买手退款失败" x:Name="chkEmergencyBuyerRefundFail" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyBuyerAfterSale_Click"/>
|
||||
<Polyline Grid.Column="5" Width="10" Margin="5,0" StrokeThickness="2" Stroke="{StaticResource mainColorBrush}" Points="5,0 5,8 5,0" VerticalAlignment="Center"/>
|
||||
|
||||
<CheckBox Grid.Column="8" Content="店铺退款完成" x:Name="chkEmergencyShopAfterSaleSuccess" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyShopAfterSale_Click"/>
|
||||
<CheckBox Grid.Column="9" Content="店铺退款中" x:Name="chkEmergencyShopInAfterSale" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyShopAfterSale_Click"/>
|
||||
</Grid>
|
||||
<CheckBox Grid.Column="6" Content="店铺客户有退货单号" x:Name="chkEmergencyShopCustomRefundHasWaybill" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyShopCustomRefundWaybill_Click"/>
|
||||
<CheckBox Grid.Column="7" Content="店铺客户无退货单号" x:Name="chkEmergencyShopCustomRefundNoWaybill" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyShopCustomRefundWaybill_Click"/>
|
||||
<Polyline Grid.Column="8" Width="10" Margin="5,0" StrokeThickness="2" Stroke="{StaticResource mainColorBrush}" Points="5,0 5,8 5,0" VerticalAlignment="Center"/>
|
||||
|
||||
<CheckBox Grid.Column="9" Content="店铺退款完成" x:Name="chkEmergencyShopAfterSaleSuccess" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyShopAfterSale_Click"/>
|
||||
<CheckBox Grid.Column="10" Content="店铺退款中" x:Name="chkEmergencyShopInAfterSale" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyShopAfterSale_Click"/>
|
||||
|
||||
<Polyline Grid.Column="11" Width="10" Margin="5,0" StrokeThickness="2" Stroke="{StaticResource mainColorBrush}" Points="5,0 5,8 5,0" VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
</TabItem>
|
||||
<TabItem Header="售后完成订单" MinWidth="60" Foreground="#FF9966" BorderBrush="Transparent" Background="Transparent" SizeChanged="TabItem_SizeChanged">
|
||||
@@ -256,14 +265,41 @@
|
||||
<Grid Background="#FFE5E5E5"/>
|
||||
</TabItem>-->
|
||||
</TabControl>
|
||||
<WrapPanel x:Name="wpFilter" Margin="630,6,0,0" VerticalAlignment="Top">
|
||||
<WrapPanel x:Name="wpFilter" Margin="630,2,0,0" VerticalAlignment="Top">
|
||||
<CheckBox Content="过滤非中转仓订单" x:Name="chkOnlyWarehouseOrder" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
|
||||
Margin="0,0,0,0" VerticalAlignment="Top" Checked="chkSubFilterSonditions_Checked" Unchecked="chkSubFilterSonditions_Checked" IsChecked="true"/>
|
||||
Margin="0,0,0,0" VerticalAlignment="Center" VerticalContentAlignment="Center" Checked="chkSubFilterSonditions_Checked" Unchecked="chkSubFilterSonditions_Checked" IsChecked="true"/>
|
||||
<CheckBox Content="过滤多件商品订单" x:Name="chkNoMultiOrder" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
|
||||
Margin="8,0,0,0" VerticalAlignment="Top" Checked="chkSubFilterSonditions_Checked" Unchecked="chkSubFilterSonditions_Checked" IsChecked="true"/>
|
||||
Margin="8,0,0,0" VerticalAlignment="Center" VerticalContentAlignment="Center" Checked="chkSubFilterSonditions_Checked" Unchecked="chkSubFilterSonditions_Checked" IsChecked="true"/>
|
||||
<Polyline Grid.Column="5" Width="10" Margin="5,0" StrokeThickness="2" Stroke="{StaticResource mainColorBrush}" Points="5,0 5,4 5,0" VerticalAlignment="Center"/>
|
||||
<CheckBox Content="过滤备注" x:Name="chkFilterRemark" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
|
||||
Margin="0,0,0,0" VerticalAlignment="Center" VerticalContentAlignment="Center" Checked="chkSubFilterSonditions_Checked" Unchecked="chkSubFilterSonditions_Checked" IsChecked="False"/>
|
||||
|
||||
<Border Margin="4,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1,1,1,1" Height="22" VerticalAlignment="Center" CornerRadius="4,0,0,4">
|
||||
<ComboBox x:Name="cmbFilterRemark" Margin="4,0,4,0" VerticalContentAlignment="Center" BorderBrush="Transparent" Style="{StaticResource RoundedComboBox}"
|
||||
Width="96" Height="20" Text="成交时间" SelectedIndex="0">
|
||||
<ComboBoxItem>
|
||||
<TextBlock Margin="0, -2">店铺备注包含</TextBlock>
|
||||
</ComboBoxItem>
|
||||
<ComboBoxItem>
|
||||
<TextBlock Margin="0, -2">软件备注包含</TextBlock>
|
||||
</ComboBoxItem>
|
||||
<ComboBoxItem>
|
||||
<TextBlock Margin="0, -2">店铺备注不含</TextBlock>
|
||||
</ComboBoxItem>
|
||||
<ComboBoxItem>
|
||||
<TextBlock Margin="0, -2">软件备注不含</TextBlock>
|
||||
</ComboBoxItem>
|
||||
</ComboBox>
|
||||
</Border>
|
||||
<Border Grid.Column="7" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="0,1,1,1" Height="22" VerticalAlignment="Center" CornerRadius="0,4,4,0" Margin="-2,0,0,0">
|
||||
<TextBox x:Name="txtFilterRemark" BorderThickness="0" BorderBrush="Transparent" Width="100" Margin="3,1" VerticalAlignment="Center" VerticalContentAlignment="Center"
|
||||
TextChanged="txtFilterRemark_TextChanged" ToolTip="{Binding Text,RelativeSource={RelativeSource Self}}"></TextBox>
|
||||
</Border>
|
||||
<Button Grid.Column="4" Style="{StaticResource BasePageButtonLeftSquareStyle}" HorizontalAlignment="Right" VerticalAlignment="Center"
|
||||
Margin="-4,0,0,0" Content=" ... " Width="22" Height="22" Click="btnMultiRemark_Click"/>
|
||||
</WrapPanel>
|
||||
<TextBlock Margin="10,6" FontSize="12" VerticalAlignment="Top" HorizontalAlignment="Right" Text="注:需中转仓订单,店铺后台勿自行发货,发货后中转仓将无法打单"
|
||||
Foreground="{StaticResource PageWarningBrushCC}"></TextBlock>
|
||||
<TextBlock Margin="10,-5, 0 -5" FontSize="12" VerticalAlignment="Top" HorizontalAlignment="Right" Text="注:需中转仓订单,店铺后台勿自行发货,发货后中转仓将无法打单"
|
||||
Foreground="{StaticResource PageWarningBrushCC}" Width="180" TextWrapping="Wrap"></TextBlock>
|
||||
</Grid>
|
||||
<Grid x:Name="lstTitle" Grid.Row="2" Margin="8,0,8,0" Background="{StaticResource ListHeadBackColorBrush}">
|
||||
<Border BorderThickness="0,0,1,0" BorderBrush="{StaticResource ListHeadBorderColorBrush}">
|
||||
@@ -325,7 +361,6 @@
|
||||
<!--此处绑定将数据源传递给子自定义控件OrderListRowCtrl-->
|
||||
<local:OrderListRowCtrl DataContext="{Binding}" VerticalAlignment="Center" VerticalContentAlignment="Center"></local:OrderListRowCtrl>
|
||||
</DataTemplate>
|
||||
|
||||
</ListBox.ItemTemplate>
|
||||
</ListBox>
|
||||
<Grid x:Name="gridFooter" Grid.Row="4">
|
||||
@@ -333,7 +368,37 @@
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="100*"></ColumnDefinition>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBox x:Name="txtFilterCount" Text="共计 0 条" Grid.Column="0" Grid.Row="2" Margin="8,0" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
|
||||
<TextBox x:Name="txtMsg" Text="共计 0 条" Grid.Column="0" Grid.Row="2" Margin="8,0" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
|
||||
</Grid>
|
||||
|
||||
<Border BorderBrush="{StaticResource pageColorBrush}" Background="White" BorderThickness="1,1,1,1" MinHeight="200" MinWidth="200" MaxWidth="400" MaxHeight="400" VerticalAlignment="Top"
|
||||
HorizontalAlignment="Left" x:Name="borderFilterRemarkSelect" CornerRadius="4" Margin="30,180,0,0" Grid.RowSpan="10">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition></RowDefinition>
|
||||
<RowDefinition Height="40"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
<ScrollViewer VerticalScrollBarVisibility="Auto" Padding="2">
|
||||
<WrapPanel x:Name="wpFilterRemarkSelect">
|
||||
</WrapPanel>
|
||||
</ScrollViewer>
|
||||
<Grid Grid.Row="2">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Button Grid.Column="0" x:Name="btnFilterRemarkSelectAll" Style="{StaticResource BasePageButtonStyle}" Grid.Row="4" Content=" 全选 " Height="22" Margin="6,0,4,0" Click="btnFilterRemarkSelectAll_Click"></Button>
|
||||
<Button Grid.Column="1" x:Name="btnFilterRemarkUnSelectAll" Style="{StaticResource BasePageButtonStyle}" Grid.Row="4" Content=" 全空 " Height="22" Click="btnFilterRemarkUnSelectAll_Click"></Button>
|
||||
<Button Grid.Column="6" x:Name="btnApplyFilterRemark" Style="{StaticResource BasePageButtonStyle}" Grid.Row="4" Content=" 确定 " Height="22" Click="btnApplyFilterRemark_Click"></Button>
|
||||
<Button Grid.Column="7" x:Name="btnCancelFilterRemark" Style="{StaticResource BasePageButtonLightStyle}" Grid.Row="4" Content=" 取消 " Height="22" Margin="4,0,6,0" Click="btnCancelFilterRemark_Click"></Button>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</Border>
|
||||
</Grid>
|
||||
</UserControl>
|
||||
Reference in new issue
Block a user