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 authored and sc committed 2022-02-22 23:19:16 +08:00
2 parents 2a6b0dff00 3436d168fd
commit 595c5a7777
3 files changed
+24 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Audit.csproj
+2
View File
@@ -113,11 +113,13 @@
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
</Reference>
View/StuffView.xaml
+4 -3
View File
@@ -4,6 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Audit.View"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
mc:Ignorable="d" DataContext="{Binding Source={StaticResource Locator},Path=Stuff}"
d:DesignHeight="900" d:DesignWidth="1140"
xmlns:mah="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro">
@@ -111,11 +112,11 @@
<ComboBoxItem Content="粉体助剂"></ComboBoxItem>
</ComboBox>
<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="465,0,0,50" Text="" VerticalAlignment="Bottom" Width="60" FontSize="16" MaxLines="1" MaxLength="25"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="420,0,0,50" TextWrapping="Wrap" Text="色彩" VerticalAlignment="Bottom" Width="50" 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"/>
<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"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,50" TextWrapping="Wrap" Text="供应商" VerticalAlignment="Bottom" Width="80" FontSize="20"/>
<TextBox x:Name="stuff_Price" HorizontalAlignment="Left" Height="30" Margin="305,0,0,50" Text="" VerticalAlignment="Bottom" Width="100" FontSize="16" MaxLines="1" MaxLength="25"/>
<TextBox x:Name="stuff_Price" HorizontalAlignment="Left" Height="30" Margin="305,0,0,50" Text="" VerticalAlignment="Bottom" Width="80" FontSize="16" MaxLines="1" MaxLength="25"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="255,0,0,50" TextWrapping="Wrap" Text="价格" VerticalAlignment="Bottom" Width="45" FontSize="20"/>
<TextBox x:Name="stuff_Concentration" HorizontalAlignment="Left" Height="30" Margin="585,0,0,50" Text="" VerticalAlignment="Bottom" Width="50" FontSize="16" MaxLines="1" MaxLength="25"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="540,0,0,50" TextWrapping="Wrap" Text="浓度" VerticalAlignment="Bottom" Width="45" FontSize="20"/>
View/StuffView.xaml.cs
+18 -1
View File
@@ -12,13 +12,15 @@ using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Forms;
using System.Drawing;
namespace Audit.View
{
/// <summary>
/// StuffView.xaml 的交互逻辑
/// </summary>
public partial class StuffView : UserControl
public partial class StuffView : System.Windows.Controls.UserControl
{
/// <summary>
/// StuffView
@@ -36,6 +38,14 @@ namespace Audit.View
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)
@@ -60,5 +70,12 @@ namespace Audit.View
if (DataGridStuff_ProductType.ToString() == "1") stuff_ProductType.Text = "助剂";
if (DataGridStuff_ProductType.ToString() == "2") stuff_ProductType.Text = "粉体助剂";
}
private void stuff_Color_TextChanged(object sender, TextChangedEventArgs e)
{
ColorDialog colorDialog = new ColorDialog();
}
}
}