From 469b8aebe1904566fbe210e740b331142274c4c5 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Thu, 1 Aug 2024 13:42:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=A4=E6=8E=A5=E6=9F=9C?=
 =?UTF-8?q?=E8=A1=A5=E8=8D=AF=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.xaml.cs                         |  3 +-
 .../ViewModels/AddToJiaoJieWindowViewModel.cs | 13 +++++++++
 .../ViewModels/RoleManagerWindowViewModel.cs  | 10 +++++--
 DM_Weight/Views/AddToJiaoJieWindow.xaml       | 12 ++++++++
 DM_Weight/Views/AddToJiaoJieWindow.xaml.cs    | 28 +++++++++++++++++++
 5 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 DM_Weight/ViewModels/AddToJiaoJieWindowViewModel.cs
 create mode 100644 DM_Weight/Views/AddToJiaoJieWindow.xaml
 create mode 100644 DM_Weight/Views/AddToJiaoJieWindow.xaml.cs

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<OrderTakeDrugNewWindow, OrderTakeDrugNewWindowViewModel>();
             containerRegistry.RegisterForNavigation<OrderTakeAllDrugDialog, OrderTakeAllDrugDialogViewModel>();
             containerRegistry.RegisterForNavigation<OrderTakeNewDialog, OrderTakeNewDialogViewModel>();
-
+            //交接柜补药
+            containerRegistry.RegisterForNavigation<AddToJiaoJieWindow, AddToJiaoJieWindowViewModel>();
 
             // 处方取药模态框
             containerRegistry.RegisterDialog<OrderTakeDialog>();
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 @@
+<UserControl x:Class="DM_Weight.Views.AddToJiaoJieWindow"
+             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" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:DM_Weight.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>
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
+{
+    /// <summary>
+    /// AddToJiaoJieWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class AddToJiaoJieWindow : UserControl
+    {
+        public AddToJiaoJieWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}