diff --git a/EOM.Client.TopSkyHotelManagementSystem.sln b/EOM.Client.TopSkyHotelManagementSystem.sln index 9858e69e58c3e68608ea19efb8012496801c79bb..b8440f06daaae7cae65c0e7b44da0ca54fba5904 100644 --- a/EOM.Client.TopSkyHotelManagementSystem.sln +++ b/EOM.Client.TopSkyHotelManagementSystem.sln @@ -28,50 +28,50 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManagement.Migra EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B55975AB-2C89-4C01-B107-D87FCA21A5E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B55975AB-2C89-4C01-B107-D87FCA21A5E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B55975AB-2C89-4C01-B107-D87FCA21A5E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B55975AB-2C89-4C01-B107-D87FCA21A5E3}.Release|Any CPU.Build.0 = Release|Any CPU - {8F5CF88A-1111-44CC-AFFA-4637EA10E191}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F5CF88A-1111-44CC-AFFA-4637EA10E191}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F5CF88A-1111-44CC-AFFA-4637EA10E191}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F5CF88A-1111-44CC-AFFA-4637EA10E191}.Release|Any CPU.Build.0 = Release|Any CPU - {566D7064-EA90-45C1-93B7-F512BBAD7BA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {566D7064-EA90-45C1-93B7-F512BBAD7BA1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {566D7064-EA90-45C1-93B7-F512BBAD7BA1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {566D7064-EA90-45C1-93B7-F512BBAD7BA1}.Release|Any CPU.Build.0 = Release|Any CPU - {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Release|Any CPU.Build.0 = Release|Any CPU - {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}.Release|Any CPU.Build.0 = Release|Any CPU - {781CEE04-DDB4-4037-8175-9A6548716871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {781CEE04-DDB4-4037-8175-9A6548716871}.Debug|Any CPU.Build.0 = Debug|Any CPU - {781CEE04-DDB4-4037-8175-9A6548716871}.Release|Any CPU.ActiveCfg = Release|Any CPU - {781CEE04-DDB4-4037-8175-9A6548716871}.Release|Any CPU.Build.0 = Release|Any CPU - {D89E76F5-007B-4915-91A8-265CCA6814BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D89E76F5-007B-4915-91A8-265CCA6814BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D89E76F5-007B-4915-91A8-265CCA6814BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D89E76F5-007B-4915-91A8-265CCA6814BF}.Release|Any CPU.Build.0 = Release|Any CPU - {1A37446C-A721-4507-89B5-7BFF6F66A004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A37446C-A721-4507-89B5-7BFF6F66A004}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A37446C-A721-4507-89B5-7BFF6F66A004}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A37446C-A721-4507-89B5-7BFF6F66A004}.Release|Any CPU.Build.0 = Release|Any CPU - {7E8046FD-4CB3-4BBC-8ADD-E27FE3DBBB55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E8046FD-4CB3-4BBC-8ADD-E27FE3DBBB55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E8046FD-4CB3-4BBC-8ADD-E27FE3DBBB55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E8046FD-4CB3-4BBC-8ADD-E27FE3DBBB55}.Release|Any CPU.Build.0 = Release|Any CPU - {A1A986E0-E59D-4913-B63E-D965453B8CC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1A986E0-E59D-4913-B63E-D965453B8CC0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1A986E0-E59D-4913-B63E-D965453B8CC0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1A986E0-E59D-4913-B63E-D965453B8CC0}.Release|Any CPU.Build.0 = Release|Any CPU + {B55975AB-2C89-4C01-B107-D87FCA21A5E3}.Debug|x64.ActiveCfg = Debug|x64 + {B55975AB-2C89-4C01-B107-D87FCA21A5E3}.Debug|x64.Build.0 = Debug|x64 + {B55975AB-2C89-4C01-B107-D87FCA21A5E3}.Release|x64.ActiveCfg = Release|x64 + {B55975AB-2C89-4C01-B107-D87FCA21A5E3}.Release|x64.Build.0 = Release|x64 + {8F5CF88A-1111-44CC-AFFA-4637EA10E191}.Debug|x64.ActiveCfg = Debug|x64 + {8F5CF88A-1111-44CC-AFFA-4637EA10E191}.Debug|x64.Build.0 = Debug|x64 + {8F5CF88A-1111-44CC-AFFA-4637EA10E191}.Release|x64.ActiveCfg = Release|x64 + {8F5CF88A-1111-44CC-AFFA-4637EA10E191}.Release|x64.Build.0 = Release|x64 + {566D7064-EA90-45C1-93B7-F512BBAD7BA1}.Debug|x64.ActiveCfg = Debug|x64 + {566D7064-EA90-45C1-93B7-F512BBAD7BA1}.Debug|x64.Build.0 = Debug|x64 + {566D7064-EA90-45C1-93B7-F512BBAD7BA1}.Release|x64.ActiveCfg = Release|x64 + {566D7064-EA90-45C1-93B7-F512BBAD7BA1}.Release|x64.Build.0 = Release|x64 + {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Debug|x64.ActiveCfg = Debug|x64 + {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Debug|x64.Build.0 = Debug|x64 + {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Release|x64.ActiveCfg = Release|x64 + {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Release|x64.Build.0 = Release|x64 + {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}.Debug|x64.ActiveCfg = Debug|x64 + {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}.Debug|x64.Build.0 = Debug|x64 + {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}.Release|x64.ActiveCfg = Release|x64 + {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}.Release|x64.Build.0 = Release|x64 + {781CEE04-DDB4-4037-8175-9A6548716871}.Debug|x64.ActiveCfg = Debug|x64 + {781CEE04-DDB4-4037-8175-9A6548716871}.Debug|x64.Build.0 = Debug|x64 + {781CEE04-DDB4-4037-8175-9A6548716871}.Release|x64.ActiveCfg = Release|x64 + {781CEE04-DDB4-4037-8175-9A6548716871}.Release|x64.Build.0 = Release|x64 + {D89E76F5-007B-4915-91A8-265CCA6814BF}.Debug|x64.ActiveCfg = Debug|x64 + {D89E76F5-007B-4915-91A8-265CCA6814BF}.Debug|x64.Build.0 = Debug|x64 + {D89E76F5-007B-4915-91A8-265CCA6814BF}.Release|x64.ActiveCfg = Release|x64 + {D89E76F5-007B-4915-91A8-265CCA6814BF}.Release|x64.Build.0 = Release|x64 + {1A37446C-A721-4507-89B5-7BFF6F66A004}.Debug|x64.ActiveCfg = Debug|x64 + {1A37446C-A721-4507-89B5-7BFF6F66A004}.Debug|x64.Build.0 = Debug|x64 + {1A37446C-A721-4507-89B5-7BFF6F66A004}.Release|x64.ActiveCfg = Release|x64 + {1A37446C-A721-4507-89B5-7BFF6F66A004}.Release|x64.Build.0 = Release|x64 + {7E8046FD-4CB3-4BBC-8ADD-E27FE3DBBB55}.Debug|x64.ActiveCfg = Debug|x64 + {7E8046FD-4CB3-4BBC-8ADD-E27FE3DBBB55}.Debug|x64.Build.0 = Debug|x64 + {7E8046FD-4CB3-4BBC-8ADD-E27FE3DBBB55}.Release|x64.ActiveCfg = Release|x64 + {7E8046FD-4CB3-4BBC-8ADD-E27FE3DBBB55}.Release|x64.Build.0 = Release|x64 + {A1A986E0-E59D-4913-B63E-D965453B8CC0}.Debug|x64.ActiveCfg = Debug|x64 + {A1A986E0-E59D-4913-B63E-D965453B8CC0}.Debug|x64.Build.0 = Debug|x64 + {A1A986E0-E59D-4913-B63E-D965453B8CC0}.Release|x64.ActiveCfg = Release|x64 + {A1A986E0-E59D-4913-B63E-D965453B8CC0}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/EOM.TSHotelManagement.Common/BackendApi/ApiConstants.cs b/EOM.TSHotelManagement.Common/BackendApi/ApiConstants.cs index 03ae1bf2f409abdc4281efd200df0609276d8f09..ac3a2abb03977309323f68ad2ad7f532bd4c3832 100644 --- a/EOM.TSHotelManagement.Common/BackendApi/ApiConstants.cs +++ b/EOM.TSHotelManagement.Common/BackendApi/ApiConstants.cs @@ -2,6 +2,7 @@ { public static class ApiConstants { + public const string Default_Version = "version"; // Base URLs public const string Base_SelectNationAll = "Base/SelectNationAll"; public const string Base_SelectGenderTypeAll = "Base/SelectGenderTypeAll"; @@ -74,7 +75,7 @@ public const string Spend_UpdateSpendInfoByRoomNo = "Spend​/UpdateSpendInfoByRoomNo"; public const string Spend_AddCustomerSpend = "Spend​/AddCustomerSpend"; public const string Spend_SeletHistorySpendInfoAll = "Spend/SeletHistorySpendInfoAll"; - public const string Spend_UpdSpenInfo = "Spend/UpdSpenInfo"; + public const string Spend_UpdSpendInfo = "Spend/UpdSpendInfo"; public const string Spend_UndoCustomerSpend = "Spend/UndoCustomerSpend"; // EnergyManagement URLs diff --git a/EOM.TSHotelManagement.Common/EOM.TSHotelManagement.Common.csproj b/EOM.TSHotelManagement.Common/EOM.TSHotelManagement.Common.csproj index 8dd223e611a7a1e1db71c17b2030f6cf7871c582..640dd30dce3c1b26168e89d7c853c5c0cabbfb84 100644 --- a/EOM.TSHotelManagement.Common/EOM.TSHotelManagement.Common.csproj +++ b/EOM.TSHotelManagement.Common/EOM.TSHotelManagement.Common.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + x64 diff --git a/EOM.TSHotelManagement.Common/Helper/HttpHelper.cs b/EOM.TSHotelManagement.Common/Helper/HttpHelper.cs index 3c334a51ca9cb9b125448d4813cbaf408cf54fa6..104eb1313250e50b25068e83e2f75c205454371a 100644 --- a/EOM.TSHotelManagement.Common/Helper/HttpHelper.cs +++ b/EOM.TSHotelManagement.Common/Helper/HttpHelper.cs @@ -22,7 +22,7 @@ namespace EOM.TSHotelManagement.Common /// /// WebApi URL /// - public const string apiUrl = "https://tshotel-api.oscode.top/api/"; + public const string apiUrl = "https://tshotel.oscode.top/api/"; #endif public class IgnoreNullValuesConverter : JsonConverter diff --git a/EOM.TSHotelManagement.Common/LocalInfo/LoginInfo.cs b/EOM.TSHotelManagement.Common/LocalInfo/LoginInfo.cs index bd3a346a4017746cb924efe1453046844c37d173..e4160e49f7fb87a6be1ccf6cbc18039681107854 100644 --- a/EOM.TSHotelManagement.Common/LocalInfo/LoginInfo.cs +++ b/EOM.TSHotelManagement.Common/LocalInfo/LoginInfo.cs @@ -59,6 +59,11 @@ namespace EOM.TSHotelManagement.Common /// public static string UserToken = ""; + /// + /// 存储当前用户密码 + /// + public static string Password = ""; + /// /// 软件更新日志 /// diff --git a/EOM.TSHotelManagement.Common/Util/ApplicationUtil.cs b/EOM.TSHotelManagement.Common/Util/ApplicationUtil.cs index a296c1b3b020bb77755cf52c0a9e6b139d6e01e2..b0d326ebf24ac5a1f69ffccf0c2556763ed16825 100644 --- a/EOM.TSHotelManagement.Common/Util/ApplicationUtil.cs +++ b/EOM.TSHotelManagement.Common/Util/ApplicationUtil.cs @@ -1,7 +1,9 @@ using EOM.TSHotelManagement.Common.Contract; +using EOM.TSHotelManagement.Common.Util; using jvncorelib.EntityLib; using System.Diagnostics; using System.Reflection; +using System.Runtime.InteropServices; namespace EOM.TSHotelManagement.Common { @@ -27,14 +29,14 @@ namespace EOM.TSHotelManagement.Common }; ResponseMsg result = HttpHelper.Request(ApiConstants.Utility_SelectCardCode, input.ModelToJson()); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { return new Card { message = "SelectCardCode+接口服务异常，请提交Issue或尝试更新版本！" }; } - if (!response.Source.IsNullOrEmpty()) + if (!response.Data.IsNullOrEmpty()) { - var address = $"{response.Source.Province}{response.Source.City}{response.Source.District}"; + var address = $"{response.Data.Province}{response.Data.City}{response.Data.District}"; var birthday = code.Substring(6, 4) + "-" + code.Substring(10, 2) + "-" + code.Substring(12, 2); var sex = code.Substring(14, 3); //性别代码为偶数是女性奇数为男性 @@ -77,6 +79,47 @@ namespace EOM.TSHotelManagement.Common return null; } + /// + /// 获取服务器版本号 + /// + /// + public static string GetServerVersion() + { + var response = HttpHelper.Request(ApiConstants.Default_Version); + if (response is ResponseMsg responseMsg) + { + return responseMsg.message!.Split(':').Last().Trim().ToString(); + } + return string.Empty; + } + + /// + /// 获取当前计算机的系统架构 + /// + /// + public static string GetSystemArchitectureViaEnv() + { + return RuntimeInformation.OSArchitecture.ToString(); + } + + /// + /// 获取当前应用框架版本 + /// + /// + public static string GetApplicationFrameworkVersion() + { + return Environment.Version.ToString(); + } + + /// + /// 获取当前软件的名称 + /// + /// + public static string GetApplicationName() + { + return LocalizationHelper.GetLocalizedString("TopSky Hotel Management System", "TS酒店管理系统"); + } + /// /// 身份证实体类 /// diff --git a/EOM.TSHotelManagement.FormUI/App.config b/EOM.TSHotelManagement.FormUI/App.config index 49cc43e1d8f54e541889767ccf34bebecdf5255f..19a67baedfeea04cafc6031acc3db5665302c95f 100644 --- a/EOM.TSHotelManagement.FormUI/App.config +++ b/EOM.TSHotelManagement.FormUI/App.config @@ -1,3 +1,15 @@  + + +
+ + + + + + + + + \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmAbout.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAbout.Designer.cs new file mode 100644 index 0000000000000000000000000000000000000000..2cfdc1db901f53d3e667dc1d6d6407fc23452d33 --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAbout.Designer.cs @@ -0,0 +1,212 @@ +namespace EOM.TSHotelManagement.FormUI +{ + partial class FrmAbout + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAbout)); + btnClose = new AntdUI.Button(); + picLogo = new PictureBox(); + lblSoftName = new Label(); + lblServerVersion = new AntdUI.Label(); + lblClientVersion = new AntdUI.Label(); + lblServerVersionDescriotion = new AntdUI.Label(); + lblClientVersionDescriotion = new AntdUI.Label(); + lblCopyright = new AntdUI.Label(); + lblNotice = new AntdUI.Label(); + lblFrameworkVersion = new AntdUI.Label(); + lblFrameworkVersionDescription = new AntdUI.Label(); + ((System.ComponentModel.ISupportInitialize)picLogo).BeginInit(); + SuspendLayout(); + // + // btnClose + // + btnClose.BackColor = Color.Transparent; + btnClose.BackgroundImage = Properties.Resources.close; + btnClose.Font = new Font("Microsoft YaHei UI", 9F); + btnClose.Ghost = true; + btnClose.Location = new Point(348, 3); + btnClose.Name = "btnClose"; + btnClose.Size = new Size(41, 38); + btnClose.TabIndex = 42; + btnClose.Click += btnClose_Click; + // + // picLogo + // + picLogo.BackColor = Color.Transparent; + picLogo.BackgroundImage = (Image)resources.GetObject("picLogo.BackgroundImage"); + picLogo.BackgroundImageLayout = ImageLayout.Stretch; + picLogo.Cursor = Cursors.Hand; + picLogo.Location = new Point(113, 57); + picLogo.Margin = new Padding(4); + picLogo.Name = "picLogo"; + picLogo.Size = new Size(165, 111); + picLogo.TabIndex = 43; + picLogo.TabStop = false; + // + // lblSoftName + // + lblSoftName.BackColor = Color.Transparent; + lblSoftName.FlatStyle = FlatStyle.Flat; + lblSoftName.Font = new Font("Noto Sans SC", 14.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + lblSoftName.Location = new Point(13, 195); + lblSoftName.Margin = new Padding(4, 0, 4, 0); + lblSoftName.Name = "lblSoftName"; + lblSoftName.Size = new Size(364, 36); + lblSoftName.TabIndex = 44; + lblSoftName.TextAlign = ContentAlignment.MiddleCenter; + // + // lblServerVersion + // + lblServerVersion.BackColor = Color.Transparent; + lblServerVersion.Font = new Font("Noto Sans SC", 9F); + lblServerVersion.Location = new Point(194, 287); + lblServerVersion.Name = "lblServerVersion"; + lblServerVersion.Size = new Size(103, 23); + lblServerVersion.TabIndex = 48; + lblServerVersion.Text = ""; + // + // lblClientVersion + // + lblClientVersion.BackColor = Color.Transparent; + lblClientVersion.Font = new Font("Noto Sans SC", 9F); + lblClientVersion.Location = new Point(194, 258); + lblClientVersion.Name = "lblClientVersion"; + lblClientVersion.Size = new Size(103, 23); + lblClientVersion.TabIndex = 47; + lblClientVersion.Text = ""; + // + // lblServerVersionDescriotion + // + lblServerVersionDescriotion.BackColor = Color.Transparent; + lblServerVersionDescriotion.Font = new Font("Noto Sans SC", 9F); + lblServerVersionDescriotion.Location = new Point(94, 287); + lblServerVersionDescriotion.Name = "lblServerVersionDescriotion"; + lblServerVersionDescriotion.Size = new Size(90, 23); + lblServerVersionDescriotion.TabIndex = 46; + lblServerVersionDescriotion.Text = ""; + lblServerVersionDescriotion.TextAlign = ContentAlignment.MiddleRight; + // + // lblClientVersionDescriotion + // + lblClientVersionDescriotion.BackColor = Color.Transparent; + lblClientVersionDescriotion.Font = new Font("Noto Sans SC", 9F); + lblClientVersionDescriotion.Location = new Point(94, 258); + lblClientVersionDescriotion.Name = "lblClientVersionDescriotion"; + lblClientVersionDescriotion.Size = new Size(90, 23); + lblClientVersionDescriotion.TabIndex = 45; + lblClientVersionDescriotion.Text = ""; + lblClientVersionDescriotion.TextAlign = ContentAlignment.MiddleRight; + // + // lblCopyright + // + lblCopyright.BackColor = Color.Transparent; + lblCopyright.Font = new Font("Noto Sans SC", 9F); + lblCopyright.Location = new Point(71, 346); + lblCopyright.Name = "lblCopyright"; + lblCopyright.Size = new Size(240, 23); + lblCopyright.TabIndex = 49; + lblCopyright.Text = ""; + lblCopyright.TextAlign = ContentAlignment.MiddleCenter; + // + // lblNotice + // + lblNotice.BackColor = Color.Transparent; + lblNotice.Font = new Font("Noto Sans SC", 9F); + lblNotice.Location = new Point(71, 375); + lblNotice.Name = "lblNotice"; + lblNotice.Size = new Size(240, 23); + lblNotice.TabIndex = 50; + lblNotice.Text = ""; + lblNotice.TextAlign = ContentAlignment.MiddleCenter; + // + // lblFrameworkVersion + // + lblFrameworkVersion.BackColor = Color.Transparent; + lblFrameworkVersion.Font = new Font("Noto Sans SC", 9F); + lblFrameworkVersion.Location = new Point(194, 316); + lblFrameworkVersion.Name = "lblFrameworkVersion"; + lblFrameworkVersion.Size = new Size(103, 23); + lblFrameworkVersion.TabIndex = 52; + lblFrameworkVersion.Text = ""; + // + // lblFrameworkVersionDescription + // + lblFrameworkVersionDescription.BackColor = Color.Transparent; + lblFrameworkVersionDescription.Font = new Font("Noto Sans SC", 9F); + lblFrameworkVersionDescription.Location = new Point(94, 316); + lblFrameworkVersionDescription.Name = "lblFrameworkVersionDescription"; + lblFrameworkVersionDescription.Size = new Size(90, 23); + lblFrameworkVersionDescription.TabIndex = 51; + lblFrameworkVersionDescription.Text = ""; + lblFrameworkVersionDescription.TextAlign = ContentAlignment.MiddleRight; + // + // FrmAbout + // + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.FromArgb(235, 243, 255); + ClientSize = new Size(390, 476); + Controls.Add(lblFrameworkVersion); + Controls.Add(lblFrameworkVersionDescription); + Controls.Add(lblNotice); + Controls.Add(lblCopyright); + Controls.Add(lblServerVersion); + Controls.Add(lblClientVersion); + Controls.Add(lblServerVersionDescriotion); + Controls.Add(lblClientVersionDescriotion); + Controls.Add(lblSoftName); + Controls.Add(picLogo); + Controls.Add(btnClose); + FormBorderStyle = FormBorderStyle.FixedSingle; + Icon = (Icon)resources.GetObject("$this.Icon"); + Margin = new Padding(2); + Name = "FrmAbout"; + StartPosition = FormStartPosition.CenterScreen; + Text = "关于我们"; + Load += FrmAboutUs_Load; + MouseDown += FrmAboutUs_MouseDown; + MouseMove += FrmAboutUs_MouseMove; + ((System.ComponentModel.ISupportInitialize)picLogo).EndInit(); + ResumeLayout(false); + } + + #endregion + + private AntdUI.Button btnClose; + private PictureBox picLogo; + private Label lblSoftName; + private AntdUI.Label lblServerVersion; + private AntdUI.Label lblClientVersion; + private AntdUI.Label lblServerVersionDescriotion; + private AntdUI.Label lblClientVersionDescriotion; + private AntdUI.Label lblCopyright; + private AntdUI.Label lblNotice; + private AntdUI.Label lblFrameworkVersion; + private AntdUI.Label lblFrameworkVersionDescription; + } +} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAbout.cs similarity index 63% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.cs rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmAbout.cs index 356cf88cd9a17495f1a02d70be5af4537c237a30..80062be8ceafbdcc011bb5f8289fd54347c0c98e 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAbout.cs @@ -22,13 +22,14 @@ * */ using AntdUI; +using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Util; namespace EOM.TSHotelManagement.FormUI { - public partial class FrmAboutUs : Window + public partial class FrmAbout : Window { - public FrmAboutUs() + public FrmAbout() { InitializeComponent(); } @@ -61,11 +62,23 @@ namespace EOM.TSHotelManagement.FormUI private void FrmAboutUs_Load(object sender, EventArgs e) { - rtbAboutUs.Text = LocalizationHelper.GetLocalizedString("Our team has always been committed to creating a user-friendly and easy-to-use management software. Our vision is to use technology to create easy-to-use open source software/components and to create software with a vision in mind. Our team is full of vitality and passion!\r\n Regarding our team, you can browse: https://www.oscode.top Learn more! \r\n For detailed information about this software, you can browse: https://gitee.com/java-and-net/TopskyHotelManagerSystem Learn more! In addition, we will still provide support for future version upgrades!", - " 我们团队一直都致力于打造一款人机交互方便，操作简单的管理软件，我们的愿景是“用技术创造易用的开源软件/组件”，一路心怀愿景去制作软件，我们的团队充满活力、激情！\r\n 关于我们团队，您可以浏览：https://www.oscode.top了解更多！ \r\n 关于本软件的详细信息，您可以浏览：https://gitee.com/java-and-net/TopskyHotelManagerSystem 了解更多！另外仍会提供后续的版本升级支持！"); + GetAboutInfo(); } - private void btnOk_Click(object sender, EventArgs e) + private void GetAboutInfo() + { + lblSoftName.Text = $"{ApplicationUtil.GetApplicationName()}"; + lblClientVersionDescriotion.Text = LocalizationHelper.GetLocalizedString("Client Version:", "客户端版本："); + lblClientVersion.Text = $"{ApplicationUtil.GetApplicationVersion()} ({ApplicationUtil.GetSystemArchitectureViaEnv()})"; + lblServerVersionDescriotion.Text = LocalizationHelper.GetLocalizedString("Server Version:", "服务端版本："); + lblServerVersion.Text = $"{ApplicationUtil.GetServerVersion()}"; + lblFrameworkVersionDescription.Text = LocalizationHelper.GetLocalizedString("Framework Version:", "框架版本："); + lblFrameworkVersion.Text = $"{ApplicationUtil.GetApplicationFrameworkVersion()}"; + lblCopyright.Text = $"{LocalizationHelper.GetLocalizedString("Copyright", "版权所有")} © 2021-{DateTime.Now.Year} 易开元(EOM). "; + lblNotice.Text = $"{LocalizationHelper.GetLocalizedString("All rights reserved", "保留所有权利")}."; + } + + private void btnClose_Click(object sender, EventArgs e) { this.Close(); } diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmAbout.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAbout.resx new file mode 100644 index 0000000000000000000000000000000000000000..716ace164c853a061411a92e7f0a5f667c43e93e --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAbout.resx @@ -0,0 +1,567 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + 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 + AABJRU5ErkJggg== + + + \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.cs index 8276769aed2f3fad9ad9b783b20243f8df6bc7c0..a9e3b766dbb47119e0c4130b32d09e171d1a2656 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.cs @@ -43,12 +43,12 @@ namespace EOM.TSHotelManagement.FormUI { result = HttpHelper.Request(ApiConstants.Room_SelectCanUseRoomAll); var datas = HttpHelper.JsonToModel>(result.message); - if (datas.StatusCode != StatusCodeConstants.Success) + if (datas.Success) { UIMessageBox.ShowError($"{ApiConstants.Room_SelectCanUseRoomAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - cboRoomList.DataSource = datas.listSource; + cboRoomList.DataSource = datas.Data.Items; cboRoomList.DisplayMember = nameof(ReadRoomOutputDto.RoomNumber); cboRoomList.ValueMember = nameof(ReadRoomOutputDto.RoomNumber); } @@ -71,8 +71,8 @@ namespace EOM.TSHotelManagement.FormUI DataChgDate = Convert.ToDateTime(DateTime.Now) }; result = HttpHelper.Request(ApiConstants.Room_TransferRoom, HttpHelper.ModelToJson(transferRoom)); - var response = HttpHelper.JsonToModel(result.message!); - if (response.StatusCode != StatusCodeConstants.Success) + var response = HttpHelper.JsonToModel(result.message!); + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Room_TransferRoom}+接口服务异常，请提交Issue或尝试更新版本！"); return; @@ -109,12 +109,12 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.RoomType_SelectRoomTypeByRoomNo, dic); var data = HttpHelper.JsonToModel>(result.message); - if (data.StatusCode != StatusCodeConstants.Success) + if (data.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.RoomType_SelectRoomTypeByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - var roomType = data.Source; + var roomType = data.Data; lblRoomType.Text = roomType.RoomTypeName; } } diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.cs index 86df5cfc85de19fd54f631fc336269fe75833cc3..e2102fc8045f2b6ff9059ffcc1b7f33751a82f12 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.cs @@ -50,20 +50,20 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Room_SelectRoomByRoomNo, pairs); var response = HttpHelper.JsonToModel>(result.message!); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { UIMessageTip.ShowError($"{ApiConstants.Room_SelectRoomByRoomNo}+接口服务异常，请提交issue"); return; } - ReadRoomOutputDto r = response.Source; + ReadRoomOutputDto r = response.Data; result = HttpHelper.Request(ApiConstants.RoomType_SelectRoomTypeByRoomNo, pairs); var roomTypeResponse = HttpHelper.JsonToModel>(result.message!); - if (roomTypeResponse.StatusCode != StatusCodeConstants.Success) + if (roomTypeResponse.Code != BusinessStatusCode.Success) { UIMessageTip.ShowError($"{ApiConstants.RoomType_SelectRoomTypeByRoomNo}+接口服务异常，请提交issue"); return; } - ReadRoomTypeOutputDto t = roomTypeResponse.Source; + ReadRoomTypeOutputDto t = roomTypeResponse.Data; txtType.Text = t.RoomTypeName; txtMoney.Text = r.RoomRent.ToString(); txtRoomPosition.Text = r.RoomLocation; @@ -76,12 +76,12 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Customer_SelectCustomers, pairs); var customerResponse = HttpHelper.JsonToModel>(result.message!); - if (customerResponse.StatusCode != StatusCodeConstants.Success) + if (customerResponse.Code != BusinessStatusCode.Success) { UIMessageTip.ShowError($"{ApiConstants.Customer_SelectCustomers}+接口服务异常，请提交issue"); return; } - var custoList = customerResponse.listSource; + var custoList = customerResponse.Data.Items; if (custoList != null && custoList != null) { var ctos = custoList.Select(custo => custo.CustomerNumber).ToArray(); @@ -119,12 +119,12 @@ namespace EOM.TSHotelManagement.FormUI }; var result = HttpHelper.Request(ApiConstants.VipLevelRule_SelectVipRuleList, dic); var response = HttpHelper.JsonToModel>(result.message!); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { UIMessageTip.ShowError($"{ApiConstants.VipLevelRule_SelectVipRuleList}+接口服务异常，请提交issue: {response.Message}", 3000); } - var listVipRule = response.listSource + var listVipRule = response.Data.Items .OrderBy(a => a.RuleValue) .Distinct() .ToList(); @@ -133,12 +133,12 @@ namespace EOM.TSHotelManagement.FormUI var user = new Dictionary { { nameof(ReadSpendInputDto.CustomerNumber), txtCustoNo.Text.Trim() } }; result = HttpHelper.Request(ApiConstants.Spend_SeletHistorySpendInfoAll, user); var customerSpends = HttpHelper.JsonToModel>(result.message!); - if (customerSpends.StatusCode != StatusCodeConstants.Success) + if (customerSpends.Code != BusinessStatusCode.Success) { UIMessageTip.ShowError($"{ApiConstants.Spend_SeletHistorySpendInfoAll}+接口服务异常，请提交issue: {response.Message}", 3000); } - var listCustoSpend = customerSpends.listSource; + var listCustoSpend = customerSpends.Data.Items; if (!listCustoSpend.IsNullOrEmpty()) { var spendAmount = listCustoSpend.Sum(a => a.ConsumptionAmount); @@ -152,8 +152,8 @@ namespace EOM.TSHotelManagement.FormUI if (new_type != 0) { result = HttpHelper.Request(ApiConstants.Customer_UpdCustomerTypeByCustoNo, HttpHelper.ModelToJson(new UpdateCustomerInputDto { CustomerNumber = txtCustoNo.Text.Trim(), CustomerType = new_type })); - var updateResponse = HttpHelper.JsonToModel(result.message!); - if (updateResponse.StatusCode != StatusCodeConstants.Success) + var updateResponse = HttpHelper.JsonToModel(result.message!); + if (updateResponse.Code != BusinessStatusCode.Success) { throw new Exception($"{ApiConstants.Customer_UpdCustomerTypeByCustoNo}+接口服务异常"); } @@ -166,12 +166,12 @@ namespace EOM.TSHotelManagement.FormUI user = new Dictionary { { nameof(ReadCustomerInputDto.CustomerNumber), txtCustoNo.Text.Trim() } }; result = HttpHelper.Request(ApiConstants.Customer_SelectCustoByInfo, user); var customerResponse = HttpHelper.JsonToModel>(result.message!); - if (customerResponse.StatusCode != StatusCodeConstants.Success) + if (customerResponse.Code != BusinessStatusCode.Success) { throw new Exception($"{ApiConstants.Customer_SelectCustoByInfo}+接口服务异常"); } - var custo = customerResponse.Source; + var custo = customerResponse.Data; txtCustoName.Text = custo?.CustomerNumber ?? ""; txtCustoTel.Text = custo?.CustomerPhoneNumber ?? ""; txtCustoType.Text = custo?.CustomerTypeName ?? ""; @@ -183,12 +183,12 @@ namespace EOM.TSHotelManagement.FormUI var user = new Dictionary { { nameof(ReadCustomerInputDto.CustomerNumber), txtCustoNo.Text.Trim() } }; result = HttpHelper.Request(ApiConstants.Customer_SelectCustoByInfo, user); var customerResponse = HttpHelper.JsonToModel>(result.message!); - if (customerResponse.StatusCode != StatusCodeConstants.Success) + if (customerResponse.Code != BusinessStatusCode.Success) { throw new Exception($"{ApiConstants.Customer_SelectCustoByInfo}+接口服务异常"); } - var custo = customerResponse.Source; + var custo = customerResponse.Data; if (!custo.IsNullOrEmpty()) { using (TransactionScope scope = new TransactionScope()) @@ -202,8 +202,8 @@ namespace EOM.TSHotelManagement.FormUI DataChgUsr = LoginInfo.WorkerNo }; result = HttpHelper.Request(ApiConstants.Room_UpdateRoomInfo, HttpHelper.ModelToJson(r)); - var response = HttpHelper.JsonToModel(result.message!); - if (response.StatusCode != StatusCodeConstants.Success) + var response = HttpHelper.JsonToModel(result.message!); + if (response.Code != BusinessStatusCode.Success) { UIMessageTip.ShowError($"{ApiConstants.Room_UpdateRoomInfo}+接口服务异常，请提交issue"); UIMessageBox.Show("登记入住失败！", "登记提示", UIStyle.Red); diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.cs index 656bd327df85782720254969bb530a41e2b2faf1..919d9ebe504d80c0de9b6509f535f4b28fd86666 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.cs @@ -85,12 +85,12 @@ namespace EOM.TSHotelManagement.FormUI #region 加载客户类型信息 result = HttpHelper.Request(ApiConstants.Base_SelectCustoTypeAllCanUse); var customerTypes = HttpHelper.JsonToModel>(result.message); - if (customerTypes.StatusCode != StatusCodeConstants.Success) + if (customerTypes.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError("SelectCustoTypeAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); return; } - List lstSourceGrid = customerTypes.listSource; + List lstDataGrid = customerTypes.Data.Items; #endregion decimal sum = 0; @@ -105,13 +105,13 @@ namespace EOM.TSHotelManagement.FormUI result = HttpHelper.Request(ApiConstants.Room_SelectRoomByRoomNo, dic); var roomInfo = HttpHelper.JsonToModel>(result.message); - if (roomInfo.StatusCode != StatusCodeConstants.Success) + if (roomInfo.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } - ReadRoomOutputDto room = roomInfo.Source; + ReadRoomOutputDto room = roomInfo.Data; if (room.LastCheckInTime == null) { @@ -127,20 +127,20 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Room_DayByRoomNo, dic); var stayDays = HttpHelper.JsonToModel>(result.message); - if (stayDays.StatusCode != 200) + if (stayDays.Code != 200) { UIMessageBox.ShowError("DayByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } - sum = Convert.ToDecimal(Convert.ToString(Convert.ToInt32(stayDays.Source.StayDays) * room.RoomRent)); + sum = Convert.ToDecimal(Convert.ToString(Convert.ToInt32(stayDays.Data.StayDays) * room.RoomRent)); - lblDay.Text = Convert.ToString(Convert.ToInt32(stayDays.Source.StayDays)); + lblDay.Text = Convert.ToString(Convert.ToInt32(stayDays.Data.StayDays)); w = new CreateEnergyManagementInputDto() { - PowerUsage = Convert.ToDecimal(Convert.ToInt32(stayDays.Source.StayDays) * 3 * 1), - WaterUsage = Convert.ToDecimal(Convert.ToDouble(stayDays.Source.StayDays) * 80 * 0.002) + PowerUsage = Convert.ToDecimal(Convert.ToInt32(stayDays.Data.StayDays) * 3 * 1), + WaterUsage = Convert.ToDecimal(Convert.ToDouble(stayDays.Data.StayDays) * 80 * 0.002) }; #region 加载客户信息 @@ -150,22 +150,22 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Customer_SelectCustoByInfo, dic); SingleOutputDto customer = HttpHelper.JsonToModel>(result.message); - if (customer?.StatusCode != StatusCodeConstants.Success) + if (customer?.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError("SelectCustoByInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } try { - CustoName.Text = customer?.Source.CustomerName; - txtCustomerName.Text = customer?.Source.CustomerName; - txtTel.Text = customer?.Source.CustomerPhoneNumber; - txtCustomerGender.Text = customer?.Source.GenderName ?? string.Empty; - txtCustomerType.Text = customer.Source.CustomerTypeName; - txtPassportName.Text = customer.Source.PassportName; - txtDateOfBirth.Text = customer.Source.DateOfBirth.ToString("yyyy/MM/dd"); - txtIdCardNumber.Text = customer.Source.IdCardNumber; - txtCustomerAddress.Text = customer.Source.CustomerAddress; + CustoName.Text = customer?.Data.CustomerName; + txtCustomerName.Text = customer?.Data.CustomerName; + txtTel.Text = customer?.Data.CustomerPhoneNumber; + txtCustomerGender.Text = customer?.Data.GenderName ?? string.Empty; + txtCustomerType.Text = customer.Data.CustomerTypeName; + txtPassportName.Text = customer.Data.PassportName; + txtDateOfBirth.Text = customer.Data.DateOfBirth.ToString("yyyy/MM/dd"); + txtIdCardNumber.Text = customer.Data.IdCardNumber; + txtCustomerAddress.Text = customer.Data.CustomerAddress; } catch { @@ -207,7 +207,7 @@ namespace EOM.TSHotelManagement.FormUI }); #endregion - var customerType = lstSourceGrid.SingleOrDefault(a => a.CustomerTypeName == txtCustomerType.Text); + var customerType = lstDataGrid.SingleOrDefault(a => a.CustomerTypeName == txtCustomerType.Text); //计算消费总额 dic = new Dictionary() @@ -217,19 +217,19 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Spend_SumConsumptionAmount, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Spend_SumConsumptionAmount}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - decimal total = response.Source.ConsumptionAmount; + decimal total = response.Data.ConsumptionAmount; decimal m = total + sum; decimal discount = (customerType != null && customerType.Discount > 0 && customerType.Discount < 100) ? customerType.Discount / 100M : 1M; lblGetReceipts.Text = m.ToString("#,##0.00"); lblVIPPrice.Text = (m * discount).ToString("#,##0.00"); - lblVIP.Text = (discount < 1M) ? DiscountConverter.ToZheString(customerType.Discount) : "无折扣(100%)"; + lblVIP.Text = (discount < 1M) ? DiscountHelper.ToZheString(customerType.Discount) : "无折扣(100%)"; Refresh(); } #endregion @@ -276,8 +276,8 @@ namespace EOM.TSHotelManagement.FormUI ElectricityUsage = w.PowerUsage, WaterUsage = w.WaterUsage })); - var response = HttpHelper.JsonToModel(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + var response = HttpHelper.JsonToModel(result.message); + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Room_CheckoutRoom}+接口服务异常，请提交Issue或尝试更新版本！"); return; @@ -327,21 +327,21 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Spend_SelectSpendByRoomNo, dic); var spendInfo = HttpHelper.JsonToModel>(result.message); - if (spendInfo.StatusCode != StatusCodeConstants.Success) + if (spendInfo.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Spend_SelectSpendByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); } - List spends = spendInfo.listSource; - totalCount = spendInfo.total; - var listTableSource = new List(); + List spends = spendInfo.Data.Items; + totalCount = spendInfo.Data.TotalCount; + var listTableData = new List(); spends = spends.OrderBy(a => a.SpendNumber).ToList(); TableComHelper tableComHelper = new TableComHelper(); - listTableSource = tableComHelper.ConvertToAntdItems(spends); + listTableData = tableComHelper.ConvertToAntdItems(spends); - return listTableSource; + return listTableData; } object GetEnergyPageData() @@ -352,20 +352,20 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.EnergyManagement_SelectEnergyManagementInfo, dic); var energyManagements = HttpHelper.JsonToModel>(result.message); - if (energyManagements.StatusCode != StatusCodeConstants.Success) + if (energyManagements.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.EnergyManagement_SelectEnergyManagementInfo}+接口服务异常，请提交Issue或尝试更新版本！"); } - List energys = energyManagements.listSource; - var listTableSource = new List(); + List energys = energyManagements.Data.Items; + var listTableData = new List(); energys = energys.OrderByDescending(a => a.StartDate).ToList(); TableComHelper tableComHelper = new TableComHelper(); - listTableSource = tableComHelper.ConvertToAntdItems(energys); + listTableData = tableComHelper.ConvertToAntdItems(energys); - return listTableSource; + return listTableData; } diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.cs index 7d6c85981b38be1729b2c4e8a6b3b82f60f67604..f74d16f2ef290462aeb5baf7a9fe7922dbd51b41 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.cs @@ -101,21 +101,21 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Customer_SelectCustomers, dic); var customers = HttpHelper.JsonToModel>(result.message); - if (customers.StatusCode != StatusCodeConstants.Success) + if (customers.Code != BusinessStatusCode.Success) { AntdUI.Message.error(this, "SelectCustomers+接口服务异常，请提交Issue或尝试更新版本！"); return null!; } - List custos = customers.listSource; - totalCount = customers.total; - var listTableSource = new List(); + List custos = customers.Data.Items; + totalCount = customers.Data.TotalCount; + var listTableData = new List(); custos = custos.OrderBy(a => a.CustomerNumber).ThenBy(a => a.CustomerName).ToList(); TableComHelper tableComHelper = new TableComHelper(); - listTableSource = tableComHelper.ConvertToAntdItems(custos); + listTableData = tableComHelper.ConvertToAntdItems(custos); - return listTableSource; + return listTableData; } #endregion @@ -141,23 +141,23 @@ namespace EOM.TSHotelManagement.FormUI } result = HttpHelper.Request(ApiConstants.Customer_SelectCustomers, dic); response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { AntdUI.Message.error(this, $"{ApiConstants.Customer_SelectCustomers}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - custos = response.listSource; - var totalCount = response.total; - var listTableSource = new List(); + custos = response.Data.Items; + var totalCount = response.Data.TotalCount; + var listTableData = new List(); custos = custos.OrderBy(a => a.CustomerNumber).ThenBy(a => a.CustomerName).ToList(); TableComHelper tableComHelper = new TableComHelper(); - listTableSource = tableComHelper.ConvertToAntdItems(custos); + listTableData = tableComHelper.ConvertToAntdItems(custos); dgvCustomerList.Columns = tableComHelper.ConvertToAntdColumns(tableComHelper.GenerateDataColumns()); - dgvCustomerList.DataSource = listTableSource; + dgvCustomerList.DataSource = listTableData; } private void btnAddCusto_BtnClick(object sender, EventArgs e) diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.cs index 7d104ada4da40433677d654d1e4a6530185a70f1..8e5c0ef44d921398c93007512aa9ee2aec3f1a0b 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.cs @@ -49,13 +49,13 @@ namespace EOM.TSHotelManagement.FormUI #region 加载客户类型信息 var result = HttpHelper.Request(ApiConstants.Base_SelectCustoTypeAllCanUse); var customerTypes = HttpHelper.JsonToModel>(result.message); - if (customerTypes.StatusCode != StatusCodeConstants.Success) + if (customerTypes.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Base_SelectCustoTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - var lstSourceGrid = customerTypes.listSource; - this.cbCustoType.DataSource = lstSourceGrid; + var lstDataGrid = customerTypes.Data.Items; + this.cbCustoType.DataSource = lstDataGrid; this.cbCustoType.DisplayMember = nameof(ReadCustoTypeOutputDto.CustomerTypeName); this.cbCustoType.ValueMember = nameof(ReadCustoTypeOutputDto.CustomerType); this.cbCustoType.SelectedIndex = 0; @@ -65,12 +65,12 @@ namespace EOM.TSHotelManagement.FormUI #region 加载证件类型信息 result = HttpHelper.Request(ApiConstants.Base_SelectPassPortTypeAllCanUse); var passportTypes = HttpHelper.JsonToModel>(result.message); - if (passportTypes.StatusCode != StatusCodeConstants.Success) + if (passportTypes.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Base_SelectPassPortTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - var passPorts = passportTypes.listSource; + var passPorts = passportTypes.Data.Items; this.cbPassportType.DataSource = passPorts; this.cbPassportType.DisplayMember = nameof(ReadPassportTypeOutputDto.PassportName); this.cbPassportType.ValueMember = nameof(ReadPassportTypeOutputDto.PassportId); @@ -85,12 +85,12 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Base_SelectGenderTypeAll, dic); var genderTypes = HttpHelper.JsonToModel>(result.message); - if (genderTypes.StatusCode != StatusCodeConstants.Success) + if (genderTypes.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Base_SelectGenderTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - var listSexType = genderTypes.listSource; + var listSexType = genderTypes.Data.Items; this.cbSex.DataSource = listSexType; this.cbSex.DisplayMember = nameof(ReadGenderTypeOutputDto.Description); this.cbSex.ValueMember = nameof(ReadGenderTypeOutputDto.Id); @@ -143,8 +143,8 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Customer_UpdCustomerInfo, HttpHelper.ModelToJson(custo)); - var response = HttpHelper.JsonToModel(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + var response = HttpHelper.JsonToModel(result.message); + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.Show("修改失败", "系统提示", UIStyle.Red, UIMessageBoxButtons.OK); return; @@ -191,8 +191,8 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Customer_InsertCustomerInfo, HttpHelper.ModelToJson(custo)); - var response = HttpHelper.JsonToModel(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + var response = HttpHelper.JsonToModel(result.message); + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.Show($"添加失败\n{response.Message}", "系统提示", UIStyle.Red, UIMessageBoxButtons.OK); return; diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.cs index d71c19dcae81d08434784fc5a694a6a9ab252288..293ea2efb6f2c77944e93e186089fea4229f06a3 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.cs @@ -51,12 +51,12 @@ namespace EOM.TSHotelManagement.FormUI }; var result = HttpHelper.Request(ApiConstants.Base_SelectNationAll, dic); var nations = HttpHelper.JsonToModel>(result.message); - if (nations.StatusCode != StatusCodeConstants.Success) + if (nations.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Base_SelectNationAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - cbWorkerNation.DataSource = nations.listSource; + cbWorkerNation.DataSource = nations.Data.Items; cbWorkerNation.DisplayMember = nameof(ReadNationOutputDto.NationName); cbWorkerNation.ValueMember = nameof(ReadNationOutputDto.NationNumber); //加载性别信息 @@ -67,23 +67,23 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Base_SelectGenderTypeAll, dic); var genderTypes = HttpHelper.JsonToModel>(result.message); - if (genderTypes.StatusCode != StatusCodeConstants.Success) + if (genderTypes.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Base_SelectGenderTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - cboSex.DataSource = genderTypes.listSource; + cboSex.DataSource = genderTypes.Data.Items; cboSex.DisplayMember = nameof(ReadGenderTypeOutputDto.Description); cboSex.ValueMember = nameof(ReadGenderTypeOutputDto.Id); //加载部门信息 result = HttpHelper.Request(ApiConstants.Base_SelectDeptAllCanUse); var depts = HttpHelper.JsonToModel>(result.message); - if (depts.StatusCode != StatusCodeConstants.Success) + if (depts.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Base_SelectDeptAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - cboWorkerClub.DataSource = depts.listSource; + cboWorkerClub.DataSource = depts.Data.Items; cboWorkerClub.DisplayMember = nameof(ReadDepartmentOutputDto.DepartmentName); cboWorkerClub.ValueMember = nameof(ReadDepartmentOutputDto.DepartmentNumber); //加载职位信息 @@ -94,12 +94,12 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Base_SelectPositionAll, dic); var positions = HttpHelper.JsonToModel>(result.message); - if (positions.StatusCode != StatusCodeConstants.Success) + if (positions.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Base_SelectPositionAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - cboWorkerPosition.DataSource = positions.listSource; + cboWorkerPosition.DataSource = positions.Data.Items; cboWorkerPosition.DisplayMember = nameof(ReadPositionOutputDto.PositionName); cboWorkerPosition.ValueMember = nameof(ReadPositionOutputDto.PositionNumber); @@ -118,12 +118,12 @@ namespace EOM.TSHotelManagement.FormUI }; var result = HttpHelper.Request(ApiConstants.Employee_SelectEmployeeInfoByEmployeeId, dic); var employees = HttpHelper.JsonToModel>(result.message); - if (employees.StatusCode != StatusCodeConstants.Success) + if (employees.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Employee_SelectEmployeeInfoByEmployeeId}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - ReadEmployeeOutputDto worker = employees.Source; + ReadEmployeeOutputDto worker = employees.Data; if (!worker.IsNullOrEmpty()) { txtWorkerNo.Text = worker.EmployeeId; @@ -144,16 +144,16 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.EmployeePhoto_EmployeePhoto, dic); var workerPic = HttpHelper.JsonToModel>(result.message); - if (workerPic.StatusCode != StatusCodeConstants.Success) + if (workerPic.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.EmployeePhoto_EmployeePhoto}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - var workerPicSource = workerPic.Source; - if (workerPicSource != null && !string.IsNullOrEmpty(workerPicSource.PhotoPath)) + var workerPicData = workerPic.Data; + if (workerPicData != null && !string.IsNullOrEmpty(workerPicData.PhotoPath)) { picWorkerPic.BackgroundImage = null; - if (!string.IsNullOrEmpty(workerPicSource.PhotoPath)) picWorkerPic.Load(workerPicSource.PhotoPath); + if (!string.IsNullOrEmpty(workerPicData.PhotoPath)) picWorkerPic.Load(workerPicData.PhotoPath); } } @@ -203,8 +203,8 @@ namespace EOM.TSHotelManagement.FormUI if (CheckInput(worker)) { result = HttpHelper.Request(ApiConstants.Employee_UpdateEmployee, HttpHelper.ModelToJson(worker)); - var response = HttpHelper.JsonToModel(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + var response = HttpHelper.JsonToModel(result.message); + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Employee_UpdateEmployee}+接口服务异常，请提交Issue或尝试更新版本！"); return; @@ -235,17 +235,17 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.EmployeePhoto_EmployeePhoto, dic); var workerPic = HttpHelper.JsonToModel>(result.message); - if (workerPic.StatusCode != StatusCodeConstants.Success) + if (workerPic.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.EmployeePhoto_EmployeePhoto}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - var workerPicSource = workerPic.Source; - if (!workerPicSource.IsNullOrEmpty() && !string.IsNullOrEmpty(workerPicSource.PhotoPath)) + var workerPicData = workerPic.Data; + if (!workerPicData.IsNullOrEmpty() && !string.IsNullOrEmpty(workerPicData.PhotoPath)) { result = HttpHelper.Request(ApiConstants.EmployeePhoto_DeleteWorkerPhoto, HttpHelper.ModelToJson(workerPic)); - var response = HttpHelper.JsonToModel(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + var response = HttpHelper.JsonToModel(result.message); + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.EmployeePhoto_DeleteWorkerPhoto}+接口服务异常，请提交Issue或尝试更新版本！"); return; @@ -273,13 +273,13 @@ namespace EOM.TSHotelManagement.FormUI }; var requestResult = HttpHelper.UploadFile(ApiConstants.EmployeePhoto_InsertWorkerPhoto, openPic.FileName, additionalParams); var response = HttpHelper.JsonToModel>(requestResult.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{response.Message}:{ApiConstants.EmployeePhoto_InsertWorkerPhoto}+接口服务异常，请提交Issue或尝试更新版本！"); return; } UIMessageTip.ShowOk("头像上传成功！稍等将会加载头像哦.."); - picWorkerPic.Load(response.Source.PhotoPath); + picWorkerPic.Load(response.Data.PhotoPath); } private void btnUpdatePassword_Click(object sender, EventArgs e) @@ -298,8 +298,8 @@ namespace EOM.TSHotelManagement.FormUI DataChgDate = DateTime.Now, DataChgUsr = LoginInfo.WorkerNo })); - var response = HttpHelper.JsonToModel(request.message); - if (response.StatusCode != StatusCodeConstants.Success) + var response = HttpHelper.JsonToModel(request.message); + if (response.Code != BusinessStatusCode.Success) { AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString($"{ApiConstants.Employee_UpdateEmployeeAccountPassword}+Interface service exception, please submit an issue or try updating the version!", $"{ApiConstants.Employee_UpdateEmployeeAccountPassword}+接口服务异常，请提交Issue或尝试更新版本！")); return; diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.cs index 5891c70899095a2dc1b23bc50a351a521e73be65..1b4dc545471c9cf9a07b739f748df87434211f41 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.cs @@ -71,21 +71,21 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Reser_SelectReserAll, dic); var resers = HttpHelper.JsonToModel>(result.message); - if (resers.StatusCode != StatusCodeConstants.Success) + if (resers.Code != BusinessStatusCode.Success) { AntdUI.Message.error(this, $"{ApiConstants.Reser_SelectReserAll}+接口服务异常，请提交Issue或尝试更新版本！"); return null!; } - List reserDataSource = resers.listSource; - totalCount = resers.total; - var listTableSource = new List(); + List reserDataSource = resers.Data.Items; + totalCount = resers.Data.TotalCount; + var listTableData = new List(); reserDataSource = reserDataSource.OrderBy(a => a.ReservationId).ThenBy(a => a.CustomerName).ToList(); TableComHelper tableComHelper = new TableComHelper(); - listTableSource = tableComHelper.ConvertToAntdItems(reserDataSource); + listTableData = tableComHelper.ConvertToAntdItems(reserDataSource); - return listTableSource; + return listTableData; } private string btnPg_ShowTotalChanged(object sender, AntdUI.PagePageEventArgs e) @@ -113,13 +113,13 @@ namespace EOM.TSHotelManagement.FormUI #region 加载客户类型信息 result = HttpHelper.Request(ApiConstants.Base_SelectCustoTypeAllCanUse); var customerTypeDataSource = HttpHelper.JsonToModel>(result.message); - if (customerTypeDataSource.StatusCode != StatusCodeConstants.Success) + if (customerTypeDataSource.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Base_SelectCustoTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - List lstSourceGrid = customerTypeDataSource.listSource; - this.cbCustoType.DataSource = lstSourceGrid; + List lstDataGrid = customerTypeDataSource.Data.Items; + this.cbCustoType.DataSource = lstDataGrid; this.cbCustoType.DisplayMember = nameof(ReadCustoTypeOutputDto.CustomerTypeName); this.cbCustoType.ValueMember = nameof(ReadCustoTypeOutputDto.CustomerType); this.cbCustoType.SelectedIndex = 0; @@ -129,12 +129,12 @@ namespace EOM.TSHotelManagement.FormUI #region 加载证件类型信息 result = HttpHelper.Request(ApiConstants.Base_SelectPassPortTypeAllCanUse); var passportDataSource = HttpHelper.JsonToModel>(result.message); - if (passportDataSource.StatusCode != StatusCodeConstants.Success) + if (passportDataSource.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Base_SelectPassPortTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - List passPorts = passportDataSource.listSource; + List passPorts = passportDataSource.Data.Items; this.cbPassportType.DataSource = passPorts; this.cbPassportType.DisplayMember = nameof(ReadPassportTypeOutputDto.PassportName); this.cbPassportType.ValueMember = nameof(ReadPassportTypeOutputDto.PassportId); @@ -149,12 +149,12 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Base_SelectGenderTypeAll, dic); var genderTypeDataSource = HttpHelper.JsonToModel>(result.message); - if (genderTypeDataSource.StatusCode != StatusCodeConstants.Success) + if (genderTypeDataSource.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Base_SelectGenderTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - List listSexType = genderTypeDataSource.listSource; + List listSexType = genderTypeDataSource.Data.Items; this.cbSex.DataSource = listSexType; this.cbSex.DisplayMember = nameof(EnumDto.Description); this.cbSex.ValueMember = nameof(EnumDto.Id); @@ -196,8 +196,8 @@ namespace EOM.TSHotelManagement.FormUI DataChgDate = DateTime.Now }; result = HttpHelper.Request(ApiConstants.Room_CheckinRoomByReservation, HttpHelper.ModelToJson(reser)); - var response = HttpHelper.JsonToModel(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + var response = HttpHelper.JsonToModel(result.message); + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Room_CheckinRoomByReservation}+接口服务异常，请提交Issue或尝试更新版本！"); return; diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.cs index a4126c869e5be160cdf3f6494da6fc32051fc4e0..39d2ca7aced11f71fe753ce135222b575bf5a21c 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.cs @@ -71,15 +71,15 @@ namespace EOM.TSHotelManagement.FormUI DataInsUsr = LoginInfo.WorkerNo }; result = HttpHelper.Request(ApiConstants.Reser_InsertReserInfo, HttpHelper.ModelToJson(reser)); - var response = HttpHelper.JsonToModel(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + var response = HttpHelper.JsonToModel(result.message); + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Reser_InsertReserInfo}+接口服务异常，请提交Issue或尝试更新版本！"); return; } result = HttpHelper.Request(ApiConstants.Room_UpdateRoomInfoWithReser, HttpHelper.ModelToJson(room)); - response = HttpHelper.JsonToModel(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + response = HttpHelper.JsonToModel(result.message); + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Room_UpdateRoomInfoWithReser}+接口服务异常，请提交Issue或尝试更新版本！"); return; @@ -99,12 +99,12 @@ namespace EOM.TSHotelManagement.FormUI cboReserWay.SelectedIndex = 0; result = HttpHelper.Request(ApiConstants.Room_SelectCanUseRoomAll); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Room_SelectCanUseRoomAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - cboReserRoomNo.DataSource = response.listSource; + cboReserRoomNo.DataSource = response.Data.Items; cboReserRoomNo.DisplayMember = nameof(ReadRoomOutputDto.RoomNumber); cboReserRoomNo.ValueMember = nameof(ReadRoomOutputDto.RoomNumber); cboReserRoomNo.Text = ucRoom.co_RoomNo; diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.cs index 242e6101ceb0c27758476a208f091c5695439f5a..5858bad4092c8532c50679941ccec188d1022812 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.cs @@ -114,9 +114,9 @@ namespace EOM.TSHotelManagement.FormUI var response = HttpHelper.JsonToModel>(httpResponse.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { - throw new HttpRequestException($"{url} 请求失败，状态码：{response.StatusCode}"); + throw new HttpRequestException($"{url} 请求失败，状态码：{response.Code}"); } var propertyInfo = typeof(ReadRoomOutputDto).GetProperty(propertyName); @@ -125,7 +125,7 @@ namespace EOM.TSHotelManagement.FormUI throw new MissingFieldException($"ReadRoomOutputDto 中未找到 {propertyName} 属性"); } - if (propertyInfo.GetValue(response.Source) is int countValue) + if (propertyInfo.GetValue(response.Data) is int countValue) { statusCounts[targetVar] = countValue; } @@ -226,12 +226,12 @@ namespace EOM.TSHotelManagement.FormUI }; var result = HttpHelper.Request(ApiConstants.RoomType_SelectRoomTypesAll, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { throw new Exception($"{ApiConstants.RoomType_SelectRoomTypesAll}+接口服务异常"); } - var listRoomTypes = response.listSource; + var listRoomTypes = response.Data.Items; if (listRoomTypes == null) { @@ -298,12 +298,12 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Room_SelectRoomAll, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Room_SelectRoomAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - romsty = response.listSource; + romsty = response.Data.Items; } else { @@ -315,12 +315,12 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Room_SelectRoomByTypeName, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Room_SelectRoomByTypeName}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - romsty = response.listSource; + romsty = response.Data.Items; } for (int i = 0; i < romsty.Count; i++) { @@ -350,12 +350,12 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Room_SelectRoomByRoomState, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Room_SelectRoomByRoomState}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - romsty = response.listSource; + romsty = response.Data.Items; for (int i = 0; i < romsty.Count; i++) { room = new ucRoom(); diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomStateManagement.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomStateManagement.cs index acc0624e4c73b5fb98700537dbc1125e21b0f0da..52d2fe2f762287e3def9a566644f8927d03be68a 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomStateManagement.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomStateManagement.cs @@ -46,12 +46,12 @@ namespace EOM.TSHotelManagement.FormUI txtRoomNo.Text = ucRoom.rm_RoomNo; result = HttpHelper.Request(ApiConstants.Base_SelectRoomStateAll); var datas = HttpHelper.JsonToModel>(result.message); - if (datas.StatusCode != 200) + if (datas.Code != 200) { UIMessageBox.ShowError($"{ApiConstants.Base_SelectRoomStateAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - cboState.DataSource = datas.listSource; + cboState.DataSource = datas.Data.Items; cboState.DisplayMember = nameof(EnumDto.Description); cboState.ValueMember = nameof(EnumDto.Id); cboState.SelectedIndex = 0; @@ -73,8 +73,8 @@ namespace EOM.TSHotelManagement.FormUI case (int)RoomState.Reserved: var updateRoom = new UpdateRoomInputDto { RoomNumber = txtRoomNo.Text.Trim(), RoomStateId = Convert.ToInt32(cboState.SelectedValue) }; result = HttpHelper.Request(ApiConstants.Room_UpdateRoomStateByRoomNo, updateRoom.ModelToJson()); - var response = HttpHelper.JsonToModel(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + var response = HttpHelper.JsonToModel(result.message); + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Room_UpdateRoomStateByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); return; diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmScreenLock.Designer.cs similarity index 38% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.Designer.cs rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmScreenLock.Designer.cs index 0b1c687960d1f09cc46cd5b549c9e63ec1891d41..e18e5bafa9501bc7d780577fbb736a3de11d6f62 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmScreenLock.Designer.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.FormUI { - partial class FrmAboutUs + partial class FrmScreenLock { /// /// Required designer variable. @@ -28,65 +28,65 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAboutUs)); - rtbAboutUs = new Sunny.UI.UIRichTextBox(); - btnOk = new AntdUI.Button(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmScreenLock)); + txtPassword = new AntdUI.Input(); + btnUnlock = new AntdUI.Button(); SuspendLayout(); // - // rtbAboutUs + // txtPassword // - rtbAboutUs.BulletIndent = 5; - rtbAboutUs.FillColor = Color.White; - rtbAboutUs.Font = new Font("微软雅黑", 12F); - rtbAboutUs.HideSelection = false; - rtbAboutUs.Location = new Point(3, 2); - rtbAboutUs.Margin = new Padding(3, 4, 3, 4); - rtbAboutUs.MinimumSize = new Size(1, 1); - rtbAboutUs.Name = "rtbAboutUs"; - rtbAboutUs.Padding = new Padding(1, 2, 1, 2); - rtbAboutUs.Radius = 10; - rtbAboutUs.ReadOnly = true; - rtbAboutUs.ScrollBarStyleInherited = false; - rtbAboutUs.ShowText = false; - rtbAboutUs.Size = new Size(385, 146); - rtbAboutUs.Style = Sunny.UI.UIStyle.Custom; - rtbAboutUs.TabIndex = 0; - rtbAboutUs.TextAlignment = ContentAlignment.MiddleCenter; + txtPassword.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + txtPassword.Location = new Point(212, 334); + txtPassword.Name = "txtPassword"; + txtPassword.PasswordChar = '*'; + txtPassword.PasswordCopy = true; + txtPassword.PlaceholderColor = Color.Gray; + txtPassword.PlaceholderText = "请输入当前登录账号密码..."; + txtPassword.Prefix = Properties.Resources._lock; + txtPassword.Size = new Size(285, 45); + txtPassword.TabIndex = 0; + txtPassword.TextAlign = HorizontalAlignment.Center; + txtPassword.UseSystemPasswordChar = true; // - // btnOk + // btnUnlock // - btnOk.Font = new Font("Microsoft YaHei UI", 12F); - btnOk.Location = new Point(145, 152); - btnOk.Name = "btnOk"; - btnOk.Size = new Size(93, 36); - btnOk.TabIndex = 129; - btnOk.Text = "知道了！"; - btnOk.Type = AntdUI.TTypeMini.Primary; - btnOk.Click += btnOk_Click; + btnUnlock.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnUnlock.Location = new Point(503, 334); + btnUnlock.Name = "btnUnlock"; + btnUnlock.Size = new Size(85, 45); + btnUnlock.TabIndex = 1; + btnUnlock.Text = "解 锁"; + btnUnlock.Type = AntdUI.TTypeMini.Primary; + btnUnlock.Click += btnUnlock_Click; // - // FrmAboutUs + // FrmScreenLock // - AutoScaleDimensions = new SizeF(7F, 17F); - AutoScaleMode = AutoScaleMode.Font; + AllowShowTitle = false; + AutoScaleMode = AutoScaleMode.None; BackColor = Color.FromArgb(235, 243, 255); - ClientSize = new Size(390, 192); - Controls.Add(btnOk); - Controls.Add(rtbAboutUs); - FormBorderStyle = FormBorderStyle.FixedSingle; + BackgroundImage = Properties.Resources.lock_screen; + BackgroundImageLayout = ImageLayout.Stretch; + ClientSize = new Size(800, 450); + Controls.Add(btnUnlock); + Controls.Add(txtPassword); Icon = (Icon)resources.GetObject("$this.Icon"); - Margin = new Padding(2); - Name = "FrmAboutUs"; - StartPosition = FormStartPosition.CenterScreen; - Text = "关于我们"; - Load += FrmAboutUs_Load; - MouseDown += FrmAboutUs_MouseDown; - MouseMove += FrmAboutUs_MouseMove; + IsForbidAltF4 = true; + MaximizeBox = false; + MinimizeBox = false; + Name = "FrmScreenLock"; + Padding = new Padding(0); + ShowIcon = false; + ShowInTaskbar = false; + ShowTitle = false; + Text = "系统已锁定"; + ZoomScaleRect = new Rectangle(15, 15, 800, 450); + Load += FrmScreenLock_Load; ResumeLayout(false); } #endregion - private Sunny.UI.UIRichTextBox rtbAboutUs; - private AntdUI.Button btnOk; + private AntdUI.Input txtPassword; + private AntdUI.Button btnUnlock; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmScreenLock.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmScreenLock.cs new file mode 100644 index 0000000000000000000000000000000000000000..2d37b5f6b2d95f9718e21ff04a4b4413f4e3d0f4 --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmScreenLock.cs @@ -0,0 +1,45 @@ +using EOM.TSHotelManagement.Common; +using jvncorelib.EncryptorLib; +using Sunny.UI; + +namespace EOM.TSHotelManagement.FormUI +{ + public partial class FrmScreenLock : UIForm + { + public FrmScreenLock() + { + InitializeComponent(); + } + + private void FrmScreenLock_Load(object sender, EventArgs e) + { + + } + + private void txtPassword_Validated(object sender, EventArgs e) + { + + } + + private void btnUnlock_Click(object sender, EventArgs e) + { + if (txtPassword.Text.Trim() == string.Empty) + { + UIMessageBox.ShowError("密码不能为空，请重新输入！"); + txtPassword.Focus(); + return; + } + var password = new EncryptLib().Decryption(LoginInfo.Password); + if (password != null && password == txtPassword.Text.Trim()) + { + this.Close(); + } + else + { + UIMessageBox.ShowError("密码错误，请重新输入！"); + txtPassword.Focus(); + txtPassword.Clear(); + } + } + } +} diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmScreenLock.resx similarity index 77% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.resx rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmScreenLock.resx index 4c87f86062214fbf221daa8372f9806bd76be6ca..01c2406f2bae1f46aca0682725d0d5995e7509f8 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.resx +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmScreenLock.resx @@ -117,24 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + - AAABAAEAICAAAAEAGAA8AwAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAAFz - UkdCAK7OHOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA7DAAAOwwHHb6hkAAAC0UlEQVRYR62XPWgU - URSFt9M0i6iIf4g/0WAQ8QfEKqTyrwqIqIUQEIUIEYMxgjYLpklhLBREoqSS4EJIKkGbRYSQRlEQm4BB - RJuAQdQ0wq7fHe6s18nuvvs2u3CYN2/OOffMm/dm3uZyTf7K5XK+Uqls53iI4+EmbfwyiuwEl0GRot85 - /vejbwm8AnfBUb9zgCl3h+GjbMHQOZoJcKLpIIhXZQtzPg/GKd4LulPQdxrcBk/BFxuO89HoEIg2gOep - Ee050O8xgrcODIB3Rj8tnh59DmI7mDV3UeB8rUucIaG7Z0LMuDwQlYzoqkvUgKQTt4JvOADkgil+dqXF - U70s16CXTqikPmmfBAUQ4OXBCJgE5z2auhwMnmnxBdodHjN4x81cKXo0NTkY7QZ/NMCw16iVAW5qcXmb - 7YkI0JpHQNHXGuCht3hLeQT4pgEGvMYy/OAGOOnVpDyZsNVJS+H1Zuld8JjV+A4UPDrhULjT1OuSjiOm - 45jXSHg2iFeXWe77klevMerxGtkAeMx7dZkAmxOdGYFLEUZnjO5xhE6+oukLry3RcQdzOglveY3QjBqj - ixG6Qa31uaqho6idsxFGMyZAZ4RuWmtNVDXczTkzD4L7O/hbTfEP3uI62l81wKAdgY0mQHBJZSZSyazv - XY3CEHyo7orj4pQm+037YOiuZOYr/xdt2Yi+CBTvgLOgAZZ/uLhwAMLisudTxxXuKTAm84fjNdEHAoyb - u++qyVWjdIn8e0ah4Qhcx1A2sanvWEN6uiKU37vC2vKO6THFX9JeHfS0IRgV2W7ng6IMAY816CZN8bec - b3L7ZEJ8RNwHgltrCQv6wXtTfIrzve7iZlldR5h8qo1ZibZs1a9wlNdxN235Y9Kn/Z8Md1HmVXRhK8Bg - B3gAlmyQRm24P8H90MqICobhFjBkhzYzMj+49gbcAe1R5rFkCrRpoP3yCMC2WI+U/xfptNEnT3/LsQAA - AABJRU5ErkJggg== + AAABAAEAICAAAAEAGAA4BAAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAAFz + UkdCAK7OHOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA7DAAAOwwHHb6hkAAADzUlEQVRYR62XS0gV + URjHLbJ8ZQYWEQRGWVlCUEhBSW7EWvTcJEgoFQRZYYlFEOYiWrSx3PRauAu1RUEEUVZGRE8VQoxqEelC + NO1tmZD2+4/fvdxx7r0zan/4cc5833e+OTNz5jwSgmp0dDQJNo6MjNTBM/gIf+ALvIV7cAiWWJP/IxIu + tMRtMEwn4oqYb9BItcBSTE4kmEuiPZSvlDgkbL1wH+rhLFyARnhqIY647od6qmstZXDRKJPG1ZRfLdkg + 6CbbIN3CXCJsOmThPwZtaidRb4dCC/MXbTJocGqsuZPgJRRTnWMhviJ+EZyDHsvxHjabO7aITSKwVI0k + 6nqtk/qWtE2Ho9BnuR7AanN7RUwiAVthwBpoVOeYe9IiVRl5ui1nA0WWudzCOR9niwU+p5j44Ikh8pVD + 6HOcBPc4wq6n32sBH6DYXB4RUoBfI19v6KHRjL0GFliYS9g1qK/CL3gCi801Jgyp0AxDcI0GaeZyCd8a + eI3fI+x/oRXWWbhL2LdAh8UeoUgxl+MsMkc3bDezR/gugp5Cv2i4k1yXQA/0QbmZXSJ+Br5a+AF3YJ65 + nATnQWonMMPMHuG/AQOwykyOuJ4F1aDktWb2CF8pdMFvWM69poUc78x4xTHEEH51QBPLUjM5sqcrBr8O + 5IIeUm/7MMVMGVPN8Bn2WWxU4Z9SByT8GrzSZUhW4yzrwCeKHRbnEj71XFPxoGLjiZguijJr6hG+JmKG + 4Tr1FCXPs4ZaZPItziXsldCvuCAi9gXkWXOXsF8CrS2aGVODdqDWyRxQxL+hiPU23R0gMMgn8HQAm37H + fKgyU1jYYnYAu+cT+A5C7NE6oIUqDQocQ4TwxXsD7kFoxg7QE9U5hnHCPuEOgGdCw7YMWi3mAEWi46BS + g0HStsuz4cD2vzqgX1VrjcZANqFjExEVJwnGqFMxtqiDEPtxCi1CLmH3dABz5FR8i+tMczk3iLsYYdsF + nUoeRMQ+AtdkxXXsxYgL3+UYWx5UEqInDoPt9DgqINeaOSIu/nIsYYzckDymWGGuKYt8+0EzpHJ7NyQS + Rq1oWlZ/ghamuHN6UJEnB/TNdfPbkG0ur4hJI6DCgjUvnKEac3n2E+1Xwk3L1wkbzBVbBGk3q9GtRkMU + mrlc39RPlmM3aG+pPPq9N5nbXwTPBm0key2Bzn4nqEbd84WEX+dH7RkbQJ2XWqivt5DgoqEOKCWU4aMZ + 1zr33QVtybTdLoKdcBB0EAn/qtQnfzSLFElCh1NtRIIcTr9TNMHUDqfjReJkKAQtp9GO55rIqmACh5mE + hH9jE4xJZSQJkAAAAABJRU5ErkJggg== \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.cs index 1c71570ee4c206c04e3a9b6259de90164dcc690b..9f7821ddc1234243f00f16dcef51c36db7e54217 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.cs @@ -56,12 +56,12 @@ namespace EOM.TSHotelManagement.FormUI #region 加载客户类型信息 result = HttpHelper.Request(ApiConstants.Base_SelectCustoTypeAllCanUse); var customerTypes = HttpHelper.JsonToModel>(result.message); - if (customerTypes.StatusCode != StatusCodeConstants.Success) + if (customerTypes.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Base_SelectCustoTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - this.cbCustoType.DataSource = customerTypes.listSource; + this.cbCustoType.DataSource = customerTypes.Data.Items; this.cbCustoType.DisplayMember = nameof(ReadCustoTypeOutputDto.CustomerTypeName); this.cbCustoType.ValueMember = nameof(ReadCustoTypeOutputDto.CustomerType); this.cbCustoType.SelectedIndex = 0; @@ -71,12 +71,12 @@ namespace EOM.TSHotelManagement.FormUI #region 加载证件类型信息 result = HttpHelper.Request(ApiConstants.Base_SelectPassPortTypeAllCanUse); var passportTypes = HttpHelper.JsonToModel>(result.message); - if (passportTypes.StatusCode != StatusCodeConstants.Success) + if (passportTypes.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Base_SelectPassPortTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - this.cbPassportType.DataSource = passportTypes.listSource; + this.cbPassportType.DataSource = passportTypes.Data.Items; this.cbPassportType.DisplayMember = nameof(ReadPassportTypeOutputDto.PassportName); this.cbPassportType.ValueMember = nameof(ReadPassportTypeOutputDto.PassportId); this.cbPassportType.SelectedIndex = 0; @@ -90,12 +90,12 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Base_SelectGenderTypeAll, dic); var genderTypes = HttpHelper.JsonToModel>(result.message); - if (genderTypes.StatusCode != StatusCodeConstants.Success) + if (genderTypes.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Base_SelectGenderTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - this.cbSex.DataSource = genderTypes.listSource; + this.cbSex.DataSource = genderTypes.Data.Items; this.cbSex.DisplayMember = nameof(EnumDto.Description); this.cbSex.ValueMember = nameof(EnumDto.Id); this.cbSex.SelectedIndex = 0; @@ -108,19 +108,19 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Customer_SelectCustoByInfo, dic); var c = HttpHelper.JsonToModel>(result.message); - if (c.StatusCode != StatusCodeConstants.Success) + if (c.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Customer_SelectCustoByInfo}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - txtCustoAdress.Text = c.Source.CustomerAddress; - txtCustoName.Text = c.Source.CustomerName; - txtCardID.Text = c.Source.IdCardNumber; - txtCustoTel.Text = c.Source.CustomerPhoneNumber; - cbSex.Text = c.Source.CustomerGender == 1 ? "男" : "女"; - cbCustoType.SelectedValue = c.Source.CustomerType; - cbPassportType.SelectedValue = c.Source.PassportId; - dtpBirthday.Value = Convert.ToDateTime(c.Source.DateOfBirth); + txtCustoAdress.Text = c.Data.CustomerAddress; + txtCustoName.Text = c.Data.CustomerName; + txtCardID.Text = c.Data.IdCardNumber; + txtCustoTel.Text = c.Data.CustomerPhoneNumber; + cbSex.Text = c.Data.CustomerGender == 1 ? "男" : "女"; + cbCustoType.SelectedValue = c.Data.CustomerType; + cbPassportType.SelectedValue = c.Data.PassportId; + dtpBirthday.Value = Convert.ToDateTime(c.Data.DateOfBirth); } } } diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.cs index 707520aeaaecf6b21dfc011f740d37c8138b51f2..bc52d16828c226426f2995ce323904c011fd69f5 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.cs @@ -76,23 +76,23 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Sellthing_SelectSellThingAll, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Sellthing_SelectSellThingAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - var listTableSource = new List(); + var listTableData = new List(); - List lstSource = response.listSource; + List lstData = response.Data.Items; TableComHelper tableComHelper = new TableComHelper(); - listTableSource = tableComHelper.ConvertToAntdItems(lstSource); + listTableData = tableComHelper.ConvertToAntdItems(lstData); dgvSellthing.Spin("正在加载中...", config => { this.dgvSellthing.Columns = tableComHelper.ConvertToAntdColumns(tableComHelper.GenerateDataColumns()); - this.dgvSellthing.DataSource = listTableSource; + this.dgvSellthing.DataSource = listTableData; }, () => { System.Diagnostics.Debug.WriteLine("加载结束"); @@ -111,15 +111,15 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Spend_SelectSpendByRoomNo, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Spend_SelectSpendByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - List lstSource = response.listSource; + List lstData = response.Data.Items; TableComHelper tableComHelper = new TableComHelper(); dgvRoomSell.Columns = tableComHelper.ConvertToAntdColumns(tableComHelper.GenerateDataColumns()); - dgvRoomSell.DataSource = tableComHelper.ConvertToAntdItems(lstSource); + dgvRoomSell.DataSource = tableComHelper.ConvertToAntdItems(lstData); }, () => { System.Diagnostics.Debug.WriteLine("加载结束"); @@ -154,19 +154,19 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Sellthing_SelectSellThingAll, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { AntdUI.Message.error(this, $"{ApiConstants.Sellthing_SelectSellThingAll}+接口服务异常，请提交Issue或尝试更新版本！"); return null!; } - List lstSource = response.listSource; - totalCount = lstSource.Count; - var listTableSource = new List(); + List lstData = response.Data.Items; + totalCount = lstData.Count; + var listTableData = new List(); TableComHelper tableComHelper = new TableComHelper(); - listTableSource = tableComHelper.ConvertToAntdItems(lstSource); + listTableData = tableComHelper.ConvertToAntdItems(lstData); - return listTableSource; + return listTableData; } #endregion @@ -241,8 +241,8 @@ namespace EOM.TSHotelManagement.FormUI WorkerNo = LoginInfo.WorkerNo, SoftwareVersion = LoginInfo.SoftwareVersion })); - var response = HttpHelper.JsonToModel(result.message!); - if (response.StatusCode != StatusCodeConstants.Success) + var response = HttpHelper.JsonToModel(result.message!); + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError(response.Message ?? "添加消费记录失败"); return; @@ -291,25 +291,25 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Sellthing_SelectSellThingByNameAndPrice, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Sellthing_SelectSellThingByNameAndPrice}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - ReadSellThingOutputDto s = response.Source; + ReadSellThingOutputDto s = response.Data; decimal num = Convert.ToDecimal(spend.ConsumptionQuantity); decimal inboundStock = (s.Stock + num); result = HttpHelper.Request(ApiConstants.Spend_UndoCustomerSpend, HttpHelper.ModelToJson(new UpdateSpendInputDto { SpendNumber = spend.SpendNumber })); - var undoSpendResponse = HttpHelper.JsonToModel(result.message); - if (undoSpendResponse.StatusCode != StatusCodeConstants.Success) + var undoSpendResponse = HttpHelper.JsonToModel(result.message); + if (undoSpendResponse.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Spend_UndoCustomerSpend}+接口服务异常，请提交Issue或尝试更新版本！"); return; } var sellThing = new UpdateSellThingInputDto { ProductName = s.ProductName, ProductPrice = s.ProductPrice, Stock = inboundStock, ProductNumber = s.ProductNumber, Specification = s.Specification }; result = HttpHelper.Request(ApiConstants.Sellthing_UpdateSellthingInfo, HttpHelper.ModelToJson(sellThing)); - var updateResponse = HttpHelper.JsonToModel(result.message); - if (updateResponse.StatusCode != StatusCodeConstants.Success) + var updateResponse = HttpHelper.JsonToModel(result.message); + if (updateResponse.Code != BusinessStatusCode.Success) { UIMessageTip.ShowError("撤销失败！", 1000); RecordHelper.Record($"接口异常。Message：\n{updateResponse.Message}", Common.Core.LogLevel.Critical); @@ -375,12 +375,12 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Room_SelectRoomByRoomNo, dic); var checkResponse = HttpHelper.JsonToModel>(result.message); - if (checkResponse.StatusCode != StatusCodeConstants.Success) + if (checkResponse.Code != BusinessStatusCode.Success) { UIMessageBox.ShowError($"{ApiConstants.Room_SelectRoomByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - ReadRoomOutputDto r = checkResponse.Source; + ReadRoomOutputDto r = checkResponse.Data; if (txtRoomNo.Text == "") { lblState.Text = ""; diff --git a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.cs b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.cs index 2152b22c72fd2ac6c637578bec57eee7d5ed00bc..b7143357d9e03062d8b2d7d12a85e050496499f5 100644 --- a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.cs +++ b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.cs @@ -26,6 +26,7 @@ using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Util; using Newtonsoft.Json; using System.Diagnostics; +using System.Runtime.InteropServices; namespace EOM.TSHotelManagement.FormUI { @@ -167,7 +168,7 @@ namespace EOM.TSHotelManagement.FormUI string targetDirectory = Path.Combine(selectedPath, FolderName, tagName); - if(!Path.Exists(targetDirectory)) + if (!Path.Exists(targetDirectory)) Directory.CreateDirectory(targetDirectory); var tempFilePath = Path.Combine(targetDirectory, fileName); @@ -255,6 +256,14 @@ namespace EOM.TSHotelManagement.FormUI private void FrmLoading_Load(object sender, EventArgs e) { + if (RuntimeInformation.OSArchitecture != Architecture.X64) + { + lblTips.Text = LocalizationHelper.GetLocalizedString("Current Software only support x64 bit Architecture, running failure", "本应用仅支持x64位系统架构，运行失败"); + AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("Tips", "系统提示"), LocalizationHelper.GetLocalizedString("Current Software only support x64 bit Architecture, running failure", "本应用不支持x64位系统架构，运行失败"), TType.Info); + Thread.Sleep(2000); + ExitApplication(); + return; + } lblLocalSoftwareVersion.Text = CurrentVersion; CheckForUpdate(); } diff --git a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.Designer.cs b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.Designer.cs index 0f1d14a92da6d4b0178bbdb19517f70ea6e7a72b..bcd09ebc8d2061ae378ebc342c05c771dbd0986b 100644 --- a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.Designer.cs @@ -61,6 +61,7 @@ txtAccount.PlaceholderText = ""; txtAccount.Size = new Size(238, 52); txtAccount.TabIndex = 32; + txtAccount.Text = "WK010"; // // txtWorkerPwd // @@ -74,6 +75,7 @@ txtWorkerPwd.PlaceholderText = ""; txtWorkerPwd.Size = new Size(238, 52); txtWorkerPwd.TabIndex = 33; + txtWorkerPwd.Text = "WK010"; // // picLogin // diff --git a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.cs b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.cs index 44c1ec91af657fe24ee85e4d867fab25a5859ebe..3836e0304e739615b4323c5170fabaea614eae46 100644 --- a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.cs +++ b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.cs @@ -26,6 +26,7 @@ using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Util; +using jvncorelib.EncryptorLib; using jvncorelib.EntityLib; namespace EOM.TSHotelManagement.FormUI @@ -131,13 +132,13 @@ namespace EOM.TSHotelManagement.FormUI var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString($"{ApiConstants.Employee_SelectEmployeeInfoByEmployeeIdAndEmployeePwd} is abnormal. Please submit an issue", $"{ApiConstants.Employee_SelectEmployeeInfoByEmployeeIdAndEmployeePwd}+接口服务异常，请提交issue"), TType.Error); return; } - ReadEmployeeOutputDto w = response.Source; + ReadEmployeeOutputDto w = response.Data; if (!w.IsNullOrEmpty()) { @@ -151,6 +152,7 @@ namespace EOM.TSHotelManagement.FormUI LoginInfo.WorkerName = w.EmployeeName; LoginInfo.WorkerClub = w.DepartmentName; LoginInfo.WorkerPosition = w.PositionName; + LoginInfo.Password = new EncryptLib().Encryption(txtWorkerPwd.Text.Trim(), EncryptionLevel.Enhanced); LoginInfo.SoftwareVersion = ApplicationUtil.GetApplicationVersion().ToString(); LoginInfo.UserToken = w.UserToken; diff --git a/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.Designer.cs b/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.Designer.cs index 85a8d620891ac724636e083c075e8c6d7bdfb345..22a3e6a80f0609a45df19276d063c7dac3d96150 100644 --- a/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.Designer.cs @@ -38,14 +38,13 @@ cmsMain = new ContextMenuStrip(components); tsmiChangeUser = new ToolStripMenuItem(); tsmiMySpace = new ToolStripMenuItem(); - tsmiExChange = new ToolStripMenuItem(); toolStripSeparator3 = new ToolStripSeparator(); tsmiLockScreen = new ToolStripMenuItem(); toolStripSeparator4 = new ToolStripSeparator(); - tsmiLoginBackSystem = new ToolStripMenuItem(); - toolStripSeparator2 = new ToolStripSeparator(); tsmiUpdateLog = new ToolStripMenuItem(); - tsmiAboutUs = new ToolStripMenuItem(); + tsmiHelp = new ToolStripMenuItem(); + tsmiAccessOfficial = new ToolStripMenuItem(); + tsmiAbout = new ToolStripMenuItem(); tsmiExitSystem = new ToolStripMenuItem(); linkLabel1 = new LinkLabel(); lblScroll = new Sunny.UI.UIScrollingText(); @@ -54,9 +53,9 @@ btnHello = new Sunny.UI.UIButton(); uiButton1 = new Sunny.UI.UIButton(); pnlCheckInfo = new Panel(); + lblCheckDay = new AntdUI.Label(); lblClose = new Label(); label4 = new Label(); - lblCheckDay = new Label(); label2 = new Label(); picLogo = new PictureBox(); muNavBar = new AntdUI.Menu(); @@ -75,11 +74,11 @@ lblTime.AutoSize = true; lblTime.BackColor = Color.Transparent; lblTime.FlatStyle = FlatStyle.Flat; - lblTime.Font = new Font("Microsoft Sans Serif", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); + lblTime.Font = new Font("Noto Sans SC", 14.2499981F, FontStyle.Regular, GraphicsUnit.Point, 0); lblTime.Location = new Point(53, 141); lblTime.Margin = new Padding(4, 0, 4, 0); lblTime.Name = "lblTime"; - lblTime.Size = new Size(92, 24); + lblTime.Size = new Size(89, 19); lblTime.TabIndex = 2; lblTime.Text = "NowTime"; // @@ -93,7 +92,7 @@ // lblSoftName.BackColor = Color.Transparent; lblSoftName.FlatStyle = FlatStyle.Flat; - lblSoftName.Font = new Font("Microsoft Sans Serif", 15F, FontStyle.Bold, GraphicsUnit.Point, 0); + lblSoftName.Font = new Font("Noto Sans SC", 14.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); lblSoftName.Location = new Point(328, 7); lblSoftName.Margin = new Padding(4, 0, 4, 0); lblSoftName.Name = "lblSoftName"; @@ -123,94 +122,86 @@ // cmsMain // cmsMain.Font = new Font("Microsoft YaHei UI Light", 12F, FontStyle.Italic, GraphicsUnit.Point, 134); - cmsMain.Items.AddRange(new ToolStripItem[] { tsmiChangeUser, tsmiMySpace, tsmiExChange, toolStripSeparator3, tsmiLockScreen, toolStripSeparator4, tsmiLoginBackSystem, toolStripSeparator2, tsmiUpdateLog, tsmiAboutUs, tsmiExitSystem }); + cmsMain.Items.AddRange(new ToolStripItem[] { tsmiChangeUser, tsmiMySpace, toolStripSeparator3, tsmiLockScreen, toolStripSeparator4, tsmiUpdateLog, tsmiHelp, tsmiAbout, tsmiExitSystem }); cmsMain.Name = "cmsMain"; cmsMain.RenderMode = ToolStripRenderMode.Professional; - cmsMain.Size = new Size(314, 214); + cmsMain.Size = new Size(181, 192); // // tsmiChangeUser // - tsmiChangeUser.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); + tsmiChangeUser.Font = new Font("Noto Sans SC", 11.9999981F); tsmiChangeUser.Image = Properties.Resources.切换账号; tsmiChangeUser.Name = "tsmiChangeUser"; - tsmiChangeUser.Size = new Size(313, 24); + tsmiChangeUser.Size = new Size(180, 22); tsmiChangeUser.Text = "切换用户"; tsmiChangeUser.Click += tsmiChangeUser_Click; // // tsmiMySpace // - tsmiMySpace.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); + tsmiMySpace.Font = new Font("Noto Sans SC", 11.9999981F); tsmiMySpace.Image = Properties.Resources.个人中心; tsmiMySpace.Name = "tsmiMySpace"; - tsmiMySpace.Size = new Size(313, 24); + tsmiMySpace.Size = new Size(180, 22); tsmiMySpace.Text = "个人中心"; tsmiMySpace.Click += tsmiMySpace_Click; // - // tsmiExChange - // - tsmiExChange.Font = new Font("Microsoft Sans Serif", 12F); - tsmiExChange.Name = "tsmiExChange"; - tsmiExChange.Size = new Size(313, 24); - tsmiExChange.Text = "换班"; - // // toolStripSeparator3 // toolStripSeparator3.Name = "toolStripSeparator3"; - toolStripSeparator3.Size = new Size(310, 6); + toolStripSeparator3.Size = new Size(177, 6); // // tsmiLockScreen // - tsmiLockScreen.Enabled = false; - tsmiLockScreen.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); + tsmiLockScreen.Font = new Font("Noto Sans SC", 11.9999981F); tsmiLockScreen.Image = Properties.Resources.锁屏; tsmiLockScreen.Name = "tsmiLockScreen"; - tsmiLockScreen.Size = new Size(313, 24); - tsmiLockScreen.Text = "快速锁屏(功能重构中，暂不开放)"; + tsmiLockScreen.Size = new Size(180, 22); + tsmiLockScreen.Text = "系统锁定"; tsmiLockScreen.Click += tsmiLockScreen_Click; // // toolStripSeparator4 // toolStripSeparator4.Name = "toolStripSeparator4"; - toolStripSeparator4.Size = new Size(310, 6); - // - // tsmiLoginBackSystem - // - tsmiLoginBackSystem.Enabled = false; - tsmiLoginBackSystem.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - tsmiLoginBackSystem.Image = Properties.Resources.系统管理员; - tsmiLoginBackSystem.Name = "tsmiLoginBackSystem"; - tsmiLoginBackSystem.Size = new Size(313, 24); - tsmiLoginBackSystem.Text = "进入后台管理系统"; - tsmiLoginBackSystem.Click += tsmiLoginBackSystem_Click; - // - // toolStripSeparator2 - // - toolStripSeparator2.Name = "toolStripSeparator2"; - toolStripSeparator2.Size = new Size(310, 6); + toolStripSeparator4.Size = new Size(177, 6); // // tsmiUpdateLog // - tsmiUpdateLog.Font = new Font("Microsoft Sans Serif", 12F); + tsmiUpdateLog.Font = new Font("Noto Sans SC", 11.9999981F); tsmiUpdateLog.Name = "tsmiUpdateLog"; - tsmiUpdateLog.Size = new Size(313, 24); + tsmiUpdateLog.Size = new Size(180, 22); tsmiUpdateLog.Text = "查看更新日志"; tsmiUpdateLog.Click += tsmiUpdateLog_Click; // - // tsmiAboutUs + // tsmiHelp + // + tsmiHelp.DropDownItems.AddRange(new ToolStripItem[] { tsmiAccessOfficial }); + tsmiHelp.Font = new Font("Noto Sans SC", 11.9999981F); + tsmiHelp.Image = Properties.Resources.关于我们; + tsmiHelp.Name = "tsmiHelp"; + tsmiHelp.Size = new Size(180, 22); + tsmiHelp.Text = "帮助"; + // + // tsmiAccessOfficial + // + tsmiAccessOfficial.Name = "tsmiAccessOfficial"; + tsmiAccessOfficial.Size = new Size(180, 22); + tsmiAccessOfficial.Text = "访问官网"; + tsmiAccessOfficial.Click += tsmiAccessOfficial_Click; + // + // tsmiAbout // - tsmiAboutUs.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - tsmiAboutUs.Image = Properties.Resources.关于我们; - tsmiAboutUs.Name = "tsmiAboutUs"; - tsmiAboutUs.Size = new Size(313, 24); - tsmiAboutUs.Text = "关于我们"; - tsmiAboutUs.Click += tsmiAboutUs_Click; + tsmiAbout.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + tsmiAbout.Name = "tsmiAbout"; + tsmiAbout.Size = new Size(180, 22); + tsmiAbout.Text = "关于"; + tsmiAbout.Click += tsmiAbout_Click; // // tsmiExitSystem // - tsmiExitSystem.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); + tsmiExitSystem.Font = new Font("Noto Sans SC", 11.9999981F); tsmiExitSystem.Image = Properties.Resources.注销; tsmiExitSystem.Name = "tsmiExitSystem"; - tsmiExitSystem.Size = new Size(313, 24); + tsmiExitSystem.Size = new Size(180, 22); tsmiExitSystem.Text = "退出系统"; tsmiExitSystem.Click += tsmiExitSystem_Click; // @@ -218,12 +209,12 @@ // linkLabel1.AutoSize = true; linkLabel1.BackColor = Color.Transparent; - linkLabel1.Font = new Font("Microsoft Sans Serif", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + linkLabel1.Font = new Font("Noto Sans SC", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 0); linkLabel1.LinkBehavior = LinkBehavior.HoverUnderline; linkLabel1.Location = new Point(214, 25); linkLabel1.Margin = new Padding(4, 0, 4, 0); linkLabel1.Name = "linkLabel1"; - linkLabel1.Size = new Size(50, 17); + linkLabel1.Size = new Size(49, 14); linkLabel1.TabIndex = 26; linkLabel1.TabStop = true; linkLabel1.Text = "未打卡"; @@ -258,11 +249,11 @@ label3.AutoSize = true; label3.BackColor = Color.Transparent; label3.FlatStyle = FlatStyle.Flat; - label3.Font = new Font("Microsoft Sans Serif", 14.25F); + label3.Font = new Font("Noto Sans SC", 14.2499981F, FontStyle.Regular, GraphicsUnit.Point, 0); label3.Location = new Point(53, 193); label3.Margin = new Padding(4, 0, 4, 0); label3.Name = "label3"; - label3.Size = new Size(54, 24); + label3.Size = new Size(53, 19); label3.TabIndex = 30; label3.Text = "Hello"; // @@ -312,9 +303,9 @@ pnlCheckInfo.BackColor = Color.Transparent; pnlCheckInfo.BackgroundImage = Properties.Resources.打卡2; pnlCheckInfo.BackgroundImageLayout = ImageLayout.Stretch; + pnlCheckInfo.Controls.Add(lblCheckDay); pnlCheckInfo.Controls.Add(lblClose); pnlCheckInfo.Controls.Add(label4); - pnlCheckInfo.Controls.Add(lblCheckDay); pnlCheckInfo.Controls.Add(label2); pnlCheckInfo.Location = new Point(208, 58); pnlCheckInfo.Margin = new Padding(4); @@ -323,6 +314,16 @@ pnlCheckInfo.TabIndex = 27; pnlCheckInfo.Visible = false; // + // lblCheckDay + // + lblCheckDay.Font = new Font("Noto Sans SC", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 0); + lblCheckDay.Location = new Point(7, 42); + lblCheckDay.Name = "lblCheckDay"; + lblCheckDay.Size = new Size(50, 23); + lblCheckDay.TabIndex = 4; + lblCheckDay.Text = "365"; + lblCheckDay.TextAlign = ContentAlignment.MiddleCenter; + // // lblClose // lblClose.AutoSize = true; @@ -338,33 +339,22 @@ // label4 // label4.AutoSize = true; - label4.Font = new Font("Microsoft Sans Serif", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + label4.Font = new Font("Noto Sans SC", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 0); label4.Location = new Point(21, 68); label4.Margin = new Padding(4, 0, 4, 0); label4.Name = "label4"; - label4.Size = new Size(22, 17); + label4.Size = new Size(21, 14); label4.TabIndex = 2; label4.Text = "天"; // - // lblCheckDay - // - lblCheckDay.AutoSize = true; - lblCheckDay.Font = new Font("Microsoft Sans Serif", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - lblCheckDay.Location = new Point(8, 40); - lblCheckDay.Margin = new Padding(4, 0, 4, 0); - lblCheckDay.Name = "lblCheckDay"; - lblCheckDay.Size = new Size(48, 17); - lblCheckDay.TabIndex = 1; - lblCheckDay.Text = "36500"; - // // label2 // label2.AutoSize = true; - label2.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - label2.Location = new Point(6, 6); + label2.Font = new Font("Noto Sans SC", 9F, FontStyle.Regular, GraphicsUnit.Point, 0); + label2.Location = new Point(6, 11); label2.Margin = new Padding(4, 0, 4, 0); label2.Name = "label2"; - label2.Size = new Size(67, 15); + label2.Size = new Size(65, 12); label2.TabIndex = 0; label2.Text = "您已打卡："; // @@ -384,7 +374,7 @@ // // muNavBar // - muNavBar.Font = new Font("Microsoft YaHei UI", 14F); + muNavBar.Font = new Font("Noto Sans SC", 14.2499981F, FontStyle.Regular, GraphicsUnit.Point, 0); muNavBar.Location = new Point(311, 172); muNavBar.Mode = AntdUI.TMenuMode.Horizontal; muNavBar.Name = "muNavBar"; @@ -490,14 +480,12 @@ private System.Windows.Forms.Panel pnlMID; private System.Windows.Forms.ToolStripMenuItem tsmiChangeUser; private System.Windows.Forms.ToolStripMenuItem tsmiLockScreen; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripMenuItem tsmiCheckUpdate; private System.Windows.Forms.ToolStripMenuItem tsmiExitSystem; - private System.Windows.Forms.ToolStripMenuItem tsmiAboutUs; + private System.Windows.Forms.ToolStripMenuItem tsmiHelp; private System.Windows.Forms.LinkLabel linkLabel1; private System.Windows.Forms.Panel pnlCheckInfo; private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label lblCheckDay; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label lblClose; public System.Windows.Forms.NotifyIcon notifyIcon1; @@ -510,14 +498,15 @@ private System.Windows.Forms.ToolStripMenuItem tsmiMySpace; private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; - private System.Windows.Forms.ToolStripMenuItem tsmiLoginBackSystem; private Sunny.UI.UIButton picSetting; - private System.Windows.Forms.ToolStripMenuItem tsmiExChange; private AntdUI.Menu muNavBar; private AntdUI.Button btnClose; private AntdUI.Button btnFormSize; private AntdUI.Button btnSetting; private AntdUI.ColorPicker cpUITheme; private ToolStripMenuItem tsmiUpdateLog; + private AntdUI.Label lblCheckDay; + private ToolStripMenuItem tsmiAccessOfficial; + private ToolStripMenuItem tsmiAbout; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.cs b/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.cs index 86e1a9dbefc92309f0cacfa25643127b0d91dbf4..ee6b9d817367f6ec39e0b6a7cae13300d158ea62 100644 --- a/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.cs +++ b/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.cs @@ -29,7 +29,7 @@ using EOM.TSHotelManagement.Common.Util; using EOM.TSHotelManagement.FormUI.Properties; using jvncorelib.CodeLib; using Sunny.UI; -using System.Runtime.InteropServices; +using System.Diagnostics; namespace EOM.TSHotelManagement.FormUI { @@ -89,10 +89,6 @@ namespace EOM.TSHotelManagement.FormUI public static string wk_WorkerName; public static string wk_WorkerNames; - #region 调用windows的系统锁定 - [DllImport("user32 ")] - public static extern bool LockWorkStation();//这个是调用windows的系统锁定 - #endregion #region 窗体渐变相关代码 private bool showing = true; @@ -156,7 +152,7 @@ namespace EOM.TSHotelManagement.FormUI #region 从数据库读取文字滚动的内容 result = HttpHelper.Request(ApiConstants.PromotionContent_SelectPromotionContents); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { fonts = null; } @@ -168,16 +164,16 @@ namespace EOM.TSHotelManagement.FormUI #region 定时器：文字滚动间隔 private void tmrFont_Tick(object sender, EventArgs e) { - if (fonts.listSource == null || fonts.listSource.Count == 0) + if (fonts.Data.Items == null || fonts.Data.Items.Count == 0) { return; } fontn++; - if (fontn >= fonts.listSource.Count) + if (fontn >= fonts.Data.Items.Count) { fontn = 0; } - lblScroll.Text = fonts.listSource[fontn].PromotionContentMessage; + lblScroll.Text = fonts.Data.Items[fontn].PromotionContentMessage; } #endregion @@ -197,39 +193,27 @@ namespace EOM.TSHotelManagement.FormUI } #endregion - #region 窗体边框阴影效果变量申明 - - const int CS_DropSHADOW = 0x20000; - const int GCL_STYLE = (-26); - //声明Win32 API - [DllImport("user32.dll", CharSet = CharSet.Auto)] - public static extern int SetClassLong(IntPtr hwnd, int nIndex, int dwNewLong); - [DllImport("user32.dll", CharSet = CharSet.Auto)] - public static extern int GetClassLong(IntPtr hwnd, int nIndex); - - #endregion - /// /// 加载导航控件列表 /// private void LoadNavBar() { - var listSource = new List(); + var listData = new List(); #region 菜单导航代码块 result = HttpHelper.Request(ApiConstants.NavBar_NavBarList); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { AntdUI.Message.error(this, "服务器维护中，请过会再试"); - listSource = null; + listData = null; return; } - listSource = response.listSource; + listData = response.Data.Items; MenuItem menuItem = null; muNavBar.Controls.Clear(); - if (!listSource.IsNullOrEmpty()) + if (!listData.IsNullOrEmpty()) { - foreach (var item in listSource) + foreach (var item in listData) { menuItem = new MenuItem { @@ -263,7 +247,7 @@ namespace EOM.TSHotelManagement.FormUI { this.Owner.Hide(); - lblSoftName.Text = System.Windows.Forms.Application.ProductName.ToString() + "_V" + ApplicationUtil.GetApplicationVersion(); + lblSoftName.Text = System.Windows.Forms.Application.ProductName.ToString() + " V" + ApplicationUtil.GetApplicationVersion(); tmrDate.Enabled = true; @@ -291,23 +275,9 @@ namespace EOM.TSHotelManagement.FormUI btnHello.BackgroundImage = Resources.咖啡; } - Dictionary user = new Dictionary() - { - { nameof(ReadEmployeeCheckInputDto.EmployeeId), LoginInfo.WorkerNo} - }; - result = HttpHelper.Request(ApiConstants.EmployeeCheck_SelectToDayCheckInfoByWorkerNo, user); - var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) - { - UIMessageTip.ShowError($"{ApiConstants.EmployeeCheck_SelectToDayCheckInfoByWorkerNo}打卡接口异常：{response.Message}"); - return; - } - if (response.Source.IsChecked) - { - linkLabel1.Text = "已打卡"; - linkLabel1.ForeColor = Color.Green; - linkLabel1.LinkColor = Color.Green; - } + pnlCheckInfo.Visible = false; + checkEmployeeCheckInfo(); + notifyIcon1.Text = "TS酒店管理系统-" + LoginInfo.WorkerName + "-版本号：" + ApplicationUtil.GetApplicationVersion(); wk_WorkerName = LoginInfo.WorkerName; @@ -324,7 +294,8 @@ namespace EOM.TSHotelManagement.FormUI #region 调用系统锁屏方法 private void tsmiLockScreen_Click(object sender, EventArgs e) { - LockWorkStation(); + var lockForm = new FrmScreenLock(); + lockForm.ShowDialog(); } #endregion @@ -352,8 +323,6 @@ namespace EOM.TSHotelManagement.FormUI #region 关于我们选项的事件方法 private void tsmiAboutUs_Click(object sender, EventArgs e) { - FrmAboutUs frm = new FrmAboutUs(); - frm.Show(); } #endregion @@ -371,39 +340,40 @@ namespace EOM.TSHotelManagement.FormUI } private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + checkEmployeeCheckInfo(); + } + + private void checkEmployeeCheckInfo() { Dictionary user = new Dictionary() { { nameof(ReadEmployeeCheckInputDto.EmployeeId), LoginInfo.WorkerNo} }; - result = HttpHelper.Request(ApiConstants.EmployeeCheck_SelectToDayCheckInfoByWorkerNo, user); + + var result = HttpHelper.Request(ApiConstants.EmployeeCheck_SelectToDayCheckInfoByWorkerNo, user); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + + if (response.Code != BusinessStatusCode.Success) { UIMessageTip.ShowError($"打卡接口:{ApiConstants.EmployeeCheck_SelectToDayCheckInfoByWorkerNo}异常：{response.Message}"); return; } - if (response.Source.IsChecked) - { - linkLabel1.Text = "已打卡"; - linkLabel1.ForeColor = Color.Green; - linkLabel1.LinkColor = Color.Green; - pnlCheckInfo.Visible = true; - result = HttpHelper.Request(ApiConstants.EmployeeCheck_SelectWorkerCheckDaySumByEmployeeId, user); - response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) - { - UIMessageTip.ShowError($"打卡天数接口{ApiConstants.EmployeeCheck_SelectWorkerCheckDaySumByEmployeeId}异常：{response.Message}"); - return; - } - lblCheckDay.Text = Convert.ToString(response.Source.CheckDay); - } - else + + var tmCur = DateTime.Today; + int currentHour = tmCur.Hour; + bool isMorningShift = currentHour < 12; + + bool shouldHaveChecked = isMorningShift ? response.Data.MorningChecked : response.Data.EveningChecked; + string shiftName = isMorningShift ? "早班" : "晚班"; + + linkLabel1.Text = shouldHaveChecked ? $"{shiftName}已打卡" : $"{shiftName}未打卡"; + linkLabel1.ForeColor = shouldHaveChecked ? Color.Green : Color.Red; + linkLabel1.LinkColor = shouldHaveChecked ? Color.Green : Color.Red; + + if (!shouldHaveChecked) { - linkLabel1.Text = "未打卡"; - linkLabel1.ForeColor = Color.Red; - linkLabel1.LinkColor = Color.Red; - bool dr = UIMessageBox.Show("你今天还未打卡哦，请先打卡吧！", "打卡提醒", UIStyle.Blue, UIMessageBoxButtons.OK); + bool dr = UIMessageBox.Show($"你的{shiftName}还未打卡哦，请先打卡吧！", "打卡提醒", UIStyle.Blue, UIMessageBoxButtons.OK); if (dr == true) { CreateEmployeeCheckInputDto workerCheck = new() @@ -411,35 +381,38 @@ namespace EOM.TSHotelManagement.FormUI CheckNumber = new UniqueCode().GetNewId("CK"), DataInsDate = DateTime.Now, IsDelete = 0, - CheckStatus = btnHello.BackgroundImage == Resources.早上 ? 0 : 1, + CheckStatus = isMorningShift ? 0 : 1, EmployeeId = LoginInfo.WorkerNo, CheckMethod = "系统界面", CheckTime = DateTime.Now, DataInsUsr = LoginInfo.WorkerNo }; + result = HttpHelper.Request(ApiConstants.EmployeeCheck_AddCheckInfo, workerCheck.ModelToJson()); - var checkResult = HttpHelper.JsonToModel(result.message); - if (checkResult.StatusCode != StatusCodeConstants.Success) + var checkResult = HttpHelper.JsonToModel(result.message); + if (checkResult.Code != BusinessStatusCode.Success) { UIMessageTip.ShowError($"打卡接口{ApiConstants.EmployeeCheck_AddCheckInfo}异常：{checkResult.Message}"); return; } + result = HttpHelper.Request(ApiConstants.EmployeeCheck_SelectWorkerCheckDaySumByEmployeeId, user); response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { UIMessageTip.ShowError($"打卡天数接口{ApiConstants.EmployeeCheck_SelectWorkerCheckDaySumByEmployeeId}异常：{response.Message}"); return; } - lblCheckDay.Text = Convert.ToString(response.Source.CheckDay); - UIMessageBox.Show("打卡成功！你已共打卡" + lblCheckDay.Text + "天，再接再厉吧！", "打卡提醒", UIStyle.Green, UIMessageBoxButtons.OK); - linkLabel1.Text = "已打卡"; + + UIMessageBox.Show($"{shiftName}打卡成功！你已共打卡" + lblCheckDay.Text + "天", "打卡提醒", UIStyle.Green, UIMessageBoxButtons.OK); + linkLabel1.Text = $"{shiftName}已打卡"; linkLabel1.ForeColor = Color.Green; linkLabel1.LinkColor = Color.Green; - pnlCheckInfo.Visible = true; - return; } } + + lblCheckDay.Text = Convert.ToString(response.Data.CheckDay); + pnlCheckInfo.Visible = true; } private void lblClose_Click(object sender, EventArgs e) @@ -466,8 +439,6 @@ namespace EOM.TSHotelManagement.FormUI private void picLogo_Click(object sender, EventArgs e) { - FrmAboutUs frmAboutUs = new FrmAboutUs(); - frmAboutUs.ShowDialog(); } private void tsmiLoginBackSystem_Click(object sender, EventArgs e) @@ -489,7 +460,6 @@ namespace EOM.TSHotelManagement.FormUI private void cpUITheme_ValueChanged(object sender, ColorEventArgs e) { AntdUI.Style.SetPrimary(e.Value); - Settings.Default["ThemeColor"] = e.Value.ToArgb().ToString("X"); Refresh(); } @@ -532,5 +502,20 @@ namespace EOM.TSHotelManagement.FormUI { AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("Update log", "更新日志"), LoginInfo.SoftwareReleaseLog, TType.Info); } + + private void tsmiAccessOfficial_Click(object sender, EventArgs e) + { + Process.Start(new ProcessStartInfo + { + FileName = "https://www.oscode.top", + UseShellExecute = true + }); + } + + private void tsmiAbout_Click(object sender, EventArgs e) + { + FrmAbout frmAbout = new FrmAbout(); + frmAbout.ShowDialog(); + } } } diff --git a/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.cs b/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.cs index b03ad1429edb09ae294e7dad695b0bca14b9bba6..6a36dc1c5dcb64062d90a7b2e81b11d3ff81c1be 100644 --- a/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.cs +++ b/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.cs @@ -229,12 +229,12 @@ namespace EOM.TSHotelManagement.FormUI result = HttpHelper.Request(ApiConstants.Room_SelectRoomByRoomNo, getParam); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Code != BusinessStatusCode.Success) { UIMessageBox.Show($"{ApiConstants.Room_SelectRoomByRoomNo}+接口服务异常！", "来自小T提示", UIStyle.Red); return; } - r = response.Source; + r = response.Data; if (r.RoomStateId == (int)Common.Core.RoomState.Vacant) { tsmiCheckIn.Enabled = true; @@ -357,7 +357,7 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Reser_SelectReserInfoByRoomNo, getParam); var reserResponse = HttpHelper.JsonToModel>(result.message); - if (reserResponse.StatusCode != StatusCodeConstants.Success) + if (reserResponse.Code != BusinessStatusCode.Success) { UIMessageBox.Show($"{ApiConstants.Reser_SelectReserInfoByRoomNo}+接口服务异常！", "来自小T提示", UIStyle.Red); return; @@ -366,11 +366,11 @@ namespace EOM.TSHotelManagement.FormUI { var reser = new DeleteReserInputDto { - ReservationId = reserResponse.Source!.ReservationId + ReservationId = reserResponse.Data!.ReservationId }; result = HttpHelper.Request(ApiConstants.Reser_DeleteReserInfo, HttpHelper.ModelToJson(reser)); - var reserResult = HttpHelper.JsonToModel(result.message); - if (reserResult.StatusCode != StatusCodeConstants.Success) + var reserResult = HttpHelper.JsonToModel(result.message); + if (reserResult.Code != BusinessStatusCode.Success) { UIMessageBox.Show($"{ApiConstants.Reser_DeleteReserInfo}+接口服务异常！", "来自小T提示", UIStyle.Red); return; diff --git a/EOM.TSHotelManagement.FormUI/EOM.TSHotelManagement.FormUI.csproj b/EOM.TSHotelManagement.FormUI/EOM.TSHotelManagement.FormUI.csproj index bd1925ecda337baf2aae0d451679612cce42a512..a2eddbe5e2f0ced68eefc250e45e814828b5de21 100644 --- a/EOM.TSHotelManagement.FormUI/EOM.TSHotelManagement.FormUI.csproj +++ b/EOM.TSHotelManagement.FormUI/EOM.TSHotelManagement.FormUI.csproj @@ -19,9 +19,10 @@ $(SolutionDir)packages\Fody\build\Fody.targets false app.manifest + x64 - + Form diff --git a/EOM.TSHotelManagement.FormUI/Properties/Resources.Designer.cs b/EOM.TSHotelManagement.FormUI/Properties/Resources.Designer.cs index b6267e6683f5a096764e7eec1ceed9b510f329b2..e5f8616914f2157764ce82e41c40269ae48d075a 100644 --- a/EOM.TSHotelManagement.FormUI/Properties/Resources.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/Properties/Resources.Designer.cs @@ -110,6 +110,16 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap lock_screen { + get { + object obj = ResourceManager.GetObject("lock_screen", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/EOM.TSHotelManagement.FormUI/Properties/Resources.resx b/EOM.TSHotelManagement.FormUI/Properties/Resources.resx index 28a3c94e45fad7d32b8c1c76a4a316411474e612..87e2814912fd96984d9b629f3c5286acd2c82e36 100644 --- a/EOM.TSHotelManagement.FormUI/Properties/Resources.resx +++ b/EOM.TSHotelManagement.FormUI/Properties/Resources.resx @@ -118,196 +118,199 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\arrow-down-b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\blue_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\后勤部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\picExtend.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\lockicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\修改.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picCommodity.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\普通会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picCommodity.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\注销.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picCustomer.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\锁屏.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picCustomer.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\picRoom.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picExtend.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\月亮.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picExtend.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\打卡.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picLogo.BackgroundImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\维修状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\picRoom.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picRoom.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\餐饮部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\settings2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\总经办卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\上传照片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\可住房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\个人中心.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\用户登录.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\人力资源部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\商品部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\修改.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\上传照片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\白金会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\关于我们.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\内控部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\脏房icon1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\切换账号.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\picCustomer.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\可住房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\可住房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\密码.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\可住状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\blue_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\后勤部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\picCommodity.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\咖啡.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\picCommodity.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\商品部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\财务部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\复制.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\lockicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\密码.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\维修部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\已住房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\人力资源部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\已住房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\切换账号.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\已住状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\settings2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\常规部门卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\脏房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\总经办卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\已住房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\打卡.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\咖啡.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\早上.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\脏房状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\普通会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\经理部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\月亮.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\黄金会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\内控部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\检查更新 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\注销.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\个人中心.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\用户登录.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\常规部门卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\白金会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\酒店部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\监管小组卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\预约状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\系统管理员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\picCustomer.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\经理部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\预约房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\维修房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\维修房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\转换.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\维修状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\系统管理员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\维修部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\picLogo.BackgroundImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\脏房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\可住房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\脏房icon1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\脏房状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\早上.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\财务部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrow-down-b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\账号.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\钻石会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\转换.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\已住状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\酒店部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\可住状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\钻石会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\复制.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\锁屏.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\已住房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\预约房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\预约房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\监管小组卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\预约状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\维修房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\餐饮部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\picExtend.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\黄金会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\账号.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\lock_screen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/Properties/Settings.Designer.cs b/EOM.TSHotelManagement.FormUI/Properties/Settings.Designer.cs index 4abd93d7240756ddf4304fb932c792fa50f4f10d..d71fbfdb088cf9e65f402d7cba1bf9ff0f97c353 100644 --- a/EOM.TSHotelManagement.FormUI/Properties/Settings.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace EOM.TSHotelManagement.FormUI.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.12.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")] public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -22,5 +22,14 @@ namespace EOM.TSHotelManagement.FormUI.Properties { return defaultInstance; } } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string ThemeColor { + get { + return ((string)(this["ThemeColor"])); + } + } } } diff --git a/EOM.TSHotelManagement.FormUI/Properties/Settings.settings b/EOM.TSHotelManagement.FormUI/Properties/Settings.settings index 049245f401462e7e3dfbb96385e122ca467a9dab..ef0bbc87e48024f737ae04d3a96a618b24933513 100644 --- a/EOM.TSHotelManagement.FormUI/Properties/Settings.settings +++ b/EOM.TSHotelManagement.FormUI/Properties/Settings.settings @@ -1,6 +1,9 @@  - - - - - + + + + + + + + \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/TableComponent/TableComHelper.cs b/EOM.TSHotelManagement.FormUI/TableComponent/TableComHelper.cs index 7ab3858853bd43271ae6a3eef512433f18c8d8ad..57ab21302dcd9a8bc3f94f3c1737eb43a7a49f9d 100644 --- a/EOM.TSHotelManagement.FormUI/TableComponent/TableComHelper.cs +++ b/EOM.TSHotelManagement.FormUI/TableComponent/TableComHelper.cs @@ -78,7 +78,7 @@ namespace EOM.TSHotelManagement.FormUI /// public List ConvertToAntdItems(List datas) { - var listTableSource = new List(); + var listTableData = new List(); var properties = typeof(T).GetProperties(); foreach (var data in datas) @@ -139,9 +139,9 @@ namespace EOM.TSHotelManagement.FormUI } } - listTableSource.Add(antItems.ToArray()); + listTableData.Add(antItems.ToArray()); } - return listTableSource; + return listTableData; } public string GetValue(IList items, string key) diff --git a/EOM.TSHotelManagement.FormUI/app.manifest b/EOM.TSHotelManagement.FormUI/app.manifest index 12ac6f7a3de51debb5bb4f755c9e3c716999814c..3589cb8b76744322d92e527bbbbbdb8c061ac23d 100644 --- a/EOM.TSHotelManagement.FormUI/app.manifest +++ b/EOM.TSHotelManagement.FormUI/app.manifest @@ -4,18 +4,6 @@ - @@ -23,25 +11,6 @@ - - - - - - - - - - - - - - - - - diff --git a/EOM.TSHotelManagement.FormUI/images/lock_screen.png b/EOM.TSHotelManagement.FormUI/images/lock_screen.png new file mode 100644 index 0000000000000000000000000000000000000000..8c7fa3d1c99b261c3143fb1d9a2bcaf20c38d0d0 Binary files /dev/null and b/EOM.TSHotelManagement.FormUI/images/lock_screen.png differ diff --git a/topsky-hotel-management-system-web-api b/topsky-hotel-management-system-web-api index 1f277e6ed986829d433ae3a37d1a00b67cd354b7..825d34f97870fede73a8904ab145da5d2facd33b 160000 --- a/topsky-hotel-management-system-web-api +++ b/topsky-hotel-management-system-web-api @@ -1 +1 @@ -Subproject commit 1f277e6ed986829d433ae3a37d1a00b67cd354b7 +Subproject commit 825d34f97870fede73a8904ab145da5d2facd33b