1

BBWY.Client/Views/MainWindow.xaml

@@ -26,7 +26,7 @@
                 <!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/>
                 <TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>-->
                 <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10059" Margin="5,0,0,0"/>
+                <TextBlock Text="v10060" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">

BBWY.Client/Views/Order/OrderList.xaml

@@ -167,10 +167,18 @@
                         </TextBlock>
                     </c:BButton.Content>
                 </c:BButton>
-                <c:BButton Content="待出库" Width="100" 
+                <c:BButton Width="100" 
                            Background="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待出库:#8080FF:#F2F2F2}"
                            Foreground="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待出库:White:#4A4A4A}"
-                           Command="{Binding SetOrderStateCommand}" CommandParameter="{x:Static cmodel:OrderState.待出库}"/>
+                           Command="{Binding SetOrderStateCommand}" CommandParameter="{x:Static cmodel:OrderState.待出库}">
+                    <c:BButton.Content>
+                        <TextBlock>
+                            <Run Text="待出库"/>
+                            <Run Text="{Binding WaitOutStoreCount,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+                                 Foreground="{StaticResource Text.Pink}"/>
+                        </TextBlock>
+                    </c:BButton.Content>
+                </c:BButton>
                 <c:BButton Content="待收货" Width="100" 
                            Background="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待收货:#8080FF:#F2F2F2}"
                            Foreground="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待收货:White:#4A4A4A}"