10005

BBWYB.Client/ViewModels/Purchase/OnlinePurchaseViewModel.cs

@@ -77,7 +77,7 @@ namespace BBWYB.Client.ViewModels
         private string county;
         private string town;
         private string prucahseRemark;
-        private PurchaseOrderMode purchaseOrderMode = PurchaseOrderMode.代发;
+        private PurchaseOrderMode purchaseOrderMode = PurchaseOrderMode.批发;
 
         private IList<PurchaseScheme> schemeList;
         /// <summary>

BBWYB.Client/Views/MainWindow.xaml

@@ -24,7 +24,7 @@
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0">
                 <TextBlock Text="{Binding GlobalContext.User.Name}"/>
                 <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10004" Margin="5,0,0,0"/>
+                <TextBlock Text="v10005" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">

BBWYB.Client/Views/Order/OrderList.xaml

@@ -477,7 +477,42 @@
                                                Command="{Binding DataContext.OnlinePurchaseCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
                                                CommandParameter="{Binding }"
                                                Visibility="{Binding IsPurchased,ConverterParameter=false:Visible:Collapsed,Converter={StaticResource objConverter}}"/>
-                                    <StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"
+
+                                    <ListBox Grid.Column="1"
+                                             Visibility="{Binding IsPurchased,ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}"
+                                             ItemsSource="{Binding OrderPurchaseInfoList}"
+                                             ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
+                                             Style="{StaticResource NoScrollViewListBoxStyle}"
+                                             HorizontalAlignment="Center"
+                                             VerticalAlignment="Center">
+                                        <ListBox.ItemTemplate>
+                                            <DataTemplate>
+                                                <StackPanel Grid.Column="1" Margin="0,0,0,10">
+                                                    <TextBlock>
+                                                            <Run Text="采购方式:"/>
+                                                            <Run Text="{Binding PurchaseMethod}"/>
+                                                                    </TextBlock>
+                                                                    <TextBlock>
+                                                            <Run Text="采购平台:"/>
+                                                            <Run Text="{Binding PurchasePlatform}"/>
+                                                                    </TextBlock>
+                                                                    <TextBlock>
+                                                            <Run Text="采购商家:"/>
+                                                            <Run Text="{Binding PurchaserName}"/>
+                                                                    </TextBlock>
+                                                                    <TextBlock>
+                                                            <Run Text="采购账号:"/>
+                                                            <Run Text="{Binding PurchaseAccountName}"/>
+                                                                    </TextBlock>
+                                                                    <TextBlock>
+                                                            <Run Text="订单号:"/>
+                                                            <Run Text="{Binding PurchaseOrderId}"/>
+                                                    </TextBlock>
+                                                </StackPanel>
+                                            </DataTemplate>
+                                        </ListBox.ItemTemplate>
+                                    </ListBox>
+                                    <!--<StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"
                                                 Visibility="{Binding IsPurchased,ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}">
                                         <TextBlock>
                                             <Run Text="采购方式:"/>
@@ -499,7 +534,7 @@
                                             <Run Text="订单号:"/>
                                             <Run Text="{Binding OrderPurchaseInfo.PurchaseOrderId}"/>
                                         </TextBlock>
-                                    </StackPanel>
+                                    </StackPanel>-->
 
                                     <Border x:Name="bd_costbg" Background="#FCECEE" Grid.Column="2" Margin="0,0,1,0"
                                             Visibility="{Binding IsCostException,ConverterParameter=true:Visible:Collapsed}"/>