Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP
This commit is contained in:
sc committed
commit
ed959085de
4 files changed
+35
-25
No files matched your search
+14
-14
@@ -15,7 +15,7 @@
|
||||
<Border BorderThickness="0,0,0,1" BorderBrush="#CCCCCC">
|
||||
</Border>
|
||||
<Grid Grid.Row="1">
|
||||
<DataGrid x:Name="DataGridDyelots" MouseDoubleClick="DataGridDyelot_MouseDoubleClick" ItemsSource="{Binding Dyelots}" SelectionMode="Single" AlternationCount="2" IsReadOnly="True" HorizontalAlignment="Left" Margin="15,15,0,150" VerticalAlignment="Stretch" Width="320" d:ItemsSource="{d:SampleData ItemCount=100}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" SelectionChanged="DataGrid_Directory" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40">
|
||||
<DataGrid x:Name="DataGridDyelots" MouseDoubleClick="DataGridDyelot_MouseDoubleClick" ItemsSource="{Binding Dyelots}" SelectionMode="Single" AlternationCount="2" IsReadOnly="True" HorizontalAlignment="Left" Margin="15,15,0,150" VerticalAlignment="Stretch" Width="320" d:ItemsSource="{d:SampleData ItemCount=100}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" VerticalContentAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled">
|
||||
<DataGrid.RowStyle>
|
||||
<Style TargetType="{x:Type DataGridRow}">
|
||||
<Style.Triggers>
|
||||
@@ -42,13 +42,13 @@
|
||||
</Style>
|
||||
</DataGrid.CellStyle>
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="工单" Width="158" FontSize="15" Binding="{Binding Dyelot}"/>
|
||||
<DataGridTextColumn Header="重染" Width="56" FontSize="15" Binding="{Binding ReDye}"/>
|
||||
<DataGridTextColumn Header="染机" Width="90" FontSize="15" Binding="{Binding Machine}"/>
|
||||
<DataGridTextColumn Header="开单时间" Width="200" FontSize="15" Binding="{Binding CreationTime,StringFormat='yyyy-MM-dd HH:mm:ss'}" MaxWidth="0"/>
|
||||
<DataGridTextColumn Header="工单" Width="158" FontSize="15" Binding="{Binding Dyelot}" MaxWidth="158" MinWidth="158" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="重染" Width="56" FontSize="15" Binding="{Binding ReDye}" MaxWidth="56" MinWidth="56" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="染机" Width="90" FontSize="15" Binding="{Binding Machine}" MaxWidth="90" MinWidth="90" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="开单时间" Width="200" FontSize="15" Binding="{Binding CreationTime,StringFormat='yyyy-MM-dd HH:mm:ss'}" MaxWidth="0" MinWidth="0" CanUserReorder="False"/>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
<DataGrid SelectionMode="Single" AlternationCount="2" IsReadOnly="True" HorizontalAlignment="Left" Margin="350,15,15,150" VerticalAlignment="Stretch" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" SelectionChanged="DataGrid_Detailed" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40">
|
||||
<DataGrid x:Name="DataGridDyelotsBulkedRecipe" ItemsSource="{Binding DyelotsBulkedRecipe}" SelectionMode="Single" AlternationCount="2" IsReadOnly="True" HorizontalAlignment="Left" Margin="350,15,15,150" VerticalAlignment="Stretch" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" VerticalContentAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled">
|
||||
<DataGrid.RowStyle >
|
||||
<Style TargetType="{x:Type DataGridRow}">
|
||||
<Style.Triggers>
|
||||
@@ -66,7 +66,7 @@
|
||||
<DataGrid.CellStyle>
|
||||
<Style TargetType="DataGridCell">
|
||||
<Setter Property="BorderThickness" Value="0"/>
|
||||
<Setter Property="MinWidth" Value="85"/>
|
||||
<Setter Property="MinWidth" Value="50"/>
|
||||
<Style.Triggers>
|
||||
<Trigger Property="IsSelected" Value="False">
|
||||
</Trigger>
|
||||
@@ -74,13 +74,13 @@
|
||||
</Style>
|
||||
</DataGrid.CellStyle>
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="步骤" Width="50" FontSize="15" Binding="{Binding StepNumber}"/>
|
||||
<DataGridTextColumn Header="原料代码" Width="100" FontSize="15" Binding="{Binding ProductCode}"/>
|
||||
<DataGridTextColumn Header="原料名称" Width="100" FontSize="15" Binding="{Binding ProductName}"/>
|
||||
<DataGridTextColumn Header="目标用量" Width="150" FontSize="15" Binding="{Binding Grams}"/>
|
||||
<DataGridTextColumn Header="实际用量" Width="150" FontSize="15" Binding="{Binding DispenseGrams}"/>
|
||||
<DataGridTextColumn Header="偏差" Width="70" FontSize="15" Visibility="Collapsed"/>
|
||||
<DataGridTextColumn Header="结束时间" Width="300" FontSize="15" Binding="{Binding DispenseEndTime,StringFormat='yyyy-MM-dd HH:mm:ss'}"/>
|
||||
<DataGridTextColumn Header="步骤" Width="50" FontSize="15" Binding="{Binding StepNumber}" MaxWidth="50" MinWidth="50" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="原料代码" Width="100" FontSize="15" Binding="{Binding ProductCode}" MaxWidth="200" MinWidth="100" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="原料名称" Width="100" FontSize="15" Binding="{Binding ProductName}" MaxWidth="200" MinWidth="100" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="目标用量" Width="150" FontSize="15" Binding="{Binding Grams}" MaxWidth="250" MinWidth="150" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="实际用量" Width="150" FontSize="15" Binding="{Binding DispenseGrams}" MaxWidth="250" MinWidth="150" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="偏差" Width="70" FontSize="15" Visibility="Collapsed" MinWidth="70" MaxWidth="150" CanUserReorder="False"/>
|
||||
<DataGridTextColumn Header="结束时间" Width="300" FontSize="15" Binding="{Binding DispenseEndTime,StringFormat='yyyy-MM-dd HH:mm:ss'}" MaxWidth="200" MinWidth="500" CanUserReorder="False"/>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
<TextBox x:Name="Dyelots_Dyelot" HorizontalAlignment="Left" Height="30" Margin="65,0,0,100" Text="" VerticalAlignment="Bottom" Width="250" FontSize="16" MaxLines="1" MaxLength="25"/>
|
||||
|
||||
@@ -66,15 +66,6 @@ namespace Audit.View
|
||||
}
|
||||
}
|
||||
|
||||
private void DataGrid_Detailed(object sender, SelectionChangedEventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void DataGrid_Directory(object sender, SelectionChangedEventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
private void DataGridDyelot_MouseDoubleClick(object sender, MouseButtonEventArgs e)// DataGridDyelot表格双击事件
|
||||
{
|
||||
int rownum = this.DataGridDyelots.SelectedIndex;//获取鼠标选中行并定义变量
|
||||
|
||||
Reference in new issue
Block a user