sc/Audit_APP
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP

Browse Source
This commit is contained in:
sc committed 2022-03-02 19:38:28 +08:00
2 parents b5c862069d f8b4451e53
commit 36da871e8d
2 files changed
+11 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

View/StuffView.xaml
+7 -3
View File
@@ -56,13 +56,17 @@
<DataGridTextColumn Header="原料名称" Width="200" FontSize="15" Binding="{Binding ProductName}" MaxWidth="300" MinWidth="200" CanUserReorder="False"/> <DataGridTextColumn Header="原料名称" Width="200" FontSize="15" Binding="{Binding ProductName}" MaxWidth="300" MinWidth="200" CanUserReorder="False"/>
<DataGridTextColumn Header="价格" Width="100" FontSize="15" Binding="{Binding Price}" MaxWidth="200" MinWidth="100" CanUserReorder="False"/> <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="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="80" FontSize="15" MaxWidth="200" MinWidth="70" CanUserReorder="False">
<DataGridTextColumn.ElementStyle>
<Style TargetType="{x:Type TextBlock}">
<Setter Property="Text" Value="{Binding Path=ProductType,Converter={StaticResource ProductTypeSQLConvert}}"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Header="色彩" Width="100" MaxWidth="500" Binding="{Binding Color}" MinWidth="50" CanUserReorder="False"> <DataGridTextColumn Header="色彩" Width="100" MaxWidth="500" MinWidth="50" CanUserReorder="False">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="{x:Type TextBlock}"> <Style TargetType="{x:Type TextBlock}">
<Setter Property="Background" Value="{Binding Path=Color,Converter={StaticResource ColorSQLConvert}}"/> <Setter Property="Background" Value="{Binding Path=Color,Converter={StaticResource ColorSQLConvert}}"/>
<Setter Property="Foreground" Value="{x:Null}"/>
</Style> </Style>
</DataGridTextColumn.ElementStyle> </DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
View/StuffView.xaml.cs
+4 -3
View File
@@ -55,13 +55,14 @@ namespace Audit.View
stuff_ProductCode.Text = DataGridStuff_ProductCode.ToString();//填入原料代码 stuff_ProductCode.Text = DataGridStuff_ProductCode.ToString();//填入原料代码
stuff_ProductName.Text = DataGridStuff_ProductName.ToString();//填入原料名称 stuff_ProductName.Text = DataGridStuff_ProductName.ToString();//填入原料名称
stuff_Price.Text = DataGridStuff_Price.ToString();//填入价格 stuff_Price.Text = DataGridStuff_Price.ToString();//填入价格
stuff_ProductType.Text = DataGridStuff_ProductType.ToString();//填入类型
stuff_ProductUnit.Text = DataGridStuff_ProductUnit.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_Concentration.Text = DataGridStuff_Concentration.ToString();//填入浓度
stuff_GRAVITY.Text = DataGridStuff_GRAVITY.ToString();//填入比重 stuff_GRAVITY.Text = DataGridStuff_GRAVITY.ToString();//填入比重
if (DataGridStuff_ProductType.ToString() == "0") stuff_ProductType.Text = "染料";//判断类型1-染料。2-助剂。3-粉体助剂。冰填入 //if (DataGridStuff_ProductType.ToString() == "0") stuff_ProductType.Text = "染料";//判断类型1-染料。2-助剂。3-粉体助剂。填入
if (DataGridStuff_ProductType.ToString() == "1") stuff_ProductType.Text = "助剂"; //if (DataGridStuff_ProductType.ToString() == "1") stuff_ProductType.Text = "助剂";
if (DataGridStuff_ProductType.ToString() == "2") stuff_ProductType.Text = "粉体助剂"; //if (DataGridStuff_ProductType.ToString() == "2") stuff_ProductType.Text = "粉体助剂";
if ((DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Background != null) //定位第5列选中行单元格，色彩，判断参数是否有效 if ((DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Background != null) //定位第5列选中行单元格，色彩，判断参数是否有效
{ {
stuff_Color.Background = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Background; //定位第5列选中行单元格，色彩，有效背景色传递至色彩框背景色 stuff_Color.Background = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Background; //定位第5列选中行单元格，色彩，有效背景色传递至色彩框背景色