Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP
This commit is contained in:
commit
b34c91c545
1 file changed
+2
-2
+2
-2
@@ -43,7 +43,7 @@
|
||||
<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 DispenseMachine}"/>
|
||||
<DataGridTextColumn Header="染机" Width="90" FontSize="15" Binding="{Binding Machine}"/>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
<DataGrid ItemsSource="{Binding DyelotsBulkedRecipe}" 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" FontSize="15">
|
||||
@@ -82,7 +82,7 @@
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
<TextBox x:Name="Dyelots_Dyelot" HorizontalAlignment="Left" Height="30" Margin="65,0,0,100" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="250" FontSize="16" MaxLines="1"/>
|
||||
<TextBox x:Name="Dyelots_DispenseMachine" HorizontalAlignment="Left" Height="30" Margin="200,0,0,50" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="115" FontSize="16" MaxLines="1"/>
|
||||
<TextBox x:Name="Dyelots_Machine" HorizontalAlignment="Left" Height="30" Margin="200,0,0,50" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="115" FontSize="16" MaxLines="1"/>
|
||||
<DatePicker HorizontalAlignment="Left" Height="30" Margin="450,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="16"/>
|
||||
<DatePicker HorizontalAlignment="Left" Height="30" Margin="715,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="16"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,100" TextWrapping="Wrap" Text="工单" VerticalAlignment="Bottom" Width="45" FontSize="20"/>
|
||||
|
||||
Reference in new issue
Block a user