diff --git a/MasaBlazorApp3/Pages/Home.razor b/MasaBlazorApp3/Pages/Home.razor index b8758b8..8073d35 100644 --- a/MasaBlazorApp3/Pages/Home.razor +++ b/MasaBlazorApp3/Pages/Home.razor @@ -45,47 +45,48 @@ - + @if (globalStateService.Operator != null) { //操作人:@globalStateService.Operator.NickName //操作人:@globalStateService.Operator.NickName - - - - + + + + - - + + } @if (globalStateService.Reviewer != null) { //复核人:@globalStateService.Reviewer.NickName //复核人:@globalStateService.Reviewer.NickName - - - - - + + + + + - - + + } -
- - 交接班 +
+ +
交接班
+
- + @@ -106,7 +107,7 @@ } - + 入库 @if (globalStateService.Operator != null) { @@ -337,10 +338,10 @@ } async void MenuClick(RadzenProfileMenuItem item) { - - string strValue= item.Value.Substring(0,1); + + string strValue = item.Value.Substring(0, 1); Pojo.User user = new Pojo.User(); - switch(strValue) + switch (strValue) { case "1": int userId = 0; @@ -359,8 +360,8 @@ ); break; case "2": - if (item.Value=="21") - { + if (item.Value == "21") + { user = globalStateService.Operator; } else @@ -383,10 +384,10 @@ { user = globalStateService.Reviewer; } - int userI =Convert.ToInt32(item.Value.Substring(1, 1)); + int userI = Convert.ToInt32(item.Value.Substring(1, 1)); await dialogService.OpenAsync( $"修改密码-{user.Username}", - new Dictionary() { { "userI",userI} }, + new Dictionary() { { "userI", userI } }, new DialogOptions() { Width = "55vw", Resizable = false, Draggable = false, ShowClose = false, ShowTitle = true } ); break; diff --git a/MasaBlazorApp3/Pages/OrderDetailDialog.razor b/MasaBlazorApp3/Pages/OrderDetailDialog.razor index b18f47f..5aa9395 100644 --- a/MasaBlazorApp3/Pages/OrderDetailDialog.razor +++ b/MasaBlazorApp3/Pages/OrderDetailDialog.razor @@ -196,7 +196,6 @@ PortUtil.AllLightOff(); if (options._data == drawerNos.Count - 1) { - PortUtil.speechSynthesizer.SpeakAsyncCancelAll(); PortUtil.speechSynthesizer.SpeakAsyncCancelAll(); PortUtil.SpeakAsync($"取药完成,请,点击完成按钮进行确认"); this.status = 2;