From c20686d2c3801b3eccd5c42bb221662f17f717c8 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Wed, 14 Aug 2024 09:13:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=98=E7=A9=BA=E7=93=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ViewModels/ReturnEmptyWindowViewModel.cs | 22 +++++++++----------
.../ViewModels/RoleManagerWindowViewModel.cs | 13 ++++++-----
DM_Weight/Views/ReturnEmptyWindow.xaml | 4 ++--
3 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs b/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs
index 4b14475..1df4851 100644
--- a/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs
+++ b/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs
@@ -101,17 +101,17 @@ namespace DM_Weight.ViewModels
}
else if (Channel != null && Channel.CanReturnQuantity > 0)
{
- Channels = Channels.Select(x =>
- {
- if (x.Id == Channel.Id)
- {
- x.IsSelected = !x.IsSelected;
- }
- return x;
- }).ToList();
- //DialogParameters dialogParameters = new DialogParameters();
- //dialogParameters.Add("channel", Channel);
- //DialogServiceExtensions.ShowDialogHost(_dialogService, "ReturnEmptyDialog", dialogParameters, DoDialogResult, "RootDialog");
+ //Channels = Channels.Select(x =>
+ //{
+ // if (x.Id == Channel.Id)
+ // {
+ // x.IsSelected = !x.IsSelected;
+ // }
+ // return x;
+ //}).ToList();
+ DialogParameters dialogParameters = new DialogParameters();
+ dialogParameters.Add("channel", Channel);
+ DialogServiceExtensions.ShowDialogHost(_dialogService, "ReturnEmptyDialog", dialogParameters, DoDialogResult, "RootDialog");
}
});
}
diff --git a/DM_Weight/ViewModels/RoleManagerWindowViewModel.cs b/DM_Weight/ViewModels/RoleManagerWindowViewModel.cs
index 3335d9f..df2ea15 100644
--- a/DM_Weight/ViewModels/RoleManagerWindowViewModel.cs
+++ b/DM_Weight/ViewModels/RoleManagerWindowViewModel.cs
@@ -318,12 +318,12 @@ namespace DM_Weight.ViewModels
PremissionName = "归还药品",
PremissionPath = "ReturnDrugWindow2",
};
- //PremissionDm huanyao2 = new PremissionDm
- //{
- // Id = 32,
- // PremissionName = "归还空瓶",
- // PremissionPath = "ReturnEmptyWindow",
- //};
+ PremissionDm returnEmpty = new PremissionDm
+ {
+ Id = 322,
+ PremissionName = "归还空瓶",
+ PremissionPath = "ReturnEmptyWindow",
+ };
PremissionDm huanyao2 = new PremissionDm
{
Id = 32,
@@ -344,6 +344,7 @@ namespace DM_Weight.ViewModels
//};
huanyaoChild.Add(Convert.ToInt32(ConfigurationManager.AppSettings["returnDrugMode"]) == 1 ? huanyao11 : huanyao1);
huanyaoChild.Add(huanyao2);
+ huanyaoChild.Add(returnEmpty);
//huanyaoChild.Add(surgery);
huanyaoChild.Add(huanyao3);
huanyao.Children = huanyaoChild;
diff --git a/DM_Weight/Views/ReturnEmptyWindow.xaml b/DM_Weight/Views/ReturnEmptyWindow.xaml
index 702780b..f435895 100644
--- a/DM_Weight/Views/ReturnEmptyWindow.xaml
+++ b/DM_Weight/Views/ReturnEmptyWindow.xaml
@@ -92,11 +92,11 @@
-
+