Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP
This commit is contained in:
commit
37a004e811
3 files changed
+13
-18
No files matched your search
+10
-10
@@ -15,16 +15,16 @@
|
||||
<Border BorderThickness="0,0,0,1" BorderBrush="#CCCCCC">
|
||||
</Border>
|
||||
<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 HorizontalAlignment="Left" Margin="15,15,0,150" VerticalAlignment="Stretch" Width="310" 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" ColumnHeaderHeight="40" FontSize="15">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="工单" Width="160" FontSize="25" />
|
||||
<DataGridTextColumn Header="重染" Width="50" FontSize="25"/>
|
||||
<DataGridTextColumn Header="重染" Width="60" FontSize="25"/>
|
||||
<DataGridTextColumn Header="染机" Width="90" FontSize="25"/>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
<DataGrid HorizontalAlignment="Left" Margin="330,15,15,150" VerticalAlignment="Stretch" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="Black" VerticalGridLinesBrush="Black" GridLinesVisibility="All" SelectionChanged="DataGrid_Detailed" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1">
|
||||
<DataGrid HorizontalAlignment="Left" Margin="340,15,15,150" VerticalAlignment="Stretch" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="Black" VerticalGridLinesBrush="Black" GridLinesVisibility="All" SelectionChanged="DataGrid_Detailed" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" FontSize="15">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="步骤" Width="50" FontSize="25"/>
|
||||
<DataGridTextColumn Header="步骤" Width="60" FontSize="25"/>
|
||||
<DataGridTextColumn Header="原料代码" Width="100" FontSize="25"/>
|
||||
<DataGridTextColumn Header="原料名称" Width="100" FontSize="25"/>
|
||||
<DataGridTextColumn Header="目标用量" Width="150" FontSize="25"/>
|
||||
@@ -33,18 +33,18 @@
|
||||
<DataGridTextColumn Header="结束时间" Width="300" FontSize="25"/>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
<TextBox HorizontalAlignment="Left" Height="35" Margin="65,0,0,100" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="250"/>
|
||||
<TextBox HorizontalAlignment="Left" Height="35" Margin="65,0,0,50" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="80"/>
|
||||
<TextBox HorizontalAlignment="Left" Height="35" Margin="200,0,0,50" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="115"/>
|
||||
<DatePicker HorizontalAlignment="Left" Height="35" Margin="420,0,0,100" VerticalAlignment="Bottom" Width="225"/>
|
||||
<DatePicker HorizontalAlignment="Left" Height="35" Margin="685,0,0,100" VerticalAlignment="Bottom" Width="225"/>
|
||||
<TextBox HorizontalAlignment="Left" Height="30" Margin="65,0,0,100" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="250" FontSize="20"/>
|
||||
<TextBox HorizontalAlignment="Left" Height="30" Margin="200,0,0,50" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="115" FontSize="20"/>
|
||||
<DatePicker HorizontalAlignment="Left" Height="30" Margin="420,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="20"/>
|
||||
<DatePicker HorizontalAlignment="Left" Height="30" Margin="685,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="20"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,100" TextWrapping="Wrap" Text="工单" VerticalAlignment="Bottom" Width="45" FontSize="20"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,50" TextWrapping="Wrap" Text="重染" VerticalAlignment="Bottom" Width="45" FontSize="20"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="30" Margin="155,0,0,50" TextWrapping="Wrap" Text="染机" VerticalAlignment="Bottom" Width="45" FontSize="20"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="30" Margin="330,0,0,50" TextWrapping="Wrap" Text="开单时间" VerticalAlignment="Bottom" Width="90" FontSize="20"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="30" Margin="330,0,0,100" TextWrapping="Wrap" Text="日期范围" VerticalAlignment="Bottom" Width="90" FontSize="20"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="45" Margin="645,0,0,101" TextWrapping="Wrap" Text="~" VerticalAlignment="Bottom" Width="40" FontSize="40"/>
|
||||
<Label Content="" HorizontalAlignment="Left" Height="30" Margin="420,0,0,50" VerticalAlignment="Bottom" Width="225" Background="White" BorderBrush="#FFCCCCCC"/>
|
||||
<Label Content="" HorizontalAlignment="Left" Height="30" Margin="420,0,0,50" VerticalAlignment="Bottom" Width="225" Background="White" BorderBrush="#FFCCCCCC" FontSize="20"/>
|
||||
<Label Content="" HorizontalAlignment="Left" Height="30" Margin="65,0,0,50" VerticalAlignment="Bottom" Width="80" Background="White" BorderBrush="#FFCCCCCC" FontSize="20"/>
|
||||
<Button Content="查询" HorizontalAlignment="Left" Height="65" Margin="935,0,0,50" VerticalAlignment="Bottom" Width="145" FontSize="40" BorderBrush="{x:Null}" Background="#FFCECECE" Click="Button_Click"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
@@ -59,9 +59,9 @@
|
||||
<Border BorderThickness="0,0,0,1" BorderBrush="#CCCCCC">
|
||||
</Border>
|
||||
<Grid Grid.Row="0">
|
||||
<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"/>
|
||||
<RadioButton Content=" 染料" x:Uid="0" HorizontalAlignment="Left" Height="30" Margin="0,0,0,1" VerticalAlignment="Top" Width="100" Background="#FFE0E0E0" BorderBrush="#FFFFFFFF" Style="{DynamicResource RadioButtonStyle}" BorderThickness="5,0,5,0"/>
|
||||
<RadioButton Content=" 助剂" x:Uid="1" HorizontalAlignment="Left" Height="30" Margin="100,0,0,1" VerticalAlignment="Top" Width="100" Background="#FFE0E0E0" BorderBrush="#FFFFFFFF" Style="{DynamicResource RadioButtonStyle}" BorderThickness="5,0,5,0"/>
|
||||
<RadioButton Content="粉体助剂" x:Uid="2" HorizontalAlignment="Left" Height="30" Margin="200,0,0,1" VerticalAlignment="Top" Width="100" Background="#FFE0E0E0" BorderBrush="#FFFFFFFF" Style="{DynamicResource RadioButtonStyle}" BorderThickness="5,0,5,0"/>
|
||||
</Grid>
|
||||
<Grid Grid.Row="1">
|
||||
<Grid Grid.Column="1">
|
||||
|
||||
@@ -27,10 +27,5 @@ namespace Audit.View
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
private void RadioButton_subdirectory(object sender, RoutedEventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user