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

View/WorkOrderView.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="DyeingComputer.View.WorkOrder"
+<UserControl x:Class="DyeingComputer.View.WorkOrderView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -7,6 +7,10 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
-            
+        <Grid>
+            <Grid HorizontalAlignment="Left" Height="236" Margin="190,81,0,0" VerticalAlignment="Top" Width="406"/>
+            <DataGrid HorizontalAlignment="Left" Height="226" Margin="78,91,0,0" VerticalAlignment="Top" Width="437" d:ItemsSource="{d:SampleData ItemCount=5}"/>
+        </Grid>
+
     </Grid>
 </UserControl>

View/WorkOrderView.xaml.cs

@@ -18,9 +18,9 @@ namespace DyeingComputer.View
     /// <summary>
     /// WorkOrder.xaml 的交互逻辑
     /// </summary>
-    public partial class WorkOrder : UserControl
+    public partial class WorkOrderView : UserControl
     {
-        public WorkOrder()
+        public WorkOrderView()
         {
             InitializeComponent();
         }