Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP

View/StuffView.xaml

@@ -86,7 +86,7 @@
                     </Style>
                 </DataGrid.CellStyle>
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="序号" Width="50" FontSize="15" Binding="{Binding ProductCode}" MaxWidth="200" MinWidth="20" CanUserReorder="False"/>
+                    <DataGridTextColumn Header="序号" Width="50" FontSize="15" MaxWidth="200" MinWidth="20" CanUserReorder="False"/>
                     <DataGridTextColumn Header="原料代码" Width="130" FontSize="15" Binding="{Binding ProductCode}" MaxWidth="200" MinWidth="100" CanUserReorder="False"/>
                     <DataGridTextColumn Header="原料名称" Width="200" FontSize="15" Binding="{Binding ProductName}" MaxWidth="300" MinWidth="200" CanUserReorder="False"/>
                     <DataGridTextColumn Header="价格" Width="100" FontSize="15" Binding="{Binding Price}" MaxWidth="200" MinWidth="100" CanUserReorder="False"/>
@@ -111,7 +111,7 @@
             <TextBlock HorizontalAlignment="Left" Height="30" Margin="420,0,0,50" TextWrapping="Wrap" Text="色彩" VerticalAlignment="Bottom" Width="50" FontSize="20" Grid.Column="1"/>
             <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" Grid.ColumnSpan="2"/>
             <TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,50" TextWrapping="Wrap" Text="供应商" VerticalAlignment="Bottom" Width="100" FontSize="20"/>
-            <TextBox x:Name="stuff_Pricee"   HorizontalAlignment="Left" Height="30" Margin="305,0,0,50" Text="" VerticalAlignment="Bottom" Width="100" FontSize="16" MaxLines="1" MaxLength="25" Grid.Column="1"/>
+            <TextBox x:Name="stuff_Price"   HorizontalAlignment="Left" Height="30" Margin="305,0,0,50" Text="" VerticalAlignment="Bottom" Width="100" FontSize="16" MaxLines="1" MaxLength="25" Grid.Column="1"/>
             <TextBlock HorizontalAlignment="Left" Height="30" Margin="255,0,0,50" TextWrapping="Wrap" Text="价格" VerticalAlignment="Bottom" Width="100" FontSize="20" Grid.Column="1"/>
             <TextBox x:Name="stuff_Concentration"   HorizontalAlignment="Left" Height="30" Margin="585,0,0,50" Text="" VerticalAlignment="Bottom" Width="50" FontSize="16" MaxLines="1" MaxLength="25" Grid.Column="1"/>
             <TextBlock HorizontalAlignment="Left" Height="30" Margin="540,0,0,50" TextWrapping="Wrap" Text="浓度" VerticalAlignment="Bottom" Width="50" FontSize="20" Grid.Column="1"/>

View/StuffView.xaml.cs

@@ -40,7 +40,23 @@ namespace Audit.View
 
         private void DataGridStuff_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
-
+            int rownum = this.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;//定位第0列选中行单元格，
+            string DataGridStuff_Price = (DataGridStuff.Columns[3].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第0列选中行单元格，
+            string DataGridStuff_ProductUnit = (DataGridStuff.Columns[4].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第0列选中行单元格，
+            string DataGridStuff_ProductType = (DataGridStuff.Columns[5].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第0列选中行单元格，
+            string DataGridStuff_Color = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第0列选中行单元格，
+            string DataGridStuff_Concentration = (DataGridStuff.Columns[7].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第0列选中行单元格，
+            string DataGridStuff_GRAVITY = (DataGridStuff.Columns[8].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第0列选中行单元格，
+            stuff_ProductCode.Text = DataGridStuff_ProductCode.ToString();
+            stuff_ProductName.Text = DataGridStuff_ProductName.ToString();
+            stuff_Price.Text = DataGridStuff_Price.ToString();
+            stuff_ProductUnit.Text = DataGridStuff_ProductUnit.ToString();
+            stuff_ProductType.Text= DataGridStuff_ProductType.ToString();
+            stuff_Color.Text = DataGridStuff_Color.ToString();
+            stuff_Concentration.Text = DataGridStuff_Concentration.ToString();
+            stuff_GRAVITY.Text = DataGridStuff_GRAVITY.ToString();
         }
     }
 }

ViewModel/StuffViewModel.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Controls;
 
 namespace Audit.ViewModel
 {