Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP
This commit is contained in:
commit
3323285542
6 files changed
+52
-9
No files matched your search
+1
-1
@@ -17,7 +17,7 @@
|
||||
<Grid Grid.Row="1">
|
||||
<DataGrid HorizontalAlignment="Left" Margin="15,15,0,150" VerticalAlignment="Stretch" Width="300" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="Black" VerticalGridLinesBrush="Black" GridLinesVisibility="All" SelectionChanged="DataGrid_Directory" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="工单" Width="160" FontSize="25"/>
|
||||
<DataGridTextColumn Header="工单" Width="160" FontSize="25" />
|
||||
<DataGridTextColumn Header="重染" Width="50" FontSize="25"/>
|
||||
<DataGridTextColumn Header="染机" Width="90" FontSize="25"/>
|
||||
</DataGrid.Columns>
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
Text="{TemplateBinding Content}"
|
||||
FontFamily="Fonts/#FontAwesome"
|
||||
HorizontalAlignment="Center"
|
||||
Width="40" FontSize="20" Margin="0,5,0,0"/>
|
||||
Width="80" FontSize="20" Margin="0,5,0,0"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
</Grid>
|
||||
@@ -59,8 +59,9 @@
|
||||
<Border BorderThickness="0,0,0,1" BorderBrush="#CCCCCC">
|
||||
</Border>
|
||||
<Grid Grid.Row="0">
|
||||
<RadioButton Content="染料" HorizontalAlignment="Left" Height="30" Margin="0,0,0,1" VerticalAlignment="Top" Width="100" Background="#FFE0E0E0" Style="{DynamicResource RadioButtonStyle}" Checked="RadioButton_subdirectory"/>
|
||||
<RadioButton Content="助剂" HorizontalAlignment="Left" Height="30" Margin="100,0,0,1" VerticalAlignment="Top" Width="100" Background="#FFE0E0E0" Style="{DynamicResource RadioButtonStyle}" Checked="RadioButton_subdirectory"/>
|
||||
<RadioButton Content=" 染料" x:Uid="0" HorizontalAlignment="Left" Height="30" Margin="0,0,0,1" VerticalAlignment="Top" Width="100" Background="#FFE0E0E0" BorderBrush="#FFAEAEAE" Style="{DynamicResource RadioButtonStyle}" Checked="RadioButton_subdirectory"/>
|
||||
<RadioButton Content=" 助剂" x:Uid="1" HorizontalAlignment="Left" Height="30" Margin="100,0,0,1" VerticalAlignment="Top" Width="100" Background="#FFE0E0E0" BorderBrush="#FFAEAEAE" Style="{DynamicResource RadioButtonStyle}" Checked="RadioButton_subdirectory"/>
|
||||
<RadioButton Content="粉体助剂" x:Uid="2" HorizontalAlignment="Left" Height="30" Margin="200,0,0,1" VerticalAlignment="Top" Width="100" Background="#FFE0E0E0" BorderBrush="#FFAEAEAE" Style="{DynamicResource RadioButtonStyle}" Checked="RadioButton_subdirectory"/>
|
||||
</Grid>
|
||||
<Grid Grid.Row="1">
|
||||
<Grid Grid.Column="1">
|
||||
|
||||
Reference in new issue
Block a user