From 49218198d57a8e983e93b2592ddde9df66f88745 Mon Sep 17 00:00:00 2001 From: maqiao <625215135@qq.com> Date: Mon, 3 Nov 2025 13:09:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=8A=A0=E8=8D=AF=E4=B8=8E?= =?UTF-8?q?=E8=8D=AF=E7=9B=92=E8=A1=A5=E8=8D=AF=E5=AE=9E=E9=99=85=E5=8F=96?= =?UTF-8?q?=E5=87=BA=E6=95=B0=E9=87=8F=E4=B8=8E=E8=87=AA=E5=8A=A8=E8=AE=A1?= =?UTF-8?q?=E6=95=B0=E4=B8=8D=E4=B8=80=E8=87=B4=E5=BC=B9=E5=87=BA=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MasaBlazorApp3/Pages/BoxAddDetailDialog.razor | 38 +++++++++--------- MasaBlazorApp3/Pages/InvoiceAddDialog.razor | 40 +++++++++---------- 2 files changed, 39 insertions(+), 39 deletions(-) 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; }