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

ViewModel/QueryViewModel.cs

@@ -15,6 +15,7 @@ namespace Audit.ViewModel
     public class QueryViewModel : ViewModelBase
     {
         private List<Dyelots> dyelots = new List<Dyelots>();
+        private List<DyelotsBulkedRecipe> dyelotsBulkedRecipe = new List<DyelotsBulkedRecipe>();
         /// <summary>
         /// 所有工单
         /// </summary>
@@ -30,12 +31,25 @@ namespace Audit.ViewModel
                 RaisePropertyChanged();
             }
         }
+        public List<DyelotsBulkedRecipe> DyelotsBulkedRecipe
+        {
+            get
+            {
+                return dyelotsBulkedRecipe;
+            }
+            set
+            {
+                dyelotsBulkedRecipe = value;
+                RaisePropertyChanged();
+            }
+        }
         /// <summary>
         /// 
         /// </summary>
         public QueryViewModel()
         {
             dyelots = new DyelotsProvider().Select();
+            dyelotsBulkedRecipe = new DyelotsBulkedRecipeProvider().Select();
         }
     }