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

1

qianyi
shanji 2 years ago
parent
01adcce7cf
commit
5fdecbdb69
2 changed files with 40 additions and 5 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. 43
      BBWY.Client/Views/Ware/WareManager.xaml
  2. 2
      BBWY.Server.Business/PlatformSDK/JDBusiness.cs

43
BBWY.Client/Views/Ware/WareManager.xaml
View File

@ -112,7 +112,6 @@
<c:BButton HorizontalAlignment="Right" Content="添加采购商" Width="110" <c:BButton HorizontalAlignment="Right" Content="添加采购商" Width="110"
Command="{Binding DataContext.AddPurchaserCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}" CommandParameter="{Binding }"/> Command="{Binding DataContext.AddPurchaserCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}" CommandParameter="{Binding }"/>
</Grid> </Grid>
<!--<Border Grid.ColumnSpan="2" BorderBrush="{StaticResource Border.Brush}" BorderThickness="0,0,0,1"/>-->
<ListBox x:Name="listbox_sku" Grid.Row="1" ItemsSource="{Binding SkuList}" <ListBox x:Name="listbox_sku" Grid.Row="1" ItemsSource="{Binding SkuList}"
Style="{StaticResource NoScrollViewListBoxStyle}" Style="{StaticResource NoScrollViewListBoxStyle}"
@ -122,11 +121,12 @@
BorderBrush="{StaticResource Border.Brush}"> BorderBrush="{StaticResource Border.Brush}">
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource Border.Brush}" <Border BorderThickness="0,0,0,0" BorderBrush="{StaticResource Border.Brush}"
Width="{Binding ActualWidth,ElementName=listbox_sku}"> Width="{Binding ActualWidth,ElementName=listbox_sku}">
<Grid Height="150"> <Grid Height="150">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!--SKU信息--> <!--SKU信息-->
@ -157,7 +157,7 @@
<!--采购方案--> <!--采购方案-->
<ListBox x:Name="listbox_purchaseSchemeList" ItemsSource="{Binding PurchaseSchemeList}" <ListBox x:Name="listbox_purchaseSchemeList" ItemsSource="{Binding PurchaseSchemeList}"
Grid.Column="1" Grid.Column="2"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
BorderThickness="1,0" BorderThickness="1,0"
BorderBrush="{StaticResource Border.Brush}" BorderBrush="{StaticResource Border.Brush}"
@ -220,6 +220,9 @@
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
</ListBox> </ListBox>
<Border Height="1" VerticalAlignment="Bottom" Background="{StaticResource Border.Brush}"/>
<Border Grid.Column="2" Height="1" VerticalAlignment="Bottom" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
</Border> </Border>
@ -227,6 +230,38 @@
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
</ListBox> </ListBox>
<ListBox x:Name="listbox_purchasePlatform" ItemsSource="{Binding PurchasePlatformList}"
SelectedItem="{Binding SelectedPurchasePlatformModel,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource NoScrollViewListBoxStyle}"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
Grid.Row="1"
Width="80"
HorizontalAlignment="Left"
Margin="300,0,0,0" BorderThickness="1,0,0,1" BorderBrush="{StaticResource Border.Brush}">
<ListBox.ItemTemplate>
<DataTemplate>
<Grid x:Name="grid_purchasePlatform" Width="{Binding ActualWidth,ElementName=listbox_purchasePlatform,Converter={StaticResource widthConverter},ConverterParameter=7}" Margin="5,5,5,0" Height="25"
Background="{StaticResource Button.Normal.Background}">
<TextBlock x:Name="txt_Platform" Text="{Binding PurchasePlatform}" HorizontalAlignment="Center" VerticalAlignment="Center"
Foreground="{StaticResource Text.Color}"/>
<b:Interaction.Triggers>
<b:EventTrigger EventName="MouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.SwitchStorageTypeCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
CommandParameter="{Binding }"/>
</b:EventTrigger>
</b:Interaction.Triggers>
</Grid>
<DataTemplate.Triggers>
<DataTrigger Binding="{Binding IsSelected,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBoxItem}}}"
Value="True">
<Setter TargetName="grid_purchasePlatform" Property="Background" Value="{StaticResource Button.Selected.Background}"/>
<Setter TargetName="txt_Platform" Property="Foreground" Value="White"/>
</DataTrigger>
</DataTemplate.Triggers>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<ListBox x:Name="listbox_purchaser" ItemsSource="{Binding PurchaserList}" <ListBox x:Name="listbox_purchaser" ItemsSource="{Binding PurchaserList}"
Grid.Row="1" Grid.Column="1" Grid.Row="1" Grid.Column="1"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"

2
BBWY.Server.Business/PlatformSDK/JDBusiness.cs
View File

@ -411,7 +411,7 @@ namespace BBWY.Server.Business
return jarray.Select(j => new LogisticsResponse() return jarray.Select(j => new LogisticsResponse()
{ {
Id = j.Value<string>("id"), Id = j.Value<string>("id"),
Name = j.Value<string>("name"), Name = j.Value<string>("name").Trim(),
}).ToList(); }).ToList();
} }

Write Preview
Loading…
Cancel
Save