Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP
This commit is contained in:
commit
ba67f7d733
2 files changed
+40
-5
No files matched your search
+29
-4
@@ -5,14 +5,39 @@
|
|||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:local="clr-namespace:Audit.View"
|
xmlns:local="clr-namespace:Audit.View"
|
||||||
mc:Ignorable="d" DataContext="{Binding Source={StaticResource Locator},Path=Query}"
|
mc:Ignorable="d" DataContext="{Binding Source={StaticResource Locator},Path=Query}"
|
||||||
d:DesignHeight="900" d:DesignWidth="1100" BorderBrush="Black" Background="White">
|
d:DesignHeight="900" d:DesignWidth="1100">
|
||||||
|
|
||||||
<Grid>
|
<Grid>
|
||||||
<DataGrid HorizontalAlignment="Left" Height="645" Margin="30,200,0,0" VerticalAlignment="Top" Width="220" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="Black" VerticalGridLinesBrush="Black" GridLinesVisibility="All" SelectionChanged="DataGrid_SelectionChanged">
|
<DataGrid HorizontalAlignment="Left" Margin="15,35,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>
|
<DataGrid.Columns>
|
||||||
<DataGridTextColumn Header="单号" Width="150" FontSize="25" />
|
<DataGridTextColumn Header="工单" Width="160" FontSize="25"/>
|
||||||
<DataGridTextColumn Header="染机" Width="70" FontSize="25"/>
|
<DataGridTextColumn Header="重染" Width="50" FontSize="25"/>
|
||||||
|
<DataGridTextColumn Header="染机" Width="90" FontSize="25"/>
|
||||||
</DataGrid.Columns>
|
</DataGrid.Columns>
|
||||||
</DataGrid>
|
</DataGrid>
|
||||||
|
<DataGrid HorizontalAlignment="Left" Margin="330,35,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.Columns>
|
||||||
|
<DataGridTextColumn Header="步骤" Width="50" 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"/>
|
||||||
|
<DataGridTextColumn Header="偏差" Width="70" FontSize="25"/>
|
||||||
|
<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"/>
|
||||||
|
<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"/>
|
||||||
|
<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>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
+11
-1
@@ -28,7 +28,17 @@ namespace Audit.View
|
|||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void DataGrid_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
private void Button_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void DataGrid_Detailed(object sender, SelectionChangedEventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void DataGrid_Directory(object sender, SelectionChangedEventArgs e)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user