diff --git a/MasaBlazorApp3/DataAccess/Dao/ISettingManuDao.cs b/MasaBlazorApp3/DataAccess/Dao/ISettingManuDao.cs index 36545dc..21d1e36 100644 --- a/MasaBlazorApp3/DataAccess/Dao/ISettingManuDao.cs +++ b/MasaBlazorApp3/DataAccess/Dao/ISettingManuDao.cs @@ -9,6 +9,6 @@ namespace MasaBlazorApp3.DataAccess.Dao { interface ISettingManuDao { - public Task> GetMenuItemsAsync(); + public Task> GetMenuItemsAsync(string culture); } } diff --git a/MasaBlazorApp3/DataAccess/Impl/SettingManuDao.cs b/MasaBlazorApp3/DataAccess/Impl/SettingManuDao.cs index 44cd6fb..8f185a1 100644 --- a/MasaBlazorApp3/DataAccess/Impl/SettingManuDao.cs +++ b/MasaBlazorApp3/DataAccess/Impl/SettingManuDao.cs @@ -9,6 +9,7 @@ using System.Collections.Generic; using System.Data.Common; using System.Linq; using System.Text; +using System.Text.RegularExpressions; using System.Threading.Tasks; namespace MasaBlazorApp3.DataAccess.Impl @@ -24,9 +25,9 @@ namespace MasaBlazorApp3.DataAccess.Impl _connection = connection; _setting = setting.Value; } - public async Task> GetMenuItemsAsync() + public async Task> GetMenuItemsAsync(string culture) { - var query = _connection.SettingManu.AsQueryable(); + var query = _connection.SettingManu.AsQueryable().Where(it=>it.Culture==culture); return await query diff --git a/MasaBlazorApp3/MasaBlazorApp3.csproj b/MasaBlazorApp3/MasaBlazorApp3.csproj index b6c5852..a7d337d 100644 --- a/MasaBlazorApp3/MasaBlazorApp3.csproj +++ b/MasaBlazorApp3/MasaBlazorApp3.csproj @@ -43,6 +43,7 @@ + @@ -57,10 +58,6 @@ - - - - diff --git a/MasaBlazorApp3/Pages/BiaoDing.razor b/MasaBlazorApp3/Pages/BiaoDing.razor index 2186971..dc50334 100644 --- a/MasaBlazorApp3/Pages/BiaoDing.razor +++ b/MasaBlazorApp3/Pages/BiaoDing.razor @@ -43,7 +43,7 @@ LoadData="@LoadData" IsLoading="@isLoading" Count="@count" - EmptyText="无数据" + EmptyText="@myText.NoDate" Data="@channels" AllowColumnResize="true" AllowAlternatingRows="false" CellClick="@((DataGridCellMouseEventArgs args) => OnCellClick(args))" @@ -52,34 +52,34 @@ @if (status < 3) { - + } @if (status > 0 && status <= 3) { - + } - - + + - + - + - + @@ -92,6 +92,8 @@ @inject NotificationService _message @inject IOptions setting; @inject DialogService dialogService; + @inject Toolbelt.Blazor.I18nText.I18nText I18nText; + private I18nText.local myText = new I18nText.local(); int status = 0; int drawerNo = 0; RadzenDataGrid grid; @@ -158,7 +160,7 @@ else { _message.Notify( - new NotificationMessage { Severity = NotificationSeverity.Error, Summary = "提示", Detail = $"抽屉【{drawerNo}】打开失败，请检测硬件", Duration = 4000 } + new NotificationMessage { Severity = NotificationSeverity.Error, Summary =myText.Tips, Detail = $"抽屉【{drawerNo}】打开失败，请检测硬件", Duration = 4000 } ); logger.Info($"抽屉打开失败"); RestData(); @@ -211,7 +213,7 @@ { logger.Info($"标定药品发生错误，{e.Message}"); _message.Notify( - new NotificationMessage { Severity = NotificationSeverity.Error, Summary = "提示", Detail = $"发生错误，{e.Message}", Duration = 4000 } + new NotificationMessage { Severity = NotificationSeverity.Error, Summary = myText.Tips, Detail = $"发生错误，{e.Message}", Duration = 4000 } ); if (setting.Value.single != null && setting.Value.single.Contains(this.drawerNo)) { @@ -253,4 +255,12 @@ // } } } + + protected override async Task OnInitializedAsync() + { + myText = await I18nText.GetTextTableAsync(this); + + base.OnInitializedAsync(); + } + } diff --git a/MasaBlazorApp3/Pages/BiaoDingDialog.razor b/MasaBlazorApp3/Pages/BiaoDingDialog.razor index b4a4da7..b5bc4e1 100644 --- a/MasaBlazorApp3/Pages/BiaoDingDialog.razor +++ b/MasaBlazorApp3/Pages/BiaoDingDialog.razor @@ -34,6 +34,8 @@ @inject Radzen.DialogService dialogService; @inject NotificationService _message @inject PortUtil PortUtil; + @inject Toolbelt.Blazor.I18nText.I18nText I18nText; + private I18nText.local myText = new I18nText.local(); [Parameter] public ChannelStock channelStockInfo { get; set; } PromiseUtil promiseUtil = new PromiseUtil(); @@ -47,6 +49,7 @@ int iClearFinish = 1; protected override async Task OnInitializedAsync() { + myText = await I18nText.GetTextTableAsync(this); if(channelStockInfo!=null&&channelStockInfo.Quantity<=0) { //库存为零，直接进行清空操作 @@ -93,7 +96,7 @@ { _message.Notify( new NotificationMessage - { Severity = NotificationSeverity.Success, Summary = "提示", Detail = "清空操作成功", Duration = 3000 } + { Severity = NotificationSeverity.Success, Summary = myText.Tips, Detail = "清空操作成功", Duration = 3000 } ); PortUtil.speechSynthesizer.SpeakAsyncCancelAll(); @@ -147,7 +150,7 @@ status = 0; _message.Notify( new NotificationMessage - { Severity = NotificationSeverity.Success, Summary = "提示", Detail = "标定成功", Duration = 3000 } + { Severity = NotificationSeverity.Success, Summary = myText.Tips, Detail = "标定成功", Duration = 3000 } ); PortUtil.speechSynthesizer.SpeakAsyncCancelAll(); @@ -173,7 +176,7 @@ logger.Error($"标定异常{ex.Message}"); _message.Notify( new NotificationMessage - { Severity = NotificationSeverity.Error, Summary = "提示", Detail = "标定异常", Duration = 3000 } + { Severity = NotificationSeverity.Error, Summary = myText.Tips, Detail = "标定异常", Duration = 3000 } ); } } @@ -181,7 +184,7 @@ { _message.Notify( new NotificationMessage - { Severity = NotificationSeverity.Error, Summary = "提示", Detail = "请输入标定数量", Duration = 3000 }); + { Severity = NotificationSeverity.Error, Summary = myText.Tips, Detail = "请输入标定数量", Duration = 3000 }); } } // 取消 diff --git a/MasaBlazorApp3/Pages/BoxAddBox.razor b/MasaBlazorApp3/Pages/BoxAddBox.razor index 71237b2..2aaf671 100644 --- a/MasaBlazorApp3/Pages/BoxAddBox.razor +++ b/MasaBlazorApp3/Pages/BoxAddBox.razor @@ -44,38 +44,38 @@ - + - + @@ -83,6 +83,8 @@ @code { @inject IChannelListDao channelStockDao; @inject DialogService dialogService; + @inject Toolbelt.Blazor.I18nText.I18nText I18nText; + private I18nText.local myText = new I18nText.local(); RadzenDataGrid grid; bool isLoading; int count; @@ -94,6 +96,7 @@ protected override async Task OnInitializedAsync() { + myText = await I18nText.GetTextTableAsync(this); await base.OnInitializedAsync(); } diff --git a/MasaBlazorApp3/Pages/BoxAddDrug.razor b/MasaBlazorApp3/Pages/BoxAddDrug.razor index d29dd4e..afc2ad0 100644 --- a/MasaBlazorApp3/Pages/BoxAddDrug.razor +++ b/MasaBlazorApp3/Pages/BoxAddDrug.razor @@ -43,38 +43,38 @@ - + - + @@ -82,6 +82,8 @@ @code { @inject IChannelListDao channelStockDao; @inject DialogService dialogService; + @inject Toolbelt.Blazor.I18nText.I18nText I18nText; + private I18nText.local myText = new I18nText.local(); RadzenDataGrid grid; bool isLoading; int count; @@ -93,6 +95,7 @@ protected override async Task OnInitializedAsync() { + myText = await I18nText.GetTextTableAsync(this); await base.OnInitializedAsync(); } diff --git a/MasaBlazorApp3/Pages/BoxBind.razor b/MasaBlazorApp3/Pages/BoxBind.razor index 687e10c..7912262 100644 --- a/MasaBlazorApp3/Pages/BoxBind.razor +++ b/MasaBlazorApp3/Pages/BoxBind.razor @@ -12,39 +12,39 @@ @(channel.DrawerNo) - 号手术间 + @myText.Box @if (channel.TotalQuantity == 0) { - + }
- 套餐 + @myText.SetMenu @if (channel.DrugId == null || channel.TotalQuantity == 0) { - + - + - + } else { @(channel.PlanInfo.Name) } - 总库存 + @myText.TotalStock @(channel.TotalQuantity) @@ -60,6 +60,8 @@ @inject IDrugInfoDao drugInfoDao; @inject DialogService dialogService; @inject NotificationService _message + @inject Toolbelt.Blazor.I18nText.I18nText I18nText; + private I18nText.local myText = new I18nText.local(); RadzenDataList grid; bool isLoading; int count; @@ -77,6 +79,7 @@ protected override async Task OnInitializedAsync() { + myText = await I18nText.GetTextTableAsync(this); await base.OnInitializedAsync(); //drugInfos = await drugInfoDao.GetAllDrug(); diff --git a/MasaBlazorApp3/Pages/BoxReplace.razor b/MasaBlazorApp3/Pages/BoxReplace.razor index 75a6cd6..ac485e1 100644 --- a/MasaBlazorApp3/Pages/BoxReplace.razor +++ b/MasaBlazorApp3/Pages/BoxReplace.razor @@ -9,17 +9,17 @@ - 药名: + @myText.DrugName: @(channelStock.Drug.DrugName) - 规格: + @myText.Spec: @(channelStock.Drug.DrugSpec) - 批次: + @myText.Batch: @(channelStock.ManuNo) - 效期: + @myText.Expiration: @(channelStock.EffDate) - 库存: + @myText.Inventory: @(channelStock.Quantity) - 交换药箱: + @myText.ReplaceDrug: @(SelectedDrawerNo) @@ -27,21 +27,21 @@ - - + - - - - - - + + + + + + - + @@ -50,9 +50,9 @@ - + - + @@ -63,6 +63,8 @@ @inject IOptions setting; @inject NotificationService _message @inject PortUtil PortUtil; + @inject Toolbelt.Blazor.I18nText.I18nText I18nText; + private I18nText.local myText = new I18nText.local(); private readonly ILog logger = LogManager.GetLogger(typeof(OrderDetailDialog)); int status; @@ -86,8 +88,9 @@ protected override async Task OnInitializedAsync() { + myText = await I18nText.GetTextTableAsync(this); DrawerNos = await channelListDao.GetDrawerNum(channelStock); - base.OnInitializedAsync(); + await base.OnInitializedAsync(); } async Task LoadData(LoadDataArgs args) { @@ -127,18 +130,18 @@ { if (selectedDrawerData.Where(cs => cs.AddQuantity != 0).Sum(cs => cs.Quantity) > channelStock.Quantity) { - _message.Notify(new NotificationMessage { Severity = NotificationSeverity.Warning, Summary = "提示", Detail = $"交换总数量不能大于库存", Duration = 4000 }); + _message.Notify(new NotificationMessage { Severity = NotificationSeverity.Warning, Summary = myText.Tips, Detail = $"交换总数量不能大于库存", Duration = 4000 }); return; } var b = await channelListDao.BoxReplaceFinish(channelStock,selectedDrawerData.Where(cl => cl.AddQuantity != 0).ToList()); if (!b) { - _message.Notify(new NotificationMessage { Severity = NotificationSeverity.Error, Summary = "提示", Detail = $"数据保存失败", Duration = 4000 }); + _message.Notify(new NotificationMessage { Severity = NotificationSeverity.Error, Summary = myText.Tips, Detail = $"数据保存失败", Duration = 4000 }); logger.Error($"药箱药品替换保存数据库失败，数据{JsonConvert.SerializeObject(selectedDrawerData.Where(cl => cl.AddQuantity != 0).ToList())}"); } else { - _message.Notify(new NotificationMessage { Severity = NotificationSeverity.Success, Summary = "提示", Detail = $"交换完成", Duration = 4000 }); + _message.Notify(new NotificationMessage { Severity = NotificationSeverity.Success, Summary = myText.Tips, Detail = $"交换完成", Duration = 4000 }); // 关闭弹窗 dialogService.Close(true); @@ -148,7 +151,7 @@ } else { - _message.Notify(new NotificationMessage { Severity = NotificationSeverity.Warning, Summary = "提示", Detail = $"无可交换数据或未输入交换数量", Duration = 4000 }); + _message.Notify(new NotificationMessage { Severity = NotificationSeverity.Warning, Summary = myText.Tips, Detail = $"无可交换数据或未输入交换数量", Duration = 4000 }); return; } } diff --git a/MasaBlazorApp3/Pages/BoxStock.razor b/MasaBlazorApp3/Pages/BoxStock.razor index c7d0782..23d1085 100644 --- a/MasaBlazorApp3/Pages/BoxStock.razor +++ b/MasaBlazorApp3/Pages/BoxStock.razor @@ -90,29 +90,29 @@ @if (manuNo == 0) { - 批次 + @myText.Batch } @(manuInfo.ManuNo) @if (manuNo == 0) { - 效期 + @myText.Expiration } @(manuInfo.EffDate) @if (manuNo == 0) { - 库存 + @myText.Inventory } @(manuInfo.Quantity) - + - + } @@ -120,7 +120,7 @@ { - 未绑定批次 + @myText.NotBind } @@ -140,6 +140,8 @@ @inject DialogService dialogService; @inject Microsoft.Extensions.Options.IOptions setting; @inject NotificationService _message + @inject Toolbelt.Blazor.I18nText.I18nText I18nText; + private I18nText.local myText = new I18nText.local(); private IEnumerable? _forecasts; bool allowRowSelectOnRowClick = true; @@ -159,6 +161,11 @@ this.drawerNo = drawerNo; grid.Reload(); } + protected override async Task OnInitializedAsync() + { + myText = await I18nText.GetTextTableAsync(this); + await base.OnInitializedAsync(); + } // void OnCurrentDateChanged(DateTime args) // { // OrderDate = new DateTime(args.Year, args.Month, args.Day); @@ -209,7 +216,7 @@ { //库存为0无法操作 _message.Notify( - new NotificationMessage { Severity = NotificationSeverity.Error, Summary = "提示", Detail = $"库存为0无法替换", Duration = 4000 } + new NotificationMessage { Severity = NotificationSeverity.Error, Summary = myText.Tips, Detail = $"库存为0无法替换", Duration = 4000 } ); } } @@ -232,7 +239,7 @@ { //库存为0无法操作 _message.Notify( - new NotificationMessage { Severity = NotificationSeverity.Error, Summary = "提示", Detail = $"库存为0，没有要移出的药品", Duration = 4000 } + new NotificationMessage { Severity = NotificationSeverity.Error, Summary = myText.Tips, Detail = $"库存为0，没有要移出的药品", Duration = 4000 } ); } } diff --git a/MasaBlazorApp3/Pages/ChangeShifts.razor b/MasaBlazorApp3/Pages/ChangeShifts.razor index 6310490..db86a25 100644 --- a/MasaBlazorApp3/Pages/ChangeShifts.razor +++ b/MasaBlazorApp3/Pages/ChangeShifts.razor @@ -17,30 +17,30 @@ @if (userI == 1) { - 请交班操作人 @FromOperator?.NickName -

登录验证

+ @myText.HandoverOperator1 @FromOperator?.NickName +

@myText.LoginCheck

 } else if (userI == 2) { - 请交班复核人 @FromRviewer?.NickName -

登录验证

+ @myText.HandoverChecker1 @FromRviewer?.NickName +

@myText.LoginCheck

 } else @if (userI == 3) { - 请接班操作人 @ToOperator?.NickName -

登录验证

+ @myText.HandoverOperator2 @ToOperator?.NickName +

@myText.LoginCheck

 } else if (userI == 4) { - 请接班复核人 @ToReviewer?.NickName -

登录验证

+ @myText.HandoverChecker2 @ToReviewer?.NickName +

@myText.LoginCheck

 } @@ -48,29 +48,29 @@ - 登录 + @myText.Login
- +
- +
- +
@@ -90,6 +90,8 @@ @inject GlobalStateService globalStateService; @inject IUserDao userDao; @inject Microsoft.Extensions.Options.IOptions setting; + @inject Toolbelt.Blazor.I18nText.I18nText I18nText; + private I18nText.local myText = new I18nText.local(); @@ -110,8 +112,9 @@ private Pojo.User loginModel = new(); - protected override Task OnInitializedAsync() + protected override async Task OnInitializedAsync() { + myText = await I18nText.GetTextTableAsync(this); FingerprintUtil.axCZKEM1.OnAttTransactionEx += axCZKEM1_OnAttTransactionEx; loginMode = setting.Value.loginMode; @@ -127,7 +130,7 @@ { FromRviewer = userDao.GetByUsername(hkcChange.FromRviewer); } - return base.OnInitializedAsync(); + await base.OnInitializedAsync(); } private async Task SetUser(Pojo.User user) diff --git a/MasaBlazorApp3/Pages/ChangeShiftsList.razor b/MasaBlazorApp3/Pages/ChangeShiftsList.razor index 702c414..4641530 100644 --- a/MasaBlazorApp3/Pages/ChangeShiftsList.razor +++ b/MasaBlazorApp3/Pages/ChangeShiftsList.razor @@ -5,11 +5,11 @@
- + - + @@ -17,7 +17,7 @@ - + @@ -26,8 +26,8 @@ - - + + @@ -40,36 +40,36 @@ LoadData="@LoadData" IsLoading="@isLoading" Count="@count" - EmptyText="无数据" + EmptyText="@myText.NoDate" Data="@_forecasts" AllowColumnResize="true" AllowAlternatingRows="false" SelectionMode="DataGridSelectionMode.Single" AllowPaging="true" PageSize="10" PagerHorizontalAlign="HorizontalAlign.Left" ShowPagingSummary="true" PagingSummaryFormat="{0}/{1} 共{2}条数据"> - + - - - - - + + + + + - + @@ -84,6 +84,10 @@ @inject DialogService dialogService; @inject NavigationManager navigate; + + @inject Toolbelt.Blazor.I18nText.I18nText I18nText; + private I18nText.local myText = new I18nText.local(); + RadzenDataGrid grid; bool isLoading; int count; @@ -120,4 +124,9 @@ end = DateTime.MinValue; await grid.Reload(); } + protected override async Task OnInitializedAsync() + { + myText = await I18nText.GetTextTableAsync(this); + await base.OnInitializedAsync(); + } } \ No newline at end of file diff --git a/MasaBlazorApp3/Pages/CheckOrder.razor b/MasaBlazorApp3/Pages/CheckOrder.razor index f5e21b7..ea2c7d9 100644 --- a/MasaBlazorApp3/Pages/CheckOrder.razor +++ b/MasaBlazorApp3/Pages/CheckOrder.razor @@ -13,11 +13,11 @@
- + - + @@ -25,7 +25,7 @@ - + @@ -34,18 +34,18 @@ - - + + - + @@ -60,10 +60,10 @@ TValue="bool" Change="@(args => { if (!allowRowSelectOnRowClick) { grid.SelectRow(data); } })" /> - - - - + + + + - + - +