Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP
This commit is contained in:
commit
b5c862069d
4 files changed
+76
-16
No files matched your search
+3
-1
@@ -11,6 +11,7 @@
|
||||
xmlns:mah="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro">
|
||||
<UserControl.Resources>
|
||||
<Convert:ColorSQLConvert x:Key="ColorSQLConvert"/>
|
||||
<Convert:ProductTypeSQLConvert x:Key="ProductTypeSQLConvert"/>
|
||||
</UserControl.Resources>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
@@ -55,7 +56,8 @@
|
||||
<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="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" Binding="{Binding ProductType}" MaxWidth="200" MinWidth="70" CanUserReorder="False">
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Header="色彩" Width="100" MaxWidth="500" Binding="{Binding Color}" MinWidth="50" CanUserReorder="False">
|
||||
<DataGridTextColumn.ElementStyle>
|
||||
<Style TargetType="{x:Type TextBlock}">
|
||||
|
||||
Reference in new issue
Block a user