Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP

View/QueryView.xaml

@@ -68,7 +68,10 @@
                         <Setter Property="BorderThickness" Value="0"/>
                         <Setter Property="MinWidth" Value="50"/>
                         <Style.Triggers>
-                            <Trigger Property="IsSelected" Value="False">
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter Property="Background" Value="{x:Null}"/>
+                                <Setter Property="BorderBrush" Value="{x:Null}"/>
+                                <Setter Property="Foreground" Value="#000000"/>
                             </Trigger>
                         </Style.Triggers>
                     </Style>

View/StuffView.xaml

@@ -81,7 +81,10 @@
                         <Setter Property="BorderThickness" Value="0"/>
                         <Setter Property="MinWidth" Value="20"/>
                         <Style.Triggers>
-                            <Trigger Property="IsSelected" Value="False">
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter Property="Background" Value="#FFC0C0C0"/>
+                                <Setter Property="BorderBrush" Value="#FFC0C0C0"/>
+                                <Setter Property="Foreground" Value="#000000"/>
                             </Trigger>
                         </Style.Triggers>
                     </Style>
@@ -112,7 +115,7 @@
                 <ComboBoxItem Content="粉体助剂"></ComboBoxItem>
             </ComboBox>
             <TextBlock HorizontalAlignment="Left" Height="30" Margin="560,0,0,100" TextWrapping="Wrap" Text="原料类型" VerticalAlignment="Bottom" Width="100" FontSize="20"/>
-            <TextBox x:Name="stuff_Color" MouseDoubleClick="stuff_Color_MouseDoubleClick"  HorizontalAlignment="Left" Height="30" Margin="445,0,0,50" Text="" VerticalAlignment="Bottom" Width="80" FontSize="16" MaxLines="1" MaxLength="25" IsReadOnly="True"/>
+            <TextBox x:Name="stuff_Color" MouseDoubleClick="Stuff_Color_MouseDoubleClick"  HorizontalAlignment="Left" Height="30" Margin="445,0,0,50" Text="" VerticalAlignment="Bottom" Width="80" FontSize="16" MaxLines="1" MaxLength="25" IsReadOnly="True"/>
             <TextBlock HorizontalAlignment="Left" Height="30" Margin="400,0,0,50" TextWrapping="Wrap" Text="色彩" VerticalAlignment="Bottom" Width="50" FontSize="20"/>
             <TextBox x:Name="stuff_ProductUnit" HorizontalAlignment="Left" Height="30" Margin="105,0,0,50" Text="" VerticalAlignment="Bottom" Width="130" FontSize="16" MaxLines="1" MaxLength="25"/>
             <TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,50" TextWrapping="Wrap" Text="供应商" VerticalAlignment="Bottom" Width="80" FontSize="20"/>

View/StuffView.xaml.cs

@@ -42,7 +42,7 @@ namespace Audit.View
 
         private void DataGridStuff_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
-            int rownum = this.DataGridStuff.SelectedIndex;//获取鼠标选中行并定义变量
+            int rownum = DataGridStuff.SelectedIndex;//获取鼠标选中行并定义变量
             string DataGridStuff_ProductCode = (DataGridStuff.Columns[1].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第0列选中行单元格，原料代码
             string DataGridStuff_ProductName = (DataGridStuff.Columns[2].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第1列选中行单元格，原料名称
             string DataGridStuff_Price = (DataGridStuff.Columns[3].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第2列选中行单元格，价格
@@ -63,15 +63,15 @@ namespace Audit.View
             if (DataGridStuff_ProductType.ToString() == "2") stuff_ProductType.Text = "粉体助剂";
         }
 
-        private void stuff_Color_MouseDoubleClick(object sender, MouseButtonEventArgs e)//色彩框双击事件
+        private void Stuff_Color_MouseDoubleClick(object sender, MouseButtonEventArgs e)//色彩框双击事件
         {
-            System.Windows.Forms.ColorDialog colorDialog = new System.Windows.Forms.ColorDialog();//打开调色盘页面
+            System.Windows.Forms.ColorDialog colorDialog = new System.Windows.Forms.ColorDialog();//使用调色盘控件ColorDialog
-            if (colorDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+            if (colorDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)//打开调色盘
             {
-
+                System.Drawing.Color DColor = colorDialog.Color;////获取选中色彩信息
-                //     System.Drawing.SolidBrush sb = new System.Drawing.SolidBrush(color);
+                System.Windows.Media.Color MColor = new System.Windows.Media.Color();//转换
-                //   SolidColorBrush solidColorBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(sb.Color.A, sb.Color.R, sb.Color.G, sb.Color.B));
+                MColor = System.Windows.Media.Color.FromArgb(DColor.A, DColor.R, DColor.G, DColor.B);//配置ARGB参数
-                //  TextBox.stuff_Color.Background = solidColorBrush;
+                stuff_Color.Background = new SolidColorBrush(MColor);//ARGB参数输出至stuff_Color的背景色
             }
         }
     }