Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP
This commit is contained in:
commit
75b03c5ac3
3 files changed
+11
-14
No files matched your search
@@ -62,7 +62,7 @@
|
||||
<Grid Grid.Row="1">
|
||||
<Grid Grid.Column="1">
|
||||
<ContentControl x:Name="ContentControl" Margin="0,31,0,0">
|
||||
<Label Content="统计" HorizontalAlignment="Left" Height="195" Margin="390,179,0,0" VerticalAlignment="Top" Width="530" FontSize="48"/>
|
||||
<Label Content="统计" HorizontalAlignment="Left" Height="195" Margin="390,179,0,0" VerticalAlignment="Top" Width="530" FontSize="48" Background="{x:Null}"/>
|
||||
</ContentControl>
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
+8
-7
@@ -98,13 +98,14 @@
|
||||
<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"/>
|
||||
<DataGridTemplateColumn Header="色彩" Width="100" MaxWidth="500" MinWidth="50" CanUserReorder="False">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate x:Name="TextBlock1">
|
||||
<TextBlock Background="{Binding Path=Color,Converter={StaticResource ColorSQLConvert}}" Text="{Binding Color}" FontSize="15" Foreground="{x:Null}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<DataGridTextColumn Header="色彩" Width="100" MaxWidth="500" Binding="{Binding Color}" MinWidth="50" CanUserReorder="False">
|
||||
<DataGridTextColumn.ElementStyle>
|
||||
<Style TargetType="{x:Type TextBlock}">
|
||||
<Setter Property="Background" Value="{Binding Path=Color,Converter={StaticResource ColorSQLConvert}}"/>
|
||||
<Setter Property="Foreground" Value="{x:Null}"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.ElementStyle>
|
||||
</DataGridTextColumn>
|
||||
<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>
|
||||
|
||||
@@ -51,21 +51,17 @@ 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);
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user