新建窗口参数修改

BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml

@@ -47,6 +47,19 @@
                         </Setter>
                     </Style>
                     <!--#endregion-->
+
+
+                    <Style x:Key="tbStyle" TargetType="TextBox">
+                        <Setter Property="BorderThickness" Value="0" />
+                        <Setter Property="Foreground" Value="DeepSkyBlue" />
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                        <Setter Property="CaretBrush" Value="Orange" />
+                        <Setter Property="FontFamily" Value="楷体" />
+                        <Setter Property="Margin" Value="5,0,0,0" />
+                        <Setter Property="FontSize" Value="18" />
+                    </Style>
+
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
@@ -180,7 +193,61 @@
                     <ColumnDefinition Width="1*" />
                     <ColumnDefinition Width="1*" />
                 </Grid.ColumnDefinitions>
-                <Grid Grid.Column="0">
+
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    FontSize="16"
+                    Text="原料名称" />
+
+                <TextBlock
+                    Grid.Column="1"
+                    HorizontalAlignment="Center"
+                    FontSize="16"
+                    Text="原料类型" />
+
+                <TextBlock
+                    Grid.Column="2"
+                    HorizontalAlignment="Center"
+                    FontSize="16"
+                    Text="原料位置" />
+
+                <TextBlock
+                    Grid.Column="3"
+                    HorizontalAlignment="Center"
+                    FontSize="16"
+                    Text="原料桶号" />
+
+                <TextBlock
+                    Grid.Column="4"
+                    HorizontalAlignment="Center"
+                    FontSize="16"
+                    Text="原料重量(kg)" />
+
+                <TextBlock
+                    Grid.Column="5"
+                    HorizontalAlignment="Center"
+                    FontSize="16"
+                    Text="功能操作" />
+
+                <Border
+                    Grid.ColumnSpan="6"
+                    BorderBrush="#8800bfff"
+                    BorderThickness="1" />
+                <Border
+                    Grid.Column="1"
+                    BorderBrush="#8800bfff"
+                    BorderThickness="1,0,1,0" />
+                <Border
+                    Grid.Column="3"
+                    BorderBrush="#8800bfff"
+                    BorderThickness="1,0,1,0" />
+                <Border
+                    Grid.Column="5"
+                    BorderBrush="#8800bfff"
+                    BorderThickness="1,0,1,0" />
+
+
+                <!--<Grid Grid.Column="0">
                     <TextBlock
                         HorizontalAlignment="Center"
                         FontSize="16"
@@ -218,7 +285,7 @@
                         Text="功能操作" />
                     <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                 </Grid>
-                <Border Grid.ColumnSpan="10" BorderThickness="1,0,1,0" />
+                <Border Grid.ColumnSpan="10" BorderThickness="1,0,1,0" />-->
             </Grid>
             <Grid Grid.Row="3">
                 <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
@@ -234,7 +301,58 @@
                                         <ColumnDefinition />
                                         <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
-                                    <Grid Grid.Column="0">
+
+
+                                    <TextBox Style="{StaticResource tbStyle}" Text="{Binding RawMaterialName}" />
+
+                                    <TextBox
+                                        Grid.Column="1"
+                                        Style="{StaticResource tbStyle}"
+                                        Text="{Binding RawMaterialType}" />
+
+                                    <TextBox
+                                        Grid.Column="2"
+                                        Style="{StaticResource tbStyle}"
+                                        Text="{Binding RawMaterialLocation}" />
+
+                                    <TextBox
+                                        Grid.Column="3"
+                                        Style="{StaticResource tbStyle}"
+                                        Text="{Binding RawMaterialBarrelNum}" />
+
+                                    <TextBox
+                                        Grid.Column="4"
+                                        Style="{StaticResource tbStyle}"
+                                        Text="{Binding RawMaterialWeight}" />
+
+                                    <Button
+                                        Grid.Column="5"
+                                        Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding RawMaterialLocation}"
+                                        Content="删除"
+                                        FontSize="16" />
+
+                                    <Border
+                                        Grid.ColumnSpan="6"
+                                        BorderBrush="#8800bfff"
+                                        BorderThickness="1,0,1,1" />
+
+                                    <Border
+                                        Grid.Column="1"
+                                        BorderBrush="#8800bfff"
+                                        BorderThickness="1,0,1,0" />
+
+                                    <Border
+                                        Grid.Column="3"
+                                        BorderBrush="#8800bfff"
+                                        BorderThickness="1,0,1,0" />
+
+                                    <Border
+                                        Grid.Column="5"
+                                        BorderBrush="#8800bfff"
+                                        BorderThickness="1,0,1,0" />
+
+                                    <!--<Grid Grid.Column="0">
                                         <TextBox Text="{Binding RawMaterialName}" />
                                         <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                                     </Grid>
@@ -260,7 +378,7 @@
                                         <Border BorderThickness="1,0,1,0" Cursor="SizeWE" />
                                     </Grid>
 
-                                    <Border Grid.ColumnSpan="10" BorderThickness="1,0,1,1" />
+                                    <Border Grid.ColumnSpan="10" BorderThickness="1,0,1,1" />-->
 
                                 </Grid>
                                 <DataTemplate.Triggers>