diff --git a/MainWindow.xaml b/MainWindow.xaml
index ee1d772..441b9ae 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -106,7 +106,7 @@
                             <Setter Property="Background" Value="#FFFFFFFF" />
                         </Trigger>
                         <Trigger Property="ItemsControl.AlternationIndex" Value="1">
-                            <Setter Property="Background" Value="#FFF5F5F5" />
+                            <Setter Property="Background" Value="#FFFFFFFF" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="False">
                         </Trigger>
@@ -119,8 +119,8 @@
                     <Setter Property="MinWidth" Value="20"/>
                     <Style.Triggers>
                         <Trigger Property="IsSelected" Value="True">
-                            <Setter Property="Background" Value="#FFC0C0C0"/>
-                            <Setter Property="BorderBrush" Value="#FFC0C0C0"/>
+                            <Setter Property="Background" Value="#FFFFFFFF"/>
+                            <Setter Property="BorderBrush" Value="#FFFFFFFF"/>
                             <Setter Property="Foreground" Value="#000000"/>
                         </Trigger>
                     </Style.Triggers>
@@ -129,19 +129,37 @@
             <DataGrid.Columns>
                 <!--列信息绑定-->
                 <DataGridTextColumn Header="序列" Width="50" FontSize="15" MaxWidth="50" MinWidth="50" CanUserReorder="False" IsReadOnly="True" Binding="{Binding ID}"/>
-                <DataGridTextColumn Header="原料代码" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False" Binding="{Binding PRODUCT_CODE}"/>
-                <DataGridTextColumn Header="目标饱和度(%)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False" Binding="{Binding CONC}"/>
+                <DataGridTemplateColumn Header="原料代码" Width="200" MaxWidth="400" MinWidth="100" CanUserReorder="False" >
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <ComboBox x:Name="CP_PRODUCT_CODE" BorderThickness="0,0,0,0" Text="{Binding PRODUCT_CODE}" BorderBrush="{x:Null}" Background="{x:Null}" IsEditable="True"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="目标饱和度(%)" Width="200" MaxWidth="400" MinWidth="100" CanUserReorder="False" >
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <TextBox x:Name="CP_CONC" BorderThickness="0,0,0,0" Text="{Binding CONC}" BorderBrush="{x:Null}" Background="{x:Null}"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
                 <DataGridTemplateColumn Header="计算单位" Width="80"  MaxWidth="80" MinWidth="80" CanUserReorder="False">
                     <DataGridTemplateColumn.CellTemplate  >
                         <DataTemplate>
-                            <ComboBox x:Name="CUnit" IsEditable="True" BindingGroup="{Binding SHIFT}">
+                            <ComboBox x:Name="CP_SHIFT" BorderThickness="0,0,0,0" Text="{Binding SHIFT}" BorderBrush="{x:Null}" Background="{x:Null}" IsEditable="True" IsReadOnly="True">
                                 <ComboBoxItem Content="%"></ComboBoxItem>
                                 <ComboBoxItem Content="g/L"></ComboBoxItem>
                             </ComboBox>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                <DataGridTextColumn Header="原料名称" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False" Binding="{Binding PRODUCT_NAME}"/>
+                <DataGridTemplateColumn Header="原料名称" Width="200" MaxWidth="400" MinWidth="100" CanUserReorder="False" >
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <ComboBox x:Name="CP_PRODUCT_NAME" BorderThickness="0,0,0,0" Text="{Binding PRODUCT_NAME}" BorderBrush="{x:Null}" Background="{x:Null}" IsEditable="True"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
                 <DataGridTextColumn Header="目标重量(g)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" CanUserReorder="False" IsReadOnly="True" Binding="{Binding TARGET_WT}"/>
                 <DataGridTextColumn Header="单位" Width="80"  FontSize="15" MaxWidth="80" MinWidth="80" CanUserReorder="False" IsReadOnly="True" Binding="{Binding UNIT}"/>
                 <DataGridTextColumn Header="备注" Width="400" FontSize="15" MinWidth="100" CanUserReorder="False" Binding="{Binding REMARK}"/>