From 5a18183ea2296df8e1c69cf9edefbda518579f70 Mon Sep 17 00:00:00 2001 From: qian Date: Thu, 7 Dec 2023 09:41:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 北京北汽/SCP/Admin/profile.aspx.cs | 12 +- 北京北汽/SCP/Business/PageBase.cs | 25 +++- 北京北汽/SCP/Views/BasicData/Price.aspx | 32 ++-- .../SCP/Views/BasicData/Price.aspx.cs | 89 +++++++----- .../Views/BasicData/Price.aspx.designer.cs | 63 ++++++++ .../SCP/Views/BasicData/SCP_LANGUAGE.aspx | 137 +++++++++--------- .../SCP/Views/BasicData/SCP_LANGUAGE.aspx.cs | 27 +++- .../BasicData/SCP_LANGUAGE.aspx.designer.cs | 74 ++++++---- .../SCP/Views/BasicData/SCP_MoldSharing.aspx | 4 +- .../Views/BasicData/SCP_MoldSharing.aspx.cs | 5 + .../SCP_MoldSharing.aspx.designer.cs | 64 +++++--- .../SCP/Views/PlanData/ASN_STATE.aspx | 4 +- .../SCP/Views/PlanData/ASN_STATE.aspx.cs | 3 + .../Views/PlanData/ASN_STATE.aspx.designer.cs | 38 +++-- .../SCP/Views/PlanData/SCP_ARRIVE_DETAIL.aspx | 8 +- .../Views/PlanData/SCP_ARRIVE_DETAIL.aspx.cs | 6 + .../SCP_ARRIVE_DETAIL.aspx.designer.cs | 67 ++++++--- .../Views/PlanData/SCP_INCOMPLETE_ASK.aspx | 4 +- .../Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs | 4 + .../SCP/Views/SupplierData/SCP_ARRIVE.aspx | 8 +- .../SCP/Views/SupplierData/SCP_ARRIVE.aspx.cs | 8 +- .../SupplierData/SCP_ARRIVE.aspx.designer.cs | 85 +++++++---- .../Views/SupplierData/SCP_ARRIVE_DETAIL.aspx | 8 +- .../SupplierData/SCP_ARRIVE_DETAIL.aspx.cs | 6 + .../SCP_ARRIVE_DETAIL.aspx.designer.cs | 76 +++++++--- .../SCP/Views/SupplierData/SCP_ASK.aspx.cs | 13 +- .../Views/SupplierData/SCP_ASK_DETAIL.aspx.cs | 5 +- .../SCP/Views/SupplierData/SCP_ASN.aspx.cs | 13 +- .../Views/SupplierData/SCP_ASN_CREATE.aspx.cs | 21 +-- .../Views/SupplierData/SCP_ASN_DETAIL.aspx.cs | 47 +++--- .../Views/SupplierData/SCP_INVOICE.aspx.cs | 9 +- .../SupplierData/SCP_INVOICE_CREATE.aspx.cs | 15 +- .../SupplierData/SCP_INVOICE_EDIT.aspx.cs | 35 +++-- .../SCP/Views/SupplierData/SCP_PALLET.aspx.cs | 3 +- .../SupplierData/SCP_PALLET_CREATE.aspx.cs | 9 +- .../SupplierData/SCP_RECEIVE_LIST.aspx.cs | 35 ++--- 北京北汽/SCP/default_hb.aspx | 12 +- 北京北汽/SCP/default_hb.aspx.cs | 11 +- 北京北汽/SCP/res/css/main3.css | 2 +- 39 files changed, 702 insertions(+), 385 deletions(-) diff --git a/北京北汽/SCP/Admin/profile.aspx.cs b/北京北汽/SCP/Admin/profile.aspx.cs index 87b89d9..c1ab16f 100644 --- a/北京北汽/SCP/Admin/profile.aspx.cs +++ b/北京北汽/SCP/Admin/profile.aspx.cs @@ -54,7 +54,7 @@ namespace SCP.admin if (newPass != confirmNewPass) { - tbxConfirmNewPassword.MarkInvalid("确认密码和新密码不一致!"); + tbxConfirmNewPassword.MarkInvalid(GetResourceKey("确认密码和新密码不一致!")); return; } @@ -64,7 +64,7 @@ namespace SCP.admin { if (!PasswordUtil.ComparePasswords(user.Password, oldPass)) { - tbxOldPassword.MarkInvalid("当前密码不正确!"); + tbxOldPassword.MarkInvalid(GetResourceKey("当前密码不正确!")); return; } @@ -81,7 +81,7 @@ namespace SCP.admin user.Password = PasswordUtil.CreateDbPassword(newPass); DB.SaveChanges(); - Alert.ShowInTop("修改密码成功!"); + Alert.ShowInTop(GetResourceKey("修改密码成功!")); } } @@ -107,12 +107,12 @@ namespace SCP.admin } else { - tbxEmail.MarkInvalid("请填写正确的邮箱格式!"); + tbxEmail.MarkInvalid(GetResourceKey( "请填写正确的邮箱格式!")); return; } DB.SaveChanges(); - - Alert.ShowInTop("用户信息修改成功!"); + String MESSAGE = GetResourceKey("用户信息修改成功!"); + Alert.ShowInTop(MESSAGE); } } diff --git a/北京北汽/SCP/Business/PageBase.cs b/北京北汽/SCP/Business/PageBase.cs index b3bd6d5..3d553c1 100644 --- a/北京北汽/SCP/Business/PageBase.cs +++ b/北京北汽/SCP/Business/PageBase.cs @@ -1241,7 +1241,7 @@ namespace SCP if (!string.IsNullOrEmpty(p_key)) { List _ls = null; - if (Application["LanguageList"] == null) + if (Application["LanguageList"] == null) { Application["LanguageList"] = ScpCache.LangauageList; } @@ -1356,6 +1356,15 @@ namespace SCP { CheckBoxList _cbl = p_crtl as CheckBoxList; _cbl.Label = GetResourceKey(_cbl.Label); + foreach (var itm in _cbl.Items) + { + itm.Text = GetResourceKey(itm.Text); + } + } + if (p_crtl is CheckBox) + { + CheckBox _cb = p_crtl as CheckBox; + _cb.Label = GetResourceKey(_cb.Label); } if (p_crtl is FineUI.Region) { @@ -1367,6 +1376,16 @@ namespace SCP Tab _tab = p_crtl as Tab; _tab.Title = GetResourceKey(_tab.Title); } + if (p_crtl is LinkButton) + { + LinkButton linkButton = p_crtl as LinkButton; + linkButton.Text = GetResourceKey(linkButton.Text); + } + if (p_crtl is ToolbarText) + { + ToolbarText toolbarText = p_crtl as ToolbarText; + toolbarText.Text = GetResourceKey(toolbarText.Text); + } } } @@ -1547,7 +1566,7 @@ namespace SCP #endregion - public static string EntityListToExcel2003(Dictionary cellHeard, IList enList, string sheetName, string title = null) + public string EntityListToExcel2003(Dictionary cellHeard, IList enList, string sheetName, string title = null) { try { @@ -1701,7 +1720,7 @@ namespace SCP FileStream file = new FileStream(filePath, FileMode.Create); workbook.Write(file); file.Close(); - Alert.Show($"{fileName}", "文件导出成功,请点击文件名下载", MessageBoxIcon.Information); + Alert.Show($"{fileName}", GetResourceKey("文件导出成功,请点击文件名下载"), MessageBoxIcon.Information); // 5.返回下载路径 return urlPath; diff --git a/北京北汽/SCP/Views/BasicData/Price.aspx b/北京北汽/SCP/Views/BasicData/Price.aspx index 9d39754..319423e 100644 --- a/北京北汽/SCP/Views/BasicData/Price.aspx +++ b/北京北汽/SCP/Views/BasicData/Price.aspx @@ -63,9 +63,9 @@