|
|
@@ -262,7 +262,7 @@ |
|
|
|
<ColumnDefinition Width="225"></ColumnDefinition> |
|
|
|
<ColumnDefinition></ColumnDefinition> |
|
|
|
</Grid.ColumnDefinitions> |
|
|
|
<ComboBox ItemsSource="{Binding DataContext.materialNames,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ItemsControl}}" Text="{Binding MaterialName}" Margin="10,0,0,10" Width="190" FontSize="14" KeyUp="ComboBox_KeyUp" LostFocus="ComboBox_LostFocus" Style="{StaticResource ComboBoxStyle1}"> |
|
|
|
<ComboBox ItemsSource="{Binding DataContext.materialNames,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ItemsControl}}" Text="{Binding MaterialName}" Margin="10,0,0,10" Width="190" FontSize="14" KeyUp="ComboBox_KeyUp" LostFocus="ComboBox_LostFocus" Style="{StaticResource ComboBoxStyle1}" Height="30"> |
|
|
|
<ComboBox.ItemContainerStyle> |
|
|
|
<Style TargetType="{x:Type ComboBoxItem}"> |
|
|
|
<Setter Property="Background" Value="White" /> |
|
|
@@ -273,18 +273,19 @@ |
|
|
|
</ComboBox.ItemContainerStyle> |
|
|
|
</ComboBox> |
|
|
|
<StackPanel Grid.Column="1" Orientation="Horizontal" > |
|
|
|
<TextBox Text="{Binding MaterialLoc}" Background="Transparent" FontSize="14" |
|
|
|
<TextBox Text="{Binding MaterialLoc}" Background="Transparent" FontSize="14" Height="30" |
|
|
|
BorderBrush="#e69519" Foreground="LightGray" Width="170" Margin="35,0,0,10" ></TextBox> |
|
|
|
|
|
|
|
</StackPanel> |
|
|
|
<StackPanel Orientation="Horizontal" Grid.Column="2"> |
|
|
|
<TextBox Text="{Binding MaterialWeight}" Background="Transparent" FontSize="14" |
|
|
|
<TextBox Text="{Binding MaterialWeight}" Background="Transparent" FontSize="14" Height="30" |
|
|
|
BorderBrush="#e69519" Foreground="LightGray" Width="170" Margin="35,0,0,10" ></TextBox> |
|
|
|
<TextBlock VerticalAlignment="Center" Margin="4,0,0,10" Text="g" Foreground="#e69519" ></TextBlock> |
|
|
|
<TextBlock VerticalAlignment="Center" FontSize="14" Margin="4,0,0,10" Text="g" Foreground="#e69519" ></TextBlock> |
|
|
|
</StackPanel> |
|
|
|
<Button Grid.Column="3" |
|
|
|
Content="删除" |
|
|
|
Width="94" |
|
|
|
Height="30" |
|
|
|
FontSize="14" |
|
|
|
Margin="0,0,20,10" |
|
|
|
Background="Transparent" |
|
|
|