Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage

Windows/Stuff.xaml

@@ -20,8 +20,7 @@
                   HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" 
                   BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" CanUserReorderColumns="False"
                   CanUserResizeRows="False"  CanUserSortColumns="False" CanUserResizeColumns="False"
-                  CanUserAddRows="False" CanUserDeleteRows="False"
-                  ItemsSource="{Binding Mode=OneWay}">
+                  CanUserAddRows="False" CanUserDeleteRows="False">
             <DataGrid.RowStyle >
                 <Style TargetType="{x:Type DataGridRow}">
                     <Style.Triggers>
@@ -66,8 +65,7 @@
                     <!--事件名称：原料类型数字转文字显示，转换器ProductTypeSQLConvert-->
                   <DataGridTextColumn.ElementStyle>
                         <Style TargetType="{x:Type TextBlock}">
-                            <!--        <Setter Property="Text" Value="{Binding ProductType, Converter={StaticResource ProductTypeSQLConvert}}"/>
-                           -->
+                            <Setter Property="Text" Value="{Binding ProductType, Converter={StaticResource ProductTypeSQLConvert}}"/>
                         </Style>
                   </DataGridTextColumn.ElementStyle>
                 </DataGridTextColumn>
@@ -75,8 +73,8 @@
                     <!--事件名称：色彩数字转色彩显示，转换器ColorSQLConvert-->
                   <DataGridTextColumn.ElementStyle>
                         <Style TargetType="{x:Type TextBlock}">
-                            <!--      <Setter Property="Background"  Value="{Binding Color, Converter={StaticResource ColorSQLConvert}}"/>
-                      -->    </Style>
+                            <Setter Property="Background"  Value="{Binding Color, Converter={StaticResource ColorSQLConvert}}"/>
+                        </Style>
                   </DataGridTextColumn.ElementStyle>
               </DataGridTextColumn>
               <DataGridTextColumn Header="浓度(%)" Binding="{Binding Concentration}" Width="70" FontSize="15" MaxWidth="200" MinWidth="20" CanUserReorder="False"/>

Windows/Stuff.xaml.cs

@@ -67,18 +67,18 @@ namespace formula_manage.Windows
             {
                 await conn_SC.OpenAsync();    //打开数据连接
                 SqlDataAdapter Stuff_data = new SqlDataAdapter(Stuff_sql,Connstr_SC);   //查询
-                DataSet Stuff_DataSet = new DataSet();       //建立缓存
-                Stuff_data.Fill(Stuff_DataSet);       //查询结果存入缓存
+
+                DataTable dataTable = new DataTable();   //建立缓存
+                Stuff_data.Fill(dataTable);    //查询结果存入缓存  
                 conn_SC.Close();  //关闭连接
 
-                // DataGridStuff.ItemsSource =  Stuff_DataSet.DefaultViewManager;
+                DataGridStuff.ItemsSource = dataTable.DefaultView; //数据加入表格
             }
             catch (Exception)
             {
                 System.Windows.MessageBox.Show("请求原料信息失败，检查连接");
                 return;
             }      
-          
         }
          
         /// <summary>