diff --git a/DM_Weight/App.xaml.cs b/DM_Weight/App.xaml.cs index c432a67..965a6b0 100644 --- a/DM_Weight/App.xaml.cs +++ b/DM_Weight/App.xaml.cs @@ -132,7 +132,8 @@ namespace DM_Weight containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); - + //交接柜补药 + containerRegistry.RegisterForNavigation(); // 处方取药模态框 containerRegistry.RegisterDialog(); diff --git a/DM_Weight/ViewModels/AddToJiaoJieWindowViewModel.cs b/DM_Weight/ViewModels/AddToJiaoJieWindowViewModel.cs new file mode 100644 index 0000000..2dc0dc4 --- /dev/null +++ b/DM_Weight/ViewModels/AddToJiaoJieWindowViewModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DM_Weight.ViewModels +{ + public class AddToJiaoJieWindowViewModel + { + + } +} diff --git a/DM_Weight/ViewModels/RoleManagerWindowViewModel.cs b/DM_Weight/ViewModels/RoleManagerWindowViewModel.cs index 0d709ab..3335d9f 100644 --- a/DM_Weight/ViewModels/RoleManagerWindowViewModel.cs +++ b/DM_Weight/ViewModels/RoleManagerWindowViewModel.cs @@ -171,11 +171,17 @@ namespace DM_Weight.ViewModels // PremissionName = "处方取药", // PremissionPath = "OrderTakeDrugWindow", //}; + //PremissionDm quyao1 = new PremissionDm + //{ + // Id = 11, + // PremissionName = "处方取药", + // PremissionPath = "OrderTakeDrugNewWindow", + //}; PremissionDm quyao1 = new PremissionDm { Id = 11, - PremissionName = "处方取药", - PremissionPath = "OrderTakeDrugNewWindow", + PremissionName = "交接柜补药", + PremissionPath = "AddToJiaoJieWindow", }; PremissionDm quyao2 = new PremissionDm { diff --git a/DM_Weight/Views/AddToJiaoJieWindow.xaml b/DM_Weight/Views/AddToJiaoJieWindow.xaml new file mode 100644 index 0000000..54925c0 --- /dev/null +++ b/DM_Weight/Views/AddToJiaoJieWindow.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/DM_Weight/Views/AddToJiaoJieWindow.xaml.cs b/DM_Weight/Views/AddToJiaoJieWindow.xaml.cs new file mode 100644 index 0000000..8f1b46f --- /dev/null +++ b/DM_Weight/Views/AddToJiaoJieWindow.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace DM_Weight.Views +{ + /// + /// AddToJiaoJieWindow.xaml 的交互逻辑 + /// + public partial class AddToJiaoJieWindow : UserControl + { + public AddToJiaoJieWindow() + { + InitializeComponent(); + } + } +}