Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage

MainWindow.xaml

@@ -95,7 +95,7 @@
             <ComboBox HorizontalAlignment="Left" Height="30" Margin="225,5,0,0" Text="" VerticalAlignment="Top" Width="175" FontSize="20" IsEditable="True" Grid.ColumnSpan="2"/>
             <TextBlock HorizontalAlignment="Left" Height="35" Margin="0,40,0,0" TextWrapping="Wrap" Text="配方代码:" VerticalAlignment="Top" Width="90" FontSize="20"/>
             <TextBox HorizontalAlignment="Left" Height="30" Margin="90,40,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="125" FontSize="20" KeyUp="SearchBox_OnKeyDownd"/>
-            <TextBox HorizontalAlignment="Left" Height="30" Margin="220,40,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="145" FontSize="20" Focusable ="False" Grid.ColumnSpan="2"/>
+            <TextBox HorizontalAlignment="Left" Height="30" Margin="225,40,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="140" FontSize="20" Focusable ="False" Grid.ColumnSpan="2"/>
             <TextBlock HorizontalAlignment="Left" Height="35" Margin="0,75,0,0" TextWrapping="Wrap" Text="重量(KG):" VerticalAlignment="Top" Width="90" FontSize="20"/>
             <TextBox x:Name="list_Weight" HorizontalAlignment="Left" Height="30" Margin="90,75,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="125" FontSize="20" 
                      KeyUp="SearchBox_OnKeyDownd" TextChanged="Weight" PreviewTextInput="Tb_KeyFloating" InputMethod.IsInputMethodEnabled="False"/>
@@ -190,7 +190,7 @@
                 </DataGridTemplateColumn>
                 <DataGridTextColumn Header="目标重量(g)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" IsReadOnly="True" Binding="{Binding TARGET_WT}" CellStyle="{StaticResource CellStyle}"/>
                 <DataGridTextColumn Header="单位" Width="80"  FontSize="15" MaxWidth="80" MinWidth="80" IsReadOnly="True" Binding="{Binding UNIT}" CellStyle="{StaticResource CellStyle}"/>
-                <DataGridTextColumn Header="备注" Width="400" FontSize="15" MinWidth="100" Binding="{Binding REMARK}" CellStyle="{StaticResource CellStyle}"/>
+                <DataGridTextColumn Header="备注" Width="600" FontSize="15" MinWidth="100" Binding="{Binding REMARK}" CellStyle="{StaticResource CellStyle}"/>
             </DataGrid.Columns>
         </DataGrid>