pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

订单界面调整

qianyi
shanji 3 years ago
parent
de17f16986
commit
23ad95f638
3 changed files with 48 additions and 81 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      BBWY.Client/ViewModels/Order/OrderListViewModel.cs
  2. 62
      BBWY.Client/Views/Order/OrderList.xaml
  3. 59
      BBWY.Test/Program.cs

6
BBWY.Client/ViewModels/Order/OrderListViewModel.cs
View File

@ -210,8 +210,8 @@ namespace BBWY.Client.ViewModels
{ {
InitSearchParam(); InitSearchParam();
this.OrderState = orderState; this.OrderState = orderState;
if (orderState != null) //if (orderState != null)
IncludeAfterOrder = false; // IncludeAfterOrder = false;
Task.Factory.StartNew(() => LoadOrder(1)); //选择状态查询订单 Task.Factory.StartNew(() => LoadOrder(1)); //选择状态查询订单
} }
@ -219,7 +219,7 @@ namespace BBWY.Client.ViewModels
{ {
InitSearchParam(); InitSearchParam();
IncludeAfterOrder = true; IncludeAfterOrder = true;
Task.Factory.StartNew(() => LoadOrder(1)); //选择状态查询订单 //Task.Factory.StartNew(() => LoadOrder(1));
} }
public void RefreshOrder(string orderId) public void RefreshOrder(string orderId)

62
BBWY.Client/Views/Order/OrderList.xaml
View File

@ -124,10 +124,10 @@
<DatePicker SelectedDate="{Binding EndDate}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="5,0,0,0"/> <DatePicker SelectedDate="{Binding EndDate}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="5,0,0,0"/>
<TextBlock Text="订单号" VerticalAlignment="Center" Margin="5,0,0,0"/> <TextBlock Text="订单号" VerticalAlignment="Center" Margin="5,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchOrderId}" WaterRemark="精确匹配"/> <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchOrderId}" WaterRemark="精确匹配"/>
<TextBlock Text="SPU" VerticalAlignment="Center" Margin="5,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="精确匹配" Text="{Binding SearchProductId}"/>
<TextBlock Text="SKU" VerticalAlignment="Center" Margin="5,0,0,0"/> <TextBlock Text="SKU" VerticalAlignment="Center" Margin="5,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchSku}" WaterRemark="精确匹配"/> <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchSku}" WaterRemark="精确匹配"/>
<TextBlock Text="快递单号" VerticalAlignment="Center" Margin="5,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchWaybill}" WaterRemark="前缀模糊匹配"/>
<!--<TextBlock Text="下单账号" VerticalAlignment="Center" Margin="5,0,0,0"/> <!--<TextBlock Text="下单账号" VerticalAlignment="Center" Margin="5,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="暂不支持" IsEnabled="False" <c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="暂不支持" IsEnabled="False"
DisableBgColor="{StaticResource TextBox.Disable.BgColor}"/>--> DisableBgColor="{StaticResource TextBox.Disable.BgColor}"/>-->
@ -152,14 +152,21 @@
<c:BButton Content="近30天" Width="50" Height="25" Margin="5,0,0,0" <c:BButton Content="近30天" Width="50" Height="25" Margin="5,0,0,0"
Command="{Binding SetSearchDateCommand}" Command="{Binding SetSearchDateCommand}"
CommandParameter="{StaticResource d30}"/> CommandParameter="{StaticResource d30}"/>
<TextBlock Text="SPU" VerticalAlignment="Center" Margin="5,0,0,0"/> <TextBlock Text="服务单" VerticalAlignment="Center" Margin="5,0,0,0"
<c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="精确匹配" Text="{Binding SearchProductId}"/> Visibility="{Binding IncludeAfterOrder,ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}"/>
<TextBlock Text="货号" VerticalAlignment="Center" Margin="5,0,0,0"/> <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding AfterOrderServiceId}" WaterRemark="精确匹配"
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchProductNo}" WaterRemark="精确匹配"/> Visibility="{Binding IncludeAfterOrder,ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}"/>
<TextBlock Text="客户姓名" VerticalAlignment="Center" Margin="5,0,0,0"/> <TextBlock Text="快递单" VerticalAlignment="Center" Margin="5,0,0,0"
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchContactName}" WaterRemark="精确匹配"/> Visibility="{Binding Visibility,ElementName=listbox_order}"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchWaybill}" WaterRemark="前缀模糊匹配"
Visibility="{Binding Visibility,ElementName=listbox_order}"/>
<TextBlock Text="货号" VerticalAlignment="Center" Margin="5,0,0,0" Visibility="{Binding Visibility,ElementName=listbox_order}"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchProductNo}" WaterRemark="精确匹配" Visibility="{Binding Visibility,ElementName=listbox_order}"/>
<TextBlock Text="客户姓名" VerticalAlignment="Center" Margin="5,0,0,0" Visibility="{Binding Visibility,ElementName=listbox_order}"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchContactName}" WaterRemark="精确匹配" Visibility="{Binding Visibility,ElementName=listbox_order}"/>
<c:BButton Content="同步" Width="50" Margin="5,0,0,0" Command="{Binding SyncOrderCommand}" ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="10000"> <c:BButton Content="同步" Width="50" Margin="5,0,0,0" Command="{Binding SyncOrderCommand}" ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="10000"
Visibility="{Binding Visibility,ElementName=listbox_order}">
<c:BButton.ToolTip> <c:BButton.ToolTip>
<StackPanel> <StackPanel>
<TextBlock Text="1.使用筛选条件中的开始时间和结束时间进行同步"/> <TextBlock Text="1.使用筛选条件中的开始时间和结束时间进行同步"/>
@ -168,7 +175,8 @@
</StackPanel> </StackPanel>
</c:BButton.ToolTip> </c:BButton.ToolTip>
</c:BButton> </c:BButton>
<c:BButton Content="导出" Command="{Binding ExportCommand}" Width="50" Margin="5,0,0,0"/> <c:BButton Content="导出" Command="{Binding ExportCommand}" Width="50" Margin="5,0,0,0"
Visibility="{Binding Visibility,ElementName=listbox_order}"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
@ -251,7 +259,8 @@
</TextBlock> </TextBlock>
</Grid> </Grid>
<Border Grid.Row="4" Background="{StaticResource Border.Background}"> <Border Grid.Row="4" Background="{StaticResource Border.Background}"
Visibility="{Binding Visibility,ElementName=listbox_order}">
<StackPanel Orientation="Horizontal" > <StackPanel Orientation="Horizontal" >
<CheckBox Content="仅显示代发订单" Margin="5,0,0,0" IsChecked="{Binding OnlyDF,Mode=OneWayToSource,UpdateSourceTrigger=PropertyChanged}"/> <CheckBox Content="仅显示代发订单" Margin="5,0,0,0" IsChecked="{Binding OnlyDF,Mode=OneWayToSource,UpdateSourceTrigger=PropertyChanged}"/>
<CheckBox Content="过滤SD订单" Margin="5,0,0,0" IsChecked="{Binding ExcludeSD,Mode=OneWayToSource,UpdateSourceTrigger=PropertyChanged}"/> <CheckBox Content="过滤SD订单" Margin="5,0,0,0" IsChecked="{Binding ExcludeSD,Mode=OneWayToSource,UpdateSourceTrigger=PropertyChanged}"/>
@ -260,7 +269,8 @@
</Border> </Border>
<Border Grid.Row="6" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1,1,1,0" <Border Grid.Row="6" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1,1,1,0"
Background="#F2F2F2"> Background="#F2F2F2"
Visibility="{Binding Visibility,ElementName=listbox_order}">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="351"/> <ColumnDefinition Width="351"/>
@ -277,8 +287,7 @@
<TextBlock Text="采购信息" Grid.Column="2" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="采购信息" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="成本信息" Grid.Column="3" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="成本信息" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="利润信息" Grid.Column="4" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="利润信息" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock x:Name="txtwuliu" Text="物流信息" Grid.Column="5" Style="{StaticResource middleTextBlock}" <TextBlock x:Name="txtwuliu" Text="物流信息" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
Visibility="{Binding IncludeAfterOrder,Converter={StaticResource objConverter},ConverterParameter=true:Collapsed:Visible}"/>
<TextBlock Text="订单状态" Grid.Column="6" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="订单状态" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="备注信息" Grid.Column="7" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="备注信息" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
@ -299,7 +308,8 @@
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
BorderBrush="{StaticResource Border.Brush}" BorderBrush="{StaticResource Border.Brush}"
BorderThickness="1,1,1,0" BorderThickness="1,1,1,0"
Foreground="{StaticResource Text.Color}"> Foreground="{StaticResource Text.Color}"
Visibility="{Binding IncludeAfterOrder,Converter={StaticResource objConverter},ConverterParameter=true:Collapsed:Visible}">
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<Grid Width="{Binding ActualWidth,ElementName=listbox_order,Converter={StaticResource widthConverter},ConverterParameter=-0}" <Grid Width="{Binding ActualWidth,ElementName=listbox_order,Converter={StaticResource widthConverter},ConverterParameter=-0}"
@ -421,7 +431,7 @@
</TextBlock> </TextBlock>
<Border BorderBrush="#EC808D" BorderThickness="1" HorizontalAlignment="Left" Padding="5,2" <Border BorderBrush="#EC808D" BorderThickness="1" HorizontalAlignment="Left" Padding="5,2"
Visibility="{Binding IsRefund,ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}"> Visibility="{Binding IsRefund,ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}">
<TextBlock Text="退款" Foreground="#EC808D"/> <TextBlock Text="售后" Foreground="#EC808D"/>
</Border> </Border>
</StackPanel> </StackPanel>
@ -807,7 +817,7 @@
Visibility="{Binding Visibility,ElementName=btn_outStore}"/> Visibility="{Binding Visibility,ElementName=btn_outStore}"/>
</Grid> </Grid>
<ListBox x:Name="listbox_afterSaleOrder" <!--<ListBox x:Name="listbox_afterSaleOrder"
Grid.Column="5" Grid.Column="5"
Visibility="Collapsed" Visibility="Collapsed"
ItemsSource="{Binding AfterSaleOrderList}" ItemsSource="{Binding AfterSaleOrderList}"
@ -823,10 +833,6 @@
<StackPanel VerticalAlignment="Center" <StackPanel VerticalAlignment="Center"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsPlaceholder,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}"> Visibility="{Binding IsPlaceholder,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}">
<!--<TextBlock>
<Run Text="SKU"/>
<Run Text="{Binding SkuId}"/>
</TextBlock>-->
<TextBlock> <TextBlock>
<Run Text="服务单结果"/> <Run Text="服务单结果"/>
<Run Text="{Binding ServiceResult,ConverterParameter=#null:未处理:#source,Converter={StaticResource objConverter}}"/> <Run Text="{Binding ServiceResult,ConverterParameter=#null:未处理:#source,Converter={StaticResource objConverter}}"/>
@ -862,21 +868,21 @@
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
</ListBox> </ListBox>-->
<TextBlock Text="{Binding OrderState}" Grid.Column="6" <TextBlock Text="{Binding OrderState}" Grid.Column="6"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center"> VerticalAlignment="Center">
<TextBlock.Visibility> <!--<TextBlock.Visibility>
<MultiBinding Converter="{StaticResource mobjConverter}" <MultiBinding Converter="{StaticResource mobjConverter}"
ConverterParameter=";true:&amp;:Collapsed:Visible:1"> ConverterParameter=";true:&amp;:Collapsed:Visible:1">
<Binding Path="DataContext.IncludeAfterOrder" RelativeSource="{RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}"/> <Binding Path="DataContext.IncludeAfterOrder" RelativeSource="{RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}"/>
<Binding Path="IsAfterSaleOrder"/> <Binding Path="IsAfterSaleOrder"/>
</MultiBinding> </MultiBinding>
</TextBlock.Visibility> </TextBlock.Visibility>-->
</TextBlock> </TextBlock>
<ListBox x:Name="listbox_afterSaleOrder1" <!--<ListBox x:Name="listbox_afterSaleOrder1"
Grid.Column="6" Grid.Column="6"
ItemsSource="{Binding AfterSaleOrderList}" ItemsSource="{Binding AfterSaleOrderList}"
Style="{StaticResource NoScrollViewListBoxStyle}" Style="{StaticResource NoScrollViewListBoxStyle}"
@ -913,7 +919,7 @@
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
</ListBox> </ListBox>-->
<StackPanel Orientation="Vertical" Grid.Column="7" Margin="5,5,5,0"> <StackPanel Orientation="Vertical" Grid.Column="7" Margin="5,5,5,0">
<StackPanel x:Name="sp_buyerRemark"> <StackPanel x:Name="sp_buyerRemark">
@ -994,11 +1000,11 @@
<Setter TargetName="btn_outStore" Property="Visibility" Value="Visible"/> <Setter TargetName="btn_outStore" Property="Visibility" Value="Visible"/>
</MultiDataTrigger.Setters> </MultiDataTrigger.Setters>
</MultiDataTrigger> </MultiDataTrigger>
<DataTrigger Binding="{Binding DataContext.IncludeAfterOrder,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" <!--<DataTrigger Binding="{Binding DataContext.IncludeAfterOrder,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
Value="True"> Value="True">
<Setter TargetName="sp_store" Property="Visibility" Value="Collapsed"/> <Setter TargetName="sp_store" Property="Visibility" Value="Collapsed"/>
<Setter TargetName="listbox_afterSaleOrder" Property="Visibility" Value="Visible"/> <Setter TargetName="listbox_afterSaleOrder" Property="Visibility" Value="Visible"/>
</DataTrigger> </DataTrigger>-->
</DataTemplate.Triggers> </DataTemplate.Triggers>
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>

59
BBWY.Test/Program.cs
View File

@ -30,59 +30,20 @@ namespace BBWY.Test
var token = "2ace3023200c4ea9aa682bbf8bffee18jztm"; var token = "2ace3023200c4ea9aa682bbf8bffee18jztm";
var jdClient = GetJdClient(appKey, appSecret); var jdClient = GetJdClient(appKey, appSecret);
//var req_productList = new WareReadSearchWare4ValidRequest() var req = new AscQueryListRequest();
//{ req.buId = "10598776";
// orderField = "modified", req.operatePin = "开发测试";
// orderType = "desc", req.operateNick = "开发测试";
// pageSize = 10, req.pageNumber = "1";
// pageNo = 1, req.pageSize ="50";
// field = "created"
//};
//req_productList.wareId = "10022906311378,10022870207603";
req.orderId = null;
req.serviceId = 1377757485;
//var rep_productList = jdClient.Execute(req_productList, token, DateTime.Now.ToLocalTime()); AscQueryListResponse response = jdClient.Execute(req, token, DateTime.Now.ToLocalTime());
//if (rep_productList.IsError)
// throw new BusinessException(string.IsNullOrEmpty(rep_productList.ErrorMsg) ? rep_productList.ErrMsg : rep_productList.ErrorMsg);
//return new ProductListResponse()
//{
// Count = rep_productList.page.totalItem,
// Items = ((JArray)rep_productList.Json["jingdong_ware_read_searchWare4Valid_responce"]["page"]["data"]).Select(p => new ProductResponse()
// {
// Id = p.Value<string>("wareId"),
// Title = p.Value<string>("title"),
// ProductItemNum = p.Value<string>("itemNum"),
// State = p.Value<int>("wareStatus")
// }).ToList()
//};
Console.WriteLine(JsonConvert.SerializeObject(response));
SearchProductSkuRequest searchProductRequest = new SearchProductSkuRequest()
{
AppKey = appKey,
AppSecret = appSecret,
AppToken = token,
Platform = Server.Model.Enums.Platform.京东,
Spu = "10022849663452"
};
//var jdClient = GetJdClient(searchProductRequest.AppKey, searchProductRequest.AppSecret);
var req_skuList = new SkuReadSearchSkuListRequest()
{
pageSize = 50,//50
field = "logo,saleAttrs,status,created"
};
if (!string.IsNullOrEmpty(searchProductRequest.Spu))
req_skuList.wareId = searchProductRequest.Spu;
else if (!string.IsNullOrEmpty(searchProductRequest.Sku))
req_skuList.skuId = searchProductRequest.Sku;
var rep_skuList = jdClient.Execute(req_skuList, searchProductRequest.AppToken, DateTime.Now.ToLocalTime());
Console.WriteLine(JsonConvert.SerializeObject(rep_skuList));
Console.ReadKey(); Console.ReadKey();
} }
} }

Write Preview
Loading…
Cancel
Save