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

View/StuffView.xaml

@@ -100,7 +100,7 @@
                     <DataGridTextColumn Header="原料类型" Width="80" FontSize="15" Binding="{Binding ProductType}" MaxWidth="200" MinWidth="70" CanUserReorder="False"/>
                     <DataGridTemplateColumn Header="色彩" Width="100" MaxWidth="500" MinWidth="50" CanUserReorder="False">
                         <DataGridTemplateColumn.CellTemplate>
-                            <DataTemplate>
+                            <DataTemplate x:Name="TextBlock1">
                                 <TextBlock Background="{Binding Path=Color,Converter={StaticResource ColorSQLConvert}}" Text="{Binding Color}" FontSize="15" Foreground="{x:Null}"/>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>

View/StuffView.xaml.cs

@@ -48,19 +48,25 @@ 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();//填入原料代码
             stuff_ProductName.Text = DataGridStuff_ProductName.ToString();//填入原料名称
             stuff_Price.Text = DataGridStuff_Price.ToString();//填入价格
             stuff_ProductUnit.Text = DataGridStuff_ProductUnit.ToString();//填入供应商           
-            stuff_Color.Text = DataGridStuff_Color.ToString();//填入色彩
+           // stuff_Color.Text = DataGridStuff_Color.ToString();//填入色彩
             stuff_Concentration.Text = DataGridStuff_Concentration.ToString();//填入浓度
             stuff_GRAVITY.Text = DataGridStuff_GRAVITY.ToString();//填入比重
             if (DataGridStuff_ProductType.ToString() == "0") stuff_ProductType.Text = "染料";//判断类型1-染料。2-助剂。3-粉体助剂。冰填入
             if (DataGridStuff_ProductType.ToString() == "1") stuff_ProductType.Text = "助剂";
             if (DataGridStuff_ProductType.ToString() == "2") stuff_ProductType.Text = "粉体助剂";
+            // stuff_Color.Background = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as System.Windows.Controls.DataGridCell).Background;
+            // FrameworkElement element = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum])).GetCellContent(item);
+            //DataGridTemplateColumn templeColumn = DataGridStuff.Columns[6] as DataGridTemplateColumn;
+            // object item = System.Windows.Forms.DataGrid.CurrentCell.Item;
+            //FrameworkElement element = templeColumn.GetCellContent(item);
+
         }
 
         private void Stuff_Color_MouseDoubleClick(object sender, MouseButtonEventArgs e)//色彩框双击事件