From e393ccf2dbd0f9ea86812ed3e5bea26e0bd16b07 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Wed, 19 Apr 2023 22:58:40 +0800
Subject: [PATCH] 1

---
 BBWYB.Client/Views/Order/OrderList.xaml | 99 ++++++++++++++-----------
 1 file changed, 54 insertions(+), 45 deletions(-)

diff --git a/BBWYB.Client/Views/Order/OrderList.xaml b/BBWYB.Client/Views/Order/OrderList.xaml
index 55207c5..66cd27f 100644
--- a/BBWYB.Client/Views/Order/OrderList.xaml
+++ b/BBWYB.Client/Views/Order/OrderList.xaml
@@ -321,11 +321,11 @@
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="351"/>
                             <ColumnDefinition/>
+                            <ColumnDefinition Width="140"/>
+                            <ColumnDefinition Width="100"/>
                             <ColumnDefinition/>
                             <ColumnDefinition/>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
+                            <ColumnDefinition Width="98"/>
                         </Grid.ColumnDefinitions>
                         <TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
                         <TextBlock Text="采购信息" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
@@ -362,21 +362,29 @@
                                 </Grid.RowDefinitions>
                                 <Grid Background="#F2F2F2" Grid.ColumnSpan="2">
                                     <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" />
                                         <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 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="收货人:"/>
                                             <TextBox Text="{Binding Consignee.ContactName}" Foreground="{StaticResource Text.Color}" 
                                                  IsReadOnly="True" Background="Transparent" BorderThickness="0"/>
                                             <TextBlock Text="联系电话:" Margin="5,0,0,0"/>
                                             <TextBox Text="{Binding Consignee.Mobile}" Foreground="{StaticResource Text.Color}"
                                                  IsReadOnly="True" Background="Transparent" BorderThickness="0"/>
-                                        </StackPanel>
+                                        </StackPanel>-->
                                     </StackPanel>
                                     <Border VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
                                 </Grid>
@@ -384,12 +392,12 @@
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="350"/>
                                         <ColumnDefinition/>
-                                        <ColumnDefinition/>
-                                        <ColumnDefinition/>
+                                        <ColumnDefinition Width="140"/>
+                                        <ColumnDefinition Width="100"/>
                                         <ColumnDefinition/>
                                         <ColumnDefinition/>
                                         <!--<ColumnDefinition/>-->
-                                        <ColumnDefinition/>
+                                        <ColumnDefinition Width="100"/>
                                     </Grid.ColumnDefinitions>
 
                                     <ListBox x:Name="listbox_orerSku" ItemsSource="{Binding ItemList}"
@@ -516,18 +524,7 @@
                                             </Path>
                                         </StackPanel>
 
-                                        <TextBlock Visibility="{Binding StorageType,ConverterParameter=SD:Visible:Collapsed,Converter={StaticResource objConverter}}">
-                                         <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 Style="{StaticResource path_question}" Width="14" Margin="5,0,0,0" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
                                                 <Path.ToolTip>
                                                     <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
                                                         <ListBox ItemsSource="{Binding OrderCouponList}"
@@ -544,7 +541,7 @@
                                                     </ToolTip>
                                                 </Path.ToolTip>
                                             </Path>
-                                        </StackPanel>
+                                        </StackPanel>-->
 
                                         <StackPanel x:Name="sp_purchaseAmount" Orientation="Horizontal">
                                             <TextBlock>
@@ -553,34 +550,28 @@
                                             </TextBlock>
                                         </StackPanel>
 
-                                        <TextBlock>
-                                        <Run Text="平台扣点"/>
-                                        <Run Text="{Binding OrderCost.PlatformCommissionAmount}"/>
-                                        <Run Text="{Binding OrderCost.PlatformCommissionRatio,StringFormat=({0:P})}"/>
-                                        </TextBlock>
-
                                         <TextBlock>
                                             <Run Text="成本总计"/>
                                             <Run Text="{Binding OrderCost.TotalCost,Mode=OneWay}"/>
                                         </TextBlock>
                                     </StackPanel>
-                                    <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Column="2" VerticalAlignment="Bottom" Margin="0,0,0,23"
-                                        Visibility="{Binding Visibility,ElementName=btn_editCost}"/>
-                                    <c:BButton x:Name="btn_editCost" Content="修改" Grid.Column="2" VerticalAlignment="Bottom"
+                                    <!--<Border Height="1" Background="{StaticResource Border.Brush}" Grid.Column="2" VerticalAlignment="Bottom" Margin="0,0,0,23"
+                                        Visibility="{Binding Visibility,ElementName=btn_editCost}"/>-->
+                                    <!--<c:BButton x:Name="btn_editCost" Content="修改" Grid.Column="2" VerticalAlignment="Bottom"
                                                Foreground="{StaticResource Text.Color}"
                                                HorizontalAlignment="Stretch"
                                                Background="White"
                                                Margin="0,0,1,0"
                                                Command="{Binding DataContext.EditCostCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
                                                CommandParameter="{Binding }"
-                                               Height="23"/>
+                                               Height="23"/>-->
 
                                     <StackPanel Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center">
                                         <TextBlock>
-                                        <Run Text="毛利"/>
+                                        <Run Text="利润"/>
                                         <Run Text="{Binding OrderCost.Profit}"/>
                                         </TextBlock>
-                                        <TextBlock>
+                                        <!--<TextBlock>
                                         <Run Text="销售毛利率"/>
                                         <Run>
                                             <Run.Text>
@@ -590,23 +581,44 @@
                                                 </MultiBinding>
                                             </Run.Text>
                                         </Run>
-                                        </TextBlock>
+                                        </TextBlock>-->
                                         <TextBlock>
-                                        <Run Text="成本毛利率"/>
+                                        <Run Text="利润率"/>
                                         <Run Text="{Binding OrderCost.ProfitRatio,Mode=OneWay,StringFormat=\{0\}%}"/>
                                         </TextBlock>
                                     </StackPanel>
 
                                     <Grid x:Name="sp_store" Grid.Column="4">
                                         <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                                            <TextBlock
-                                               Text="{Binding ExpressName}" 
-                                               TextWrapping="Wrap"
-                                               HorizontalAlignment="Center"/>
-                                            <c:BButton Style="{StaticResource LinkButton}" 
+                                            <StackPanel Orientation="Horizontal"
+                                                        Visibility="{Binding WaybillNo,ConverterParameter=#null:Collapsed:Visible,Converter={StaticResource objConverter}}">
+                                                <TextBlock Text="{Binding ExpressName}" TextWrapping="Wrap"/>
+                                                <!--{Binding ExpressName}-->
+                                                <!--{Binding WaybillNo}-->
+
+                                                
+                                                <c:BButton Style="{StaticResource LinkButton}" 
                                                    Content="{Binding WaybillNo}" 
                                                    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>
                                         <c:BButton x:Name="btn_outStore" Content="出库" VerticalAlignment="Bottom"
                                            Foreground="{StaticResource Text.Color}"
@@ -654,9 +666,6 @@
                                 <DataTrigger Binding="{Binding VenderRemark}" Value="">
                                     <Setter TargetName="btn_copyVenderRemark" Property="Visibility" Value="Collapsed"/>
                                 </DataTrigger>
-                                <DataTrigger Binding="{Binding PreferentialAmount}" Value="0">
-                                    <Setter TargetName="sp_orderCoupon" Property="Visibility" Value="Collapsed"/>
-                                </DataTrigger>
                                 <DataTrigger Binding="{Binding OrderState}" Value="已取消">
                                     <Setter TargetName="btn_orderState" Property="Background" Value="#EC808D"/>
                                 </DataTrigger>