diff --git a/MasaBlazorApp3/Pages/BoxAddDetailDialog.razor b/MasaBlazorApp3/Pages/BoxAddDetailDialog.razor index 8419b47..923aa7f 100644 --- a/MasaBlazorApp3/Pages/BoxAddDetailDialog.razor +++ b/MasaBlazorApp3/Pages/BoxAddDetailDialog.razor @@ -235,7 +235,7 @@ } } - // 所有抽屉操作完成,断电单支抽屉 + // 所有抽屉操作完成,断电单支抽屉 for (int i = 0; i < drawerNos.Count; i++) { if (setting.Value.single.Contains(drawerNos[i].ChannelStock.DrawerNo)) @@ -244,24 +244,24 @@ await Task.Delay(200); } } - // if (!string.IsNullOrEmpty(alertMessage)) - // { - // //弹出确认对话框 - alertMessage += "应取数与实际取出数不一致确认要保存吗?"; - // //弹出确认提示框 - // var confirm = await dialogService.OpenAsync( - // $"保存确认", - // new Dictionary() { { "confirmInfo", alertMessage } }, - // new DialogOptions() { Width = "45vw", Resizable = true, Draggable = true, ShowClose = false }); - logger.Info(alertMessage); - // if (!confirm) - // { - // RestData(); - // logger.Info("取消保存"); - // // 关闭弹窗 - // dialogService.Close(false); - // } - // } + if (!string.IsNullOrEmpty(alertMessage)) + { + //弹出确认对话框 + alertMessage += "应取数与实际取出数不一致确认要保存吗?"; + //弹出确认提示框 + var confirm = await dialogService.OpenAsync( + $"保存确认", + new Dictionary() { { "confirmInfo", alertMessage } }, + new DialogOptions() { Width = "45vw", Resizable = true, Draggable = true, ShowClose = false }); + logger.Info(alertMessage); + if (!confirm) + { + RestData(); + logger.Info("取消保存"); + // 关闭弹窗 + dialogService.Close(false); + } + } stop(); } else diff --git a/MasaBlazorApp3/Pages/InvoiceAddDialog.razor b/MasaBlazorApp3/Pages/InvoiceAddDialog.razor index 16e0162..b228318 100644 --- a/MasaBlazorApp3/Pages/InvoiceAddDialog.razor +++ b/MasaBlazorApp3/Pages/InvoiceAddDialog.razor @@ -339,27 +339,27 @@ //弹出确认对话框 alertMessage += "应取数与实际取出数不一致确认要保存吗?"; //弹出确认提示框 - // var confirm = await dialogService.OpenAsync - // ( - // $"保存确认", - // new Dictionary - // () { { "confirmInfo", alertMessage } }, - // new DialogOptions() - // { Width = "45vw", Resizable = true, Draggable = true, ShowClose = false }); + var confirm = await dialogService.OpenAsync + ( + $"保存确认", + new Dictionary + () { { "confirmInfo", alertMessage } }, + new DialogOptions() + { Width = "45vw", Resizable = true, Draggable = true, ShowClose = false }); - // if (!confirm) - // { - // RestData(); - // logger.Info("取消保存"); - // cancelFlag = true; - // // 关闭弹窗 - // dialogService.Close(false); - // break; - // } - // else - // { - // logger.Info(alertMessage); - // } + if (!confirm) + { + RestData(); + logger.Info("取消保存"); + cancelFlag = true; + // 关闭弹窗 + dialogService.Close(false); + break; + } + else + { + logger.Info(alertMessage); + } logger.Info(alertMessage); alertMessage = string.Empty; }