maqiao
/
HKC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改还空瓶

This commit is contained in:
maqiao 2024-08-14 09:13:03 +08:00
parent 427b249429
commit c20686d2c3
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs
View File

@ -101,17 +101,17 @@ namespace DM_Weight.ViewModels
} }
else if (Channel != null && Channel.CanReturnQuantity > 0) else if (Channel != null && Channel.CanReturnQuantity > 0)
{ {
Channels = Channels.Select(x => //Channels = Channels.Select(x =>
{ //{
if (x.Id == Channel.Id) // if (x.Id == Channel.Id)
{ // {
x.IsSelected = !x.IsSelected; // x.IsSelected = !x.IsSelected;
} // }
return x; // return x;
}).ToList(); //}).ToList();
//DialogParameters dialogParameters = new DialogParameters(); DialogParameters dialogParameters = new DialogParameters();
//dialogParameters.Add("channel", Channel); dialogParameters.Add("channel", Channel);
//DialogServiceExtensions.ShowDialogHost(_dialogService, "ReturnEmptyDialog", dialogParameters, DoDialogResult, "RootDialog"); DialogServiceExtensions.ShowDialogHost(_dialogService, "ReturnEmptyDialog", dialogParameters, DoDialogResult, "RootDialog");
} }
}); });
} }

13
DM_Weight/ViewModels/RoleManagerWindowViewModel.cs
View File

@ -318,12 +318,12 @@ namespace DM_Weight.ViewModels
PremissionName = "归还药品", PremissionName = "归还药品",
PremissionPath = "ReturnDrugWindow2", PremissionPath = "ReturnDrugWindow2",
}; };
//PremissionDm huanyao2 = new PremissionDm PremissionDm returnEmpty = new PremissionDm
//{ {
// Id = 32, Id = 322,
// PremissionName = "归还空瓶", PremissionName = "归还空瓶",
// PremissionPath = "ReturnEmptyWindow", PremissionPath = "ReturnEmptyWindow",
//}; };
PremissionDm huanyao2 = new PremissionDm PremissionDm huanyao2 = new PremissionDm
{ {
Id = 32, Id = 32,
@ -344,6 +344,7 @@ namespace DM_Weight.ViewModels
//}; //};
huanyaoChild.Add(Convert.ToInt32(ConfigurationManager.AppSettings["returnDrugMode"]) == 1 ? huanyao11 : huanyao1); huanyaoChild.Add(Convert.ToInt32(ConfigurationManager.AppSettings["returnDrugMode"]) == 1 ? huanyao11 : huanyao1);
huanyaoChild.Add(huanyao2); huanyaoChild.Add(huanyao2);
huanyaoChild.Add(returnEmpty);
//huanyaoChild.Add(surgery); //huanyaoChild.Add(surgery);
huanyaoChild.Add(huanyao3); huanyaoChild.Add(huanyao3);
huanyao.Children = huanyaoChild; huanyao.Children = huanyaoChild;

4
DM_Weight/Views/ReturnEmptyWindow.xaml
View File

@ -92,11 +92,11 @@
<Setter Property="Foreground" Value="White" /> <Setter Property="Foreground" Value="White" />
</Style> </Style>
</ListView.Resources> </ListView.Resources>
<!--<i:Interaction.Triggers> <i:Interaction.Triggers>
<i:EventTrigger EventName="SelectionChanged"> <i:EventTrigger EventName="SelectionChanged">
<i:InvokeCommandAction Command="{Binding RowSelected}" /> <i:InvokeCommandAction Command="{Binding RowSelected}" />
</i:EventTrigger> </i:EventTrigger>
</i:Interaction.Triggers>--> </i:Interaction.Triggers>
<ListView.View> <ListView.View>
<GridView ColumnHeaderContainerStyle="{StaticResource st}"> <GridView ColumnHeaderContainerStyle="{StaticResource st}">
<!--<GridViewColumn Header="选择" Width="100"> <!--<GridViewColumn Header="选择" Width="100">