diff --git a/View/StatisticsView.xaml b/View/StatisticsView.xaml
index 5986b1d..e33a5ec 100644
--- a/View/StatisticsView.xaml
+++ b/View/StatisticsView.xaml
@@ -62,7 +62,7 @@
-
+
diff --git a/View/StuffView.xaml b/View/StuffView.xaml
index 6f09ce7..2ffed78 100644
--- a/View/StuffView.xaml
+++ b/View/StuffView.xaml
@@ -98,13 +98,14 @@
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/View/StuffView.xaml.cs b/View/StuffView.xaml.cs
index 216b6f8..5b9e825 100644
--- a/View/StuffView.xaml.cs
+++ b/View/StuffView.xaml.cs
@@ -51,22 +51,18 @@ namespace Audit.View
//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_Color.Background = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Background;//定位第5列选中行单元格,色彩,背景色传递至色彩框背景色
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)//色彩框双击事件