diff --git a/EOM.Client.TopSkyHotelManagementSystem.sln b/EOM.Client.TopSkyHotelManagementSystem.sln index 9858e69e58c3e68608ea19efb8012496801c79bb..98c469cd39ec71284ea520ed596a11b2e44325f8 100644 --- a/EOM.Client.TopSkyHotelManagementSystem.sln +++ b/EOM.Client.TopSkyHotelManagementSystem.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.4.33213.308 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Api", "Api", "{6A3E4936-8B95-49E0-842B-E002C0E024CE}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{6A3E4936-8B95-49E0-842B-E002C0E024CE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{3B8902EC-CAB9-406A-AAF7-24DABD885AC0}" EndProject @@ -28,50 +28,90 @@ 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 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 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}.Debug|x86.ActiveCfg = Debug|x64 + {B55975AB-2C89-4C01-B107-D87FCA21A5E3}.Debug|x86.Build.0 = Debug|x64 + {B55975AB-2C89-4C01-B107-D87FCA21A5E3}.Release|x64.ActiveCfg = Release|x64 + {B55975AB-2C89-4C01-B107-D87FCA21A5E3}.Release|x86.ActiveCfg = Release|x86 + {B55975AB-2C89-4C01-B107-D87FCA21A5E3}.Release|x86.Build.0 = Release|x86 + {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}.Debug|x86.ActiveCfg = Debug|x64 + {8F5CF88A-1111-44CC-AFFA-4637EA10E191}.Debug|x86.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 + {8F5CF88A-1111-44CC-AFFA-4637EA10E191}.Release|x86.ActiveCfg = Release|x64 + {8F5CF88A-1111-44CC-AFFA-4637EA10E191}.Release|x86.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}.Debug|x86.ActiveCfg = Debug|x64 + {566D7064-EA90-45C1-93B7-F512BBAD7BA1}.Debug|x86.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 + {566D7064-EA90-45C1-93B7-F512BBAD7BA1}.Release|x86.ActiveCfg = Release|x64 + {566D7064-EA90-45C1-93B7-F512BBAD7BA1}.Release|x86.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}.Debug|x86.ActiveCfg = Debug|x64 + {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Debug|x86.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 + {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Release|x86.ActiveCfg = Release|x64 + {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Release|x86.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}.Debug|x86.ActiveCfg = Debug|x64 + {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}.Debug|x86.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 + {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}.Release|x86.ActiveCfg = Release|x64 + {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}.Release|x86.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}.Debug|x86.ActiveCfg = Debug|x64 + {781CEE04-DDB4-4037-8175-9A6548716871}.Debug|x86.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 + {781CEE04-DDB4-4037-8175-9A6548716871}.Release|x86.ActiveCfg = Release|x64 + {781CEE04-DDB4-4037-8175-9A6548716871}.Release|x86.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}.Debug|x86.ActiveCfg = Debug|x64 + {D89E76F5-007B-4915-91A8-265CCA6814BF}.Debug|x86.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 + {D89E76F5-007B-4915-91A8-265CCA6814BF}.Release|x86.ActiveCfg = Release|x64 + {D89E76F5-007B-4915-91A8-265CCA6814BF}.Release|x86.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}.Debug|x86.ActiveCfg = Debug|x64 + {1A37446C-A721-4507-89B5-7BFF6F66A004}.Debug|x86.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 + {1A37446C-A721-4507-89B5-7BFF6F66A004}.Release|x86.ActiveCfg = Release|x64 + {1A37446C-A721-4507-89B5-7BFF6F66A004}.Release|x86.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}.Debug|x86.ActiveCfg = Debug|x64 + {7E8046FD-4CB3-4BBC-8ADD-E27FE3DBBB55}.Debug|x86.Build.0 = Debug|x64 + {7E8046FD-4CB3-4BBC-8ADD-E27FE3DBBB55}.Release|x64.ActiveCfg = Release|x64 + {7E8046FD-4CB3-4BBC-8ADD-E27FE3DBBB55}.Release|x86.ActiveCfg = Release|x86 + {7E8046FD-4CB3-4BBC-8ADD-E27FE3DBBB55}.Release|x86.Build.0 = Release|x86 + {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}.Debug|x86.ActiveCfg = Debug|x64 + {A1A986E0-E59D-4913-B63E-D965453B8CC0}.Debug|x86.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 + {A1A986E0-E59D-4913-B63E-D965453B8CC0}.Release|x86.ActiveCfg = Release|x64 + {A1A986E0-E59D-4913-B63E-D965453B8CC0}.Release|x86.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..8114313a858ac58ec8897f8f91db71c85353b807 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"; @@ -31,7 +32,6 @@ public const string Room_SelectRoomAll = "Room/SelectRoomAll"; public const string Room_SelectRoomByRoomNo = "Room/SelectRoomByRoomNo"; public const string Room_DayByRoomNo = "Room/DayByRoomNo"; - public const string Room_CheckoutRoomByRoomNo = "Room/CheckoutRoomByRoomNo"; public const string Room_SelectCanUseRoomAll = "Room/SelectCanUseRoomAll"; public const string Room_UpdateRoomInfo = "Room​/UpdateRoomInfo"; public const string Room_UpdateRoomInfoWithReser = "Room​/UpdateRoomInfoWithReser"; @@ -52,6 +52,7 @@ public const string Reser_DeleteReserInfo = "Reser/DeleteReserInfo"; public const string Reser_InsertReserInfo = "Reser​/InserReserInfo"; public const string Reser_SelectReserInfoByRoomNo = "Reser/SelectReserInfoByRoomNo"; + public const string Reser_SelectReserTypeAll = "Reser/SelectReserTypeAll"; // Room Type URLs public const string RoomType_SelectRoomTypeByRoomNo = "RoomType/SelectRoomTypeByRoomNo"; @@ -70,17 +71,10 @@ // Spend URLs public const string Spend_SelectSpendByRoomNo = "Spend/SelectSpendByRoomNo"; public const string Spend_SumConsumptionAmount = "Spend/SumConsumptionAmount"; - public const string Spend_UpdateMoneyState = "Spend/UpdateMoneyState"; - 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_UndoCustomerSpend = "Spend/UndoCustomerSpend"; - // EnergyManagement URLs - public const string EnergyManagement_SelectEnergyManagementInfo = "EnergyManagement/SelectEnergyManagementInfo"; - public const string EnergyManagement_InsertEnergyManagementInfo = "EnergyManagement/InsertEnergyManagementInfo"; - // PromotionContent public const string PromotionContent_SelectPromotionContents = "PromotionContent/SelectPromotionContents"; @@ -92,7 +86,7 @@ // SellThing public const string Sellthing_SelectSellThingAll = "Sellthing/SelectSellThingAll"; - public const string Sellthing_UpdateSellthingInfo = "Sellthing/UpdateSellthingInfo"; + public const string Sellthing_UpdateSellthingInfo = "Sellthing/UpdateSellthing"; public const string Sellthing_SelectSellThingByNameAndPrice = "Sellthing/SelectSellThingByNameAndPrice"; // Utility diff --git a/EOM.TSHotelManagement.Common/EOM.TSHotelManagement.Common.csproj b/EOM.TSHotelManagement.Common/EOM.TSHotelManagement.Common.csproj index 8dd223e611a7a1e1db71c17b2030f6cf7871c582..fc0d7c3486a79de3d9dfe73665d173d800799f61 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 @@ -12,9 +13,7 @@ - - diff --git a/EOM.TSHotelManagement.Common/Helper/HttpHelper.cs b/EOM.TSHotelManagement.Common/Helper/HttpHelper.cs index 3c334a51ca9cb9b125448d4813cbaf408cf54fa6..64f88b50bfc00502a72433e2516aa91a476868c5 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 @@ -402,28 +402,6 @@ namespace EOM.TSHotelManagement.Common return REG_URL_ENCODING.Replace(stringToEncode, m => m.Value.ToUpperInvariant()); } - /// - /// Json转数组列表 - /// - /// - /// - /// - public static List? JsonToList(string JsonStr) - { - return JsonConvert.DeserializeObject>(JsonStr); - } - - /// - /// Json转分页列表 - /// - /// - /// - /// - public static T? JsonToPageList(string json) where T : class - { - return JsonConvert.DeserializeObject(json); - } - /// /// Json转实体 /// @@ -434,27 +412,5 @@ namespace EOM.TSHotelManagement.Common { return JsonConvert.DeserializeObject(input); } - - /// - /// 实体转Json - /// - /// - /// - /// - public static string ModelToJson(this T input) - { - try - { - return JsonConvert.SerializeObject(input, new JsonSerializerSettings - { - Converters = { new IgnoreNullValuesConverter(true) }, - Formatting = Formatting.Indented // 如果需要格式化输出 - }); - } - catch (Exception ex) - { - return ex.Message; - } - } } } 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/UIControlConstant.cs b/EOM.TSHotelManagement.Common/UIControlConstant.cs new file mode 100644 index 0000000000000000000000000000000000000000..5ba682dca99445aa8005fdb8bae68a5885c7d58b --- /dev/null +++ b/EOM.TSHotelManagement.Common/UIControlConstant.cs @@ -0,0 +1,25 @@ +namespace EOM.TSHotelManagement.Common +{ + public class UIControlConstant + { + public const string CheckInRoom = "入住房间"; + public const string ReservationRoom = "预约房间"; + public const string ChangeRoom = "更换房间"; + public const string ChangeStateRoom = "更换房间状态"; + public const string CheckOutRoom = "结算退房"; + public const string CustomerInformation = "客户信息"; + + public const string ChangeAccount = "切换账号"; + public const string SystemLock = "系统锁定"; + public const string ExitSystem = "退出系统"; + public const string Help = "帮助"; + public const string VisitOfficial = "访问官网"; + public const string About = "关于"; + public const string UpdateLog = "查看更新日志"; + + public const string PersonnalCenter = "个人中心"; + public const string PersonnalInformation = "我的信息"; + public const string AccountSecurity = "账号安全"; + public const string AccountAvator = "账号头像"; + } +} diff --git a/EOM.TSHotelManagement.Common/UIControlIconConstant.cs b/EOM.TSHotelManagement.Common/UIControlIconConstant.cs new file mode 100644 index 0000000000000000000000000000000000000000..db5c2413c7718350d26782c56a5654a80078bd5f --- /dev/null +++ b/EOM.TSHotelManagement.Common/UIControlIconConstant.cs @@ -0,0 +1,25 @@ +namespace EOM.TSHotelManagement.Common +{ + public class UIControlIconConstant + { + public const string ChangeAccount = ""; + public const string PersonnalCenter = ""; + public const string SystemLock = ""; + public const string Help = ""; + public const string Exit = ""; + public const string PersonnalInformation = ""; + public const string AccountSecurity = ""; + public const string AccountAvator = ""; + public const string Internet = ""; + public const string Log = ""; + public const string About = ""; + + + public const string Clock = ""; + public const string CheckIn = ""; + public const string CheckOut = ""; + public const string ChangeRoom = ""; + public const string ChangeState = ""; + public const string CustomerInformation = ""; + } +} diff --git a/EOM.TSHotelManagement.Common/UIMessageConstant.cs b/EOM.TSHotelManagement.Common/UIMessageConstant.cs new file mode 100644 index 0000000000000000000000000000000000000000..2e8483ac1df937e337bfc2d2dd510307e8c79743 --- /dev/null +++ b/EOM.TSHotelManagement.Common/UIMessageConstant.cs @@ -0,0 +1,21 @@ +namespace EOM.TSHotelManagement.Common +{ + public class UIMessageConstant + { + public const string Success = "成功"; + public const string Error = "错误"; + public const string Warning = "警告"; + public const string Information = "信息"; + public const string Ok = "确定"; + public const string Chs_Cancel = "取消"; + public const string Chs_Ok = "好的"; + public const string Eng_Ok = "OK"; + public const string Chs_Yes = "是"; + public const string Chs_No = "否"; + public const string Chs_Wait = "稍后"; + public const string Eng_Cancel = "Cancel"; + public const string Eng_Yes = "Yes"; + public const string Eng_No = "No"; + public const string Eng_Wait = "Wait a minute..."; + } +} diff --git a/EOM.TSHotelManagement.Common/Util/ApplicationUtil.cs b/EOM.TSHotelManagement.Common/Util/ApplicationUtil.cs index a296c1b3b020bb77755cf52c0a9e6b139d6e01e2..d84931e8c03ec66e11c623c7b90dadfedb65fc6b 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.Success == false) { 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.Common/Util/RecordHelper.cs b/EOM.TSHotelManagement.Common/Util/RecordHelper.cs index a20c925395b7d37d5e32eae2dc3b924fbb9521d6..fbbb88c99f19b045c04d0bcd91c16eb1ab12d727 100644 --- a/EOM.TSHotelManagement.Common/Util/RecordHelper.cs +++ b/EOM.TSHotelManagement.Common/Util/RecordHelper.cs @@ -1,5 +1,7 @@ using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Core; +using jvncorelib.CodeLib; +using jvncorelib.EntityLib; namespace EOM.TSHotelManagement.Common { @@ -18,6 +20,7 @@ namespace EOM.TSHotelManagement.Common string api = ApiConstants.Utility_AddLog; var logDetail = new CreateOperationLogInputDto { + OperationId = new UniqueCode().GetNewId("OP-"), OperationTime = Convert.ToDateTime(DateTime.Now), LogContent = operationLog, OperationAccount = LoginInfo.WorkerNo, @@ -27,7 +30,7 @@ namespace EOM.TSHotelManagement.Common DataInsUsr = LoginInfo.WorkerNo, DataInsDate = Convert.ToDateTime(DateTime.Now) }; - HttpHelper.Request(api, HttpHelper.ModelToJson(logDetail)); + HttpHelper.Request(api, logDetail.ModelToJson()); } } 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/FrmChangeRoom.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.Designer.cs deleted file mode 100644 index 68f6f743ea1a600d4310869a8653ef97dcd2d773..0000000000000000000000000000000000000000 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.Designer.cs +++ /dev/null @@ -1,134 +0,0 @@ -namespace EOM.TSHotelManagement.FormUI -{ - partial class FrmChangeRoom - { - /// - /// 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(FrmChangeRoom)); - this.uiLabel1 = new Sunny.UI.UILabel(); - this.cboRoomList = new Sunny.UI.UIComboBox(); - this.uiLabel2 = new Sunny.UI.UILabel(); - this.lblRoomType = new Sunny.UI.UILabel(); - this.btnChangeRoom = new Sunny.UI.UIButton(); - this.SuspendLayout(); - // - // uiLabel1 - // - this.uiLabel1.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiLabel1.Location = new System.Drawing.Point(15, 54); - this.uiLabel1.Name = "uiLabel1"; - this.uiLabel1.Size = new System.Drawing.Size(202, 28); - this.uiLabel1.Style = Sunny.UI.UIStyle.Custom; - this.uiLabel1.TabIndex = 6; - this.uiLabel1.Text = "请选择需要转换的新房间："; - this.uiLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // cboRoomList - // - this.cboRoomList.DataSource = null; - this.cboRoomList.FillColor = System.Drawing.Color.White; - this.cboRoomList.Font = new System.Drawing.Font("微软雅黑", 12F); - this.cboRoomList.Location = new System.Drawing.Point(208, 55); - this.cboRoomList.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cboRoomList.MinimumSize = new System.Drawing.Size(63, 0); - this.cboRoomList.Name = "cboRoomList"; - this.cboRoomList.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cboRoomList.Radius = 15; - this.cboRoomList.Size = new System.Drawing.Size(150, 29); - this.cboRoomList.Style = Sunny.UI.UIStyle.Custom; - this.cboRoomList.TabIndex = 7; - this.cboRoomList.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.cboRoomList.TextChanged += new System.EventHandler(this.cboRoomList_TextChanged); - // - // uiLabel2 - // - this.uiLabel2.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiLabel2.Location = new System.Drawing.Point(15, 96); - this.uiLabel2.Name = "uiLabel2"; - this.uiLabel2.Size = new System.Drawing.Size(183, 28); - this.uiLabel2.Style = Sunny.UI.UIStyle.Custom; - this.uiLabel2.TabIndex = 8; - this.uiLabel2.Text = "新 房 间 类 型 为："; - this.uiLabel2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // lblRoomType - // - this.lblRoomType.Font = new System.Drawing.Font("微软雅黑", 12F); - this.lblRoomType.Location = new System.Drawing.Point(208, 96); - this.lblRoomType.Name = "lblRoomType"; - this.lblRoomType.Size = new System.Drawing.Size(150, 28); - this.lblRoomType.Style = Sunny.UI.UIStyle.Custom; - this.lblRoomType.TabIndex = 9; - this.lblRoomType.Text = "新 房 间 类 型"; - this.lblRoomType.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // btnChangeRoom - // - this.btnChangeRoom.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnChangeRoom.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnChangeRoom.Location = new System.Drawing.Point(133, 138); - this.btnChangeRoom.MinimumSize = new System.Drawing.Size(1, 1); - this.btnChangeRoom.Name = "btnChangeRoom"; - this.btnChangeRoom.Radius = 15; - this.btnChangeRoom.Size = new System.Drawing.Size(107, 40); - this.btnChangeRoom.Style = Sunny.UI.UIStyle.Custom; - this.btnChangeRoom.TabIndex = 10; - this.btnChangeRoom.Text = "转 房"; - this.btnChangeRoom.Click += new System.EventHandler(this.btnChangeRoom_Click); - // - // FrmChangeRoom - // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.ClientSize = new System.Drawing.Size(372, 198); - this.Controls.Add(this.btnChangeRoom); - this.Controls.Add(this.lblRoomType); - this.Controls.Add(this.uiLabel2); - this.Controls.Add(this.cboRoomList); - this.Controls.Add(this.uiLabel1); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "FrmChangeRoom"; - this.ShowIcon = true; - this.ShowTitleIcon = true; - this.Style = Sunny.UI.UIStyle.Custom; - this.Text = "转换房间"; - this.Load += new System.EventHandler(this.FrmChangeRoom_Load); - this.ResumeLayout(false); - - } - - #endregion - private Sunny.UI.UILabel uiLabel1; - private Sunny.UI.UIComboBox cboRoomList; - private Sunny.UI.UILabel uiLabel2; - private Sunny.UI.UILabel lblRoomType; - private Sunny.UI.UIButton btnChangeRoom; - } -} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.Designer.cs deleted file mode 100644 index 05091947f076ab0c591ecb8a5172d3397d5c7f15..0000000000000000000000000000000000000000 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.Designer.cs +++ /dev/null @@ -1,680 +0,0 @@ -namespace EOM.TSHotelManagement.FormUI -{ - partial class FrmCheckOutForm - { - /// - /// 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(FrmCheckOutForm)); - lblVIPPrice = new Label(); - label15 = new Label(); - lblDay = new Label(); - lable00 = new Label(); - label29 = new Label(); - lblVIP = new Label(); - label25 = new Label(); - label27 = new Label(); - label28 = new Label(); - lblChange = new Label(); - label21 = new Label(); - lblGetReceipts = new Label(); - label1 = new Label(); - label24 = new Label(); - label17 = new Label(); - label18 = new Label(); - label2 = new Label(); - label3 = new Label(); - label4 = new Label(); - label5 = new Label(); - label16 = new Label(); - label22 = new Label(); - label30 = new Label(); - label31 = new Label(); - label32 = new Label(); - uiTabControlMenu2 = new Sunny.UI.UITabControlMenu(); - tabPage1 = new TabPage(); - dtpCheckTime = new AntdUI.Input(); - txtRoomNo = new AntdUI.Input(); - CustoName = new AntdUI.Input(); - CustoNo = new AntdUI.Input(); - btnBalance = new AntdUI.Button(); - txtReceipts = new AntdUI.Input(); - btnPg = new AntdUI.Pagination(); - dgvSpendList = new AntdUI.Table(); - tabPage2 = new TabPage(); - txtCustomerAddress = new AntdUI.Input(); - txtDateOfBirth = new AntdUI.Input(); - txtCustomerGender = new AntdUI.Input(); - txtCustomerName = new AntdUI.Input(); - txtCustomerNumber = new AntdUI.Input(); - txtTel = new AntdUI.Input(); - txtIdCardNumber = new AntdUI.Input(); - txtPassportName = new AntdUI.Input(); - txtCustomerType = new AntdUI.Input(); - tabPage3 = new TabPage(); - dgvWti = new AntdUI.Table(); - uiTabControlMenu2.SuspendLayout(); - tabPage1.SuspendLayout(); - tabPage2.SuspendLayout(); - tabPage3.SuspendLayout(); - SuspendLayout(); - // - // lblVIPPrice - // - lblVIPPrice.AutoSize = true; - lblVIPPrice.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); - lblVIPPrice.Location = new Point(509, 394); - lblVIPPrice.Name = "lblVIPPrice"; - lblVIPPrice.Size = new Size(40, 20); - lblVIPPrice.TabIndex = 28; - lblVIPPrice.Text = "0.00"; - // - // label15 - // - label15.AutoSize = true; - label15.Font = new Font("Microsoft Sans Serif", 10.5F, FontStyle.Bold, GraphicsUnit.Point, 0); - label15.ForeColor = Color.Red; - label15.Location = new Point(7, 525); - label15.Name = "label15"; - label15.Size = new Size(273, 17); - label15.TabIndex = 11; - label15.Text = "Tips：请提醒客人不要忘记带齐行李哦~"; - // - // lblDay - // - lblDay.AutoSize = true; - lblDay.Font = new Font("Microsoft Sans Serif", 15F, FontStyle.Regular, GraphicsUnit.Point, 0); - lblDay.Location = new Point(593, 76); - lblDay.Name = "lblDay"; - lblDay.Size = new Size(45, 25); - lblDay.TabIndex = 114; - lblDay.Text = "Null"; - // - // lable00 - // - lable00.AutoSize = true; - lable00.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); - lable00.Location = new Point(422, 394); - lable00.Name = "lable00"; - lable00.Size = new Size(89, 20); - lable00.TabIndex = 26; - lable00.Text = "应付金额："; - // - // label29 - // - label29.AutoSize = true; - label29.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label29.Location = new Point(572, 24); - label29.Name = "label29"; - label29.Size = new Size(88, 25); - label29.TabIndex = 113; - label29.Text = "已住天数"; - // - // lblVIP - // - lblVIP.AutoSize = true; - lblVIP.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); - lblVIP.Location = new Point(508, 362); - lblVIP.Name = "lblVIP"; - lblVIP.Size = new Size(73, 20); - lblVIP.TabIndex = 24; - lblVIP.Text = "不 打 折"; - // - // label25 - // - label25.AutoSize = true; - label25.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); - label25.Location = new Point(422, 362); - label25.Name = "label25"; - label25.Size = new Size(89, 20); - label25.TabIndex = 23; - label25.Text = "会员折扣："; - // - // label27 - // - label27.AutoSize = true; - label27.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label27.Location = new Point(285, 76); - label27.Name = "label27"; - label27.Size = new Size(88, 25); - label27.TabIndex = 110; - label27.Text = "房间编号"; - // - // label28 - // - label28.AutoSize = true; - label28.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label28.Location = new Point(285, 24); - label28.Name = "label28"; - label28.Size = new Size(88, 25); - label28.TabIndex = 109; - label28.Text = "入住时间"; - // - // lblChange - // - lblChange.AutoSize = true; - lblChange.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); - lblChange.Location = new Point(509, 458); - lblChange.Name = "lblChange"; - lblChange.Size = new Size(40, 20); - lblChange.TabIndex = 21; - lblChange.Text = "0.00"; - // - // label21 - // - label21.AutoSize = true; - label21.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); - label21.Location = new Point(421, 458); - label21.Name = "label21"; - label21.Size = new Size(89, 20); - label21.TabIndex = 20; - label21.Text = "找 零："; - // - // lblGetReceipts - // - lblGetReceipts.AutoSize = true; - lblGetReceipts.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); - lblGetReceipts.Location = new Point(509, 330); - lblGetReceipts.Name = "lblGetReceipts"; - lblGetReceipts.Size = new Size(40, 20); - lblGetReceipts.TabIndex = 19; - lblGetReceipts.Text = "0.00"; - // - // label1 - // - label1.AutoSize = true; - label1.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label1.Location = new Point(7, 76); - label1.Name = "label1"; - label1.Size = new Size(88, 25); - label1.TabIndex = 106; - label1.Text = "客户姓名"; - // - // label24 - // - label24.AutoSize = true; - label24.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label24.Location = new Point(7, 24); - label24.Name = "label24"; - label24.Size = new Size(88, 25); - label24.TabIndex = 105; - label24.Text = "客户编号"; - // - // label17 - // - label17.AutoSize = true; - label17.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); - label17.Location = new Point(421, 426); - label17.Name = "label17"; - label17.Size = new Size(89, 20); - label17.TabIndex = 14; - label17.Text = "实收金额："; - // - // label18 - // - label18.AutoSize = true; - label18.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); - label18.Location = new Point(422, 330); - label18.Name = "label18"; - label18.Size = new Size(89, 20); - label18.TabIndex = 15; - label18.Text = "消费总额："; - // - // label2 - // - label2.AutoSize = true; - label2.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label2.Location = new Point(25, 234); - label2.Name = "label2"; - label2.Size = new Size(88, 25); - label2.TabIndex = 115; - label2.Text = "居住地址"; - // - // label3 - // - label3.AutoSize = true; - label3.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label3.Location = new Point(344, 179); - label3.Name = "label3"; - label3.Size = new Size(88, 25); - label3.TabIndex = 114; - label3.Text = "联系方式"; - // - // label4 - // - label4.AutoSize = true; - label4.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label4.Location = new Point(344, 128); - label4.Name = "label4"; - label4.Size = new Size(88, 25); - label4.TabIndex = 113; - label4.Text = "证件号码"; - // - // label5 - // - label5.AutoSize = true; - label5.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label5.Location = new Point(344, 77); - label5.Name = "label5"; - label5.Size = new Size(88, 25); - label5.TabIndex = 112; - label5.Text = "证件类型"; - // - // label16 - // - label16.AutoSize = true; - label16.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label16.Location = new Point(344, 26); - label16.Name = "label16"; - label16.Size = new Size(88, 25); - label16.TabIndex = 111; - label16.Text = "客户类型"; - // - // label22 - // - label22.AutoSize = true; - label22.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label22.Location = new Point(27, 182); - label22.Name = "label22"; - label22.Size = new Size(88, 25); - label22.TabIndex = 110; - label22.Text = "出生日期"; - // - // label30 - // - label30.AutoSize = true; - label30.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label30.Location = new Point(27, 130); - label30.Name = "label30"; - label30.Size = new Size(86, 25); - label30.TabIndex = 109; - label30.Text = "性 别"; - // - // label31 - // - label31.AutoSize = true; - label31.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label31.Location = new Point(27, 78); - label31.Name = "label31"; - label31.Size = new Size(88, 25); - label31.TabIndex = 108; - label31.Text = "客户姓名"; - // - // label32 - // - label32.AutoSize = true; - label32.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label32.Location = new Point(27, 26); - label32.Name = "label32"; - label32.Size = new Size(88, 25); - label32.TabIndex = 107; - label32.Text = "客户编号"; - // - // uiTabControlMenu2 - // - uiTabControlMenu2.Alignment = TabAlignment.Left; - uiTabControlMenu2.Controls.Add(tabPage1); - uiTabControlMenu2.Controls.Add(tabPage2); - uiTabControlMenu2.Controls.Add(tabPage3); - uiTabControlMenu2.DrawMode = TabDrawMode.OwnerDrawFixed; - uiTabControlMenu2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiTabControlMenu2.Location = new Point(3, 38); - uiTabControlMenu2.MenuStyle = Sunny.UI.UIMenuStyle.Custom; - uiTabControlMenu2.Multiline = true; - uiTabControlMenu2.Name = "uiTabControlMenu2"; - uiTabControlMenu2.SelectedIndex = 0; - uiTabControlMenu2.Size = new Size(865, 550); - uiTabControlMenu2.SizeMode = TabSizeMode.Fixed; - uiTabControlMenu2.TabBackColor = Color.FromArgb(235, 243, 255); - uiTabControlMenu2.TabIndex = 15; - uiTabControlMenu2.TabSelectedColor = Color.Snow; - // - // tabPage1 - // - tabPage1.Controls.Add(dtpCheckTime); - tabPage1.Controls.Add(txtRoomNo); - tabPage1.Controls.Add(CustoName); - tabPage1.Controls.Add(CustoNo); - tabPage1.Controls.Add(btnBalance); - tabPage1.Controls.Add(txtReceipts); - tabPage1.Controls.Add(btnPg); - tabPage1.Controls.Add(dgvSpendList); - tabPage1.Controls.Add(label24); - tabPage1.Controls.Add(lblVIPPrice); - tabPage1.Controls.Add(label18); - tabPage1.Controls.Add(label15); - tabPage1.Controls.Add(label17); - tabPage1.Controls.Add(lblDay); - tabPage1.Controls.Add(label1); - tabPage1.Controls.Add(lable00); - tabPage1.Controls.Add(lblGetReceipts); - tabPage1.Controls.Add(label29); - tabPage1.Controls.Add(lblVIP); - tabPage1.Controls.Add(label21); - tabPage1.Controls.Add(label25); - tabPage1.Controls.Add(lblChange); - tabPage1.Controls.Add(label28); - tabPage1.Controls.Add(label27); - tabPage1.Location = new Point(201, 0); - tabPage1.Name = "tabPage1"; - tabPage1.Size = new Size(664, 550); - tabPage1.TabIndex = 0; - tabPage1.Text = "退房结算"; - tabPage1.UseVisualStyleBackColor = true; - // - // dtpCheckTime - // - dtpCheckTime.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - dtpCheckTime.Location = new Point(376, 16); - dtpCheckTime.Name = "dtpCheckTime"; - dtpCheckTime.PlaceholderText = ""; - dtpCheckTime.ReadOnly = true; - dtpCheckTime.Size = new Size(180, 42); - dtpCheckTime.TabIndex = 161; - // - // txtRoomNo - // - txtRoomNo.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtRoomNo.Location = new Point(376, 67); - txtRoomNo.Name = "txtRoomNo"; - txtRoomNo.PlaceholderText = ""; - txtRoomNo.ReadOnly = true; - txtRoomNo.Size = new Size(180, 42); - txtRoomNo.TabIndex = 160; - // - // CustoName - // - CustoName.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - CustoName.Location = new Point(98, 67); - CustoName.Name = "CustoName"; - CustoName.PlaceholderText = ""; - CustoName.ReadOnly = true; - CustoName.Size = new Size(180, 42); - CustoName.TabIndex = 159; - // - // CustoNo - // - CustoNo.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - CustoNo.Location = new Point(98, 16); - CustoNo.Name = "CustoNo"; - CustoNo.PlaceholderText = ""; - CustoNo.ReadOnly = true; - CustoNo.Size = new Size(180, 42); - CustoNo.TabIndex = 158; - // - // btnBalance - // - btnBalance.Location = new Point(422, 493); - btnBalance.Name = "btnBalance"; - btnBalance.Size = new Size(183, 48); - btnBalance.TabIndex = 157; - btnBalance.Text = "结 算"; - btnBalance.Type = AntdUI.TTypeMini.Primary; - btnBalance.Click += btnBalance_Click; - // - // txtReceipts - // - txtReceipts.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtReceipts.HandCursor = Cursors.IBeam; - txtReceipts.Location = new Point(508, 424); - txtReceipts.Name = "txtReceipts"; - txtReceipts.PlaceholderText = ""; - txtReceipts.Radius = 0; - txtReceipts.Size = new Size(97, 29); - txtReceipts.TabIndex = 156; - txtReceipts.TextChanged += txtReceipts_TextChanged; - // - // btnPg - // - btnPg.Current = 0; - btnPg.Location = new Point(7, 330); - btnPg.Name = "btnPg"; - btnPg.PageSize = 15; - btnPg.ShowSizeChanger = true; - btnPg.Size = new Size(403, 25); - btnPg.TabIndex = 135; - btnPg.Total = 1000000; - btnPg.ValueChanged += btnPg_ValueChanged; - btnPg.ShowTotalChanged += btnPg_ShowTotalChanged; - // - // dgvSpendList - // - dgvSpendList.Location = new Point(7, 113); - dgvSpendList.Name = "dgvSpendList"; - dgvSpendList.Size = new Size(654, 208); - dgvSpendList.TabIndex = 118; - dgvSpendList.Text = "table1"; - // - // tabPage2 - // - tabPage2.Controls.Add(txtCustomerAddress); - tabPage2.Controls.Add(txtDateOfBirth); - tabPage2.Controls.Add(txtCustomerGender); - tabPage2.Controls.Add(txtCustomerName); - tabPage2.Controls.Add(txtCustomerNumber); - tabPage2.Controls.Add(txtTel); - tabPage2.Controls.Add(txtIdCardNumber); - tabPage2.Controls.Add(txtPassportName); - tabPage2.Controls.Add(txtCustomerType); - tabPage2.Controls.Add(label32); - tabPage2.Controls.Add(label31); - tabPage2.Controls.Add(label30); - tabPage2.Controls.Add(label22); - tabPage2.Controls.Add(label16); - tabPage2.Controls.Add(label5); - tabPage2.Controls.Add(label4); - tabPage2.Controls.Add(label3); - tabPage2.Controls.Add(label2); - tabPage2.Location = new Point(201, 0); - tabPage2.Name = "tabPage2"; - tabPage2.Size = new Size(664, 550); - tabPage2.TabIndex = 1; - tabPage2.Text = "客户信息"; - tabPage2.UseVisualStyleBackColor = true; - // - // txtCustomerAddress - // - txtCustomerAddress.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustomerAddress.Location = new Point(134, 221); - txtCustomerAddress.Name = "txtCustomerAddress"; - txtCustomerAddress.PlaceholderText = ""; - txtCustomerAddress.ReadOnly = true; - txtCustomerAddress.Size = new Size(506, 42); - txtCustomerAddress.TabIndex = 158; - // - // txtDateOfBirth - // - txtDateOfBirth.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtDateOfBirth.Location = new Point(134, 170); - txtDateOfBirth.Name = "txtDateOfBirth"; - txtDateOfBirth.PlaceholderText = ""; - txtDateOfBirth.ReadOnly = true; - txtDateOfBirth.Size = new Size(203, 42); - txtDateOfBirth.TabIndex = 157; - // - // txtCustomerGender - // - txtCustomerGender.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustomerGender.Location = new Point(134, 119); - txtCustomerGender.Name = "txtCustomerGender"; - txtCustomerGender.PlaceholderText = ""; - txtCustomerGender.ReadOnly = true; - txtCustomerGender.Size = new Size(203, 42); - txtCustomerGender.TabIndex = 156; - // - // txtCustomerName - // - txtCustomerName.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustomerName.Location = new Point(134, 68); - txtCustomerName.Name = "txtCustomerName"; - txtCustomerName.PlaceholderText = ""; - txtCustomerName.ReadOnly = true; - txtCustomerName.Size = new Size(203, 42); - txtCustomerName.TabIndex = 155; - // - // txtCustomerNumber - // - txtCustomerNumber.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustomerNumber.Location = new Point(134, 17); - txtCustomerNumber.Name = "txtCustomerNumber"; - txtCustomerNumber.PlaceholderText = ""; - txtCustomerNumber.ReadOnly = true; - txtCustomerNumber.Size = new Size(203, 42); - txtCustomerNumber.TabIndex = 154; - // - // txtTel - // - txtTel.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtTel.Location = new Point(437, 170); - txtTel.Name = "txtTel"; - txtTel.PlaceholderText = ""; - txtTel.ReadOnly = true; - txtTel.Size = new Size(203, 42); - txtTel.TabIndex = 153; - // - // txtIdCardNumber - // - txtIdCardNumber.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtIdCardNumber.Location = new Point(437, 119); - txtIdCardNumber.Name = "txtIdCardNumber"; - txtIdCardNumber.PlaceholderText = ""; - txtIdCardNumber.ReadOnly = true; - txtIdCardNumber.Size = new Size(203, 42); - txtIdCardNumber.TabIndex = 152; - // - // txtPassportName - // - txtPassportName.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtPassportName.Location = new Point(437, 68); - txtPassportName.Name = "txtPassportName"; - txtPassportName.PlaceholderText = ""; - txtPassportName.ReadOnly = true; - txtPassportName.Size = new Size(203, 42); - txtPassportName.TabIndex = 151; - // - // txtCustomerType - // - txtCustomerType.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustomerType.Location = new Point(437, 17); - txtCustomerType.Name = "txtCustomerType"; - txtCustomerType.PlaceholderText = ""; - txtCustomerType.ReadOnly = true; - txtCustomerType.Size = new Size(203, 42); - txtCustomerType.TabIndex = 150; - // - // tabPage3 - // - tabPage3.Controls.Add(dgvWti); - tabPage3.Location = new Point(201, 0); - tabPage3.Name = "tabPage3"; - tabPage3.Size = new Size(664, 550); - tabPage3.TabIndex = 2; - tabPage3.Text = "历史水电情况"; - tabPage3.UseVisualStyleBackColor = true; - // - // dgvWti - // - dgvWti.Location = new Point(5, 7); - dgvWti.Name = "dgvWti"; - dgvWti.Size = new Size(654, 502); - dgvWti.TabIndex = 136; - dgvWti.Text = "table1"; - // - // FrmCheckOutForm - // - AutoScaleMode = AutoScaleMode.None; - BackColor = Color.FromArgb(235, 243, 255); - ClientSize = new Size(873, 593); - Controls.Add(uiTabControlMenu2); - Icon = (Icon)resources.GetObject("$this.Icon"); - MaximizeBox = false; - MinimizeBox = false; - Name = "FrmCheckOutForm"; - ShowTitleIcon = true; - Text = "退房结算"; - ZoomScaleRect = new Rectangle(15, 15, 888, 603); - Load += FrmCheckOutForm_Load; - MouseDown += FrmCheckOutForm_MouseDown; - MouseMove += FrmCheckOutForm_MouseMove; - uiTabControlMenu2.ResumeLayout(false); - tabPage1.ResumeLayout(false); - tabPage1.PerformLayout(); - tabPage2.ResumeLayout(false); - tabPage2.PerformLayout(); - tabPage3.ResumeLayout(false); - ResumeLayout(false); - } - - #endregion - private System.Windows.Forms.Label lblVIPPrice; - private System.Windows.Forms.Label label15; - private System.Windows.Forms.Label lblDay; - private System.Windows.Forms.Label lable00; - private System.Windows.Forms.Label label29; - private System.Windows.Forms.Label lblVIP; - private System.Windows.Forms.Label label25; - private System.Windows.Forms.Label label27; - private System.Windows.Forms.Label label28; - private System.Windows.Forms.Label lblChange; - private System.Windows.Forms.Label label21; - private System.Windows.Forms.Label lblGetReceipts; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label24; - private System.Windows.Forms.Label label17; - private System.Windows.Forms.Label label18; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label16; - private System.Windows.Forms.Label label22; - private System.Windows.Forms.Label label30; - private System.Windows.Forms.Label label31; - private System.Windows.Forms.Label label32; - private Sunny.UI.UITabControlMenu uiTabControlMenu2; - private System.Windows.Forms.TabPage tabPage1; - private System.Windows.Forms.TabPage tabPage2; - private System.Windows.Forms.TabPage tabPage3; - private AntdUI.Table dgvSpendList; - private AntdUI.Pagination btnPg; - private AntdUI.Input txtTel; - private AntdUI.Input txtIdCardNumber; - private AntdUI.Input txtPassportName; - private AntdUI.Input txtCustomerType; - private AntdUI.Input txtCustomerAddress; - private AntdUI.Input txtDateOfBirth; - private AntdUI.Input txtCustomerGender; - private AntdUI.Input txtCustomerName; - private AntdUI.Input txtCustomerNumber; - private AntdUI.Input txtReceipts; - private AntdUI.Button btnBalance; - private AntdUI.Input txtRoomNo; - private AntdUI.Input CustoName; - private AntdUI.Input CustoNo; - private AntdUI.Input dtpCheckTime; - private AntdUI.Table dgvWti; - } -} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.Designer.cs deleted file mode 100644 index 0c0217c1286a85e19e2ab8b35788087161c8a98b..0000000000000000000000000000000000000000 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.Designer.cs +++ /dev/null @@ -1,404 +0,0 @@ -namespace EOM.TSHotelManagement.FormUI -{ - partial class FrmEditInputs - { - /// - /// 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(FrmEditInputs)); - this.cbCustoType = new Sunny.UI.UIComboBox(); - this.cbPassportType = new Sunny.UI.UIComboBox(); - this.cbSex = new Sunny.UI.UIComboBox(); - this.txtCustoNo = new Sunny.UI.UITextBox(); - this.txtCustoName = new Sunny.UI.UITextBox(); - this.txtCardID = new Sunny.UI.UITextBox(); - this.txtTel = new Sunny.UI.UITextBox(); - this.dtpBirthday = new Sunny.UI.UIDatePicker(); - this.txtCustoAdress = new Sunny.UI.UITextBox(); - this.label10 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.pnlBtm.SuspendLayout(); - this.SuspendLayout(); - // - // pnlBtm - // - this.pnlBtm.Location = new System.Drawing.Point(1, 315); - this.pnlBtm.Size = new System.Drawing.Size(798, 55); - // - // btnCancel - // - this.btnCancel.Location = new System.Drawing.Point(670, 12); - this.btnCancel.Radius = 25; - this.btnCancel.Text = "关 闭"; - // - // btnOK - // - this.btnOK.Location = new System.Drawing.Point(555, 12); - this.btnOK.Radius = 25; - this.btnOK.Text = "保 存"; - // - // cbCustoType - // - this.cbCustoType.DataSource = null; - this.cbCustoType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cbCustoType.FillColor = System.Drawing.Color.White; - this.cbCustoType.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cbCustoType.Location = new System.Drawing.Point(518, 50); - this.cbCustoType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cbCustoType.MinimumSize = new System.Drawing.Size(63, 0); - this.cbCustoType.Name = "cbCustoType"; - this.cbCustoType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cbCustoType.Radius = 20; - this.cbCustoType.ReadOnly = true; - this.cbCustoType.Size = new System.Drawing.Size(250, 35); - this.cbCustoType.TabIndex = 124; - this.cbCustoType.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.cbCustoType.Watermark = ""; - // - // cbPassportType - // - this.cbPassportType.DataSource = null; - this.cbPassportType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cbPassportType.FillColor = System.Drawing.Color.White; - this.cbPassportType.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cbPassportType.Location = new System.Drawing.Point(518, 101); - this.cbPassportType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cbPassportType.MinimumSize = new System.Drawing.Size(63, 0); - this.cbPassportType.Name = "cbPassportType"; - this.cbPassportType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cbPassportType.Radius = 20; - this.cbPassportType.Size = new System.Drawing.Size(250, 35); - this.cbPassportType.TabIndex = 123; - this.cbPassportType.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // cbSex - // - this.cbSex.DataSource = null; - this.cbSex.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cbSex.FillColor = System.Drawing.Color.White; - this.cbSex.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cbSex.Location = new System.Drawing.Point(142, 155); - this.cbSex.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cbSex.MinimumSize = new System.Drawing.Size(63, 0); - this.cbSex.Name = "cbSex"; - this.cbSex.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cbSex.Radius = 20; - this.cbSex.Size = new System.Drawing.Size(250, 35); - this.cbSex.TabIndex = 122; - this.cbSex.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // txtCustoNo - // - this.txtCustoNo.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoNo.FillColor = System.Drawing.Color.White; - this.txtCustoNo.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCustoNo.Location = new System.Drawing.Point(142, 51); - this.txtCustoNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCustoNo.Maximum = 2147483647D; - this.txtCustoNo.Minimum = -2147483648D; - this.txtCustoNo.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCustoNo.Name = "txtCustoNo"; - this.txtCustoNo.Padding = new System.Windows.Forms.Padding(5); - this.txtCustoNo.Radius = 20; - this.txtCustoNo.ReadOnly = true; - this.txtCustoNo.Size = new System.Drawing.Size(250, 35); - this.txtCustoNo.Style = Sunny.UI.UIStyle.Custom; - this.txtCustoNo.StyleCustomMode = true; - this.txtCustoNo.TabIndex = 121; - this.txtCustoNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // txtCustoName - // - this.txtCustoName.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoName.FillColor = System.Drawing.Color.White; - this.txtCustoName.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCustoName.Location = new System.Drawing.Point(142, 103); - this.txtCustoName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCustoName.Maximum = 2147483647D; - this.txtCustoName.Minimum = -2147483648D; - this.txtCustoName.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCustoName.Name = "txtCustoName"; - this.txtCustoName.Padding = new System.Windows.Forms.Padding(5); - this.txtCustoName.Radius = 20; - this.txtCustoName.Size = new System.Drawing.Size(250, 35); - this.txtCustoName.Style = Sunny.UI.UIStyle.Custom; - this.txtCustoName.StyleCustomMode = true; - this.txtCustoName.TabIndex = 120; - this.txtCustoName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // txtCardID - // - this.txtCardID.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCardID.FillColor = System.Drawing.Color.White; - this.txtCardID.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCardID.Location = new System.Drawing.Point(518, 152); - this.txtCardID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCardID.Maximum = 2147483647D; - this.txtCardID.Minimum = -2147483648D; - this.txtCardID.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCardID.Name = "txtCardID"; - this.txtCardID.Padding = new System.Windows.Forms.Padding(5); - this.txtCardID.Radius = 20; - this.txtCardID.Size = new System.Drawing.Size(250, 35); - this.txtCardID.Style = Sunny.UI.UIStyle.Custom; - this.txtCardID.StyleCustomMode = true; - this.txtCardID.TabIndex = 119; - this.txtCardID.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.txtCardID.Validated += new System.EventHandler(this.txtCardID_Validated); - // - // txtTel - // - this.txtTel.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtTel.FillColor = System.Drawing.Color.White; - this.txtTel.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtTel.Location = new System.Drawing.Point(518, 203); - this.txtTel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtTel.Maximum = 2147483647D; - this.txtTel.Minimum = -2147483648D; - this.txtTel.MinimumSize = new System.Drawing.Size(1, 1); - this.txtTel.Name = "txtTel"; - this.txtTel.Padding = new System.Windows.Forms.Padding(5); - this.txtTel.Radius = 20; - this.txtTel.Size = new System.Drawing.Size(250, 35); - this.txtTel.Style = Sunny.UI.UIStyle.Custom; - this.txtTel.StyleCustomMode = true; - this.txtTel.TabIndex = 118; - this.txtTel.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // dtpBirthday - // - this.dtpBirthday.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.dtpBirthday.FillColor = System.Drawing.Color.White; - this.dtpBirthday.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F); - this.dtpBirthday.Location = new System.Drawing.Point(142, 207); - this.dtpBirthday.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.dtpBirthday.MaxLength = 10; - this.dtpBirthday.MinimumSize = new System.Drawing.Size(63, 0); - this.dtpBirthday.Name = "dtpBirthday"; - this.dtpBirthday.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.dtpBirthday.Radius = 20; - this.dtpBirthday.ReadOnly = true; - this.dtpBirthday.Size = new System.Drawing.Size(250, 31); - this.dtpBirthday.SymbolDropDown = 61555; - this.dtpBirthday.SymbolNormal = 61555; - this.dtpBirthday.TabIndex = 117; - this.dtpBirthday.Text = "2020-11-24"; - this.dtpBirthday.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.dtpBirthday.Value = new System.DateTime(2020, 11, 24, 22, 50, 36, 791); - // - // txtCustoAdress - // - this.txtCustoAdress.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoAdress.FillColor = System.Drawing.Color.White; - this.txtCustoAdress.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCustoAdress.Location = new System.Drawing.Point(140, 255); - this.txtCustoAdress.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCustoAdress.Maximum = 2147483647D; - this.txtCustoAdress.Minimum = -2147483648D; - this.txtCustoAdress.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCustoAdress.Name = "txtCustoAdress"; - this.txtCustoAdress.Padding = new System.Windows.Forms.Padding(5); - this.txtCustoAdress.Radius = 20; - this.txtCustoAdress.Size = new System.Drawing.Size(628, 35); - this.txtCustoAdress.Style = Sunny.UI.UIStyle.Custom; - this.txtCustoAdress.StyleCustomMode = true; - this.txtCustoAdress.TabIndex = 116; - this.txtCustoAdress.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // label10 - // - this.label10.AutoSize = true; - this.label10.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label10.Location = new System.Drawing.Point(33, 265); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(88, 25); - this.label10.TabIndex = 115; - this.label10.Text = "居住地址"; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(414, 210); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(88, 25); - this.label9.TabIndex = 114; - this.label9.Text = "联系方式"; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(414, 159); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(88, 25); - this.label8.TabIndex = 113; - this.label8.Text = "证件号码"; - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(414, 108); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(88, 25); - this.label7.TabIndex = 112; - this.label7.Text = "证件类型"; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(414, 57); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(88, 25); - this.label6.TabIndex = 111; - this.label6.Text = "客户类型"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(35, 213); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(88, 25); - this.label5.TabIndex = 110; - this.label5.Text = "出生日期"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(35, 161); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(74, 25); - this.label4.TabIndex = 109; - this.label4.Text = "性 别"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(35, 109); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(88, 25); - this.label3.TabIndex = 108; - this.label3.Text = "客户姓名"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(35, 57); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(88, 25); - this.label2.TabIndex = 107; - this.label2.Text = "客户编号"; - // - // FrmEditInputs - // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 373); - this.Controls.Add(this.cbCustoType); - this.Controls.Add(this.cbPassportType); - this.Controls.Add(this.cbSex); - this.Controls.Add(this.txtCustoNo); - this.Controls.Add(this.txtCustoName); - this.Controls.Add(this.txtCardID); - this.Controls.Add(this.txtTel); - this.Controls.Add(this.dtpBirthday); - this.Controls.Add(this.txtCustoAdress); - this.Controls.Add(this.label10); - this.Controls.Add(this.label9); - this.Controls.Add(this.label8); - this.Controls.Add(this.label7); - this.Controls.Add(this.label6); - this.Controls.Add(this.label5); - this.Controls.Add(this.label4); - this.Controls.Add(this.label3); - this.Controls.Add(this.label2); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Name = "FrmEditInputs"; - this.ShowTitleIcon = true; - this.Text = "添加会员信息"; - this.ButtonOkClick += new System.EventHandler(this.FrmEditInputs_ButtonOkClick); - this.ButtonCancelClick += new System.EventHandler(this.FrmEditInputs_ButtonCancelClick); - this.Load += new System.EventHandler(this.FrmEditInputs_Load); - this.Controls.SetChildIndex(this.pnlBtm, 0); - this.Controls.SetChildIndex(this.label2, 0); - this.Controls.SetChildIndex(this.label3, 0); - this.Controls.SetChildIndex(this.label4, 0); - this.Controls.SetChildIndex(this.label5, 0); - this.Controls.SetChildIndex(this.label6, 0); - this.Controls.SetChildIndex(this.label7, 0); - this.Controls.SetChildIndex(this.label8, 0); - this.Controls.SetChildIndex(this.label9, 0); - this.Controls.SetChildIndex(this.label10, 0); - this.Controls.SetChildIndex(this.txtCustoAdress, 0); - this.Controls.SetChildIndex(this.dtpBirthday, 0); - this.Controls.SetChildIndex(this.txtTel, 0); - this.Controls.SetChildIndex(this.txtCardID, 0); - this.Controls.SetChildIndex(this.txtCustoName, 0); - this.Controls.SetChildIndex(this.txtCustoNo, 0); - this.Controls.SetChildIndex(this.cbSex, 0); - this.Controls.SetChildIndex(this.cbPassportType, 0); - this.Controls.SetChildIndex(this.cbCustoType, 0); - this.pnlBtm.ResumeLayout(false); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private Sunny.UI.UIComboBox cbCustoType; - private Sunny.UI.UIComboBox cbPassportType; - private Sunny.UI.UIComboBox cbSex; - private Sunny.UI.UITextBox txtCustoNo; - private Sunny.UI.UITextBox txtCustoName; - private Sunny.UI.UITextBox txtCardID; - private Sunny.UI.UITextBox txtTel; - private Sunny.UI.UIDatePicker dtpBirthday; - private Sunny.UI.UITextBox txtCustoAdress; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label2; - } -} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.Designer.cs deleted file mode 100644 index 7c21ae0b90eebc6aac3201d553b053efa394f735..0000000000000000000000000000000000000000 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.Designer.cs +++ /dev/null @@ -1,556 +0,0 @@ - -namespace EOM.TSHotelManagement.FormUI -{ - partial class FrmMySpace - { - /// - /// 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(FrmMySpace)); - label7 = new Label(); - btnUpdWorker = new Sunny.UI.UIButton(); - cbWorkerNation = new Sunny.UI.UIComboBox(); - label1 = new Label(); - cboWorkerClub = new Sunny.UI.UIComboBox(); - cboWorkerPosition = new Sunny.UI.UIComboBox(); - cboSex = new Sunny.UI.UIComboBox(); - txtWorkerNo = new Sunny.UI.UITextBox(); - txtWorkerName = new Sunny.UI.UITextBox(); - txtTel = new Sunny.UI.UITextBox(); - txtAddress = new Sunny.UI.UITextBox(); - label2 = new Label(); - label5 = new Label(); - label16 = new Label(); - label30 = new Label(); - label31 = new Label(); - label32 = new Label(); - openPic = new OpenFileDialog(); - uiTabControlMenu2 = new Sunny.UI.UITabControlMenu(); - tabPage1 = new TabPage(); - tabPage2 = new TabPage(); - avatar3 = new AntdUI.Avatar(); - txtOldPassword = new AntdUI.Input(); - lblEmployeeId = new AntdUI.Label(); - avatar2 = new AntdUI.Avatar(); - avatar1 = new AntdUI.Avatar(); - btnUpdatePassword = new AntdUI.Button(); - txtNewPassword = new AntdUI.Input(); - tabPage3 = new TabPage(); - label4 = new AntdUI.Label(); - picWorkerPic = new PictureBox(); - uiTabControlMenu2.SuspendLayout(); - tabPage1.SuspendLayout(); - tabPage2.SuspendLayout(); - tabPage3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)picWorkerPic).BeginInit(); - SuspendLayout(); - // - // label7 - // - label7.AutoSize = true; - label7.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label7.Location = new Point(58, 171); - label7.Name = "label7"; - label7.Size = new Size(88, 25); - label7.TabIndex = 131; - label7.Text = "联系方式"; - // - // btnUpdWorker - // - btnUpdWorker.Cursor = Cursors.Hand; - btnUpdWorker.Font = new Font("微软雅黑", 12F); - btnUpdWorker.Location = new Point(562, 270); - btnUpdWorker.MinimumSize = new Size(1, 1); - btnUpdWorker.Name = "btnUpdWorker"; - btnUpdWorker.Radius = 20; - btnUpdWorker.Size = new Size(109, 42); - btnUpdWorker.TabIndex = 130; - btnUpdWorker.Text = "修 改"; - btnUpdWorker.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - btnUpdWorker.Click += btnUpdWorker_Click; - // - // cbWorkerNation - // - cbWorkerNation.DataSource = null; - cbWorkerNation.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - cbWorkerNation.FillColor = Color.White; - cbWorkerNation.Font = new Font("微软雅黑", 15.75F); - cbWorkerNation.ItemHoverColor = Color.FromArgb(155, 200, 255); - cbWorkerNation.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - cbWorkerNation.Location = new Point(466, 116); - cbWorkerNation.Margin = new Padding(4, 5, 4, 5); - cbWorkerNation.MinimumSize = new Size(63, 0); - cbWorkerNation.Name = "cbWorkerNation"; - cbWorkerNation.Padding = new Padding(0, 0, 30, 2); - cbWorkerNation.Radius = 20; - cbWorkerNation.Size = new Size(203, 35); - cbWorkerNation.Style = Sunny.UI.UIStyle.Custom; - cbWorkerNation.SymbolSize = 24; - cbWorkerNation.TabIndex = 129; - cbWorkerNation.TextAlignment = ContentAlignment.MiddleLeft; - cbWorkerNation.Watermark = ""; - cbWorkerNation.SelectedIndexChanged += cbWorkerNation_SelectedIndexChanged; - // - // label1 - // - label1.AutoSize = true; - label1.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label1.Location = new Point(369, 119); - label1.Name = "label1"; - label1.Size = new Size(86, 25); - label1.TabIndex = 128; - label1.Text = "民 族"; - // - // cboWorkerClub - // - cboWorkerClub.DataSource = null; - cboWorkerClub.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - cboWorkerClub.FillColor = Color.White; - cboWorkerClub.Font = new Font("微软雅黑", 15.75F); - cboWorkerClub.ItemHoverColor = Color.FromArgb(155, 200, 255); - cboWorkerClub.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - cboWorkerClub.Location = new Point(467, 12); - cboWorkerClub.Margin = new Padding(4, 5, 4, 5); - cboWorkerClub.MinimumSize = new Size(63, 0); - cboWorkerClub.Name = "cboWorkerClub"; - cboWorkerClub.Padding = new Padding(0, 0, 30, 2); - cboWorkerClub.Radius = 20; - cboWorkerClub.ReadOnly = true; - cboWorkerClub.Size = new Size(203, 35); - cboWorkerClub.Style = Sunny.UI.UIStyle.Custom; - cboWorkerClub.SymbolSize = 24; - cboWorkerClub.TabIndex = 125; - cboWorkerClub.TextAlignment = ContentAlignment.MiddleLeft; - cboWorkerClub.Watermark = ""; - // - // cboWorkerPosition - // - cboWorkerPosition.DataSource = null; - cboWorkerPosition.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - cboWorkerPosition.FillColor = Color.White; - cboWorkerPosition.Font = new Font("微软雅黑", 15.75F); - cboWorkerPosition.ItemHoverColor = Color.FromArgb(155, 200, 255); - cboWorkerPosition.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - cboWorkerPosition.Location = new Point(467, 64); - cboWorkerPosition.Margin = new Padding(4, 5, 4, 5); - cboWorkerPosition.MinimumSize = new Size(63, 0); - cboWorkerPosition.Name = "cboWorkerPosition"; - cboWorkerPosition.Padding = new Padding(0, 0, 30, 2); - cboWorkerPosition.Radius = 20; - cboWorkerPosition.ReadOnly = true; - cboWorkerPosition.Size = new Size(203, 35); - cboWorkerPosition.Style = Sunny.UI.UIStyle.Custom; - cboWorkerPosition.SymbolSize = 24; - cboWorkerPosition.TabIndex = 124; - cboWorkerPosition.TextAlignment = ContentAlignment.MiddleLeft; - cboWorkerPosition.Watermark = ""; - // - // cboSex - // - cboSex.DataSource = null; - cboSex.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - cboSex.FillColor = Color.White; - cboSex.Font = new Font("微软雅黑", 15.75F); - cboSex.ItemHoverColor = Color.FromArgb(155, 200, 255); - cboSex.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - cboSex.Location = new Point(155, 116); - cboSex.Margin = new Padding(4, 5, 4, 5); - cboSex.MinimumSize = new Size(63, 0); - cboSex.Name = "cboSex"; - cboSex.Padding = new Padding(0, 0, 30, 2); - cboSex.Radius = 20; - cboSex.Size = new Size(203, 35); - cboSex.Style = Sunny.UI.UIStyle.Custom; - cboSex.SymbolSize = 24; - cboSex.TabIndex = 123; - cboSex.TextAlignment = ContentAlignment.MiddleLeft; - cboSex.Watermark = ""; - // - // txtWorkerNo - // - txtWorkerNo.Cursor = Cursors.IBeam; - txtWorkerNo.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtWorkerNo.Location = new Point(156, 12); - txtWorkerNo.Margin = new Padding(4, 5, 4, 5); - txtWorkerNo.MinimumSize = new Size(1, 1); - txtWorkerNo.Name = "txtWorkerNo"; - txtWorkerNo.Padding = new Padding(5); - txtWorkerNo.Radius = 20; - txtWorkerNo.ReadOnly = true; - txtWorkerNo.ShowText = false; - txtWorkerNo.Size = new Size(203, 35); - txtWorkerNo.Style = Sunny.UI.UIStyle.Custom; - txtWorkerNo.StyleCustomMode = true; - txtWorkerNo.TabIndex = 122; - txtWorkerNo.TextAlignment = ContentAlignment.MiddleLeft; - txtWorkerNo.Watermark = ""; - // - // txtWorkerName - // - txtWorkerName.Cursor = Cursors.IBeam; - txtWorkerName.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtWorkerName.Location = new Point(156, 64); - txtWorkerName.Margin = new Padding(4, 5, 4, 5); - txtWorkerName.MinimumSize = new Size(1, 1); - txtWorkerName.Name = "txtWorkerName"; - txtWorkerName.Padding = new Padding(5); - txtWorkerName.Radius = 20; - txtWorkerName.ShowText = false; - txtWorkerName.Size = new Size(203, 35); - txtWorkerName.Style = Sunny.UI.UIStyle.Custom; - txtWorkerName.StyleCustomMode = true; - txtWorkerName.TabIndex = 121; - txtWorkerName.TextAlignment = ContentAlignment.MiddleLeft; - txtWorkerName.Watermark = ""; - // - // txtTel - // - txtTel.Cursor = Cursors.IBeam; - txtTel.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtTel.Location = new Point(156, 164); - txtTel.Margin = new Padding(4, 5, 4, 5); - txtTel.MinimumSize = new Size(1, 1); - txtTel.Name = "txtTel"; - txtTel.Padding = new Padding(5); - txtTel.Radius = 20; - txtTel.ShowText = false; - txtTel.Size = new Size(515, 35); - txtTel.Style = Sunny.UI.UIStyle.Custom; - txtTel.StyleCustomMode = true; - txtTel.TabIndex = 119; - txtTel.TextAlignment = ContentAlignment.MiddleLeft; - txtTel.Watermark = ""; - // - // txtAddress - // - txtAddress.Cursor = Cursors.IBeam; - txtAddress.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtAddress.Location = new Point(156, 216); - txtAddress.Margin = new Padding(4, 5, 4, 5); - txtAddress.MinimumSize = new Size(1, 1); - txtAddress.Name = "txtAddress"; - txtAddress.Padding = new Padding(5); - txtAddress.Radius = 20; - txtAddress.ShowText = false; - txtAddress.Size = new Size(515, 35); - txtAddress.Style = Sunny.UI.UIStyle.Custom; - txtAddress.StyleCustomMode = true; - txtAddress.TabIndex = 117; - txtAddress.TextAlignment = ContentAlignment.MiddleLeft; - txtAddress.Watermark = ""; - // - // label2 - // - label2.AutoSize = true; - label2.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label2.Location = new Point(58, 221); - label2.Name = "label2"; - label2.Size = new Size(88, 25); - label2.TabIndex = 115; - label2.Text = "居住地址"; - // - // label5 - // - label5.AutoSize = true; - label5.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label5.Location = new Point(369, 69); - label5.Name = "label5"; - label5.Size = new Size(88, 25); - label5.TabIndex = 112; - label5.Text = "现任职位"; - // - // label16 - // - label16.AutoSize = true; - label16.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label16.Location = new Point(369, 18); - label16.Name = "label16"; - label16.Size = new Size(88, 25); - label16.TabIndex = 111; - label16.Text = "所在部门"; - // - // label30 - // - label30.AutoSize = true; - label30.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label30.Location = new Point(58, 119); - label30.Name = "label30"; - label30.Size = new Size(86, 25); - label30.TabIndex = 109; - label30.Text = "性 别"; - // - // label31 - // - label31.AutoSize = true; - label31.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label31.Location = new Point(58, 69); - label31.Name = "label31"; - label31.Size = new Size(88, 25); - label31.TabIndex = 108; - label31.Text = "员工姓名"; - // - // label32 - // - label32.AutoSize = true; - label32.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label32.Location = new Point(58, 18); - label32.Name = "label32"; - label32.Size = new Size(88, 25); - label32.TabIndex = 107; - label32.Text = "员工编号"; - // - // openPic - // - openPic.FileName = "openFileDialog1"; - openPic.Filter = "PNG文件|*.png|JPG文件|*.jpg|位图文件|*.bmp"; - openPic.FileOk += openPic_FileOk; - // - // uiTabControlMenu2 - // - uiTabControlMenu2.Alignment = TabAlignment.Left; - uiTabControlMenu2.Controls.Add(tabPage1); - uiTabControlMenu2.Controls.Add(tabPage2); - uiTabControlMenu2.Controls.Add(tabPage3); - uiTabControlMenu2.DrawMode = TabDrawMode.OwnerDrawFixed; - uiTabControlMenu2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiTabControlMenu2.Location = new Point(3, 38); - uiTabControlMenu2.MenuStyle = Sunny.UI.UIMenuStyle.Custom; - uiTabControlMenu2.Multiline = true; - uiTabControlMenu2.Name = "uiTabControlMenu2"; - uiTabControlMenu2.SelectedIndex = 0; - uiTabControlMenu2.Size = new Size(929, 546); - uiTabControlMenu2.SizeMode = TabSizeMode.Fixed; - uiTabControlMenu2.TabBackColor = Color.FromArgb(235, 243, 255); - uiTabControlMenu2.TabIndex = 15; - uiTabControlMenu2.TabSelectedColor = Color.Snow; - // - // tabPage1 - // - tabPage1.Controls.Add(label7); - tabPage1.Controls.Add(label32); - tabPage1.Controls.Add(btnUpdWorker); - tabPage1.Controls.Add(label31); - tabPage1.Controls.Add(cbWorkerNation); - tabPage1.Controls.Add(label30); - tabPage1.Controls.Add(label1); - tabPage1.Controls.Add(label16); - tabPage1.Controls.Add(cboWorkerClub); - tabPage1.Controls.Add(label5); - tabPage1.Controls.Add(cboWorkerPosition); - tabPage1.Controls.Add(label2); - tabPage1.Controls.Add(cboSex); - tabPage1.Controls.Add(txtAddress); - tabPage1.Controls.Add(txtWorkerNo); - tabPage1.Controls.Add(txtTel); - tabPage1.Controls.Add(txtWorkerName); - tabPage1.Location = new Point(201, 0); - tabPage1.Name = "tabPage1"; - tabPage1.Size = new Size(728, 546); - tabPage1.TabIndex = 0; - tabPage1.Text = "个人信息"; - tabPage1.UseVisualStyleBackColor = true; - // - // tabPage2 - // - tabPage2.Controls.Add(avatar3); - tabPage2.Controls.Add(txtOldPassword); - tabPage2.Controls.Add(lblEmployeeId); - tabPage2.Controls.Add(avatar2); - tabPage2.Controls.Add(avatar1); - tabPage2.Controls.Add(btnUpdatePassword); - tabPage2.Controls.Add(txtNewPassword); - tabPage2.Location = new Point(201, 0); - tabPage2.Name = "tabPage2"; - tabPage2.Size = new Size(728, 546); - tabPage2.TabIndex = 1; - tabPage2.Text = "账号安全"; - tabPage2.UseVisualStyleBackColor = true; - // - // avatar3 - // - avatar3.Image = (Image)resources.GetObject("avatar3.Image"); - avatar3.ImageFit = AntdUI.TFit.None; - avatar3.Location = new Point(224, 204); - avatar3.Name = "avatar3"; - avatar3.Size = new Size(45, 43); - avatar3.TabIndex = 47; - avatar3.Text = "a"; - // - // txtOldPassword - // - txtOldPassword.BackColor = Color.White; - txtOldPassword.Font = new Font("Microsoft YaHei UI", 14F); - txtOldPassword.Location = new Point(267, 201); - txtOldPassword.Name = "txtOldPassword"; - txtOldPassword.PasswordChar = '*'; - txtOldPassword.PasswordCopy = true; - txtOldPassword.PlaceholderColorExtend = ""; - txtOldPassword.PlaceholderText = ""; - txtOldPassword.Size = new Size(238, 52); - txtOldPassword.TabIndex = 46; - // - // lblEmployeeId - // - lblEmployeeId.Location = new Point(267, 131); - lblEmployeeId.Name = "lblEmployeeId"; - lblEmployeeId.Size = new Size(238, 43); - lblEmployeeId.TabIndex = 45; - lblEmployeeId.Text = ""; - lblEmployeeId.TextAlign = ContentAlignment.MiddleCenter; - // - // avatar2 - // - avatar2.Image = (Image)resources.GetObject("avatar2.Image"); - avatar2.ImageFit = AntdUI.TFit.None; - avatar2.Location = new Point(224, 284); - avatar2.Name = "avatar2"; - avatar2.Size = new Size(45, 43); - avatar2.TabIndex = 44; - avatar2.Text = "a"; - // - // avatar1 - // - avatar1.Image = (Image)resources.GetObject("avatar1.Image"); - avatar1.ImageFit = AntdUI.TFit.None; - avatar1.Location = new Point(224, 131); - avatar1.Name = "avatar1"; - avatar1.Size = new Size(45, 43); - avatar1.TabIndex = 43; - avatar1.Text = "a"; - // - // btnUpdatePassword - // - btnUpdatePassword.Font = new Font("Microsoft YaHei UI", 12F); - btnUpdatePassword.Location = new Point(277, 358); - btnUpdatePassword.Name = "btnUpdatePassword"; - btnUpdatePassword.Radius = 8; - btnUpdatePassword.Shape = AntdUI.TShape.Round; - btnUpdatePassword.Size = new Size(191, 57); - btnUpdatePassword.TabIndex = 42; - btnUpdatePassword.Text = "修改密码"; - btnUpdatePassword.Type = AntdUI.TTypeMini.Primary; - btnUpdatePassword.Click += btnUpdatePassword_Click; - // - // txtNewPassword - // - txtNewPassword.BackColor = Color.White; - txtNewPassword.Font = new Font("Microsoft YaHei UI", 14F); - txtNewPassword.Location = new Point(267, 280); - txtNewPassword.Name = "txtNewPassword"; - txtNewPassword.PasswordChar = '*'; - txtNewPassword.PasswordCopy = true; - txtNewPassword.PlaceholderColorExtend = ""; - txtNewPassword.PlaceholderText = ""; - txtNewPassword.Size = new Size(238, 52); - txtNewPassword.TabIndex = 41; - // - // tabPage3 - // - tabPage3.Controls.Add(label4); - tabPage3.Controls.Add(picWorkerPic); - tabPage3.Location = new Point(201, 0); - tabPage3.Name = "tabPage3"; - tabPage3.Size = new Size(728, 546); - tabPage3.TabIndex = 2; - tabPage3.Text = "账号头像"; - tabPage3.UseVisualStyleBackColor = true; - // - // label4 - // - label4.Location = new Point(257, 416); - label4.Name = "label4"; - label4.Size = new Size(215, 23); - label4.TabIndex = 1; - label4.Text = "Tips:头像大小不能超过1MB"; - // - // picWorkerPic - // - picWorkerPic.BackgroundImage = Properties.Resources.账号; - picWorkerPic.BackgroundImageLayout = ImageLayout.Stretch; - picWorkerPic.Location = new Point(257, 150); - picWorkerPic.Name = "picWorkerPic"; - picWorkerPic.Size = new Size(215, 246); - picWorkerPic.SizeMode = PictureBoxSizeMode.StretchImage; - picWorkerPic.TabIndex = 0; - picWorkerPic.TabStop = false; - picWorkerPic.Click += picWorkerPic_Click; - // - // FrmMySpace - // - AutoScaleMode = AutoScaleMode.None; - ClientSize = new Size(937, 589); - Controls.Add(uiTabControlMenu2); - Icon = (Icon)resources.GetObject("$this.Icon"); - MaximizeBox = false; - MinimizeBox = false; - Name = "FrmMySpace"; - ShowTitleIcon = true; - Text = "个人中心"; - ZoomScaleRect = new Rectangle(15, 15, 873, 587); - Load += FrmMySpace_Load; - uiTabControlMenu2.ResumeLayout(false); - tabPage1.ResumeLayout(false); - tabPage1.PerformLayout(); - tabPage2.ResumeLayout(false); - tabPage3.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)picWorkerPic).EndInit(); - ResumeLayout(false); - } - - #endregion - private Sunny.UI.UIComboBox cbWorkerNation; - private System.Windows.Forms.Label label1; - private Sunny.UI.UIComboBox cboWorkerClub; - private Sunny.UI.UIComboBox cboWorkerPosition; - private Sunny.UI.UIComboBox cboSex; - private Sunny.UI.UITextBox txtWorkerNo; - private Sunny.UI.UITextBox txtWorkerName; - private Sunny.UI.UITextBox txtTel; - private Sunny.UI.UITextBox txtAddress; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label16; - private System.Windows.Forms.Label label30; - private System.Windows.Forms.Label label31; - private System.Windows.Forms.Label label32; - private Sunny.UI.UIButton btnUpdWorker; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.OpenFileDialog openPic; - private Sunny.UI.UITabControlMenu uiTabControlMenu2; - private System.Windows.Forms.TabPage tabPage1; - private System.Windows.Forms.TabPage tabPage2; - private System.Windows.Forms.TabPage tabPage3; - private System.Windows.Forms.PictureBox picWorkerPic; - private AntdUI.Label label4; - private AntdUI.Label lblEmployeeId; - private AntdUI.Avatar avatar2; - private AntdUI.Avatar avatar1; - private AntdUI.Button btnUpdatePassword; - private AntdUI.Input txtNewPassword; - private AntdUI.Avatar avatar3; - private AntdUI.Input txtOldPassword; - } -} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.cs deleted file mode 100644 index d71c19dcae81d08434784fc5a694a6a9ab252288..0000000000000000000000000000000000000000 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.cs +++ /dev/null @@ -1,311 +0,0 @@ -/* - * MIT License - *Copyright (c) 2021 易开元(EOM) - - *Permission is hereby granted, free of charge, to any person obtaining a copy - *of this software and associated documentation files (the "Software"), to deal - *in the Software without restriction, including without limitation the rights - *to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - *copies of the Software, and to permit persons to whom the Software is - *furnished to do so, subject to the following conditions: - - *The above copyright notice and this permission notice shall be included in all - *copies or substantial portions of the Software. - - *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - *IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - *FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - *AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - *LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - *OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - *SOFTWARE. - * - */ - -using AntdUI; -using EOM.TSHotelManagement.Common; -using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Util; -using jvncorelib.EncryptorLib; -using jvncorelib.EntityLib; -using Sunny.UI; -using System.ComponentModel; - -namespace EOM.TSHotelManagement.FormUI -{ - public partial class FrmMySpace : UIForm - { - public FrmMySpace() - { - InitializeComponent(); - } - - EncryptLib encryptLib = new EncryptLib(); - private void FrmMySpace_Load(object sender, EventArgs e) - { - //加载民族信息 - Dictionary dic = new Dictionary - { - { nameof(ReadNationInputDto.IsDelete), "0" }, - { nameof(ReadNationInputDto.IgnorePaging), "true" } - }; - var result = HttpHelper.Request(ApiConstants.Base_SelectNationAll, dic); - var nations = HttpHelper.JsonToModel>(result.message); - if (nations.StatusCode != StatusCodeConstants.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectNationAll}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - cbWorkerNation.DataSource = nations.listSource; - cbWorkerNation.DisplayMember = nameof(ReadNationOutputDto.NationName); - cbWorkerNation.ValueMember = nameof(ReadNationOutputDto.NationNumber); - //加载性别信息 - dic = new Dictionary - { - { nameof(ReadGenderTypeInputDto.IsDelete) , "0" }, - { nameof(ReadGenderTypeInputDto.IgnorePaging) , "true" } - }; - result = HttpHelper.Request(ApiConstants.Base_SelectGenderTypeAll, dic); - var genderTypes = HttpHelper.JsonToModel>(result.message); - if (genderTypes.StatusCode != StatusCodeConstants.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectGenderTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - cboSex.DataSource = genderTypes.listSource; - 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) - { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectDeptAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - cboWorkerClub.DataSource = depts.listSource; - cboWorkerClub.DisplayMember = nameof(ReadDepartmentOutputDto.DepartmentName); - cboWorkerClub.ValueMember = nameof(ReadDepartmentOutputDto.DepartmentNumber); - //加载职位信息 - dic = new Dictionary - { - { nameof(ReadPositionInputDto.IsDelete), "0" }, - { nameof(ReadPositionInputDto.IgnorePaging), "true" } - }; - result = HttpHelper.Request(ApiConstants.Base_SelectPositionAll, dic); - var positions = HttpHelper.JsonToModel>(result.message); - if (positions.StatusCode != StatusCodeConstants.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectPositionAll}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - cboWorkerPosition.DataSource = positions.listSource; - cboWorkerPosition.DisplayMember = nameof(ReadPositionOutputDto.PositionName); - cboWorkerPosition.ValueMember = nameof(ReadPositionOutputDto.PositionNumber); - - lblEmployeeId.Text = LoginInfo.WorkerNo; - txtOldPassword.PlaceholderText = LocalizationHelper.GetLocalizedString("Please input old password", "请输入旧密码"); - txtNewPassword.PlaceholderText = LocalizationHelper.GetLocalizedString("Please input new password", "请输入新密码"); - - LoadData(); - } - - public void LoadData() - { - var dic = new Dictionary - { - { nameof(ReadEmployeeInputDto.EmployeeId) , LoginInfo.WorkerNo } - }; - var result = HttpHelper.Request(ApiConstants.Employee_SelectEmployeeInfoByEmployeeId, dic); - var employees = HttpHelper.JsonToModel>(result.message); - if (employees.StatusCode != StatusCodeConstants.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Employee_SelectEmployeeInfoByEmployeeId}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - ReadEmployeeOutputDto worker = employees.Source; - if (!worker.IsNullOrEmpty()) - { - txtWorkerNo.Text = worker.EmployeeId; - txtWorkerName.Text = worker.EmployeeName; - cboSex.SelectedIndex = worker.Gender; - cboWorkerPosition.Text = worker.PositionName; - cboWorkerPosition.SelectedValue = worker.Position; - cboWorkerClub.Text = worker.DepartmentName; - cboWorkerClub.SelectedValue = worker.Department; - cbWorkerNation.Text = worker.EthnicityName; - cbWorkerNation.SelectedValue = worker.Ethnicity; - txtAddress.Text = worker.Address; - txtTel.Text = worker.PhoneNumber; - } - dic = new Dictionary - { - { nameof(ReadEmployeePhotoInputDto.EmployeeId) , LoginInfo.WorkerNo } - }; - result = HttpHelper.Request(ApiConstants.EmployeePhoto_EmployeePhoto, dic); - var workerPic = HttpHelper.JsonToModel>(result.message); - if (workerPic.StatusCode != StatusCodeConstants.Success) - { - UIMessageBox.ShowError($"{ApiConstants.EmployeePhoto_EmployeePhoto}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - var workerPicSource = workerPic.Source; - if (workerPicSource != null && !string.IsNullOrEmpty(workerPicSource.PhotoPath)) - { - picWorkerPic.BackgroundImage = null; - if (!string.IsNullOrEmpty(workerPicSource.PhotoPath)) picWorkerPic.Load(workerPicSource.PhotoPath); - } - } - - public bool CheckInput(UpdateEmployeeInputDto worker) - { - if (string.IsNullOrWhiteSpace(worker.EmployeeId)) - { - return false; - } - if (string.IsNullOrWhiteSpace(worker.EmployeeName)) - { - return false; - } - if (string.IsNullOrWhiteSpace(worker.Gender + "")) - { - return false; - } - if (string.IsNullOrWhiteSpace(worker.Ethnicity)) - { - return false; - } - if (string.IsNullOrWhiteSpace(worker.PhoneNumber)) - { - return false; - } - if (string.IsNullOrWhiteSpace(worker.Address)) - { - return false; - } - return true; - } - ResponseMsg result = new ResponseMsg(); - private void btnUpdWorker_Click(object sender, EventArgs e) - { - UpdateEmployeeInputDto worker = new UpdateEmployeeInputDto() - { - EmployeeId = txtWorkerNo.Text.Trim(), - EmployeeName = txtWorkerName.Text.Trim(), - Gender = cboSex.Text == "男" ? 1 : 0, - Ethnicity = cbWorkerNation.SelectedValue.ToString(), - PhoneNumber = txtTel.Text.Trim(), - Address = txtAddress.Text.Trim(), - DataChgUsr = LoginInfo.WorkerNo, - DataChgDate = DateTime.Now - }; - - if (CheckInput(worker)) - { - result = HttpHelper.Request(ApiConstants.Employee_UpdateEmployee, HttpHelper.ModelToJson(worker)); - var response = HttpHelper.JsonToModel(result.message); - if (response.StatusCode != StatusCodeConstants.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Employee_UpdateEmployee}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - UIMessageBox.Show("修改成功！", "系统提示", UIStyle.Green, UIMessageBoxButtons.OK); - #region 获取添加操作日志所需的信息 - RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "修改个人信息操作！", Common.Core.LogLevel.Warning); - #endregion - LoadData(); - return; - } - } - - private void cbWorkerNation_SelectedIndexChanged(object sender, EventArgs e) - { - } - - private void picWorkerPic_Click(object sender, EventArgs e) - { - openPic.ShowDialog(); - } - - private void openPic_FileOk(object sender, CancelEventArgs e) - { - var dic = new Dictionary - { - { nameof(ReadEmployeePhotoInputDto.EmployeeId) , LoginInfo.WorkerNo } - }; - result = HttpHelper.Request(ApiConstants.EmployeePhoto_EmployeePhoto, dic); - var workerPic = HttpHelper.JsonToModel>(result.message); - if (workerPic.StatusCode != StatusCodeConstants.Success) - { - UIMessageBox.ShowError($"{ApiConstants.EmployeePhoto_EmployeePhoto}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - var workerPicSource = workerPic.Source; - if (!workerPicSource.IsNullOrEmpty() && !string.IsNullOrEmpty(workerPicSource.PhotoPath)) - { - result = HttpHelper.Request(ApiConstants.EmployeePhoto_DeleteWorkerPhoto, HttpHelper.ModelToJson(workerPic)); - var response = HttpHelper.JsonToModel(result.message); - if (response.StatusCode != StatusCodeConstants.Success) - { - UIMessageBox.ShowError($"{ApiConstants.EmployeePhoto_DeleteWorkerPhoto}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - PicHandler(); - } - else - { - PicHandler(); - } - - } - - public void PicHandler() - { - Dictionary additionalParams = new Dictionary - { - { nameof(CreateEmployeePhotoInputDto.EmployeeId), txtWorkerNo.Text.Trim() } - }; - - var workerPic = new CreateEmployeePhotoInputDto - { - EmployeeId = txtWorkerNo.Text.Trim(), - PhotoUrl = null, - }; - var requestResult = HttpHelper.UploadFile(ApiConstants.EmployeePhoto_InsertWorkerPhoto, openPic.FileName, additionalParams); - var response = HttpHelper.JsonToModel>(requestResult.message); - if (response.StatusCode != StatusCodeConstants.Success) - { - UIMessageBox.ShowError($"{response.Message}:{ApiConstants.EmployeePhoto_InsertWorkerPhoto}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - UIMessageTip.ShowOk("头像上传成功！稍等将会加载头像哦.."); - picWorkerPic.Load(response.Source.PhotoPath); - } - - private void btnUpdatePassword_Click(object sender, EventArgs e) - { - if (string.IsNullOrEmpty(txtOldPassword.Text) || string.IsNullOrEmpty(txtNewPassword.Text)) - { - AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString("Please input new password or old password", "请输入旧密码或新密码"), TType.Error); - return; - } - - var request = HttpHelper.Request(ApiConstants.Employee_UpdateEmployeeAccountPassword, HttpHelper.ModelToJson(new UpdateEmployeeInputDto - { - EmployeeId = LoginInfo.WorkerNo, - OldPassword = txtOldPassword.Text.Trim(), - Password = txtNewPassword.Text.Trim(), - DataChgDate = DateTime.Now, - DataChgUsr = LoginInfo.WorkerNo - })); - var response = HttpHelper.JsonToModel(request.message); - if (response.StatusCode != StatusCodeConstants.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; - } - AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString("Update password success", "更新密码成功"), TType.Success); - return; - } - } -} diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomStateManagement.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomStateManagement.Designer.cs deleted file mode 100644 index e288cfd67a159808a765da8713c612da0018651c..0000000000000000000000000000000000000000 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomStateManagement.Designer.cs +++ /dev/null @@ -1,144 +0,0 @@ -namespace EOM.TSHotelManagement.FormUI -{ - partial class FrmRoomStateManager - { - /// - /// 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(FrmRoomStateManager)); - this.txtRoomNo = new Sunny.UI.UITextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.cboState = new Sunny.UI.UIComboBox(); - this.btnOk = new Sunny.UI.UIButton(); - this.SuspendLayout(); - // - // txtRoomNo - // - this.txtRoomNo.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtRoomNo.FillColor = System.Drawing.Color.White; - this.txtRoomNo.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtRoomNo.Location = new System.Drawing.Point(121, 48); - this.txtRoomNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtRoomNo.Maximum = 2147483647D; - this.txtRoomNo.Minimum = -2147483648D; - this.txtRoomNo.MinimumSize = new System.Drawing.Size(1, 1); - this.txtRoomNo.Name = "txtRoomNo"; - this.txtRoomNo.Padding = new System.Windows.Forms.Padding(5); - this.txtRoomNo.Radius = 20; - this.txtRoomNo.Size = new System.Drawing.Size(158, 35); - this.txtRoomNo.Style = Sunny.UI.UIStyle.Custom; - this.txtRoomNo.StyleCustomMode = true; - this.txtRoomNo.TabIndex = 133; - this.txtRoomNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(29, 54); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(88, 25); - this.label2.TabIndex = 132; - this.label2.Text = "客户编号"; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(29, 106); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(88, 25); - this.label1.TabIndex = 134; - this.label1.Text = "房间状态"; - // - // cboState - // - this.cboState.DataSource = null; - this.cboState.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cboState.FillColor = System.Drawing.Color.White; - this.cboState.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cboState.Items.AddRange(new object[] { - "前台", - "小程序", - "电话"}); - this.cboState.Location = new System.Drawing.Point(121, 101); - this.cboState.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cboState.MinimumSize = new System.Drawing.Size(63, 0); - this.cboState.Name = "cboState"; - this.cboState.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cboState.Radius = 20; - this.cboState.Size = new System.Drawing.Size(158, 35); - this.cboState.TabIndex = 135; - this.cboState.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.cboState.Watermark = ""; - // - // btnOk - // - this.btnOk.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnOk.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnOk.Location = new System.Drawing.Point(196, 148); - this.btnOk.MinimumSize = new System.Drawing.Size(1, 1); - this.btnOk.Name = "btnOk"; - this.btnOk.Radius = 15; - this.btnOk.Size = new System.Drawing.Size(84, 35); - this.btnOk.TabIndex = 136; - this.btnOk.Text = "修改"; - this.btnOk.Click += new System.EventHandler(this.btnOk_Click); - // - // FrmRoomStateManager - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(308, 196); - this.Controls.Add(this.btnOk); - this.Controls.Add(this.cboState); - this.Controls.Add(this.label1); - this.Controls.Add(this.txtRoomNo); - this.Controls.Add(this.label2); - this.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "FrmRoomStateManager"; - this.ShowIcon = true; - this.ShowTitleIcon = true; - this.Text = "修改房间状态"; - this.Load += new System.EventHandler(this.FrmRoomStateManager_Load); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - private Sunny.UI.UITextBox txtRoomNo; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; - private Sunny.UI.UIComboBox cboState; - private Sunny.UI.UIButton btnOk; - } -} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.Designer.cs deleted file mode 100644 index 937040a6e708c7a33a3a6adf40ff5287e5817d19..0000000000000000000000000000000000000000 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.Designer.cs +++ /dev/null @@ -1,377 +0,0 @@ -namespace EOM.TSHotelManagement.FormUI -{ - partial class FrmSelectCustoInfo - { - /// - /// 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(FrmSelectCustoInfo)); - this.cbCustoType = new Sunny.UI.UIComboBox(); - this.cbPassportType = new Sunny.UI.UIComboBox(); - this.cbSex = new Sunny.UI.UIComboBox(); - this.txtCustoNo = new Sunny.UI.UITextBox(); - this.txtCustoName = new Sunny.UI.UITextBox(); - this.txtCardID = new Sunny.UI.UITextBox(); - this.txtCustoTel = new Sunny.UI.UITextBox(); - this.dtpBirthday = new Sunny.UI.UIDatePicker(); - this.txtCustoAdress = new Sunny.UI.UITextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); - this.label18 = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // cbCustoType - // - this.cbCustoType.DataSource = null; - this.cbCustoType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cbCustoType.FillColor = System.Drawing.Color.White; - this.cbCustoType.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cbCustoType.Location = new System.Drawing.Point(512, 49); - this.cbCustoType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cbCustoType.MinimumSize = new System.Drawing.Size(63, 0); - this.cbCustoType.Name = "cbCustoType"; - this.cbCustoType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cbCustoType.Radius = 20; - this.cbCustoType.ReadOnly = true; - this.cbCustoType.Size = new System.Drawing.Size(250, 35); - this.cbCustoType.Style = Sunny.UI.UIStyle.Custom; - this.cbCustoType.TabIndex = 128; - this.cbCustoType.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.cbCustoType.Watermark = ""; - // - // cbPassportType - // - this.cbPassportType.DataSource = null; - this.cbPassportType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cbPassportType.FillColor = System.Drawing.Color.White; - this.cbPassportType.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cbPassportType.Location = new System.Drawing.Point(512, 100); - this.cbPassportType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cbPassportType.MinimumSize = new System.Drawing.Size(63, 0); - this.cbPassportType.Name = "cbPassportType"; - this.cbPassportType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cbPassportType.Radius = 20; - this.cbPassportType.ReadOnly = true; - this.cbPassportType.Size = new System.Drawing.Size(250, 35); - this.cbPassportType.Style = Sunny.UI.UIStyle.Custom; - this.cbPassportType.TabIndex = 127; - this.cbPassportType.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // cbSex - // - this.cbSex.DataSource = null; - this.cbSex.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cbSex.FillColor = System.Drawing.Color.White; - this.cbSex.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cbSex.Location = new System.Drawing.Point(136, 154); - this.cbSex.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cbSex.MinimumSize = new System.Drawing.Size(63, 0); - this.cbSex.Name = "cbSex"; - this.cbSex.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cbSex.Radius = 20; - this.cbSex.ReadOnly = true; - this.cbSex.Size = new System.Drawing.Size(250, 35); - this.cbSex.Style = Sunny.UI.UIStyle.Custom; - this.cbSex.TabIndex = 126; - this.cbSex.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // txtCustoNo - // - this.txtCustoNo.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoNo.FillColor = System.Drawing.Color.White; - this.txtCustoNo.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCustoNo.Location = new System.Drawing.Point(136, 50); - this.txtCustoNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCustoNo.Maximum = 2147483647D; - this.txtCustoNo.Minimum = -2147483648D; - this.txtCustoNo.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCustoNo.Name = "txtCustoNo"; - this.txtCustoNo.Padding = new System.Windows.Forms.Padding(5); - this.txtCustoNo.Radius = 20; - this.txtCustoNo.ReadOnly = true; - this.txtCustoNo.Size = new System.Drawing.Size(250, 35); - this.txtCustoNo.Style = Sunny.UI.UIStyle.Custom; - this.txtCustoNo.StyleCustomMode = true; - this.txtCustoNo.TabIndex = 125; - this.txtCustoNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // txtCustoName - // - this.txtCustoName.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoName.FillColor = System.Drawing.Color.White; - this.txtCustoName.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCustoName.Location = new System.Drawing.Point(136, 102); - this.txtCustoName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCustoName.Maximum = 2147483647D; - this.txtCustoName.Minimum = -2147483648D; - this.txtCustoName.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCustoName.Name = "txtCustoName"; - this.txtCustoName.Padding = new System.Windows.Forms.Padding(5); - this.txtCustoName.Radius = 20; - this.txtCustoName.ReadOnly = true; - this.txtCustoName.Size = new System.Drawing.Size(250, 35); - this.txtCustoName.Style = Sunny.UI.UIStyle.Custom; - this.txtCustoName.StyleCustomMode = true; - this.txtCustoName.TabIndex = 124; - this.txtCustoName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // txtCardID - // - this.txtCardID.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCardID.FillColor = System.Drawing.Color.White; - this.txtCardID.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCardID.Location = new System.Drawing.Point(512, 151); - this.txtCardID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCardID.Maximum = 2147483647D; - this.txtCardID.Minimum = -2147483648D; - this.txtCardID.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCardID.Name = "txtCardID"; - this.txtCardID.Padding = new System.Windows.Forms.Padding(5); - this.txtCardID.Radius = 20; - this.txtCardID.ReadOnly = true; - this.txtCardID.Size = new System.Drawing.Size(250, 35); - this.txtCardID.Style = Sunny.UI.UIStyle.Custom; - this.txtCardID.StyleCustomMode = true; - this.txtCardID.TabIndex = 123; - this.txtCardID.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // txtCustoTel - // - this.txtCustoTel.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoTel.FillColor = System.Drawing.Color.White; - this.txtCustoTel.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCustoTel.Location = new System.Drawing.Point(512, 202); - this.txtCustoTel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCustoTel.Maximum = 2147483647D; - this.txtCustoTel.Minimum = -2147483648D; - this.txtCustoTel.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCustoTel.Name = "txtCustoTel"; - this.txtCustoTel.Padding = new System.Windows.Forms.Padding(5); - this.txtCustoTel.Radius = 20; - this.txtCustoTel.ReadOnly = true; - this.txtCustoTel.Size = new System.Drawing.Size(250, 35); - this.txtCustoTel.Style = Sunny.UI.UIStyle.Custom; - this.txtCustoTel.StyleCustomMode = true; - this.txtCustoTel.TabIndex = 122; - this.txtCustoTel.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // dtpBirthday - // - this.dtpBirthday.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.dtpBirthday.FillColor = System.Drawing.Color.White; - this.dtpBirthday.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F); - this.dtpBirthday.Location = new System.Drawing.Point(136, 206); - this.dtpBirthday.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.dtpBirthday.MaxLength = 10; - this.dtpBirthday.MinimumSize = new System.Drawing.Size(63, 0); - this.dtpBirthday.Name = "dtpBirthday"; - this.dtpBirthday.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.dtpBirthday.Radius = 20; - this.dtpBirthday.ReadOnly = true; - this.dtpBirthday.Size = new System.Drawing.Size(250, 31); - this.dtpBirthday.Style = Sunny.UI.UIStyle.Custom; - this.dtpBirthday.SymbolDropDown = 61555; - this.dtpBirthday.SymbolNormal = 61555; - this.dtpBirthday.TabIndex = 121; - this.dtpBirthday.Text = "2020-11-24"; - this.dtpBirthday.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.dtpBirthday.Value = new System.DateTime(2020, 11, 24, 22, 50, 36, 791); - // - // txtCustoAdress - // - this.txtCustoAdress.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoAdress.FillColor = System.Drawing.Color.White; - this.txtCustoAdress.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCustoAdress.Location = new System.Drawing.Point(134, 254); - this.txtCustoAdress.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCustoAdress.Maximum = 2147483647D; - this.txtCustoAdress.Minimum = -2147483648D; - this.txtCustoAdress.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCustoAdress.Name = "txtCustoAdress"; - this.txtCustoAdress.Padding = new System.Windows.Forms.Padding(5); - this.txtCustoAdress.Radius = 20; - this.txtCustoAdress.ReadOnly = true; - this.txtCustoAdress.Size = new System.Drawing.Size(628, 35); - this.txtCustoAdress.Style = Sunny.UI.UIStyle.Custom; - this.txtCustoAdress.StyleCustomMode = true; - this.txtCustoAdress.TabIndex = 120; - this.txtCustoAdress.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(27, 264); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(88, 25); - this.label1.TabIndex = 118; - this.label1.Text = "居住地址"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(408, 209); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(88, 25); - this.label2.TabIndex = 117; - this.label2.Text = "联系方式"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(408, 158); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(88, 25); - this.label3.TabIndex = 116; - this.label3.Text = "证件号码"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(408, 107); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(88, 25); - this.label4.TabIndex = 115; - this.label4.Text = "证件类型"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(408, 56); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(88, 25); - this.label5.TabIndex = 114; - this.label5.Text = "客户类型"; - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label15.Location = new System.Drawing.Point(29, 212); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(88, 25); - this.label15.TabIndex = 113; - this.label15.Text = "出生日期"; - // - // label16 - // - this.label16.AutoSize = true; - this.label16.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label16.Location = new System.Drawing.Point(29, 160); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(74, 25); - this.label16.TabIndex = 112; - this.label16.Text = "性 别"; - // - // label17 - // - this.label17.AutoSize = true; - this.label17.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label17.Location = new System.Drawing.Point(29, 108); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(88, 25); - this.label17.TabIndex = 111; - this.label17.Text = "客户姓名"; - // - // label18 - // - this.label18.AutoSize = true; - this.label18.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label18.Location = new System.Drawing.Point(29, 56); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(88, 25); - this.label18.TabIndex = 110; - this.label18.Text = "客户编号"; - // - // FrmSelectCustoInfo - // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.ClientSize = new System.Drawing.Size(787, 316); - this.Controls.Add(this.cbCustoType); - this.Controls.Add(this.cbPassportType); - this.Controls.Add(this.cbSex); - this.Controls.Add(this.txtCustoNo); - this.Controls.Add(this.txtCustoName); - this.Controls.Add(this.txtCardID); - this.Controls.Add(this.txtCustoTel); - this.Controls.Add(this.dtpBirthday); - this.Controls.Add(this.txtCustoAdress); - this.Controls.Add(this.label1); - this.Controls.Add(this.label2); - this.Controls.Add(this.label3); - this.Controls.Add(this.label4); - this.Controls.Add(this.label5); - this.Controls.Add(this.label15); - this.Controls.Add(this.label16); - this.Controls.Add(this.label17); - this.Controls.Add(this.label18); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "FrmSelectCustoInfo"; - this.ShowIcon = true; - this.ShowTitleIcon = true; - this.Style = Sunny.UI.UIStyle.Custom; - this.Text = "客户信息"; - this.Load += new System.EventHandler(this.FrmSelectCustoInfo_Load); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - private Sunny.UI.UIComboBox cbCustoType; - private Sunny.UI.UIComboBox cbPassportType; - private Sunny.UI.UIComboBox cbSex; - private Sunny.UI.UITextBox txtCustoNo; - private Sunny.UI.UITextBox txtCustoName; - private Sunny.UI.UITextBox txtCardID; - private Sunny.UI.UITextBox txtCustoTel; - private Sunny.UI.UIDatePicker dtpBirthday; - private Sunny.UI.UITextBox txtCustoAdress; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label15; - private System.Windows.Forms.Label label16; - private System.Windows.Forms.Label label17; - private System.Windows.Forms.Label label18; - } -} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.cs deleted file mode 100644 index 1c71570ee4c206c04e3a9b6259de90164dcc690b..0000000000000000000000000000000000000000 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.cs +++ /dev/null @@ -1,126 +0,0 @@ -/* - * MIT License - *Copyright (c) 2021 易开元(EOM) - - *Permission is hereby granted, free of charge, to any person obtaining a copy - *of this software and associated documentation files (the "Software"), to deal - *in the Software without restriction, including without limitation the rights - *to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - *copies of the Software, and to permit persons to whom the Software is - *furnished to do so, subject to the following conditions: - - *The above copyright notice and this permission notice shall be included in all - *copies or substantial portions of the Software. - - *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - *IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - *FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - *AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - *LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - *OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - *SOFTWARE. - * - */ - -using EOM.TSHotelManagement.Common; -using EOM.TSHotelManagement.Common.Contract; -using Sunny.UI; - -namespace EOM.TSHotelManagement.FormUI -{ - public partial class FrmSelectCustoInfo : UIForm - { - public FrmSelectCustoInfo() - { - InitializeComponent(); - } - - Dictionary dic = null; - ResponseMsg result = null; - - #region 存放客户信息类 - public static string co_CustoNo; - public static string co_RoomNo; - public static string co_CustoName; - public static string co_CustoBirthday; - public static string co_CustoSex; - public static string co_CustoTel; - public static string co_CustoPassportType; - public static string co_CustoAddress; - public static string co_CustoType; - public static string co_CustoID; - #endregion - - private void FrmSelectCustoInfo_Load(object sender, EventArgs e) - { - #region 加载客户类型信息 - result = HttpHelper.Request(ApiConstants.Base_SelectCustoTypeAllCanUse); - var customerTypes = HttpHelper.JsonToModel>(result.message); - if (customerTypes.StatusCode != StatusCodeConstants.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectCustoTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - this.cbCustoType.DataSource = customerTypes.listSource; - this.cbCustoType.DisplayMember = nameof(ReadCustoTypeOutputDto.CustomerTypeName); - this.cbCustoType.ValueMember = nameof(ReadCustoTypeOutputDto.CustomerType); - this.cbCustoType.SelectedIndex = 0; - this.cbCustoType.ReadOnly = true; - #endregion - - #region 加载证件类型信息 - result = HttpHelper.Request(ApiConstants.Base_SelectPassPortTypeAllCanUse); - var passportTypes = HttpHelper.JsonToModel>(result.message); - if (passportTypes.StatusCode != StatusCodeConstants.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectPassPortTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - this.cbPassportType.DataSource = passportTypes.listSource; - this.cbPassportType.DisplayMember = nameof(ReadPassportTypeOutputDto.PassportName); - this.cbPassportType.ValueMember = nameof(ReadPassportTypeOutputDto.PassportId); - this.cbPassportType.SelectedIndex = 0; - #endregion - - #region 加载性别信息 - dic = new Dictionary - { - { nameof(ReadGenderTypeInputDto.IsDelete) , "0" }, - { nameof(ReadGenderTypeInputDto.IgnorePaging) , "true" } - }; - result = HttpHelper.Request(ApiConstants.Base_SelectGenderTypeAll, dic); - var genderTypes = HttpHelper.JsonToModel>(result.message); - if (genderTypes.StatusCode != StatusCodeConstants.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectGenderTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - this.cbSex.DataSource = genderTypes.listSource; - this.cbSex.DisplayMember = nameof(EnumDto.Description); - this.cbSex.ValueMember = nameof(EnumDto.Id); - this.cbSex.SelectedIndex = 0; - #endregion - - txtCustoNo.Text = ucRoom.rm_CustoNo; - dic = new Dictionary() - { - { nameof(ReadCustomerInputDto.CustomerNumber),txtCustoNo.Text.ToString() } - }; - result = HttpHelper.Request(ApiConstants.Customer_SelectCustoByInfo, dic); - var c = HttpHelper.JsonToModel>(result.message); - if (c.StatusCode != StatusCodeConstants.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); - } - } -} diff --git a/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.Designer.cs b/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.Designer.cs deleted file mode 100644 index 8899f24b5f12f49cdc32cec4ced1ad13166f2a0a..0000000000000000000000000000000000000000 --- a/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.Designer.cs +++ /dev/null @@ -1,137 +0,0 @@ -namespace EOM.TSHotelManagement.FormUI -{ - partial class ucRoom - { - /// - /// 必需的设计器变量。 - /// - private System.ComponentModel.IContainer components = null; - - /// - /// 清理所有正在使用的资源。 - /// - /// 如果应释放托管资源，为 true；否则为 false。 - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region 组件设计器生成的代码 - - /// - /// 设计器支持所需的方法 - 不要修改 - /// 使用代码编辑器修改此方法的内容。 - /// - private void InitializeComponent() - { - components = new System.ComponentModel.Container(); - btnRoom = new AntdUI.Button(); - cmsMain = new ContextMenuStrip(components); - tsmiReserRoom = new ToolStripMenuItem(); - tsmiCheckIn = new ToolStripMenuItem(); - tsmiCheckOut = new ToolStripMenuItem(); - tsmiChangeRoom = new ToolStripMenuItem(); - tsmiSelectUserInfo = new ToolStripMenuItem(); - tsmiChangeState = new ToolStripMenuItem(); - cmsMain.SuspendLayout(); - SuspendLayout(); - // - // btnRoom - // - btnRoom.AutoEllipsis = true; - btnRoom.BackColor = Color.Transparent; - btnRoom.BackgroundImage = Properties.Resources.可住状态; - btnRoom.BackgroundImageLayout = AntdUI.TFit.Cover; - btnRoom.ContextMenuStrip = cmsMain; - btnRoom.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - btnRoom.Ghost = true; - btnRoom.IconRatio = 0.5F; - btnRoom.JoinLeft = true; - btnRoom.JoinRight = true; - btnRoom.Location = new Point(0, 0); - btnRoom.Name = "btnRoom"; - btnRoom.Radius = 12; - btnRoom.Size = new Size(122, 102); - btnRoom.TabIndex = 0; - btnRoom.Text = "总统套房\r\n\r\nBS001\r\n\r\n小T呀"; - btnRoom.Click += btnRoom_Click; - // - // cmsMain - // - cmsMain.ImageScalingSize = new Size(28, 28); - cmsMain.Items.AddRange(new ToolStripItem[] { tsmiReserRoom, tsmiCheckIn, tsmiCheckOut, tsmiChangeRoom, tsmiSelectUserInfo, tsmiChangeState }); - cmsMain.Name = "cmsMain"; - cmsMain.Size = new Size(149, 136); - cmsMain.Opening += cmsMain_Opening; - // - // tsmiReserRoom - // - tsmiReserRoom.Name = "tsmiReserRoom"; - tsmiReserRoom.Size = new Size(148, 22); - tsmiReserRoom.Text = "预约房间"; - tsmiReserRoom.Click += tsmiReserRoom_Click; - // - // tsmiCheckIn - // - tsmiCheckIn.Name = "tsmiCheckIn"; - tsmiCheckIn.Size = new Size(148, 22); - tsmiCheckIn.Text = "入住房间"; - tsmiCheckIn.Click += tsmiCheckIn_Click; - // - // tsmiCheckOut - // - tsmiCheckOut.Name = "tsmiCheckOut"; - tsmiCheckOut.Size = new Size(148, 22); - tsmiCheckOut.Text = "结算退房"; - tsmiCheckOut.Click += tsmiCheckOut_Click; - // - // tsmiChangeRoom - // - tsmiChangeRoom.Name = "tsmiChangeRoom"; - tsmiChangeRoom.Size = new Size(148, 22); - tsmiChangeRoom.Text = "转换房间"; - tsmiChangeRoom.Click += tsmiChangeRoom_Click; - // - // tsmiSelectUserInfo - // - tsmiSelectUserInfo.Name = "tsmiSelectUserInfo"; - tsmiSelectUserInfo.Size = new Size(148, 22); - tsmiSelectUserInfo.Text = "查看用户信息"; - tsmiSelectUserInfo.Click += tsmiSelectUserInfo_Click; - // - // tsmiChangeState - // - tsmiChangeState.Name = "tsmiChangeState"; - tsmiChangeState.Size = new Size(148, 22); - tsmiChangeState.Text = "修改房间状态"; - tsmiChangeState.Click += tsmiChangeState_Click; - // - // ucRoom - // - AutoScaleDimensions = new SizeF(7F, 17F); - AutoScaleMode = AutoScaleMode.Font; - Controls.Add(btnRoom); - Name = "ucRoom"; - Size = new Size(122, 102); - Load += ucRoom_Load; - cmsMain.ResumeLayout(false); - ResumeLayout(false); - } - - #endregion - - public AntdUI.Button btnRoom; - private AntdUI.Button button1; - private System.Windows.Forms.ContextMenuStrip cmsMain; - private System.Windows.Forms.ToolStripMenuItem tsmiReserRoom; - private System.Windows.Forms.ToolStripMenuItem tsmiCheckIn; - private System.Windows.Forms.ToolStripMenuItem tsmiCheckOut; - private System.Windows.Forms.ToolStripMenuItem tsmiChangeRoom; - private System.Windows.Forms.ToolStripMenuItem tsmiSelectUserInfo; - private System.Windows.Forms.ToolStripMenuItem tsmiChangeState; - } -} diff --git a/EOM.TSHotelManagement.FormUI/AppUserControls/ucNavBar.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.Designer.cs similarity index 44% rename from EOM.TSHotelManagement.FormUI/AppUserControls/ucNavBar.Designer.cs rename to EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.Designer.cs index e6eee04a1e5b366f7fc314d756974a1f8bbd4749..22ef3f4d227b079bf811fdef932a6caeffe0abdb 100644 --- a/EOM.TSHotelManagement.FormUI/AppUserControls/ucNavBar.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.Designer.cs @@ -1,6 +1,6 @@ -namespace EOM.TSHotelManagement.FormUI.AppUserControls +namespace EOM.TSHotelManagement.FormUI { - partial class ucNavBar + partial class ucRoom { /// /// 必需的设计器变量。 @@ -28,20 +28,42 @@ /// private void InitializeComponent() { + btnRoom = new AntdUI.Button(); SuspendLayout(); // - // ucNavBar + // btnRoom // - AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); - AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - BackColor = System.Drawing.Color.Transparent; - BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - Margin = new System.Windows.Forms.Padding(4); - Name = "ucNavBar"; - Size = new System.Drawing.Size(153, 113); + btnRoom.AutoEllipsis = true; + btnRoom.BackColor = Color.Transparent; + btnRoom.BackgroundImage = Properties.Resources.可住状态; + btnRoom.Font = new Font("Noto Sans SC", 9F); + btnRoom.Ghost = true; + btnRoom.IconRatio = 0.5F; + btnRoom.JoinLeft = true; + btnRoom.JoinRight = true; + btnRoom.Location = new Point(0, 0); + btnRoom.Name = "btnRoom"; + btnRoom.Radius = 12; + btnRoom.Size = new Size(122, 102); + btnRoom.TabIndex = 0; + btnRoom.Text = "总统套房\r\n\r\nBS001\r\n\r\n小T呀"; + btnRoom.Click += btnRoom_Click; + btnRoom.MouseClick += btnRoom_MouseClick; + // + // ucRoom + // + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; + Controls.Add(btnRoom); + Name = "ucRoom"; + Size = new Size(122, 102); + Load += ucRoom_Load; ResumeLayout(false); } #endregion + + public AntdUI.Button btnRoom; + private AntdUI.Button button1; } } diff --git a/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.cs b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.cs similarity index 60% rename from EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.cs rename to EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.cs index b03ad1429edb09ae294e7dad695b0bca14b9bba6..f5c211665c583862e1fc2931f0b6a614031adc68 100644 --- a/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.cs +++ b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.cs @@ -1,9 +1,10 @@ -using EOM.TSHotelManagement.Common; +using AntdUI; +using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; +using EOM.TSHotelManagement.Common.Util; using EOM.TSHotelManagement.FormUI.Properties; using EOM.TSHotelManagement.Shared; -using Sunny.UI; -using System.ComponentModel; +using jvncorelib.EntityLib; using System.Drawing.Drawing2D; using System.Runtime.InteropServices; @@ -12,10 +13,12 @@ namespace EOM.TSHotelManagement.FormUI public partial class ucRoom : UserControl { private LoadingProgress _loadingProgress; - public ucRoom() + private FrmRoomManager _fromRoomManagement; + public ucRoom(FrmRoomManager frmRoomManagement) { InitializeComponent(); _loadingProgress = new LoadingProgress(); + _fromRoomManagement = frmRoomManagement; } @@ -60,14 +63,8 @@ namespace EOM.TSHotelManagement.FormUI public ReadCustomerOutputDto romCustoInfo { get; set; } #endregion - public string lblMark { get; set; } - private void btnRoom_Click(object sender, EventArgs e) { - if (lblMark == "Mark") - { - return; - } LoadRoomInfo(); FrmRoomManager.ReadInfo(); } @@ -152,6 +149,19 @@ namespace EOM.TSHotelManagement.FormUI uint oldGWLEx = SetWindowLong(this.Handle, GWL_EXSTYLE, WS_EX_TRANSPARENT | WS_EX_LAYERED); } + + AntdUI.IContextMenuStripItem[] menulist = new AntdUI.IContextMenuStripItem[] + { + new AntdUI.ContextMenuStripItem(UIControlConstant.ReservationRoom).SetIcon(UIControlIconConstant.Clock), + new AntdUI.ContextMenuStripItem(UIControlConstant.CheckInRoom).SetIcon(UIControlIconConstant.CheckIn), + new AntdUI.ContextMenuStripItem(UIControlConstant.CheckOutRoom).SetIcon(UIControlIconConstant.CheckOut), + + new AntdUI.ContextMenuStripItem(UIControlConstant.ChangeRoom).SetIcon(UIControlIconConstant.ChangeRoom), + new AntdUI.ContextMenuStripItem(UIControlConstant.ChangeStateRoom).SetIcon(UIControlIconConstant.ChangeState), + + new AntdUI.ContextMenuStripItem(UIControlConstant.CustomerInformation).SetIcon(UIControlIconConstant.CustomerInformation) + }; + public void LoadRoomInfo() { co_RoomNo = romRoomInfo.RoomNumber; @@ -200,7 +210,7 @@ namespace EOM.TSHotelManagement.FormUI btnRoom.BackgroundImage = Resources.预约状态; break; } - btnRoom.BackgroundImageLayout = AntdUI.TFit.Cover; + btnRoom.BackgroundImageLayout = AntdUI.TFit.Fill; } ReadRoomOutputDto r; @@ -209,109 +219,44 @@ namespace EOM.TSHotelManagement.FormUI FrmReserManager frm = new FrmReserManager(); frm.ShowDialog(); } - private void cmsMain_Opening(object sender, CancelEventArgs e) - { - if (lblMark == "Mark") - { - e.Cancel = true; - return; - } - var roomText = btnRoom.Text?.Split("\n\n"); - if (roomText == null || roomText.Length < 2) - { - UIMessageBox.Show("房间信息不完整！", "来自小T提示", UIStyle.Red); - return; - } - getParam = new Dictionary - { - { nameof(ReadRoomInputDto.RoomNumber), roomText[1] } - }; - result = HttpHelper.Request(ApiConstants.Room_SelectRoomByRoomNo, getParam); - var response = HttpHelper.JsonToModel>(result.message); - - if (response.StatusCode != StatusCodeConstants.Success) - { - UIMessageBox.Show($"{ApiConstants.Room_SelectRoomByRoomNo}+接口服务异常！", "来自小T提示", UIStyle.Red); - return; - } - r = response.Source; - if (r.RoomStateId == (int)Common.Core.RoomState.Vacant) - { - tsmiCheckIn.Enabled = true; - tsmiCheckOut.Enabled = false; - tsmiSelectUserInfo.Enabled = false; - tsmiChangeState.Enabled = true; - tsmiChangeRoom.Enabled = false; - tsmiReserRoom.Enabled = true; - } - else if (r.RoomStateId == (int)Common.Core.RoomState.Occupied) - { - tsmiCheckIn.Enabled = false; - tsmiCheckOut.Enabled = true; - tsmiSelectUserInfo.Enabled = true; - tsmiChangeState.Enabled = false; - tsmiChangeRoom.Enabled = true; - tsmiReserRoom.Enabled = false; - } - else if (r.RoomStateId == (int)Common.Core.RoomState.Dirty || r.RoomStateId == (int)Common.Core.RoomState.Maintenance) - { - tsmiCheckIn.Enabled = false; - tsmiCheckOut.Enabled = false; - tsmiSelectUserInfo.Enabled = false; - tsmiChangeState.Enabled = true; - tsmiChangeRoom.Enabled = false; - tsmiReserRoom.Enabled = false; - } - else - { - tsmiCheckIn.Enabled = true; - tsmiCheckOut.Enabled = false; - tsmiSelectUserInfo.Enabled = false; - tsmiChangeState.Enabled = true; - tsmiChangeRoom.Enabled = false; - tsmiReserRoom.Enabled = false; - } - } private void tsmiCheckIn_Click(object sender, EventArgs e) { if (romCustoInfo != null && romRoomInfo != null) { + rm_CustoNo = romCustoInfo.CustomerNumber; + rm_RoomNo = romRoomInfo.RoomNumber; + rm_RoomType = romRoomInfo.RoomName; + rm_RoomMoney = Convert.ToDecimal(romRoomInfo.RoomRent).ToString(); if (r.RoomStateId == new EnumHelper().GetEnumValue(Common.Core.RoomState.Reserved)) { - rm_CustoNo = romCustoInfo.CustomerNumber; - rm_RoomNo = romRoomInfo.RoomNumber; - rm_RoomType = romRoomInfo.RoomName; - rm_RoomMoney = Convert.ToDecimal(romRoomInfo.RoomRent).ToString(); rm_RoomStateId = (int)Common.Core.RoomState.Reserved; - UIMessageBox.ShowInfo("欢迎入住，请先注册客户信息！"); + NotificationService.ShowInfo("欢迎入住，请先注册客户信息！"); FrmReserList frm = new FrmReserList(); frm.ShowDialog(); return; } else { - rm_CustoNo = romCustoInfo.CustomerNumber; - rm_RoomNo = romRoomInfo.RoomNumber; - rm_RoomType = romRoomInfo.RoomName; - rm_RoomMoney = Convert.ToDecimal(romRoomInfo.RoomRent).ToString(); FrmCheckIn frm = new FrmCheckIn(); frm.ShowDialog(); } } else { - UIMessageBox.Show("房间信息不完整！", "来自小T提示", UIStyle.Red); + NotificationService.ShowError("房间信息不完整！"); + return; } } private void tsmiCheckOut_Click(object sender, EventArgs e) { rm_CustoNo = romRoomInfo.CustomerNumber; + co_CustoName = romCustoInfo.CustomerName; rm_RoomNo = romRoomInfo.RoomNumber; rm_RoomType = romRoomInfo.RoomName; - FrmCheckOutForm frm = new FrmCheckOutForm(_loadingProgress); - frm.ShowDialog(this); + FrmCheckOutDetail frm = new FrmCheckOutDetail(); + frm.ShowDialog(); } public static string? RoomNo; @@ -321,8 +266,12 @@ namespace EOM.TSHotelManagement.FormUI { if (romCustoInfo != null && romRoomInfo != null) { - bool tf = UIMessageBox.Show("确定要进行转房吗？", "来自小T的提醒", UIStyle.Orange, UIMessageBoxButtons.OKCancel); - if (tf) + var dr = AntdUI.Modal.open(new AntdUI.Modal.Config(null, UIMessageConstant.Information, "是否要进行房间更换？", AntdUI.TType.Info) + { + CancelText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_No, UIMessageConstant.Chs_No), + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Yes, UIMessageConstant.Chs_Yes) + }); + if (dr == DialogResult.OK) { RoomNo = romRoomInfo.RoomNumber; CustoNo = romCustoInfo.CustomerNumber; @@ -333,14 +282,14 @@ namespace EOM.TSHotelManagement.FormUI } else { - UIMessageBox.Show("房间信息不完整！", "来自小T提示", UIStyle.Red); + NotificationService.ShowError("房间信息不完整！"); + return; } } private void tsmiSelectUserInfo_Click(object sender, EventArgs e) { - rm_CustoNo = romCustoInfo.CustomerNumber; - FrmSelectCustoInfo frm = new FrmSelectCustoInfo(); + FrmCustomerInfo frm = new FrmCustomerInfo(romCustoInfo.CustomerNumber); frm.ShowDialog(); } @@ -348,8 +297,12 @@ namespace EOM.TSHotelManagement.FormUI { if (r.RoomStateId == (int)Common.Core.RoomState.Reserved) { - bool tf = UIMessageBox.Show("当前房间已被预约，确认更改状态后将会删除原本预约状态及信息，你确定吗？", "来自小T的提醒", UIStyle.Red, UIMessageBoxButtons.OKCancel); - if (tf) + var dr = AntdUI.Modal.open(new AntdUI.Modal.Config(null, UIMessageConstant.Warning, "当前房间已被预约，确认更改状态后将会删除原本预约状态及信息，你确定吗？", AntdUI.TType.Warn) + { + CancelText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_No, UIMessageConstant.Chs_No), + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Yes, UIMessageConstant.Chs_Yes) + }); + if (dr == DialogResult.OK) { getParam = new Dictionary() { @@ -357,22 +310,22 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Reser_SelectReserInfoByRoomNo, getParam); var reserResponse = HttpHelper.JsonToModel>(result.message); - if (reserResponse.StatusCode != StatusCodeConstants.Success) + if (reserResponse.Success == false) { - UIMessageBox.Show($"{ApiConstants.Reser_SelectReserInfoByRoomNo}+接口服务异常！", "来自小T提示", UIStyle.Red); + NotificationService.ShowError($"{ApiConstants.Reser_SelectReserInfoByRoomNo}+接口服务异常！"); return; } else { 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) + result = HttpHelper.Request(ApiConstants.Reser_DeleteReserInfo, reser.ModelToJson()); + var reserResult = HttpHelper.JsonToModel(result.message); + if (reserResult.Success == false) { - UIMessageBox.Show($"{ApiConstants.Reser_DeleteReserInfo}+接口服务异常！", "来自小T提示", UIStyle.Red); + NotificationService.ShowError($"{ApiConstants.Reser_DeleteReserInfo}+接口服务异常！"); return; } } @@ -387,7 +340,119 @@ namespace EOM.TSHotelManagement.FormUI } else { - UIMessageBox.Show("房间信息不完整！", "来自小T提示", UIStyle.Red); + NotificationService.ShowError("房间信息不完整！"); + } + } + + private void RightKey(AntdUI.ContextMenuStripItem it) + { + switch (it.Text) + { + case UIControlConstant.ReservationRoom: + tsmiReserRoom_Click(this, EventArgs.Empty); + break; + case UIControlConstant.CheckInRoom: + tsmiCheckIn_Click(this, EventArgs.Empty); + break; + case UIControlConstant.ChangeRoom: + tsmiChangeRoom_Click(this, EventArgs.Empty); + break; + case UIControlConstant.CheckOutRoom: + tsmiCheckOut_Click(this, EventArgs.Empty); + break; + case UIControlConstant.CustomerInformation: + tsmiSelectUserInfo_Click(this, EventArgs.Empty); + break; + case UIControlConstant.ChangeStateRoom: + tsmiChangeState_Click(this, EventArgs.Empty); + break; + } + } + + private void ContextMenuItemHandler() + { + var roomText = btnRoom.Text?.Split("\n\n"); + if (roomText == null || roomText.Length < 2) + { + NotificationService.ShowError("房间信息不完整！"); + return; + } + getParam = new Dictionary + { + { nameof(ReadRoomInputDto.RoomNumber), roomText[1] } + }; + result = HttpHelper.Request(ApiConstants.Room_SelectRoomByRoomNo, getParam); + var response = HttpHelper.JsonToModel>(result.message); + + if (response.Success == false) + { + NotificationService.ShowError($"{ApiConstants.Room_SelectRoomByRoomNo}+接口服务异常！"); + return; + } + r = response.Data; + + foreach (ContextMenuStripItem item in menulist) + { + switch (r.RoomStateId) + { + case (int)Common.Core.RoomState.Vacant: + item.Enabled = item.Text switch + { + UIControlConstant.CheckInRoom => true, + UIControlConstant.ReservationRoom => true, + UIControlConstant.ChangeRoom => false, + UIControlConstant.CheckOutRoom => false, + UIControlConstant.CustomerInformation => false, + _ => item.Enabled + }; + break; + case (int)Common.Core.RoomState.Occupied: + item.Enabled = item.Text switch + { + UIControlConstant.CheckInRoom => false, + UIControlConstant.ReservationRoom => false, + UIControlConstant.ChangeRoom => true, + UIControlConstant.CheckOutRoom => true, + UIControlConstant.CustomerInformation => true, + _ => item.Enabled + }; + break; + case (int)Common.Core.RoomState.Dirty: + case (int)Common.Core.RoomState.Maintenance: + item.Enabled = item.Text switch + { + UIControlConstant.CheckInRoom => false, + UIControlConstant.ReservationRoom => false, + UIControlConstant.ChangeRoom => false, + UIControlConstant.CheckOutRoom => false, + UIControlConstant.CustomerInformation => false, + _ => item.Enabled + }; + break; + default: + item.Enabled = item.Text switch + { + UIControlConstant.CheckInRoom => true, + UIControlConstant.ReservationRoom => false, + UIControlConstant.ChangeRoom => false, + UIControlConstant.CheckOutRoom => false, + UIControlConstant.CustomerInformation => false, + _ => item.Enabled + }; + break; + } + } + + } + + private void btnRoom_MouseClick(object sender, MouseEventArgs e) + { + ContextMenuItemHandler(); + if (e.Button == MouseButtons.Right) + { + AntdUI.ContextMenuStrip.Config config = new AntdUI.ContextMenuStrip.Config(this, RightKey, menulist); + config.Font = new Font("Noto Sans SC", 9f, FontStyle.Bold); + AntdUI.ContextMenuStrip.open(config); } } } diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.resx b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.resx similarity index 100% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.resx rename to EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.resx diff --git a/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoomType.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.Designer.cs similarity index 56% rename from EOM.TSHotelManagement.FormUI/AppUserControls/ucRoomType.Designer.cs rename to EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.Designer.cs index a7679ab7c534753ae6692af3b66d3d111f7681ed..568b526274167b59841ffe16d26046060eab079b 100644 --- a/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoomType.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.Designer.cs @@ -1,4 +1,4 @@ -namespace EOM.TSHotelManagement.FormUI.AppUserControls +namespace EOM.TSHotelManagement.FormUI { partial class ucRoomType { @@ -28,33 +28,30 @@ /// private void InitializeComponent() { - btnRoomType = new Sunny.UI.UIButton(); + btnRoomType = new AntdUI.Button(); SuspendLayout(); // // btnRoomType // - btnRoomType.Cursor = System.Windows.Forms.Cursors.Hand; - btnRoomType.Font = new System.Drawing.Font("微软雅黑", 12F); - btnRoomType.Location = new System.Drawing.Point(0, 2); - btnRoomType.Margin = new System.Windows.Forms.Padding(4); - btnRoomType.MinimumSize = new System.Drawing.Size(1, 1); + btnRoomType.Font = new Font("Noto Sans SC", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnRoomType.Location = new Point(2, 0); btnRoomType.Name = "btnRoomType"; - btnRoomType.Size = new System.Drawing.Size(107, 33); - btnRoomType.TabIndex = 1; - btnRoomType.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + btnRoomType.Size = new Size(113, 37); + btnRoomType.TabIndex = 0; + btnRoomType.Type = AntdUI.TTypeMini.Info; // // ucRoomType // - AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); - AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; Controls.Add(btnRoomType); Name = "ucRoomType"; - Size = new System.Drawing.Size(107, 37); + Size = new Size(117, 38); ResumeLayout(false); } #endregion - public Sunny.UI.UIButton btnRoomType; + public AntdUI.Button btnRoomType; } } diff --git a/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoomType.cs b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.cs similarity index 71% rename from EOM.TSHotelManagement.FormUI/AppUserControls/ucRoomType.cs rename to EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.cs index 45d8a40f35f8cba010f6d43b4272b7a172ea9338..7506853d98110ce8a5ce9e928e0f3f5ff4b4ae5e 100644 --- a/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoomType.cs +++ b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.cs @@ -1,4 +1,4 @@ -namespace EOM.TSHotelManagement.FormUI.AppUserControls +namespace EOM.TSHotelManagement.FormUI { public partial class ucRoomType : UserControl { diff --git a/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoomType.resx b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.resx similarity index 99% rename from EOM.TSHotelManagement.FormUI/AppUserControls/ucRoomType.resx rename to EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.resx index af32865ec12ff9e3beb4b98fb4cf5b8420e12d69..8b2ff64a11300290ddac7e7d9bc26e5e0a766508 100644 --- a/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoomType.resx +++ b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.resx @@ -1,7 +1,7 @@  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 17, 17 + + + + + AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8g////QP// + /2D///9g////gf///0D///9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///yD///+B////v/// + ///////////////////////////////////////f////n////4EAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///yD///+B//////// + /////////////////////////////////////////////////////////////////9////9gAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///+B//////// + ////////////////////////////3////9////+/////v/////////////////////////////////// + //////+/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8g////gf// + ///////////////////////f////gf///0AAAAAAAAAAAAAAAAAAAAAAAAAAAP///yD///+B////n/// + ///////////////////////f////QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// + /4H////////////////////f////gQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////IP///7//////////////////////////QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAD///+B////////////////////3////yAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///4H////////////////////fAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////QP///////////////////98AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///0D///////////////////+/AAAAAAAA + AAAAAAAAAAAAAP///yD///+////////////////f////IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///4H///////////// + //////9AAAAAAAAAAAAAAAAA////YP///////////////////0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAP///2D/////////3wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// + /7///////////////98AAAAAAAAAAAAAAAD///+///////////////+/AAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////v///////////////YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////QP///////////////////2AAAAAA////IP///////////////////0AAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////f//////////////9gAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////v///////////////nwAAAAD///+B///////////////fAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///9///////////////2AAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///9g////////////////AAAAAP///7////////////// + /4EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////3///////////////YAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////////////8g////v/// + ////////////YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////f//////// + //////9gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///9////////////// + /2D////f//////////////9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// + /9///////////////2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////3/// + ////////////YP///////////////////0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///+B////3/// + /4EAAAAA////3///////////////YP///yD///+f////3////yAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAD///+///////////////+B////3///////////////YAAAAAAAAAAAAAAAAAAAAAAAAAAA////IP// + /////////////////5/////f//////////////+B////3///////////////nwAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAP///9///////////////2D///+///////////////9gAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////3/////////////////////////////////////////////////////////9AAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////////////////////QP///5///////////////58AAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAD///8g////////////////////////////////////////////////////gQAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///yD///////////////////8g////YP///////////////wAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8g//////////////////////////////////////// + /4EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////gf//////////////3wAAAAAAAAAA//////// + ////////////YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8g//////////////////////// + //////+BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///yD////f//////////////+BAAAAAAAA + AAD///+/////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8g//////// + ////////////gQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////YP//////////////3/// + /0AAAAAAAAAAAP///0D///////////////////+BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAD///8g////gf///2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///yD///////////// + //////+fAAAAAAAAAAAAAAAAAAAAAP///5////////////////////9AAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8g////v/// + ////////////3////yAAAAAAAAAAAAAAAAAAAAAAAAAAAP///7////////////////////9AAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////IP// + /7////////////////////+BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////IP////////////////// + //////+BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// + /yD////f////////////////////nwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////QP// + ///////////////////////f////gQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// + /yD///+B/////////////////////////58AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////IP///9//////////////////////////3////7////+B////YP///0D///9A////YP// + /4H///+///////////////////////////////+BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////IP///4H///////////////////////////////////////////// + ///////////////////////////////////////f////gQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///yD///+f//////////////////////// + ///////////////////////////////////////f////gQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8g////gf// + /4H///+/////3//////////f////3////7////+B////QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA//9////AA///AAH//AAAf/gP4D/wP/wf4P/+D+H//4fD//+Hx/5/w4f8 + f+OP/H/hD/x/8Q/8f/Ef/H/xH/x/8R/EZ/AfwAPxH8AH8Q/gB/GP8A/hj/gf4Yf8P+PD/v/Dw///h+H/ + /wfwf/4P+B/4H/wDwD/+AAB//4AB///gD/8= + + + \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLogin.Designer.cs similarity index 74% rename from EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.Designer.cs rename to EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLogin.Designer.cs index 0f1d14a92da6d4b0178bbdb19517f70ea6e7a72b..8b3cb0c0d81a46ce9508cf9075596c2993dfaccb 100644 --- a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLogin.Designer.cs @@ -33,11 +33,11 @@ txtAccount = new AntdUI.Input(); txtWorkerPwd = new AntdUI.Input(); picLogin = new AntdUI.Button(); - picFormSize = new AntdUI.Button(); - picClose = new AntdUI.Button(); avatar1 = new AntdUI.Avatar(); avatar2 = new AntdUI.Avatar(); label1 = new AntdUI.Label(); + btnMinimize = new AntdUI.Button(); + btnClose = new AntdUI.Button(); SuspendLayout(); // // label2 @@ -55,17 +55,18 @@ // txtAccount // txtAccount.BackColor = Color.White; - txtAccount.Font = new Font("Microsoft YaHei UI", 14F); + txtAccount.Font = new Font("Noto Sans SC", 12F); txtAccount.Location = new Point(648, 190); txtAccount.Name = "txtAccount"; txtAccount.PlaceholderText = ""; txtAccount.Size = new Size(238, 52); txtAccount.TabIndex = 32; + txtAccount.Text = "WK010"; // // txtWorkerPwd // txtWorkerPwd.BackColor = Color.White; - txtWorkerPwd.Font = new Font("Microsoft YaHei UI", 14F); + txtWorkerPwd.Font = new Font("Noto Sans SC", 12F); txtWorkerPwd.Location = new Point(648, 264); txtWorkerPwd.Name = "txtWorkerPwd"; txtWorkerPwd.PasswordChar = '*'; @@ -74,10 +75,11 @@ txtWorkerPwd.PlaceholderText = ""; txtWorkerPwd.Size = new Size(238, 52); txtWorkerPwd.TabIndex = 33; + txtWorkerPwd.Text = "WK010"; // // picLogin // - picLogin.Font = new Font("Microsoft YaHei UI", 12F); + picLogin.Font = new Font("Noto Sans SC", 12F); picLogin.Location = new Point(658, 342); picLogin.Name = "picLogin"; picLogin.Radius = 8; @@ -88,30 +90,6 @@ picLogin.Type = AntdUI.TTypeMini.Primary; picLogin.Click += picLogin_Click; // - // picFormSize - // - picFormSize.BackColor = Color.Transparent; - picFormSize.BackgroundImage = Properties.Resources.arrow_down_b; - picFormSize.Font = new Font("Microsoft YaHei UI", 9F); - picFormSize.Ghost = true; - picFormSize.Location = new Point(822, 1); - picFormSize.Name = "picFormSize"; - picFormSize.Size = new Size(41, 38); - picFormSize.TabIndex = 36; - picFormSize.Click += picMin_Click; - // - // picClose - // - picClose.BackColor = Color.Transparent; - picClose.BackgroundImage = Properties.Resources.close; - picClose.Font = new Font("Microsoft YaHei UI", 9F); - picClose.Ghost = true; - picClose.Location = new Point(875, 1); - picClose.Name = "picClose"; - picClose.Size = new Size(41, 38); - picClose.TabIndex = 37; - picClose.Click += picClose_Click; - // // avatar1 // avatar1.Image = (Image)resources.GetObject("avatar1.Image"); @@ -134,7 +112,7 @@ // // label1 // - label1.Font = new Font("Microsoft YaHei UI", 14F); + label1.Font = new Font("Noto Sans SC", 14F); label1.Location = new Point(648, 72); label1.Name = "label1"; label1.Size = new Size(222, 83); @@ -142,6 +120,36 @@ label1.Text = "欢迎登录"; label1.TextAlign = ContentAlignment.MiddleCenter; // + // btnMinimize + // + btnMinimize.Anchor = AnchorStyles.Right; + btnMinimize.BackColor = Color.FromArgb(22, 119, 255); + btnMinimize.DisplayStyle = AntdUI.TButtonDisplayStyle.Text; + btnMinimize.Font = new Font("Noto Sans SC", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnMinimize.Location = new Point(832, 2); + btnMinimize.Name = "btnMinimize"; + btnMinimize.Size = new Size(38, 38); + btnMinimize.TabIndex = 143; + btnMinimize.Text = "—"; + btnMinimize.TextAlign = ContentAlignment.BottomCenter; + btnMinimize.Type = AntdUI.TTypeMini.Info; + btnMinimize.Click += picMin_Click; + // + // btnClose + // + btnClose.Anchor = AnchorStyles.Top | AnchorStyles.Right; + btnClose.BackColor = Color.FromArgb(22, 119, 255); + btnClose.DisplayStyle = AntdUI.TButtonDisplayStyle.Text; + btnClose.Font = new Font("Noto Sans SC", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnClose.Location = new Point(876, 2); + btnClose.Name = "btnClose"; + btnClose.Size = new Size(38, 38); + btnClose.TabIndex = 142; + btnClose.Text = "×"; + btnClose.TextAlign = ContentAlignment.BottomCenter; + btnClose.Type = AntdUI.TTypeMini.Info; + btnClose.Click += picClose_Click; + // // FrmLogin // AutoScaleDimensions = new SizeF(7F, 17F); @@ -150,11 +158,11 @@ BackgroundImage = (Image)resources.GetObject("$this.BackgroundImage"); BackgroundImageLayout = ImageLayout.Zoom; ClientSize = new Size(916, 510); + Controls.Add(btnMinimize); + Controls.Add(btnClose); Controls.Add(label1); Controls.Add(avatar2); Controls.Add(avatar1); - Controls.Add(picClose); - Controls.Add(picFormSize); Controls.Add(picLogin); Controls.Add(txtWorkerPwd); Controls.Add(txtAccount); @@ -177,11 +185,11 @@ private AntdUI.Input txtAccount; private AntdUI.Input txtWorkerPwd; private AntdUI.Button picLogin; - private AntdUI.Button picFormSize; - private AntdUI.Button picClose; private AntdUI.Avatar avatar1; private AntdUI.Avatar avatar2; private AntdUI.Label label1; + private AntdUI.Button btnMinimize; + private AntdUI.Button btnClose; } } diff --git a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.cs b/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLogin.cs similarity index 71% rename from EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.cs rename to EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLogin.cs index 44c1ec91af657fe24ee85e4d867fab25a5859ebe..3b27600500365fc24f54f1aea72e2aa0410ddb63 100644 --- a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.cs +++ b/EOM.TSHotelManagement.FormUI/ClientEntrance/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 @@ -104,13 +105,13 @@ namespace EOM.TSHotelManagement.FormUI { if (txtAccount.Text == "") { - AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString("Please input employee number or email", "请输入员工编号或邮箱地址"), TType.Error); + NotificationService.ShowError(LocalizationHelper.GetLocalizedString("Please input employee number or email", "请输入员工编号或邮箱地址")); txtAccount.Focus(); return false; } if (txtWorkerPwd.Text == "") { - AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString("Please input password", "请输入员工密码"), TType.Error); + NotificationService.ShowError(LocalizationHelper.GetLocalizedString("Please input password", "请输入员工密码")); txtWorkerPwd.Focus(); return false; } @@ -127,23 +128,23 @@ namespace EOM.TSHotelManagement.FormUI { var worker = new ReadEmployeeInputDto() { EmployeeId = txtAccount.Text.Trim(), EmailAddress = txtAccount.Text.Trim(), Password = txtWorkerPwd.Text.Trim() }; - result = HttpHelper.Request(ApiConstants.Employee_SelectEmployeeInfoByEmployeeIdAndEmployeePwd, HttpHelper.ModelToJson(worker)); + result = HttpHelper.Request(ApiConstants.Employee_SelectEmployeeInfoByEmployeeIdAndEmployeePwd, worker.ModelToJson()); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Success == false) { - 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); + NotificationService.ShowError(LocalizationHelper.GetLocalizedString($"{ApiConstants.Employee_SelectEmployeeInfoByEmployeeIdAndEmployeePwd} is abnormal. Please submit an issue", $"{ApiConstants.Employee_SelectEmployeeInfoByEmployeeIdAndEmployeePwd}+接口服务异常，请提交issue")); return; } - ReadEmployeeOutputDto w = response.Source; + ReadEmployeeOutputDto w = response.Data; if (!w.IsNullOrEmpty()) { if (w.IsEnable == 0) { - AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString("The account has been disabled, please contact your superiors to unblock it!", "账号已禁用，请联系上级解封！"), TType.Error); + NotificationService.ShowError(LocalizationHelper.GetLocalizedString("The account has been disabled, please contact your superiors to unblock it!", "账号已禁用，请联系上级解封！")); return; } @@ -151,14 +152,15 @@ 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; if (w.IsInitialize == 0) { - AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString("The initial password for the current account has not been changed, and it will be directed to the change page later", "当前账号未修改初始密码，稍后将引导至修改页面"), TType.Error); - FrmMySpace frmMySpace = new FrmMySpace(); - frmMySpace.ShowDialog(); + NotificationService.ShowError(LocalizationHelper.GetLocalizedString("The initial password for the current account has not been changed, and it will be directed to the change page later", "当前账号未修改初始密码，稍后将引导至修改页面")); + FrmAccountSecurity frmAccountSecurity = new FrmAccountSecurity(); + frmAccountSecurity.ShowDialog(); } FrmMain frm = new FrmMain(this); @@ -167,7 +169,7 @@ namespace EOM.TSHotelManagement.FormUI } else { - AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString("Employee number/email or password incorrect", "员工编号/邮箱地址或密码错误！"), TType.Error); + NotificationService.ShowError(LocalizationHelper.GetLocalizedString("Employee number/email or password incorrect", "员工编号/邮箱地址或密码错误！")); txtWorkerPwd.Focus(); } } @@ -175,7 +177,7 @@ namespace EOM.TSHotelManagement.FormUI catch (Exception ex) { RecordHelper.Record(LocalizationHelper.GetLocalizedString($"Login error:{ex.Message}", $"登录异常:{ex.Message}"), Common.Core.LogLevel.Critical); - AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString("The server is under maintenance, please try again later", "服务器维护中，请稍后再试！"), TType.Error); + NotificationService.ShowError(LocalizationHelper.GetLocalizedString("The server is under maintenance, please try again later", "服务器维护中，请稍后再试！")); } } #endregion diff --git a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.resx b/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLogin.resx similarity index 100% rename from EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.resx rename to EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLogin.resx diff --git a/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientMain/FrmMain.Designer.cs similarity index 40% rename from EOM.TSHotelManagement.FormUI/AppMain/FrmMain.Designer.cs rename to EOM.TSHotelManagement.FormUI/ClientMain/FrmMain.Designer.cs index 85a8d620891ac724636e083c075e8c6d7bdfb345..ff1693d7d43bd4b9f3ff0b795c67b8c76a95c383 100644 --- a/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientMain/FrmMain.Designer.cs @@ -30,70 +30,34 @@ { components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain)); - lblTime = new Label(); - tmrDate = new System.Windows.Forms.Timer(components); lblSoftName = new Label(); pnlMID = new Panel(); - notifyIcon1 = new NotifyIcon(components); - 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(); - tsmiExitSystem = new ToolStripMenuItem(); + niClientIcon = new NotifyIcon(components); linkLabel1 = new LinkLabel(); - lblScroll = new Sunny.UI.UIScrollingText(); tmrFont = new System.Windows.Forms.Timer(components); - label3 = new Label(); - btnHello = new Sunny.UI.UIButton(); - uiButton1 = new Sunny.UI.UIButton(); + lbHello = new Label(); 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(); - btnClose = new AntdUI.Button(); - btnFormSize = new AntdUI.Button(); btnSetting = new AntdUI.Button(); cpUITheme = new AntdUI.ColorPicker(); - cmsMain.SuspendLayout(); + lblScroll = new AntdUI.Label(); + ltNow = new AntdUI.LabelTime(); + btnMinimize = new AntdUI.Button(); + btnClose = new AntdUI.Button(); pnlCheckInfo.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)picLogo).BeginInit(); SuspendLayout(); // - // lblTime - // - lblTime.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - 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.Location = new Point(53, 141); - lblTime.Margin = new Padding(4, 0, 4, 0); - lblTime.Name = "lblTime"; - lblTime.Size = new Size(92, 24); - lblTime.TabIndex = 2; - lblTime.Text = "NowTime"; - // - // tmrDate - // - tmrDate.Enabled = true; - tmrDate.Interval = 60000; - tmrDate.Tick += tmrDate_Tick; - // // lblSoftName // 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"; @@ -112,209 +76,58 @@ pnlMID.Size = new Size(1072, 490); pnlMID.TabIndex = 23; // - // notifyIcon1 - // - notifyIcon1.Icon = (Icon)resources.GetObject("notifyIcon1.Icon"); - notifyIcon1.Text = "TS酒店管理系统"; - notifyIcon1.Visible = true; - notifyIcon1.BalloonTipClosed += notifyIcon1_BalloonTipClosed; - notifyIcon1.MouseDoubleClick += notifyIcon1_MouseDoubleClick; - // - // 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.Name = "cmsMain"; - cmsMain.RenderMode = ToolStripRenderMode.Professional; - cmsMain.Size = new Size(314, 214); - // - // tsmiChangeUser - // - tsmiChangeUser.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - tsmiChangeUser.Image = Properties.Resources.切换账号; - tsmiChangeUser.Name = "tsmiChangeUser"; - tsmiChangeUser.Size = new Size(313, 24); - tsmiChangeUser.Text = "切换用户"; - tsmiChangeUser.Click += tsmiChangeUser_Click; - // - // tsmiMySpace - // - tsmiMySpace.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - tsmiMySpace.Image = Properties.Resources.个人中心; - tsmiMySpace.Name = "tsmiMySpace"; - tsmiMySpace.Size = new Size(313, 24); - 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); + // niClientIcon // - // tsmiLockScreen - // - tsmiLockScreen.Enabled = false; - tsmiLockScreen.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - tsmiLockScreen.Image = Properties.Resources.锁屏; - tsmiLockScreen.Name = "tsmiLockScreen"; - tsmiLockScreen.Size = new Size(313, 24); - 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); - // - // tsmiUpdateLog - // - tsmiUpdateLog.Font = new Font("Microsoft Sans Serif", 12F); - tsmiUpdateLog.Name = "tsmiUpdateLog"; - tsmiUpdateLog.Size = new Size(313, 24); - tsmiUpdateLog.Text = "查看更新日志"; - tsmiUpdateLog.Click += tsmiUpdateLog_Click; - // - // tsmiAboutUs - // - 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; - // - // tsmiExitSystem - // - tsmiExitSystem.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - tsmiExitSystem.Image = Properties.Resources.注销; - tsmiExitSystem.Name = "tsmiExitSystem"; - tsmiExitSystem.Size = new Size(313, 24); - tsmiExitSystem.Text = "退出系统"; - tsmiExitSystem.Click += tsmiExitSystem_Click; + niClientIcon.Icon = (Icon)resources.GetObject("niClientIcon.Icon"); + niClientIcon.Text = "TS酒店管理系统"; + niClientIcon.Visible = true; + niClientIcon.BalloonTipClosed += niClientIcon_BalloonTipClosed; + niClientIcon.MouseClick += niClientIcon_MouseClick; // // linkLabel1 // 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 = "未打卡"; linkLabel1.VisitedLinkColor = Color.Green; linkLabel1.LinkClicked += linkLabel1_LinkClicked; // - // lblScroll - // - lblScroll.Active = true; - lblScroll.FillColor = Color.FromArgb(235, 243, 255); - lblScroll.Font = new Font("微软雅黑", 12F); - lblScroll.Interval = 1000; - lblScroll.Location = new Point(328, 58); - lblScroll.Margin = new Padding(4); - lblScroll.MinimumSize = new Size(1, 1); - lblScroll.Name = "lblScroll"; - lblScroll.Radius = 0; - lblScroll.RectSides = ToolStripStatusLabelBorderSides.None; - lblScroll.ScrollingType = Sunny.UI.UIScrollingText.UIScrollingType.LeftToRight; - lblScroll.Size = new Size(739, 33); - lblScroll.TabIndex = 0; - // // tmrFont // tmrFont.Enabled = true; tmrFont.Interval = 1000; tmrFont.Tick += tmrFont_Tick; // - // label3 - // - label3.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - label3.AutoSize = true; - label3.BackColor = Color.Transparent; - label3.FlatStyle = FlatStyle.Flat; - label3.Font = new Font("Microsoft Sans Serif", 14.25F); - label3.Location = new Point(53, 193); - label3.Margin = new Padding(4, 0, 4, 0); - label3.Name = "label3"; - label3.Size = new Size(54, 24); - label3.TabIndex = 30; - label3.Text = "Hello"; - // - // btnHello - // - btnHello.BackColor = Color.Transparent; - btnHello.BackgroundImageLayout = ImageLayout.Zoom; - btnHello.FillColor = Color.Transparent; - btnHello.Font = new Font("微软雅黑", 12F); - btnHello.Location = new Point(5, 183); - btnHello.Margin = new Padding(4); - btnHello.MinimumSize = new Size(1, 1); - btnHello.Name = "btnHello"; - btnHello.Radius = 20; - btnHello.RadiusSides = Sunny.UI.UICornerRadiusSides.None; - btnHello.RectColor = Color.Transparent; - btnHello.RectSides = ToolStripStatusLabelBorderSides.None; - btnHello.Size = new Size(40, 34); - btnHello.Style = Sunny.UI.UIStyle.Custom; - btnHello.StyleCustomMode = true; - btnHello.TabIndex = 33; - btnHello.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - // - // uiButton1 - // - uiButton1.BackColor = Color.Transparent; - uiButton1.BackgroundImage = (Image)resources.GetObject("uiButton1.BackgroundImage"); - uiButton1.BackgroundImageLayout = ImageLayout.Stretch; - uiButton1.FillColor = Color.Transparent; - uiButton1.Font = new Font("微软雅黑", 12F); - uiButton1.Location = new Point(6, 127); - uiButton1.Margin = new Padding(4); - uiButton1.MinimumSize = new Size(1, 1); - uiButton1.Name = "uiButton1"; - uiButton1.Radius = 20; - uiButton1.RadiusSides = Sunny.UI.UICornerRadiusSides.None; - uiButton1.RectColor = Color.Transparent; - uiButton1.RectSides = ToolStripStatusLabelBorderSides.None; - uiButton1.Size = new Size(40, 39); - uiButton1.Style = Sunny.UI.UIStyle.Custom; - uiButton1.StyleCustomMode = true; - uiButton1.TabIndex = 31; - uiButton1.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + // lbHello + // + lbHello.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + lbHello.AutoSize = true; + lbHello.BackColor = Color.Transparent; + lbHello.FlatStyle = FlatStyle.Flat; + lbHello.Font = new Font("Noto Sans SC", 14.2499981F, FontStyle.Regular, GraphicsUnit.Point, 0); + lbHello.Location = new Point(5, 198); + lbHello.Margin = new Padding(4, 0, 4, 0); + lbHello.Name = "lbHello"; + lbHello.Size = new Size(53, 19); + lbHello.TabIndex = 30; + lbHello.Text = "Hello"; // // pnlCheckInfo // 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 +136,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 +161,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 = "您已打卡："; // @@ -380,11 +192,10 @@ picLogo.Size = new Size(165, 111); picLogo.TabIndex = 15; picLogo.TabStop = false; - picLogo.Click += picLogo_Click; // // 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"; @@ -393,88 +204,110 @@ muNavBar.Text = "menu1"; muNavBar.SelectChanged += muNavBar_SelectChanged; // - // 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(1032, 5); - btnClose.Name = "btnClose"; - btnClose.Size = new Size(41, 38); - btnClose.TabIndex = 41; - btnClose.Click += picClose_Click; - // - // btnFormSize - // - btnFormSize.BackColor = Color.Transparent; - btnFormSize.BackgroundImage = Properties.Resources.arrow_down_b; - btnFormSize.Font = new Font("Microsoft YaHei UI", 9F); - btnFormSize.Ghost = true; - btnFormSize.Location = new Point(982, 5); - btnFormSize.Name = "btnFormSize"; - btnFormSize.Size = new Size(41, 38); - btnFormSize.TabIndex = 40; - btnFormSize.Click += picFormSize_Click; - // // btnSetting // btnSetting.BackColor = Color.Transparent; btnSetting.BackgroundImage = Properties.Resources.settings2; - btnSetting.Font = new Font("Microsoft YaHei UI", 9F); + btnSetting.Font = new Font("Noto Sans SC", 9F, FontStyle.Regular, GraphicsUnit.Point, 0); btnSetting.Ghost = true; - btnSetting.Location = new Point(932, 5); + btnSetting.Location = new Point(946, 4); btnSetting.Name = "btnSetting"; btnSetting.Size = new Size(41, 38); btnSetting.TabIndex = 42; - btnSetting.Click += btnSetting_Click; + btnSetting.MouseClick += btnSetting_MouseClick; // // cpUITheme // - cpUITheme.Location = new Point(882, 5); + cpUITheme.Location = new Point(899, 4); cpUITheme.Name = "cpUITheme"; cpUITheme.Size = new Size(41, 38); cpUITheme.TabIndex = 43; - cpUITheme.Text = "colorPicker1"; + cpUITheme.Text = "col"; cpUITheme.Value = Color.FromArgb(22, 119, 255); cpUITheme.ValueChanged += cpUITheme_ValueChanged; // + // lblScroll + // + lblScroll.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + lblScroll.Location = new Point(328, 49); + lblScroll.Name = "lblScroll"; + lblScroll.Size = new Size(745, 39); + lblScroll.TabIndex = 44; + lblScroll.Text = ""; + lblScroll.TextAlign = ContentAlignment.MiddleCenter; + // + // ltNow + // + ltNow.AutoWidth = true; + ltNow.Font = new Font("Noto Sans SC", 9F, FontStyle.Regular, GraphicsUnit.Point, 0); + ltNow.Location = new Point(5, 142); + ltNow.Name = "ltNow"; + ltNow.Size = new Size(127, 35); + ltNow.TabIndex = 45; + // + // btnMinimize + // + btnMinimize.Anchor = AnchorStyles.Right; + btnMinimize.BackColor = Color.FromArgb(22, 119, 255); + btnMinimize.DisplayStyle = AntdUI.TButtonDisplayStyle.Text; + btnMinimize.Font = new Font("Noto Sans SC", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnMinimize.Location = new Point(993, 4); + btnMinimize.Name = "btnMinimize"; + btnMinimize.Size = new Size(38, 38); + btnMinimize.TabIndex = 145; + btnMinimize.Text = "—"; + btnMinimize.TextAlign = ContentAlignment.BottomCenter; + btnMinimize.Type = AntdUI.TTypeMini.Info; + btnMinimize.Click += picFormSize_Click; + // + // btnClose + // + btnClose.Anchor = AnchorStyles.Top | AnchorStyles.Right; + btnClose.BackColor = Color.FromArgb(22, 119, 255); + btnClose.DisplayStyle = AntdUI.TButtonDisplayStyle.Text; + btnClose.Font = new Font("Noto Sans SC", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnClose.Location = new Point(1037, 4); + btnClose.Name = "btnClose"; + btnClose.Size = new Size(38, 38); + btnClose.TabIndex = 144; + btnClose.Text = "×"; + btnClose.TextAlign = ContentAlignment.BottomCenter; + btnClose.Type = AntdUI.TTypeMini.Info; + btnClose.Click += picClose_Click; + // // FrmMain // AutoScaleDimensions = new SizeF(7F, 17F); AutoScaleMode = AutoScaleMode.Font; AutoValidate = AutoValidate.Disable; BackColor = Color.FromArgb(235, 243, 255); - BackgroundImageLayout = ImageLayout.Stretch; CausesValidation = false; ClientSize = new Size(1080, 721); - Controls.Add(cpUITheme); + Controls.Add(btnMinimize); + Controls.Add(btnClose); + Controls.Add(ltNow); Controls.Add(lblScroll); + Controls.Add(cpUITheme); Controls.Add(btnSetting); - Controls.Add(btnClose); - Controls.Add(btnFormSize); Controls.Add(muNavBar); - Controls.Add(btnHello); - Controls.Add(uiButton1); - Controls.Add(label3); + Controls.Add(lbHello); Controls.Add(pnlCheckInfo); Controls.Add(linkLabel1); Controls.Add(pnlMID); Controls.Add(picLogo); Controls.Add(lblSoftName); - Controls.Add(lblTime); FormBorderStyle = FormBorderStyle.None; Icon = (Icon)resources.GetObject("$this.Icon"); Margin = new Padding(4); Name = "FrmMain"; + Resizable = false; StartPosition = FormStartPosition.CenterScreen; Text = "TS酒店管理系统"; FormClosing += FrmMain_FormClosing; FormClosed += FrmMain_FormClosed; Load += FrmMain_Load; - MouseDown += FrmMain_MouseDown_1; - MouseMove += FrmMain_MouseMove_1; - cmsMain.ResumeLayout(false); + MouseDown += FrmMain_MouseDown; + MouseMove += FrmMain_MouseMove; pnlCheckInfo.ResumeLayout(false); pnlCheckInfo.PerformLayout(); ((System.ComponentModel.ISupportInitialize)picLogo).EndInit(); @@ -483,41 +316,25 @@ } #endregion - private System.Windows.Forms.Label lblTime; - private System.Windows.Forms.Timer tmrDate; private System.Windows.Forms.Label lblSoftName; private System.Windows.Forms.PictureBox picLogo; 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.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; - public System.Windows.Forms.ContextMenuStrip cmsMain; + public System.Windows.Forms.NotifyIcon niClientIcon; private System.Windows.Forms.Timer tmrFont; - private Sunny.UI.UIScrollingText lblScroll; - private System.Windows.Forms.Label label3; - private Sunny.UI.UIButton uiButton1; - private Sunny.UI.UIButton btnHello; - 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 System.Windows.Forms.Label lbHello; 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 AntdUI.Label lblScroll; + private AntdUI.LabelTime ltNow; + private AntdUI.Button btnMinimize; + private AntdUI.Button btnClose; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.cs b/EOM.TSHotelManagement.FormUI/ClientMain/FrmMain.cs similarity index 54% rename from EOM.TSHotelManagement.FormUI/AppMain/FrmMain.cs rename to EOM.TSHotelManagement.FormUI/ClientMain/FrmMain.cs index 86e1a9dbefc92309f0cacfa25643127b0d91dbf4..2af201461cbd5931db8d664646fca5d30835ab8a 100644 --- a/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.cs +++ b/EOM.TSHotelManagement.FormUI/ClientMain/FrmMain.cs @@ -28,8 +28,8 @@ using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Util; using EOM.TSHotelManagement.FormUI.Properties; using jvncorelib.CodeLib; -using Sunny.UI; -using System.Runtime.InteropServices; +using jvncorelib.EntityLib; +using System.Diagnostics; namespace EOM.TSHotelManagement.FormUI { @@ -76,35 +76,24 @@ namespace EOM.TSHotelManagement.FormUI public void StopUseExit() { - notifyIcon1.Visible = false; - tsmiExitSystem.Enabled = false; + niClientIcon.Visible = false; } public void StartUseExit() { - notifyIcon1.Visible = true; - tsmiExitSystem.Enabled = true; + niClientIcon.Visible = true; } 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; - #endregion - #region 记录鼠标和窗体坐标的方法 private Point mouseOld;//鼠标旧坐标 private Point formOld;//窗体旧坐标 #endregion #region 记录移动的窗体坐标 - private void FrmMain_MouseDown_1(object sender, MouseEventArgs e) + private void FrmMain_MouseDown(object sender, MouseEventArgs e) { formOld = this.Location; mouseOld = MousePosition; @@ -112,7 +101,7 @@ namespace EOM.TSHotelManagement.FormUI #endregion #region 记录窗体移动的坐标 - private void FrmMain_MouseMove_1(object sender, MouseEventArgs e) + private void FrmMain_MouseMove(object sender, MouseEventArgs e) { if (e.Button == MouseButtons.Left) { @@ -124,31 +113,6 @@ namespace EOM.TSHotelManagement.FormUI } #endregion - #region 定时器：获取网络时间 - private void tmrDate_Tick(object sender, EventArgs e) - { - lblTime.Text = Convert.ToDateTime(DateTime.Now).ToString("yyyy-MM-dd HH:mm"); - - DateTime tmCur = Convert.ToDateTime(DateTime.Now); - - if (tmCur.Hour < 8 || tmCur.Hour > 18) - {//晚上 - label3.Text = "(*´▽｀)ノノ晚上好," + LoginInfo.WorkerName; - btnHello.BackgroundImage = Resources.月亮; - } - else if (tmCur.Hour > 8 && tmCur.Hour < 12) - {//上午 - label3.Text = "上午好," + LoginInfo.WorkerName; - btnHello.BackgroundImage = Resources.早上; - } - else - {//下午 - label3.Text = "下午好," + LoginInfo.WorkerName; - btnHello.BackgroundImage = Resources.咖啡; - } - } - #endregion - ListOutputDto fonts = null; int fontn = 0; private void LoadFonts() @@ -156,7 +120,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.Success == false) { fonts = null; } @@ -168,16 +132,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 @@ -186,7 +150,7 @@ namespace EOM.TSHotelManagement.FormUI { System.Windows.Forms.Application.Exit(); - notifyIcon1.Dispose(); + niClientIcon.Dispose(); } #endregion @@ -197,39 +161,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.Success == false) { 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 { @@ -258,57 +210,54 @@ namespace EOM.TSHotelManagement.FormUI #endregion } + AntdUI.IContextMenuStripItem[] menulist = new AntdUI.IContextMenuStripItem[] + { + new AntdUI.ContextMenuStripItem(UIControlConstant.ChangeAccount).SetIcon(UIControlIconConstant.ChangeAccount), + new AntdUI.ContextMenuStripItem(UIControlConstant.PersonnalCenter).SetIcon(UIControlIconConstant.PersonnalCenter).SetSub( + new AntdUI.ContextMenuStripItem(UIControlConstant.PersonnalInformation).SetIcon(UIControlIconConstant.PersonnalInformation), + new AntdUI.ContextMenuStripItem(UIControlConstant.AccountSecurity).SetIcon(UIControlIconConstant.AccountSecurity), + new AntdUI.ContextMenuStripItem(UIControlConstant.AccountAvator).SetIcon(UIControlIconConstant.AccountAvator) + ), + new AntdUI.ContextMenuStripItem(UIControlConstant.SystemLock).SetIcon(UIControlIconConstant.SystemLock), + new AntdUI.ContextMenuStripItem(UIControlConstant.UpdateLog).SetIcon(UIControlIconConstant.Log), + new AntdUI.ContextMenuStripItem(UIControlConstant.Help).SetIcon(UIControlIconConstant.Help).SetSub( + new AntdUI.ContextMenuStripItem(UIControlConstant.VisitOfficial).SetIcon(UIControlIconConstant.Internet) + ), + new AntdUI.ContextMenuStripItem(UIControlConstant.About).SetIcon(UIControlIconConstant.About), + new AntdUI.ContextMenuStripItem(UIControlConstant.ExitSystem).SetIcon(UIControlIconConstant.Exit) + }; + #region 窗体加载事件方法 private void FrmMain_Load(object sender, EventArgs e) { this.Owner.Hide(); - lblSoftName.Text = System.Windows.Forms.Application.ProductName.ToString() + "_V" + ApplicationUtil.GetApplicationVersion(); - - tmrDate.Enabled = true; + lblSoftName.Text = ApplicationUtil.GetApplicationName() + " V" + ApplicationUtil.GetApplicationVersion(); LoadNavBar(); LoadFonts(); - lblTime.Text = Convert.ToDateTime(DateTime.Now).ToString("yyyy-MM-dd HH:mm"); + DateTime tmCur = DateTime.Now; - DateTime tmCur = Convert.ToDateTime(DateTime.Now); + int currentHour = tmCur.Hour; if (tmCur.Hour < 8 || tmCur.Hour > 18) { - label3.Text = "(*´▽｀)ノノ晚上好 " + LoginInfo.WorkerName; - btnHello.BackgroundImage = Resources.月亮; + lbHello.Text = "(*´▽｀)ノノ晚上好 " + LoginInfo.WorkerName; } else if (tmCur.Hour > 8 && tmCur.Hour < 12) { - label3.Text = "(*´▽｀)ノノ上午好 " + LoginInfo.WorkerName; - btnHello.BackgroundImage = Resources.早上; + lbHello.Text = "(*´▽｀)ノノ上午好 " + LoginInfo.WorkerName; } else { - label3.Text = "(*´▽｀)ノノ下午好 " + LoginInfo.WorkerName; - btnHello.BackgroundImage = Resources.咖啡; + lbHello.Text = "(*´▽｀)ノノ下午好 " + LoginInfo.WorkerName; } - 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; - } - notifyIcon1.Text = "TS酒店管理系统-" + LoginInfo.WorkerName + "-版本号：" + ApplicationUtil.GetApplicationVersion(); + pnlCheckInfo.Visible = false; + + niClientIcon.Text = "TS酒店管理系统 - " + LoginInfo.WorkerName + " - 版本号：V" + ApplicationUtil.GetApplicationVersion(); wk_WorkerName = LoginInfo.WorkerName; FrmRoomManager frmRoomManager = new FrmRoomManager @@ -318,128 +267,182 @@ namespace EOM.TSHotelManagement.FormUI pnlMID.Controls.Add(frmRoomManager); frmRoomManager.Show(); - } - #endregion + Dictionary user = new Dictionary() + { + { nameof(ReadEmployeeCheckInputDto.EmployeeId), LoginInfo.WorkerNo} + }; - #region 调用系统锁屏方法 - private void tsmiLockScreen_Click(object sender, EventArgs e) - { - LockWorkStation(); - } - #endregion + var result = HttpHelper.Request(ApiConstants.EmployeeCheck_SelectToDayCheckInfoByWorkerNo, user); + var response = HttpHelper.JsonToModel>(result.message); - #region 检查软件更新版本事件方法 - private void tsmiCheckUpdate_Click(object sender, EventArgs e) - { - } - #endregion + if (response.Success == false) + { + AntdUI.Notification.open(new AntdUI.Notification.Config(this, UIMessageConstant.Error, $"打卡接口:{ApiConstants.EmployeeCheck_SelectToDayCheckInfoByWorkerNo}异常：{response.Message}", AntdUI.TType.Error, AntdUI.TAlignFrom.TR, Font) + { + Radius = 10, + FontStyleTitle = FontStyle.Bold, + ShowInWindow = true + }); + return; + } - #region 切换用户事件方法 - private void tsmiChangeUser_Click(object sender, EventArgs e) - { - this.Close(); - } - #endregion + bool isMorningShift = currentHour < 12; - #region 退出酒店管理系统事件方法 - private void tsmiExitSystem_Click(object sender, EventArgs e) - { - System.Windows.Forms.Application.Exit(); + 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; + + lblCheckDay.Text = Convert.ToString(response.Data.CheckDay); } #endregion - #region 关于我们选项的事件方法 - private void tsmiAboutUs_Click(object sender, EventArgs e) + private void LeftKey(AntdUI.ContextMenuStripItem it) { - FrmAboutUs frm = new FrmAboutUs(); - frm.Show(); + switch (it.Text) + { + case UIControlConstant.ChangeAccount: + var dr = AntdUI.Modal.open(new AntdUI.Modal.Config(this, UIMessageConstant.Warning, LocalizationHelper.GetLocalizedString("Are you sure you want to switch accounts?", "你确定要切换账号吗？"), AntdUI.TType.Warn) + { + CancelText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Cancel, UIMessageConstant.Chs_Cancel), + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Yes, UIMessageConstant.Chs_Yes) + }); + if (dr == DialogResult.OK) + { + this.Close(); + } + break; + case UIControlConstant.SystemLock: + FrmScreenLock frmScreenLock = new(); + frmScreenLock.ShowDialog(); + break; + case UIControlConstant.UpdateLog: + AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("Update log", "更新日志"), LoginInfo.SoftwareReleaseLog, TType.Info); + break; + case UIControlConstant.About: + FrmAbout frmAbout = new(); + frmAbout.ShowDialog(); + break; + case UIControlConstant.ExitSystem: + System.Windows.Forms.Application.Exit(); + break; + case UIControlConstant.VisitOfficial: + Process.Start(new ProcessStartInfo + { + FileName = "https://www.oscode.top", + UseShellExecute = true + }); + break; + case UIControlConstant.PersonnalInformation: + FrmPersonnelInfo frmPersonnelInfo = new(); + frmPersonnelInfo.ShowDialog(); + break; + case UIControlConstant.AccountSecurity: + FrmAccountSecurity frmAccountSecurity = new(); + frmAccountSecurity.ShowDialog(); + break; + case UIControlConstant.AccountAvator: + FrmAvator frmAvator = new(); + frmAvator.ShowDialog(); + break; + } } - #endregion #region 当窗体关闭后的事件方法 private void FrmMain_FormClosed(object sender, FormClosedEventArgs e) { - notifyIcon1.Dispose(); + niClientIcon.Dispose(); } #endregion private void FrmMain_FormClosing(object sender, FormClosingEventArgs e) { - notifyIcon1.Dispose(); + niClientIcon.Dispose(); this.returnForm1.Visible = true; } 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.Success == false) { - UIMessageTip.ShowError($"打卡接口:{ApiConstants.EmployeeCheck_SelectToDayCheckInfoByWorkerNo}异常：{response.Message}"); + NotificationService.ShowError($"打卡接口:{ApiConstants.EmployeeCheck_SelectToDayCheckInfoByWorkerNo}异常：{response.Message}"); return; } - if (response.Source.IsChecked) + + var tmCur = DateTime.Now; + 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.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) + var dr = AntdUI.Modal.open(new AntdUI.Modal.Config(this, UIMessageConstant.Information, $"你的{shiftName}还未打卡哦，请先打卡吧！", AntdUI.TType.Info) { - UIMessageTip.ShowError($"打卡天数接口{ApiConstants.EmployeeCheck_SelectWorkerCheckDaySumByEmployeeId}异常：{response.Message}"); - return; - } - lblCheckDay.Text = Convert.ToString(response.Source.CheckDay); - } - else - { - linkLabel1.Text = "未打卡"; - linkLabel1.ForeColor = Color.Red; - linkLabel1.LinkColor = Color.Red; - bool dr = UIMessageBox.Show("你今天还未打卡哦，请先打卡吧！", "打卡提醒", UIStyle.Blue, UIMessageBoxButtons.OK); - if (dr == true) + CancelText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Wait, UIMessageConstant.Chs_Wait), + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Yes, UIMessageConstant.Chs_Yes) + }); + if (dr == DialogResult.OK) { CreateEmployeeCheckInputDto workerCheck = new() { 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.Success == false) { - UIMessageTip.ShowError($"打卡接口{ApiConstants.EmployeeCheck_AddCheckInfo}异常：{checkResult.Message}"); + NotificationService.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.Success == false) { - UIMessageTip.ShowError($"打卡天数接口{ApiConstants.EmployeeCheck_SelectWorkerCheckDaySumByEmployeeId}异常：{response.Message}"); + NotificationService.ShowError($"打卡天数接口{ApiConstants.EmployeeCheck_SelectWorkerCheckDaySumByEmployeeId}异常：{response.Message}"); return; } - lblCheckDay.Text = Convert.ToString(response.Source.CheckDay); - UIMessageBox.Show("打卡成功！你已共打卡" + lblCheckDay.Text + "天，再接再厉吧！", "打卡提醒", UIStyle.Green, UIMessageBoxButtons.OK); - linkLabel1.Text = "已打卡"; + + linkLabel1.Text = $"{shiftName}已打卡"; linkLabel1.ForeColor = Color.Green; linkLabel1.LinkColor = Color.Green; - pnlCheckInfo.Visible = true; - return; } } + NotificationService.ShowSuccess($"{shiftName}打卡成功！你已共打卡" + response.Data.CheckDay + "天"); + lblCheckDay.Text = Convert.ToString(response.Data.CheckDay); + pnlCheckInfo.Visible = true; + lblCheckDay.Refresh(); + this.Refresh(); } private void lblClose_Click(object sender, EventArgs e) @@ -447,49 +450,19 @@ namespace EOM.TSHotelManagement.FormUI pnlCheckInfo.Visible = false; } - private void notifyIcon1_MouseDoubleClick(object sender, MouseEventArgs e) - { - - } - - private void tsmiMySpace_Click(object sender, EventArgs e) - { - FrmMySpace frmMySpace = new FrmMySpace(); - frmMySpace.Text = LoginInfo.WorkerName + "的个人中心"; - frmMySpace.Show(); - } - public void CloseMine() { this.Close(); } - private void picLogo_Click(object sender, EventArgs e) + private void niClientIcon_BalloonTipClosed(object sender, EventArgs e) { - FrmAboutUs frmAboutUs = new FrmAboutUs(); - frmAboutUs.ShowDialog(); - } - - private void tsmiLoginBackSystem_Click(object sender, EventArgs e) - { - - - } - - private void btnSetting_Click(object sender, EventArgs e) - { - cmsMain.Show(Cursor.Position); - } - - private void notifyIcon1_BalloonTipClosed(object sender, EventArgs e) - { - notifyIcon1.Dispose(); + niClientIcon.Dispose(); } private void cpUITheme_ValueChanged(object sender, ColorEventArgs e) { AntdUI.Style.SetPrimary(e.Value); - Settings.Default["ThemeColor"] = e.Value.ToArgb().ToString("X"); Refresh(); } @@ -528,9 +501,24 @@ namespace EOM.TSHotelManagement.FormUI } - private void tsmiUpdateLog_Click(object sender, EventArgs e) + private void btnSetting_MouseClick(object sender, MouseEventArgs e) + { + if (e.Button == MouseButtons.Left) + { + AntdUI.ContextMenuStrip.Config config = new AntdUI.ContextMenuStrip.Config(this, LeftKey, menulist); + config.Font = new Font("Noto Sans SC", 9f, FontStyle.Bold); + AntdUI.ContextMenuStrip.open(config); + } + } + + private void niClientIcon_MouseClick(object sender, MouseEventArgs e) { - AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("Update log", "更新日志"), LoginInfo.SoftwareReleaseLog, TType.Info); + if (e.Button == MouseButtons.Right) + { + AntdUI.ContextMenuStrip.Config config = new AntdUI.ContextMenuStrip.Config(this, LeftKey, menulist); + config.Font = new Font("Noto Sans SC", 9f, FontStyle.Bold); + AntdUI.ContextMenuStrip.open(config); + } } } } diff --git a/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.resx b/EOM.TSHotelManagement.FormUI/ClientMain/FrmMain.resx similarity index 96% rename from EOM.TSHotelManagement.FormUI/AppMain/FrmMain.resx rename to EOM.TSHotelManagement.FormUI/ClientMain/FrmMain.resx index 4ac33fde91185271a938c08ef0422aee1582e54d..e61ef683c653e0e106c3d0d84746027af6a66397 100644 --- a/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.resx +++ b/EOM.TSHotelManagement.FormUI/ClientMain/FrmMain.resx @@ -117,14 +117,17 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 + + True - - 206, 17 + + True + + + 114, 16 - + AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -148,27 +151,21 @@ AAD//wAA//8AAA== - - 324, 17 + + True - 111, 17 + 19, 16 + + + True + + + True + + + True - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAjdJREFUWEft - lr1qG0EQx/0ASWfdXko/gB8hEFAXV25SGVKkSiEXTuWkSN4lGOTZReAncGv8BsZGnDRbhOQhEv57X7Nz - H9oTKfWDgWP/s3OzK93MHB0dODCBGf1+NbPbt8bywji+MZY3wcrnBTT46H3/hcxuv2SW2Vj+O2bwga/e - vzeGihND/KhfBMuJn2B6PRj2UHGi400is/xdB85uNz9yKs7M6ldW++EZa9D6/OOoieT0PIuCOX7Jb/m9 - 9tPAB75yL2Jpv50Y55djp8gtvzOW72F41np0e84vtT5K5vhCnOBB66BKoDxhTwIAe5tDOL7Qei/Hd39e - G8vrJgHiU+0DkhIgPhUHWSO29ulgrJ+PXX1NSgIg/mP6udY7GOuvmwSIz7Vek5wA8blI4FrrHYzlVb3h - +GfxRus1qQkgRpsAr7TewVj2wdnxi9YkUQLOf9C6RHyWXmsdqvoeqpzWJDKBYMSftE+NqJYbrXWoGksZ - VFS7PnK3+Rgl4fhS+yCG0G+03iF0uvpqqTjTuiYj/zlKwm6/Sj2U7VZfSK2Xqt2GDWOfoSQjfzW0R1ZE - xJZaL+jnsu2m1H9gyH/Dy+Ra6At1YpY5eVZAP2+ubcfXMIZsSpNnBDkD6GtNIWpGxI9a30kYRNo/D+xh - qC9IqvrfNKEygT0Hk6EBA+VVVkk8Y23IP446kTCYiNkgMvzGavhoNb/caxAZopoR2jY9bOvk3j+VclZA - uw4dE00LfQO2Ktf8PKnnHzgg+AcOWrMEs2MtNAAAAABJRU5ErkJggg== - - iVBORw0KGgoAAAANSUhEUgAAAPoAAACtCAYAAACZZ2JyAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH @@ -596,6 +593,27 @@ pvrhFwgTJkz1wy8QJkyY6odfIEyYMNUPv0CYMGGqH/8Hl1vdIDodNEkAAAAASUVORK5CYII= + + True + + + True + + + True + + + True + + + True + + + True + + + True + 43 diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmAbout.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmAbout.Designer.cs new file mode 100644 index 0000000000000000000000000000000000000000..14611b9ab920f2b06d3e3a84492df8f23e2a723c --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmAbout.Designer.cs @@ -0,0 +1,207 @@ +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)); + 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(); + whAboutHeader = new ucWindowHeader(); + ((System.ComponentModel.ISupportInitialize)picLogo).BeginInit(); + SuspendLayout(); + // + // 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", 10.5F); + lblServerVersion.Location = new Point(194, 287); + lblServerVersion.Name = "lblServerVersion"; + lblServerVersion.Size = new Size(183, 23); + lblServerVersion.TabIndex = 48; + lblServerVersion.Text = ""; + // + // lblClientVersion + // + lblClientVersion.BackColor = Color.Transparent; + lblClientVersion.Font = new Font("Noto Sans SC", 10.5F); + lblClientVersion.Location = new Point(194, 258); + lblClientVersion.Name = "lblClientVersion"; + lblClientVersion.Size = new Size(183, 23); + lblClientVersion.TabIndex = 47; + lblClientVersion.Text = ""; + // + // lblServerVersionDescriotion + // + lblServerVersionDescriotion.BackColor = Color.Transparent; + lblServerVersionDescriotion.Font = new Font("Noto Sans SC", 10.5F); + lblServerVersionDescriotion.Location = new Point(13, 287); + lblServerVersionDescriotion.Name = "lblServerVersionDescriotion"; + lblServerVersionDescriotion.Size = new Size(171, 23); + lblServerVersionDescriotion.TabIndex = 46; + lblServerVersionDescriotion.Text = ""; + lblServerVersionDescriotion.TextAlign = ContentAlignment.MiddleRight; + // + // lblClientVersionDescriotion + // + lblClientVersionDescriotion.BackColor = Color.Transparent; + lblClientVersionDescriotion.Font = new Font("Noto Sans SC", 10.5F); + lblClientVersionDescriotion.Location = new Point(13, 258); + lblClientVersionDescriotion.Name = "lblClientVersionDescriotion"; + lblClientVersionDescriotion.Size = new Size(171, 23); + lblClientVersionDescriotion.TabIndex = 45; + lblClientVersionDescriotion.Text = ""; + lblClientVersionDescriotion.TextAlign = ContentAlignment.MiddleRight; + // + // lblCopyright + // + lblCopyright.BackColor = Color.Transparent; + lblCopyright.Font = new Font("Noto Sans SC", 10.5F); + lblCopyright.Location = new Point(13, 346); + lblCopyright.Name = "lblCopyright"; + lblCopyright.Size = new Size(364, 23); + lblCopyright.TabIndex = 49; + lblCopyright.Text = ""; + lblCopyright.TextAlign = ContentAlignment.MiddleCenter; + // + // lblNotice + // + lblNotice.BackColor = Color.Transparent; + lblNotice.Font = new Font("Noto Sans SC", 10.5F); + lblNotice.Location = new Point(13, 375); + lblNotice.Name = "lblNotice"; + lblNotice.Size = new Size(364, 23); + lblNotice.TabIndex = 50; + lblNotice.Text = ""; + lblNotice.TextAlign = ContentAlignment.MiddleCenter; + // + // lblFrameworkVersion + // + lblFrameworkVersion.BackColor = Color.Transparent; + lblFrameworkVersion.Font = new Font("Noto Sans SC", 10.5F); + lblFrameworkVersion.Location = new Point(194, 316); + lblFrameworkVersion.Name = "lblFrameworkVersion"; + lblFrameworkVersion.Size = new Size(183, 23); + lblFrameworkVersion.TabIndex = 52; + lblFrameworkVersion.Text = ""; + // + // lblFrameworkVersionDescription + // + lblFrameworkVersionDescription.BackColor = Color.Transparent; + lblFrameworkVersionDescription.Font = new Font("Noto Sans SC", 10.5F); + lblFrameworkVersionDescription.Location = new Point(13, 316); + lblFrameworkVersionDescription.Name = "lblFrameworkVersionDescription"; + lblFrameworkVersionDescription.Size = new Size(171, 23); + lblFrameworkVersionDescription.TabIndex = 51; + lblFrameworkVersionDescription.Text = ""; + lblFrameworkVersionDescription.TextAlign = ContentAlignment.MiddleRight; + // + // whAboutHeader + // + whAboutHeader.Location = new Point(1, -1); + whAboutHeader.Name = "whAboutHeader"; + whAboutHeader.Size = new Size(391, 35); + whAboutHeader.TabIndex = 53; + // + // FrmAbout + // + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.FromArgb(235, 243, 255); + ClientSize = new Size(390, 476); + Controls.Add(whAboutHeader); + 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); + FormBorderStyle = FormBorderStyle.None; + Icon = (Icon)resources.GetObject("$this.Icon"); + Margin = new Padding(2); + Name = "FrmAbout"; + Resizable = false; + StartPosition = FormStartPosition.CenterScreen; + Text = "关于我们"; + Load += FrmAboutUs_Load; + MouseDown += FrmAboutUs_MouseDown; + MouseMove += FrmAboutUs_MouseMove; + ((System.ComponentModel.ISupportInitialize)picLogo).EndInit(); + ResumeLayout(false); + } + + #endregion + 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; + private ucWindowHeader whAboutHeader; + } +} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmAbout.cs similarity index 59% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmAbout.cs index 356cf88cd9a17495f1a02d70be5af4537c237a30..15f2df0a7920145ad9a488dab29cde3e416df843 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmAbout.cs @@ -22,15 +22,19 @@ * */ 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() + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAbout)); + public FrmAbout() { InitializeComponent(); + + whAboutHeader.ApplySettingsWithoutMinimize("关于", string.Empty, (Image)resources.GetObject("FrmAbout.Icon")!); } #region 记录鼠标和窗体坐标的方法 @@ -61,11 +65,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 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 btnOk_Click(object sender, EventArgs e) + private void btnClose_Click(object sender, EventArgs e) { this.Close(); } diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmAbout.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmAbout.resx new file mode 100644 index 0000000000000000000000000000000000000000..716ace164c853a061411a92e7f0a5f667c43e93e --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/ClientModule/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/ClientModule/FrmAccountSecurity.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmAccountSecurity.Designer.cs new file mode 100644 index 0000000000000000000000000000000000000000..9dd8d60e929595cdf8d6ad4454be71f7c27511bc --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmAccountSecurity.Designer.cs @@ -0,0 +1,161 @@ +namespace EOM.TSHotelManagement.FormUI +{ + partial class FrmAccountSecurity + { + /// + /// 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(FrmAccountSecurity)); + avatar3 = new AntdUI.Avatar(); + txtOldPassword = new AntdUI.Input(); + lblEmployeeId = new AntdUI.Label(); + avatar2 = new AntdUI.Avatar(); + avatar1 = new AntdUI.Avatar(); + btnUpdatePassword = new AntdUI.Button(); + txtNewPassword = new AntdUI.Input(); + ucWindowHeader1 = new ucWindowHeader(); + SuspendLayout(); + // + // avatar3 + // + avatar3.Image = (Image)resources.GetObject("avatar3.Image"); + avatar3.ImageFit = AntdUI.TFit.None; + avatar3.Location = new Point(16, 135); + avatar3.Name = "avatar3"; + avatar3.Size = new Size(45, 43); + avatar3.TabIndex = 54; + avatar3.Text = "a"; + // + // txtOldPassword + // + txtOldPassword.BackColor = Color.White; + txtOldPassword.Font = new Font("Noto Sans SC", 14F); + txtOldPassword.Location = new Point(59, 132); + txtOldPassword.Name = "txtOldPassword"; + txtOldPassword.PasswordChar = '*'; + txtOldPassword.PasswordCopy = true; + txtOldPassword.PlaceholderColorExtend = ""; + txtOldPassword.PlaceholderText = ""; + txtOldPassword.Size = new Size(238, 52); + txtOldPassword.TabIndex = 53; + // + // lblEmployeeId + // + lblEmployeeId.Font = new Font("Noto Sans SC", 14F); + lblEmployeeId.Location = new Point(59, 62); + lblEmployeeId.Name = "lblEmployeeId"; + lblEmployeeId.Size = new Size(238, 43); + lblEmployeeId.TabIndex = 52; + lblEmployeeId.Text = ""; + lblEmployeeId.TextAlign = ContentAlignment.MiddleCenter; + // + // avatar2 + // + avatar2.Image = (Image)resources.GetObject("avatar2.Image"); + avatar2.ImageFit = AntdUI.TFit.None; + avatar2.Location = new Point(16, 215); + avatar2.Name = "avatar2"; + avatar2.Size = new Size(45, 43); + avatar2.TabIndex = 51; + avatar2.Text = "a"; + // + // avatar1 + // + avatar1.Image = (Image)resources.GetObject("avatar1.Image"); + avatar1.ImageFit = AntdUI.TFit.None; + avatar1.Location = new Point(16, 62); + avatar1.Name = "avatar1"; + avatar1.Size = new Size(45, 43); + avatar1.TabIndex = 50; + avatar1.Text = "a"; + // + // btnUpdatePassword + // + btnUpdatePassword.Font = new Font("Noto Sans SC", 12F); + btnUpdatePassword.Location = new Point(76, 289); + btnUpdatePassword.Name = "btnUpdatePassword"; + btnUpdatePassword.Size = new Size(161, 51); + btnUpdatePassword.TabIndex = 49; + btnUpdatePassword.Text = "修改密码"; + btnUpdatePassword.Type = AntdUI.TTypeMini.Primary; + btnUpdatePassword.Click += btnUpdatePassword_Click; + // + // txtNewPassword + // + txtNewPassword.BackColor = Color.White; + txtNewPassword.Font = new Font("Noto Sans SC", 14F); + txtNewPassword.Location = new Point(59, 211); + txtNewPassword.Name = "txtNewPassword"; + txtNewPassword.PasswordChar = '*'; + txtNewPassword.PasswordCopy = true; + txtNewPassword.PlaceholderColorExtend = ""; + txtNewPassword.PlaceholderText = ""; + txtNewPassword.Size = new Size(238, 52); + txtNewPassword.TabIndex = 48; + // + // ucWindowHeader1 + // + ucWindowHeader1.Location = new Point(-1, -1); + ucWindowHeader1.Name = "ucWindowHeader1"; + ucWindowHeader1.Size = new Size(313, 33); + ucWindowHeader1.TabIndex = 55; + // + // FrmAccountSecurity + // + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.FromArgb(235, 243, 255); + ClientSize = new Size(312, 353); + Controls.Add(ucWindowHeader1); + Controls.Add(avatar3); + Controls.Add(txtOldPassword); + Controls.Add(lblEmployeeId); + Controls.Add(avatar2); + Controls.Add(avatar1); + Controls.Add(btnUpdatePassword); + Controls.Add(txtNewPassword); + FormBorderStyle = FormBorderStyle.None; + Icon = (Icon)resources.GetObject("$this.Icon"); + Name = "FrmAccountSecurity"; + Resizable = false; + StartPosition = FormStartPosition.CenterScreen; + Text = "FrmAccountSecurity"; + Load += FrmAccountSecurity_Load; + ResumeLayout(false); + } + + #endregion + + private AntdUI.Avatar avatar3; + private AntdUI.Input txtOldPassword; + private AntdUI.Label lblEmployeeId; + private AntdUI.Avatar avatar2; + private AntdUI.Avatar avatar1; + private AntdUI.Button btnUpdatePassword; + private AntdUI.Input txtNewPassword; + private ucWindowHeader ucWindowHeader1; + } +} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmAccountSecurity.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmAccountSecurity.cs new file mode 100644 index 0000000000000000000000000000000000000000..f926c360d9628ac01743a2d190713cb842cc7b02 --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmAccountSecurity.cs @@ -0,0 +1,53 @@ +using AntdUI; +using EOM.TSHotelManagement.Common; +using EOM.TSHotelManagement.Common.Contract; +using EOM.TSHotelManagement.Common.Util; +using jvncorelib.EntityLib; + +namespace EOM.TSHotelManagement.FormUI +{ + public partial class FrmAccountSecurity : Window + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAccountSecurity)); + public FrmAccountSecurity() + { + InitializeComponent(); + + ucWindowHeader1.ApplySettingsWithoutMinimize("账号安全", string.Empty, (Image)resources.GetObject("FrmAccountSecurity.Icon")!); + } + + private void FrmAccountSecurity_Load(object sender, EventArgs e) + { + lblEmployeeId.Text = LoginInfo.WorkerNo; + txtOldPassword.PlaceholderText = LocalizationHelper.GetLocalizedString("Please input old password", "请输入旧密码"); + txtNewPassword.PlaceholderText = LocalizationHelper.GetLocalizedString("Please input new password", "请输入新密码"); + } + + private void btnUpdatePassword_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(txtOldPassword.Text) || string.IsNullOrEmpty(txtNewPassword.Text)) + { + NotificationService.ShowWarning(LocalizationHelper.GetLocalizedString("Please input new password or old password", "请输入旧密码或新密码")); + return; + } + + var employee = new UpdateEmployeeInputDto + { + EmployeeId = LoginInfo.WorkerNo, + OldPassword = txtOldPassword.Text.Trim(), + Password = txtNewPassword.Text.Trim(), + DataChgDate = DateTime.Now, + DataChgUsr = LoginInfo.WorkerNo + }; + var request = HttpHelper.Request(ApiConstants.Employee_UpdateEmployeeAccountPassword, employee.ModelToJson()); + var response = HttpHelper.JsonToModel(request.message); + if (response.Success == false) + { + NotificationService.ShowError(LocalizationHelper.GetLocalizedString($"{ApiConstants.Employee_UpdateEmployeeAccountPassword}+Interface service exception, please submit an issue or try updating the version!", $"{ApiConstants.Employee_UpdateEmployeeAccountPassword}+接口服务异常，请提交Issue或尝试更新版本！")); + return; + } + NotificationService.ShowSuccess(LocalizationHelper.GetLocalizedString("Update password success", "更新密码成功")); + return; + } + } +} diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmAccountSecurity.resx similarity index 85% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.resx rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmAccountSecurity.resx index 962430fd9866e5e33f0bab916bc3df5ed0b09fc9..cce1d4a4fe3559788a64dd18f19579111db2d7d1 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.resx +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmAccountSecurity.resx @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - @@ -159,22 +156,24 @@ - AAABAAEAICAAAAEAGACFAwAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAAFz - UkdCAK7OHOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA7DAAAOwwHHb6hkAAADGklEQVRYR72XMWtU - QRDHAzY24USwCFiIgmC+gK0GES1zkEoCZ6MfwA/gFSmEq3MiKYSAcoQYiV1sAoKNhEtjIwohiCAeSEK8 - 9uLv/9x9zO3tvd3cgQ/+vPd2Z2f+szOzb97MTOY1GAxmwSLogC44BH3wA7w7PT1tgiWe5zNV5omh8AZo - g98YyL028rQnpDC6Ao6tVd5PwA5YBy2wCnbBLyO3NzUBFH4IDK8xdr9KMfOXWHMLXLFyjM+JpOayiCHc - 88Z53gYLWQvHCAVxqyaBsQOzYOpYoqsREGiMdQbBDSPcnMZruxade9KLc5/B9aheJVyucWSvgS1Xgl+5 - v0iVX2X8XakV2a6YJxJtXp6E9ei8m+wMYHHbJF1lwiH7ftxhwNzbM4cNZTVw5Lxfq1LgSix1GFVmuUrU - 5cS/BIf1svG+/h8I6JwoLmzfFYFN99JPbR9yV1PuSyaRQ7OGQEsEuo7AToqA5n1JxYigq5OjA7kvzuZH - ETh0L+s5i5F9VLELWUctNl87m99EoO9eWjkEXN481BkQEMky7nbxmbN5MhEBR2IOJQ2IPEkdQqFjrCtO - XNb9OVMIdAIGR6xKqvSceZG6k9pJn0f67mQlIQsuIPwc9MBNb0AK5Il5f+w8exmStaSYK5ob7p9EoFPG - I0Kd+Ytg38S76cX8mCHwypTYVmwnFC4jsyoCi2ZgpOFg/oFNNpVtjAAy55j7HiRmIxJ/9Y7Fhfw9EVCz - 6bdk5ChGrlxgFhZhsDuAjtuBcRl4ExJgrPiQcVcLd76Y52Xsx4i5p6FikQoJjCG6G8S+bpxol3MYUecb - /RyzYClCIHeozBdVCPjpvD+WzaHdYcA2JGUrxvhlFtlOKdf4UDunjDfer0RLFSHbCZfsU3WdmrfhkY1K - eQTKjtjHOmWgaj4w3svS5Q8YF6+J2nJ0LIBts+0HWcZNjQ/FHWX6MalsWFxF1SUbJMpk7b0S01eH8UQ/ - pPbXTL9n+k3TWPFlNbLK9njC5W6HK1GdE0XfmHkd6WwZKbVcozE5DNdQuAw2QRf433PtiJ41pjn1mLVc - W38BcWWyUzy+d+8AAAAASUVORK5CYII= + AAABAAEAICAAAAEAGAASBAAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAAFz + UkdCAK7OHOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA7DAAAOwwHHb6hkAAADp0lEQVRYR7WXWYhP + URzHx5pliGEkSyhJeCCJZHsgpSxZx5pkT0h2CYkHpQYJKeRBliyFEoMiWVIj2bLmwYOdeCDM+HzP/c5/ + TPP3n/u/xrc+nXN+27n/+7/3nHNz4qqkpKQrTIYNcBwOwurS0tJxkOuw/yMmGgsPmSit8N2CPg6vXlF4 + IXN88kQ3oBAKYA7swnzbvg8w1WnVIwqOhMfwFpYwTxO7Kgjfcl+E7lJ7m/9NKkTB/fAN5tmcVvjrw274 + CtttTi4mr02hKfAOTkEXu/4qYtrAK3gBBTYnEwXyYQs8gfE2ZxRxjWErvId1NicTBTqBXrVr0N/mjOKu + 1SN2JvyEQzYnEwX6QDHo9neyOaO4gJrE9qXVw3gZ2tmVvUjuBXq3z0MPmzOKeesQO9IXUASt7MpeJHeD + c3AHhtmcUcQ1ZO6VvoAzUN+u7EVya9gJeguWxinGvM2JOw16FQttTi6KaPnV6vYcRtucVkyu2z/fv/4Z + jLEruagVFiIXvQK97aokQgY57iPNepv/XRTU23DZxV/DNrr9oJ79w2GP/BL94pBYnaLoANAd+OV5NNFT + +AwlHv+AY3Rr0HaEjTDBJXSHujNeDAPoh4uPJYKbkDQD7tP/q/B/oRkMs+k/sO0BTKTbk/asba9p1tPm + eYr0IiCfQBW76cTvoGX5JKyDYTAa1uI+SqsluFCxcUSs7lAjT1dR+PXwHY5CQ/B1GAENHVJJhGnzKogy + qhaxu2kqb+0YW8IBB2lXWwVt7c4oUtorL46ouYimgVMjYdD/rROOAh7TjLOrShFbVxer3DIxfgl7QQua + 6qXE+AQ0c3qqwAo7tafPtatKEatnoli5ZWJ8laazQxSjrfpI5I3EuIhmegigkwu3MWrlWxOMMaVif4r8 + tAcSbGGDc1hKZU69atrHr0J+MMaU66RE/l2annanhF3HtjNRVLnKnBfpf6JdHAxZKCpTLmroYDrI7pSw + t4DzUVS55BiiDq02nQ6Ojy1y7oVKFuM3sMzulHCNwl7h20JjFVgAWmg2OTYrkZcHkyCsdhJ9TTTKIYrR + V5UeuiD6OkFPhTw5d8BX7JVuWzYiv8I6QE0d5x/BXdf/U1q2a4VEnDp2fQyDhFIxagwPpWOI2Ak0dUMy + g5eRObH0+uoB074QS8RuhmgvoPPC9sSiRg/oAJdskk3rgf7rbRB2SIm+zosD6dYJF0BH/51ONImgWOqr + iXEu42lwAVbYrB85FPbBLGKa2oxycn4DnUXgUUEkWqsAAAAASUVORK5CYII= \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmAvator.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmAvator.Designer.cs new file mode 100644 index 0000000000000000000000000000000000000000..f97042de8229674bf8bdaca41c7b1d5c53f2453c --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmAvator.Designer.cs @@ -0,0 +1,101 @@ +namespace EOM.TSHotelManagement.FormUI +{ + partial class FrmAvator + { + /// + /// 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(FrmAvator)); + label4 = new AntdUI.Label(); + picWorkerPic = new PictureBox(); + openPic = new OpenFileDialog(); + ucWindowHeader1 = new ucWindowHeader(); + ((System.ComponentModel.ISupportInitialize)picWorkerPic).BeginInit(); + SuspendLayout(); + // + // label4 + // + label4.Font = new Font("Noto Sans SC", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 0); + label4.Location = new Point(293, 347); + label4.Name = "label4"; + label4.Size = new Size(215, 23); + label4.TabIndex = 3; + label4.Text = "Tips:头像大小不能超过1MB"; + label4.TextAlign = ContentAlignment.MiddleCenter; + // + // picWorkerPic + // + picWorkerPic.BackgroundImage = Properties.Resources.账号; + picWorkerPic.BackgroundImageLayout = ImageLayout.Stretch; + picWorkerPic.Location = new Point(293, 81); + picWorkerPic.Name = "picWorkerPic"; + picWorkerPic.Size = new Size(215, 246); + picWorkerPic.SizeMode = PictureBoxSizeMode.StretchImage; + picWorkerPic.TabIndex = 2; + picWorkerPic.TabStop = false; + picWorkerPic.Click += picWorkerPic_Click; + // + // openPic + // + openPic.FileName = "openFileDialog1"; + openPic.Filter = "PNG文件|*.png|JPG文件|*.jpg|位图文件|*.bmp"; + openPic.FileOk += openPic_FileOk; + // + // ucWindowHeader1 + // + ucWindowHeader1.Location = new Point(-2, 0); + ucWindowHeader1.Name = "ucWindowHeader1"; + ucWindowHeader1.Size = new Size(804, 35); + ucWindowHeader1.TabIndex = 4; + // + // FrmAvator + // + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.FromArgb(235, 243, 255); + ClientSize = new Size(800, 450); + Controls.Add(ucWindowHeader1); + Controls.Add(label4); + Controls.Add(picWorkerPic); + FormBorderStyle = FormBorderStyle.None; + Icon = (Icon)resources.GetObject("$this.Icon"); + Name = "FrmAvator"; + Resizable = false; + StartPosition = FormStartPosition.CenterScreen; + Text = "FrmAvator"; + Load += FrmAvator_Load; + ((System.ComponentModel.ISupportInitialize)picWorkerPic).EndInit(); + ResumeLayout(false); + } + + #endregion + + private AntdUI.Label label4; + private PictureBox picWorkerPic; + private OpenFileDialog openPic; + private ucWindowHeader ucWindowHeader1; + } +} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmAvator.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmAvator.cs new file mode 100644 index 0000000000000000000000000000000000000000..a118bed49e43232ba06dbb19ae873a748e130ff1 --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmAvator.cs @@ -0,0 +1,103 @@ +using AntdUI; +using EOM.TSHotelManagement.Common; +using EOM.TSHotelManagement.Common.Contract; +using jvncorelib.EntityLib; +using System.ComponentModel; + +namespace EOM.TSHotelManagement.FormUI +{ + public partial class FrmAvator : Window + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAvator)); + public FrmAvator() + { + InitializeComponent(); + + ucWindowHeader1.ApplySettingsWithoutMinimize("账号头像", string.Empty, (Image)resources.GetObject("FrmAvator.Icon")!); + } + + private void FrmAvator_Load(object sender, EventArgs e) + { + var dic = new Dictionary + { + { nameof(ReadEmployeePhotoInputDto.EmployeeId) , LoginInfo.WorkerNo } + }; + result = HttpHelper.Request(ApiConstants.EmployeePhoto_EmployeePhoto, dic); + var workerPic = HttpHelper.JsonToModel>(result.message); + if (workerPic.Success == false) + { + NotificationService.ShowError($"{ApiConstants.EmployeePhoto_EmployeePhoto}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + var workerPicData = workerPic.Data; + if (workerPicData != null && !string.IsNullOrEmpty(workerPicData.PhotoPath)) + { + picWorkerPic.BackgroundImage = null; + if (!string.IsNullOrEmpty(workerPicData.PhotoPath)) picWorkerPic.Load(workerPicData.PhotoPath); + } + } + + + public void PicHandler() + { + Dictionary additionalParams = new Dictionary + { + { nameof(CreateEmployeePhotoInputDto.EmployeeId), LoginInfo.WorkerNo } + }; + + var workerPic = new CreateEmployeePhotoInputDto + { + EmployeeId = LoginInfo.WorkerNo.Trim(), + PhotoUrl = null, + }; + var requestResult = HttpHelper.UploadFile(ApiConstants.EmployeePhoto_InsertWorkerPhoto, openPic.FileName, additionalParams); + var response = HttpHelper.JsonToModel>(requestResult.message); + if (response.Success == false) + { + NotificationService.ShowError($"{response.Message}:{ApiConstants.EmployeePhoto_InsertWorkerPhoto}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + NotificationService.ShowSuccess("头像上传成功！稍等将会加载头像哦.."); + picWorkerPic.Load(response.Data.PhotoPath); + } + + private void picWorkerPic_Click(object sender, EventArgs e) + { + openPic.ShowDialog(); + } + + ResponseMsg result = new ResponseMsg(); + private void openPic_FileOk(object sender, CancelEventArgs e) + { + var dic = new Dictionary + { + { nameof(ReadEmployeePhotoInputDto.EmployeeId) , LoginInfo.WorkerNo } + }; + result = HttpHelper.Request(ApiConstants.EmployeePhoto_EmployeePhoto, dic); + var workerPic = HttpHelper.JsonToModel>(result.message); + if (workerPic.Success == false) + { + NotificationService.ShowError($"{ApiConstants.EmployeePhoto_EmployeePhoto}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + var workerPicData = workerPic.Data; + if (!workerPicData.IsNullOrEmpty() && !string.IsNullOrEmpty(workerPicData.PhotoPath)) + { + result = HttpHelper.Request(ApiConstants.EmployeePhoto_DeleteWorkerPhoto, workerPic.ModelToJson()); + var response = HttpHelper.JsonToModel(result.message); + if (response.Success == false) + { + NotificationService.ShowError($"{ApiConstants.EmployeePhoto_DeleteWorkerPhoto}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + PicHandler(); + } + else + { + PicHandler(); + } + + } + + } +} diff --git a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmAvator.resx similarity index 73% rename from EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.resx rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmAvator.resx index 14fe195ef576fb4cdd892bfae2d2c70f38ac5a83..2b65bdbac37634721280ba41eb0ef68d6951c8ed 100644 --- a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.resx +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmAvator.resx @@ -117,7 +117,30 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 + + + + AAABAAEAICAAAAEAGAASBAAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAAFz + UkdCAK7OHOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA7DAAAOwwHHb6hkAAADp0lEQVRYR7WXWYhP + URzHx5pliGEkSyhJeCCJZHsgpSxZx5pkT0h2CYkHpQYJKeRBliyFEoMiWVIj2bLmwYOdeCDM+HzP/c5/ + TPP3n/u/xrc+nXN+27n/+7/3nHNz4qqkpKQrTIYNcBwOwurS0tJxkOuw/yMmGgsPmSit8N2CPg6vXlF4 + IXN88kQ3oBAKYA7swnzbvg8w1WnVIwqOhMfwFpYwTxO7Kgjfcl+E7lJ7m/9NKkTB/fAN5tmcVvjrw274 + CtttTi4mr02hKfAOTkEXu/4qYtrAK3gBBTYnEwXyYQs8gfE2ZxRxjWErvId1NicTBTqBXrVr0N/mjOKu + 1SN2JvyEQzYnEwX6QDHo9neyOaO4gJrE9qXVw3gZ2tmVvUjuBXq3z0MPmzOKeesQO9IXUASt7MpeJHeD + c3AHhtmcUcQ1ZO6VvoAzUN+u7EVya9gJeguWxinGvM2JOw16FQttTi6KaPnV6vYcRtucVkyu2z/fv/4Z + jLEruagVFiIXvQK97aokQgY57iPNepv/XRTU23DZxV/DNrr9oJ79w2GP/BL94pBYnaLoANAd+OV5NNFT + +AwlHv+AY3Rr0HaEjTDBJXSHujNeDAPoh4uPJYKbkDQD7tP/q/B/oRkMs+k/sO0BTKTbk/asba9p1tPm + eYr0IiCfQBW76cTvoGX5JKyDYTAa1uI+SqsluFCxcUSs7lAjT1dR+PXwHY5CQ/B1GAENHVJJhGnzKogy + qhaxu2kqb+0YW8IBB2lXWwVt7c4oUtorL46ouYimgVMjYdD/rROOAh7TjLOrShFbVxer3DIxfgl7QQua + 6qXE+AQ0c3qqwAo7tafPtatKEatnoli5ZWJ8laazQxSjrfpI5I3EuIhmegigkwu3MWrlWxOMMaVif4r8 + tAcSbGGDc1hKZU69atrHr0J+MMaU66RE/l2annanhF3HtjNRVLnKnBfpf6JdHAxZKCpTLmroYDrI7pSw + t4DzUVS55BiiDq02nQ6Ojy1y7oVKFuM3sMzulHCNwl7h20JjFVgAWmg2OTYrkZcHkyCsdhJ9TTTKIYrR + V5UeuiD6OkFPhTw5d8BX7JVuWzYiv8I6QE0d5x/BXdf/U1q2a4VEnDp2fQyDhFIxagwPpWOI2Ak0dUMy + g5eRObH0+uoB074QS8RuhmgvoPPC9sSiRg/oAJdskk3rgf7rbRB2SIm+zosD6dYJF0BH/51ONImgWOqr + iXEu42lwAVbYrB85FPbBLGKa2oxycn4DnUXgUUEkWqsAAAAASUVORK5CYII= + + \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.Designer.cs new file mode 100644 index 0000000000000000000000000000000000000000..d99f2e286ca914a749db62c3955d793b3ffa7416 --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.Designer.cs @@ -0,0 +1,135 @@ +namespace EOM.TSHotelManagement.FormUI +{ + partial class FrmChangeRoom + { + /// + /// 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(FrmChangeRoom)); + ucWindowHeader1 = new ucWindowHeader(); + label24 = new Label(); + label1 = new Label(); + lblRoomType = new AntdUI.Label(); + btnChangeRoom = new AntdUI.Button(); + cboRoomList = new AntdUI.Select(); + SuspendLayout(); + // + // ucWindowHeader1 + // + ucWindowHeader1.Location = new Point(0, -1); + ucWindowHeader1.Name = "ucWindowHeader1"; + ucWindowHeader1.Size = new Size(249, 35); + ucWindowHeader1.TabIndex = 11; + // + // label24 + // + label24.AutoSize = true; + label24.Font = new Font("Noto Sans SC", 14F); + label24.Location = new Point(5, 58); + label24.Name = "label24"; + label24.Size = new Size(85, 19); + label24.TabIndex = 159; + label24.Text = "新房间："; + // + // label1 + // + label1.AutoSize = true; + label1.Font = new Font("Noto Sans SC", 14F); + label1.Location = new Point(5, 108); + label1.Name = "label1"; + label1.Size = new Size(81, 19); + label1.TabIndex = 161; + label1.Text = "类 型："; + // + // lblRoomType + // + lblRoomType.Font = new Font("Noto Sans SC", 12F); + lblRoomType.Location = new Point(91, 99); + lblRoomType.Name = "lblRoomType"; + lblRoomType.Size = new Size(149, 36); + lblRoomType.TabIndex = 162; + lblRoomType.Text = ""; + lblRoomType.TextAlign = ContentAlignment.MiddleCenter; + // + // btnChangeRoom + // + btnChangeRoom.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnChangeRoom.Location = new Point(155, 156); + btnChangeRoom.Name = "btnChangeRoom"; + btnChangeRoom.Size = new Size(85, 45); + btnChangeRoom.TabIndex = 163; + btnChangeRoom.Text = "转 房"; + btnChangeRoom.Type = AntdUI.TTypeMini.Primary; + btnChangeRoom.Click += btnChangeRoom_Click; + // + // cboRoomList + // + cboRoomList.Font = new Font("Noto Sans SC", 12F); + cboRoomList.List = true; + cboRoomList.ListAutoWidth = true; + cboRoomList.Location = new Point(91, 46); + cboRoomList.Name = "cboRoomList"; + cboRoomList.Placement = AntdUI.TAlignFrom.Bottom; + cboRoomList.Size = new Size(149, 45); + cboRoomList.TabIndex = 179; + cboRoomList.TextChanged += cboRoomList_TextChanged; + // + // FrmChangeRoom + // + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.FromArgb(235, 243, 255); + ClientSize = new Size(248, 210); + Controls.Add(cboRoomList); + Controls.Add(btnChangeRoom); + Controls.Add(lblRoomType); + Controls.Add(label1); + Controls.Add(label24); + Controls.Add(ucWindowHeader1); + FormBorderStyle = FormBorderStyle.None; + Icon = (Icon)resources.GetObject("$this.Icon"); + Margin = new Padding(2); + MaximizeBox = false; + MinimizeBox = false; + Name = "FrmChangeRoom"; + Resizable = false; + StartPosition = FormStartPosition.CenterScreen; + Text = "转换房间"; + Load += FrmChangeRoom_Load; + ResumeLayout(false); + PerformLayout(); + + } + + #endregion + private ucWindowHeader ucWindowHeader1; + private Label label24; + private Label label1; + private AntdUI.Label lblRoomType; + private AntdUI.Button btnChangeRoom; + private AntdUI.Select cboRoomList; + } +} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.cs similarity index 75% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.cs index 8276769aed2f3fad9ad9b783b20243f8df6bc7c0..9f2d88951f036b0644a64d1cb77b87319d267cb2 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.cs @@ -22,18 +22,21 @@ * */ +using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using jvncorelib.EntityLib; -using Sunny.UI; namespace EOM.TSHotelManagement.FormUI { - public partial class FrmChangeRoom : UIForm + public partial class FrmChangeRoom : Window { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmChangeRoom)); public FrmChangeRoom() { InitializeComponent(); + + ucWindowHeader1.ApplySettingsWithoutMinimize("转换房间", string.Empty, (Image)resources.GetObject("FrmChangeRoom.Icon")!); } ResponseMsg result = null; @@ -43,14 +46,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或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_SelectCanUseRoomAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - cboRoomList.DataSource = datas.listSource; - cboRoomList.DisplayMember = nameof(ReadRoomOutputDto.RoomNumber); - cboRoomList.ValueMember = nameof(ReadRoomOutputDto.RoomNumber); + this.cboRoomList.Items.AddRange(datas.Data.Items.Select(item => new AntdUI.SelectItem(item.RoomNumber, item.RoomNumber)).ToArray()); } private void btnChangeRoom_Click(object sender, EventArgs e) @@ -70,11 +71,11 @@ namespace EOM.TSHotelManagement.FormUI DataChgUsr = LoginInfo.WorkerNo, 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) + result = HttpHelper.Request(ApiConstants.Room_TransferRoom, transferRoom.ModelToJson()); + var response = HttpHelper.JsonToModel(result.message!); + if (!response.Success) { - UIMessageBox.ShowError($"{ApiConstants.Room_TransferRoom}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_TransferRoom}+接口服务异常，请提交Issue或尝试更新版本！"); return; } @@ -85,12 +86,12 @@ namespace EOM.TSHotelManagement.FormUI #region 获取添加操作日志所需的信息 RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + transferRoom.DataChgDate + "位于" + LoginInfo.SoftwareVersion + "执行：" + transferRoom.CustomerNumber + "于" + transferRoom.DataChgDate + "进行了换房！", Common.Core.LogLevel.Warning); #endregion - UIMessageBox.ShowSuccess("转房成功"); + NotificationService.ShowSuccess("转房成功"); this.Close(); } catch (Exception) { - UIMessageBox.ShowError("转房失败"); + NotificationService.ShowError("转房失败"); } } @@ -109,12 +110,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.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.RoomType_SelectRoomTypeByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.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/FrmChangeRoom.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.resx similarity index 94% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.resx rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.resx index 211ed0936cc068c5ab8d5774f308bc5a332af403..1437888d8177178ae8d2cb13d733da0f1dd5004f 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.resx +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.resx @@ -1,17 +1,17 @@  - diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.Designer.cs similarity index 31% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.Designer.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.Designer.cs index 6ece672041c2bf5495c2981e914bad2d018dc2d2..5464960e32436b92cedaa0ff5b37f213933a1757 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.Designer.cs @@ -29,243 +29,89 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmCheckIn)); - txtRoomPosition = new Sunny.UI.UITextBox(); label3 = new Label(); - txtType = new Sunny.UI.UIComboBox(); - txtRoomNo = new Sunny.UI.UITextBox(); - txtState = new Sunny.UI.UITextBox(); - txtMoney = new Sunny.UI.UITextBox(); label13 = new Label(); label15 = new Label(); label19 = new Label(); label20 = new Label(); - txtCustoNo = new Sunny.UI.UITextBox(); - txtCustoName = new Sunny.UI.UITextBox(); label18 = new Label(); label16 = new Label(); - txtCustoTel = new Sunny.UI.UITextBox(); label14 = new Label(); - txtCustoType = new Sunny.UI.UITextBox(); label12 = new Label(); - txtDeposit = new Sunny.UI.UITextBox(); label1 = new Label(); - pnlBtm.SuspendLayout(); + ucWindowHeader1 = new ucWindowHeader(); + btnCheckIn = new AntdUI.Button(); + btnCancel = new AntdUI.Button(); + txtRoomNo = new AntdUI.Input(); + txtState = new AntdUI.Input(); + txtRoomPosition = new AntdUI.Input(); + txtRent = new AntdUI.Input(); + txtDeposit = new AntdUI.Input(); + txtCustomerName = new AntdUI.Input(); + txtCustomerLevel = new AntdUI.Input(); + txtCustomerTel = new AntdUI.Input(); + txtCustomerNo = new AntdUI.Input(); + txtRoomType = new AntdUI.Input(); SuspendLayout(); // - // pnlBtm - // - pnlBtm.Location = new Point(1, 328); - pnlBtm.Size = new Size(859, 53); - pnlBtm.Style = Sunny.UI.UIStyle.Custom; - // - // btnCancel - // - btnCancel.Location = new Point(731, 12); - btnCancel.Style = Sunny.UI.UIStyle.Custom; - // - // btnOK - // - btnOK.Location = new Point(616, 12); - btnOK.Style = Sunny.UI.UIStyle.Custom; - // - // txtRoomPosition - // - txtRoomPosition.Cursor = Cursors.IBeam; - txtRoomPosition.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtRoomPosition.Location = new Point(170, 163); - txtRoomPosition.Margin = new Padding(4, 5, 4, 5); - txtRoomPosition.MinimumSize = new Size(1, 1); - txtRoomPosition.Name = "txtRoomPosition"; - txtRoomPosition.Padding = new Padding(5); - txtRoomPosition.Radius = 20; - txtRoomPosition.ReadOnly = true; - txtRoomPosition.ShowText = false; - txtRoomPosition.Size = new Size(251, 35); - txtRoomPosition.Style = Sunny.UI.UIStyle.Custom; - txtRoomPosition.StyleCustomMode = true; - txtRoomPosition.TabIndex = 150; - txtRoomPosition.TextAlignment = ContentAlignment.MiddleLeft; - txtRoomPosition.Watermark = ""; - // // label3 // label3.AutoSize = true; - label3.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label3.Location = new Point(63, 168); + label3.Font = new Font("Noto Sans SC", 14.2499981F); + label3.Location = new Point(8, 169); label3.Name = "label3"; - label3.Size = new Size(88, 25); + label3.Size = new Size(85, 19); label3.TabIndex = 149; label3.Text = "房间位置"; // - // txtType - // - txtType.DataSource = null; - txtType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - txtType.FillColor = Color.White; - txtType.Font = new Font("微软雅黑", 15.75F); - txtType.ItemHoverColor = Color.FromArgb(155, 200, 255); - txtType.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - txtType.Location = new Point(547, 55); - txtType.Margin = new Padding(4, 5, 4, 5); - txtType.MinimumSize = new Size(63, 0); - txtType.Name = "txtType"; - txtType.Padding = new Padding(0, 0, 30, 2); - txtType.Radius = 20; - txtType.ReadOnly = true; - txtType.Size = new Size(250, 35); - txtType.Style = Sunny.UI.UIStyle.Custom; - txtType.SymbolSize = 24; - txtType.TabIndex = 148; - txtType.TextAlignment = ContentAlignment.MiddleLeft; - txtType.Watermark = ""; - // - // txtRoomNo - // - txtRoomNo.Cursor = Cursors.IBeam; - txtRoomNo.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtRoomNo.Location = new Point(171, 55); - txtRoomNo.Margin = new Padding(4, 5, 4, 5); - txtRoomNo.MinimumSize = new Size(1, 1); - txtRoomNo.Name = "txtRoomNo"; - txtRoomNo.Padding = new Padding(5); - txtRoomNo.Radius = 20; - txtRoomNo.ReadOnly = true; - txtRoomNo.ShowText = false; - txtRoomNo.Size = new Size(250, 35); - txtRoomNo.Style = Sunny.UI.UIStyle.Custom; - txtRoomNo.StyleCustomMode = true; - txtRoomNo.TabIndex = 147; - txtRoomNo.TextAlignment = ContentAlignment.MiddleLeft; - txtRoomNo.Watermark = ""; - // - // txtState - // - txtState.Cursor = Cursors.IBeam; - txtState.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtState.Location = new Point(171, 110); - txtState.Margin = new Padding(4, 5, 4, 5); - txtState.MinimumSize = new Size(1, 1); - txtState.Name = "txtState"; - txtState.Padding = new Padding(5); - txtState.Radius = 20; - txtState.ReadOnly = true; - txtState.ShowText = false; - txtState.Size = new Size(250, 35); - txtState.Style = Sunny.UI.UIStyle.Custom; - txtState.StyleCustomMode = true; - txtState.TabIndex = 146; - txtState.TextAlignment = ContentAlignment.MiddleLeft; - txtState.Watermark = ""; - // - // txtMoney - // - txtMoney.Cursor = Cursors.IBeam; - txtMoney.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtMoney.Location = new Point(547, 111); - txtMoney.Margin = new Padding(4, 5, 4, 5); - txtMoney.MinimumSize = new Size(1, 1); - txtMoney.Name = "txtMoney"; - txtMoney.Padding = new Padding(5); - txtMoney.Radius = 20; - txtMoney.ReadOnly = true; - txtMoney.ShowText = false; - txtMoney.Size = new Size(250, 35); - txtMoney.Style = Sunny.UI.UIStyle.Custom; - txtMoney.StyleCustomMode = true; - txtMoney.TabIndex = 145; - txtMoney.TextAlignment = ContentAlignment.MiddleLeft; - txtMoney.Watermark = ""; - // // label13 // label13.AutoSize = true; - label13.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label13.Location = new Point(443, 114); + label13.Font = new Font("Noto Sans SC", 14.2499981F); + label13.Location = new Point(387, 117); label13.Name = "label13"; - label13.Size = new Size(88, 25); + label13.Size = new Size(85, 19); label13.TabIndex = 144; label13.Text = "房间单价"; // // label15 // label15.AutoSize = true; - label15.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label15.Location = new Point(443, 62); + label15.Font = new Font("Noto Sans SC", 14.2499981F); + label15.Location = new Point(387, 64); label15.Name = "label15"; - label15.Size = new Size(88, 25); + label15.Size = new Size(85, 19); label15.TabIndex = 143; label15.Text = "房间类型"; // // label19 // label19.AutoSize = true; - label19.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label19.Location = new Point(64, 114); + label19.Font = new Font("Noto Sans SC", 14.2499981F); + label19.Location = new Point(9, 117); label19.Name = "label19"; - label19.Size = new Size(88, 25); + label19.Size = new Size(85, 19); label19.TabIndex = 142; label19.Text = "房间状态"; // // label20 // label20.AutoSize = true; - label20.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label20.Location = new Point(64, 62); + label20.Font = new Font("Noto Sans SC", 14.2499981F); + label20.Location = new Point(9, 64); label20.Name = "label20"; - label20.Size = new Size(88, 25); + label20.Size = new Size(85, 19); label20.TabIndex = 141; label20.Text = "房间编号"; // - // txtCustoNo - // - txtCustoNo.AutoCompleteMode = AutoCompleteMode.Suggest; - txtCustoNo.AutoCompleteSource = AutoCompleteSource.CustomSource; - txtCustoNo.BackColor = Color.Transparent; - txtCustoNo.Cursor = Cursors.IBeam; - txtCustoNo.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustoNo.Location = new Point(170, 218); - txtCustoNo.Margin = new Padding(4, 5, 4, 5); - txtCustoNo.MinimumSize = new Size(1, 1); - txtCustoNo.Name = "txtCustoNo"; - txtCustoNo.Padding = new Padding(5); - txtCustoNo.Radius = 20; - txtCustoNo.ShowText = false; - txtCustoNo.Size = new Size(250, 35); - txtCustoNo.Style = Sunny.UI.UIStyle.Custom; - txtCustoNo.StyleCustomMode = true; - txtCustoNo.TabIndex = 143; - txtCustoNo.TextAlignment = ContentAlignment.MiddleLeft; - txtCustoNo.Watermark = ""; - txtCustoNo.Validated += txtCustoNo_Validated; - // - // txtCustoName - // - txtCustoName.BackColor = Color.Transparent; - txtCustoName.Cursor = Cursors.IBeam; - txtCustoName.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustoName.Location = new Point(546, 218); - txtCustoName.Margin = new Padding(4, 5, 4, 5); - txtCustoName.MinimumSize = new Size(1, 1); - txtCustoName.Name = "txtCustoName"; - txtCustoName.Padding = new Padding(5); - txtCustoName.Radius = 20; - txtCustoName.ReadOnly = true; - txtCustoName.ShowText = false; - txtCustoName.Size = new Size(250, 35); - txtCustoName.Style = Sunny.UI.UIStyle.Custom; - txtCustoName.StyleCustomMode = true; - txtCustoName.TabIndex = 144; - txtCustoName.TextAlignment = ContentAlignment.MiddleLeft; - txtCustoName.Watermark = ""; - // // label18 // label18.AutoSize = true; label18.BackColor = Color.Transparent; - label18.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label18.Location = new Point(63, 225); + label18.Font = new Font("Noto Sans SC", 14.2499981F); + label18.Location = new Point(8, 222); label18.Name = "label18"; - label18.Size = new Size(88, 25); + label18.Size = new Size(85, 19); label18.TabIndex = 137; label18.Text = "客户编号"; // @@ -273,188 +119,229 @@ // label16.AutoSize = true; label16.BackColor = Color.Transparent; - label16.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label16.Location = new Point(63, 277); + label16.Font = new Font("Noto Sans SC", 14.2499981F); + label16.Location = new Point(8, 275); label16.Name = "label16"; - label16.Size = new Size(88, 25); + label16.Size = new Size(85, 19); label16.TabIndex = 138; label16.Text = "客户电话"; // - // txtCustoTel - // - txtCustoTel.BackColor = Color.Transparent; - txtCustoTel.Cursor = Cursors.IBeam; - txtCustoTel.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustoTel.Location = new Point(170, 273); - txtCustoTel.Margin = new Padding(4, 5, 4, 5); - txtCustoTel.MinimumSize = new Size(1, 1); - txtCustoTel.Name = "txtCustoTel"; - txtCustoTel.Padding = new Padding(5); - txtCustoTel.Radius = 20; - txtCustoTel.ReadOnly = true; - txtCustoTel.ShowText = false; - txtCustoTel.Size = new Size(250, 35); - txtCustoTel.Style = Sunny.UI.UIStyle.Custom; - txtCustoTel.StyleCustomMode = true; - txtCustoTel.TabIndex = 142; - txtCustoTel.TextAlignment = ContentAlignment.MiddleLeft; - txtCustoTel.Watermark = ""; - // // label14 // label14.AutoSize = true; label14.BackColor = Color.Transparent; - label14.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label14.Location = new Point(442, 225); + label14.Font = new Font("Noto Sans SC", 14.2499981F); + label14.Location = new Point(387, 222); label14.Name = "label14"; - label14.Size = new Size(88, 25); + label14.Size = new Size(85, 19); label14.TabIndex = 139; label14.Text = "客户姓名"; // - // txtCustoType - // - txtCustoType.BackColor = Color.Transparent; - txtCustoType.Cursor = Cursors.IBeam; - txtCustoType.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustoType.Location = new Point(546, 274); - txtCustoType.Margin = new Padding(4, 5, 4, 5); - txtCustoType.MinimumSize = new Size(1, 1); - txtCustoType.Name = "txtCustoType"; - txtCustoType.Padding = new Padding(5); - txtCustoType.Radius = 20; - txtCustoType.ReadOnly = true; - txtCustoType.ShowText = false; - txtCustoType.Size = new Size(250, 35); - txtCustoType.Style = Sunny.UI.UIStyle.Custom; - txtCustoType.StyleCustomMode = true; - txtCustoType.TabIndex = 141; - txtCustoType.TextAlignment = ContentAlignment.MiddleLeft; - txtCustoType.Watermark = ""; - // // label12 // label12.AutoSize = true; label12.BackColor = Color.Transparent; - label12.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label12.Location = new Point(442, 277); + label12.Font = new Font("Noto Sans SC", 14.2499981F); + label12.Location = new Point(387, 275); label12.Name = "label12"; - label12.Size = new Size(88, 25); + label12.Size = new Size(85, 19); label12.TabIndex = 140; label12.Text = "会员等级"; // - // txtDeposit - // - txtDeposit.Cursor = Cursors.IBeam; - txtDeposit.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtDeposit.Location = new Point(547, 163); - txtDeposit.Margin = new Padding(4, 5, 4, 5); - txtDeposit.MinimumSize = new Size(1, 1); - txtDeposit.Name = "txtDeposit"; - txtDeposit.Padding = new Padding(5); - txtDeposit.Radius = 20; - txtDeposit.ReadOnly = true; - txtDeposit.ShowText = false; - txtDeposit.Size = new Size(250, 35); - txtDeposit.Style = Sunny.UI.UIStyle.Custom; - txtDeposit.StyleCustomMode = true; - txtDeposit.TabIndex = 152; - txtDeposit.TextAlignment = ContentAlignment.MiddleLeft; - txtDeposit.Watermark = ""; - // // label1 // label1.AutoSize = true; - label1.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label1.Location = new Point(443, 168); + label1.Font = new Font("Noto Sans SC", 14.2499981F); + label1.Location = new Point(387, 169); label1.Name = "label1"; - label1.Size = new Size(88, 25); + label1.Size = new Size(85, 19); label1.TabIndex = 151; label1.Text = "房间押金"; // + // ucWindowHeader1 + // + ucWindowHeader1.Location = new Point(0, -1); + ucWindowHeader1.Name = "ucWindowHeader1"; + ucWindowHeader1.Size = new Size(732, 35); + ucWindowHeader1.TabIndex = 153; + // + // btnCheckIn + // + btnCheckIn.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnCheckIn.Location = new Point(548, 322); + btnCheckIn.Name = "btnCheckIn"; + btnCheckIn.Size = new Size(85, 45); + btnCheckIn.TabIndex = 164; + btnCheckIn.Text = "入 住"; + btnCheckIn.Type = AntdUI.TTypeMini.Primary; + btnCheckIn.Click += FrmCheckIn_ButtonOkClick; + // + // btnCancel + // + btnCancel.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnCancel.Location = new Point(639, 322); + btnCancel.Name = "btnCancel"; + btnCancel.Size = new Size(85, 45); + btnCancel.TabIndex = 165; + btnCancel.Text = "取 消"; + btnCancel.Type = AntdUI.TTypeMini.Primary; + btnCancel.Click += btnCancel_Click; + // + // txtRoomNo + // + txtRoomNo.Font = new Font("Noto Sans SC", 12F); + txtRoomNo.Location = new Point(93, 51); + txtRoomNo.Name = "txtRoomNo"; + txtRoomNo.ReadOnly = true; + txtRoomNo.Size = new Size(250, 45); + txtRoomNo.TabIndex = 166; + // + // txtState + // + txtState.Font = new Font("Noto Sans SC", 12F); + txtState.Location = new Point(93, 104); + txtState.Name = "txtState"; + txtState.ReadOnly = true; + txtState.Size = new Size(250, 45); + txtState.TabIndex = 167; + // + // txtRoomPosition + // + txtRoomPosition.Font = new Font("Noto Sans SC", 12F); + txtRoomPosition.Location = new Point(93, 157); + txtRoomPosition.Name = "txtRoomPosition"; + txtRoomPosition.ReadOnly = true; + txtRoomPosition.Size = new Size(250, 45); + txtRoomPosition.TabIndex = 168; + // + // txtRent + // + txtRent.Font = new Font("Noto Sans SC", 12F); + txtRent.Location = new Point(474, 104); + txtRent.Name = "txtRent"; + txtRent.ReadOnly = true; + txtRent.Size = new Size(250, 45); + txtRent.TabIndex = 169; + // + // txtDeposit + // + txtDeposit.Font = new Font("Noto Sans SC", 12F); + txtDeposit.Location = new Point(474, 157); + txtDeposit.Name = "txtDeposit"; + txtDeposit.ReadOnly = true; + txtDeposit.Size = new Size(250, 45); + txtDeposit.TabIndex = 170; + // + // txtCustomerName + // + txtCustomerName.Font = new Font("Noto Sans SC", 12F); + txtCustomerName.Location = new Point(474, 210); + txtCustomerName.Name = "txtCustomerName"; + txtCustomerName.ReadOnly = true; + txtCustomerName.Size = new Size(250, 45); + txtCustomerName.TabIndex = 171; + // + // txtCustomerLevel + // + txtCustomerLevel.Font = new Font("Noto Sans SC", 12F); + txtCustomerLevel.Location = new Point(474, 263); + txtCustomerLevel.Name = "txtCustomerLevel"; + txtCustomerLevel.ReadOnly = true; + txtCustomerLevel.Size = new Size(250, 45); + txtCustomerLevel.TabIndex = 172; + // + // txtCustomerTel + // + txtCustomerTel.Font = new Font("Noto Sans SC", 12F); + txtCustomerTel.Location = new Point(93, 263); + txtCustomerTel.Name = "txtCustomerTel"; + txtCustomerTel.ReadOnly = true; + txtCustomerTel.Size = new Size(250, 45); + txtCustomerTel.TabIndex = 173; + // + // txtCustomerNo + // + txtCustomerNo.Font = new Font("Noto Sans SC", 12F); + txtCustomerNo.Location = new Point(93, 210); + txtCustomerNo.Name = "txtCustomerNo"; + txtCustomerNo.Size = new Size(250, 45); + txtCustomerNo.TabIndex = 174; + txtCustomerNo.Validated += txtCustoNo_Validated; + // + // txtRoomType + // + txtRoomType.Font = new Font("Noto Sans SC", 12F); + txtRoomType.Location = new Point(474, 51); + txtRoomType.Name = "txtRoomType"; + txtRoomType.ReadOnly = true; + txtRoomType.Size = new Size(250, 45); + txtRoomType.TabIndex = 175; + // // FrmCheckIn // AutoScaleMode = AutoScaleMode.None; BackColor = Color.FromArgb(235, 243, 255); - ClientSize = new Size(861, 384); + ClientSize = new Size(731, 379); ControlBox = false; + Controls.Add(txtRoomType); + Controls.Add(txtCustomerNo); + Controls.Add(txtCustomerTel); + Controls.Add(txtCustomerLevel); + Controls.Add(txtCustomerName); Controls.Add(txtDeposit); - Controls.Add(label1); - Controls.Add(txtCustoNo); - Controls.Add(txtCustoName); + Controls.Add(txtRent); Controls.Add(txtRoomPosition); + Controls.Add(txtState); + Controls.Add(txtRoomNo); + Controls.Add(btnCancel); + Controls.Add(btnCheckIn); + Controls.Add(ucWindowHeader1); + Controls.Add(label1); Controls.Add(label18); Controls.Add(label3); Controls.Add(label16); - Controls.Add(txtType); - Controls.Add(txtCustoTel); - Controls.Add(txtRoomNo); Controls.Add(label14); - Controls.Add(txtState); - Controls.Add(txtCustoType); - Controls.Add(txtMoney); Controls.Add(label12); Controls.Add(label13); Controls.Add(label15); Controls.Add(label19); Controls.Add(label20); Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + FormBorderStyle = FormBorderStyle.None; Icon = (Icon)resources.GetObject("$this.Icon"); - IsForbidAltF4 = true; Margin = new Padding(4, 5, 4, 5); Name = "FrmCheckIn"; - ShowTitleIcon = true; - Style = Sunny.UI.UIStyle.Custom; + Resizable = false; + StartPosition = FormStartPosition.CenterScreen; Text = "房间入住"; - ZoomScaleRect = new Rectangle(15, 15, 861, 384); - ButtonOkClick += FrmCheckIn_ButtonOkClick; - ButtonCancelClick += FrmCheckIn_ButtonCancelClick; Load += FrmCheckIn_Load; - Controls.SetChildIndex(label20, 0); - Controls.SetChildIndex(label19, 0); - Controls.SetChildIndex(label15, 0); - Controls.SetChildIndex(label13, 0); - Controls.SetChildIndex(label12, 0); - Controls.SetChildIndex(txtMoney, 0); - Controls.SetChildIndex(txtCustoType, 0); - Controls.SetChildIndex(txtState, 0); - Controls.SetChildIndex(label14, 0); - Controls.SetChildIndex(txtRoomNo, 0); - Controls.SetChildIndex(txtCustoTel, 0); - Controls.SetChildIndex(txtType, 0); - Controls.SetChildIndex(label16, 0); - Controls.SetChildIndex(label3, 0); - Controls.SetChildIndex(label18, 0); - Controls.SetChildIndex(txtRoomPosition, 0); - Controls.SetChildIndex(txtCustoName, 0); - Controls.SetChildIndex(txtCustoNo, 0); - Controls.SetChildIndex(label1, 0); - Controls.SetChildIndex(txtDeposit, 0); - Controls.SetChildIndex(pnlBtm, 0); - pnlBtm.ResumeLayout(false); ResumeLayout(false); PerformLayout(); } #endregion - private Sunny.UI.UITextBox txtRoomPosition; private System.Windows.Forms.Label label3; - private Sunny.UI.UIComboBox txtType; - private Sunny.UI.UITextBox txtRoomNo; - private Sunny.UI.UITextBox txtState; - private Sunny.UI.UITextBox txtMoney; private System.Windows.Forms.Label label13; private System.Windows.Forms.Label label15; private System.Windows.Forms.Label label19; private System.Windows.Forms.Label label20; - private Sunny.UI.UITextBox txtCustoNo; - private Sunny.UI.UITextBox txtCustoName; private System.Windows.Forms.Label label18; private System.Windows.Forms.Label label16; - private Sunny.UI.UITextBox txtCustoTel; private System.Windows.Forms.Label label14; - private Sunny.UI.UITextBox txtCustoType; private System.Windows.Forms.Label label12; - private Sunny.UI.UITextBox txtDeposit; private System.Windows.Forms.Label label1; + private ucWindowHeader ucWindowHeader1; + private AntdUI.Button btnCheckIn; + private AntdUI.Button btnCancel; + private AntdUI.Input txtRoomNo; + private AntdUI.Input txtState; + private AntdUI.Input txtRoomPosition; + private AntdUI.Input txtRent; + private AntdUI.Input txtDeposit; + private AntdUI.Input txtCustomerName; + private AntdUI.Input txtCustomerLevel; + private AntdUI.Input txtCustomerTel; + private AntdUI.Input txtCustomerNo; + private AntdUI.Input txtRoomType; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.cs similarity index 61% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.cs index 86df5cfc85de19fd54f631fc336269fe75833cc3..92453d0af46bda937da9c447c68333169e898107 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.cs @@ -23,20 +23,23 @@ */ +using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Core; using jvncorelib.EntityLib; -using Sunny.UI; using System.Transactions; namespace EOM.TSHotelManagement.FormUI { - public partial class FrmCheckIn : UIEditForm + public partial class FrmCheckIn : Window { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmCheckIn)); public FrmCheckIn() { InitializeComponent(); + + ucWindowHeader1.ApplySettingsWithoutMinimize("入住房间", string.Empty, (Image)resources.GetObject("FrmCheckIn.Icon")!); } ResponseMsg result = new ResponseMsg(); @@ -50,51 +53,25 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Room_SelectRoomByRoomNo, pairs); var response = HttpHelper.JsonToModel>(result.message!); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Success == false) { - UIMessageTip.ShowError($"{ApiConstants.Room_SelectRoomByRoomNo}+接口服务异常，请提交issue"); + NotificationService.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.Success == false) { - UIMessageTip.ShowError($"{ApiConstants.RoomType_SelectRoomTypeByRoomNo}+接口服务异常，请提交issue"); + NotificationService.ShowError($"{ApiConstants.RoomType_SelectRoomTypeByRoomNo}+接口服务异常，请提交issue"); return; } - ReadRoomTypeOutputDto t = roomTypeResponse.Source; - txtType.Text = t.RoomTypeName; - txtMoney.Text = r.RoomRent.ToString(); + ReadRoomTypeOutputDto t = roomTypeResponse.Data; + txtRoomType.Text = t.RoomTypeName; + txtRent.Text = r.RoomRent.ToString(); txtRoomPosition.Text = r.RoomLocation; txtState.Text = r.RoomState; txtDeposit.Text = r.RoomDeposit.ToString(); - pairs = new Dictionary - { - { nameof(ReadCustomerInputDto.IgnorePaging) , "true" }, - { nameof(ReadCustomerInputDto.IsDelete) , "0" } - }; - result = HttpHelper.Request(ApiConstants.Customer_SelectCustomers, pairs); - var customerResponse = HttpHelper.JsonToModel>(result.message!); - if (customerResponse.StatusCode != StatusCodeConstants.Success) - { - UIMessageTip.ShowError($"{ApiConstants.Customer_SelectCustomers}+接口服务异常，请提交issue"); - return; - } - var custoList = customerResponse.listSource; - if (custoList != null && custoList != null) - { - var ctos = custoList.Select(custo => custo.CustomerNumber).ToArray(); - txtCustoNo.AutoCompleteCustomSource.AddRange(ctos); - } - try - { - txtCustoNo.Text = ""; - } - catch - { - txtCustoNo.Text = ucRoom.rm_CustoNo; - } } private void txtCustoNo_Validated(object sender, EventArgs e) @@ -105,7 +82,7 @@ namespace EOM.TSHotelManagement.FormUI } catch (Exception ex) { - UIMessageTip.ShowError($"接口服务异常，请提交issue: {ex.Message}", 3000); + NotificationService.ShowError($"接口服务异常，请提交issue: {ex.Message}"); } } @@ -119,26 +96,26 @@ 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.Success == false) { - UIMessageTip.ShowError($"{ApiConstants.VipLevelRule_SelectVipRuleList}+接口服务异常，请提交issue: {response.Message}", 3000); + NotificationService.ShowError($"{ApiConstants.VipLevelRule_SelectVipRuleList}+接口服务异常，请提交issue: {response.Message}"); } - var listVipRule = response.listSource + var listVipRule = response.Data.Items .OrderBy(a => a.RuleValue) .Distinct() .ToList(); // 查询用户消费记录 - var user = new Dictionary { { nameof(ReadSpendInputDto.CustomerNumber), txtCustoNo.Text.Trim() } }; + var user = new Dictionary { { nameof(ReadSpendInputDto.CustomerNumber), txtCustomerNo.Text.Trim() } }; result = HttpHelper.Request(ApiConstants.Spend_SeletHistorySpendInfoAll, user); var customerSpends = HttpHelper.JsonToModel>(result.message!); - if (customerSpends.StatusCode != StatusCodeConstants.Success) + if (customerSpends.Success == false) { - UIMessageTip.ShowError($"{ApiConstants.Spend_SeletHistorySpendInfoAll}+接口服务异常，请提交issue: {response.Message}", 3000); + NotificationService.ShowError($"{ApiConstants.Spend_SeletHistorySpendInfoAll}+接口服务异常，请提交issue: {response.Message}"); } - var listCustoSpend = customerSpends.listSource; + var listCustoSpend = customerSpends.Data.Items; if (!listCustoSpend.IsNullOrEmpty()) { var spendAmount = listCustoSpend.Sum(a => a.ConsumptionAmount); @@ -151,9 +128,10 @@ 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 customer = new UpdateCustomerInputDto { CustomerNumber = txtCustomerNo.Text.Trim(), CustomerType = new_type }; + result = HttpHelper.Request(ApiConstants.Customer_UpdCustomerTypeByCustoNo, customer.ModelToJson()); + var updateResponse = HttpHelper.JsonToModel(result.message!); + if (updateResponse.Success == false) { throw new Exception($"{ApiConstants.Customer_UpdCustomerTypeByCustoNo}+接口服务异常"); } @@ -161,34 +139,34 @@ namespace EOM.TSHotelManagement.FormUI } // 获取用户卡片信息 - if (!string.IsNullOrEmpty(txtCustoNo.Text)) + if (!string.IsNullOrEmpty(txtCustomerNo.Text)) { - user = new Dictionary { { nameof(ReadCustomerInputDto.CustomerNumber), txtCustoNo.Text.Trim() } }; + user = new Dictionary { { nameof(ReadCustomerInputDto.CustomerNumber), txtCustomerNo.Text.Trim() } }; result = HttpHelper.Request(ApiConstants.Customer_SelectCustoByInfo, user); var customerResponse = HttpHelper.JsonToModel>(result.message!); - if (customerResponse.StatusCode != StatusCodeConstants.Success) + if (customerResponse.Success == false) { throw new Exception($"{ApiConstants.Customer_SelectCustoByInfo}+接口服务异常"); } - var custo = customerResponse.Source; - txtCustoName.Text = custo?.CustomerNumber ?? ""; - txtCustoTel.Text = custo?.CustomerPhoneNumber ?? ""; - txtCustoType.Text = custo?.CustomerTypeName ?? ""; + var custo = customerResponse.Data; + txtCustomerName.Text = custo?.CustomerName ?? ""; + txtCustomerTel.Text = custo?.CustomerPhoneNumber ?? ""; + txtCustomerLevel.Text = custo?.CustomerTypeName ?? ""; } } private void FrmCheckIn_ButtonOkClick(object sender, EventArgs e) { - var user = new Dictionary { { nameof(ReadCustomerInputDto.CustomerNumber), txtCustoNo.Text.Trim() } }; + var user = new Dictionary { { nameof(ReadCustomerInputDto.CustomerNumber), txtCustomerNo.Text.Trim() } }; result = HttpHelper.Request(ApiConstants.Customer_SelectCustoByInfo, user); var customerResponse = HttpHelper.JsonToModel>(result.message!); - if (customerResponse.StatusCode != StatusCodeConstants.Success) + if (customerResponse.Success == false) { throw new Exception($"{ApiConstants.Customer_SelectCustoByInfo}+接口服务异常"); } - var custo = customerResponse.Source; + var custo = customerResponse.Data; if (!custo.IsNullOrEmpty()) { using (TransactionScope scope = new TransactionScope()) @@ -196,21 +174,21 @@ namespace EOM.TSHotelManagement.FormUI UpdateRoomInputDto r = new UpdateRoomInputDto() { LastCheckInTime = DateOnly.FromDateTime(DateTime.Now), - CustomerNumber = txtCustoNo.Text, + CustomerNumber = txtCustomerNo.Text, RoomStateId = (int)RoomState.Occupied, RoomNumber = txtRoomNo.Text, - DataChgUsr = LoginInfo.WorkerNo + DataChgUsr = LoginInfo.WorkerNo, + DataChgDate = DateTime.Now }; - result = HttpHelper.Request(ApiConstants.Room_UpdateRoomInfo, HttpHelper.ModelToJson(r)); - var response = HttpHelper.JsonToModel(result.message!); - if (response.StatusCode != StatusCodeConstants.Success) + result = HttpHelper.Request(ApiConstants.Room_UpdateRoomInfo, r.ModelToJson()); + var response = HttpHelper.JsonToModel(result.message!); + if (response.Success == false) { - UIMessageTip.ShowError($"{ApiConstants.Room_UpdateRoomInfo}+接口服务异常，请提交issue"); - UIMessageBox.Show("登记入住失败！", "登记提示", UIStyle.Red); + NotificationService.ShowError($"{ApiConstants.Room_UpdateRoomInfo}+接口服务异常，请提交issue"); return; } - UIMessageBox.Show("登记入住成功！", "登记提示", UIStyle.Green); - txtCustoNo.Text = ""; + NotificationService.ShowSuccess("登记入住成功！"); + txtCustomerNo.Text = ""; FrmRoomManager.Reload(""); FrmRoomManager._RefreshRoomCount(); #region 获取添加操作日志所需的信息 @@ -223,11 +201,11 @@ namespace EOM.TSHotelManagement.FormUI } else { - UIMessageBox.Show("所选客户不存在！", "系统提示", UIStyle.Red); + NotificationService.ShowError("所选客户不存在！"); } } - private void FrmCheckIn_ButtonCancelClick(object sender, EventArgs e) + private void btnCancel_Click(object sender, EventArgs e) { this.Close(); } diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.resx similarity index 100% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.resx rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.resx diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.Designer.cs new file mode 100644 index 0000000000000000000000000000000000000000..e7f08cd331edb64c31955f213373ac7aa39a321e --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.Designer.cs @@ -0,0 +1,382 @@ +namespace EOM.TSHotelManagement.FormUI +{ + partial class FrmCheckOutDetail + { + /// + /// 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(FrmCheckOutDetail)); + dtpCheckTime = new AntdUI.Input(); + label24 = new Label(); + txtRoomNo = new AntdUI.Input(); + label27 = new Label(); + CustoName = new AntdUI.Input(); + label28 = new Label(); + CustoNo = new AntdUI.Input(); + lblChange = new Label(); + btnBalance = new AntdUI.Button(); + label25 = new Label(); + txtReceipts = new AntdUI.Input(); + label21 = new Label(); + btnPg = new AntdUI.Pagination(); + lblVIP = new Label(); + dgvSpendList = new AntdUI.Table(); + label29 = new Label(); + lblGetReceipts = new Label(); + lblVIPPrice = new Label(); + lable00 = new Label(); + label18 = new Label(); + label1 = new Label(); + label15 = new Label(); + lblDay = new Label(); + label17 = new Label(); + ucWindowHeader1 = new ucWindowHeader(); + SuspendLayout(); + // + // dtpCheckTime + // + dtpCheckTime.Font = new Font("Noto Sans SC", 12F); + dtpCheckTime.Location = new Point(408, 51); + dtpCheckTime.Name = "dtpCheckTime"; + dtpCheckTime.PlaceholderText = ""; + dtpCheckTime.ReadOnly = true; + dtpCheckTime.Size = new Size(180, 42); + dtpCheckTime.TabIndex = 185; + // + // label24 + // + label24.AutoSize = true; + label24.Font = new Font("Noto Sans SC", 14.2499981F); + label24.Location = new Point(18, 61); + label24.Name = "label24"; + label24.Size = new Size(85, 19); + label24.TabIndex = 172; + label24.Text = "客户编号"; + // + // txtRoomNo + // + txtRoomNo.Font = new Font("Noto Sans SC", 12F); + txtRoomNo.Location = new Point(408, 102); + txtRoomNo.Name = "txtRoomNo"; + txtRoomNo.PlaceholderText = ""; + txtRoomNo.ReadOnly = true; + txtRoomNo.Size = new Size(180, 42); + txtRoomNo.TabIndex = 184; + // + // label27 + // + label27.AutoSize = true; + label27.Font = new Font("Noto Sans SC", 14.2499981F); + label27.Location = new Point(323, 113); + label27.Name = "label27"; + label27.Size = new Size(85, 19); + label27.TabIndex = 175; + label27.Text = "房间编号"; + // + // CustoName + // + CustoName.Font = new Font("Noto Sans SC", 12F); + CustoName.Location = new Point(103, 102); + CustoName.Name = "CustoName"; + CustoName.PlaceholderText = ""; + CustoName.ReadOnly = true; + CustoName.Size = new Size(214, 42); + CustoName.TabIndex = 183; + // + // label28 + // + label28.AutoSize = true; + label28.Font = new Font("Noto Sans SC", 14.2499981F); + label28.Location = new Point(323, 61); + label28.Name = "label28"; + label28.Size = new Size(85, 19); + label28.TabIndex = 174; + label28.Text = "入住时间"; + // + // CustoNo + // + CustoNo.Font = new Font("Noto Sans SC", 12F); + CustoNo.Location = new Point(103, 51); + CustoNo.Name = "CustoNo"; + CustoNo.PlaceholderText = ""; + CustoNo.ReadOnly = true; + CustoNo.Size = new Size(214, 42); + CustoNo.TabIndex = 182; + // + // lblChange + // + lblChange.AutoSize = true; + lblChange.Font = new Font("Noto Sans SC", 11.9999981F); + lblChange.Location = new Point(605, 445); + lblChange.Name = "lblChange"; + lblChange.Size = new Size(38, 17); + lblChange.TabIndex = 167; + lblChange.Text = "0.00"; + // + // btnBalance + // + btnBalance.Font = new Font("Noto Sans SC", 12F); + btnBalance.Location = new Point(544, 533); + btnBalance.Name = "btnBalance"; + btnBalance.Size = new Size(132, 48); + btnBalance.TabIndex = 181; + btnBalance.Text = "结 算"; + btnBalance.Type = AntdUI.TTypeMini.Primary; + btnBalance.Click += btnBalance_Click; + // + // label25 + // + label25.AutoSize = true; + label25.Font = new Font("Noto Sans SC", 11.9999981F); + label25.Location = new Point(323, 444); + label25.Name = "label25"; + label25.Size = new Size(88, 17); + label25.TabIndex = 168; + label25.Text = "会员折扣："; + // + // txtReceipts + // + txtReceipts.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + txtReceipts.HandCursor = Cursors.IBeam; + txtReceipts.Location = new Point(404, 468); + txtReceipts.Name = "txtReceipts"; + txtReceipts.PlaceholderText = ""; + txtReceipts.Size = new Size(111, 36); + txtReceipts.TabIndex = 180; + txtReceipts.TextChanged += txtReceipts_TextChanged; + // + // label21 + // + label21.AutoSize = true; + label21.Font = new Font("Noto Sans SC", 11.9999981F); + label21.Location = new Point(517, 445); + label21.Name = "label21"; + label21.Size = new Size(88, 17); + label21.TabIndex = 166; + label21.Text = "找 零："; + // + // btnPg + // + btnPg.Font = new Font("Noto Sans SC", 9F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnPg.Location = new Point(12, 365); + btnPg.Name = "btnPg"; + btnPg.PageSize = 15; + btnPg.ShowSizeChanger = true; + btnPg.Size = new Size(654, 32); + btnPg.TabIndex = 179; + btnPg.Total = 1000000; + btnPg.ValueChanged += btnPg_ValueChanged; + btnPg.ShowTotalChanged += btnPg_ShowTotalChanged; + // + // lblVIP + // + lblVIP.AutoSize = true; + lblVIP.Font = new Font("Noto Sans SC", 11.9999981F); + lblVIP.Location = new Point(412, 444); + lblVIP.Name = "lblVIP"; + lblVIP.Size = new Size(72, 17); + lblVIP.TabIndex = 169; + lblVIP.Text = "不 打 折"; + // + // dgvSpendList + // + dgvSpendList.Font = new Font("Noto Sans SC", 9F, FontStyle.Regular, GraphicsUnit.Point, 0); + dgvSpendList.Gap = 12; + dgvSpendList.Location = new Point(12, 148); + dgvSpendList.Name = "dgvSpendList"; + dgvSpendList.Size = new Size(654, 208); + dgvSpendList.TabIndex = 178; + dgvSpendList.Text = "table1"; + // + // label29 + // + label29.AutoSize = true; + label29.Font = new Font("Noto Sans SC", 14.2499981F, FontStyle.Regular, GraphicsUnit.Point, 0); + label29.Location = new Point(591, 61); + label29.Name = "label29"; + label29.Size = new Size(85, 19); + label29.TabIndex = 176; + label29.Text = "已住天数"; + // + // lblGetReceipts + // + lblGetReceipts.AutoSize = true; + lblGetReceipts.Font = new Font("Noto Sans SC", 11.9999981F); + lblGetReceipts.Location = new Point(413, 412); + lblGetReceipts.Name = "lblGetReceipts"; + lblGetReceipts.Size = new Size(38, 17); + lblGetReceipts.TabIndex = 165; + lblGetReceipts.Text = "0.00"; + // + // lblVIPPrice + // + lblVIPPrice.AutoSize = true; + lblVIPPrice.Font = new Font("Noto Sans SC", 11.9999981F); + lblVIPPrice.Location = new Point(605, 413); + lblVIPPrice.Name = "lblVIPPrice"; + lblVIPPrice.Size = new Size(38, 17); + lblVIPPrice.TabIndex = 171; + lblVIPPrice.Text = "0.00"; + // + // lable00 + // + lable00.AutoSize = true; + lable00.Font = new Font("Noto Sans SC", 11.9999981F); + lable00.Location = new Point(517, 413); + lable00.Name = "lable00"; + lable00.Size = new Size(88, 17); + lable00.TabIndex = 170; + lable00.Text = "应付金额："; + // + // label18 + // + label18.AutoSize = true; + label18.Font = new Font("Noto Sans SC", 11.9999981F); + label18.Location = new Point(323, 412); + label18.Name = "label18"; + label18.Size = new Size(88, 17); + label18.TabIndex = 164; + label18.Text = "消费总额："; + // + // label1 + // + label1.AutoSize = true; + label1.Font = new Font("Noto Sans SC", 14.2499981F); + label1.Location = new Point(18, 113); + label1.Name = "label1"; + label1.Size = new Size(85, 19); + label1.TabIndex = 173; + label1.Text = "客户姓名"; + // + // label15 + // + label15.AutoSize = true; + label15.Font = new Font("Noto Sans SC Medium", 10.499999F, FontStyle.Regular, GraphicsUnit.Point, 0); + label15.ForeColor = Color.Red; + label15.Location = new Point(12, 567); + label15.Name = "label15"; + label15.Size = new Size(251, 14); + label15.TabIndex = 162; + label15.Text = "Tips：请提醒客人不要忘记带齐行李哦~"; + // + // lblDay + // + lblDay.AutoSize = true; + lblDay.Font = new Font("Noto Sans SC", 14.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + lblDay.Location = new Point(608, 112); + lblDay.Name = "lblDay"; + lblDay.Size = new Size(45, 20); + lblDay.TabIndex = 177; + lblDay.Text = "Null"; + // + // label17 + // + label17.AutoSize = true; + label17.Font = new Font("Noto Sans SC", 11.9999981F); + label17.Location = new Point(323, 479); + label17.Name = "label17"; + label17.Size = new Size(88, 17); + label17.TabIndex = 163; + label17.Text = "实收金额："; + // + // ucWindowHeader1 + // + ucWindowHeader1.Location = new Point(-1, 0); + ucWindowHeader1.Name = "ucWindowHeader1"; + ucWindowHeader1.Size = new Size(690, 35); + ucWindowHeader1.TabIndex = 186; + // + // FrmCheckOutDetail + // + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.FromArgb(235, 243, 255); + ClientSize = new Size(689, 590); + Controls.Add(ucWindowHeader1); + Controls.Add(dtpCheckTime); + Controls.Add(label24); + Controls.Add(txtRoomNo); + Controls.Add(label27); + Controls.Add(CustoName); + Controls.Add(label28); + Controls.Add(CustoNo); + Controls.Add(lblChange); + Controls.Add(btnBalance); + Controls.Add(label25); + Controls.Add(txtReceipts); + Controls.Add(label21); + Controls.Add(btnPg); + Controls.Add(lblVIP); + Controls.Add(dgvSpendList); + Controls.Add(label29); + Controls.Add(lblGetReceipts); + Controls.Add(lblVIPPrice); + Controls.Add(lable00); + Controls.Add(label18); + Controls.Add(label1); + Controls.Add(label15); + Controls.Add(lblDay); + Controls.Add(label17); + FormBorderStyle = FormBorderStyle.None; + Icon = (Icon)resources.GetObject("$this.Icon"); + Name = "FrmCheckOutDetail"; + Resizable = false; + StartPosition = FormStartPosition.CenterScreen; + Text = "FrmCheckOutDetail"; + Load += FrmCheckOutDetail_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private AntdUI.Input dtpCheckTime; + private Label label24; + private AntdUI.Input txtRoomNo; + private Label label27; + private AntdUI.Input CustoName; + private Label label28; + private AntdUI.Input CustoNo; + private Label lblChange; + private AntdUI.Button btnBalance; + private Label label25; + private AntdUI.Input txtReceipts; + private Label label21; + private AntdUI.Pagination btnPg; + private Label lblVIP; + private AntdUI.Table dgvSpendList; + private Label label29; + private Label lblGetReceipts; + private Label lblVIPPrice; + private Label lable00; + private Label label18; + private Label label1; + private Label label15; + private Label lblDay; + private Label label17; + private ucWindowHeader ucWindowHeader1; + } +} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.cs similarity index 38% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.cs index 656bd327df85782720254969bb530a41e2b2faf1..74ab54aad52449307e96180e4e8a8f234e576fa5 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.cs @@ -1,102 +1,33 @@ -/* - * MIT License - *Copyright (c) 2021 易开元(EOM) - - *Permission is hereby granted, free of charge, to any person obtaining a copy - *of this software and associated documentation files (the "Software"), to deal - *in the Software without restriction, including without limitation the rights - *to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - *copies of the Software, and to permit persons to whom the Software is - *furnished to do so, subject to the following conditions: - - *The above copyright notice and this permission notice shall be included in all - *copies or substantial portions of the Software. - - *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - *IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - *FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - *AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - *LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - *OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - *SOFTWARE. - * - */ - +using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Shared; -using Sunny.UI; +using jvncorelib.EntityLib; +using System.Data; namespace EOM.TSHotelManagement.FormUI { - public partial class FrmCheckOutForm : UIForm + public partial class FrmCheckOutDetail : Window { - public static string co_CustoNo; - public static string co_RoomNo; - public static string co_CustoName; - public static string co_CustoBirthday; - public static string co_CustoSex; - public static string co_CustoTel; - public static string co_CustoPassportType; - public static string co_CustoAddress; - public static string co_CustoType; - public static string co_CustoID; - public static CreateEnergyManagementInputDto w; - private LoadingProgress _loadingProgress; - - public FrmCheckOutForm(LoadingProgress loadingProgress) + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmCheckOutDetail)); + public FrmCheckOutDetail() { InitializeComponent(); - _loadingProgress = loadingProgress; + + ucWindowHeader1.ApplySettingsWithoutMinimize("房间结算", string.Empty, (Image)resources.GetObject("FrmCheckOutDetail.Icon")!); } ResponseMsg result = null; Dictionary dic = null; + public static CreateEnergyManagementInputDto w; + public static decimal TotalConsumptionAmount = 0M; - #region 记录鼠标和窗体坐标的方法 - private Point mouseOld;//鼠标旧坐标 - private Point formOld;//窗体旧坐标 - #endregion - - #region 记录移动的窗体坐标 - private void FrmCheckOutForm_MouseDown(object sender, MouseEventArgs e) - { - formOld = this.Location; - mouseOld = MousePosition; - } - #endregion - - #region 记录窗体移动的坐标 - private void FrmCheckOutForm_MouseMove(object sender, MouseEventArgs e) - { - if (e.Button == MouseButtons.Left) - { - Point mouseNew = MousePosition; - int moveX = mouseNew.X - mouseOld.X; - int moveY = mouseNew.Y - mouseOld.Y; - this.Location = new Point(formOld.X + moveX, formOld.Y + moveY); - } - } - #endregion - - #region 窗体加载事件 - private void FrmCheckOutForm_Load(object sender, EventArgs e) + private void FrmCheckOutDetail_Load(object sender, EventArgs e) { - #region 加载客户类型信息 - result = HttpHelper.Request(ApiConstants.Base_SelectCustoTypeAllCanUse); - var customerTypes = HttpHelper.JsonToModel>(result.message); - if (customerTypes.StatusCode != StatusCodeConstants.Success) - { - UIMessageBox.ShowError("SelectCustoTypeAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - List lstSourceGrid = customerTypes.listSource; - #endregion - decimal sum = 0; - txtCustomerNumber.Text = ucRoom.rm_CustoNo; CustoNo.Text = ucRoom.rm_CustoNo; txtRoomNo.Text = ucRoom.rm_RoomNo; + CustoName.Text = ucRoom.co_CustoName; dic = new Dictionary() { @@ -105,21 +36,21 @@ namespace EOM.TSHotelManagement.FormUI result = HttpHelper.Request(ApiConstants.Room_SelectRoomByRoomNo, dic); var roomInfo = HttpHelper.JsonToModel>(result.message); - if (roomInfo.StatusCode != StatusCodeConstants.Success) + if (roomInfo.Success == false) { - UIMessageBox.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } - ReadRoomOutputDto room = roomInfo.Source; + ReadRoomOutputDto room = roomInfo.Data; if (room.LastCheckInTime == null) { - dtpCheckTime.Text = Convert.ToDateTime(DateTime.Now).ToString("yyyy-MM-dd"); + dtpCheckTime.Text = Convert.ToDateTime(DateTime.Now).ToString("yyyy/MM/dd"); } else { - dtpCheckTime.Text = Convert.ToDateTime(room.LastCheckInTime).ToString("yyyy-MM-dd"); + dtpCheckTime.Text = Convert.ToDateTime(room.LastCheckInTime).ToString("yyyy/MM/dd"); } dic = new Dictionary() { @@ -127,54 +58,21 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Room_DayByRoomNo, dic); var stayDays = HttpHelper.JsonToModel>(result.message); - if (stayDays.StatusCode != 200) + if (stayDays.Success == false) { - UIMessageBox.ShowError("DayByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.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) - }; - - #region 加载客户信息 - dic = new Dictionary() - { - { nameof(ReadCustomerInputDto.CustomerNumber),CustoNo.Text.ToString() } + PowerUsage = Convert.ToDecimal(Convert.ToInt32(stayDays.Data.StayDays) * 3 * 1), + WaterUsage = Convert.ToDecimal(Convert.ToDouble(stayDays.Data.StayDays) * 80 * 0.002) }; - result = HttpHelper.Request(ApiConstants.Customer_SelectCustoByInfo, dic); - SingleOutputDto customer = HttpHelper.JsonToModel>(result.message); - if (customer?.StatusCode != StatusCodeConstants.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; - } - catch - { - - - } - - - #endregion #region 加载消费信息 @@ -195,116 +93,124 @@ namespace EOM.TSHotelManagement.FormUI #endregion - #region 加载水电费信息 - dgvWti.Spin("正在加载中...", config => + dic = new Dictionary() { - TableComHelper tableComHelper = new TableComHelper(); - dgvWti.Columns = tableComHelper.ConvertToAntdColumns(tableComHelper.GenerateDataColumns()); - dgvWti.DataSource = GetEnergyPageData(); - }, () => + { nameof(ReadCustomerInputDto.CustomerNumber), CustoNo.Text.Trim() } + }; + var request = HttpHelper.Request(ApiConstants.Customer_SelectCustoByInfo, dic); + var customerResponse = HttpHelper.JsonToModel>(request.message); + if (customerResponse.Success == false) { - System.Diagnostics.Debug.WriteLine("加载结束"); - }); - #endregion - - var customerType = lstSourceGrid.SingleOrDefault(a => a.CustomerTypeName == txtCustomerType.Text); + NotificationService.ShowError($"{ApiConstants.Spend_SumConsumptionAmount}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + var customer = customerResponse.Data; - //计算消费总额 dic = new Dictionary() { - { nameof(ReadSpendInputDto.RoomNumber), txtRoomNo.Text.Trim() }, - { nameof(ReadSpendInputDto.CustomerNumber), txtCustomerNumber.Text.Trim() }, + { nameof(ReadCustoTypeInputDto.CustomerType), customer.CustomerType.ToString() } }; - result = HttpHelper.Request(ApiConstants.Spend_SumConsumptionAmount, dic); - var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + request = HttpHelper.Request(ApiConstants.CustoType_SelectCustoTypeByTypeId, dic); + var customerTypeResponse = HttpHelper.JsonToModel>(request.message); + if (customerTypeResponse.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Spend_SumConsumptionAmount}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Spend_SumConsumptionAmount}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - decimal total = response.Source.ConsumptionAmount; + + var customerType = customerTypeResponse.Data; + + //计算消费总额 + //dic = new Dictionary() + //{ + // { nameof(ReadSpendInputDto.RoomNumber), txtRoomNo.Text.Trim() }, + // { nameof(ReadSpendInputDto.CustomerNumber), CustoNo.Text.Trim() }, + //}; + //result = HttpHelper.Request(ApiConstants.Spend_SumConsumptionAmount, dic); + //var spendResponse = HttpHelper.JsonToModel>(result.message); + //if (spendResponse.Success == false) + //{ + // NotificationService.ShowError($"{ApiConstants.Spend_SumConsumptionAmount}+接口服务异常，请提交Issue或尝试更新版本！"); + // return; + //} + decimal total = TotalConsumptionAmount; 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%)"; - Refresh(); + lblVIP.Text = (discount < 1M) ? DiscountHelper.ToZheString(customerType.Discount) : "无折扣(100%)"; } - #endregion - #region 实收金额文本框值改变时事件 - private void txtReceipts_TextChanged(object sender, EventArgs e) + object GetPageData(int current, int pageSize, ref int totalCount) { - if (txtReceipts.Text != "") + string RoomNo = txtRoomNo.Text; + dic = new Dictionary() { - try - { - double receipt = Convert.ToDouble(Convert.ToDecimal(txtReceipts.Text)); - double vipPrice = Convert.ToDouble(Convert.ToDecimal(lblVIPPrice.Text)); - lblChange.Text = Decimal.Parse((receipt - vipPrice).ToString()).ToString("#,##0.00"); - } - catch - { - UIMessageBox.Show("非法输入，请重新输入！", "系统提示", UIStyle.Orange); - txtReceipts.Clear(); - txtReceipts.Focus(); - return; - } - } - else + { nameof(ReadSpendInputDto.CustomerNumber) , CustoNo.Text.Trim() }, + { nameof(ReadSpendInputDto.SettlementStatus) , ConsumptionConstant.UnSettle.Code }, + { nameof(ReadSpendInputDto.RoomNumber) , RoomNo }, + { nameof(ReadAdministratorInputDto.IgnorePaging) , "true" } + }; + result = HttpHelper.Request(ApiConstants.Spend_SelectSpendByRoomNo, dic); + var spendInfo = HttpHelper.JsonToModel>(result.message); + if (spendInfo.Success == false) { - lblChange.Text = "-" + lblGetReceipts.Text; - return; + NotificationService.ShowError($"{ApiConstants.Spend_SelectSpendByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); } + + List spends = spendInfo.Data.Items; + totalCount = spendInfo.Data.TotalCount; + var listTableData = new List(); + + spends = spends.OrderBy(a => a.SpendNumber).ToList(); + + TableComHelper tableComHelper = new TableComHelper(); + listTableData = tableComHelper.ConvertToAntdItems(spends); + + TotalConsumptionAmount = spends.Count() == 0 ? 0 : spends.DefaultIfEmpty().Sum(a => a!.ConsumptionAmount); + + return listTableData; } - #endregion - #region 结算按钮点击事件 private void btnBalance_Click(object sender, EventArgs e) { if (!string.IsNullOrEmpty(txtReceipts.Text) && Convert.ToDecimal(txtReceipts.Text) > Convert.ToDecimal(lblVIPPrice.Text))//判断实收金额是否为空以及是否小于应收金额 { - result = HttpHelper.Request(ApiConstants.Room_CheckoutRoom, - HttpHelper.ModelToJson(new CheckoutRoomDto - { - RoomNumber = txtRoomNo.Text.Trim(), - CustomerNumber = txtCustomerNumber.Text.Trim(), - DataChgDate = DateTime.Now, - DataChgUsr = LoginInfo.WorkerNo, - ElectricityUsage = w.PowerUsage, - WaterUsage = w.WaterUsage - })); - var response = HttpHelper.JsonToModel(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + var model = new CheckoutRoomDto { - UIMessageBox.ShowError($"{ApiConstants.Room_CheckoutRoom}+接口服务异常，请提交Issue或尝试更新版本！"); + RoomNumber = txtRoomNo.Text.Trim(), + CustomerNumber = CustoNo.Text.Trim(), + DataChgDate = DateTime.Now, + DataChgUsr = LoginInfo.WorkerNo, + ElectricityUsage = w.PowerUsage, + WaterUsage = w.WaterUsage + }; + result = HttpHelper.Request(ApiConstants.Room_CheckoutRoom, model.ModelToJson()); + var response = HttpHelper.JsonToModel(result.message); + if (response.Success == false) + { + NotificationService.ShowError($"{ApiConstants.Room_CheckoutRoom}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - UIMessageBox.Show("结算成功！", "系统提示", UIStyle.Green); + NotificationService.ShowSuccess("结算成功！"); FrmRoomManager.Reload(""); FrmRoomManager._RefreshRoomCount(); #region 获取添加操作日志所需的信息 - RecordHelper.Record(LoginInfo.WorkerClub + "-" + LoginInfo.WorkerPosition + "-" + LoginInfo.WorkerName + "于" + Convert.ToDateTime(DateTime.Now) + "帮助" + txtCustomerNumber.Text + "进行了退房结算操作！", Common.Core.LogLevel.Critical); + RecordHelper.Record(LoginInfo.WorkerClub + "-" + LoginInfo.WorkerPosition + "-" + LoginInfo.WorkerName + "于" + Convert.ToDateTime(DateTime.Now) + "帮助" + CustoNo.Text + "进行了退房结算操作！", Common.Core.LogLevel.Critical); #endregion this.Close(); } else { - UIMessageBox.Show("实收金额不能为空或实收金额不能小于折后金额！", "系统提示", UIStyle.Orange); + NotificationService.ShowWarning("实收金额不能为空或实收金额不能小于应付金额！"); return; } } - #endregion - - private string btnPg_ShowTotalChanged(object sender, AntdUI.PagePageEventArgs e) - { - return $"{e.PageSize} / {e.Total}条 共{e.PageTotal}页"; - } - private void btnPg_ValueChanged(object sender, AntdUI.PagePageEventArgs e) + private void btnPg_ValueChanged(object sender, PagePageEventArgs e) { var dataCount = 0; dgvSpendList.Spin("正在加载中...", config => @@ -317,57 +223,34 @@ namespace EOM.TSHotelManagement.FormUI }); } - object GetPageData(int current, int pageSize, ref int totalCount) + private string btnPg_ShowTotalChanged(object sender, PagePageEventArgs e) { - string RoomNo = txtRoomNo.Text; - dic = new Dictionary() - { - { nameof(ReadSpendInputDto.RoomNumber) , RoomNo }, - { nameof(ReadAdministratorInputDto.IgnorePaging) , "true" } - }; - result = HttpHelper.Request(ApiConstants.Spend_SelectSpendByRoomNo, dic); - var spendInfo = HttpHelper.JsonToModel>(result.message); - if (spendInfo.StatusCode != StatusCodeConstants.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Spend_SelectSpendByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); - } - - List spends = spendInfo.listSource; - totalCount = spendInfo.total; - var listTableSource = new List(); - - spends = spends.OrderBy(a => a.SpendNumber).ToList(); - - TableComHelper tableComHelper = new TableComHelper(); - listTableSource = tableComHelper.ConvertToAntdItems(spends); - - return listTableSource; + return $"{e.PageSize} / {e.Total}条 共{e.PageTotal}页"; } - object GetEnergyPageData() + private void txtReceipts_TextChanged(object sender, EventArgs e) { - dic = new Dictionary() + if (txtReceipts.Text != "") { - { nameof(ReadEnergyManagementInputDto.RoomNo),txtRoomNo.Text.Trim()} - }; - result = HttpHelper.Request(ApiConstants.EnergyManagement_SelectEnergyManagementInfo, dic); - var energyManagements = HttpHelper.JsonToModel>(result.message); - if (energyManagements.StatusCode != StatusCodeConstants.Success) + try + { + double receipt = Convert.ToDouble(Convert.ToDecimal(txtReceipts.Text)); + double vipPrice = Convert.ToDouble(Convert.ToDecimal(lblVIPPrice.Text)); + lblChange.Text = Decimal.Parse((receipt - vipPrice).ToString()).ToString("#,##0.00"); + } + catch + { + NotificationService.ShowWarning("非法输入，请重新输入！"); + txtReceipts.Clear(); + txtReceipts.Focus(); + return; + } + } + else { - UIMessageBox.ShowError($"{ApiConstants.EnergyManagement_SelectEnergyManagementInfo}+接口服务异常，请提交Issue或尝试更新版本！"); + lblChange.Text = "-" + lblGetReceipts.Text; + return; } - - List energys = energyManagements.listSource; - var listTableSource = new List(); - - energys = energys.OrderByDescending(a => a.StartDate).ToList(); - - TableComHelper tableComHelper = new TableComHelper(); - listTableSource = tableComHelper.ConvertToAntdItems(energys); - - return listTableSource; } - - } } diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.resx similarity index 100% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.resx rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.resx diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.Designer.cs new file mode 100644 index 0000000000000000000000000000000000000000..2958167c9ca82359afea39e2b040a09e8d889f62 --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.Designer.cs @@ -0,0 +1,300 @@ +namespace EOM.TSHotelManagement.FormUI +{ + partial class FrmCustomerInfo + { + /// + /// 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(FrmCustomerInfo)); + txtCustomerAddress = new AntdUI.Input(); + txtDateOfBirth = new AntdUI.Input(); + txtCustomerGender = new AntdUI.Input(); + txtCustomerName = new AntdUI.Input(); + txtCustomerNumber = new AntdUI.Input(); + txtTel = new AntdUI.Input(); + txtIdCardNumber = new AntdUI.Input(); + txtPassportName = new AntdUI.Input(); + txtCustomerType = new AntdUI.Input(); + label32 = new Label(); + label31 = new Label(); + label30 = new Label(); + label22 = new Label(); + label16 = new Label(); + label5 = new Label(); + label4 = new Label(); + label3 = new Label(); + label2 = new Label(); + ucWindowHeader1 = new ucWindowHeader(); + SuspendLayout(); + // + // txtCustomerAddress + // + txtCustomerAddress.Font = new Font("Noto Sans SC", 12F); + txtCustomerAddress.Location = new Point(95, 239); + txtCustomerAddress.Name = "txtCustomerAddress"; + txtCustomerAddress.PlaceholderText = ""; + txtCustomerAddress.ReadOnly = true; + txtCustomerAddress.Size = new Size(506, 42); + txtCustomerAddress.TabIndex = 176; + // + // txtDateOfBirth + // + txtDateOfBirth.Font = new Font("Noto Sans SC", 12F); + txtDateOfBirth.Location = new Point(95, 190); + txtDateOfBirth.Name = "txtDateOfBirth"; + txtDateOfBirth.PlaceholderText = ""; + txtDateOfBirth.ReadOnly = true; + txtDateOfBirth.Size = new Size(203, 42); + txtDateOfBirth.TabIndex = 175; + // + // txtCustomerGender + // + txtCustomerGender.Font = new Font("Noto Sans SC", 12F); + txtCustomerGender.Location = new Point(95, 141); + txtCustomerGender.Name = "txtCustomerGender"; + txtCustomerGender.PlaceholderText = ""; + txtCustomerGender.ReadOnly = true; + txtCustomerGender.Size = new Size(203, 42); + txtCustomerGender.TabIndex = 174; + // + // txtCustomerName + // + txtCustomerName.Font = new Font("Noto Sans SC", 12F); + txtCustomerName.Location = new Point(95, 92); + txtCustomerName.Name = "txtCustomerName"; + txtCustomerName.PlaceholderText = ""; + txtCustomerName.ReadOnly = true; + txtCustomerName.Size = new Size(203, 42); + txtCustomerName.TabIndex = 173; + // + // txtCustomerNumber + // + txtCustomerNumber.Font = new Font("Noto Sans SC", 12F); + txtCustomerNumber.Location = new Point(95, 43); + txtCustomerNumber.Name = "txtCustomerNumber"; + txtCustomerNumber.PlaceholderText = ""; + txtCustomerNumber.ReadOnly = true; + txtCustomerNumber.Size = new Size(203, 42); + txtCustomerNumber.TabIndex = 172; + // + // txtTel + // + txtTel.Font = new Font("Noto Sans SC", 12F); + txtTel.Location = new Point(398, 190); + txtTel.Name = "txtTel"; + txtTel.PlaceholderText = ""; + txtTel.ReadOnly = true; + txtTel.Size = new Size(203, 42); + txtTel.TabIndex = 171; + // + // txtIdCardNumber + // + txtIdCardNumber.Font = new Font("Noto Sans SC", 12F); + txtIdCardNumber.Location = new Point(398, 141); + txtIdCardNumber.Name = "txtIdCardNumber"; + txtIdCardNumber.PlaceholderText = ""; + txtIdCardNumber.ReadOnly = true; + txtIdCardNumber.Size = new Size(203, 42); + txtIdCardNumber.TabIndex = 170; + // + // txtPassportName + // + txtPassportName.Font = new Font("Noto Sans SC", 12F); + txtPassportName.Location = new Point(398, 92); + txtPassportName.Name = "txtPassportName"; + txtPassportName.PlaceholderText = ""; + txtPassportName.ReadOnly = true; + txtPassportName.Size = new Size(203, 42); + txtPassportName.TabIndex = 169; + // + // txtCustomerType + // + txtCustomerType.Font = new Font("Noto Sans SC", 12F); + txtCustomerType.Location = new Point(398, 43); + txtCustomerType.Name = "txtCustomerType"; + txtCustomerType.PlaceholderText = ""; + txtCustomerType.ReadOnly = true; + txtCustomerType.Size = new Size(203, 42); + txtCustomerType.TabIndex = 168; + // + // label32 + // + label32.AutoSize = true; + label32.Font = new Font("Noto Sans SC", 14.25F); + label32.Location = new Point(12, 54); + label32.Name = "label32"; + label32.Size = new Size(85, 19); + label32.TabIndex = 159; + label32.Text = "客户编号"; + // + // label31 + // + label31.AutoSize = true; + label31.Font = new Font("Noto Sans SC", 14.25F); + label31.Location = new Point(12, 103); + label31.Name = "label31"; + label31.Size = new Size(85, 19); + label31.TabIndex = 160; + label31.Text = "客户姓名"; + // + // label30 + // + label30.AutoSize = true; + label30.Font = new Font("Noto Sans SC", 14.25F); + label30.Location = new Point(12, 152); + label30.Name = "label30"; + label30.Size = new Size(87, 19); + label30.TabIndex = 161; + label30.Text = "性 别"; + // + // label22 + // + label22.AutoSize = true; + label22.Font = new Font("Noto Sans SC", 14.25F); + label22.Location = new Point(12, 201); + label22.Name = "label22"; + label22.Size = new Size(85, 19); + label22.TabIndex = 162; + label22.Text = "出生日期"; + // + // label16 + // + label16.AutoSize = true; + label16.Font = new Font("Noto Sans SC", 14.25F); + label16.Location = new Point(315, 54); + label16.Name = "label16"; + label16.Size = new Size(85, 19); + label16.TabIndex = 163; + label16.Text = "客户类型"; + // + // label5 + // + label5.AutoSize = true; + label5.Font = new Font("Noto Sans SC", 14.25F); + label5.Location = new Point(315, 103); + label5.Name = "label5"; + label5.Size = new Size(85, 19); + label5.TabIndex = 164; + label5.Text = "证件类型"; + // + // label4 + // + label4.AutoSize = true; + label4.Font = new Font("Noto Sans SC", 14.25F); + label4.Location = new Point(315, 152); + label4.Name = "label4"; + label4.Size = new Size(85, 19); + label4.TabIndex = 165; + label4.Text = "证件号码"; + // + // label3 + // + label3.AutoSize = true; + label3.Font = new Font("Noto Sans SC", 14.25F); + label3.Location = new Point(315, 201); + label3.Name = "label3"; + label3.Size = new Size(85, 19); + label3.TabIndex = 166; + label3.Text = "联系方式"; + // + // label2 + // + label2.AutoSize = true; + label2.Font = new Font("Noto Sans SC", 14.25F); + label2.Location = new Point(10, 250); + label2.Name = "label2"; + label2.Size = new Size(85, 19); + label2.TabIndex = 167; + label2.Text = "居住地址"; + // + // ucWindowHeader1 + // + ucWindowHeader1.Location = new Point(0, 0); + ucWindowHeader1.Name = "ucWindowHeader1"; + ucWindowHeader1.Size = new Size(610, 35); + ucWindowHeader1.TabIndex = 177; + // + // FrmCustomerInfo + // + AutoScaleMode = AutoScaleMode.None; + BackColor = Color.FromArgb(235, 243, 255); + ClientSize = new Size(608, 292); + Controls.Add(ucWindowHeader1); + Controls.Add(txtCustomerAddress); + Controls.Add(txtDateOfBirth); + Controls.Add(txtCustomerGender); + Controls.Add(txtCustomerName); + Controls.Add(txtCustomerNumber); + Controls.Add(txtTel); + Controls.Add(txtIdCardNumber); + Controls.Add(txtPassportName); + Controls.Add(txtCustomerType); + Controls.Add(label32); + Controls.Add(label31); + Controls.Add(label30); + Controls.Add(label22); + Controls.Add(label16); + Controls.Add(label5); + Controls.Add(label4); + Controls.Add(label3); + Controls.Add(label2); + FormBorderStyle = FormBorderStyle.None; + Icon = (Icon)resources.GetObject("$this.Icon"); + MaximizeBox = false; + MinimizeBox = false; + Name = "FrmCustomerInfo"; + Resizable = false; + StartPosition = FormStartPosition.CenterScreen; + Text = "客户信息"; + Load += FrmSelectCustoInfo_Load; + ResumeLayout(false); + PerformLayout(); + + } + + #endregion + + private AntdUI.Input txtCustomerAddress; + private AntdUI.Input txtDateOfBirth; + private AntdUI.Input txtCustomerGender; + private AntdUI.Input txtCustomerName; + private AntdUI.Input txtCustomerNumber; + private AntdUI.Input txtTel; + private AntdUI.Input txtIdCardNumber; + private AntdUI.Input txtPassportName; + private AntdUI.Input txtCustomerType; + private Label label32; + private Label label31; + private Label label30; + private Label label22; + private Label label16; + private Label label5; + private Label label4; + private Label label3; + private Label label2; + private ucWindowHeader ucWindowHeader1; + } +} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppUserControls/ucNavBar.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.cs similarity index 37% rename from EOM.TSHotelManagement.FormUI/AppUserControls/ucNavBar.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.cs index ca8cc1ddf9620fef2ca78e5abdd19ecf34e9182c..af592709f26fd09bf8b098da3617e58defe079ca 100644 --- a/EOM.TSHotelManagement.FormUI/AppUserControls/ucNavBar.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.cs @@ -21,13 +21,50 @@ *SOFTWARE. * */ -namespace EOM.TSHotelManagement.FormUI.AppUserControls + +using AntdUI; +using EOM.TSHotelManagement.Common; +using EOM.TSHotelManagement.Common.Contract; + +namespace EOM.TSHotelManagement.FormUI { - public partial class ucNavBar : UserControl + public partial class FrmCustomerInfo : Window { - public ucNavBar() + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmCustomerInfo)); + public string CustomerNumber { get; set; } + public FrmCustomerInfo(string customerNumber) { InitializeComponent(); + CustomerNumber = customerNumber; + + ucWindowHeader1.ApplySettingsWithoutMinimize("查看用户信息", string.Empty, (Image)resources.GetObject("FrmCustomerInfo.Icon")!); + } + + Dictionary dic = null; + ResponseMsg result = null; + + private void FrmSelectCustoInfo_Load(object sender, EventArgs e) + { + dic = new Dictionary() + { + { nameof(ReadCustomerInputDto.CustomerNumber), CustomerNumber } + }; + result = HttpHelper.Request(ApiConstants.Customer_SelectCustoByInfo, dic); + var c = HttpHelper.JsonToModel>(result.message); + if (c.Success == false) + { + NotificationService.ShowError($"{ApiConstants.Customer_SelectCustoByInfo}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + txtCustomerNumber.Text = c.Data.CustomerNumber; + txtCustomerAddress.Text = c.Data.CustomerAddress; + txtCustomerName.Text = c.Data.CustomerName; + txtIdCardNumber.Text = c.Data.IdCardNumber; + txtTel.Text = c.Data.CustomerPhoneNumber; + txtCustomerGender.Text = c.Data.CustomerGender == 1 ? "男" : "女"; + txtCustomerType.Text = c.Data.CustomerTypeName; + txtPassportName.Text = c.Data.PassportName; + txtDateOfBirth.Text = c.Data.DateOfBirth.ToString("yyyy/MM/dd"); } } } diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.resx similarity index 94% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.resx rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.resx index e5b2e7fb654858eab67f6a44c1ca7a62c305933d..dc8897533deff45d1aae64e6b10b57d4d13098c1 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.resx +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.resx @@ -1,17 +1,17 @@  - diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.Designer.cs similarity index 74% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.Designer.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.Designer.cs index e5aeaf09d67c9f203559286cc71ce3a4443b5803..0782ba18d9beaac8eb1ba37168810b684cecea65 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.Designer.cs @@ -30,19 +30,19 @@ { components = new System.ComponentModel.Container(); toolTip1 = new ToolTip(components); - cmsCustoManager = new Sunny.UI.UIContextMenuStrip(); - tsmiCustoNo = new ToolStripMenuItem(); - uiLine1 = new Sunny.UI.UILine(); btnSerach = new AntdUI.Button(); btnAddCusto = new AntdUI.Button(); btnUpdCustomer = new AntdUI.Button(); dgvCustomerList = new AntdUI.Table(); + cmsCustomerAction = new ContextMenuStrip(components); + tsmiCustoNoCopy = new ToolStripMenuItem(); btnPg = new AntdUI.Pagination(); label1 = new AntdUI.Label(); label2 = new AntdUI.Label(); txtCustoName = new AntdUI.Input(); txtCustoNo = new AntdUI.Input(); - cmsCustoManager.SuspendLayout(); + divider1 = new AntdUI.Divider(); + cmsCustomerAction.SuspendLayout(); SuspendLayout(); // // toolTip1 @@ -50,38 +50,9 @@ toolTip1.ToolTipIcon = ToolTipIcon.Info; toolTip1.ToolTipTitle = "获取账号"; // - // cmsCustoManager - // - cmsCustoManager.BackColor = Color.FromArgb(243, 249, 255); - cmsCustoManager.Font = new Font("微软雅黑", 12F); - cmsCustoManager.Items.AddRange(new ToolStripItem[] { tsmiCustoNo }); - cmsCustoManager.Name = "cmsCustoManager"; - cmsCustoManager.Size = new Size(177, 30); - // - // tsmiCustoNo - // - tsmiCustoNo.Image = Properties.Resources.复制; - tsmiCustoNo.Name = "tsmiCustoNo"; - tsmiCustoNo.Size = new Size(176, 26); - tsmiCustoNo.Text = "复制用户编号"; - tsmiCustoNo.Click += tsmiCustoNo_Click; - // - // uiLine1 - // - uiLine1.BackColor = Color.Transparent; - uiLine1.Font = new Font("微软雅黑", 12F); - uiLine1.ForeColor = Color.FromArgb(48, 48, 48); - uiLine1.Location = new Point(772, 411); - uiLine1.Margin = new Padding(4); - uiLine1.MinimumSize = new Size(2, 3); - uiLine1.Name = "uiLine1"; - uiLine1.Size = new Size(291, 24); - uiLine1.TabIndex = 124; - uiLine1.Text = "右键可复制快速客户编号"; - // // btnSerach // - btnSerach.Font = new Font("Microsoft YaHei UI", 12F); + btnSerach.Font = new Font("Noto Sans SC", 12F); btnSerach.Location = new Point(602, 441); btnSerach.Name = "btnSerach"; btnSerach.Size = new Size(93, 47); @@ -92,19 +63,21 @@ // // btnAddCusto // - btnAddCusto.Font = new Font("Microsoft YaHei UI", 12F); + btnAddCusto.Font = new Font("Noto Sans SC", 12F); + btnAddCusto.IconPosition = AntdUI.TAlignMini.Top; btnAddCusto.Location = new Point(772, 441); btnAddCusto.Name = "btnAddCusto"; btnAddCusto.Size = new Size(93, 47); btnAddCusto.TabIndex = 128; btnAddCusto.Text = "添加客户"; + btnAddCusto.TextCenterHasIcon = true; btnAddCusto.Type = AntdUI.TTypeMini.Primary; btnAddCusto.Click += btnAddCusto_BtnClick; // // btnUpdCustomer // btnUpdCustomer.Enabled = false; - btnUpdCustomer.Font = new Font("Microsoft YaHei UI", 12F); + btnUpdCustomer.Font = new Font("Noto Sans SC", 12F); btnUpdCustomer.Location = new Point(942, 441); btnUpdCustomer.Name = "btnUpdCustomer"; btnUpdCustomer.Size = new Size(93, 47); @@ -116,7 +89,8 @@ // dgvCustomerList // dgvCustomerList.Bordered = true; - dgvCustomerList.ContextMenuStrip = cmsCustoManager; + dgvCustomerList.ContextMenuStrip = cmsCustomerAction; + dgvCustomerList.Gap = 12; dgvCustomerList.Location = new Point(10, 7); dgvCustomerList.Name = "dgvCustomerList"; dgvCustomerList.Size = new Size(1053, 391); @@ -124,9 +98,22 @@ dgvCustomerList.CellClick += dgvCustomerList_CellClick; dgvCustomerList.CellDoubleClick += dgvCustomerList_CellDoubleClick; // + // cmsCustomerAction + // + cmsCustomerAction.Items.AddRange(new ToolStripItem[] { tsmiCustoNoCopy }); + cmsCustomerAction.Name = "cmsCustomerAction"; + cmsCustomerAction.Size = new Size(149, 26); + // + // tsmiCustoNoCopy + // + tsmiCustoNoCopy.Name = "tsmiCustoNoCopy"; + tsmiCustoNoCopy.Size = new Size(148, 22); + tsmiCustoNoCopy.Text = "复制用户编号"; + tsmiCustoNoCopy.Click += tsmiCustoNo_Click; + // // btnPg // - btnPg.Current = 0; + btnPg.Font = new Font("Noto Sans SC", 9F, FontStyle.Regular, GraphicsUnit.Point, 0); btnPg.Location = new Point(10, 404); btnPg.Name = "btnPg"; btnPg.PageSize = 15; @@ -139,7 +126,7 @@ // // label1 // - label1.Font = new Font("Microsoft YaHei UI", 12.5F); + label1.Font = new Font("Noto Sans SC", 12F); label1.Location = new Point(283, 453); label1.Name = "label1"; label1.Size = new Size(86, 26); @@ -149,7 +136,7 @@ // // label2 // - label2.Font = new Font("Microsoft YaHei UI", 12.5F); + label2.Font = new Font("Noto Sans SC", 12F); label2.Location = new Point(12, 453); label2.Name = "label2"; label2.Size = new Size(86, 26); @@ -159,7 +146,7 @@ // // txtCustoName // - txtCustoName.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); + txtCustoName.Font = new Font("Noto Sans SC", 12F); txtCustoName.Location = new Point(375, 444); txtCustoName.Name = "txtCustoName"; txtCustoName.PlaceholderText = "请输入客户姓名..."; @@ -168,19 +155,30 @@ // // txtCustoNo // - txtCustoNo.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); + txtCustoNo.Font = new Font("Noto Sans SC", 12F); txtCustoNo.Location = new Point(104, 444); txtCustoNo.Name = "txtCustoNo"; txtCustoNo.PlaceholderText = "请输入客户编号..."; txtCustoNo.Size = new Size(173, 42); txtCustoNo.TabIndex = 149; // + // divider1 + // + divider1.Font = new Font("Noto Sans SC", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 0); + divider1.Location = new Point(670, 406); + divider1.Name = "divider1"; + divider1.Size = new Size(393, 23); + divider1.TabIndex = 153; + divider1.Text = "右键可复制快速客户编号"; + divider1.Thickness = 1F; + // // FrmCustomerManager // AutoScaleDimensions = new SizeF(7F, 17F); AutoScaleMode = AutoScaleMode.Font; BackColor = Color.FromArgb(235, 243, 255); ClientSize = new Size(1072, 490); + Controls.Add(divider1); Controls.Add(label1); Controls.Add(label2); Controls.Add(txtCustoName); @@ -190,22 +188,18 @@ Controls.Add(btnUpdCustomer); Controls.Add(btnAddCusto); Controls.Add(btnSerach); - Controls.Add(uiLine1); FormBorderStyle = FormBorderStyle.None; Margin = new Padding(4); Name = "FrmCustomerManager"; StartPosition = FormStartPosition.CenterScreen; Text = "TS酒店管理系统"; Load += FrmCustomerManager_Load; - cmsCustoManager.ResumeLayout(false); + cmsCustomerAction.ResumeLayout(false); ResumeLayout(false); } #endregion private System.Windows.Forms.ToolTip toolTip1; - private Sunny.UI.UIContextMenuStrip cmsCustoManager; - private System.Windows.Forms.ToolStripMenuItem tsmiCustoNo; - private Sunny.UI.UILine uiLine1; private AntdUI.Button btnSerach; private AntdUI.Button btnAddCusto; private AntdUI.Button btnUpdCustomer; @@ -215,5 +209,8 @@ private AntdUI.Label label2; private AntdUI.Input txtCustoName; private AntdUI.Input txtCustoNo; + private ContextMenuStrip cmsCustomerAction; + private ToolStripMenuItem tsmiCustoNoCopy; + private AntdUI.Divider divider1; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.cs similarity index 93% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.cs index 7d6c85981b38be1729b2c4e8a6b3b82f60f67604..692e14fad600cabbc0fe0b62e88883d8de3bbb2c 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.cs @@ -24,7 +24,7 @@ using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; -using Sunny.UI; +using jvncorelib.EntityLib; using System.Runtime.InteropServices; namespace EOM.TSHotelManagement.FormUI @@ -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.Success == false) { 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.Success == false) { 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/FrmCustomerManagement.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.resx similarity index 96% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.resx rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.resx index 05f7066207d7f4ce437ca6c3b5aeb7623cc43b89..8c8239e08389b63dff51c9bf07db9ce915fa7a01 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.resx +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.resx @@ -120,7 +120,7 @@ 17, 17 - - 179, 17 + + 125, 19 \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.Designer.cs new file mode 100644 index 0000000000000000000000000000000000000000..374c5143c665726474a783cafdfd78f9bc8bb646 --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.Designer.cs @@ -0,0 +1,306 @@ +namespace EOM.TSHotelManagement.FormUI +{ + partial class FrmEditInputs + { + /// + /// 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(FrmEditInputs)); + label10 = new Label(); + label9 = new Label(); + label8 = new Label(); + label7 = new Label(); + label6 = new Label(); + label5 = new Label(); + label4 = new Label(); + label3 = new Label(); + label2 = new Label(); + dtpDateOfBirth = new AntdUI.DatePicker(); + txtCustomerName = new AntdUI.Input(); + txtCustomerId = new AntdUI.Input(); + txtCustomerCardID = new AntdUI.Input(); + txtCustomerTel = new AntdUI.Input(); + txtCustomerAddress = new AntdUI.Input(); + ucWindowHeader1 = new ucWindowHeader(); + btnOk = new AntdUI.Button(); + cboGender = new AntdUI.Select(); + cboPassportType = new AntdUI.Select(); + cboCustomerType = new AntdUI.Select(); + SuspendLayout(); + // + // label10 + // + label10.AutoSize = true; + label10.Font = new Font("Noto Sans SC", 14.2499981F); + label10.Location = new Point(9, 263); + label10.Name = "label10"; + label10.Size = new Size(85, 19); + label10.TabIndex = 115; + label10.Text = "居住地址"; + // + // label9 + // + label9.AutoSize = true; + label9.Font = new Font("Noto Sans SC", 14.2499981F); + label9.Location = new Point(379, 212); + label9.Name = "label9"; + label9.Size = new Size(85, 19); + label9.TabIndex = 114; + label9.Text = "联系方式"; + // + // label8 + // + label8.AutoSize = true; + label8.Font = new Font("Noto Sans SC", 14.2499981F); + label8.Location = new Point(379, 161); + label8.Name = "label8"; + label8.Size = new Size(85, 19); + label8.TabIndex = 113; + label8.Text = "证件号码"; + // + // label7 + // + label7.AutoSize = true; + label7.Font = new Font("Noto Sans SC", 14.2499981F); + label7.Location = new Point(379, 110); + label7.Name = "label7"; + label7.Size = new Size(85, 19); + label7.TabIndex = 112; + label7.Text = "证件类型"; + // + // label6 + // + label6.AutoSize = true; + label6.Font = new Font("Noto Sans SC", 14.2499981F); + label6.Location = new Point(379, 59); + label6.Name = "label6"; + label6.Size = new Size(85, 19); + label6.TabIndex = 111; + label6.Text = "客户类型"; + // + // label5 + // + label5.AutoSize = true; + label5.Font = new Font("Noto Sans SC", 14.2499981F); + label5.Location = new Point(11, 212); + label5.Name = "label5"; + label5.Size = new Size(85, 19); + label5.TabIndex = 110; + label5.Text = "出生日期"; + // + // label4 + // + label4.AutoSize = true; + label4.Font = new Font("Noto Sans SC", 14.2499981F); + label4.Location = new Point(11, 161); + label4.Name = "label4"; + label4.Size = new Size(82, 19); + label4.TabIndex = 109; + label4.Text = "性 别"; + // + // label3 + // + label3.AutoSize = true; + label3.Font = new Font("Noto Sans SC", 14.2499981F); + label3.Location = new Point(11, 110); + label3.Name = "label3"; + label3.Size = new Size(85, 19); + label3.TabIndex = 108; + label3.Text = "客户姓名"; + // + // label2 + // + label2.AutoSize = true; + label2.Font = new Font("Noto Sans SC", 14.2499981F); + label2.Location = new Point(11, 59); + label2.Name = "label2"; + label2.Size = new Size(85, 19); + label2.TabIndex = 107; + label2.Text = "客户编号"; + // + // dtpDateOfBirth + // + dtpDateOfBirth.Font = new Font("Noto Sans SC", 10F); + dtpDateOfBirth.Location = new Point(94, 201); + dtpDateOfBirth.Name = "dtpDateOfBirth"; + dtpDateOfBirth.Size = new Size(252, 43); + dtpDateOfBirth.TabIndex = 166; + // + // txtCustomerName + // + txtCustomerName.Font = new Font("Noto Sans SC", 12F); + txtCustomerName.Location = new Point(95, 99); + txtCustomerName.Name = "txtCustomerName"; + txtCustomerName.Size = new Size(252, 45); + txtCustomerName.TabIndex = 164; + // + // txtCustomerId + // + txtCustomerId.Font = new Font("Noto Sans SC", 12F); + txtCustomerId.Location = new Point(95, 48); + txtCustomerId.Name = "txtCustomerId"; + txtCustomerId.ReadOnly = true; + txtCustomerId.Size = new Size(252, 45); + txtCustomerId.TabIndex = 163; + // + // txtCustomerCardID + // + txtCustomerCardID.Font = new Font("Noto Sans SC", 12F); + txtCustomerCardID.Location = new Point(463, 148); + txtCustomerCardID.Name = "txtCustomerCardID"; + txtCustomerCardID.Size = new Size(250, 45); + txtCustomerCardID.TabIndex = 168; + txtCustomerCardID.Validated += txtCardID_Validated; + // + // txtCustomerTel + // + txtCustomerTel.Font = new Font("Noto Sans SC", 12F); + txtCustomerTel.Location = new Point(463, 198); + txtCustomerTel.Name = "txtCustomerTel"; + txtCustomerTel.Size = new Size(250, 45); + txtCustomerTel.TabIndex = 167; + // + // txtCustomerAddress + // + txtCustomerAddress.Font = new Font("Noto Sans SC", 12F); + txtCustomerAddress.Location = new Point(95, 250); + txtCustomerAddress.Name = "txtCustomerAddress"; + txtCustomerAddress.Size = new Size(618, 45); + txtCustomerAddress.TabIndex = 171; + // + // ucWindowHeader1 + // + ucWindowHeader1.Location = new Point(0, 0); + ucWindowHeader1.Name = "ucWindowHeader1"; + ucWindowHeader1.Size = new Size(723, 35); + ucWindowHeader1.TabIndex = 172; + // + // btnOk + // + btnOk.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnOk.Location = new Point(579, 307); + btnOk.Name = "btnOk"; + btnOk.Size = new Size(135, 45); + btnOk.TabIndex = 173; + btnOk.Text = "保 存"; + btnOk.Type = AntdUI.TTypeMini.Info; + btnOk.Click += FrmEditInputs_ButtonOkClick; + // + // cboGender + // + cboGender.Font = new Font("Noto Sans SC", 12F); + cboGender.List = true; + cboGender.ListAutoWidth = true; + cboGender.Location = new Point(95, 150); + cboGender.Name = "cboGender"; + cboGender.Placement = AntdUI.TAlignFrom.Bottom; + cboGender.Size = new Size(251, 45); + cboGender.TabIndex = 174; + // + // cboPassportType + // + cboPassportType.Font = new Font("Noto Sans SC", 12F); + cboPassportType.List = true; + cboPassportType.ListAutoWidth = true; + cboPassportType.Location = new Point(463, 98); + cboPassportType.Name = "cboPassportType"; + cboPassportType.Placement = AntdUI.TAlignFrom.Bottom; + cboPassportType.Size = new Size(251, 45); + cboPassportType.TabIndex = 175; + // + // cboCustomerType + // + cboCustomerType.Font = new Font("Noto Sans SC", 12F); + cboCustomerType.List = true; + cboCustomerType.ListAutoWidth = true; + cboCustomerType.Location = new Point(463, 48); + cboCustomerType.Name = "cboCustomerType"; + cboCustomerType.Placement = AntdUI.TAlignFrom.Bottom; + cboCustomerType.Size = new Size(251, 45); + cboCustomerType.TabIndex = 176; + // + // FrmEditInputs + // + AutoScaleMode = AutoScaleMode.None; + BackColor = Color.FromArgb(235, 243, 255); + ClientSize = new Size(722, 364); + Controls.Add(cboCustomerType); + Controls.Add(cboPassportType); + Controls.Add(cboGender); + Controls.Add(btnOk); + Controls.Add(ucWindowHeader1); + Controls.Add(txtCustomerAddress); + Controls.Add(txtCustomerCardID); + Controls.Add(txtCustomerTel); + Controls.Add(dtpDateOfBirth); + Controls.Add(txtCustomerName); + Controls.Add(txtCustomerId); + Controls.Add(label10); + Controls.Add(label9); + Controls.Add(label8); + Controls.Add(label7); + Controls.Add(label6); + Controls.Add(label5); + Controls.Add(label4); + Controls.Add(label3); + Controls.Add(label2); + FormBorderStyle = FormBorderStyle.None; + Icon = (Icon)resources.GetObject("$this.Icon"); + MaximizeBox = false; + MinimizeBox = false; + Name = "FrmEditInputs"; + Resizable = false; + StartPosition = FormStartPosition.CenterScreen; + Text = "添加会员信息"; + Load += FrmEditInputs_Load; + ResumeLayout(false); + PerformLayout(); + + } + + #endregion + private System.Windows.Forms.Label label10; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label2; + private AntdUI.DatePicker dtpDateOfBirth; + private AntdUI.Input txtCustomerName; + private AntdUI.Input txtCustomerId; + private AntdUI.Input txtCustomerCardID; + private AntdUI.Input txtCustomerTel; + private AntdUI.Input txtCustomerAddress; + private ucWindowHeader ucWindowHeader1; + private AntdUI.Button btnOk; + private AntdUI.Select cboGender; + private AntdUI.Select cboPassportType; + private AntdUI.Select cboCustomerType; + } +} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.cs similarity index 45% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.cs index 7d104ada4da40433677d654d1e4a6530185a70f1..ce87bc7bdc0fe707ff3a4f4d4011320da6339285 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.cs @@ -22,20 +22,27 @@ * */ +using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using jvncorelib.CodeLib; -using Sunny.UI; +using jvncorelib.EntityLib; namespace EOM.TSHotelManagement.FormUI { - public partial class FrmEditInputs : UIEditForm + public partial class FrmEditInputs : Window { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmEditInputs)); private LoadingProgress? _loadingProgress; public FrmEditInputs(LoadingProgress? loadingProgress = null) { InitializeComponent(); _loadingProgress = loadingProgress; + + ucWindowHeader1.ApplySettingsWithoutMinimize( + this.Text.Contains("修改") ? "修改客户信息" : "添加客户信息", + string.Empty, + (Image)resources.GetObject("FrmEditInputs.Icon")!); } Dictionary dic = null; @@ -44,37 +51,30 @@ namespace EOM.TSHotelManagement.FormUI private void FrmEditInputs_Load(object sender, EventArgs e) { string cardId = new UniqueCode().GetNewId("TS"); - txtCustoNo.Text = cardId; + txtCustomerId.Text = cardId; #region 加载客户类型信息 var result = HttpHelper.Request(ApiConstants.Base_SelectCustoTypeAllCanUse); var customerTypes = HttpHelper.JsonToModel>(result.message); - if (customerTypes.StatusCode != StatusCodeConstants.Success) + if (customerTypes.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectCustoTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Base_SelectCustoTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - var lstSourceGrid = customerTypes.listSource; - this.cbCustoType.DataSource = lstSourceGrid; - this.cbCustoType.DisplayMember = nameof(ReadCustoTypeOutputDto.CustomerTypeName); - this.cbCustoType.ValueMember = nameof(ReadCustoTypeOutputDto.CustomerType); - this.cbCustoType.SelectedIndex = 0; - this.cbCustoType.ReadOnly = true; + var lstDataGrid = customerTypes.Data.Items; + this.cboCustomerType.Items.AddRange(lstDataGrid.Select(item => new AntdUI.SelectItem(item.CustomerTypeName, item.CustomerType)).ToArray()); #endregion #region 加载证件类型信息 result = HttpHelper.Request(ApiConstants.Base_SelectPassPortTypeAllCanUse); var passportTypes = HttpHelper.JsonToModel>(result.message); - if (passportTypes.StatusCode != StatusCodeConstants.Success) + if (passportTypes.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectPassPortTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Base_SelectPassPortTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - var passPorts = passportTypes.listSource; - this.cbPassportType.DataSource = passPorts; - this.cbPassportType.DisplayMember = nameof(ReadPassportTypeOutputDto.PassportName); - this.cbPassportType.ValueMember = nameof(ReadPassportTypeOutputDto.PassportId); - this.cbPassportType.SelectedIndex = 0; + var passPorts = passportTypes.Data.Items; + this.cboPassportType.Items.AddRange(passPorts.Select(item => new AntdUI.SelectItem(item.PassportName, item.PassportId)).ToArray()); #endregion #region 加载性别信息 @@ -85,41 +85,37 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Base_SelectGenderTypeAll, dic); var genderTypes = HttpHelper.JsonToModel>(result.message); - if (genderTypes.StatusCode != StatusCodeConstants.Success) + if (genderTypes.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectGenderTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Base_SelectGenderTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - var listSexType = genderTypes.listSource; - this.cbSex.DataSource = listSexType; - this.cbSex.DisplayMember = nameof(ReadGenderTypeOutputDto.Description); - this.cbSex.ValueMember = nameof(ReadGenderTypeOutputDto.Id); - this.cbSex.SelectedIndex = 0; + var listSexType = genderTypes.Data.Items; + this.cboGender.Items.AddRange(listSexType.Select(item => new AntdUI.SelectItem(item.Description, item.Id)).ToArray()); #endregion if (this.Text.Equals("修改客户信息")) { - txtCustoNo.Text = FrmCustomerManager.cm_CustoNo; - txtCustoName.Text = FrmCustomerManager.cm_CustoName; - txtCustoAdress.Text = FrmCustomerManager.cm_CustoAddress; - cbCustoType.SelectedValue = FrmCustomerManager.cm_CustoType; - cbSex.SelectedValue = FrmCustomerManager.cm_CustoSex; - cbPassportType.SelectedValue = FrmCustomerManager.cm_PassportType; - dtpBirthday.Value = FrmCustomerManager.cm_CustoBirth; - txtCardID.Text = FrmCustomerManager.cm_CustoIdCardNumber; - txtCustoAdress.Text = FrmCustomerManager.cm_CustoAddress; - txtTel.Text = FrmCustomerManager.cm_CustoTel; - btnOK.Text = "修改"; + txtCustomerId.Text = FrmCustomerManager.cm_CustoNo; + txtCustomerName.Text = FrmCustomerManager.cm_CustoName; + txtCustomerAddress.Text = FrmCustomerManager.cm_CustoAddress; + cboCustomerType.SelectedValue = FrmCustomerManager.cm_CustoType; + cboGender.SelectedValue = FrmCustomerManager.cm_CustoSex; + cboPassportType.SelectedValue = FrmCustomerManager.cm_PassportType; + dtpDateOfBirth.Value = FrmCustomerManager.cm_CustoBirth; + txtCustomerCardID.Text = FrmCustomerManager.cm_CustoIdCardNumber; + txtCustomerTel.Text = FrmCustomerManager.cm_CustoTel; + btnOk.Text = "修改"; - this.ButtonOkClick -= new EventHandler(FrmEditInputs_ButtonOkClick); - this.ButtonOkClick += new EventHandler(btnOK_UpdClick); + this.btnOk.Click -= new EventHandler(FrmEditInputs_ButtonOkClick); + this.btnOk.Click += new EventHandler(btnOK_UpdClick); - if (!cbPassportType.SelectedText.ToString().Contains("身份证")) - { - dtpBirthday.Enabled = true; - dtpBirthday.ReadOnly = false; - return; - } + //if (!cboPassportType.SelectedValue.ToString().Contains("身份证")) + //{ + // dtpBirthday.Enabled = true; + // dtpBirthday.ReadOnly = false; + // return; + //} } } @@ -129,47 +125,33 @@ namespace EOM.TSHotelManagement.FormUI UpdateCustomerInputDto custo = new UpdateCustomerInputDto() { Id = FrmCustomerManager.cm_CustoId, - CustomerNumber = txtCustoNo.Text, - CustomerName = txtCustoName.Text, - CustomerGender = Convert.ToInt32(cbSex.SelectedValue.ToString()), - DateOfBirth = DateOnly.FromDateTime(dtpBirthday.Value.Date), - CustomerType = Convert.ToInt32(cbCustoType.SelectedValue.ToString()), - PassportId = Convert.ToInt32(cbPassportType.SelectedValue), - IdCardNumber = txtCardID.Text, - CustomerPhoneNumber = txtTel.Text, - CustomerAddress = txtCustoAdress.Text, + CustomerNumber = txtCustomerId.Text, + CustomerName = txtCustomerName.Text, + CustomerGender = Convert.ToInt32(cboGender.SelectedValue.ToString()), + DateOfBirth = DateOnly.FromDateTime(Convert.ToDateTime(dtpDateOfBirth.Value).Date), + CustomerType = Convert.ToInt32(cboCustomerType.SelectedValue.ToString()), + PassportId = Convert.ToInt32(cboPassportType.SelectedValue), + IdCardNumber = txtCustomerCardID.Text, + CustomerPhoneNumber = txtCustomerTel.Text, + CustomerAddress = txtCustomerAddress.Text, IsDelete = 0, DataChgUsr = LoginInfo.WorkerNo, }; - result = HttpHelper.Request(ApiConstants.Customer_UpdCustomerInfo, HttpHelper.ModelToJson(custo)); - var response = HttpHelper.JsonToModel(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + result = HttpHelper.Request(ApiConstants.Customer_UpdCustomerInfo, custo.ModelToJson()); + var response = HttpHelper.JsonToModel(result.message); + if (response.Success == false) { - UIMessageBox.Show("修改失败", "系统提示", UIStyle.Red, UIMessageBoxButtons.OK); + NotificationService.ShowError("修改失败"); return; } - UIMessageBox.Show("修改成功", "系统提示", UIStyle.Green, UIMessageBoxButtons.OK); + NotificationService.ShowSuccess("修改成功"); #region 获取添加操作日志所需的信息 RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "修改了一名客户信息，客户编号为：" + custo.CustomerNumber, Common.Core.LogLevel.Critical); #endregion this.Close(); FrmCustomerManager.ReloadCustomer(false); - - foreach (Control Ctrol in this.Controls) - { - if (Ctrol is Sunny.UI.UITextBox) - { - Ctrol.Text = ""; - } - if (Ctrol is Sunny.UI.UIComboBox) - { - this.cbSex.SelectedIndex = 0; - this.cbCustoType.SelectedIndex = 0; - this.cbPassportType.SelectedIndex = 0; - } - } } private void FrmEditInputs_ButtonOkClick(object sender, EventArgs e) @@ -177,73 +159,52 @@ namespace EOM.TSHotelManagement.FormUI CreateCustomerInputDto custo = new CreateCustomerInputDto() { DataInsDate = DateTime.Now, - CustomerNumber = txtCustoNo.Text, - CustomerName = txtCustoName.Text, - CustomerGender = Convert.ToInt32(cbSex.SelectedValue.ToString()), - DateOfBirth = dtpBirthday.Value.Date, - CustomerType = Convert.ToInt32(cbCustoType.SelectedValue.ToString()), - PassportId = Convert.ToInt32(cbPassportType.SelectedValue.ToString()), - IdCardNumber = txtCardID.Text, - CustomerPhoneNumber = txtTel.Text, - CustomerAddress = txtCustoAdress.Text, + CustomerNumber = txtCustomerId.Text, + CustomerName = txtCustomerName.Text, + CustomerGender = Convert.ToInt32(cboGender.SelectedValue.ToString()), + DateOfBirth = Convert.ToDateTime(dtpDateOfBirth.Value).Date, + CustomerType = Convert.ToInt32(cboCustomerType.SelectedValue.ToString()), + PassportId = Convert.ToInt32(cboPassportType.SelectedValue.ToString()), + IdCardNumber = txtCustomerCardID.Text, + CustomerPhoneNumber = txtCustomerTel.Text, + CustomerAddress = txtCustomerAddress.Text, DataInsUsr = LoginInfo.WorkerNo, IsDelete = 0 }; - result = HttpHelper.Request(ApiConstants.Customer_InsertCustomerInfo, HttpHelper.ModelToJson(custo)); - var response = HttpHelper.JsonToModel(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + result = HttpHelper.Request(ApiConstants.Customer_InsertCustomerInfo, custo.ModelToJson()); + var response = HttpHelper.JsonToModel(result.message); + if (response.Success == false) { - UIMessageBox.Show($"添加失败\n{response.Message}", "系统提示", UIStyle.Red, UIMessageBoxButtons.OK); + NotificationService.ShowError($"添加失败\n{response.Message}"); return; } - UIMessageBox.Show("添加成功", "系统提示", UIStyle.Green, UIMessageBoxButtons.OK); + NotificationService.ShowSuccess("添加成功"); FrmCustomerManager.ReloadCustomer(false); #region 获取添加操作日志所需的信息 RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "添加了一名客户，客户编号为：" + custo.CustomerNumber, Common.Core.LogLevel.Critical); #endregion this.Close(); - - - foreach (Control Ctrol in this.Controls) - { - if (Ctrol is Sunny.UI.UITextBox) - { - Ctrol.Text = ""; - } - if (Ctrol is Sunny.UI.UIComboBox) - { - this.cbSex.SelectedIndex = 0; - this.cbCustoType.SelectedIndex = 0; - this.cbPassportType.SelectedIndex = 0; - } - } - } - - - private void FrmEditInputs_ButtonCancelClick(object sender, EventArgs e) - { - this.Close(); } private void txtCardID_Validated(object sender, EventArgs e) { //获取得到输入的身份证号码 - string identityCard = txtCardID.Text.Trim(); + string identityCard = txtCustomerCardID.Text.Trim(); - if (!cbPassportType.Text.ToString().Contains("身份证")) + if (!cboPassportType.Text.ToString().Contains("身份证")) { - dtpBirthday.Enabled = true; - dtpBirthday.ReadOnly = false; + dtpDateOfBirth.Enabled = true; + dtpDateOfBirth.ReadOnly = false; return; } if (string.IsNullOrEmpty(identityCard)) { //身份证号码不能为空，如果为空返回 - UIMessageBox.ShowError("身份证号码不能为空！"); - if (txtCardID.CanFocus) + NotificationService.ShowError("身份证号码不能为空！"); + if (txtCustomerCardID.CanFocus) { - txtCardID.Focus();//设置当前输入焦点为txtCardID_identityCard + txtCustomerCardID.Focus();//设置当前输入焦点为txtCardID_identityCard } return; } @@ -252,11 +213,7 @@ namespace EOM.TSHotelManagement.FormUI //身份证号码只能为15位或18位其它不合法 if (identityCard.Length != 15 && identityCard.Length != 18) { - UIMessageBox.ShowWarning("身份证号码为15位或18位，请检查！"); - if (txtCardID.CanFocus) - { - txtCardID.Focus(); - } + NotificationService.ShowWarning("身份证号码为15位或18位，请检查！"); return; } } @@ -264,36 +221,32 @@ namespace EOM.TSHotelManagement.FormUI if (identityCard.Length == 18) { var result = ApplicationUtil.SearchCode(identityCard); - if (result.message.IsNullOrEmpty()) //如果没有错误消息输出，则代表成功 + if (string.IsNullOrEmpty(result.message)) //如果没有错误消息输出，则代表成功 { try { - cbSex.Text = result.sex ?? string.Empty; - txtCustoAdress.Text = result.address ?? string.Empty; + cboGender.Text = result.sex ?? string.Empty; + txtCustomerAddress.Text = result.address ?? string.Empty; if (DateTime.TryParse(result.birthday, out DateTime parsedDate)) { - dtpBirthday.Value = parsedDate; + dtpDateOfBirth.Value = parsedDate; } else { - UIMessageBox.ShowError("请正确输入证件号码！"); + NotificationService.ShowError("请正确输入证件号码！"); return; } } catch { - UIMessageBox.ShowError("请正确输入证件号码！"); + NotificationService.ShowError("请正确输入证件号码！"); return; } - finally - { - cbPassportType.SelectedIndex = 0; - } } else { - UIMessageBox.ShowError(result.message); + NotificationService.ShowError(result.message); return; } } diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.resx similarity index 94% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.resx rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.resx index 79f7d218268707b7a8a373a6c304f22c06bddaac..a70dd336ed3503a079691d86a4b36368133755ee 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.resx +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.resx @@ -1,17 +1,17 @@  - diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.Designer.cs new file mode 100644 index 0000000000000000000000000000000000000000..507d2a8d369a1fa67038f70ca64f2f18084303c9 --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.Designer.cs @@ -0,0 +1,283 @@ +namespace EOM.TSHotelManagement.FormUI +{ + partial class FrmPersonnelInfo + { + /// + /// 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(FrmPersonnelInfo)); + label7 = new Label(); + label5 = new Label(); + label32 = new Label(); + label31 = new Label(); + label30 = new Label(); + label1 = new Label(); + label2 = new Label(); + label16 = new Label(); + txtEmployeeId = new AntdUI.Input(); + txtEmployeeName = new AntdUI.Input(); + txtEmployeeAddress = new AntdUI.Input(); + txtEmployeeTel = new AntdUI.Input(); + btnUpdate = new AntdUI.Button(); + cboGender = new AntdUI.Select(); + cboEmployeeNation = new AntdUI.Select(); + cboEmployeePosition = new AntdUI.Select(); + cboEmployeeDepartment = new AntdUI.Select(); + ucWindowHeader1 = new ucWindowHeader(); + SuspendLayout(); + // + // label7 + // + label7.AutoSize = true; + label7.Font = new Font("Noto Sans SC", 14.2499981F); + label7.Location = new Point(18, 214); + label7.Name = "label7"; + label7.Size = new Size(85, 19); + label7.TabIndex = 148; + label7.Text = "联系方式"; + // + // label5 + // + label5.AutoSize = true; + label5.Font = new Font("Noto Sans SC", 14.2499981F); + label5.Location = new Point(329, 112); + label5.Name = "label5"; + label5.Size = new Size(85, 19); + label5.TabIndex = 136; + label5.Text = "现任职位"; + // + // label32 + // + label32.AutoSize = true; + label32.Font = new Font("Noto Sans SC", 14.2499981F); + label32.Location = new Point(18, 61); + label32.Name = "label32"; + label32.Size = new Size(85, 19); + label32.TabIndex = 132; + label32.Text = "员工编号"; + // + // label31 + // + label31.AutoSize = true; + label31.Font = new Font("Noto Sans SC", 14.2499981F); + label31.Location = new Point(18, 112); + label31.Name = "label31"; + label31.Size = new Size(85, 19); + label31.TabIndex = 133; + label31.Text = "员工姓名"; + // + // label30 + // + label30.AutoSize = true; + label30.Font = new Font("Noto Sans SC", 14.2499981F); + label30.Location = new Point(18, 162); + label30.Name = "label30"; + label30.Size = new Size(77, 19); + label30.TabIndex = 134; + label30.Text = "性 别"; + // + // label1 + // + label1.AutoSize = true; + label1.Font = new Font("Noto Sans SC", 14.2499981F); + label1.Location = new Point(329, 162); + label1.Name = "label1"; + label1.Size = new Size(77, 19); + label1.TabIndex = 145; + label1.Text = "民 族"; + // + // label2 + // + label2.AutoSize = true; + label2.Font = new Font("Noto Sans SC", 14.2499981F); + label2.Location = new Point(18, 264); + label2.Name = "label2"; + label2.Size = new Size(85, 19); + label2.TabIndex = 137; + label2.Text = "居住地址"; + // + // label16 + // + label16.AutoSize = true; + label16.Font = new Font("Noto Sans SC", 14.2499981F); + label16.Location = new Point(329, 61); + label16.Name = "label16"; + label16.Size = new Size(85, 19); + label16.TabIndex = 135; + label16.Text = "所在部门"; + // + // txtEmployeeId + // + txtEmployeeId.Font = new Font("Noto Sans SC", 12F); + txtEmployeeId.Location = new Point(103, 51); + txtEmployeeId.Name = "txtEmployeeId"; + txtEmployeeId.ReadOnly = true; + txtEmployeeId.Size = new Size(205, 45); + txtEmployeeId.TabIndex = 149; + // + // txtEmployeeName + // + txtEmployeeName.Font = new Font("Noto Sans SC", 12F); + txtEmployeeName.Location = new Point(103, 102); + txtEmployeeName.Name = "txtEmployeeName"; + txtEmployeeName.Size = new Size(205, 45); + txtEmployeeName.TabIndex = 150; + // + // txtEmployeeAddress + // + txtEmployeeAddress.Font = new Font("Noto Sans SC", 12F); + txtEmployeeAddress.Location = new Point(103, 251); + txtEmployeeAddress.Name = "txtEmployeeAddress"; + txtEmployeeAddress.Size = new Size(515, 45); + txtEmployeeAddress.TabIndex = 151; + // + // txtEmployeeTel + // + txtEmployeeTel.Font = new Font("Noto Sans SC", 12F); + txtEmployeeTel.Location = new Point(104, 202); + txtEmployeeTel.Name = "txtEmployeeTel"; + txtEmployeeTel.Size = new Size(515, 45); + txtEmployeeTel.TabIndex = 152; + // + // btnUpdate + // + btnUpdate.Font = new Font("Noto Sans SC", 12F); + btnUpdate.Location = new Point(530, 302); + btnUpdate.Name = "btnUpdate"; + btnUpdate.Size = new Size(87, 43); + btnUpdate.TabIndex = 157; + btnUpdate.Text = "修 改"; + btnUpdate.Type = AntdUI.TTypeMini.Info; + btnUpdate.Click += btnUpdate_Click; + // + // cboGender + // + cboGender.Font = new Font("Noto Sans SC", 12F); + cboGender.List = true; + cboGender.ListAutoWidth = true; + cboGender.Location = new Point(103, 152); + cboGender.Name = "cboGender"; + cboGender.Placement = AntdUI.TAlignFrom.Bottom; + cboGender.Size = new Size(205, 45); + cboGender.TabIndex = 175; + // + // cboEmployeeNation + // + cboEmployeeNation.Font = new Font("Noto Sans SC", 12F); + cboEmployeeNation.List = true; + cboEmployeeNation.ListAutoWidth = true; + cboEmployeeNation.Location = new Point(413, 152); + cboEmployeeNation.Name = "cboEmployeeNation"; + cboEmployeeNation.Placement = AntdUI.TAlignFrom.Bottom; + cboEmployeeNation.Size = new Size(204, 45); + cboEmployeeNation.TabIndex = 176; + // + // cboEmployeePosition + // + cboEmployeePosition.Font = new Font("Noto Sans SC", 12F); + cboEmployeePosition.List = true; + cboEmployeePosition.ListAutoWidth = true; + cboEmployeePosition.Location = new Point(413, 102); + cboEmployeePosition.Name = "cboEmployeePosition"; + cboEmployeePosition.Placement = AntdUI.TAlignFrom.Bottom; + cboEmployeePosition.Size = new Size(205, 45); + cboEmployeePosition.TabIndex = 177; + // + // cboEmployeeDepartment + // + cboEmployeeDepartment.Font = new Font("Noto Sans SC", 12F); + cboEmployeeDepartment.List = true; + cboEmployeeDepartment.ListAutoWidth = true; + cboEmployeeDepartment.Location = new Point(413, 51); + cboEmployeeDepartment.Name = "cboEmployeeDepartment"; + cboEmployeeDepartment.Placement = AntdUI.TAlignFrom.Bottom; + cboEmployeeDepartment.Size = new Size(205, 45); + cboEmployeeDepartment.TabIndex = 178; + // + // ucWindowHeader1 + // + ucWindowHeader1.Location = new Point(-1, -1); + ucWindowHeader1.Name = "ucWindowHeader1"; + ucWindowHeader1.Size = new Size(639, 35); + ucWindowHeader1.TabIndex = 179; + // + // FrmPersonnelInfo + // + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.FromArgb(235, 243, 255); + ClientSize = new Size(637, 359); + Controls.Add(ucWindowHeader1); + Controls.Add(cboEmployeeDepartment); + Controls.Add(cboEmployeePosition); + Controls.Add(cboEmployeeNation); + Controls.Add(cboGender); + Controls.Add(btnUpdate); + Controls.Add(txtEmployeeTel); + Controls.Add(txtEmployeeAddress); + Controls.Add(txtEmployeeName); + Controls.Add(txtEmployeeId); + Controls.Add(label7); + Controls.Add(label5); + Controls.Add(label32); + Controls.Add(label31); + Controls.Add(label30); + Controls.Add(label1); + Controls.Add(label2); + Controls.Add(label16); + FormBorderStyle = FormBorderStyle.None; + Icon = (Icon)resources.GetObject("$this.Icon"); + Name = "FrmPersonnelInfo"; + Resizable = false; + StartPosition = FormStartPosition.CenterScreen; + Text = "FrmPersonnelInfo"; + Load += FrmPersonnelInfo_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label label7; + private Label label5; + private Label label32; + private Label label31; + private Label label30; + private Label label1; + private Label label2; + private Label label16; + private AntdUI.Input txtEmployeeId; + private AntdUI.Input txtEmployeeName; + private AntdUI.Input txtEmployeeAddress; + private AntdUI.Input txtEmployeeTel; + private AntdUI.Button btnUpdate; + private AntdUI.Select cboGender; + private AntdUI.Select cboEmployeeNation; + private AntdUI.Select cboEmployeePosition; + private AntdUI.Select cboEmployeeDepartment; + private ucWindowHeader ucWindowHeader1; + } +} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.cs new file mode 100644 index 0000000000000000000000000000000000000000..f30ffe8b32a84d91384640b28e7d5e81ade24bb6 --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.cs @@ -0,0 +1,170 @@ +using AntdUI; +using EOM.TSHotelManagement.Common; +using EOM.TSHotelManagement.Common.Contract; +using jvncorelib.EntityLib; +using System.Data; + +namespace EOM.TSHotelManagement.FormUI +{ + public partial class FrmPersonnelInfo : Window + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmPersonnelInfo)); + public FrmPersonnelInfo() + { + InitializeComponent(); + + ucWindowHeader1.ApplySettingsWithoutMinimize("我的信息", string.Empty, (Image)resources.GetObject("FrmPersonnelInfo.Icon")!); + } + + private void FrmPersonnelInfo_Load(object sender, EventArgs e) + { + + //加载民族信息 + Dictionary dic = new Dictionary + { + { nameof(ReadNationInputDto.IsDelete), "0" }, + { nameof(ReadNationInputDto.IgnorePaging), "true" } + }; + var result = HttpHelper.Request(ApiConstants.Base_SelectNationAll, dic); + var nations = HttpHelper.JsonToModel>(result.message); + if (nations.Success == false) + { + NotificationService.ShowError($"{ApiConstants.Base_SelectNationAll}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + cboEmployeeNation.Items.AddRange(nations.Data.Items.Select(item => new AntdUI.SelectItem(item.NationName, item.NationNumber)).ToArray()); + //加载性别信息 + dic = new Dictionary + { + { nameof(ReadGenderTypeInputDto.IsDelete) , "0" }, + { nameof(ReadGenderTypeInputDto.IgnorePaging) , "true" } + }; + result = HttpHelper.Request(ApiConstants.Base_SelectGenderTypeAll, dic); + var genderTypes = HttpHelper.JsonToModel>(result.message); + if (genderTypes.Success == false) + { + NotificationService.ShowError($"{ApiConstants.Base_SelectGenderTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + cboGender.Items.AddRange(genderTypes.Data.Items.Select(item => new AntdUI.SelectItem(item.Description, item.Id)).ToArray()); + //加载部门信息 + result = HttpHelper.Request(ApiConstants.Base_SelectDeptAllCanUse); + var depts = HttpHelper.JsonToModel>(result.message); + if (depts.Success == false) + { + NotificationService.ShowError($"{ApiConstants.Base_SelectDeptAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + cboEmployeeDepartment.Items.AddRange(depts.Data.Items.Select(item => new AntdUI.SelectItem(item.DepartmentName, item.DepartmentNumber)).ToArray()); + //加载职位信息 + dic = new Dictionary + { + { nameof(ReadPositionInputDto.IsDelete), "0" }, + { nameof(ReadPositionInputDto.IgnorePaging), "true" } + }; + result = HttpHelper.Request(ApiConstants.Base_SelectPositionAll, dic); + var positions = HttpHelper.JsonToModel>(result.message); + if (positions.Success == false) + { + NotificationService.ShowError($"{ApiConstants.Base_SelectPositionAll}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + cboEmployeePosition.Items.AddRange(positions.Data.Items.Select(item => new AntdUI.SelectItem(item.PositionName, item.PositionNumber)).ToArray()); + + LoadPersonnelInfo(); + } + + private void LoadPersonnelInfo() + { + var dic = new Dictionary + { + { nameof(ReadEmployeeInputDto.EmployeeId) , LoginInfo.WorkerNo } + }; + var result = HttpHelper.Request(ApiConstants.Employee_SelectEmployeeInfoByEmployeeId, dic); + var employees = HttpHelper.JsonToModel>(result.message); + if (employees.Success == false) + { + NotificationService.ShowError($"{ApiConstants.Employee_SelectEmployeeInfoByEmployeeId}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + ReadEmployeeOutputDto worker = employees.Data; + if (!worker.IsNullOrEmpty()) + { + txtEmployeeId.Text = worker.EmployeeId; + txtEmployeeName.Text = worker.EmployeeName; + cboGender.SelectedValue = worker.Gender; + cboEmployeePosition.Text = worker.PositionName; + cboEmployeePosition.SelectedValue = worker.Position; + cboEmployeeDepartment.Text = worker.DepartmentName; + cboEmployeeDepartment.SelectedValue = worker.Department; + cboEmployeeNation.Text = worker.EthnicityName; + cboEmployeeNation.SelectedValue = worker.Ethnicity; + txtEmployeeAddress.Text = worker.Address; + txtEmployeeTel.Text = worker.PhoneNumber; + } + Refresh(); + } + + public bool CheckInput(UpdateEmployeeInputDto worker) + { + if (string.IsNullOrWhiteSpace(worker.EmployeeId)) + { + return false; + } + if (string.IsNullOrWhiteSpace(worker.EmployeeName)) + { + return false; + } + if (string.IsNullOrWhiteSpace(worker.Gender + "")) + { + return false; + } + if (string.IsNullOrWhiteSpace(worker.Ethnicity)) + { + return false; + } + if (string.IsNullOrWhiteSpace(worker.PhoneNumber)) + { + return false; + } + if (string.IsNullOrWhiteSpace(worker.Address)) + { + return false; + } + return true; + } + + ResponseMsg result = new ResponseMsg(); + private void btnUpdate_Click(object sender, EventArgs e) + { + UpdateEmployeeInputDto worker = new UpdateEmployeeInputDto() + { + EmployeeId = txtEmployeeId.Text.Trim(), + EmployeeName = txtEmployeeName.Text.Trim(), + Gender = cboGender.Text == "男" ? 1 : 0, + Ethnicity = cboEmployeeNation.SelectedValue.ToString(), + PhoneNumber = txtEmployeeTel.Text.Trim(), + Address = txtEmployeeAddress.Text.Trim(), + DataChgUsr = LoginInfo.WorkerNo, + DataChgDate = DateTime.Now + }; + + if (CheckInput(worker)) + { + result = HttpHelper.Request(ApiConstants.Employee_UpdateEmployee, worker.ModelToJson()); + var response = HttpHelper.JsonToModel(result.message); + if (response.Success == false) + { + NotificationService.ShowError($"{ApiConstants.Employee_UpdateEmployee}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + NotificationService.ShowSuccess("修改成功！"); + #region 获取添加操作日志所需的信息 + RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "修改个人信息操作！", Common.Core.LogLevel.Warning); + #endregion + LoadPersonnelInfo(); + return; + } + } + } +} diff --git a/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.resx similarity index 75% rename from EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.resx rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.resx index 98b3243196168d3e1232b6dab2d7bda1900d3d0a..e072779bb13c5f4e65afc2344f9f08d4cc044486 100644 --- a/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.resx +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.resx @@ -117,7 +117,27 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - + + + + AAABAAEAICAAAAEAGAASBAAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAAFz + UkdCAK7OHOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA7DAAAOwwHHb6hkAAADp0lEQVRYR7WXWYhP + URzHx5pliGEkSyhJeCCJZHsgpSxZx5pkT0h2CYkHpQYJKeRBliyFEoMiWVIj2bLmwYOdeCDM+HzP/c5/ + TPP3n/u/xrc+nXN+27n/+7/3nHNz4qqkpKQrTIYNcBwOwurS0tJxkOuw/yMmGgsPmSit8N2CPg6vXlF4 + IXN88kQ3oBAKYA7swnzbvg8w1WnVIwqOhMfwFpYwTxO7Kgjfcl+E7lJ7m/9NKkTB/fAN5tmcVvjrw274 + CtttTi4mr02hKfAOTkEXu/4qYtrAK3gBBTYnEwXyYQs8gfE2ZxRxjWErvId1NicTBTqBXrVr0N/mjOKu + 1SN2JvyEQzYnEwX6QDHo9neyOaO4gJrE9qXVw3gZ2tmVvUjuBXq3z0MPmzOKeesQO9IXUASt7MpeJHeD + c3AHhtmcUcQ1ZO6VvoAzUN+u7EVya9gJeguWxinGvM2JOw16FQttTi6KaPnV6vYcRtucVkyu2z/fv/4Z + jLEruagVFiIXvQK97aokQgY57iPNepv/XRTU23DZxV/DNrr9oJ79w2GP/BL94pBYnaLoANAd+OV5NNFT + +AwlHv+AY3Rr0HaEjTDBJXSHujNeDAPoh4uPJYKbkDQD7tP/q/B/oRkMs+k/sO0BTKTbk/asba9p1tPm + eYr0IiCfQBW76cTvoGX5JKyDYTAa1uI+SqsluFCxcUSs7lAjT1dR+PXwHY5CQ/B1GAENHVJJhGnzKogy + qhaxu2kqb+0YW8IBB2lXWwVt7c4oUtorL46ouYimgVMjYdD/rROOAh7TjLOrShFbVxer3DIxfgl7QQua + 6qXE+AQ0c3qqwAo7tafPtatKEatnoli5ZWJ8laazQxSjrfpI5I3EuIhmegigkwu3MWrlWxOMMaVif4r8 + tAcSbGGDc1hKZU69atrHr0J+MMaU66RE/l2annanhF3HtjNRVLnKnBfpf6JdHAxZKCpTLmroYDrI7pSw + t4DzUVS55BiiDq02nQ6Ojy1y7oVKFuM3sMzulHCNwl7h20JjFVgAWmg2OTYrkZcHkyCsdhJ9TTTKIYrR + V5UeuiD6OkFPhTw5d8BX7JVuWzYiv8I6QE0d5x/BXdf/U1q2a4VEnDp2fQyDhFIxagwPpWOI2Ak0dUMy + g5eRObH0+uoB074QS8RuhmgvoPPC9sSiRg/oAJdskk3rgf7rbRB2SIm+zosD6dYJF0BH/51ONImgWOqr + iXEu42lwAVbYrB85FPbBLGKa2oxycn4DnUXgUUEkWqsAAAAASUVORK5CYII= + + \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmProgress.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmProgress.Designer.cs similarity index 97% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmProgress.Designer.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmProgress.Designer.cs index b8e70e1501139842b7fb07c79e8b427603cf5327..80684614f47bb0621b30a36b81a48dd064560968 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmProgress.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmProgress.Designer.cs @@ -35,6 +35,7 @@ // spin1 // spin1.BackColor = Color.Transparent; + spin1.Font = new Font("Noto Sans SC", 10F); spin1.Location = new Point(7, 13); spin1.Name = "spin1"; spin1.Size = new Size(141, 84); diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmProgress.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmProgress.cs similarity index 100% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmProgress.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmProgress.cs diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmProgress.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmProgress.resx similarity index 100% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmProgress.resx rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmProgress.resx diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.Designer.cs similarity index 32% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.Designer.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.Designer.cs index ea0c6c50c40701283f59008f249fd65d055185ca..0611e42b986340c964218979c5c080ed8cde85ae 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.Designer.cs @@ -29,15 +29,6 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmReserList)); - cbCustoType = new Sunny.UI.UIComboBox(); - cbPassportType = new Sunny.UI.UIComboBox(); - cbSex = new Sunny.UI.UIComboBox(); - txtCustoNo = new Sunny.UI.UITextBox(); - txtCustoName = new Sunny.UI.UITextBox(); - txtCardID = new Sunny.UI.UITextBox(); - txtTel = new Sunny.UI.UITextBox(); - dtpBirthday = new Sunny.UI.UIDatePicker(); - txtCustoAdress = new Sunny.UI.UITextBox(); label10 = new Label(); label9 = new Label(); label8 = new Label(); @@ -47,303 +38,125 @@ label4 = new Label(); label3 = new Label(); label2 = new Label(); - btnSelect = new Sunny.UI.UIButton(); dgvReserList = new AntdUI.Table(); btnPg = new AntdUI.Pagination(); + ucWindowHeader1 = new ucWindowHeader(); + btnOk = new AntdUI.Button(); + txtCustomerName = new AntdUI.Input(); + txtCustomerId = new AntdUI.Input(); + txtCustomerAddress = new AntdUI.Input(); + txtCustomerTel = new AntdUI.Input(); + txtCustomerCardID = new AntdUI.Input(); + dtpDateOfBirth = new AntdUI.DatePicker(); + cboCustomerType = new AntdUI.Select(); + cboPassportType = new AntdUI.Select(); + cboGender = new AntdUI.Select(); SuspendLayout(); // - // cbCustoType - // - cbCustoType.DataSource = null; - cbCustoType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - cbCustoType.FillColor = Color.White; - cbCustoType.Font = new Font("微软雅黑", 15.75F); - cbCustoType.ItemHoverColor = Color.FromArgb(155, 200, 255); - cbCustoType.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - cbCustoType.Location = new Point(499, 290); - cbCustoType.Margin = new Padding(4, 5, 4, 5); - cbCustoType.MinimumSize = new Size(63, 0); - cbCustoType.Name = "cbCustoType"; - cbCustoType.Padding = new Padding(0, 0, 30, 2); - cbCustoType.Radius = 20; - cbCustoType.ReadOnly = true; - cbCustoType.Size = new Size(250, 35); - cbCustoType.SymbolSize = 24; - cbCustoType.TabIndex = 134; - cbCustoType.TextAlignment = ContentAlignment.MiddleLeft; - cbCustoType.Watermark = ""; - // - // cbPassportType - // - cbPassportType.DataSource = null; - cbPassportType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - cbPassportType.FillColor = Color.White; - cbPassportType.Font = new Font("微软雅黑", 15.75F); - cbPassportType.ItemHoverColor = Color.FromArgb(155, 200, 255); - cbPassportType.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - cbPassportType.Location = new Point(499, 341); - cbPassportType.Margin = new Padding(4, 5, 4, 5); - cbPassportType.MinimumSize = new Size(63, 0); - cbPassportType.Name = "cbPassportType"; - cbPassportType.Padding = new Padding(0, 0, 30, 2); - cbPassportType.Radius = 20; - cbPassportType.Size = new Size(250, 35); - cbPassportType.SymbolSize = 24; - cbPassportType.TabIndex = 133; - cbPassportType.TextAlignment = ContentAlignment.MiddleLeft; - cbPassportType.Watermark = ""; - // - // cbSex - // - cbSex.DataSource = null; - cbSex.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - cbSex.FillColor = Color.White; - cbSex.Font = new Font("微软雅黑", 15.75F); - cbSex.ItemHoverColor = Color.FromArgb(155, 200, 255); - cbSex.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - cbSex.Location = new Point(123, 397); - cbSex.Margin = new Padding(4, 5, 4, 5); - cbSex.MinimumSize = new Size(63, 0); - cbSex.Name = "cbSex"; - cbSex.Padding = new Padding(0, 0, 30, 2); - cbSex.Radius = 20; - cbSex.Size = new Size(250, 35); - cbSex.SymbolSize = 24; - cbSex.TabIndex = 132; - cbSex.TextAlignment = ContentAlignment.MiddleLeft; - cbSex.Watermark = ""; - // - // txtCustoNo - // - txtCustoNo.Cursor = Cursors.IBeam; - txtCustoNo.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustoNo.Location = new Point(123, 293); - txtCustoNo.Margin = new Padding(4, 5, 4, 5); - txtCustoNo.MinimumSize = new Size(1, 1); - txtCustoNo.Name = "txtCustoNo"; - txtCustoNo.Padding = new Padding(5); - txtCustoNo.Radius = 20; - txtCustoNo.ReadOnly = true; - txtCustoNo.ShowText = false; - txtCustoNo.Size = new Size(250, 35); - txtCustoNo.Style = Sunny.UI.UIStyle.Custom; - txtCustoNo.StyleCustomMode = true; - txtCustoNo.TabIndex = 131; - txtCustoNo.TextAlignment = ContentAlignment.MiddleLeft; - txtCustoNo.Watermark = ""; - // - // txtCustoName - // - txtCustoName.Cursor = Cursors.IBeam; - txtCustoName.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustoName.Location = new Point(123, 345); - txtCustoName.Margin = new Padding(4, 5, 4, 5); - txtCustoName.MinimumSize = new Size(1, 1); - txtCustoName.Name = "txtCustoName"; - txtCustoName.Padding = new Padding(5); - txtCustoName.Radius = 20; - txtCustoName.ShowText = false; - txtCustoName.Size = new Size(250, 35); - txtCustoName.Style = Sunny.UI.UIStyle.Custom; - txtCustoName.StyleCustomMode = true; - txtCustoName.TabIndex = 130; - txtCustoName.TextAlignment = ContentAlignment.MiddleLeft; - txtCustoName.Watermark = ""; - // - // txtCardID - // - txtCardID.Cursor = Cursors.IBeam; - txtCardID.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCardID.Location = new Point(499, 392); - txtCardID.Margin = new Padding(4, 5, 4, 5); - txtCardID.MinimumSize = new Size(1, 1); - txtCardID.Name = "txtCardID"; - txtCardID.Padding = new Padding(5); - txtCardID.Radius = 20; - txtCardID.ShowText = false; - txtCardID.Size = new Size(250, 35); - txtCardID.Style = Sunny.UI.UIStyle.Custom; - txtCardID.StyleCustomMode = true; - txtCardID.TabIndex = 129; - txtCardID.TextAlignment = ContentAlignment.MiddleLeft; - txtCardID.Watermark = ""; - txtCardID.Validated += txtCardID_Validated; - // - // txtTel - // - txtTel.Cursor = Cursors.IBeam; - txtTel.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtTel.Location = new Point(499, 443); - txtTel.Margin = new Padding(4, 5, 4, 5); - txtTel.MinimumSize = new Size(1, 1); - txtTel.Name = "txtTel"; - txtTel.Padding = new Padding(5); - txtTel.Radius = 20; - txtTel.ShowText = false; - txtTel.Size = new Size(250, 35); - txtTel.Style = Sunny.UI.UIStyle.Custom; - txtTel.StyleCustomMode = true; - txtTel.TabIndex = 128; - txtTel.TextAlignment = ContentAlignment.MiddleLeft; - txtTel.Watermark = ""; - // - // dtpBirthday - // - dtpBirthday.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - dtpBirthday.FillColor = Color.White; - dtpBirthday.Font = new Font("Microsoft Sans Serif", 15.75F); - dtpBirthday.Location = new Point(123, 449); - dtpBirthday.Margin = new Padding(4, 5, 4, 5); - dtpBirthday.MaxLength = 10; - dtpBirthday.MinimumSize = new Size(63, 0); - dtpBirthday.Name = "dtpBirthday"; - dtpBirthday.Padding = new Padding(0, 0, 30, 2); - dtpBirthday.Radius = 20; - dtpBirthday.ReadOnly = true; - dtpBirthday.Size = new Size(250, 31); - dtpBirthday.SymbolDropDown = 61555; - dtpBirthday.SymbolNormal = 61555; - dtpBirthday.SymbolSize = 24; - dtpBirthday.TabIndex = 127; - dtpBirthday.Text = "2020-11-24"; - dtpBirthday.TextAlignment = ContentAlignment.MiddleLeft; - dtpBirthday.Value = new DateTime(2020, 11, 24, 22, 50, 36, 791); - dtpBirthday.Watermark = ""; - // - // txtCustoAdress - // - txtCustoAdress.Cursor = Cursors.IBeam; - txtCustoAdress.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustoAdress.Location = new Point(121, 497); - txtCustoAdress.Margin = new Padding(4, 5, 4, 5); - txtCustoAdress.MinimumSize = new Size(1, 1); - txtCustoAdress.Name = "txtCustoAdress"; - txtCustoAdress.Padding = new Padding(5); - txtCustoAdress.Radius = 20; - txtCustoAdress.ShowText = false; - txtCustoAdress.Size = new Size(628, 35); - txtCustoAdress.Style = Sunny.UI.UIStyle.Custom; - txtCustoAdress.StyleCustomMode = true; - txtCustoAdress.TabIndex = 126; - txtCustoAdress.TextAlignment = ContentAlignment.MiddleLeft; - txtCustoAdress.Watermark = ""; - // // label10 // label10.AutoSize = true; - label10.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label10.Location = new Point(14, 505); + label10.Font = new Font("Noto Sans SC", 14.2499981F); + label10.Location = new Point(30, 508); label10.Name = "label10"; - label10.Size = new Size(88, 25); + label10.Size = new Size(85, 19); label10.TabIndex = 122; label10.Text = "居住地址"; // // label9 // label9.AutoSize = true; - label9.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label9.Location = new Point(403, 450); + label9.Font = new Font("Noto Sans SC", 14.2499981F); + label9.Location = new Point(408, 457); label9.Name = "label9"; - label9.Size = new Size(88, 25); + label9.Size = new Size(85, 19); label9.TabIndex = 121; label9.Text = "联系方式"; // // label8 // label8.AutoSize = true; - label8.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label8.Location = new Point(403, 399); + label8.Font = new Font("Noto Sans SC", 14.2499981F); + label8.Location = new Point(408, 404); label8.Name = "label8"; - label8.Size = new Size(88, 25); + label8.Size = new Size(85, 19); label8.TabIndex = 120; label8.Text = "证件号码"; // // label7 // label7.AutoSize = true; - label7.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label7.Location = new Point(403, 348); + label7.Font = new Font("Noto Sans SC", 14.2499981F); + label7.Location = new Point(408, 354); label7.Name = "label7"; - label7.Size = new Size(88, 25); + label7.Size = new Size(85, 19); label7.TabIndex = 119; label7.Text = "证件类型"; // // label6 // label6.AutoSize = true; - label6.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label6.Location = new Point(403, 297); + label6.Font = new Font("Noto Sans SC", 14.2499981F); + label6.Location = new Point(408, 304); label6.Name = "label6"; - label6.Size = new Size(88, 25); + label6.Size = new Size(85, 19); label6.TabIndex = 118; label6.Text = "客户类型"; // // label5 // label5.AutoSize = true; - label5.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label5.Location = new Point(16, 453); + label5.Font = new Font("Noto Sans SC", 14.2499981F); + label5.Location = new Point(28, 457); label5.Name = "label5"; - label5.Size = new Size(88, 25); + label5.Size = new Size(85, 19); label5.TabIndex = 117; label5.Text = "出生日期"; // // label4 // label4.AutoSize = true; - label4.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label4.Location = new Point(16, 401); + label4.Font = new Font("Noto Sans SC", 14.2499981F); + label4.Location = new Point(38, 406); label4.Name = "label4"; - label4.Size = new Size(86, 25); + label4.Size = new Size(77, 19); label4.TabIndex = 116; label4.Text = "性 别"; // // label3 // label3.AutoSize = true; - label3.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label3.Location = new Point(16, 349); + label3.Font = new Font("Noto Sans SC", 14.2499981F); + label3.Location = new Point(30, 355); label3.Name = "label3"; - label3.Size = new Size(88, 25); + label3.Size = new Size(85, 19); label3.TabIndex = 115; label3.Text = "客户姓名"; // // label2 // label2.AutoSize = true; - label2.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label2.Location = new Point(16, 297); + label2.Font = new Font("Noto Sans SC", 14.2499981F); + label2.Location = new Point(30, 304); label2.Name = "label2"; - label2.Size = new Size(88, 25); + label2.Size = new Size(85, 19); label2.TabIndex = 114; label2.Text = "客户编号"; // - // btnSelect - // - btnSelect.Cursor = Cursors.Hand; - btnSelect.Font = new Font("微软雅黑", 12F); - btnSelect.Location = new Point(19, 44); - btnSelect.MinimumSize = new Size(1, 1); - btnSelect.Name = "btnSelect"; - btnSelect.Radius = 15; - btnSelect.Size = new Size(129, 29); - btnSelect.TabIndex = 135; - btnSelect.Text = "入住并注册"; - btnSelect.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - btnSelect.Click += btnSelect_Click; - // // dgvReserList // - dgvReserList.Location = new Point(14, 83); + dgvReserList.Font = new Font("Noto Sans SC", 9F); + dgvReserList.Gap = 12; + dgvReserList.Location = new Point(14, 87); dgvReserList.Name = "dgvReserList"; - dgvReserList.Size = new Size(735, 160); + dgvReserList.Size = new Size(735, 156); dgvReserList.TabIndex = 136; dgvReserList.Text = "table1"; dgvReserList.CellClick += dgvReserList_CellClick; // // btnPg // - btnPg.Current = 0; + btnPg.Font = new Font("Noto Sans SC", 9F); btnPg.Location = new Point(14, 253); btnPg.Name = "btnPg"; btnPg.PageSize = 15; @@ -354,23 +167,126 @@ btnPg.ValueChanged += btnPg_ValueChanged; btnPg.ShowTotalChanged += btnPg_ShowTotalChanged; // + // ucWindowHeader1 + // + ucWindowHeader1.Location = new Point(1, 1); + ucWindowHeader1.Name = "ucWindowHeader1"; + ucWindowHeader1.Size = new Size(761, 35); + ucWindowHeader1.TabIndex = 138; + // + // btnOk + // + btnOk.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnOk.Location = new Point(14, 36); + btnOk.Name = "btnOk"; + btnOk.Size = new Size(135, 45); + btnOk.TabIndex = 139; + btnOk.Text = "入住并注册"; + btnOk.Type = AntdUI.TTypeMini.Info; + btnOk.Click += btnSelect_Click; + // + // txtCustomerName + // + txtCustomerName.Font = new Font("Noto Sans SC", 12F); + txtCustomerName.Location = new Point(121, 343); + txtCustomerName.Name = "txtCustomerName"; + txtCustomerName.Size = new Size(252, 45); + txtCustomerName.TabIndex = 155; + // + // txtCustomerId + // + txtCustomerId.Font = new Font("Noto Sans SC", 12F); + txtCustomerId.Location = new Point(121, 290); + txtCustomerId.Name = "txtCustomerId"; + txtCustomerId.ReadOnly = true; + txtCustomerId.Size = new Size(252, 45); + txtCustomerId.TabIndex = 154; + // + // txtCustomerAddress + // + txtCustomerAddress.Font = new Font("Noto Sans SC", 12F); + txtCustomerAddress.Location = new Point(121, 496); + txtCustomerAddress.Name = "txtCustomerAddress"; + txtCustomerAddress.Size = new Size(628, 45); + txtCustomerAddress.TabIndex = 157; + // + // txtCustomerTel + // + txtCustomerTel.Font = new Font("Noto Sans SC", 12F); + txtCustomerTel.Location = new Point(501, 444); + txtCustomerTel.Name = "txtCustomerTel"; + txtCustomerTel.Size = new Size(250, 43); + txtCustomerTel.TabIndex = 158; + // + // txtCustomerCardID + // + txtCustomerCardID.Font = new Font("Noto Sans SC", 12F); + txtCustomerCardID.Location = new Point(501, 394); + txtCustomerCardID.Name = "txtCustomerCardID"; + txtCustomerCardID.Size = new Size(250, 45); + txtCustomerCardID.TabIndex = 159; + txtCustomerCardID.Validated += txtCardID_Validated; + // + // dtpDateOfBirth + // + dtpDateOfBirth.Font = new Font("Noto Sans SC", 10F); + dtpDateOfBirth.Location = new Point(120, 444); + dtpDateOfBirth.Name = "dtpDateOfBirth"; + dtpDateOfBirth.Size = new Size(252, 43); + dtpDateOfBirth.TabIndex = 162; + // + // cboCustomerType + // + cboCustomerType.Font = new Font("Noto Sans SC", 12F); + cboCustomerType.List = true; + cboCustomerType.ListAutoWidth = true; + cboCustomerType.Location = new Point(501, 293); + cboCustomerType.Name = "cboCustomerType"; + cboCustomerType.Placement = AntdUI.TAlignFrom.Bottom; + cboCustomerType.Size = new Size(251, 45); + cboCustomerType.TabIndex = 178; + // + // cboPassportType + // + cboPassportType.Font = new Font("Noto Sans SC", 12F); + cboPassportType.List = true; + cboPassportType.ListAutoWidth = true; + cboPassportType.Location = new Point(501, 343); + cboPassportType.Name = "cboPassportType"; + cboPassportType.Placement = AntdUI.TAlignFrom.Bottom; + cboPassportType.Size = new Size(251, 45); + cboPassportType.TabIndex = 177; + // + // cboGender + // + cboGender.Font = new Font("Noto Sans SC", 12F); + cboGender.List = true; + cboGender.ListAutoWidth = true; + cboGender.Location = new Point(122, 394); + cboGender.Name = "cboGender"; + cboGender.Placement = AntdUI.TAlignFrom.Bottom; + cboGender.Size = new Size(251, 45); + cboGender.TabIndex = 179; + // // FrmReserList // AutoScaleMode = AutoScaleMode.None; + BackColor = Color.FromArgb(235, 243, 255); BackgroundImageLayout = ImageLayout.Stretch; ClientSize = new Size(763, 556); + Controls.Add(cboGender); + Controls.Add(cboCustomerType); + Controls.Add(cboPassportType); + Controls.Add(dtpDateOfBirth); + Controls.Add(txtCustomerCardID); + Controls.Add(txtCustomerTel); + Controls.Add(txtCustomerAddress); + Controls.Add(txtCustomerName); + Controls.Add(txtCustomerId); + Controls.Add(btnOk); + Controls.Add(ucWindowHeader1); Controls.Add(btnPg); Controls.Add(dgvReserList); - Controls.Add(btnSelect); - Controls.Add(cbCustoType); - Controls.Add(cbPassportType); - Controls.Add(cbSex); - Controls.Add(txtCustoNo); - Controls.Add(txtCustoName); - Controls.Add(txtCardID); - Controls.Add(txtTel); - Controls.Add(dtpBirthday); - Controls.Add(txtCustoAdress); Controls.Add(label10); Controls.Add(label9); Controls.Add(label8); @@ -380,26 +296,18 @@ Controls.Add(label4); Controls.Add(label3); Controls.Add(label2); + FormBorderStyle = FormBorderStyle.None; Icon = (Icon)resources.GetObject("$this.Icon"); Name = "FrmReserList"; - ShowTitleIcon = true; + Resizable = false; + StartPosition = FormStartPosition.CenterScreen; Text = "预约列表"; - ZoomScaleRect = new Rectangle(15, 15, 763, 556); Load += FrmReserList_Load; ResumeLayout(false); PerformLayout(); } #endregion - private Sunny.UI.UIComboBox cbCustoType; - private Sunny.UI.UIComboBox cbPassportType; - private Sunny.UI.UIComboBox cbSex; - private Sunny.UI.UITextBox txtCustoNo; - private Sunny.UI.UITextBox txtCustoName; - private Sunny.UI.UITextBox txtCardID; - private Sunny.UI.UITextBox txtTel; - private Sunny.UI.UIDatePicker dtpBirthday; - private Sunny.UI.UITextBox txtCustoAdress; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label8; @@ -409,8 +317,18 @@ private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label2; - private Sunny.UI.UIButton btnSelect; private AntdUI.Table dgvReserList; private AntdUI.Pagination btnPg; + private ucWindowHeader ucWindowHeader1; + private AntdUI.Button btnOk; + private AntdUI.Input txtCustomerName; + private AntdUI.Input txtCustomerId; + private AntdUI.Input txtCustomerAddress; + private AntdUI.Input txtCustomerTel; + private AntdUI.Input txtCustomerCardID; + private AntdUI.DatePicker dtpDateOfBirth; + private AntdUI.Select cboCustomerType; + private AntdUI.Select cboPassportType; + private AntdUI.Select cboGender; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.cs similarity index 64% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.cs index 5891c70899095a2dc1b23bc50a351a521e73be65..bf4ef3f29062072ba1fed8b82a654411c9a7dc8a 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.cs @@ -21,18 +21,22 @@ *SOFTWARE. * */ +using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using jvncorelib.CodeLib; -using Sunny.UI; +using jvncorelib.EntityLib; namespace EOM.TSHotelManagement.FormUI { - public partial class FrmReserList : UIForm + public partial class FrmReserList : Window { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmReserList)); public FrmReserList() { InitializeComponent(); + + ucWindowHeader1.ApplySettingsWithoutMinimize("预约列表", string.Empty, (Image)resources.GetObject("FrmReserList.Icon")!); } ResponseMsg result = new ResponseMsg(); @@ -71,21 +75,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.Success == false) { 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,32 +117,25 @@ namespace EOM.TSHotelManagement.FormUI #region 加载客户类型信息 result = HttpHelper.Request(ApiConstants.Base_SelectCustoTypeAllCanUse); var customerTypeDataSource = HttpHelper.JsonToModel>(result.message); - if (customerTypeDataSource.StatusCode != StatusCodeConstants.Success) + if (customerTypeDataSource.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectCustoTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Base_SelectCustoTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - List lstSourceGrid = customerTypeDataSource.listSource; - this.cbCustoType.DataSource = lstSourceGrid; - this.cbCustoType.DisplayMember = nameof(ReadCustoTypeOutputDto.CustomerTypeName); - this.cbCustoType.ValueMember = nameof(ReadCustoTypeOutputDto.CustomerType); - this.cbCustoType.SelectedIndex = 0; - this.cbCustoType.ReadOnly = true; + List lstDataGrid = customerTypeDataSource.Data.Items; + this.cboCustomerType.Items.AddRange(lstDataGrid.Select(item => new AntdUI.SelectItem(item.CustomerTypeName, item.CustomerType)).ToArray()); #endregion #region 加载证件类型信息 result = HttpHelper.Request(ApiConstants.Base_SelectPassPortTypeAllCanUse); var passportDataSource = HttpHelper.JsonToModel>(result.message); - if (passportDataSource.StatusCode != StatusCodeConstants.Success) + if (passportDataSource.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectPassPortTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Base_SelectPassPortTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - List passPorts = passportDataSource.listSource; - this.cbPassportType.DataSource = passPorts; - this.cbPassportType.DisplayMember = nameof(ReadPassportTypeOutputDto.PassportName); - this.cbPassportType.ValueMember = nameof(ReadPassportTypeOutputDto.PassportId); - this.cbPassportType.SelectedIndex = 0; + List passPorts = passportDataSource.Data.Items; + this.cboPassportType.Items.AddRange(passPorts.Select(item => new AntdUI.SelectItem(item.PassportName, item.PassportId)).ToArray()); #endregion #region 加载性别信息 @@ -149,15 +146,13 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Base_SelectGenderTypeAll, dic); var genderTypeDataSource = HttpHelper.JsonToModel>(result.message); - if (genderTypeDataSource.StatusCode != StatusCodeConstants.Success) + if (genderTypeDataSource.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectGenderTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Base_SelectGenderTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - List listSexType = genderTypeDataSource.listSource; - this.cbSex.DataSource = listSexType; - this.cbSex.DisplayMember = nameof(EnumDto.Description); - this.cbSex.ValueMember = nameof(EnumDto.Id); + List listSexType = genderTypeDataSource.Data.Items; + this.cboGender.Items.AddRange(listSexType.Select(item => new AntdUI.SelectItem(item.Description, item.Id)).ToArray()); #endregion } @@ -168,9 +163,9 @@ namespace EOM.TSHotelManagement.FormUI ReservationId = helper.GetValue(data, nameof(ReadReserOutputDto.ReservationId)); RoomNumber = helper.GetValue(data, nameof(ReadReserOutputDto.ReservationRoomNumber)); string custoNo = new UniqueCode().GetNewId("TS-"); - txtCustoNo.Text = custoNo; - txtCustoName.Text = helper.GetValue(data, nameof(ReadReserOutputDto.CustomerName)); - txtTel.Text = helper.GetValue(data, nameof(ReadReserOutputDto.ReservationPhoneNumber)); + txtCustomerId.Text = custoNo; + txtCustomerName.Text = helper.GetValue(data, nameof(ReadReserOutputDto.CustomerName)); + txtCustomerTel.Text = helper.GetValue(data, nameof(ReadReserOutputDto.ReservationPhoneNumber)); } } @@ -180,30 +175,30 @@ namespace EOM.TSHotelManagement.FormUI { ReservationId = ReservationId, RoomNumber = RoomNumber, - CustomerNumber = txtCustoNo.Text.Trim(), - CustomerName = txtCustoName.Text.Trim(), - CustomerType = Convert.ToInt32(cbCustoType.SelectedValue), - CustomerPhoneNumber = txtTel.Text.Trim(), - CustomerAddress = txtCustoAdress.Text.Trim(), - IdCardNumber = txtCardID.Text.Trim(), - PassportId = Convert.ToInt32(cbPassportType.SelectedValue), - CustomerGender = Convert.ToInt32(cbSex.SelectedValue), - DateOfBirth = DateOnly.FromDateTime(dtpBirthday.Value), + CustomerNumber = txtCustomerId.Text.Trim(), + CustomerName = txtCustomerName.Text.Trim(), + CustomerType = Convert.ToInt32(cboCustomerType.SelectedValue), + CustomerPhoneNumber = txtCustomerTel.Text.Trim(), + CustomerAddress = txtCustomerAddress.Text.Trim(), + IdCardNumber = txtCustomerCardID.Text.Trim(), + PassportId = Convert.ToInt32(cboPassportType.SelectedValue), + CustomerGender = Convert.ToInt32(cboGender.SelectedValue), + DateOfBirth = DateOnly.FromDateTime(Convert.ToDateTime(dtpDateOfBirth.Value)), IsDelete = 0, DataInsUsr = LoginInfo.WorkerNo, DataChgUsr = LoginInfo.WorkerNo, DataInsDate = DateTime.Now, DataChgDate = DateTime.Now }; - result = HttpHelper.Request(ApiConstants.Room_CheckinRoomByReservation, HttpHelper.ModelToJson(reser)); - var response = HttpHelper.JsonToModel(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + result = HttpHelper.Request(ApiConstants.Room_CheckinRoomByReservation, reser.ModelToJson()); + var response = HttpHelper.JsonToModel(result.message); + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Room_CheckinRoomByReservation}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_CheckinRoomByReservation}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - UIMessageBox.ShowSuccess("操作成功"); + NotificationService.ShowSuccess("操作成功"); LoadReserData(); FrmRoomManager.Reload(""); FrmRoomManager._RefreshRoomCount(); @@ -213,15 +208,15 @@ namespace EOM.TSHotelManagement.FormUI private void txtCardID_Validated(object sender, EventArgs e) { //获取得到输入的身份证号码 - string identityCard = txtCardID.Text.Trim(); + string identityCard = txtCustomerCardID.Text.Trim(); if (string.IsNullOrEmpty(identityCard)) { //身份证号码不能为空，如果为空返回 - UIMessageBox.ShowError("身份证号码不能为空！"); - if (txtCardID.CanFocus) + NotificationService.ShowWarning("身份证号码不能为空！"); + if (txtCustomerCardID.CanFocus) { - txtCardID.Focus();//设置当前输入焦点为txtCardID_identityCard + txtCustomerCardID.Focus();//设置当前输入焦点为txtCardID_identityCard } return; } @@ -230,10 +225,10 @@ namespace EOM.TSHotelManagement.FormUI //身份证号码只能为15位或18位其它不合法 if (identityCard.Length != 15 && identityCard.Length != 18) { - UIMessageBox.ShowWarning("身份证号码为15位或18位，请检查！"); - if (txtCardID.CanFocus) + NotificationService.ShowWarning("身份证号码为15位或18位，请检查！"); + if (txtCustomerCardID.CanFocus) { - txtCardID.Focus(); + txtCustomerCardID.Focus(); } return; } @@ -242,23 +237,23 @@ namespace EOM.TSHotelManagement.FormUI if (identityCard.Length == 18) { var result = ApplicationUtil.SearchCode(identityCard); - if (result.message.IsNullOrEmpty()) //如果没有错误消息输出，则代表成功 + if (string.IsNullOrEmpty(result.message)) //如果没有错误消息输出，则代表成功 { try { - cbSex.Text = result.sex; - txtCustoAdress.Text = result.address; - dtpBirthday.Value = Convert.ToDateTime(result.birthday); + cboGender.SelectedValue = result.sex; + txtCustomerAddress.Text = result.address; + dtpDateOfBirth.Value = Convert.ToDateTime(result.birthday); } catch { - UIMessageBox.ShowError("请正确输入证件号码！"); + NotificationService.ShowError("请正确输入证件号码！"); return; } } else { - UIMessageBox.ShowError(result.message); + NotificationService.ShowError(result.message); return; } } diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.resx similarity index 100% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.resx rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.resx diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.Designer.cs similarity index 32% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.Designer.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.Designer.cs index 7cb671acb1584689951e4a3bfe7197b0f12fc273..161560671fee8f22c7a67d50a8cc806e7b146268 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.Designer.cs @@ -29,284 +29,212 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmReserManager)); - btnReserList = new Sunny.UI.UIButton(); - txtCustoName = new Sunny.UI.UITextBox(); - txtCustoTel = new Sunny.UI.UITextBox(); label1 = new Label(); label9 = new Label(); - cboReserWay = new Sunny.UI.UIComboBox(); label10 = new Label(); - cboReserRoomNo = new Sunny.UI.UIComboBox(); label11 = new Label(); - dtpBookDate = new Sunny.UI.UIDatePicker(); label12 = new Label(); - dtpEndDate = new Sunny.UI.UIDatePicker(); label13 = new Label(); - btnReser = new Sunny.UI.UIButton(); + btnReserList = new AntdUI.Button(); + btnReser = new AntdUI.Button(); + txtCustoName = new AntdUI.Input(); + txtCustoTel = new AntdUI.Input(); + dtpStartDate = new AntdUI.DatePicker(); + dtpEndDate = new AntdUI.DatePicker(); + whReserRoomManagement = new ucWindowHeader(); + cboReserChannel = new AntdUI.Select(); + cboReserRoom = new AntdUI.Select(); SuspendLayout(); // - // btnReserList - // - btnReserList.Cursor = Cursors.Hand; - btnReserList.Font = new Font("微软雅黑", 12F); - btnReserList.Location = new Point(89, 50); - btnReserList.MinimumSize = new Size(1, 1); - btnReserList.Name = "btnReserList"; - btnReserList.Radius = 15; - btnReserList.Size = new Size(136, 35); - btnReserList.Style = Sunny.UI.UIStyle.Custom; - btnReserList.TabIndex = 72; - btnReserList.Text = "查看预约列表"; - btnReserList.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - btnReserList.Click += btnReserList_Click; - // - // txtCustoName - // - txtCustoName.Cursor = Cursors.IBeam; - txtCustoName.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustoName.Location = new Point(122, 94); - txtCustoName.Margin = new Padding(4, 5, 4, 5); - txtCustoName.MinimumSize = new Size(1, 1); - txtCustoName.Name = "txtCustoName"; - txtCustoName.Padding = new Padding(5); - txtCustoName.Radius = 20; - txtCustoName.ShowText = false; - txtCustoName.Size = new Size(159, 35); - txtCustoName.Style = Sunny.UI.UIStyle.Custom; - txtCustoName.StyleCustomMode = true; - txtCustoName.TabIndex = 107; - txtCustoName.TextAlignment = ContentAlignment.MiddleLeft; - txtCustoName.Watermark = ""; - // - // txtCustoTel - // - txtCustoTel.Cursor = Cursors.IBeam; - txtCustoTel.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustoTel.Location = new Point(122, 147); - txtCustoTel.Margin = new Padding(4, 5, 4, 5); - txtCustoTel.MaxLength = 11; - txtCustoTel.MinimumSize = new Size(1, 1); - txtCustoTel.Name = "txtCustoTel"; - txtCustoTel.Padding = new Padding(5); - txtCustoTel.Radius = 20; - txtCustoTel.ShowText = false; - txtCustoTel.Size = new Size(159, 35); - txtCustoTel.Style = Sunny.UI.UIStyle.Custom; - txtCustoTel.StyleCustomMode = true; - txtCustoTel.TabIndex = 108; - txtCustoTel.TextAlignment = ContentAlignment.MiddleLeft; - txtCustoTel.Watermark = ""; - // // label1 // label1.AutoSize = true; - label1.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label1.Location = new Point(30, 151); + label1.Font = new Font("Noto Sans SC", 14.25F); + label1.Location = new Point(283, 62); label1.Name = "label1"; - label1.Size = new Size(88, 25); + label1.Size = new Size(85, 19); label1.TabIndex = 106; - label1.Text = "预约号码"; + label1.Text = "电话号码"; // // label9 // label9.AutoSize = true; - label9.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label9.Location = new Point(30, 99); + label9.Font = new Font("Noto Sans SC", 14.25F); + label9.Location = new Point(24, 62); label9.Name = "label9"; - label9.Size = new Size(88, 25); + label9.Size = new Size(85, 19); label9.TabIndex = 105; label9.Text = "客户姓名"; // - // cboReserWay - // - cboReserWay.DataSource = null; - cboReserWay.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - cboReserWay.FillColor = Color.White; - cboReserWay.Font = new Font("微软雅黑", 15.75F); - cboReserWay.ItemHoverColor = Color.FromArgb(155, 200, 255); - cboReserWay.Items.AddRange(new object[] { "前台", "小程序", "电话" }); - cboReserWay.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - cboReserWay.Location = new Point(122, 200); - cboReserWay.Margin = new Padding(4, 5, 4, 5); - cboReserWay.MinimumSize = new Size(63, 0); - cboReserWay.Name = "cboReserWay"; - cboReserWay.Padding = new Padding(0, 0, 30, 2); - cboReserWay.Radius = 20; - cboReserWay.ReadOnly = true; - cboReserWay.Size = new Size(159, 35); - cboReserWay.Style = Sunny.UI.UIStyle.Custom; - cboReserWay.SymbolSize = 24; - cboReserWay.TabIndex = 110; - cboReserWay.TextAlignment = ContentAlignment.MiddleLeft; - cboReserWay.Watermark = ""; - // // label10 // label10.AutoSize = true; - label10.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label10.Location = new Point(33, 203); + label10.Font = new Font("Noto Sans SC", 14.25F); + label10.Location = new Point(24, 110); label10.Name = "label10"; - label10.Size = new Size(88, 25); + label10.Size = new Size(85, 19); label10.TabIndex = 109; label10.Text = "预约渠道"; // - // cboReserRoomNo - // - cboReserRoomNo.DataSource = null; - cboReserRoomNo.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - cboReserRoomNo.FillColor = Color.White; - cboReserRoomNo.Font = new Font("微软雅黑", 15.75F); - cboReserRoomNo.ItemHoverColor = Color.FromArgb(155, 200, 255); - cboReserRoomNo.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - cboReserRoomNo.Location = new Point(122, 253); - cboReserRoomNo.Margin = new Padding(4, 5, 4, 5); - cboReserRoomNo.MinimumSize = new Size(63, 0); - cboReserRoomNo.Name = "cboReserRoomNo"; - cboReserRoomNo.Padding = new Padding(0, 0, 30, 2); - cboReserRoomNo.Radius = 20; - cboReserRoomNo.Size = new Size(159, 35); - cboReserRoomNo.Style = Sunny.UI.UIStyle.Custom; - cboReserRoomNo.SymbolSize = 24; - cboReserRoomNo.TabIndex = 112; - cboReserRoomNo.TextAlignment = ContentAlignment.MiddleLeft; - cboReserRoomNo.Watermark = ""; - // // label11 // label11.AutoSize = true; - label11.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label11.Location = new Point(33, 255); + label11.Font = new Font("Noto Sans SC", 14.25F); + label11.Location = new Point(284, 110); label11.Name = "label11"; - label11.Size = new Size(88, 25); + label11.Size = new Size(85, 19); label11.TabIndex = 111; label11.Text = "预约房号"; // - // dtpBookDate - // - dtpBookDate.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - dtpBookDate.FillColor = Color.White; - dtpBookDate.Font = new Font("Microsoft Sans Serif", 15.75F); - dtpBookDate.Location = new Point(122, 307); - dtpBookDate.Margin = new Padding(4, 5, 4, 5); - dtpBookDate.MaxLength = 10; - dtpBookDate.MinimumSize = new Size(63, 0); - dtpBookDate.Name = "dtpBookDate"; - dtpBookDate.Padding = new Padding(0, 0, 30, 2); - dtpBookDate.Radius = 20; - dtpBookDate.Size = new Size(159, 31); - dtpBookDate.Style = Sunny.UI.UIStyle.Custom; - dtpBookDate.SymbolDropDown = 61555; - dtpBookDate.SymbolNormal = 61555; - dtpBookDate.SymbolSize = 24; - dtpBookDate.TabIndex = 114; - dtpBookDate.Text = "2021-05-13"; - dtpBookDate.TextAlignment = ContentAlignment.MiddleLeft; - dtpBookDate.Value = new DateTime(2021, 5, 13, 0, 0, 0, 0); - dtpBookDate.Watermark = ""; - // // label12 // label12.AutoSize = true; - label12.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label12.Location = new Point(30, 307); + label12.Font = new Font("Noto Sans SC", 14.25F); + label12.Location = new Point(24, 158); label12.Name = "label12"; - label12.Size = new Size(88, 25); + label12.Size = new Size(85, 19); label12.TabIndex = 113; label12.Text = "预约起始"; // - // dtpEndDate - // - dtpEndDate.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - dtpEndDate.FillColor = Color.White; - dtpEndDate.Font = new Font("Microsoft Sans Serif", 15.75F); - dtpEndDate.Location = new Point(125, 356); - dtpEndDate.Margin = new Padding(4, 5, 4, 5); - dtpEndDate.MaxLength = 10; - dtpEndDate.MinimumSize = new Size(63, 0); - dtpEndDate.Name = "dtpEndDate"; - dtpEndDate.Padding = new Padding(0, 0, 30, 2); - dtpEndDate.Radius = 20; - dtpEndDate.Size = new Size(156, 31); - dtpEndDate.Style = Sunny.UI.UIStyle.Custom; - dtpEndDate.SymbolDropDown = 61555; - dtpEndDate.SymbolNormal = 61555; - dtpEndDate.SymbolSize = 24; - dtpEndDate.TabIndex = 116; - dtpEndDate.Text = "2021-05-13"; - dtpEndDate.TextAlignment = ContentAlignment.MiddleLeft; - dtpEndDate.Value = new DateTime(2021, 5, 13, 0, 0, 0, 0); - dtpEndDate.Watermark = ""; - // // label13 // label13.AutoSize = true; - label13.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label13.Location = new Point(33, 359); + label13.Font = new Font("Noto Sans SC", 14.25F); + label13.Location = new Point(284, 158); label13.Name = "label13"; - label13.Size = new Size(88, 25); + label13.Size = new Size(85, 19); label13.TabIndex = 115; label13.Text = "预约止日"; // + // btnReserList + // + btnReserList.Font = new Font("Noto Sans SC", 12F); + btnReserList.Location = new Point(316, 195); + btnReserList.Name = "btnReserList"; + btnReserList.Size = new Size(139, 43); + btnReserList.TabIndex = 118; + btnReserList.Text = "查看预约列表"; + btnReserList.Click += btnReserList_Click; + // // btnReser // - btnReser.Cursor = Cursors.Hand; - btnReser.Font = new Font("微软雅黑", 12F); - btnReser.Location = new Point(109, 411); - btnReser.MinimumSize = new Size(1, 1); + btnReser.Font = new Font("Noto Sans SC", 12F); + btnReser.Location = new Point(461, 195); btnReser.Name = "btnReser"; - btnReser.Radius = 15; - btnReser.Size = new Size(97, 35); - btnReser.Style = Sunny.UI.UIStyle.Custom; - btnReser.TabIndex = 117; - btnReser.Text = "预约"; - btnReser.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + btnReser.Size = new Size(87, 43); + btnReser.TabIndex = 119; + btnReser.Text = "预 约"; + btnReser.Type = AntdUI.TTypeMini.Info; btnReser.Click += btnReser_Click; // + // txtCustoName + // + txtCustoName.Font = new Font("Noto Sans SC", 12F); + txtCustoName.Location = new Point(115, 49); + txtCustoName.Name = "txtCustoName"; + txtCustoName.Size = new Size(162, 45); + txtCustoName.TabIndex = 121; + // + // txtCustoTel + // + txtCustoTel.Font = new Font("Noto Sans SC", 12F); + txtCustoTel.Location = new Point(376, 49); + txtCustoTel.Name = "txtCustoTel"; + txtCustoTel.Size = new Size(161, 45); + txtCustoTel.TabIndex = 122; + // + // dtpStartDate + // + dtpStartDate.Font = new Font("Noto Sans SC", 10F); + dtpStartDate.Location = new Point(115, 146); + dtpStartDate.Name = "dtpStartDate"; + dtpStartDate.Size = new Size(162, 43); + dtpStartDate.TabIndex = 125; + // + // dtpEndDate + // + dtpEndDate.Font = new Font("Noto Sans SC", 10F); + dtpEndDate.Location = new Point(376, 146); + dtpEndDate.Name = "dtpEndDate"; + dtpEndDate.Size = new Size(161, 43); + dtpEndDate.TabIndex = 126; + // + // whReserRoomManagement + // + whReserRoomManagement.Location = new Point(0, 0); + whReserRoomManagement.Name = "whReserRoomManagement"; + whReserRoomManagement.Size = new Size(562, 34); + whReserRoomManagement.TabIndex = 141; + // + // cboReserChannel + // + cboReserChannel.Font = new Font("Noto Sans SC", 12F); + cboReserChannel.List = true; + cboReserChannel.ListAutoWidth = true; + cboReserChannel.Location = new Point(115, 100); + cboReserChannel.Name = "cboReserChannel"; + cboReserChannel.Placement = AntdUI.TAlignFrom.Bottom; + cboReserChannel.Size = new Size(162, 40); + cboReserChannel.TabIndex = 175; + // + // cboReserRoom + // + cboReserRoom.Font = new Font("Noto Sans SC", 12F); + cboReserRoom.List = true; + cboReserRoom.ListAutoWidth = true; + cboReserRoom.Location = new Point(376, 100); + cboReserRoom.Name = "cboReserRoom"; + cboReserRoom.Placement = AntdUI.TAlignFrom.Bottom; + cboReserRoom.Size = new Size(161, 40); + cboReserRoom.TabIndex = 176; + // // FrmReserManager // AutoScaleMode = AutoScaleMode.None; BackColor = Color.FromArgb(235, 243, 255); BackgroundImageLayout = ImageLayout.Stretch; - ClientSize = new Size(315, 461); - Controls.Add(btnReser); + ClientSize = new Size(560, 251); + Controls.Add(cboReserRoom); + Controls.Add(cboReserChannel); + Controls.Add(whReserRoomManagement); Controls.Add(dtpEndDate); + Controls.Add(dtpStartDate); + Controls.Add(txtCustoTel); + Controls.Add(txtCustoName); + Controls.Add(btnReser); + Controls.Add(btnReserList); Controls.Add(label13); - Controls.Add(dtpBookDate); Controls.Add(label12); - Controls.Add(cboReserRoomNo); Controls.Add(label11); - Controls.Add(cboReserWay); Controls.Add(label10); - Controls.Add(txtCustoName); - Controls.Add(txtCustoTel); Controls.Add(label1); Controls.Add(label9); - Controls.Add(btnReserList); + FormBorderStyle = FormBorderStyle.None; Icon = (Icon)resources.GetObject("$this.Icon"); Name = "FrmReserManager"; - ShowTitleIcon = true; - Style = Sunny.UI.UIStyle.Custom; + Resizable = false; + StartPosition = FormStartPosition.CenterScreen; Text = "预约管理"; - ZoomScaleRect = new Rectangle(15, 15, 315, 461); Load += FrmRoomManager_Load; ResumeLayout(false); PerformLayout(); } #endregion - private Sunny.UI.UIButton btnReserList; - private Sunny.UI.UITextBox txtCustoName; - private Sunny.UI.UITextBox txtCustoTel; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label9; - private Sunny.UI.UIComboBox cboReserWay; private System.Windows.Forms.Label label10; - private Sunny.UI.UIComboBox cboReserRoomNo; private System.Windows.Forms.Label label11; - private Sunny.UI.UIDatePicker dtpBookDate; private System.Windows.Forms.Label label12; - private Sunny.UI.UIDatePicker dtpEndDate; private System.Windows.Forms.Label label13; - private Sunny.UI.UIButton btnReser; + private AntdUI.Button btnReserList; + private AntdUI.Button btnReser; + private AntdUI.Input txtCustoName; + private AntdUI.Input txtCustoTel; + private AntdUI.DatePicker dtpStartDate; + private AntdUI.DatePicker dtpEndDate; + private ucWindowHeader whReserRoomManagement; + private AntdUI.Select cboReserChannel; + private AntdUI.Select cboReserRoom; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.cs similarity index 60% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.cs index a4126c869e5be160cdf3f6494da6fc32051fc4e0..c328bf3152993c929afcab0a8ab6205036cae0a6 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.cs @@ -21,20 +21,23 @@ *SOFTWARE. * */ +using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Core; using jvncorelib.CodeLib; -using Sunny.UI; +using jvncorelib.EntityLib; using System.Transactions; namespace EOM.TSHotelManagement.FormUI { - public partial class FrmReserManager : UIForm + public partial class FrmReserManager : Window { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmReserManager)); public FrmReserManager() { InitializeComponent(); + whReserRoomManagement.ApplySettingsWithoutMinimize("房间预约管理", string.Empty, (Image)resources.GetObject("FrmReserManager.Icon")!); #region 防止背景闪屏方法 this.DoubleBuffered = true;//设置本窗体 SetStyle(ControlStyles.UserPaint, true); @@ -56,59 +59,67 @@ namespace EOM.TSHotelManagement.FormUI ReservationId = reserid, CustomerName = txtCustoName.Text.Trim(), ReservationPhoneNumber = txtCustoTel.Text.Trim(), - ReservationChannel = cboReserWay.Text, - ReservationRoomNumber = cboReserRoomNo.Text, - ReservationStartDate = dtpBookDate.Value, - ReservationEndDate = dtpEndDate.Value, + ReservationChannel = cboReserChannel.SelectedValue?.ToString() ?? string.Empty, + ReservationRoomNumber = cboReserRoom.Text, + ReservationStartDate = dtpStartDate.Value ?? dtpStartDate.Value.GetValueOrDefault(), + ReservationEndDate = dtpEndDate.Value ?? dtpEndDate.Value.GetValueOrDefault(), DataInsUsr = LoginInfo.WorkerNo, DataInsDate = DateTime.Now }; UpdateRoomInputDto room = new UpdateRoomInputDto() { - RoomNumber = cboReserRoomNo.Text, + RoomNumber = cboReserRoom.Text, RoomStateId = (int)RoomState.Reserved, DataInsDate = DateTime.Now, DataInsUsr = LoginInfo.WorkerNo }; - result = HttpHelper.Request(ApiConstants.Reser_InsertReserInfo, HttpHelper.ModelToJson(reser)); - var response = HttpHelper.JsonToModel(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + result = HttpHelper.Request(ApiConstants.Reser_InsertReserInfo, reser.ModelToJson()); + var response = HttpHelper.JsonToModel(result.message); + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Reser_InsertReserInfo}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.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) + result = HttpHelper.Request(ApiConstants.Room_UpdateRoomInfoWithReser, room.ModelToJson()); + response = HttpHelper.JsonToModel(result.message); + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Room_UpdateRoomInfoWithReser}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_UpdateRoomInfoWithReser}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - UIMessageBox.ShowSuccess("预约成功！请在指定时间内进行登记入住"); + NotificationService.ShowSuccess("预约成功！请在指定时间内进行登记入住"); #region 获取添加操作日志所需的信息 RecordHelper.Record(LoginInfo.WorkerClub + LoginInfo.WorkerPosition + LoginInfo.WorkerName + "于" + Convert.ToDateTime(DateTime.Now) + "帮助" + txtCustoTel.Text + "进行了预订房间操作！", Common.Core.LogLevel.Normal); #endregion scope.Complete(); FrmRoomManager.Reload(""); + FrmRoomManager._RefreshRoomCount(); this.Close(); } } private void FrmRoomManager_Load(object sender, EventArgs e) { - cboReserWay.SelectedIndex = 0; result = HttpHelper.Request(ApiConstants.Room_SelectCanUseRoomAll); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Room_SelectCanUseRoomAll}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_SelectCanUseRoomAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - cboReserRoomNo.DataSource = response.listSource; - cboReserRoomNo.DisplayMember = nameof(ReadRoomOutputDto.RoomNumber); - cboReserRoomNo.ValueMember = nameof(ReadRoomOutputDto.RoomNumber); - cboReserRoomNo.Text = ucRoom.co_RoomNo; - dtpBookDate.Value = Convert.ToDateTime(DateTime.Now); + cboReserRoom.Items.AddRange(response.Data.Items.Select(item => new AntdUI.SelectItem(item.RoomNumber)).ToArray()); + + result = HttpHelper.Request(ApiConstants.Reser_SelectReserTypeAll); + var reserTypes = HttpHelper.JsonToModel>(result.message); + if (reserTypes.Success == false) + { + NotificationService.ShowError($"{ApiConstants.Reser_SelectReserTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + cboReserChannel.Items.AddRange(reserTypes.Data.Items.Select(item => new AntdUI.SelectItem(item.Description, item.Name)).ToArray()); + + cboReserRoom.Text = ucRoom.co_RoomNo; + dtpStartDate.Value = Convert.ToDateTime(DateTime.Now); } private void btnReserList_Click(object sender, EventArgs e) diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.resx similarity index 100% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.resx rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.resx diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomManagement.Designer.cs similarity index 67% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.Designer.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomManagement.Designer.cs index ce9636ae37cc0ce10bbaffad354ec8bf68da4fed..b8b30236f84491633444a2cbde2b286ee15ff91e 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomManagement.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - flpRoom = new FlowLayoutPanel(); pnlRoomInfo = new Panel(); lblRoomState = new Label(); label11 = new Label(); @@ -40,21 +39,12 @@ label3 = new Label(); label2 = new Label(); label1 = new Label(); - flpRoomTypes = new Sunny.UI.UIFlowLayoutPanel(); muRoomState = new AntdUI.Menu(); + flpRoomTypes = new AntdUI.In.FlowLayoutPanel(); + flpRoom = new AntdUI.In.FlowLayoutPanel(); pnlRoomInfo.SuspendLayout(); SuspendLayout(); // - // flpRoom - // - flpRoom.AutoScroll = true; - flpRoom.BackColor = Color.Transparent; - flpRoom.Location = new Point(265, 103); - flpRoom.Margin = new Padding(4); - flpRoom.Name = "flpRoom"; - flpRoom.Size = new Size(804, 516); - flpRoom.TabIndex = 71; - // // pnlRoomInfo // pnlRoomInfo.BackColor = Color.Transparent; @@ -68,152 +58,147 @@ pnlRoomInfo.Controls.Add(label3); pnlRoomInfo.Controls.Add(label2); pnlRoomInfo.Controls.Add(label1); - pnlRoomInfo.Location = new Point(2, 312); + pnlRoomInfo.Location = new Point(3, 273); pnlRoomInfo.Margin = new Padding(4); pnlRoomInfo.Name = "pnlRoomInfo"; - pnlRoomInfo.Size = new Size(255, 307); + pnlRoomInfo.Size = new Size(255, 346); pnlRoomInfo.TabIndex = 72; // // lblRoomState // lblRoomState.AutoSize = true; - lblRoomState.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - lblRoomState.Location = new Point(86, 146); + lblRoomState.Font = new Font("Noto Sans SC", 12F); + lblRoomState.Location = new Point(108, 173); lblRoomState.Margin = new Padding(4, 0, 4, 0); lblRoomState.Name = "lblRoomState"; - lblRoomState.Size = new Size(10, 15); + lblRoomState.Size = new Size(12, 17); lblRoomState.TabIndex = 16; lblRoomState.Text = " "; // // label11 // label11.AutoSize = true; - label11.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - label11.Location = new Point(11, 146); + label11.Font = new Font("Noto Sans SC", 12F); + label11.Location = new Point(11, 173); label11.Margin = new Padding(4, 0, 4, 0); label11.Name = "label11"; - label11.Size = new Size(67, 15); + label11.Size = new Size(88, 17); label11.TabIndex = 15; label11.Text = "房间状态："; // // lblRoomNo // lblRoomNo.AutoSize = true; - lblRoomNo.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - lblRoomNo.Location = new Point(86, 13); + lblRoomNo.Font = new Font("Noto Sans SC", 12F); + lblRoomNo.Location = new Point(108, 13); lblRoomNo.Margin = new Padding(4, 0, 4, 0); lblRoomNo.Name = "lblRoomNo"; - lblRoomNo.Size = new Size(10, 15); + lblRoomNo.Size = new Size(12, 17); lblRoomNo.TabIndex = 14; lblRoomNo.Text = " "; // // lblCustoName // lblCustoName.AutoSize = true; - lblCustoName.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - lblCustoName.Location = new Point(86, 46); + lblCustoName.Font = new Font("Noto Sans SC", 12F); + lblCustoName.Location = new Point(108, 53); lblCustoName.Margin = new Padding(4, 0, 4, 0); lblCustoName.Name = "lblCustoName"; - lblCustoName.Size = new Size(10, 15); + lblCustoName.Size = new Size(12, 17); lblCustoName.TabIndex = 12; lblCustoName.Text = " "; // // lblRoomPosition // lblRoomPosition.AutoSize = true; - lblRoomPosition.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - lblRoomPosition.Location = new Point(86, 113); + lblRoomPosition.Font = new Font("Noto Sans SC", 12F); + lblRoomPosition.Location = new Point(108, 133); lblRoomPosition.Margin = new Padding(4, 0, 4, 0); lblRoomPosition.Name = "lblRoomPosition"; - lblRoomPosition.Size = new Size(10, 15); + lblRoomPosition.Size = new Size(12, 17); lblRoomPosition.TabIndex = 10; lblRoomPosition.Text = " "; // // lblCheckTime // lblCheckTime.AutoSize = true; - lblCheckTime.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - lblCheckTime.Location = new Point(86, 80); + lblCheckTime.Font = new Font("Noto Sans SC", 12F); + lblCheckTime.Location = new Point(108, 93); lblCheckTime.Margin = new Padding(4, 0, 4, 0); lblCheckTime.Name = "lblCheckTime"; - lblCheckTime.Size = new Size(10, 15); + lblCheckTime.Size = new Size(12, 17); lblCheckTime.TabIndex = 9; lblCheckTime.Text = " "; // // label4 // label4.AutoSize = true; - label4.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - label4.Location = new Point(11, 113); + label4.Font = new Font("Noto Sans SC", 12F); + label4.Location = new Point(11, 133); label4.Margin = new Padding(4, 0, 4, 0); label4.Name = "label4"; - label4.Size = new Size(67, 15); + label4.Size = new Size(88, 17); label4.TabIndex = 3; label4.Text = "所在区域："; // // label3 // label3.AutoSize = true; - label3.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - label3.Location = new Point(11, 80); + label3.Font = new Font("Noto Sans SC", 12F); + label3.Location = new Point(11, 93); label3.Margin = new Padding(4, 0, 4, 0); label3.Name = "label3"; - label3.Size = new Size(67, 15); + label3.Size = new Size(88, 17); label3.TabIndex = 2; label3.Text = "入住时间："; // // label2 // label2.AutoSize = true; - label2.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - label2.Location = new Point(11, 46); + label2.Font = new Font("Noto Sans SC", 12F); + label2.Location = new Point(11, 53); label2.Margin = new Padding(4, 0, 4, 0); label2.Name = "label2"; - label2.Size = new Size(67, 15); + label2.Size = new Size(88, 17); label2.TabIndex = 1; label2.Text = "客户名字："; // // label1 // label1.AutoSize = true; - label1.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + label1.Font = new Font("Noto Sans SC", 12F); label1.Location = new Point(11, 13); label1.Margin = new Padding(4, 0, 4, 0); label1.Name = "label1"; - label1.Size = new Size(67, 15); + label1.Size = new Size(88, 17); label1.TabIndex = 0; label1.Text = "房间号码："; // - // flpRoomTypes - // - flpRoomTypes.BackColor = Color.Transparent; - flpRoomTypes.FillColor = Color.Transparent; - flpRoomTypes.FillColor2 = Color.Transparent; - flpRoomTypes.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - flpRoomTypes.Location = new Point(265, 4); - flpRoomTypes.Margin = new Padding(4, 5, 4, 5); - flpRoomTypes.MinimumSize = new Size(1, 1); - flpRoomTypes.Name = "flpRoomTypes"; - flpRoomTypes.Padding = new Padding(2); - flpRoomTypes.RadiusSides = Sunny.UI.UICornerRadiusSides.None; - flpRoomTypes.RectSides = ToolStripStatusLabelBorderSides.None; - flpRoomTypes.ShowText = false; - flpRoomTypes.Size = new Size(804, 90); - flpRoomTypes.TabIndex = 95; - flpRoomTypes.Text = "uiFlowLayoutPanel1"; - flpRoomTypes.TextAlignment = ContentAlignment.MiddleCenter; - // // muRoomState // - muRoomState.Font = new Font("Microsoft YaHei UI", 10F); + muRoomState.Font = new Font("Noto Sans SC", 10F); muRoomState.Indent = true; muRoomState.Location = new Point(2, 4); muRoomState.Mode = AntdUI.TMenuMode.Vertical; muRoomState.Name = "muRoomState"; - muRoomState.Size = new Size(255, 301); + muRoomState.Size = new Size(255, 262); muRoomState.TabIndex = 96; muRoomState.SelectChanged += muRoomState_SelectChanged; // + // flpRoomTypes + // + flpRoomTypes.Location = new Point(265, 6); + flpRoomTypes.Name = "flpRoomTypes"; + flpRoomTypes.Size = new Size(804, 90); + flpRoomTypes.TabIndex = 97; + // + // flpRoom + // + flpRoom.Location = new Point(265, 103); + flpRoom.Name = "flpRoom"; + flpRoom.Size = new Size(804, 516); + flpRoom.TabIndex = 98; + // // FrmRoomManager // AutoScaleDimensions = new SizeF(7F, 17F); @@ -221,10 +206,10 @@ BackColor = Color.FromArgb(235, 243, 255); BackgroundImageLayout = ImageLayout.Stretch; ClientSize = new Size(1072, 623); - Controls.Add(muRoomState); + Controls.Add(flpRoom); Controls.Add(flpRoomTypes); + Controls.Add(muRoomState); Controls.Add(pnlRoomInfo); - Controls.Add(flpRoom); DoubleBuffered = true; FormBorderStyle = FormBorderStyle.None; Margin = new Padding(4); @@ -239,7 +224,6 @@ #endregion public System.Windows.Forms.FlowLayoutPanel pe; - private System.Windows.Forms.FlowLayoutPanel flpRoom; private System.Windows.Forms.Label label11; private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label3; @@ -251,7 +235,8 @@ public System.Windows.Forms.Label lblRoomPosition; public System.Windows.Forms.Label lblCheckTime; public System.Windows.Forms.Panel pnlRoomInfo; - private Sunny.UI.UIFlowLayoutPanel flpRoomTypes; private AntdUI.Menu muRoomState; + private AntdUI.In.FlowLayoutPanel flpRoomTypes; + private AntdUI.In.FlowLayoutPanel flpRoom; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomManagement.cs similarity index 84% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomManagement.cs index 242e6101ceb0c27758476a208f091c5695439f5a..79a5e5d4023307fb3969fba6287d776ceea6d978 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomManagement.cs @@ -26,10 +26,9 @@ using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Core; -using EOM.TSHotelManagement.FormUI.AppUserControls; using EOM.TSHotelManagement.FormUI.Properties; using EOM.TSHotelManagement.Shared; -using Sunny.UI; +using jvncorelib.EntityLib; namespace EOM.TSHotelManagement.FormUI { @@ -114,18 +113,28 @@ namespace EOM.TSHotelManagement.FormUI var response = HttpHelper.JsonToModel>(httpResponse.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Success == false) { - throw new HttpRequestException($"{url} 请求失败，状态码：{response.StatusCode}"); + AntdUI.Notification.open(new AntdUI.Notification.Config(this, UIMessageConstant.Error, $"{url} 请求失败，状态码：{response.Code}", AntdUI.TType.Error, AntdUI.TAlignFrom.TR, Font) + { + Radius = 10, + FontStyleTitle = FontStyle.Bold, + ShowInWindow = true + }); } var propertyInfo = typeof(ReadRoomOutputDto).GetProperty(propertyName); if (propertyInfo == null) { - throw new MissingFieldException($"ReadRoomOutputDto 中未找到 {propertyName} 属性"); + AntdUI.Notification.open(new AntdUI.Notification.Config(this, UIMessageConstant.Error, $"ReadRoomOutputDto 中未找到 {propertyName} 属性", AntdUI.TType.Error, AntdUI.TAlignFrom.TR, Font) + { + Radius = 10, + FontStyleTitle = FontStyle.Bold, + ShowInWindow = true + }); } - if (propertyInfo.GetValue(response.Source) is int countValue) + if (propertyInfo.GetValue(response.Data) is int countValue) { statusCounts[targetVar] = countValue; } @@ -150,7 +159,12 @@ namespace EOM.TSHotelManagement.FormUI } catch (Exception ex) { - UIMessageBox.ShowError($"接口服务异常，请提交Issue或尝试更新版本！: {ex.Message}"); + AntdUI.Notification.open(new AntdUI.Notification.Config(this, UIMessageConstant.Error, $"接口服务异常，请提交Issue或尝试更新版本！: {ex.Message}", AntdUI.TType.Error, AntdUI.TAlignFrom.TR, Font) + { + Radius = 10, + FontStyleTitle = FontStyle.Bold, + ShowInWindow = true + }); } } @@ -226,20 +240,20 @@ 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.Success == false) { - throw new Exception($"{ApiConstants.RoomType_SelectRoomTypesAll}+接口服务异常"); + NotificationService.ShowError($"{ApiConstants.RoomType_SelectRoomTypesAll}+接口服务异常"); } - var listRoomTypes = response.listSource; + var listRoomTypes = response.Data.Items; if (listRoomTypes == null) { - UIMessageBox.ShowError("Room types list is null"); + NotificationService.ShowError($"房间类型列表为空"); return; } - flpRoomTypes.Clear(); + flpRoomTypes.Controls.Clear(); AddRoomTypeButton("全部房间", "btnAll", btnAll_Click); foreach (var type in listRoomTypes) @@ -249,7 +263,7 @@ namespace EOM.TSHotelManagement.FormUI } catch (Exception ex) { - UIMessageBox.ShowError($"接口服务异常，请提交Issue或尝试更新版本！: {ex.Message}"); + NotificationService.ShowError($"接口服务异常，请提交Issue或尝试更新版本！: {ex.Message}"); } } @@ -264,7 +278,7 @@ namespace EOM.TSHotelManagement.FormUI private void btnRoomType_Click(object? sender, EventArgs e) { - if (sender is UIButton button) + if (sender is AntdUI.Button button) { string buttonName = button.Text; LoadData(buttonName); @@ -298,12 +312,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.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Room_SelectRoomAll}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_SelectRoomAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - romsty = response.listSource; + romsty = response.Data.Items; } else { @@ -315,18 +329,17 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Room_SelectRoomByTypeName, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Room_SelectRoomByTypeName}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_SelectRoomByTypeName}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - romsty = response.listSource; + romsty = response.Data.Items; } for (int i = 0; i < romsty.Count; i++) { - room = new ucRoom(); + room = new ucRoom(this); room.btnRoom.Text = string.Format("{0}\n\n{1}\n\n{2}", romsty[i].RoomName, romsty[i].RoomNumber, romsty[i].CustomerName ?? " "); - room.lblMark = string.Empty; room.romRoomInfo = romsty[i]; room.romCustoInfo = new ReadCustomerOutputDto { CustomerNumber = romsty[i].CustomerNumber, CustomerName = romsty[i].CustomerName }; flpRoom.Controls.Add(room); @@ -350,17 +363,16 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Room_SelectRoomByRoomState, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Room_SelectRoomByRoomState}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_SelectRoomByRoomState}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - romsty = response.listSource; + romsty = response.Data.Items; for (int i = 0; i < romsty.Count; i++) { - room = new ucRoom(); + room = new ucRoom(this); room.btnRoom.Text = string.Format("{0}\n\n{1}\n\n{2}", romsty[i].RoomName, romsty[i].RoomNumber, romsty[i].CustomerName); - room.lblMark = string.Empty; room.romRoomInfo = romsty[i]; room.romCustoInfo = new ReadCustomerOutputDto { CustomerNumber = romsty[i].CustomerNumber, CustomerName = romsty[i].CustomerName }; flpRoom.Controls.Add(room); diff --git a/EOM.TSHotelManagement.FormUI/AppUserControls/ucNavBar.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomManagement.resx similarity index 99% rename from EOM.TSHotelManagement.FormUI/AppUserControls/ucNavBar.resx rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomManagement.resx index af32865ec12ff9e3beb4b98fb4cf5b8420e12d69..8b2ff64a11300290ddac7e7d9bc26e5e0a766508 100644 --- a/EOM.TSHotelManagement.FormUI/AppUserControls/ucNavBar.resx +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomManagement.resx @@ -1,7 +1,7 @@  diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.Designer.cs similarity index 40% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.Designer.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.Designer.cs index 0b1c687960d1f09cc46cd5b549c9e63ec1891d41..30665088bc8b60c6985d2474443505a35231da2e 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.Designer.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.FormUI { - partial class FrmAboutUs + partial class FrmScreenLock { /// /// Required designer variable. @@ -28,65 +28,64 @@ /// 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; + 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); + FormBorderStyle = FormBorderStyle.None; Icon = (Icon)resources.GetObject("$this.Icon"); - Margin = new Padding(2); - Name = "FrmAboutUs"; + MaximizeBox = false; + MinimizeBox = false; + Name = "FrmScreenLock"; + Resizable = false; + ShowIcon = false; + ShowInTaskbar = false; StartPosition = FormStartPosition.CenterScreen; - Text = "关于我们"; - Load += FrmAboutUs_Load; - MouseDown += FrmAboutUs_MouseDown; - MouseMove += FrmAboutUs_MouseMove; + Text = "系统已锁定"; + TopMost = true; + 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/ClientModule/FrmScreenLock.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.cs new file mode 100644 index 0000000000000000000000000000000000000000..dbc877f15fa0270ae39e917e50c19c7e718a976f --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.cs @@ -0,0 +1,45 @@ +using AntdUI; +using EOM.TSHotelManagement.Common; +using jvncorelib.EncryptorLib; + +namespace EOM.TSHotelManagement.FormUI +{ + public partial class FrmScreenLock : Window + { + 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) + { + NotificationService.ShowError("密码不能为空，请重新输入！"); + txtPassword.Focus(); + return; + } + var password = new EncryptLib().Decryption(LoginInfo.Password); + if (password != null && password == txtPassword.Text.Trim()) + { + this.Close(); + } + else + { + NotificationService.ShowError("密码错误，请重新输入！"); + txtPassword.Focus(); + txtPassword.Clear(); + } + } + } +} diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.resx new file mode 100644 index 0000000000000000000000000000000000000000..01c2406f2bae1f46aca0682725d0d5995e7509f8 --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.resx @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + True + + + + + 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/FrmSellThing.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.Designer.cs similarity index 59% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.Designer.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.Designer.cs index 651b8fd576ec269919237258db5bb8bf78b48410..e6ae042827d8e1d46595c6384c97b59ac42af7f6 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.Designer.cs @@ -30,14 +30,14 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmSellThing)); groupBox2 = new GroupBox(); - txtPrice = new Sunny.UI.UITextBox(); - uiLabel6 = new Sunny.UI.UILabel(); - nudNum = new Sunny.UI.UIDoubleUpDown(); - uiLabel5 = new Sunny.UI.UILabel(); - txtSellName = new Sunny.UI.UITextBox(); - uiLabel4 = new Sunny.UI.UILabel(); - txtSellNo = new Sunny.UI.UITextBox(); - uiLabel3 = new Sunny.UI.UILabel(); + label6 = new AntdUI.Label(); + label5 = new AntdUI.Label(); + label4 = new AntdUI.Label(); + label3 = new AntdUI.Label(); + nudNum = new AntdUI.InputNumber(); + txtPrice = new AntdUI.Input(); + txtSellName = new AntdUI.Input(); + txtSellNo = new AntdUI.Input(); label1 = new AntdUI.Label(); txtFind = new AntdUI.Input(); btnFind = new AntdUI.Button(); @@ -50,20 +50,21 @@ btnAdd = new AntdUI.Button(); btnCancel = new AntdUI.Button(); dgvRoomSell = new AntdUI.Table(); + ucWindowHeader1 = new ucWindowHeader(); groupBox2.SuspendLayout(); SuspendLayout(); // // groupBox2 // - groupBox2.Controls.Add(txtPrice); - groupBox2.Controls.Add(uiLabel6); + groupBox2.Controls.Add(label6); + groupBox2.Controls.Add(label5); + groupBox2.Controls.Add(label4); + groupBox2.Controls.Add(label3); groupBox2.Controls.Add(nudNum); - groupBox2.Controls.Add(uiLabel5); + groupBox2.Controls.Add(txtPrice); groupBox2.Controls.Add(txtSellName); - groupBox2.Controls.Add(uiLabel4); groupBox2.Controls.Add(txtSellNo); - groupBox2.Controls.Add(uiLabel3); - groupBox2.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + groupBox2.Font = new Font("Noto Sans SC", 9F); groupBox2.Location = new Point(617, 88); groupBox2.Name = "groupBox2"; groupBox2.Size = new Size(452, 123); @@ -71,151 +72,107 @@ groupBox2.TabStop = false; groupBox2.Text = "订购中心"; // - // txtPrice - // - txtPrice.Cursor = Cursors.IBeam; - txtPrice.Font = new Font("微软雅黑", 12F); - txtPrice.Location = new Point(310, 74); - txtPrice.Margin = new Padding(4, 5, 4, 5); - txtPrice.MinimumSize = new Size(1, 1); - txtPrice.Name = "txtPrice"; - txtPrice.Padding = new Padding(5); - txtPrice.Radius = 20; - txtPrice.ReadOnly = true; - txtPrice.ShowText = false; - txtPrice.Size = new Size(116, 29); - txtPrice.Style = Sunny.UI.UIStyle.Custom; - txtPrice.TabIndex = 30; - txtPrice.TextAlignment = ContentAlignment.MiddleLeft; - txtPrice.Watermark = ""; - // - // uiLabel6 - // - uiLabel6.Font = new Font("微软雅黑", 12F); - uiLabel6.ForeColor = Color.FromArgb(48, 48, 48); - uiLabel6.Location = new Point(258, 74); - uiLabel6.Name = "uiLabel6"; - uiLabel6.Size = new Size(61, 29); - uiLabel6.Style = Sunny.UI.UIStyle.Custom; - uiLabel6.TabIndex = 29; - uiLabel6.Text = "单价："; - uiLabel6.TextAlign = ContentAlignment.MiddleLeft; + // label6 + // + label6.BackColor = Color.Transparent; + label6.Font = new Font("Noto Sans SC", 12F); + label6.Location = new Point(258, 32); + label6.Name = "label6"; + label6.Size = new Size(61, 23); + label6.TabIndex = 38; + label6.Text = "数量："; + // + // label5 + // + label5.BackColor = Color.Transparent; + label5.Font = new Font("Noto Sans SC", 12F); + label5.Location = new Point(258, 78); + label5.Name = "label5"; + label5.Size = new Size(61, 23); + label5.TabIndex = 37; + label5.Text = "单价："; + // + // label4 + // + label4.BackColor = Color.Transparent; + label4.Font = new Font("Noto Sans SC", 12F); + label4.Location = new Point(19, 78); + label4.Name = "label4"; + label4.Size = new Size(92, 23); + label4.TabIndex = 36; + label4.Text = "商品名称："; + label4.TextAlign = ContentAlignment.MiddleCenter; + // + // label3 + // + label3.BackColor = Color.Transparent; + label3.Font = new Font("Noto Sans SC", 12F); + label3.Location = new Point(19, 32); + label3.Name = "label3"; + label3.Size = new Size(92, 23); + label3.TabIndex = 35; + label3.Text = "商品编号："; + label3.TextAlign = ContentAlignment.MiddleCenter; // // nudNum // - nudNum.AutoValidate = AutoValidate.Disable; - nudNum.Font = new Font("新宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - nudNum.Location = new Point(310, 30); - nudNum.Margin = new Padding(4, 5, 4, 5); - nudNum.Maximum = 9999D; - nudNum.Minimum = 0D; - nudNum.MinimumSize = new Size(100, 0); + nudNum.Font = new Font("Noto Sans SC", 12F); + nudNum.Location = new Point(319, 23); nudNum.Name = "nudNum"; - nudNum.Radius = 20; - nudNum.ShowText = false; - nudNum.Size = new Size(116, 29); - nudNum.Step = 1D; - nudNum.Style = Sunny.UI.UIStyle.Custom; - nudNum.StyleCustomMode = true; - nudNum.TabIndex = 25; - nudNum.Text = null; - nudNum.TextAlignment = ContentAlignment.MiddleCenter; - nudNum.ValueChanged += nudNum_ValueChanged; - // - // uiLabel5 - // - uiLabel5.Font = new Font("微软雅黑", 12F); - uiLabel5.ForeColor = Color.FromArgb(48, 48, 48); - uiLabel5.Location = new Point(258, 30); - uiLabel5.Name = "uiLabel5"; - uiLabel5.Size = new Size(61, 29); - uiLabel5.Style = Sunny.UI.UIStyle.Custom; - uiLabel5.TabIndex = 28; - uiLabel5.Text = "数量："; - uiLabel5.TextAlign = ContentAlignment.MiddleLeft; + nudNum.Size = new Size(119, 38); + nudNum.TabIndex = 34; + nudNum.Text = "0"; + nudNum.TextAlign = HorizontalAlignment.Center; + // + // txtPrice + // + txtPrice.Font = new Font("Noto Sans SC", 12F); + txtPrice.Location = new Point(319, 69); + txtPrice.Name = "txtPrice"; + txtPrice.ReadOnly = true; + txtPrice.Size = new Size(119, 38); + txtPrice.TabIndex = 33; // // txtSellName // - txtSellName.Cursor = Cursors.IBeam; - txtSellName.Font = new Font("微软雅黑", 12F); - txtSellName.Location = new Point(107, 74); - txtSellName.Margin = new Padding(4, 5, 4, 5); - txtSellName.MinimumSize = new Size(1, 1); + txtSellName.Font = new Font("Noto Sans SC", 12F); + txtSellName.Location = new Point(111, 69); txtSellName.Name = "txtSellName"; - txtSellName.Padding = new Padding(5); - txtSellName.Radius = 20; txtSellName.ReadOnly = true; - txtSellName.ShowText = false; - txtSellName.Size = new Size(145, 29); - txtSellName.Style = Sunny.UI.UIStyle.Custom; - txtSellName.TabIndex = 27; - txtSellName.TextAlignment = ContentAlignment.MiddleLeft; - txtSellName.Watermark = ""; - // - // uiLabel4 - // - uiLabel4.Font = new Font("微软雅黑", 12F); - uiLabel4.ForeColor = Color.FromArgb(48, 48, 48); - uiLabel4.Location = new Point(26, 73); - uiLabel4.Name = "uiLabel4"; - uiLabel4.Size = new Size(92, 29); - uiLabel4.Style = Sunny.UI.UIStyle.Custom; - uiLabel4.TabIndex = 26; - uiLabel4.Text = "商品名称："; - uiLabel4.TextAlign = ContentAlignment.MiddleLeft; + txtSellName.Size = new Size(145, 38); + txtSellName.TabIndex = 32; // // txtSellNo // - txtSellNo.Cursor = Cursors.IBeam; - txtSellNo.Font = new Font("微软雅黑", 12F); - txtSellNo.Location = new Point(107, 30); - txtSellNo.Margin = new Padding(4, 5, 4, 5); - txtSellNo.MinimumSize = new Size(1, 1); + txtSellNo.Font = new Font("Noto Sans SC", 12F); + txtSellNo.Location = new Point(111, 23); txtSellNo.Name = "txtSellNo"; - txtSellNo.Padding = new Padding(5); - txtSellNo.Radius = 20; txtSellNo.ReadOnly = true; - txtSellNo.ShowText = false; - txtSellNo.Size = new Size(145, 29); - txtSellNo.Style = Sunny.UI.UIStyle.Custom; - txtSellNo.TabIndex = 25; - txtSellNo.TextAlignment = ContentAlignment.MiddleLeft; - txtSellNo.Watermark = ""; - // - // uiLabel3 - // - uiLabel3.Font = new Font("微软雅黑", 12F); - uiLabel3.ForeColor = Color.FromArgb(48, 48, 48); - uiLabel3.Location = new Point(26, 29); - uiLabel3.Name = "uiLabel3"; - uiLabel3.Size = new Size(92, 29); - uiLabel3.Style = Sunny.UI.UIStyle.Custom; - uiLabel3.TabIndex = 23; - uiLabel3.Text = "商品编号："; - uiLabel3.TextAlign = ContentAlignment.MiddleLeft; + txtSellNo.Size = new Size(145, 38); + txtSellNo.TabIndex = 31; // // label1 // label1.BackColor = Color.Transparent; - label1.Font = new Font("微软雅黑", 12F); - label1.Location = new Point(65, 51); + label1.Font = new Font("Noto Sans SC", 12F); + label1.Location = new Point(45, 51); label1.Name = "label1"; - label1.Size = new Size(125, 23); + label1.Size = new Size(145, 23); label1.TabIndex = 26; - label1.Text = "要查找的商品："; + label1.Text = "要查找的商品名称："; label1.TextAlign = ContentAlignment.MiddleCenter; // // txtFind // - txtFind.Font = new Font("微软雅黑", 12F); - txtFind.Location = new Point(200, 44); + txtFind.Font = new Font("Noto Sans SC", 12F); + txtFind.Location = new Point(200, 42); txtFind.Name = "txtFind"; txtFind.Size = new Size(197, 38); txtFind.TabIndex = 27; // // btnFind // - btnFind.Font = new Font("微软雅黑", 12F); + btnFind.Font = new Font("Noto Sans SC", 12F); btnFind.Location = new Point(407, 44); btnFind.Name = "btnFind"; btnFind.Size = new Size(101, 38); @@ -227,7 +184,7 @@ // label2 // label2.BackColor = Color.Transparent; - label2.Font = new Font("微软雅黑", 12F); + label2.Font = new Font("Noto Sans SC", 12F); label2.Location = new Point(518, 51); label2.Name = "label2"; label2.Size = new Size(92, 23); @@ -237,8 +194,8 @@ // // txtRoomNo // - txtRoomNo.Font = new Font("微软雅黑", 12F); - txtRoomNo.Location = new Point(620, 44); + txtRoomNo.Font = new Font("Noto Sans SC", 12F); + txtRoomNo.Location = new Point(617, 42); txtRoomNo.Name = "txtRoomNo"; txtRoomNo.Size = new Size(134, 38); txtRoomNo.TabIndex = 30; @@ -247,7 +204,7 @@ // // btnCheck // - btnCheck.Font = new Font("微软雅黑", 12F); + btnCheck.Font = new Font("Noto Sans SC", 12F); btnCheck.Location = new Point(764, 44); btnCheck.Name = "btnCheck"; btnCheck.Size = new Size(101, 38); @@ -259,7 +216,7 @@ // lblState // lblState.BackColor = Color.Transparent; - lblState.Font = new Font("微软雅黑", 12F); + lblState.Font = new Font("Noto Sans SC", 12F); lblState.Location = new Point(875, 51); lblState.Name = "lblState"; lblState.Size = new Size(130, 23); @@ -271,7 +228,8 @@ // dgvSellthing.AutoSizeColumnsMode = AntdUI.ColumnsMode.Fill; dgvSellthing.Bordered = true; - dgvSellthing.Font = new Font("Microsoft YaHei UI", 9F); + dgvSellthing.Font = new Font("Noto Sans SC", 9F); + dgvSellthing.Gap = 12; dgvSellthing.Location = new Point(4, 88); dgvSellthing.Name = "dgvSellthing"; dgvSellthing.Size = new Size(487, 351); @@ -280,8 +238,7 @@ // // btnPg // - btnPg.Current = 0; - btnPg.Font = new Font("微软雅黑", 12F); + btnPg.Font = new Font("Noto Sans SC", 12F); btnPg.Location = new Point(4, 448); btnPg.Name = "btnPg"; btnPg.PageSize = 15; @@ -292,7 +249,7 @@ // // btnAdd // - btnAdd.Font = new Font("微软雅黑", 12F); + btnAdd.Font = new Font("Noto Sans SC", 12F); btnAdd.Location = new Point(496, 88); btnAdd.Name = "btnAdd"; btnAdd.Size = new Size(115, 38); @@ -303,7 +260,7 @@ // // btnCancel // - btnCancel.Font = new Font("微软雅黑", 12F); + btnCancel.Font = new Font("Noto Sans SC", 12F); btnCancel.Location = new Point(496, 174); btnCancel.Name = "btnCancel"; btnCancel.Size = new Size(115, 38); @@ -316,18 +273,27 @@ // dgvRoomSell.AutoSizeColumnsMode = AntdUI.ColumnsMode.Fill; dgvRoomSell.Bordered = true; - dgvRoomSell.Font = new Font("Microsoft YaHei UI", 9F); + dgvRoomSell.Font = new Font("Noto Sans SC", 9F); + dgvRoomSell.Gap = 12; dgvRoomSell.Location = new Point(497, 217); dgvRoomSell.Name = "dgvRoomSell"; dgvRoomSell.Size = new Size(572, 262); dgvRoomSell.TabIndex = 138; dgvRoomSell.CellClick += dgvRoomSell_CellClick; // + // ucWindowHeader1 + // + ucWindowHeader1.Location = new Point(1, 1); + ucWindowHeader1.Name = "ucWindowHeader1"; + ucWindowHeader1.Size = new Size(1071, 35); + ucWindowHeader1.TabIndex = 139; + // // FrmSellThing // AutoScaleMode = AutoScaleMode.None; BackColor = Color.FromArgb(235, 243, 255); ClientSize = new Size(1072, 486); + Controls.Add(ucWindowHeader1); Controls.Add(dgvRoomSell); Controls.Add(btnCancel); Controls.Add(btnAdd); @@ -341,15 +307,13 @@ Controls.Add(txtFind); Controls.Add(label1); Controls.Add(groupBox2); + FormBorderStyle = FormBorderStyle.None; Icon = (Icon)resources.GetObject("$this.Icon"); - IsForbidAltF4 = true; MaximizeBox = false; MinimizeBox = false; Name = "FrmSellThing"; - ShowTitleIcon = true; - Style = Sunny.UI.UIStyle.Custom; + Resizable = false; Text = "商品消费"; - ZoomScaleRect = new Rectangle(15, 15, 1072, 490); Load += FrmSellThing_Load; groupBox2.ResumeLayout(false); ResumeLayout(false); @@ -357,15 +321,6 @@ #endregion private System.Windows.Forms.GroupBox groupBox2; - //private Sunny.UI.UIDataGridView dgvRoomSell; - private Sunny.UI.UITextBox txtPrice; - private Sunny.UI.UILabel uiLabel6; - private Sunny.UI.UIDoubleUpDown nudNum; - private Sunny.UI.UILabel uiLabel5; - private Sunny.UI.UITextBox txtSellName; - private Sunny.UI.UILabel uiLabel4; - private Sunny.UI.UITextBox txtSellNo; - private Sunny.UI.UILabel uiLabel3; private System.Windows.Forms.DataGridViewTextBoxColumn clRoomNo; private System.Windows.Forms.DataGridViewTextBoxColumn clCustoNo; private System.Windows.Forms.DataGridViewTextBoxColumn clSpendName; @@ -402,5 +357,14 @@ private AntdUI.Button btnAdd; private AntdUI.Button btnCancel; private AntdUI.Table dgvRoomSell; + private ucWindowHeader ucWindowHeader1; + private AntdUI.InputNumber nudNum; + private AntdUI.Input txtPrice; + private AntdUI.Input txtSellName; + private AntdUI.Input txtSellNo; + private AntdUI.Label label6; + private AntdUI.Label label5; + private AntdUI.Label label4; + private AntdUI.Label label3; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.cs similarity index 72% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.cs index 707520aeaaecf6b21dfc011f740d37c8138b51f2..753da66d24caf5b78afb2202a959282d3622e0b3 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.cs @@ -22,17 +22,18 @@ * */ +using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Core; +using EOM.TSHotelManagement.Common.Util; using EOM.TSHotelManagement.Shared; using jvncorelib.EntityLib; -using Sunny.UI; using System.Transactions; namespace EOM.TSHotelManagement.FormUI { - public partial class FrmSellThing : Sunny.UI.UIForm + public partial class FrmSellThing : Window { static string roomNo; @@ -41,12 +42,15 @@ namespace EOM.TSHotelManagement.FormUI ReadRoomOutputDto r = null; private static ReadSpendOutputDto spend = null; + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmSellThing)); private LoadingProgress loadingProgress; public FrmSellThing() { InitializeComponent(); loadingProgress = new LoadingProgress(); + + ucWindowHeader1.ApplySettingsWithoutMinimize("商品消费", string.Empty, (Image)resources.GetObject("FrmSellThing.Icon")!); } #region 窗体加载事件 @@ -70,29 +74,28 @@ namespace EOM.TSHotelManagement.FormUI { dic = new Dictionary() { - { nameof(ReadSellThingInputDto.ProductNumber) , sellthing.Trim() }, { nameof(ReadSellThingInputDto.ProductName) , sellthing.Trim() }, - { nameof(ReadSellThingInputDto.Specification) , sellthing.Trim() } + { nameof(ReadSellThingInputDto.IsDelete) , "0" } }; result = HttpHelper.Request(ApiConstants.Sellthing_SelectSellThingAll, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Sellthing_SelectSellThingAll}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.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("加载结束"); @@ -101,25 +104,27 @@ namespace EOM.TSHotelManagement.FormUI #endregion #region 根据客户编号加载消费信息的方法 - private void LoadSpendInfoByRoomNo(string room) + private void LoadSpendInfoByRoomNo(ReadRoomOutputDto room) { dgvRoomSell.Spin("正在加载中...", config => { dic = new Dictionary() { - { nameof(ReadSpendInputDto.RoomNumber), room } + { nameof(ReadSpendInputDto.CustomerNumber), room.CustomerNumber }, + { nameof(ReadSpendInputDto.RoomNumber), room.RoomNumber }, + { nameof(ReadSpendInputDto.SettlementStatus) , ConsumptionConstant.UnSettle.Code }, }; result = HttpHelper.Request(ApiConstants.Spend_SelectSpendByRoomNo, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Spend_SelectSpendByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.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 +159,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.Success == false) { 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 @@ -176,31 +181,31 @@ namespace EOM.TSHotelManagement.FormUI { if (string.IsNullOrEmpty(txtRoomNo.Text)) { - UIMessageBox.Show("消费房间不能为空", "提示信息", UIStyle.Red, UIMessageBoxButtons.OKCancel); + NotificationService.ShowWarning("消费房间不能为空"); txtRoomNo.Focus(); return false; } if (string.IsNullOrEmpty(txtSellNo.Text)) { - UIMessageBox.Show("商品编号不能为空", "提示信息", UIStyle.Red, UIMessageBoxButtons.OKCancel); + NotificationService.ShowWarning("商品编号不能为空"); txtSellNo.Focus(); return false; } if (string.IsNullOrEmpty(txtSellName.Text)) { - UIMessageBox.Show("商品名称不能为空", "提示信息", UIStyle.Red, UIMessageBoxButtons.OKCancel); + NotificationService.ShowWarning("商品名称不能为空"); txtSellName.Focus(); return false; } if (string.IsNullOrEmpty(txtPrice.Text)) { - UIMessageBox.Show("商品单价不能为空", "提示信息", UIStyle.Red, UIMessageBoxButtons.OKCancel); + NotificationService.ShowWarning("商品单价不能为空"); txtPrice.Focus(); return false; } if (nudNum.Value <= 0) { - UIMessageBox.Show("数量不能小于或等于0", "提示信息", UIStyle.Red, UIMessageBoxButtons.OKCancel); + NotificationService.ShowWarning("数量不能小于或等于0"); txtPrice.Focus(); return false; } @@ -217,12 +222,12 @@ namespace EOM.TSHotelManagement.FormUI { if (lblState.Visible == false) { - UIMessageBox.Show("请先输入消费的房间！", "提示信息", UIStyle.Red); + NotificationService.ShowWarning("请先输入消费的房间！"); return; } if (nudNum.Value <= 0) { - UIMessageBox.Show("请输入消费数量！", "提示信息", UIStyle.Red); + NotificationService.ShowWarning("请输入消费数量！"); return; } if (lblState.Text == "该房间可消费") @@ -231,7 +236,7 @@ namespace EOM.TSHotelManagement.FormUI try { - var result = HttpHelper.Request(ApiConstants.Spend_AddCustomerSpend, HttpHelper.ModelToJson(new AddCustomerSpendInputDto + var customerSpend = new AddCustomerSpendInputDto { RoomNumber = txtRoomNo.Text.Trim(), ProductNumber = txtSellNo.Text.Trim(), @@ -240,21 +245,22 @@ namespace EOM.TSHotelManagement.FormUI Price = Convert.ToDecimal(txtPrice.Text), WorkerNo = LoginInfo.WorkerNo, SoftwareVersion = LoginInfo.SoftwareVersion - })); - var response = HttpHelper.JsonToModel(result.message!); - if (response.StatusCode != StatusCodeConstants.Success) + }; + var result = HttpHelper.Request(ApiConstants.Spend_AddCustomerSpend, customerSpend.ModelToJson()); + var response = HttpHelper.JsonToModel(result.message!); + if (response.Success == false) { - UIMessageBox.ShowError(response.Message ?? "添加消费记录失败"); + NotificationService.ShowError(response.Message ?? "添加消费记录失败"); return; } - UIMessageBox.Show("添加成功", "系统提示", UIStyle.Green); + NotificationService.ShowSuccess("添加成功"); - LoadSpendInfoByRoomNo(txtRoomNo.Text.Trim()); + LoadSpendInfoByRoomNo(r); LoadSellThingInfo(); } catch (Exception ex) { - UIMessageBox.ShowError($"接口调用异常: {ex.Message}"); + NotificationService.ShowError($"接口调用异常: {ex.Message}"); return; } } @@ -269,17 +275,22 @@ namespace EOM.TSHotelManagement.FormUI { if (lblState.Visible == false) { - UIMessageBox.Show("请先输入消费的房间！", "提示信息", UIStyle.Red); + NotificationService.ShowWarning("请先输入消费的房间！"); return; } if (!spend.IsNullOrEmpty()) { if (spend.ConsumptionType == SpendType.Room.Code || spend.ConsumptionType == SpendType.Other.Code) { - UIMessageBox.Show($"此条消费记录非{SpendType.Product.Description}记录，无法删除！", "提示信息", UIStyle.Red); + NotificationService.ShowError($"此条消费记录非{SpendType.Product.Description}记录，无法删除！"); return; } - if (UIMessageDialog.ShowMessageDialog("你确定要撤回该消费记录吗？", UILocalize.WarningTitle, true, Style)) + var dr = AntdUI.Modal.open(new AntdUI.Modal.Config(this, UIMessageConstant.Information, $"你确定要撤回该消费记录吗？", AntdUI.TType.Info) + { + CancelText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Wait, UIMessageConstant.Chs_Wait), + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Yes, UIMessageConstant.Chs_Yes) + }); + if (dr == DialogResult.OK) { using (TransactionScope scope = new TransactionScope()) { @@ -291,36 +302,36 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Sellthing_SelectSellThingByNameAndPrice, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Sellthing_SelectSellThingByNameAndPrice}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Sellthing_SelectSellThingByNameAndPrice}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - ReadSellThingOutputDto s = response.Source; - 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) + ReadSellThingOutputDto s = response.Data; + int num = spend.ConsumptionQuantity; + int inboundStock = (s.Stock + num); + var model = new UpdateSpendInputDto { SpendNumber = spend.SpendNumber }; + result = HttpHelper.Request(ApiConstants.Spend_UndoCustomerSpend, model.ModelToJson()); + var undoSpendResponse = HttpHelper.JsonToModel(result.message); + if (undoSpendResponse.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Spend_UndoCustomerSpend}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.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) + result = HttpHelper.Request(ApiConstants.Sellthing_UpdateSellthingInfo, sellThing.ModelToJson()); + var updateResponse = HttpHelper.JsonToModel(result.message); + if (updateResponse.Success == false) { - UIMessageTip.ShowError("撤销失败！", 1000); RecordHelper.Record($"接口异常。Message：\n{updateResponse.Message}", Common.Core.LogLevel.Critical); - UIMessageBox.ShowError($"{ApiConstants.Sellthing_UpdateSellthingInfo}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Sellthing_UpdateSellthingInfo}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - UIMessageTip.ShowOk("撤销成功！", 1000); + NotificationService.ShowSuccess("撤销成功！"); #region 获取添加操作日志所需的信息 RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "帮助" + spend.CustomerNumber + "撤销了消费商品:" + txtSellName.Text + "操作！", Common.Core.LogLevel.Warning); #endregion - LoadSpendInfoByRoomNo(txtRoomNo.Text); + LoadSpendInfoByRoomNo(r); LoadSellThingInfo(); nudNum.Value = 0; scope.Complete(); @@ -334,20 +345,12 @@ namespace EOM.TSHotelManagement.FormUI } else { - UIMessageTip.ShowError("操作取消！", 1000); + NotificationService.ShowWarning("操作取消！"); } } else { - UIMessageBox.Show("请选择要删除的消费记录！", "提示信息", UIStyle.Red); - } - } - - private void nudNum_ValueChanged(object sender, double value) - { - if (nudNum.Value < 0) - { - nudNum.Value = 0; + NotificationService.ShowWarning("请选择要删除的消费记录！"); } } @@ -366,21 +369,21 @@ namespace EOM.TSHotelManagement.FormUI string room = txtRoomNo.Text.Trim(); if (string.IsNullOrWhiteSpace(room) == true) { - UIMessageTip.ShowWarning("请输入消费房间号！", 1000); + NotificationService.ShowWarning("请输入消费房间号！"); return; } dic = new Dictionary() { - { nameof(ReadRoomInputDto.RoomNumber) , room} + { nameof(ReadSpendInputDto.RoomNumber) , room }, }; result = HttpHelper.Request(ApiConstants.Room_SelectRoomByRoomNo, dic); var checkResponse = HttpHelper.JsonToModel>(result.message); - if (checkResponse.StatusCode != StatusCodeConstants.Success) + if (checkResponse.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Room_SelectRoomByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_SelectRoomByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - ReadRoomOutputDto r = checkResponse.Source; + r = checkResponse.Data; if (txtRoomNo.Text == "") { lblState.Text = ""; @@ -398,7 +401,7 @@ namespace EOM.TSHotelManagement.FormUI lblState.Visible = true; lblState.Text = "该房间可消费"; lblState.ForeColor = Color.Black; - LoadSpendInfoByRoomNo(room); + LoadSpendInfoByRoomNo(r); } else { @@ -414,7 +417,7 @@ namespace EOM.TSHotelManagement.FormUI { if (lblState.Visible == false) { - UIMessageBox.Show("请先输入消费的房间！", "提示信息", UIStyle.Red); + NotificationService.ShowWarning("请先输入消费的房间！"); return; } if (e.Record is IList data) diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.resx similarity index 100% rename from EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.resx rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.resx diff --git a/EOM.TSHotelManagement.FormUI/EOM.TSHotelManagement.FormUI.csproj b/EOM.TSHotelManagement.FormUI/EOM.TSHotelManagement.FormUI.csproj index bd1925ecda337baf2aae0d451679612cce42a512..4315ea43c377ba2ec3b5ce31cd9e822e561e5a98 100644 --- a/EOM.TSHotelManagement.FormUI/EOM.TSHotelManagement.FormUI.csproj +++ b/EOM.TSHotelManagement.FormUI/EOM.TSHotelManagement.FormUI.csproj @@ -11,7 +11,7 @@ true enable true - 2.8.5.2 + 2.8.6.0 EOM.TSHotelManagement.FormUI.Program x64 TS酒店管理系统 @@ -19,9 +19,10 @@ $(SolutionDir)packages\Fody\build\Fody.targets false app.manifest + x64 - + Form @@ -30,26 +31,20 @@ Form - + Form - - Form - - + Form Form - - Form - - + Form - + Form @@ -61,10 +56,10 @@ Form - + Form - + Form @@ -73,22 +68,19 @@ Form - + Form - + Form - + Form - - UserControl - - + UserControl - + UserControl @@ -120,29 +112,28 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/EOM.TSHotelManagement.FormUI/Properties/Resources.Designer.cs b/EOM.TSHotelManagement.FormUI/Properties/Resources.Designer.cs index b6267e6683f5a096764e7eec1ceed9b510f329b2..662e6eede2060907279327f3a5aee65949b1ea3e 100644 --- a/EOM.TSHotelManagement.FormUI/Properties/Resources.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/Properties/Resources.Designer.cs @@ -73,39 +73,9 @@ namespace EOM.TSHotelManagement.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap arrow_down_b { + internal static System.Drawing.Bitmap lock_screen { get { - object obj = ResourceManager.GetObject("arrow-down-b", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap blue_refresh { - get { - object obj = ResourceManager.GetObject("blue_refresh", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap close { - get { - object obj = ResourceManager.GetObject("close", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018_jpg_w1024_new_small { - get { - object obj = ResourceManager.GetObject("jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small", resourceCulture); + object obj = ResourceManager.GetObject("lock_screen", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -150,26 +120,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap picExtend_Image { - get { - object obj = ResourceManager.GetObject("picExtend.Image", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap picExtend_ImageHover { - get { - object obj = ResourceManager.GetObject("picExtend.ImageHover", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -210,96 +160,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 上传照片 { - get { - object obj = ResourceManager.GetObject("上传照片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 个人中心 { - get { - object obj = ResourceManager.GetObject("个人中心", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 人力资源部卡片 { - get { - object obj = ResourceManager.GetObject("人力资源部卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 修改 { - get { - object obj = ResourceManager.GetObject("修改", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 关于我们 { - get { - object obj = ResourceManager.GetObject("关于我们", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 内控部卡片 { - get { - object obj = ResourceManager.GetObject("内控部卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 切换账号 { - get { - object obj = ResourceManager.GetObject("切换账号", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 可住房_hover_icon { - get { - object obj = ResourceManager.GetObject("可住房(hover)icon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 可住房icon { - get { - object obj = ResourceManager.GetObject("可住房icon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -310,36 +170,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 后勤部卡片 { - get { - object obj = ResourceManager.GetObject("后勤部卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 咖啡 { - get { - object obj = ResourceManager.GetObject("咖啡", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 商品部卡片 { - get { - object obj = ResourceManager.GetObject("商品部卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -360,26 +190,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 已住房_hover_icon { - get { - object obj = ResourceManager.GetObject("已住房(hover)icon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 已住房icon { - get { - object obj = ResourceManager.GetObject("已住房icon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -390,26 +200,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 常规部门卡片 { - get { - object obj = ResourceManager.GetObject("常规部门卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 总经办卡片 { - get { - object obj = ResourceManager.GetObject("总经办卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -420,56 +210,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 早上 { - get { - object obj = ResourceManager.GetObject("早上", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 普通会员 { - get { - object obj = ResourceManager.GetObject("普通会员", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 月亮 { - get { - object obj = ResourceManager.GetObject("月亮", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 检查更新__1_ { - get { - object obj = ResourceManager.GetObject("检查更新 (1)", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 注销 { - get { - object obj = ResourceManager.GetObject("注销", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -480,66 +220,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 白金会员 { - get { - object obj = ResourceManager.GetObject("白金会员", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 监管小组卡片 { - get { - object obj = ResourceManager.GetObject("监管小组卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 系统管理员 { - get { - object obj = ResourceManager.GetObject("系统管理员", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 经理部卡片 { - get { - object obj = ResourceManager.GetObject("经理部卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 维修房_hover_icon { - get { - object obj = ResourceManager.GetObject("维修房(hover)icon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 维修房icon { - get { - object obj = ResourceManager.GetObject("维修房icon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -550,36 +230,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 维修部卡片 { - get { - object obj = ResourceManager.GetObject("维修部卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 脏房_hover_icon { - get { - object obj = ResourceManager.GetObject("脏房(hover)icon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 脏房icon1 { - get { - object obj = ResourceManager.GetObject("脏房icon1", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -590,16 +240,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 财务部卡片 { - get { - object obj = ResourceManager.GetObject("财务部卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -620,56 +260,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 酒店部卡片 { - get { - object obj = ResourceManager.GetObject("酒店部卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 钻石会员 { - get { - object obj = ResourceManager.GetObject("钻石会员", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 锁屏 { - get { - object obj = ResourceManager.GetObject("锁屏", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 预约房_hover_icon { - get { - object obj = ResourceManager.GetObject("预约房(hover)icon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 预约房icon { - get { - object obj = ResourceManager.GetObject("预约房icon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -679,25 +269,5 @@ namespace EOM.TSHotelManagement.FormUI.Properties { return ((System.Drawing.Bitmap)(obj)); } } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 餐饮部卡片 { - get { - object obj = ResourceManager.GetObject("餐饮部卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 黄金会员 { - get { - object obj = ResourceManager.GetObject("黄金会员", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } } } diff --git a/EOM.TSHotelManagement.FormUI/Properties/Resources.resx b/EOM.TSHotelManagement.FormUI/Properties/Resources.resx index 28a3c94e45fad7d32b8c1c76a4a316411474e612..77d69cfe101b255b21748a33a7391b3d84b5da4d 100644 --- a/EOM.TSHotelManagement.FormUI/Properties/Resources.resx +++ b/EOM.TSHotelManagement.FormUI/Properties/Resources.resx @@ -118,196 +118,67 @@ 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\jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.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\picCommodity.Image.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\picCustomer.Image.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\picExtend.Image.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\picLogo.BackgroundImage.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\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\人力资源部卡片.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\可住房(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\咖啡.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\已住房(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\总经办卡片.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\picRoom.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\白金会员.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\维修房(hover)icon.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\维修房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\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\脏房(hover)icon.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\脏房icon1.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\预约状态.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\转换.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\已住状态.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 + + ..\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/Resources/EOM.TSHotelManagement.Common.Contract.xml b/EOM.TSHotelManagement.FormUI/Resources/EOM.TSHotelManagement.Common.Contract.xml index c501ed307e9ed40afd329cf0c8b9769985ddc00c..22f5b6d7c8d4d74489d106dd7b5c360ca8022e38 100644 --- a/EOM.TSHotelManagement.FormUI/Resources/EOM.TSHotelManagement.Common.Contract.xml +++ b/EOM.TSHotelManagement.FormUI/Resources/EOM.TSHotelManagement.Common.Contract.xml @@ -4,58 +4,153 @@ EOM.TSHotelManagement.Common.Contract - + - Token + 资料创建人 - + - 删除标识 + 资料创建时间 - + - 资料创建人 + 资料更新人 - + - 资料创建时间 + 资料更新时间 - + - 资料更新人 + Token - + - 资料更新时间 + 删除标识 - + - 状态码，例如 200 表示成功，500 表示服务器错误，400 表示客户端错误等 + 状态码，例如 0 表示成功 - + 返回消息，用于描述请求结果 - + - + 带状态码和消息的构造函数 状态码 消息 + + + 请求成功 + + + + + 创建成功（常用于 POST 请求） + + + + + 已接受（请求已接收但未处理完成） + + + + + 无内容（响应体为空） + + + + + 永久重定向 + + + + + 临时重定向 + + + + + 查看其他地址（常用于 POST 后重定向） + + + + + 资源未修改（缓存用） + + + + + 错误请求（参数或格式错误） + + + + + 未授权（身份验证失败） + + + + + 禁止访问（无权限） + + + + + 未找到资源 + + + + + 方法不允许（如 GET 接口用 POST 访问） + + + + + 请求超时 + + + + + 资源冲突（如重复提交） + + + + + 服务器内部错误 + + + + + 网关错误（上游服务异常） + + + + + 服务不可用（维护或过载） + + + + + 网关超时（上游服务响应超时） + + 页数 @@ -76,21 +171,96 @@ 带总数的列表输出Dto - + 数据源 - + - 总数 + 菜单 + + + + + 菜单主键 (Menu Key) + + + + + 菜单标题 (Menu Title) + + + + + 菜单路径 (Menu Path) + + + + + 图标 + + + + + 子菜单 (Child Menus) - + 数据源 + + + 账号 (Account) + + + + + 密码 (Password) + + + + + 邮箱 (Email) + + + + + 账号 (Account) + + + + + 邮箱 (Email) + + + + + 名称 (Name) + + + + + 密码 (Password) + + + + + 状态 (Status) + + + + + 最后一次登录地址 (Last Login IP) + + + + + 最后一次登录时间 (Last Login Time) + + 客户类型 (Customer Type) @@ -101,6 +271,11 @@ 客户类型名称 (Customer Type Name) + + + 优惠折扣 + + 打卡编号 (Check-in/Check-out Number) @@ -136,6 +311,76 @@ 管理员类型名称 (Administrator Type Name) + + + 公告类型编号 (AppointmentNotice Type Number) + + + + + 公告类型名称 (AppointmentNotice Type Name) + + + + + 公告类型编号 (AppointmentNotice Type Number) + + + + + 公告类型编号 (AppointmentNotice Type Number) + + + + + 公告类型名称 (AppointmentNotice Type Name) + + + + + 公告类型编号 (AppointmentNotice Type Number) + + + + + 公告类型名称 (AppointmentNotice Type Name) + + + + + 删除标识 + + + + + 资料创建人 + + + + + 资料创建时间 + + + + + 资料更新人 + + + + + 资料更新时间 + + + + + 公告类型编号 (AppointmentNotice Type Number) + + + + + 公告类型名称 (AppointmentNotice Type Name) + + 菜单视图模型 (Menu View Model) @@ -216,26 +461,6 @@ 系统管理 - - - 模块ID (Module ID) - - - - - 管理员账号 (Administrator Account) - - - - - 模块名称 (Module Name) - - - - - 是否开启 (Is Enabled) - - 备 注:角色编码 @@ -344,5 +569,70 @@ 异常堆栈 (Exception Stack Trace) + + + 请求路径 (URL Path) + + + + + HTTP方法 (GET/POST等) + + + + + 请求IP地址 + + + + + 请求参数 + + + + + HTTP状态码 + + + + + 请求时长(毫秒) + + + + + 用户代理 (浏览器信息) + + + + + 用户名 (未登录则为空) + + + + + 异常信息 + + + + + 请求时间 (自动设置为当前时间) + + + + + 响应大小(字节) + + + + + API操作描述 + + + + + 软件版本 + + diff --git a/EOM.TSHotelManagement.FormUI/Resources/arrow-down-b.png b/EOM.TSHotelManagement.FormUI/Resources/arrow-down-b.png deleted file mode 100644 index 7eabdc7ca4b00a854b670f4e02bdfd7b849ffd4f..0000000000000000000000000000000000000000 Binary files a/EOM.TSHotelManagement.FormUI/Resources/arrow-down-b.png and /dev/null differ diff --git a/EOM.TSHotelManagement.FormUI/Resources/blue_refresh.png b/EOM.TSHotelManagement.FormUI/Resources/blue_refresh.png deleted file mode 100644 index f12826d742262b64f217d8cc273420a4e5300ebe..0000000000000000000000000000000000000000 Binary files a/EOM.TSHotelManagement.FormUI/Resources/blue_refresh.png and /dev/null differ diff --git a/EOM.TSHotelManagement.FormUI/Resources/close.png b/EOM.TSHotelManagement.FormUI/Resources/close.png deleted file mode 100644 index 5fa944123722d8c0f82e5999c347238621bcfe76..0000000000000000000000000000000000000000 Binary files a/EOM.TSHotelManagement.FormUI/Resources/close.png and /dev/null differ diff --git a/EOM.TSHotelManagement.FormUI/Resources/jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png b/EOM.TSHotelManagement.FormUI/Resources/jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png deleted file mode 100644 index 67b24a2981fbf6e992d3965d23914f6da9735830..0000000000000000000000000000000000000000 Binary files a/EOM.TSHotelManagement.FormUI/Resources/jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png and /dev/null differ diff --git a/EOM.TSHotelManagement.FormUI/Resources/picExtend.Image.png b/EOM.TSHotelManagement.FormUI/Resources/picExtend.Image.png deleted file mode 100644 index 149be74c24104ea6cbc596a7341f147ae17036b0..0000000000000000000000000000000000000000 Binary files a/EOM.TSHotelManagement.FormUI/Resources/picExtend.Image.png and /dev/null differ diff --git a/EOM.TSHotelManagement.FormUI/Resources/picExtend.ImageHover.png b/EOM.TSHotelManagement.FormUI/Resources/picExtend.ImageHover.png deleted file mode 100644 index 21d9df7b4bb8f5d91d8ff55f87a7f4c8f3e8c8ab..0000000000000000000000000000000000000000 Binary files a/EOM.TSHotelManagement.FormUI/Resources/picExtend.ImageHover.png and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\344\270\212\344\274\240\347\205\247\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\344\270\212\344\274\240\347\205\247\347\211\207.png" deleted file mode 100644 index 3a70a3404154b633b81799d175b9780f473e9b44..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\344\270\212\344\274\240\347\205\247\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\344\270\252\344\272\272\344\270\255\345\277\203.png" "b/EOM.TSHotelManagement.FormUI/Resources/\344\270\252\344\272\272\344\270\255\345\277\203.png" deleted file mode 100644 index 8e75c850427cdd9483165d9e8f8420b3a47c9ff3..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\344\270\252\344\272\272\344\270\255\345\277\203.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\344\272\272\345\212\233\350\265\204\346\272\220\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\344\272\272\345\212\233\350\265\204\346\272\220\351\203\250\345\215\241\347\211\207.png" deleted file mode 100644 index a70a961d8a73985576291caa3336826a2c1c33a5..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\344\272\272\345\212\233\350\265\204\346\272\220\351\203\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\344\277\256\346\224\271.png" "b/EOM.TSHotelManagement.FormUI/Resources/\344\277\256\346\224\271.png" deleted file mode 100644 index 40df4c0e1029b6f7e396dceb4beb00d582803df1..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\344\277\256\346\224\271.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\205\263\344\272\216\346\210\221\344\273\254.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\205\263\344\272\216\346\210\221\344\273\254.png" deleted file mode 100644 index 195624fd05c5a0067c266b9ae9548102e2ed69c8..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\205\263\344\272\216\346\210\221\344\273\254.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\206\205\346\216\247\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\206\205\346\216\247\351\203\250\345\215\241\347\211\207.png" deleted file mode 100644 index 34c901a338d45a8b68ac233594b5dfa0c47fe262..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\206\205\346\216\247\351\203\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\210\207\346\215\242\350\264\246\345\217\267.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\210\207\346\215\242\350\264\246\345\217\267.png" deleted file mode 100644 index 51e1b2e9fecd6d799a3659f2dc4976173c68dba2..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\210\207\346\215\242\350\264\246\345\217\267.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\217\257\344\275\217\346\210\277(hover)icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\217\257\344\275\217\346\210\277(hover)icon.png" deleted file mode 100644 index c1dca5d426bce5ebdf7b75f37ea47b2019713c45..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\217\257\344\275\217\346\210\277(hover)icon.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\217\257\344\275\217\346\210\277icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\217\257\344\275\217\346\210\277icon.png" deleted file mode 100644 index ca1dae65d35036c66f7f4572dc8b4eaaff6f2b64..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\217\257\344\275\217\346\210\277icon.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\220\216\345\213\244\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\220\216\345\213\244\351\203\250\345\215\241\347\211\207.png" deleted file mode 100644 index 9049fef1385af581fbbaf05bcf223ad316486ca2..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\220\216\345\213\244\351\203\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\222\226\345\225\241.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\222\226\345\225\241.png" deleted file mode 100644 index ae3efb12e7d9f6d6c9427baf6a9d84d5ba8cb13d..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\222\226\345\225\241.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\225\206\345\223\201\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\225\206\345\223\201\351\203\250\345\215\241\347\211\207.png" deleted file mode 100644 index 7e6f811291b4b5920409c14c5359674cae2e9ffb..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\225\206\345\223\201\351\203\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\267\262\344\275\217\346\210\277(hover)icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\267\262\344\275\217\346\210\277(hover)icon.png" deleted file mode 100644 index 0c3a3049e17afd385282dd7af3175f5f8f62b322..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\267\262\344\275\217\346\210\277(hover)icon.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\267\262\344\275\217\346\210\277icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\267\262\344\275\217\346\210\277icon.png" deleted file mode 100644 index d444ebb8f5c3c63ebc852bded823fdf7fb82ce72..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\267\262\344\275\217\346\210\277icon.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\270\270\350\247\204\351\203\250\351\227\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\270\270\350\247\204\351\203\250\351\227\250\345\215\241\347\211\207.png" deleted file mode 100644 index fd2bdd6115eab21f9c65906de9717dc96d9a03ba..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\270\270\350\247\204\351\203\250\351\227\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\346\200\273\347\273\217\345\212\236\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\346\200\273\347\273\217\345\212\236\345\215\241\347\211\207.png" deleted file mode 100644 index 28bfeee18ae3cbb9280c9a26f211932c05b25ef8..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\346\200\273\347\273\217\345\212\236\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\346\227\251\344\270\212.png" "b/EOM.TSHotelManagement.FormUI/Resources/\346\227\251\344\270\212.png" deleted file mode 100644 index 31509299647b539898ced35b971c5e67e0fdc02a..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\346\227\251\344\270\212.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\346\231\256\351\200\232\344\274\232\345\221\230.png" "b/EOM.TSHotelManagement.FormUI/Resources/\346\231\256\351\200\232\344\274\232\345\221\230.png" deleted file mode 100644 index 4f89f6582c7cca0b463b577cdc4be568c5c23bb6..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\346\231\256\351\200\232\344\274\232\345\221\230.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\346\234\210\344\272\256.png" "b/EOM.TSHotelManagement.FormUI/Resources/\346\234\210\344\272\256.png" deleted file mode 100644 index 1caddfd6e9741eca79fc829250ea508d6596d0f6..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\346\234\210\344\272\256.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\346\243\200\346\237\245\346\233\264\346\226\260 (1).png" "b/EOM.TSHotelManagement.FormUI/Resources/\346\243\200\346\237\245\346\233\264\346\226\260 (1).png" deleted file mode 100644 index 84b0766bda0cb7da6ad7980e5ebb7a0662027b06..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\346\243\200\346\237\245\346\233\264\346\226\260 (1).png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\346\263\250\351\224\200.png" "b/EOM.TSHotelManagement.FormUI/Resources/\346\263\250\351\224\200.png" deleted file mode 100644 index 24c205237c0ad17e09af926318cfc0b9bba82203..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\346\263\250\351\224\200.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\347\231\275\351\207\221\344\274\232\345\221\230.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\231\275\351\207\221\344\274\232\345\221\230.png" deleted file mode 100644 index 17ca731aa33ae297afa79dce3af3f19ae558e5ae..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\347\231\275\351\207\221\344\274\232\345\221\230.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\347\233\221\347\256\241\345\260\217\347\273\204\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\233\221\347\256\241\345\260\217\347\273\204\345\215\241\347\211\207.png" deleted file mode 100644 index 04ab28ee7ebc8e3e244ce6ec6482381e9d8ba72f..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\347\233\221\347\256\241\345\260\217\347\273\204\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\347\263\273\347\273\237\347\256\241\347\220\206\345\221\230.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\263\273\347\273\237\347\256\241\347\220\206\345\221\230.png" deleted file mode 100644 index fa5fa0c4c59f855dc24537f60594e224879f8a0f..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\347\263\273\347\273\237\347\256\241\347\220\206\345\221\230.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\347\273\217\347\220\206\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\273\217\347\220\206\351\203\250\345\215\241\347\211\207.png" deleted file mode 100644 index 01b97aaa68a9e4d3f01fa6041c4a8185c5089c95..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\347\273\217\347\220\206\351\203\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\346\210\277(hover)icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\346\210\277(hover)icon.png" deleted file mode 100644 index 2b12319437d589743210f84777e7de6557b71612..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\346\210\277(hover)icon.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\346\210\277icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\346\210\277icon.png" deleted file mode 100644 index e4af31f0223a6486962981b322a1e46278df8590..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\346\210\277icon.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\351\203\250\345\215\241\347\211\207.png" deleted file mode 100644 index 3d5c1f1f5a0fe165f8202a8880045944e216801e..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\351\203\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\350\204\217\346\210\277(hover)icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\350\204\217\346\210\277(hover)icon.png" deleted file mode 100644 index 3a73a1abcbaab7bd834d5261c7f8059a1b8a8052..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\350\204\217\346\210\277(hover)icon.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\350\204\217\346\210\277icon1.png" "b/EOM.TSHotelManagement.FormUI/Resources/\350\204\217\346\210\277icon1.png" deleted file mode 100644 index b2435f604db4ca8321d41552d7dbd1a6d508fe7e..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\350\204\217\346\210\277icon1.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\350\264\242\345\212\241\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\350\264\242\345\212\241\351\203\250\345\215\241\347\211\207.png" deleted file mode 100644 index 531524e0b946d4a5c2f0dc4a12226b9c12e6850b..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\350\264\242\345\212\241\351\203\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\351\205\222\345\272\227\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\205\222\345\272\227\351\203\250\345\215\241\347\211\207.png" deleted file mode 100644 index 4b16ce1072261f11fc6fe938a7687574384671fb..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\351\205\222\345\272\227\351\203\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\351\222\273\347\237\263\344\274\232\345\221\230.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\222\273\347\237\263\344\274\232\345\221\230.png" deleted file mode 100644 index ea26dd214b05492bf0259effc237a6eb4c2bc496..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\351\222\273\347\237\263\344\274\232\345\221\230.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\351\224\201\345\261\217.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\224\201\345\261\217.png" deleted file mode 100644 index 1e06a51a35eee37351b69f786f035fdf9552f251..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\351\224\201\345\261\217.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\351\242\204\347\272\246\346\210\277(hover)icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\242\204\347\272\246\346\210\277(hover)icon.png" deleted file mode 100644 index 7d6ba1e80bb4aa9899257ca905fe367776da0897..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\351\242\204\347\272\246\346\210\277(hover)icon.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\351\242\204\347\272\246\346\210\277icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\242\204\347\272\246\346\210\277icon.png" deleted file mode 100644 index 214d13988e717e5f243dd0f08b359bc70c9c2ed8..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\351\242\204\347\272\246\346\210\277icon.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\351\244\220\351\245\256\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\244\220\351\245\256\351\203\250\345\215\241\347\211\207.png" deleted file mode 100644 index 4e055088420883d015431424808c2c17f98f41db..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\351\244\220\351\245\256\351\203\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\351\273\204\351\207\221\344\274\232\345\221\230.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\273\204\351\207\221\344\274\232\345\221\230.png" deleted file mode 100644 index 4e49841e243c067d0f4ebe7d4ec65590824b2082..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\351\273\204\351\207\221\344\274\232\345\221\230.png" and /dev/null differ diff --git a/EOM.TSHotelManagement.FormUI/Services/NotificationService.cs b/EOM.TSHotelManagement.FormUI/Services/NotificationService.cs new file mode 100644 index 0000000000000000000000000000000000000000..3ec170cf7bcc76fc1dcbf340bc8737a9b338d26a --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/Services/NotificationService.cs @@ -0,0 +1,49 @@ +using AntdUI; +using EOM.TSHotelManagement.Common; +using EOM.TSHotelManagement.Common.Util; + +namespace EOM.TSHotelManagement.FormUI +{ + public static class NotificationService + { + public static void ShowSuccess(string message) + { + Modal.open(new Modal.Config(null, UIMessageConstant.Success, message, TType.Success) + { + Draggable = true, + CancelText = null, + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Ok, UIMessageConstant.Chs_Ok) + }); + } + + public static void ShowError(string message) + { + Modal.open(new Modal.Config(null, UIMessageConstant.Error, message, TType.Error) + { + Draggable = true, + CancelText = null, + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Ok, UIMessageConstant.Chs_Ok) + }); + } + + public static void ShowInfo(string message) + { + Modal.open(new Modal.Config(null, UIMessageConstant.Information, message, TType.Info) + { + Draggable = true, + CancelText = null, + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Ok, UIMessageConstant.Chs_Ok) + }); + } + + public static void ShowWarning(string message) + { + Modal.open(new Modal.Config(null, UIMessageConstant.Warning, message, TType.Warn) + { + Draggable = true, + CancelText = null, + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Ok, UIMessageConstant.Chs_Ok) + }); + } + } +} 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/icon/update.ico b/EOM.TSHotelManagement.FormUI/icon/update.ico new file mode 100644 index 0000000000000000000000000000000000000000..6320dd6632ce4c62e78027c34e6dedfeb1de0c19 Binary files /dev/null and b/EOM.TSHotelManagement.FormUI/icon/update.ico differ diff --git a/EOM.TSHotelManagement.FormUI/images/blue_refresh.png b/EOM.TSHotelManagement.FormUI/images/blue_refresh.png deleted file mode 100644 index f12826d742262b64f217d8cc273420a4e5300ebe..0000000000000000000000000000000000000000 Binary files a/EOM.TSHotelManagement.FormUI/images/blue_refresh.png and /dev/null differ 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/README.en.md b/README.en.md index 6b839b6b92d685cd71efb16cccc1927b83d2745e..fbce1af1a9b3e45925db1cc3504ea5395a0c8278 100644 --- a/README.en.md +++ b/README.en.md @@ -24,8 +24,6 @@ 2. ##### SQLSugar, the most popular ORM framework in China. [SQLSugar, Apache-2.0 License](https://gitee.com/dotnetchina/SqlSugar) -3. ##### SunnyUI—SunnyUI.Net, based on C# .Net WinForm open-source control library, tool library, extension library, and multi-page development framework. [SunnyUI.Net, GPL3.0 License](https://gitee.com/yhuse/SunnyUI) - 4. ##### **RestSharp——Simple REST and HTTP API Client for .NET。[RestSharp,Apache-2.0 License](https://github.com/restsharp/RestSharp)** 5. ##### AntdUI——基于 Ant Design 设计语言的 Winform 界面库. AntdUI。[AntdUI,Apache-2.0 License](https://gitee.com/antdui/AntdUI) @@ -36,7 +34,7 @@ 2. Bugs and comments are welcome! -3. This system’s 95% of the pages are created based on the SunnyUI.Net control library, hereby specially declared! +3. This system’s 95% of the pages are created based on the AntdUI.Net control library, hereby specially declared! 4. Regarding the database script issue, please first go to the database script folder, choose either the MySQL version or PostgreSQL version folder to download the Data and Table files. In the database, execute the Table.sql first, then the Data.sql! @@ -133,8 +131,18 @@ EOM.Client.TopSkyHotelManagerSystem **Download and install .NET SDK version 8 or above.** **Download and install Microsoft Visual Studio Professional 2022 or above, unzip the downloaded Zip package, and run the .sln file.** -# :inbox_tray: Database Setup and Deployment (Local): +# :inbox_tray: Open Source Linsense： + +[MIT Linsense](https://gitee.com/java-and-net/TopskyHotelManagementSystem/blob/master/LICENSE) + +# :pray: Rely on the project's open source license： + +Fody [MIT Linsense](https://github.com/Fody/Fody/blob/master/License.txt) + +SQLSugar [Apache-2.0 Linsense](https://gitee.com/dotnetchina/SqlSugar/blob/master/LICENSE) + +RestSharp [Apache-2.0 Linsense](https://github.com/restsharp/RestSharp/blob/dev/LICENSE.txt) -**Omitted. This project does not include backend business logic. For details, please refer to: [Business Logic Project](https://gitee.com/java-and-net/topsky-hotel-management-system-web-api/blob/master/README.en.md)** +AntdUI [Apache-2.0 Linsense](https://gitee.com/AntdUI/AntdUI/blob/main/LICENSE) [![java-and-net/TopskyHotelManagementSystem](https://gitee.com/java-and-net/TopskyHotelManagementSystem/widgets/widget_card.svg?colors=4183c4,ffffff,ffffff,e3e9ed,666666,9b9b9b)](https://gitee.com/java-and-net/TopskyHotelManagerSystem) diff --git a/README.md b/README.md index 021feb17bf62eb221f3b027ad04d7ee8ca0653d7..4c387e747c08de0d04beddaafde3b9729d89d4cd 100644 --- a/README.md +++ b/README.md @@ -12,11 +12,13 @@ # :exclamation: 重要说明： - **注意：目前master分支随v2.x版本变动而变动，v2.x版本与v1.x版本变动极大，因此想要v1.x版本的可移步至v1.x分支地址** ： https://gitee.com/java-and-net/TopskyHotelManagerSystem/tree/v1.x/ +**1.目前master分支随v2.8.x版本变动而变动，v2.0.x版本与v1.x版本均以归档，因此想要v1.x和v2.0.x版本的可移步至对应分支地址:
+ v1.x分支：https://gitee.com/java-and-net/TopskyHotelManagerSystem/tree/v1.x/
+ v2.x分支：https://gitee.com/java-and-net/TopskyHotelManagementSystem/tree/v2.0.x** - **即日起，程序版本号规范将固定为x.x.x.x，第一位为当前程序版本，第二位为当前程序框架版本，第三位为功能大变更版本，第四位为日常修复版本，例如：基于.NET 8框架的2.0版本，对应的版本号是2.8.0.0，往后的.NET 9将会是2.9.0.0，并以此类推** +**2.程序版本号规范将固定为x.x.x.x，第一位为当前程序版本，第二位为当前程序框架版本，第三位为功能大变更版本，第四位为日常修复版本，例如：基于NET 8框架的2.0版本，对应的版本号是2.8.0.0，往后的NET 9将会是2.9.0.0，并以此类推。** -**即日起，该项目正式进入维护阶段，不再新增任何功能。同时，我们很高兴地宣布，TopSkyHotelManagementSystem的移动端开发工作正式启动，具体仓库地址为：[TopSkyHotelManagementSystem-MAUI](https://gitee.com/java-and-net/topsky-hotel-management-system-maui)，该项目基于.NET 8的MAUI进行开发，目前仅考虑安卓端，其他暂不具备条件。** +**3.该项目正式进入维护阶段，不再新增任何功能。同时，我们很高兴地宣布，TopSkyHotelManagementSystem的移动端开发工作正式启动，具体仓库地址为：[TopSkyHotelManagementSystem-MAUI](https://gitee.com/java-and-net/topsky-hotel-management-system-maui)，该项目基于.NET 8的MAUI进行开发，目前仅考虑安卓端，其他暂不具备测试条件。** # :pray: 引用的开源项目： @@ -24,8 +26,6 @@ 2. ##### SQLSugar，国内最受欢迎ORM框架[SQLSugar。 [Apache-2.0开源协议](https://gitee.com/dotnetchina/SqlSugar) -3. ##### SunnyUI——SunnyUI.Net, 基于 C# .Net WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。[SunnyUI.Net,GPL3.0开源协议](https://gitee.com/yhuse/SunnyUI) - 4. ##### **RestSharp——Simple REST and HTTP API Client for .NET。[RestSharp,Apache-2.0开源协议](https://github.com/restsharp/RestSharp)** 5. ##### AntdUI——👚 基于 Ant Design 设计语言的 Winform 界面库。[AntdUI,Apache-2.0开源协议](https://gitee.com/antdui/AntdUI) @@ -36,7 +36,7 @@ 2、有bug欢迎提出issue！或进行评论 -3、本系统UI框架主要基于Sunny.UI和AntdUI进行创建，在此特别声明！ +3、本系统UI框架主要基于AntdUI进行创建，在此特别声明！ 4、关于数据库脚本问题，请先移步至数据库脚本文件夹下，选择Mysql版本或PostgreSQL版本任意文件夹下载Data和Table两个文件，再数据库中先执行Table.sql，再执行Data.sql! @@ -132,8 +132,18 @@ EOM.Client.TopskyHotelManagementSystem **下载并安装.NET 8及以上SDK版本。** **下载并安装Microsoft Visual Studio Professional 2022及以上版本，并通过下载Zip包解压，打开.sln后缀格式文件运行。** -# :inbox_tray: 数据库运行部署(本地)： +# :inbox_tray: 开源协议： + +[MIT Linsense](https://gitee.com/java-and-net/TopskyHotelManagementSystem/blob/master/LICENSE) + +# :inbox_tray: 依赖项目开源协议： + +Fody [MIT Linsense](https://github.com/Fody/Fody/blob/master/License.txt) + +SQLSugar [Apache-2.0 Linsense](https://gitee.com/dotnetchina/SqlSugar/blob/master/LICENSE) + +RestSharp [Apache-2.0 Linsense](https://github.com/restsharp/RestSharp/blob/dev/LICENSE.txt) -**略，本项目不包含后台业务逻辑。详情请查看：[业务逻辑项目](https://gitee.com/java-and-net/topsky-hotel-management-system-web-api/blob/master/README.md#%E6%95%B0%E6%8D%AE%E5%BA%93%E8%BF%90%E8%A1%8C%E9%83%A8%E7%BD%B2%E6%9C%AC%E5%9C%B0)** +AntdUI [Apache-2.0 Linsense](https://gitee.com/AntdUI/AntdUI/blob/main/LICENSE) [![java-and-net/TopskyHotelManagementSystem](https://gitee.com/java-and-net/TopskyHotelManagementSystem/widgets/widget_card.svg?colors=4183c4,ffffff,ffffff,e3e9ed,666666,9b9b9b)](https://gitee.com/java-and-net/TopskyHotelManagerSystem) \ No newline at end of file diff --git a/topsky-hotel-management-system-web-api b/topsky-hotel-management-system-web-api index 0cb2d1a9f09d594f2829f73bd05c92c2c9eff075..ccf133f885049974dd3cc5078406ba4d13eb42db 160000 --- a/topsky-hotel-management-system-web-api +++ b/topsky-hotel-management-system-web-api @@ -1 +1 @@ -Subproject commit 0cb2d1a9f09d594f2829f73bd05c92c2c9eff075 +Subproject commit ccf133f885049974dd3cc5078406ba4d13eb42db