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

售后

qianyi
shanji 3 years ago
parent
dbd29557e8
commit
eb8df8f3ba
2 changed files with 51 additions and 2 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. 10
      BBWY.Client/Models/Order/OrderCost.cs
  2. 43
      BBWY.Client/Views/Order/OrderList.xaml

10
BBWY.Client/Models/Order/OrderCost.cs
View File

@ -54,6 +54,11 @@
/// </summary> /// </summary>
public decimal RefundAmount { get; set; } = 0.00M; public decimal RefundAmount { get; set; } = 0.00M;
/// <summary>
/// 退款采购金额
/// </summary>
public decimal RefundPurchaseAmount { get; set; } = 0.0M;
/// <summary> /// <summary>
/// 补发快递费 /// 补发快递费
/// </summary> /// </summary>
@ -69,6 +74,11 @@
/// </summary> /// </summary>
public decimal ReissueAfterSaleAmount { get; set; } = 0.00M; public decimal ReissueAfterSaleAmount { get; set; } = 0.00M;
/// <summary>
/// 补发总计
/// </summary>
public decimal TotalReissue { get { return ReissueFreight + ReissueProductAmount + ReissueAfterSaleAmount; } }
/// <summary> /// <summary>
/// 成本总计 /// 成本总计
/// </summary> /// </summary>

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

@ -552,6 +552,11 @@
</Path> </Path>
</StackPanel> </StackPanel>
<TextBlock Visibility="{Binding OrderCost.RefundAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"
Foreground="Red">
<Run Text="退款金额"/>
<Run Text="{Binding OrderCost.RefundAmount}"/>
</TextBlock>
<StackPanel x:Name="sp_orderCoupon" Orientation="Horizontal"> <StackPanel x:Name="sp_orderCoupon" Orientation="Horizontal">
<TextBlock> <TextBlock>
@ -686,6 +691,12 @@
</Path> </Path>
</StackPanel> </StackPanel>
<TextBlock Visibility="{Binding OrderCost.RefundPurchaseAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"
Foreground="Red">
<Run Text="退采金额"/>
<Run Text="{Binding OrderCost.RefundPurchaseAmount}"/>
</TextBlock>
<TextBlock> <TextBlock>
<Run Text="快递费用"/> <Run Text="快递费用"/>
<Run Text="{Binding OrderCost.DeliveryExpressFreight}"/> <Run Text="{Binding OrderCost.DeliveryExpressFreight}"/>
@ -702,13 +713,41 @@
<Run Text="{Binding OrderCost.SDCommissionAmount}"/> <Run Text="{Binding OrderCost.SDCommissionAmount}"/>
</TextBlock> </TextBlock>
<StackPanel Orientation="Horizontal"
Visibility="{Binding OrderCost.TotalReissue,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}">
<TextBlock>
<Run Text="补发总计"/>
<Run Text="{Binding OrderCost.TotalReissue,Mode=OneWay}"/>
</TextBlock>
<Path Style="{StaticResource path_question}" Width="14" Margin="5,0,0,0" Fill="#EC808D" ToolTipService.InitialShowDelay="0">
<Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<StackPanel>
<TextBlock>
<Run Text="补发快递成本"/>
<Run Text="{Binding OrderCost.ReissueFreight}"/>
</TextBlock>
<TextBlock>
<Run Text="补发货款成本"/>
<Run Text="{Binding OrderCost.ReissueProductAmount}"/>
</TextBlock>
<TextBlock>
<Run Text="售后补偿成本"/>
<Run Text="{Binding OrderCost.ReissueAfterSaleAmount}"/>
</TextBlock>
</StackPanel>
</ToolTip>
</Path.ToolTip>
</Path>
</StackPanel>
<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="3" VerticalAlignment="Bottom" Margin="0,0,0,25" <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Column="3" 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="3" VerticalAlignment="Bottom" <c:BButton x:Name="btn_editCost" Content="修改" Grid.Column="3" VerticalAlignment="Bottom"
Foreground="{StaticResource Text.Color}" Foreground="{StaticResource Text.Color}"
@ -718,7 +757,7 @@
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 }"
Visibility="{Binding StorageType,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}" Visibility="{Binding StorageType,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
Height="25"/> Height="23"/>
<StackPanel Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"> <StackPanel Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock> <TextBlock>

Write Preview
Loading…
Cancel
Save