Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP

Audit.csproj

@@ -117,6 +117,7 @@
     <Reference Include="System.Security" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Services" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
     </Reference>

View/StuffView.xaml

@@ -97,10 +97,10 @@
                     <DataGridTextColumn Header="比重" Width="70" FontSize="15" Binding="{Binding GRAVITY}" MaxWidth="200" MinWidth="20" CanUserReorder="False"/>
                 </DataGrid.Columns>
             </DataGrid>
-            <RadioButton Content="染料" HorizontalAlignment="Left" Height="40" Margin="995,265,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1"/>
+            <RadioButton Content="染料" x:Name="Button_0" GroupName="button" BindingGroup="{Binding Button_ProductType}" HorizontalAlignment="Left" Height="40" Margin="995,265,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1"/>
-            <RadioButton Content="助剂" HorizontalAlignment="Left" Height="40" Margin="995,305,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1"/>
+            <RadioButton Content="助剂" x:Name="Button_1" GroupName="button" BindingGroup="{Binding Button_ProductType}" HorizontalAlignment="Left" Height="40" Margin="995,305,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1"/>
-            <RadioButton Content="粉体助剂" HorizontalAlignment="Left" Height="40" Margin="995,345,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1"/>
+            <RadioButton Content="粉体助剂" x:Name="Button_2" GroupName="button" BindingGroup="{Binding Button_ProductType}" HorizontalAlignment="Left" Height="40" Margin="995,345,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1"/>
-            <RadioButton Content="全部原料" HorizontalAlignment="Left" Height="40" Margin="995,385,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1"/>
+            <RadioButton Content="全部原料" x:Name="Button_all" GroupName="button" BindingGroup="{Binding Button_ProductType}" HorizontalAlignment="Left" Height="40" Margin="995,385,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1" IsChecked="True"/>
             <TextBox x:Name="stuff_ProductCode"   HorizontalAlignment="Left" Height="30" Margin="105,0,0,100" Text="" VerticalAlignment="Bottom" Width="130" FontSize="16" MaxLines="1" MaxLength="25" Grid.ColumnSpan="2"/>
             <TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,100" TextWrapping="Wrap" Text="原料代码" VerticalAlignment="Bottom" Width="100" FontSize="20"/>
             <TextBox x:Name="stuff_ProductName"   HorizontalAlignment="Left" Height="30" Margin="345,0,0,100" Text="" VerticalAlignment="Bottom" Width="200" FontSize="16" MaxLines="1" MaxLength="25" Grid.Column="1"/>

ViewModel/StuffViewModel.cs

@@ -2,10 +2,13 @@
 using Models;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Web.Services.Description;
 using System.Windows.Controls;
+using System.Windows.Data;
 
 namespace Audit.ViewModel
 {
@@ -32,7 +35,7 @@ namespace Audit.ViewModel
         }
 
         /// <summary>
-        /// 
+        /// StuffViewModel
         /// </summary>
         public StuffViewModel()
         {