sc
/
Audit_APP
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP

master
sc 4 years ago
parent
3323285542 8ca4d50791
commit
37a004e811
3 changed files with 13 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      View/QueryView.xaml
  2. 6
      View/StatisticsView.xaml
  3. 5
      View/StatisticsView.xaml.cs

20
View/QueryView.xaml
View File

@ -15,16 +15,16 @@
<Border BorderThickness="0,0,0,1" BorderBrush="#CCCCCC"> <Border BorderThickness="0,0,0,1" BorderBrush="#CCCCCC">
</Border> </Border>
<Grid Grid.Row="1"> <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> <DataGrid.Columns>
<DataGridTextColumn Header="工单" Width="160" FontSize="25" /> <DataGridTextColumn Header="工单" Width="160" FontSize="25" />
<DataGridTextColumn Header="重染" Width="50" FontSize="25"/> <DataGridTextColumn Header="重染" Width="60" FontSize="25"/>
<DataGridTextColumn Header="染机" Width="90" FontSize="25"/> <DataGridTextColumn Header="染机" Width="90" FontSize="25"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </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> <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="100" FontSize="25"/> <DataGridTextColumn Header="原料名称" Width="100" FontSize="25"/>
<DataGridTextColumn Header="目标用量" Width="150" FontSize="25"/> <DataGridTextColumn Header="目标用量" Width="150" FontSize="25"/>
@ -33,18 +33,18 @@
<DataGridTextColumn Header="结束时间" Width="300" FontSize="25"/> <DataGridTextColumn Header="结束时间" Width="300" FontSize="25"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
<TextBox HorizontalAlignment="Left" Height="35" Margin="65,0,0,100" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="250"/> <TextBox HorizontalAlignment="Left" Height="30" Margin="65,0,0,100" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="250" FontSize="20"/>
<TextBox HorizontalAlignment="Left" Height="35" Margin="65,0,0,50" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="80"/> <TextBox HorizontalAlignment="Left" Height="30" Margin="200,0,0,50" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="115" FontSize="20"/>
<TextBox HorizontalAlignment="Left" Height="35" Margin="200,0,0,50" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="115"/> <DatePicker HorizontalAlignment="Left" Height="30" Margin="420,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="20"/>
<DatePicker HorizontalAlignment="Left" Height="35" Margin="420,0,0,100" VerticalAlignment="Bottom" Width="225"/> <DatePicker HorizontalAlignment="Left" Height="30" Margin="685,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="20"/>
<DatePicker HorizontalAlignment="Left" Height="35" Margin="685,0,0,100" VerticalAlignment="Bottom" Width="225"/>
<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,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="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="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,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="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"/> <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"/> <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>
</Grid> </Grid>

6
View/StatisticsView.xaml
View File

@ -59,9 +59,9 @@
<Border BorderThickness="0,0,0,1" BorderBrush="#CCCCCC"> <Border BorderThickness="0,0,0,1" BorderBrush="#CCCCCC">
</Border> </Border>
<Grid Grid.Row="0"> <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="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="#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="#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="#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="#FFFFFFFF" Style="{DynamicResource RadioButtonStyle}" BorderThickness="5,0,5,0"/>
</Grid> </Grid>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<Grid Grid.Column="1"> <Grid Grid.Column="1">

5
View/StatisticsView.xaml.cs
View File

@ -27,10 +27,5 @@ namespace Audit.View
{ {
InitializeComponent(); InitializeComponent();
} }
private void RadioButton_subdirectory(object sender, RoutedEventArgs e)
{
}
} }
} }

Write Preview
Loading…
Cancel
Save