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

1

updatebug
shanji 2 years ago
parent
858c297be9
commit
e393ccf2db
1 changed files with 54 additions and 45 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. 97
      BBWYB.Client/Views/Order/OrderList.xaml

97
BBWYB.Client/Views/Order/OrderList.xaml
View File

@ -321,11 +321,11 @@
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="351"/> <ColumnDefinition Width="351"/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition Width="140"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition Width="98"/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="采购信息" Grid.Column="1" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="采购信息" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
@ -362,21 +362,29 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Background="#F2F2F2" Grid.ColumnSpan="2"> <Grid Background="#F2F2F2" Grid.ColumnSpan="2">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding OrderStartTime,StringFormat=yyyy-MM-dd HH:mm:ss}" VerticalAlignment="Center" Margin="5,0,0,0"/> <TextBlock Text="{Binding StartTime,StringFormat=yyyy-MM-dd HH:mm:ss}" VerticalAlignment="Center" Margin="5,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="订单号:" Margin="5,0,0,0" /> <TextBlock VerticalAlignment="Center" Text="订单号:" Margin="5,0,0,0" />
<c:BButton Content="{Binding Id}" Style="{StaticResource LinkButton}" <c:BButton Content="{Binding Id}" Style="{StaticResource LinkButton}"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding Id}" Margin="5,0,0,0"/> 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}"/> <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}"/> <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 VerticalAlignment="Center" Margin="5,0,0,0" Text="下单店铺:"/>
<c:BButton Style="{StaticResource LinkButton}" Content="{Binding SourceShopName}" Margin="5,0,0,0"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding SourceShopName}"/>
<TextBlock VerticalAlignment="Center" Margin="5,0,0,0" Text="下单Sku:"/>
<c:BButton Style="{StaticResource LinkButton}" Content="{Binding SourceSku}" Margin="5,0,0,0"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding SourceSku}"/>
<!--<StackPanel x:Name="txt_consignee" Margin="5,0,0,0" Orientation="Horizontal" VerticalAlignment="Center">
<TextBlock Text="收货人:"/> <TextBlock Text="收货人:"/>
<TextBox Text="{Binding Consignee.ContactName}" Foreground="{StaticResource Text.Color}" <TextBox Text="{Binding Consignee.ContactName}" Foreground="{StaticResource Text.Color}"
IsReadOnly="True" Background="Transparent" BorderThickness="0"/> IsReadOnly="True" Background="Transparent" BorderThickness="0"/>
<TextBlock Text="联系电话:" Margin="5,0,0,0"/> <TextBlock Text="联系电话:" Margin="5,0,0,0"/>
<TextBox Text="{Binding Consignee.Mobile}" Foreground="{StaticResource Text.Color}" <TextBox Text="{Binding Consignee.Mobile}" Foreground="{StaticResource Text.Color}"
IsReadOnly="True" Background="Transparent" BorderThickness="0"/> IsReadOnly="True" Background="Transparent" BorderThickness="0"/>
</StackPanel> </StackPanel>-->
</StackPanel> </StackPanel>
<Border VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/> <Border VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
@ -384,12 +392,12 @@
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="350"/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition Width="140"/>
<ColumnDefinition/> <ColumnDefinition Width="100"/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<!--<ColumnDefinition/>--> <!--<ColumnDefinition/>-->
<ColumnDefinition/> <ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<ListBox x:Name="listbox_orerSku" ItemsSource="{Binding ItemList}" <ListBox x:Name="listbox_orerSku" ItemsSource="{Binding ItemList}"
@ -516,18 +524,7 @@
</Path> </Path>
</StackPanel> </StackPanel>
<TextBlock Visibility="{Binding StorageType,ConverterParameter=SD:Visible:Collapsed,Converter={StaticResource objConverter}}"> <!--<Path Style="{StaticResource path_question}" Width="14" Margin="5,0,0,0" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
<Run Text="实付金额"/>
<Run Text="{Binding OrderPayment,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"/>
</TextBlock>
<StackPanel x:Name="sp_orderCoupon" Orientation="Horizontal">
<TextBlock>
<Run Text="优惠金额"/>
<Run Text="{Binding PreferentialAmount}"/>
</TextBlock>
<Path Style="{StaticResource path_question}" Width="14" Margin="5,0,0,0" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
<Path.ToolTip> <Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}"> <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<ListBox ItemsSource="{Binding OrderCouponList}" <ListBox ItemsSource="{Binding OrderCouponList}"
@ -544,7 +541,7 @@
</ToolTip> </ToolTip>
</Path.ToolTip> </Path.ToolTip>
</Path> </Path>
</StackPanel> </StackPanel>-->
<StackPanel x:Name="sp_purchaseAmount" Orientation="Horizontal"> <StackPanel x:Name="sp_purchaseAmount" Orientation="Horizontal">
<TextBlock> <TextBlock>
@ -553,34 +550,28 @@
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
<TextBlock>
<Run Text="平台扣点"/>
<Run Text="{Binding OrderCost.PlatformCommissionAmount}"/>
<Run Text="{Binding OrderCost.PlatformCommissionRatio,StringFormat=({0:P})}"/>
</TextBlock>
<TextBlock> <TextBlock>
<Run Text="成本总计"/> <Run Text="成本总计"/>
<Run Text="{Binding OrderCost.TotalCost,Mode=OneWay}"/> <Run Text="{Binding OrderCost.TotalCost,Mode=OneWay}"/>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
<Border Height="1" Background="{StaticResource Border.Brush}" Grid.Column="2" VerticalAlignment="Bottom" Margin="0,0,0,23" <!--<Border Height="1" Background="{StaticResource Border.Brush}" Grid.Column="2" VerticalAlignment="Bottom" Margin="0,0,0,23"
Visibility="{Binding Visibility,ElementName=btn_editCost}"/> Visibility="{Binding Visibility,ElementName=btn_editCost}"/>-->
<c:BButton x:Name="btn_editCost" Content="修改" Grid.Column="2" VerticalAlignment="Bottom" <!--<c:BButton x:Name="btn_editCost" Content="修改" Grid.Column="2" VerticalAlignment="Bottom"
Foreground="{StaticResource Text.Color}" Foreground="{StaticResource Text.Color}"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Background="White" Background="White"
Margin="0,0,1,0" Margin="0,0,1,0"
Command="{Binding DataContext.EditCostCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" Command="{Binding DataContext.EditCostCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
CommandParameter="{Binding }" CommandParameter="{Binding }"
Height="23"/> Height="23"/>-->
<StackPanel Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"> <StackPanel Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock> <TextBlock>
<Run Text="毛利"/> <Run Text="利润"/>
<Run Text="{Binding OrderCost.Profit}"/> <Run Text="{Binding OrderCost.Profit}"/>
</TextBlock> </TextBlock>
<TextBlock> <!--<TextBlock>
<Run Text="销售毛利率"/> <Run Text="销售毛利率"/>
<Run> <Run>
<Run.Text> <Run.Text>
@ -590,23 +581,44 @@
</MultiBinding> </MultiBinding>
</Run.Text> </Run.Text>
</Run> </Run>
</TextBlock> </TextBlock>-->
<TextBlock> <TextBlock>
<Run Text="成本毛利率"/> <Run Text="利润率"/>
<Run Text="{Binding OrderCost.ProfitRatio,Mode=OneWay,StringFormat=\{0\}%}"/> <Run Text="{Binding OrderCost.ProfitRatio,Mode=OneWay,StringFormat=\{0\}%}"/>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
<Grid x:Name="sp_store" Grid.Column="4"> <Grid x:Name="sp_store" Grid.Column="4">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"> <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock <StackPanel Orientation="Horizontal"
Text="{Binding ExpressName}" Visibility="{Binding WaybillNo,ConverterParameter=#null:Collapsed:Visible,Converter={StaticResource objConverter}}">
TextWrapping="Wrap" <TextBlock Text="{Binding ExpressName}" TextWrapping="Wrap"/>
HorizontalAlignment="Center"/> <!--{Binding ExpressName}-->
<!--{Binding WaybillNo}-->
<c:BButton Style="{StaticResource LinkButton}" <c:BButton Style="{StaticResource LinkButton}"
Content="{Binding WaybillNo}" Content="{Binding WaybillNo}"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding WaybillNo}"/> CommandParameter="{Binding WaybillNo}"
Margin="10,0,0,0"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock>
<Run Text="收货人:" Foreground="Black"/>
<Run Text="{Binding Consignee.ContactName}"/>
</TextBlock>
<TextBlock Margin="10,0,0,0">
<Run Text="联系方式:" Foreground="Black"/>
<Run Text="{Binding Consignee.Mobile}"/>
</TextBlock>
</StackPanel>
<TextBlock TextWrapping="Wrap">
<Run Text="收货地址:" Foreground="Black"/>
<Run Text="{Binding Consignee.Address}"/>
</TextBlock>
</StackPanel> </StackPanel>
<c:BButton x:Name="btn_outStore" Content="出库" VerticalAlignment="Bottom" <c:BButton x:Name="btn_outStore" Content="出库" VerticalAlignment="Bottom"
Foreground="{StaticResource Text.Color}" Foreground="{StaticResource Text.Color}"
@ -654,9 +666,6 @@
<DataTrigger Binding="{Binding VenderRemark}" Value=""> <DataTrigger Binding="{Binding VenderRemark}" Value="">
<Setter TargetName="btn_copyVenderRemark" Property="Visibility" Value="Collapsed"/> <Setter TargetName="btn_copyVenderRemark" Property="Visibility" Value="Collapsed"/>
</DataTrigger> </DataTrigger>
<DataTrigger Binding="{Binding PreferentialAmount}" Value="0">
<Setter TargetName="sp_orderCoupon" Property="Visibility" Value="Collapsed"/>
</DataTrigger>
<DataTrigger Binding="{Binding OrderState}" Value="已取消"> <DataTrigger Binding="{Binding OrderState}" Value="已取消">
<Setter TargetName="btn_orderState" Property="Background" Value="#EC808D"/> <Setter TargetName="btn_orderState" Property="Background" Value="#EC808D"/>
</DataTrigger> </DataTrigger>

Write Preview
Loading…
Cancel
Save