Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
This commit is contained in:
commit
2c46319d3c
6 files changed
+121
-27
No files matched your search
+13
-10
@@ -4,7 +4,9 @@
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:local="clr-namespace:formula_manage.Windows"
|
||||
xmlns:ConvertMoels="clr-namespace:formula_manage.ConvertMoels"
|
||||
xmlns:ConvertMoels="clr-namespace:formula_manage.ConvertMoels"
|
||||
xmlns:viewmodel="clr-namespace:formula_manage.ViewModel"
|
||||
DataContext="{Binding Source={StaticResource Locator},Path=Stuff}"
|
||||
mc:Ignorable="d"
|
||||
Title="Stuff" Height="720" Width="1100" BorderBrush="White" Background="#FFE0E0E0">
|
||||
<Window.Resources>
|
||||
@@ -17,7 +19,8 @@
|
||||
<DataGrid x:Name="DataGridStuff" MouseDoubleClick="DataGridStuff_MouseDoubleClick" SelectionMode="Single" AlternationCount="2" IsReadOnly="True"
|
||||
HorizontalAlignment="Left" Margin="15,15,0,150" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30"
|
||||
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"
|
||||
BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" CanUserReorderColumns="False">
|
||||
BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" CanUserReorderColumns="False"
|
||||
ItemsSource="{Binding Product, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
|
||||
<DataGrid.RowStyle >
|
||||
<Style TargetType="{x:Type DataGridRow}">
|
||||
<Style.Triggers>
|
||||
@@ -54,15 +57,15 @@
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<DataGridTextColumn Header="原料代码" Width="130" FontSize="15" MaxWidth="130" MinWidth="100" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="原料名称" Width="200" FontSize="15" MaxWidth="200" MinWidth="200" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="价格(¥/kg)" Width="100" FontSize="15" MaxWidth="100" MinWidth="100" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="供应商" Width="150" FontSize="15" MaxWidth="150" MinWidth="150" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="原料代码" Binding="{Binding ProductCode}" Width="130" FontSize="15" MaxWidth="130" MinWidth="100" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="原料名称" Binding="{Binding ProductName}" Width="200" FontSize="15" MaxWidth="200" MinWidth="200" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="价格(¥/kg)" Binding="{Binding Price}" Width="100" FontSize="15" MaxWidth="100" MinWidth="100" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="供应商" Binding="{Binding SUPPLIER}" Width="150" FontSize="15" MaxWidth="150" MinWidth="150" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="原料类型" Width="80" FontSize="15" MaxWidth="80" MinWidth="70" CanUserReorder="False">
|
||||
<!--事件名称:原料类型数字转文字显示,转换器ProductTypeSQLConvert-->
|
||||
<DataGridTextColumn.ElementStyle>
|
||||
<Style TargetType="{x:Type TextBlock}">
|
||||
<Setter Property="Text" Value="{Binding ProductType, Converter={StaticResource ProductTypeSQLConvert}}"/>
|
||||
<Setter Property="Text" Value="{Binding Path=ProductType, Converter={StaticResource ProductTypeSQLConvert}}"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.ElementStyle>
|
||||
</DataGridTextColumn>
|
||||
@@ -70,12 +73,12 @@
|
||||
<!--事件名称:色彩数字转色彩显示,转换器ColorSQLConvert-->
|
||||
<DataGridTextColumn.ElementStyle>
|
||||
<Style TargetType="{x:Type TextBlock}">
|
||||
<Setter Property="Background" Value="{Binding Color, Converter={StaticResource ColorSQLConvert}}"/>
|
||||
<Setter Property="Background" Value="{Binding Path=Color, Converter={StaticResource ColorSQLConvert}}"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.ElementStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Header="浓度(%)" Width="70" FontSize="15" MaxWidth="200" MinWidth="20" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="比重(sg)" Width="70" FontSize="15" MaxWidth="200" MinWidth="20" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="浓度(%)" Binding="{Binding Concentration}" Width="70" FontSize="15" MaxWidth="200" MinWidth="20" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="比重(sg)" Binding="{Binding GRAVITY}" Width="70" FontSize="15" MaxWidth="200" MinWidth="20" CanUserReorder="False"/>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
<!--搜索类型-->
|
||||
|
||||
@@ -12,7 +12,8 @@ using System.Windows.Input;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Media.Imaging;
|
||||
using System.Windows.Shapes;
|
||||
|
||||
using GalaSoft.MvvmLight;
|
||||
using formula_manage.SQLModels;
|
||||
|
||||
namespace formula_manage.Windows
|
||||
{
|
||||
@@ -24,10 +25,10 @@ namespace formula_manage.Windows
|
||||
public Stuff()
|
||||
{
|
||||
WindowStartupLocation = WindowStartupLocation.CenterScreen;
|
||||
InitializeComponent();
|
||||
|
||||
this.DataGridStuff.LoadingRow += new EventHandler<DataGridRowEventArgs>(this.DataGridEquipment_LoadingRow);//生成序列号
|
||||
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -38,9 +39,11 @@ namespace formula_manage.Windows
|
||||
e.Row.Header = e.Row.GetIndex() + 1;
|
||||
}
|
||||
|
||||
public static Boolean Button_sql = true;
|
||||
public static int Buttontype_sql = -1;
|
||||
private void Radiobutton(object sender, EventArgs e)
|
||||
{
|
||||
/* System.Windows.Controls.RadioButton Radiobutton = (sender as System.Windows.Controls.RadioButton);
|
||||
System.Windows.Controls.RadioButton Radiobutton = (sender as System.Windows.Controls.RadioButton);
|
||||
string radiobutton = Radiobutton.Content.ToString();
|
||||
if (radiobutton == "全部原料") Buttontype_sql = -1;
|
||||
if (radiobutton == "染料") Buttontype_sql = 0;
|
||||
@@ -48,7 +51,7 @@ namespace formula_manage.Windows
|
||||
if (radiobutton == "粉体助剂") Buttontype_sql = 2;
|
||||
if (radiobutton == "液体染料") Buttontype_sql = 3;
|
||||
Button_sql = true;
|
||||
*/ }
|
||||
}
|
||||
|
||||
private void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user