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

1

qianyi
shanji 2 years ago
parent
7335efe36b
commit
144d57b78a
4 changed files with 194 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      BBWY.Client/Models/MappingProfile.cs
  2. 1
      BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs
  3. 194
      BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml
  4. 3
      BBWY.Client/Views/Order/OrderListControl.xaml

2
BBWY.Client/Models/MappingProfile.cs
View File

@ -32,6 +32,8 @@ namespace BBWY.Client.Models
CreateMap<BillCorrectionOrderResponse, BillCorrectionOrder>();
CreateMap<ServiceOrderItemResponse, ServiceOrder>();
CreateMap<ProductSkuWithSchemeResponse, ProductSkuWithScheme>();
CreateMap<PurchaseOrderV2Response, PurchaseOrderV2>();
CreateMap<PurchaseOrderSkuResponse, PurchaseOrderSku>();
}
}
}

1
BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs
View File

@ -1,7 +1,6 @@
using BBWY.Client.APIServices;
using BBWY.Client.Models;
using BBWY.Client.Views.BatchPurchase;
using BBWY.Client.Views.ServiceOrder;
using BBWY.Common.Extensions;
using BBWY.Common.Models;
using BBWY.Controls;

194
BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml
View File

@ -11,6 +11,7 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib"
d:DesignHeight="1080" d:DesignWidth="1920"
Title="BatchPurchaseOrderList"
Foreground="{StaticResource Text.Color}"
DataContext="{Binding BatchPurchaseOrderListVM,Source={StaticResource Locator}}">
<Page.Resources>
<sys:Int32 x:Key="d0">0</sys:Int32>
@ -155,7 +156,7 @@
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition Width="80"/>
</Grid.ColumnDefinitions>
<TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
@ -175,12 +176,197 @@
</Grid>
</Border>
<ListBox Grid.Row="5"
ItemsSource="{StaticResource PurchaseOrderList}"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}">
<ListBox x:Name="listbox_purchaseOrder"
Grid.Row="5"
ItemsSource="{Binding PurchaseOrderList}"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
BorderThickness="1"
BorderBrush="{StaticResource Border.Brush}"
Foreground="{StaticResource Text.Color}">
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Width="{Binding ActualWidth,ElementName=listbox_purchaseOrder,Converter={StaticResource widthConverter},ConverterParameter=-0}">
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid Background="#F2F2F2" Grid.ColumnSpan="2">
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd HH:mm:ss}" VerticalAlignment="Center" Margin="5,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="订单号:" Margin="5,0,0,0" />
<c:BButton Content="{Binding Id}" Style="{StaticResource LinkButton}"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding Id}" Margin="5,0,0,0"/>
<c:BButton x:Name="btn_orderState" Content="{Binding OrderState}" Margin="5,0,0,0" Height="25" Padding="5,0" Background="{StaticResource Text.Link.Color}"/>
<Border Width="1" Margin="5,5,0,5" Background="{StaticResource Border.Brush}"/>
<StackPanel x:Name="txt_consignee" Margin="5,0,0,0" Orientation="Horizontal" VerticalAlignment="Center">
<TextBlock Text="下单账号:"/>
<c:BButton Content="{Binding PurchaseAccountId}" Style="{StaticResource LinkButton}"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding PurchaseAccountId}" Margin="5,0,0,0"/>
<TextBlock Text="收货人:" Margin="5,0,0,0"/>
<c:BButton Content="{Binding ConsigneeContactName}" Style="{StaticResource LinkButton}"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding ConsigneeContactName}" Margin="5,0,0,0"/>
<TextBlock Text="联系电话" Margin="5,0,0,0"/>
<c:BButton Content="{Binding ConsigneeMobile}" Style="{StaticResource LinkButton}"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding ConsigneeMobile}" Margin="5,0,0,0"/>
</StackPanel>
</StackPanel>
<Border VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="380"/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition Width="80"/>
</Grid.ColumnDefinitions>
<ListBox x:Name="listbox_purchaseOrderSku" ItemsSource="{Binding ItemList}"
Style="{StaticResource NoScrollViewListBoxStyle}"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
Foreground="{StaticResource Text.Color}">
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="90"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<!--{Binding Logo}-->
<c:BAsyncImage UrlSource="{Binding Logo}"
Width="80" DecodePixelWidth="80"
VerticalAlignment="Top" Margin="0,5,0,5"
Cursor="Hand"/>
<StackPanel Grid.Column="1" Orientation="Vertical" Margin="0,5,0,5">
<TextBlock TextTrimming="CharacterEllipsis">
<TextBlock.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="{Binding SkuTitle}"/>
</ToolTip>
</TextBlock.ToolTip>
<Run Text="SKU名称:"/>
<Run Text="{Binding SkuTitle}"/>
</TextBlock>
<TextBlock TextWrapping="Wrap">
<Run Text="单价:"/>
<Run Text="{Binding Price}" Foreground="{StaticResource Text.Pink}"/>
</TextBlock>
<TextBlock TextWrapping="Wrap">
<Run Text="数量:"/>
<Run Text="{Binding Quantity}" Foreground="{StaticResource Text.Pink}"/>
</TextBlock>
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal">
<TextBlock Text="SPU:"/>
<c:BButton Content="{Binding ProductId}" Style="{StaticResource LinkButton}"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding ProductId}"
Margin=" 5,0,0,0"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="SKU:"/>
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding SkuId}"
Margin=" 5,0,0,0"/>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock>
<Run Text="采购平台:"/>
<Run Text="{Binding PurchasePlatform}"/>
</TextBlock>
<TextBlock>
<Run Text="采购商家:"/>
<Run Text="{Binding PurchaserName}"/>
</TextBlock>
<TextBlock>
<Run Text="采购账号:"/>
<Run Text="{Binding PurchaseAccountId}"/>
</TextBlock>
</StackPanel>
<Border Width="1" Grid.Column="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock>
<Run Text="采购货款:"/>
<Run Text="{Binding ProductAmount}" Foreground="{StaticResource Text.Pink}"/>
</TextBlock>
<TextBlock>
<Run Text="采购运费:"/>
<Run Text="{Binding PurchaseFreight}" Foreground="{StaticResource Text.Pink}"/>
</TextBlock>
<TextBlock>
<Run Text="采购金额:"/>
<Run Text="{Binding PurchaseAmount}" Foreground="{StaticResource Text.Pink}"/>
</TextBlock>
</StackPanel>
<Border Width="1" Grid.Column="2" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<StackPanel Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock>
<Run Text="质检:"/>
<Run Text="{Binding QualityInspectionAmount}" Foreground="{StaticResource Text.Pink}"/>
</TextBlock>
<TextBlock>
<Run Text="打包:"/>
<Run Text="{Binding ConsumableAmount}" Foreground="{StaticResource Text.Pink}"/>
</TextBlock>
<TextBlock>
<Run Text="发货入仓:"/>
<Run Text="{Binding InStorageAmount}" Foreground="{StaticResource Text.Pink}"/>
</TextBlock>
<TextBlock>
<Run Text="头程运费:"/>
<Run Text="{Binding FirstFreight}" Foreground="{StaticResource Text.Pink}"/>
</TextBlock>
</StackPanel>
<Border Width="1" Grid.Column="3" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<StackPanel Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock>
<Run Text="快递公司:"/>
<Run Text="{Binding ExpressName}"/>
</TextBlock>
<TextBlock>
<Run Text="快递单号:"/>
<Run Text="{Binding WaybillNo}"/>
</TextBlock>
</StackPanel>
<Border Width="1" Grid.Column="4" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<TextBlock Grid.Column="5" Text="{Binding Remark}" VerticalAlignment="Center" HorizontalAlignment="Center"
TextWrapping="Wrap"/>
<Border Width="1" Grid.Column="5" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Border Grid.Row="1" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>

3
BBWY.Client/Views/Order/OrderListControl.xaml
View File

@ -114,7 +114,8 @@
<ListBox x:Name="listbox_orerSku" ItemsSource="{Binding ItemList}"
Style="{StaticResource NoScrollViewListBoxStyle}"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}">
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
Foreground="{StaticResource Text.Color}">
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}">

Write Preview
Loading…
Cancel
Save