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

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

Browse Source
This commit is contained in:
sc committed 2022-02-23 19:40:31 +08:00
2 parents 595c5a7777 2e4d9abb7e
commit 4fd6a7c023
2 files changed
+9 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

View/StuffView.xaml
+1 -1
View File
@@ -112,7 +112,7 @@
<ComboBoxItem Content="粉体助剂"></ComboBoxItem> <ComboBoxItem Content="粉体助剂"></ComboBoxItem>
</ComboBox> </ComboBox>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="560,0,0,100" TextWrapping="Wrap" Text="原料类型" VerticalAlignment="Bottom" Width="100" FontSize="20"/> <TextBlock HorizontalAlignment="Left" Height="30" Margin="560,0,0,100" TextWrapping="Wrap" Text="原料类型" VerticalAlignment="Bottom" Width="100" FontSize="20"/>
<TextBox x:Name="stuff_Color" HorizontalAlignment="Left" Height="30" Margin="445,0,0,50" Text="" VerticalAlignment="Bottom" Width="80" FontSize="16" MaxLines="1" MaxLength="25" TextChanged="stuff_Color_TextChanged"/> <TextBox x:Name="stuff_Color" MouseDoubleClick="stuff_Color_MouseDoubleClick" HorizontalAlignment="Left" Height="30" Margin="445,0,0,50" Text="" VerticalAlignment="Bottom" Width="80" FontSize="16" MaxLines="1" MaxLength="25" IsReadOnly="True"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="400,0,0,50" TextWrapping="Wrap" Text="色彩" VerticalAlignment="Bottom" Width="50" FontSize="20"/> <TextBlock HorizontalAlignment="Left" Height="30" Margin="400,0,0,50" TextWrapping="Wrap" Text="色彩" VerticalAlignment="Bottom" Width="50" FontSize="20"/>
<TextBox x:Name="stuff_ProductUnit" HorizontalAlignment="Left" Height="30" Margin="105,0,0,50" Text="" VerticalAlignment="Bottom" Width="130" FontSize="16" MaxLines="1" MaxLength="25"/> <TextBox x:Name="stuff_ProductUnit" HorizontalAlignment="Left" Height="30" Margin="105,0,0,50" Text="" VerticalAlignment="Bottom" Width="130" FontSize="16" MaxLines="1" MaxLength="25"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,50" TextWrapping="Wrap" Text="供应商" VerticalAlignment="Bottom" Width="80" FontSize="20"/> <TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,50" TextWrapping="Wrap" Text="供应商" VerticalAlignment="Bottom" Width="80" FontSize="20"/>
View/StuffView.xaml.cs
+8 -11
View File
@@ -38,14 +38,6 @@ namespace Audit.View
private void Button_Delete(object sender, RoutedEventArgs e) private void Button_Delete(object sender, RoutedEventArgs e)
{ {
System.Windows.Forms.ColorDialog colorDialog = new System.Windows.Forms.ColorDialog();
if (colorDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
// System.Drawing.SolidBrush sb = new System.Drawing.SolidBrush(color);
// SolidColorBrush solidColorBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(sb.Color.A, sb.Color.R, sb.Color.G, sb.Color.B));
// TextBox.stuff_Color.Background = solidColorBrush;
}
} }
private void DataGridStuff_MouseDoubleClick(object sender, MouseButtonEventArgs e) private void DataGridStuff_MouseDoubleClick(object sender, MouseButtonEventArgs e)
@@ -71,11 +63,16 @@ namespace Audit.View
if (DataGridStuff_ProductType.ToString() == "2") stuff_ProductType.Text = "粉体助剂"; if (DataGridStuff_ProductType.ToString() == "2") stuff_ProductType.Text = "粉体助剂";
} }
private void stuff_Color_TextChanged(object sender, TextChangedEventArgs e) private void stuff_Color_MouseDoubleClick(object sender, MouseButtonEventArgs e)//色彩框双击事件
{ {
ColorDialog colorDialog = new ColorDialog(); System.Windows.Forms.ColorDialog colorDialog = new System.Windows.Forms.ColorDialog();//打开调色盘页面
if (colorDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
// System.Drawing.SolidBrush sb = new System.Drawing.SolidBrush(color);
// SolidColorBrush solidColorBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(sb.Color.A, sb.Color.R, sb.Color.G, sb.Color.B));
// TextBox.stuff_Color.Background = solidColorBrush;
}
} }
} }
} }