Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP

View/StuffView.xaml

@@ -96,7 +96,13 @@
                     <DataGridTextColumn Header="价格" Width="100" FontSize="15" Binding="{Binding Price}" MaxWidth="200" MinWidth="100" CanUserReorder="False"/>
                     <DataGridTextColumn Header="供应商" Width="150" FontSize="15" Binding="{Binding ProductUnit}" MaxWidth="250" MinWidth="150" CanUserReorder="False"/>
                     <DataGridTextColumn Header="原料类型" Width="80" FontSize="15" Binding="{Binding ProductType}" MaxWidth="200" MinWidth="70" CanUserReorder="False"/>
-                    <DataGridTextColumn Header="色彩" Width="100" FontSize="15" Binding="{Binding Color}" MaxWidth="500" MinWidth="50" CanUserReorder="False"/>
+                    <DataGridTemplateColumn Header="色彩" Width="100" MaxWidth="500" MinWidth="50" CanUserReorder="False">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBlock Background="{Binding}" Text="{Binding Color}" FontSize="15"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
                     <DataGridTextColumn Header="浓度" Width="70" FontSize="15" Binding="{Binding Concentration}" MaxWidth="200" MinWidth="20" CanUserReorder="False"/>
                     <DataGridTextColumn Header="比重" Width="70" FontSize="15" Binding="{Binding GRAVITY}" MaxWidth="200" MinWidth="20" CanUserReorder="False"/>
                 </DataGrid.Columns>

View/StuffView.xaml.cs

@@ -48,7 +48,7 @@ namespace Audit.View
             string DataGridStuff_Price = (DataGridStuff.Columns[3].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第2列选中行单元格，价格
             string DataGridStuff_ProductUnit = (DataGridStuff.Columns[4].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第3列选中行单元格，供应商           
             string DataGridStuff_ProductType = (DataGridStuff.Columns[5].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第4列选中行单元格，类型
-            string DataGridStuff_Color = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第5列选中行单元格，色彩
+         //   string DataGridStuff_Color = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第5列选中行单元格，色彩
             string DataGridStuff_Concentration = (DataGridStuff.Columns[7].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第6列选中行单元格，浓度
             string DataGridStuff_GRAVITY = (DataGridStuff.Columns[8].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第7列选中行单元格，比重
             stuff_ProductCode.Text = DataGridStuff_ProductCode.ToString();//填入原料代码