diff --git a/EOM.TSHotelManager.Common/AppConstant/Constant.cs b/EOM.TSHotelManager.Common/AppConstant/Constant.cs index 197cd70fdf198c276c10b66690d63a7388f533b0..12fe684ca1bebca22a9906fa516f0572f98a8600 100644 --- a/EOM.TSHotelManager.Common/AppConstant/Constant.cs +++ b/EOM.TSHotelManager.Common/AppConstant/Constant.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace EOM.TSHotelManager.Common +namespace EOM.TSHotelManager.Common { public class Constant where T : Constant { diff --git a/EOM.TSHotelManager.Common/AppConstant/CustomTypeConstant.cs b/EOM.TSHotelManager.Common/AppConstant/CustomTypeConstant.cs index caf0285a3c3aef4dcaa22df17be449111680d3eb..557a75dacb200fb8d4ad4557d020734ed1381145 100644 --- a/EOM.TSHotelManager.Common/AppConstant/CustomTypeConstant.cs +++ b/EOM.TSHotelManager.Common/AppConstant/CustomTypeConstant.cs @@ -1,12 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace EOM.TSHotelManager.Common +namespace EOM.TSHotelManager.Common { - public class CustomTypeConstant:Constant + public class CustomTypeConstant : Constant { // 普通会员 public static readonly CustomTypeConstant RegularMember = new CustomTypeConstant("0", "普通会员"); diff --git a/EOM.TSHotelManager.Common/AppConstant/PassportConstant.cs b/EOM.TSHotelManager.Common/AppConstant/PassportConstant.cs index 475df45393110e491c543a82b1f9d0b82816b3f2..096fe7458088c47bbea682e3de1cd5b48ff2ee25 100644 --- a/EOM.TSHotelManager.Common/AppConstant/PassportConstant.cs +++ b/EOM.TSHotelManager.Common/AppConstant/PassportConstant.cs @@ -1,13 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace EOM.TSHotelManager.Common +namespace EOM.TSHotelManager.Common { - public class PassportConstant:Constant + public class PassportConstant : Constant { // 中国居民身份证 public static readonly PassportConstant ChineseResidentIdentityCard = new PassportConstant("0", "中国居民身份证"); diff --git a/EOM.TSHotelManager.Common/AppConstant/RoomStateConstant.cs b/EOM.TSHotelManager.Common/AppConstant/RoomStateConstant.cs index 870274e9b708316db81cf3cd36521d79b0dc0b03..cd8c2a2eb3db8c8e8a95f46fb59228ddb55f8be6 100644 --- a/EOM.TSHotelManager.Common/AppConstant/RoomStateConstant.cs +++ b/EOM.TSHotelManager.Common/AppConstant/RoomStateConstant.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace EOM.TSHotelManager.Common +namespace EOM.TSHotelManager.Common { public class RoomStateConstant : Constant { diff --git a/EOM.TSHotelManager.Common/AppConstant/SexConstant.cs b/EOM.TSHotelManager.Common/AppConstant/SexConstant.cs index cee11f7adc5cd69d86439a280c7d649f25be1c91..f20ade00f00f0a68e881a113512f723767cfde3a 100644 --- a/EOM.TSHotelManager.Common/AppConstant/SexConstant.cs +++ b/EOM.TSHotelManager.Common/AppConstant/SexConstant.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace EOM.TSHotelManager.Common +namespace EOM.TSHotelManager.Common { public class SexConstant : Constant { diff --git a/EOM.TSHotelManager.Common/HttpHelper/HttpHelper.cs b/EOM.TSHotelManager.Common/Helper/HttpHelper.cs similarity index 80% rename from EOM.TSHotelManager.Common/HttpHelper/HttpHelper.cs rename to EOM.TSHotelManager.Common/Helper/HttpHelper.cs index 7b2b3525d028e67ce68d9c7feaf12585f89744c2..11dec7e5509265c3aaeab18b3165a1957bd24529 100644 --- a/EOM.TSHotelManager.Common/HttpHelper/HttpHelper.cs +++ b/EOM.TSHotelManager.Common/Helper/HttpHelper.cs @@ -1,19 +1,12 @@ using jvncorelib.EncryptorLib; using jvncorelib.EntityLib; -using jvncorelib.HttpLib; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using RestSharp; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Net; -using System.Net.Security; using System.Text; using System.Text.RegularExpressions; using System.Web; -using System.Windows.Input; namespace EOM.TSHotelManager.Common { @@ -58,9 +51,9 @@ namespace EOM.TSHotelManager.Common _convertEmptyStringToNull = convertEmptyStringToNull; } - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer) { - JObject obj = JObject.FromObject(value, serializer); + JObject obj = JObject.FromObject(value ?? new object(), serializer); foreach (var prop in obj.Properties().ToList()) { @@ -80,12 +73,12 @@ namespace EOM.TSHotelManager.Common obj.WriteTo(writer); } - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + public override object ReadJson(JsonReader? reader, Type? objectType, object? existingValue, JsonSerializer? serializer) { throw new NotImplementedException(); } - public override bool CanConvert(Type objectType) + public override bool CanConvert(Type? objectType) { return objectType == typeof(JObject); } @@ -100,12 +93,17 @@ namespace EOM.TSHotelManager.Common /// 服务器文件夹路径 public static string UpLoadFile(string fileNamePath, string uriString) { - // 创建WebClient实例 - WebClient myWebClient = new WebClient(); - byte[] responseData = myWebClient.UploadFile(uriString, "POST", fileNamePath);//得到返回的内容 - String str = Encoding.UTF8.GetString(responseData);//得到的目的字符串 + using HttpClient client = new HttpClient(); + using MultipartFormDataContent content = new MultipartFormDataContent(); + using FileStream fs = new FileStream(fileNamePath, FileMode.Open, FileAccess.Read); + using StreamContent streamContent = new StreamContent(fs); + content.Add(streamContent, "file", Path.GetFileName(fileNamePath)); - return str.Replace('\"', ' '); + HttpResponseMessage response = client.PostAsync(uriString, content).Result; + response.EnsureSuccessStatusCode(); + string responseData = response.Content.ReadAsStringAsync().Result; + + return responseData.Replace('\"', ' '); } /// @@ -115,7 +113,7 @@ namespace EOM.TSHotelManager.Common /// /// /// - public static ResponseMsg Request(string url, string json = null, Dictionary dic = null) + public static ResponseMsg Request(string url, string? json = null, Dictionary? dic = null) { ResponseMsg msg = new ResponseMsg(); @@ -142,6 +140,25 @@ namespace EOM.TSHotelManager.Common return msg; } + + /// + /// 批量请求 + /// + /// + /// + public static Dictionary RaiseRequests(Dictionary? dic)> requests) + { + var results = new Dictionary(); + + foreach (var (url, (json, dic)) in requests) + { + var result = Request(url, json, dic); + results[url] = result; + } + + return results; + } + /// /// GET请求 /// @@ -152,7 +169,7 @@ namespace EOM.TSHotelManager.Common /// /// /// - public static ResponseMsg DoGet(string url, IDictionary parameters = null, string contentType = null, string referer = null, string cookie = null, Dictionary dicHeaders = null) + public static ResponseMsg DoGet(string url, IDictionary? parameters = null, string? contentType = null, string? referer = null, string? cookie = null, Dictionary? dicHeaders = null) { if (parameters != null && parameters.Count > 0) { @@ -170,8 +187,8 @@ namespace EOM.TSHotelManager.Common var client = new RestClient(url); var request = new RestRequest(); - string resultContent = ""; - RestResponse rsp = null; + string? resultContent = null; + RestResponse? rsp = null; try { @@ -220,7 +237,7 @@ namespace EOM.TSHotelManager.Common /// /// /// - public static ResponseMsg DoPost(string url, string jsonParam = null, string contentType = null, string referer = null, string cookie = null, Dictionary dicHeaders = null) + public static ResponseMsg DoPost(string url, string? jsonParam = null, string? contentType = null, string? referer = null, string? cookie = null, Dictionary? dicHeaders = null) { var reponse = new RestResponse(); var client = new RestClient(url); @@ -254,7 +271,7 @@ namespace EOM.TSHotelManager.Common request.AddHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36"); - request.AddBody(jsonParam); + request.AddBody(jsonParam!); var token = LoginInfo.UserToken.IsNullOrEmpty() ? AdminInfo.UserToken : LoginInfo.UserToken; @@ -305,7 +322,7 @@ namespace EOM.TSHotelManager.Common * 1.左右括号没有转移（Java的URLEncoder.encode有） * 2.转移符合都是小写的，Java是大写的 */ - public static string UrlEncode(string str, Encoding e) + public static string? UrlEncode(string? str, Encoding e) { var REG_URL_ENCODING = new Regex(@"%[a-f0-9]{2}"); @@ -324,18 +341,29 @@ namespace EOM.TSHotelManager.Common /// /// /// - public static List JsonToList(string JsonStr) + 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转实体 /// /// /// /// - public static T JsonToModel(this string input) + public static T? JsonToModel(this string input) { return JsonConvert.DeserializeObject(input); } diff --git a/EOM.TSHotelManager.Common/HttpHelper/ResponseMsg.cs b/EOM.TSHotelManager.Common/Helper/ResponseMsg.cs similarity index 85% rename from EOM.TSHotelManager.Common/HttpHelper/ResponseMsg.cs rename to EOM.TSHotelManager.Common/Helper/ResponseMsg.cs index 56ca30d637c5151e4b3f0527e4f3c39a8c3d56cd..398fb453840e64833248cb202c25460b05dc9d3f 100644 --- a/EOM.TSHotelManager.Common/HttpHelper/ResponseMsg.cs +++ b/EOM.TSHotelManager.Common/Helper/ResponseMsg.cs @@ -9,6 +9,6 @@ /// /// 错误信息 /// - public string message { get; set; } + public string? message { get; set; } } } diff --git a/EOM.TSHotelManager.Common/Util/ApplicationUtil.cs b/EOM.TSHotelManager.Common/Util/ApplicationUtil.cs index 00dd3baf555e1fcf42092969df01df27b72f3bb1..80c110b8277e040b22837ca276c426d6242c46bf 100644 --- a/EOM.TSHotelManager.Common/Util/ApplicationUtil.cs +++ b/EOM.TSHotelManager.Common/Util/ApplicationUtil.cs @@ -1,15 +1,6 @@ -using NPOI.SS.Formula.Functions; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Net; -using System.Net.Http; +using System.Diagnostics; using System.Reflection; using System.Text; -using System.Threading; -using System.Xml.Linq; namespace EOM.TSHotelManager.Common { diff --git a/EOM.TSHotelManager.Common/Util/ExportHelper.cs b/EOM.TSHotelManager.Common/Util/ExportHelper.cs index 6608497deb48a3f812dcb622053f39a2729af209..e6efac2226ea45b32b95d6ad8c2dcfc0fd6a2f13 100644 --- a/EOM.TSHotelManager.Common/Util/ExportHelper.cs +++ b/EOM.TSHotelManager.Common/Util/ExportHelper.cs @@ -1,11 +1,7 @@ using jvncorelib.EntityLib; using NPOI.SS.UserModel; using NPOI.XSSF.UserModel; -using System; -using System.Collections.Generic; using System.Data; -using System.IO; -using System.Linq; namespace EOM.TSHotelManager.Common { diff --git a/EOM.TSHotelManager.Common/Util/RecordHelper.cs b/EOM.TSHotelManager.Common/Util/RecordHelper.cs index 1084200b4da403dde67e196afa2cc4b8cef8643e..8395d814aaad76a2719232f8808c6c3268b97173 100644 --- a/EOM.TSHotelManager.Common/Util/RecordHelper.cs +++ b/EOM.TSHotelManager.Common/Util/RecordHelper.cs @@ -1,5 +1,4 @@ using EOM.TSHotelManager.Common.Core; -using System; namespace EOM.TSHotelManager.Common { diff --git a/EOM.TSHotelManager.FormUI/ApiExtractor/ApiConstant.cs b/EOM.TSHotelManager.FormUI/ApiExtractor/ApiConstant.cs index de6971b1c4ac514ee28dbaac435909fdccc31f68..3f1876b2674e546bac44f7294a2cf9c13a80d1d4 100644 --- a/EOM.TSHotelManager.FormUI/ApiExtractor/ApiConstant.cs +++ b/EOM.TSHotelManager.FormUI/ApiExtractor/ApiConstant.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace EOM.TSHotelManager.FormUI +namespace EOM.TSHotelManager.FormUI { public static class ApiConstant { diff --git a/EOM.TSHotelManager.FormUI/ApiExtractor/SwaggerExtractor.cs b/EOM.TSHotelManager.FormUI/ApiExtractor/SwaggerExtractor.cs index 7f5fe6c1ec793aba2e52ff2a6f829a2c8ae0b551..862000fd6f949fabc87520e8f023e644f3c760f2 100644 --- a/EOM.TSHotelManager.FormUI/ApiExtractor/SwaggerExtractor.cs +++ b/EOM.TSHotelManager.FormUI/ApiExtractor/SwaggerExtractor.cs @@ -1,13 +1,6 @@ using EOM.TSHotelManager.Common; using Newtonsoft.Json; using RestSharp; -using Sunny.UI.Win32; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Security.Policy; -using System.Text; -using System.Threading.Tasks; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/App.config b/EOM.TSHotelManager.FormUI/App.config new file mode 100644 index 0000000000000000000000000000000000000000..49cc43e1d8f54e541889767ccf34bebecdf5255f --- /dev/null +++ b/EOM.TSHotelManager.FormUI/App.config @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.cs index 585a91625c33e1fcd381393749cc658e4f626ebd..22519f37f1273cb9a472e11bd4d36987e5aaad16 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,9 +22,6 @@ * */ using Sunny.UI; -using System; -using System.Drawing; -using System.Windows.Forms; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.cs index a8bd5d79bb90d3cf74fb2b935ae3f7c90c91028c..f79d80b2ff9c833ca96f50f058495f2662bcfc52 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,16 +22,10 @@ * */ using AntdUI; +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; -using Sunny.UI; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Xml.Linq; using EOM.TSHotelManager.Common.Util; -using EOM.TSHotelManager.Common; +using Sunny.UI; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.cs index c86ac788edc4675585f66fea27274be7c38c044e..dbd1e479d3573a59149c56161775f38d2dc226c9 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -21,14 +21,12 @@ *SOFTWARE. * */ -using EOM.TSHotelManager.Common.Core; -using Sunny.UI; +using AntdUI; using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; +using EOM.TSHotelManager.Common.Core; using EOM.TSHotelManager.Common.Util; -using AntdUI; -using System.Linq; +using jvncorelib.EntityLib; +using Sunny.UI; namespace EOM.TSHotelManager.FormUI { @@ -111,7 +109,7 @@ namespace EOM.TSHotelManager.FormUI { { "isDelete","0"} }; - result = HttpHelper.Request("RoomType/SelectRoomTypesAll",null, dic); + result = HttpHelper.Request("RoomType/SelectRoomTypesAll", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("SelectRoomTypesAll+接口服务异常，请提交Issue或尝试更新版本！"); @@ -123,16 +121,17 @@ namespace EOM.TSHotelManager.FormUI public void LoadRoom() { - result = HttpHelper.Request("Room/SelectCanUseRoomAll"); + result = HttpHelper.Request("Room/SelectRoomAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCanUseRoomAll+接口服务异常，请提交Issue或尝试更新版本！"); + UIMessageBox.ShowError("SelectRoomAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } List rooms = HttpHelper.JsonToList(result.message); flpRoom.Controls.Clear(); for (int i = 0; i < rooms.Count; i++) { + room = new ucRoom(); room.btnRoom.Text = string.Format("{0}\n\n{1}\n\n{2}", rooms[i].RoomName, rooms[i].RoomNo, rooms[i].CustoName); room.lblMark = "Mark"; //=Mark时，判断为房态图，禁用右键菜单 room.romRoomInfo = rooms[i]; @@ -142,8 +141,21 @@ namespace EOM.TSHotelManager.FormUI private void cboRoomType_TextChanged(object sender, EventArgs e) { + dic = new Dictionary() + { + { "roomTypeId",cboRoomType.SelectedValue.ToString()} + }; + result = HttpHelper.Request("RoomType/SelectRoomTypeByType", null, dic); + if (result.statusCode != 200) + { + UIMessageBox.ShowError("SelectRoomTypeByType+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + var roomType = HttpHelper.JsonToModel(result.message); + txtMoney.Value = !roomType.IsNullOrEmpty() ? roomType.RoomRent : 0; + txtDeposit.Value = !roomType.IsNullOrEmpty() ? roomType.RoomDeposit : 0; } private bool CheckRoomExists(string RoomNo) diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.cs index 1c404eb62d151bba18707a30e9e896cbc3a1ec54..a378740663ecb85943ccc66c616189a3aa3a61c9 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -21,11 +21,9 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.cs index 0de1b6ae62f87f5579fa41a050c063cc4bf832f7..ea6f0f72448dbb7fa192fd60f9937d871a3ec50e 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -21,13 +21,10 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using jvncorelib.EntityLib; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.Linq; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.cs index 8ee714e7c6cf0c2a5091fb3945952a547f6daa77..128498348a391f6258723aef3e53599a26a6ea81 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,7 +22,6 @@ * */ using Sunny.UI; -using System; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCash.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCash.cs index 90131f8006629e66764af78df5afcaf1b2a380a9..28842d0a25707856b91268faf31108b96a44cd23 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCash.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCash.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -21,12 +21,10 @@ *SOFTWARE. * */ -using EOM.TSHotelManager.Common.Core; -using Sunny.UI; using EOM.TSHotelManager.Common; -using System; -using System.Linq; +using EOM.TSHotelManager.Common.Core; using EOM.TSHotelManager.Common.Util; +using Sunny.UI; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.cs index a462981407b9a6dbc0dc9c0c1dafff66e7d94cde..5dc04e72954a98bb403dd42ff8c9c1b3abe6da53 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -21,13 +21,10 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using jvncorelib.EntityLib; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.Drawing; using System.Text.RegularExpressions; namespace EOM.TSHotelManager.FormUI diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.cs index f9c930bcde14f162b40df8ad9513a1e5b774ca20..1e6c58f34521b9f0234d447d45e56341a5fdbe7f 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,11 +22,9 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.cs index 4236e4e9d5fb4ed96e6032789ebf9089160b61e1..fcdaaa41ac72dbe75d96e9ffdcf2123eb8a1f6e4 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,11 +22,9 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; using System.Transactions; namespace EOM.TSHotelManager.FormUI @@ -52,8 +50,8 @@ namespace EOM.TSHotelManager.FormUI return; } cboRoomList.DataSource = HttpHelper.JsonToList(result.message); - cboRoomList.ValueMember = "RoomNo"; - cboRoomList.DisplayMember = "RoomNo"; + cboRoomList.DisplayMember = nameof(Room.RoomNo); + cboRoomList.ValueMember = nameof(Room.RoomNo); firstLoad = false; } @@ -61,7 +59,7 @@ namespace EOM.TSHotelManager.FormUI { double sum = 0; string lbu = LoginInfo.WorkerName; - string rno = ucRoom.RoomNo.ToString(); + string rno = ucRoom.co_RoomNo.ToString(); string nrno = cboRoomList.Text; dic = new Dictionary() { @@ -78,7 +76,7 @@ namespace EOM.TSHotelManager.FormUI Room checkInRoom = new Room() { RoomNo = nrno, - CustoNo = ucRoom.CustoNo, + CustoNo = ucRoom.co_CustoNo, RoomStateId = 1, CheckTime = Convert.ToDateTime(DateTime.Now), datains_usr = LoginInfo.WorkerNo @@ -100,7 +98,7 @@ namespace EOM.TSHotelManager.FormUI RoomNo = cboRoomList.Text, SpendName = "居住" + rno + "共" + Convert.ToInt32(result.message) + "天", SpendAmount = Convert.ToInt32(result.message), - CustoNo = ucRoom.CustoNo, + CustoNo = ucRoom.co_CustoNo, SpendPrice = Convert.ToDecimal(sum), SpendMoney = Convert.ToDecimal(sum), SpendTime = Convert.ToDateTime(Convert.ToDateTime(DateTime.Now).ToString("yyyy-MM-dd HH:mm:ss")), @@ -160,6 +158,7 @@ namespace EOM.TSHotelManager.FormUI } bool m = result.message.ToString().Equals("true"); FrmRoomManager.Reload(""); + FrmRoomManager._RefreshRoomCount(); #region 获取添加操作日志所需的信息 RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + ucRoom.CustoNo + "于" + Convert.ToDateTime(DateTime.Now) + "进行了换房！", 2); #endregion diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.cs index 17a87249035f3cb7ea4dce07dc98caff58a945fa..798251a35afcf037f85d7c61e236497e53cbf0ac 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -23,12 +23,9 @@ */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.Linq; using System.Transactions; namespace EOM.TSHotelManager.FormUI @@ -40,36 +37,27 @@ namespace EOM.TSHotelManager.FormUI InitializeComponent(); } - protected override bool CheckData() - { - return CheckEmpty(txtCustoName, "请输入姓名") - && CheckEmpty(txtCustoNo, "请输入客户编号") - && CheckEmpty(txtCustoTel, "输入11位手机号码"); - } - int count = 0; - ResponseMsg result = new ResponseMsg(); - #region 窗体加载事件方法 private void FrmCheckIn_Load(object sender, EventArgs e) { txtRoomNo.Text = ucRoom.rm_RoomNo; Dictionary pairs = new Dictionary(); - pairs.Add("no", txtRoomNo.Text.Trim()); + pairs.Add("no", txtRoomNo.Text.Trim()!); result = HttpHelper.Request("Room/SelectRoomByRoomNo", null, pairs); if (result.statusCode != 200) { UIMessageTip.ShowError("SelectRoomByRoomNo+接口服务异常，请提交issue"); return; } - Room r = HttpHelper.JsonToModel(result.message); + Room r = HttpHelper.JsonToModel(result.message!)!; result = HttpHelper.Request("RoomType/SelectRoomTypeByRoomNo", null, pairs); if (result.statusCode != 200) { UIMessageTip.ShowError("SelectRoomTypeByRoomNo+接口服务异常，请提交issue"); return; } - RoomType t = HttpHelper.JsonToModel(result.message); + RoomType t = HttpHelper.JsonToModel(result.message!)!; txtType.Text = t.RoomName; txtMoney.Text = r.RoomMoney.ToString(); txtRoomPosition.Text = r.RoomPosition; @@ -81,10 +69,12 @@ namespace EOM.TSHotelManager.FormUI UIMessageTip.ShowError("SelectCustoAll+接口服务异常，请提交issue"); return; } - var ctos = HttpHelper.JsonToList(result.message).Select(a => a.CustoNo).ToArray(); - //List roms = new RoomService().SelectCanUseRoomAll(); - - txtCustoNo.AutoCompleteCustomSource.AddRange(ctos); + var custoList = HttpHelper.JsonToPageList>(result.message!); + if (custoList != null && custoList != null) + { + var ctos = custoList.listSource.Select(custo => custo.CustoNo).ToArray(); + txtCustoNo.AutoCompleteCustomSource.AddRange(ctos); + } try { txtCustoNo.Text = ""; @@ -93,9 +83,7 @@ namespace EOM.TSHotelManager.FormUI { txtCustoNo.Text = ucRoom.rm_CustoNo; } - } - #endregion #region 关闭窗口 private void btnClose_Click(object sender, EventArgs e) @@ -120,77 +108,77 @@ namespace EOM.TSHotelManager.FormUI private void txtCustoNo_Validated(object sender, EventArgs e) { - result = HttpHelper.Request("VipRule/SelectVipRuleList", null, null); + try + { + ValidateAndUpdateCustomerInfo(); + } + catch (Exception ex) + { + UIMessageTip.ShowError($"接口服务异常，请提交issue: {ex.Message}"); + } + } + + private void ValidateAndUpdateCustomerInfo() + { + // 获取会员规则列表 + var result = HttpHelper.Request("VipRule/SelectVipRuleList", null, null); if (result.statusCode != 200) { - UIMessageTip.ShowError("SelectVipRuleList+接口服务异常，请提交issue"); - return; + throw new Exception("SelectVipRuleList+接口服务异常"); } - //在每次完成输入验证之后，对该用户的会员等级进行初始化或升级以及降级操作 - var listVipRule = HttpHelper.JsonToList(result.message).OrderBy(a => a.rule_value).Distinct().ToList(); - var new_type = 0; - //查询该用户以往的消费记录总额是否达到指定金额,不为空则为老客户 - Dictionary user = new Dictionary(); - user.Add("custoNo", txtCustoNo.Text.Trim()); + + var listVipRule = HttpHelper.JsonToList(result.message!)! + .OrderBy(a => a.rule_value) + .Distinct() + .ToList(); + + // 查询用户消费记录 + var user = new Dictionary { { "custoNo", txtCustoNo.Text.Trim() } }; result = HttpHelper.Request("Spend/SeletHistorySpendInfoAll", null, user); if (result.statusCode != 200) { - UIMessageTip.ShowError("SeletHistorySpendInfoAll+接口服务异常，请提交issue"); - return; + throw new Exception("SeletHistorySpendInfoAll+接口服务异常"); } - var listCustoSpend = HttpHelper.JsonToList(result.message); + + var listCustoSpend = HttpHelper.JsonToList(result.message!)!; if (!listCustoSpend.IsNullOrEmpty()) { var spendAmount = listCustoSpend.Sum(a => a.SpendMoney); - listVipRule.ForEach(vipRule => - { - if (spendAmount >= vipRule.rule_value) - { - new_type = vipRule.type_id; - } - }); + var new_type = listVipRule + .Where(vipRule => spendAmount >= vipRule.rule_value) + .OrderByDescending(vipRule => vipRule.rule_value) + .FirstOrDefault()?.type_id ?? 0; - //不等于0即会员等级有变，需进行及时会员等级 + // 如果会员等级有变，更新会员等级 if (new_type != 0) { - user = new Dictionary(); - user.Add("custoNo", txtCustoNo.Text.Trim()); - user.Add("userType", new_type.ToString()); + user = new Dictionary + { + { "custoNo", txtCustoNo.Text.Trim() }, + { "userType", new_type.ToString() } + }; result = HttpHelper.Request("Custo/UpdCustomerTypeByCustoNo", null, user); if (result.statusCode != 200) { - UIMessageTip.ShowError("UpdCustomerTypeByCustoNo+接口服务异常，请提交issue"); - return; + throw new Exception("UpdCustomerTypeByCustoNo+接口服务异常"); } } - } - try + // 获取用户卡片信息 + if (!string.IsNullOrEmpty(txtCustoNo.Text)) { - if (string.IsNullOrEmpty(txtCustoNo.Text)) - { - return; - } - user = new Dictionary(); - user.Add("CustoNo", txtCustoNo.Text.Trim()); + user = new Dictionary { { "CustoNo", txtCustoNo.Text.Trim() } }; result = HttpHelper.Request("Custo/SelectCardInfoByCustoNo", null, user); if (result.statusCode != 200) { - UIMessageTip.ShowError("SelectCardInfoByCustoNo+接口服务异常，请提交issue"); - return; + throw new Exception("SelectCardInfoByCustoNo+接口服务异常"); } - Custo c = HttpHelper.JsonToModel(result.message); - txtCustoName.Text = c.CustoName; - txtCustoTel.Text = c.CustoTel; - txtCustoType.Text = c.typeName; - } - catch - { - txtCustoName.Text = ""; - txtCustoTel.Text = ""; - txtCustoType.Text = ""; + var custo = HttpHelper.JsonToModel(result.message!); + txtCustoName.Text = custo?.CustoName ?? ""; + txtCustoTel.Text = custo?.CustoTel ?? ""; + txtCustoType.Text = custo?.typeName ?? ""; } } @@ -228,6 +216,7 @@ namespace EOM.TSHotelManager.FormUI UIMessageBox.Show("登记入住成功！", "登记提示", UIStyle.Green); txtCustoNo.Text = ""; FrmRoomManager.Reload(""); + FrmRoomManager._RefreshRoomCount(); #region 获取添加操作日志所需的信息 RecordHelper.Record(LoginInfo.WorkerClub + "-" + LoginInfo.WorkerPosition + "-" + LoginInfo.WorkerName + "于" + Convert.ToDateTime(DateTime.Now) + "帮助" + r.CustoNo + "进行了入住操作！", 1); #endregion diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.cs index 7bd0d105f6787db1ff5ed49489c7b5c46da5b166..d93477875be2e7e922339adb26cbe5c540905520 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -23,10 +23,9 @@ */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.Designer.cs index b301ae8d601cbc8095c22a05c1c06a071f93c64b..32f59213dedb7503a4e47423102e930a5c4cce26 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.Designer.cs @@ -28,1071 +28,1051 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle1 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle2 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle3 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle4 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle5 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle6 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle7 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle8 = new DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmCheckOutForm)); - this.btnBalance = new Sunny.UI.UIButton(); - this.lblVIPPrice = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); - this.dgvSpendList = new Sunny.UI.UIDataGridView(); - this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clPrice = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clSpendNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.lblDay = new System.Windows.Forms.Label(); - this.lable00 = new System.Windows.Forms.Label(); - this.label29 = new System.Windows.Forms.Label(); - this.lblVIP = new System.Windows.Forms.Label(); - this.dtpCheckTime = new Sunny.UI.UITextBox(); - this.label25 = new System.Windows.Forms.Label(); - this.txtRoomNo = new Sunny.UI.UITextBox(); - this.label27 = new System.Windows.Forms.Label(); - this.label28 = new System.Windows.Forms.Label(); - this.lblChange = new System.Windows.Forms.Label(); - this.CustoNo = new Sunny.UI.UITextBox(); - this.label21 = new System.Windows.Forms.Label(); - this.CustoName = new Sunny.UI.UITextBox(); - this.lblGetReceipts = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.label24 = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); - this.label18 = new System.Windows.Forms.Label(); - this.cboCustoType = new Sunny.UI.UIComboBox(); - this.cboPassportType = new Sunny.UI.UIComboBox(); - this.cboCustoSex = new Sunny.UI.UIComboBox(); - this.txtCustoNo = new Sunny.UI.UITextBox(); - this.txtCustoName = new Sunny.UI.UITextBox(); - this.txtPassportNum = new Sunny.UI.UITextBox(); - this.txtTel = new Sunny.UI.UITextBox(); - this.dtpBirth = new Sunny.UI.UIDatePicker(); - this.txtAddress = new Sunny.UI.UITextBox(); - 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.label16 = new System.Windows.Forms.Label(); - this.label22 = new System.Windows.Forms.Label(); - this.label30 = new System.Windows.Forms.Label(); - this.label31 = new System.Windows.Forms.Label(); - this.label32 = new System.Windows.Forms.Label(); - this.dgvWti = new Sunny.UI.UIDataGridView(); - this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clRoomNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clCustoNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clStartTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clDealTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clWater = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clElectric = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clMarkUser = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.uiTabControlMenu2 = new Sunny.UI.UITabControlMenu(); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.txtReceipts = new Sunny.UI.UITextBox(); - this.tabPage2 = new System.Windows.Forms.TabPage(); - this.tabPage3 = new System.Windows.Forms.TabPage(); - ((System.ComponentModel.ISupportInitialize)(this.dgvSpendList)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dgvWti)).BeginInit(); - this.uiTabControlMenu2.SuspendLayout(); - this.tabPage1.SuspendLayout(); - this.tabPage2.SuspendLayout(); - this.tabPage3.SuspendLayout(); - this.SuspendLayout(); + btnBalance = new Sunny.UI.UIButton(); + lblVIPPrice = new Label(); + label15 = new Label(); + dgvSpendList = new Sunny.UI.UIDataGridView(); + dataGridViewTextBoxColumn1 = new DataGridViewTextBoxColumn(); + clPrice = new DataGridViewTextBoxColumn(); + dataGridViewTextBoxColumn2 = new DataGridViewTextBoxColumn(); + dataGridViewTextBoxColumn3 = new DataGridViewTextBoxColumn(); + dataGridViewTextBoxColumn4 = new DataGridViewTextBoxColumn(); + dataGridViewTextBoxColumn5 = new DataGridViewTextBoxColumn(); + dataGridViewTextBoxColumn6 = new DataGridViewTextBoxColumn(); + dataGridViewTextBoxColumn7 = new DataGridViewTextBoxColumn(); + clSpendNo = new DataGridViewTextBoxColumn(); + Column1 = new DataGridViewTextBoxColumn(); + Column2 = new DataGridViewTextBoxColumn(); + Column3 = new DataGridViewTextBoxColumn(); + Column4 = new DataGridViewTextBoxColumn(); + Column8 = new DataGridViewTextBoxColumn(); + lblDay = new Label(); + lable00 = new Label(); + label29 = new Label(); + lblVIP = new Label(); + dtpCheckTime = new Sunny.UI.UITextBox(); + label25 = new Label(); + txtRoomNo = new Sunny.UI.UITextBox(); + label27 = new Label(); + label28 = new Label(); + lblChange = new Label(); + CustoNo = new Sunny.UI.UITextBox(); + label21 = new Label(); + CustoName = new Sunny.UI.UITextBox(); + lblGetReceipts = new Label(); + label1 = new Label(); + label24 = new Label(); + label17 = new Label(); + label18 = new Label(); + cboCustoType = new Sunny.UI.UIComboBox(); + cboPassportType = new Sunny.UI.UIComboBox(); + cboCustoSex = new Sunny.UI.UIComboBox(); + txtCustoNo = new Sunny.UI.UITextBox(); + txtCustoName = new Sunny.UI.UITextBox(); + txtPassportNum = new Sunny.UI.UITextBox(); + txtTel = new Sunny.UI.UITextBox(); + dtpBirth = new Sunny.UI.UIDatePicker(); + txtAddress = new Sunny.UI.UITextBox(); + 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(); + dgvWti = new Sunny.UI.UIDataGridView(); + uiTabControlMenu2 = new Sunny.UI.UITabControlMenu(); + tabPage1 = new TabPage(); + txtReceipts = new Sunny.UI.UITextBox(); + tabPage2 = new TabPage(); + tabPage3 = new TabPage(); + Column11 = new DataGridViewTextBoxColumn(); + token = new DataGridViewTextBoxColumn(); + clRoomNo = new DataGridViewTextBoxColumn(); + clCustoNo = new DataGridViewTextBoxColumn(); + clStartTime = new DataGridViewTextBoxColumn(); + clDealTime = new DataGridViewTextBoxColumn(); + clWater = new DataGridViewTextBoxColumn(); + clElectric = new DataGridViewTextBoxColumn(); + clMarkUser = new DataGridViewTextBoxColumn(); + Column5 = new DataGridViewTextBoxColumn(); + Column6 = new DataGridViewTextBoxColumn(); + Column7 = new DataGridViewTextBoxColumn(); + Column9 = new DataGridViewTextBoxColumn(); + Column10 = new DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)dgvSpendList).BeginInit(); + ((System.ComponentModel.ISupportInitialize)dgvWti).BeginInit(); + uiTabControlMenu2.SuspendLayout(); + tabPage1.SuspendLayout(); + tabPage2.SuspendLayout(); + tabPage3.SuspendLayout(); + SuspendLayout(); // // btnBalance // - this.btnBalance.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnBalance.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnBalance.Location = new System.Drawing.Point(495, 485); - this.btnBalance.MinimumSize = new System.Drawing.Size(1, 1); - this.btnBalance.Name = "btnBalance"; - this.btnBalance.Radius = 30; - this.btnBalance.Size = new System.Drawing.Size(162, 46); - this.btnBalance.Style = Sunny.UI.UIStyle.Custom; - this.btnBalance.TabIndex = 116; - this.btnBalance.Text = "结 算"; - this.btnBalance.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnBalance.Click += new System.EventHandler(this.btnBalance_Click); + btnBalance.Cursor = Cursors.Hand; + btnBalance.Font = new Font("微软雅黑", 12F); + btnBalance.Location = new Point(459, 486); + btnBalance.MinimumSize = new Size(1, 1); + btnBalance.Name = "btnBalance"; + btnBalance.Radius = 30; + btnBalance.Size = new Size(162, 46); + btnBalance.Style = Sunny.UI.UIStyle.Custom; + btnBalance.TabIndex = 116; + btnBalance.Text = "结 算"; + btnBalance.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + btnBalance.Click += btnBalance_Click; // // lblVIPPrice // - this.lblVIPPrice.AutoSize = true; - this.lblVIPPrice.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblVIPPrice.Location = new System.Drawing.Point(585, 388); - this.lblVIPPrice.Name = "lblVIPPrice"; - this.lblVIPPrice.Size = new System.Drawing.Size(40, 20); - this.lblVIPPrice.TabIndex = 28; - this.lblVIPPrice.Text = "0.00"; + lblVIPPrice.AutoSize = true; + lblVIPPrice.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); + lblVIPPrice.Location = new Point(549, 389); + lblVIPPrice.Name = "lblVIPPrice"; + lblVIPPrice.Size = new Size(40, 20); + lblVIPPrice.TabIndex = 28; + lblVIPPrice.Text = "0.00"; // // label15 // - this.label15.AutoSize = true; - this.label15.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label15.ForeColor = System.Drawing.Color.Red; - this.label15.Location = new System.Drawing.Point(7, 525); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(253, 17); - this.label15.TabIndex = 11; - this.label15.Text = "Tips：请提醒客人不要忘记带齐行李哦~"; + label15.AutoSize = true; + label15.Font = new Font("Microsoft Sans Serif", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + label15.ForeColor = Color.Red; + label15.Location = new Point(7, 525); + label15.Name = "label15"; + label15.Size = new Size(253, 17); + label15.TabIndex = 11; + label15.Text = "Tips：请提醒客人不要忘记带齐行李哦~"; // // dgvSpendList // - this.dgvSpendList.AllowUserToAddRows = false; - this.dgvSpendList.AllowUserToDeleteRows = false; - this.dgvSpendList.AllowUserToResizeColumns = false; - this.dgvSpendList.AllowUserToResizeRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.dgvSpendList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dgvSpendList.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dgvSpendList.BackgroundColor = System.Drawing.Color.White; - this.dgvSpendList.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F); - dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvSpendList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; - this.dgvSpendList.ColumnHeadersHeight = 32; - this.dgvSpendList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - this.dgvSpendList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.dataGridViewTextBoxColumn1, - this.clPrice, - this.dataGridViewTextBoxColumn2, - this.dataGridViewTextBoxColumn3, - this.dataGridViewTextBoxColumn4, - this.dataGridViewTextBoxColumn5, - this.dataGridViewTextBoxColumn6, - this.dataGridViewTextBoxColumn7, - this.clSpendNo, - this.Column1, - this.Column2, - this.Column3, - this.Column4, - this.Column8}); - this.dgvSpendList.EnableHeadersVisualStyles = false; - this.dgvSpendList.Font = new System.Drawing.Font("微软雅黑", 12F); - this.dgvSpendList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.dgvSpendList.Location = new System.Drawing.Point(10, 113); - this.dgvSpendList.Name = "dgvSpendList"; - this.dgvSpendList.ReadOnly = true; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvSpendList.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; - this.dgvSpendList.RowHeadersVisible = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.White; - this.dgvSpendList.RowsDefaultCellStyle = dataGridViewCellStyle4; - this.dgvSpendList.RowTemplate.Height = 29; - this.dgvSpendList.SelectedIndex = -1; - this.dgvSpendList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvSpendList.ShowRowErrors = false; - this.dgvSpendList.Size = new System.Drawing.Size(648, 202); - this.dgvSpendList.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.dgvSpendList.Style = Sunny.UI.UIStyle.Custom; - this.dgvSpendList.TabIndex = 115; + dgvSpendList.AllowUserToAddRows = false; + dgvSpendList.AllowUserToDeleteRows = false; + dgvSpendList.AllowUserToResizeColumns = false; + dgvSpendList.AllowUserToResizeRows = false; + dataGridViewCellStyle1.BackColor = Color.FromArgb(235, 243, 255); + dgvSpendList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dgvSpendList.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + dgvSpendList.BackgroundColor = Color.White; + dgvSpendList.ColumnHeadersBorderStyle = DataGridViewHeaderBorderStyle.Single; + dataGridViewCellStyle2.Alignment = DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = Color.FromArgb(80, 160, 255); + dataGridViewCellStyle2.Font = new Font("微软雅黑", 12F); + dataGridViewCellStyle2.ForeColor = Color.White; + dataGridViewCellStyle2.SelectionBackColor = SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = DataGridViewTriState.True; + dgvSpendList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dgvSpendList.ColumnHeadersHeight = 32; + dgvSpendList.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + dgvSpendList.Columns.AddRange(new DataGridViewColumn[] { dataGridViewTextBoxColumn1, clPrice, dataGridViewTextBoxColumn2, dataGridViewTextBoxColumn3, dataGridViewTextBoxColumn4, dataGridViewTextBoxColumn5, dataGridViewTextBoxColumn6, dataGridViewTextBoxColumn7, clSpendNo, Column1, Column2, Column3, Column4, Column8 }); + dgvSpendList.EnableHeadersVisualStyles = false; + dgvSpendList.Font = new Font("微软雅黑", 12F); + dgvSpendList.GridColor = Color.FromArgb(80, 160, 255); + dgvSpendList.Location = new Point(10, 113); + dgvSpendList.Name = "dgvSpendList"; + dgvSpendList.ReadOnly = true; + dataGridViewCellStyle3.Alignment = DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = Color.FromArgb(235, 243, 255); + dataGridViewCellStyle3.Font = new Font("微软雅黑", 12F); + dataGridViewCellStyle3.ForeColor = Color.FromArgb(48, 48, 48); + dataGridViewCellStyle3.SelectionBackColor = Color.FromArgb(80, 160, 255); + dataGridViewCellStyle3.SelectionForeColor = Color.White; + dataGridViewCellStyle3.WrapMode = DataGridViewTriState.True; + dgvSpendList.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; + dgvSpendList.RowHeadersVisible = false; + dataGridViewCellStyle4.BackColor = Color.White; + dgvSpendList.RowsDefaultCellStyle = dataGridViewCellStyle4; + dgvSpendList.RowTemplate.Height = 29; + dgvSpendList.SelectedIndex = -1; + dgvSpendList.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dgvSpendList.ShowRowErrors = false; + dgvSpendList.Size = new Size(648, 202); + dgvSpendList.StripeOddColor = Color.FromArgb(235, 243, 255); + dgvSpendList.Style = Sunny.UI.UIStyle.Custom; + dgvSpendList.TabIndex = 115; // // dataGridViewTextBoxColumn1 // - this.dataGridViewTextBoxColumn1.DataPropertyName = "RoomNo"; - this.dataGridViewTextBoxColumn1.FillWeight = 102.6831F; - this.dataGridViewTextBoxColumn1.HeaderText = "房号"; - this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; - this.dataGridViewTextBoxColumn1.ReadOnly = true; + dataGridViewTextBoxColumn1.DataPropertyName = "RoomNo"; + dataGridViewTextBoxColumn1.FillWeight = 102.6831F; + dataGridViewTextBoxColumn1.HeaderText = "房号"; + dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; + dataGridViewTextBoxColumn1.ReadOnly = true; // // clPrice // - this.clPrice.DataPropertyName = "SpendPriceStr"; - this.clPrice.HeaderText = "单价(元)"; - this.clPrice.Name = "clPrice"; - this.clPrice.ReadOnly = true; + clPrice.DataPropertyName = "SpendPriceStr"; + clPrice.HeaderText = "单价(元)"; + clPrice.Name = "clPrice"; + clPrice.ReadOnly = true; // // dataGridViewTextBoxColumn2 // - this.dataGridViewTextBoxColumn2.DataPropertyName = "CustoNo"; - this.dataGridViewTextBoxColumn2.FillWeight = 102.6831F; - this.dataGridViewTextBoxColumn2.HeaderText = "客户编号"; - this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; - this.dataGridViewTextBoxColumn2.ReadOnly = true; + dataGridViewTextBoxColumn2.DataPropertyName = "CustoNo"; + dataGridViewTextBoxColumn2.FillWeight = 102.6831F; + dataGridViewTextBoxColumn2.HeaderText = "客户编号"; + dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; + dataGridViewTextBoxColumn2.ReadOnly = true; // // dataGridViewTextBoxColumn3 // - this.dataGridViewTextBoxColumn3.DataPropertyName = "SpendName"; - this.dataGridViewTextBoxColumn3.FillWeight = 102.6831F; - this.dataGridViewTextBoxColumn3.HeaderText = "商品"; - this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; - this.dataGridViewTextBoxColumn3.ReadOnly = true; + dataGridViewTextBoxColumn3.DataPropertyName = "SpendName"; + dataGridViewTextBoxColumn3.FillWeight = 102.6831F; + dataGridViewTextBoxColumn3.HeaderText = "商品"; + dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; + dataGridViewTextBoxColumn3.ReadOnly = true; // // dataGridViewTextBoxColumn4 // - this.dataGridViewTextBoxColumn4.DataPropertyName = "SpendAmount"; - this.dataGridViewTextBoxColumn4.FillWeight = 60F; - this.dataGridViewTextBoxColumn4.HeaderText = "数量"; - this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; - this.dataGridViewTextBoxColumn4.ReadOnly = true; + dataGridViewTextBoxColumn4.DataPropertyName = "SpendAmount"; + dataGridViewTextBoxColumn4.FillWeight = 60F; + dataGridViewTextBoxColumn4.HeaderText = "数量"; + dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; + dataGridViewTextBoxColumn4.ReadOnly = true; // // dataGridViewTextBoxColumn5 // - this.dataGridViewTextBoxColumn5.DataPropertyName = "SpendPrice"; - this.dataGridViewTextBoxColumn5.FillWeight = 102.6831F; - this.dataGridViewTextBoxColumn5.HeaderText = "单价(元)"; - this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; - this.dataGridViewTextBoxColumn5.ReadOnly = true; - this.dataGridViewTextBoxColumn5.Visible = false; + dataGridViewTextBoxColumn5.DataPropertyName = "SpendPrice"; + dataGridViewTextBoxColumn5.FillWeight = 102.6831F; + dataGridViewTextBoxColumn5.HeaderText = "单价(元)"; + dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; + dataGridViewTextBoxColumn5.ReadOnly = true; + dataGridViewTextBoxColumn5.Visible = false; // // dataGridViewTextBoxColumn6 // - this.dataGridViewTextBoxColumn6.DataPropertyName = "SpendMoneyStr"; - this.dataGridViewTextBoxColumn6.FillWeight = 102.6831F; - this.dataGridViewTextBoxColumn6.HeaderText = "总额"; - this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; - this.dataGridViewTextBoxColumn6.ReadOnly = true; + dataGridViewTextBoxColumn6.DataPropertyName = "SpendMoneyStr"; + dataGridViewTextBoxColumn6.FillWeight = 102.6831F; + dataGridViewTextBoxColumn6.HeaderText = "总额"; + dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; + dataGridViewTextBoxColumn6.ReadOnly = true; // // dataGridViewTextBoxColumn7 // - this.dataGridViewTextBoxColumn7.DataPropertyName = "SpendTime"; - this.dataGridViewTextBoxColumn7.FillWeight = 102.6831F; - this.dataGridViewTextBoxColumn7.HeaderText = "消费时间"; - this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; - this.dataGridViewTextBoxColumn7.ReadOnly = true; + dataGridViewTextBoxColumn7.DataPropertyName = "SpendTime"; + dataGridViewTextBoxColumn7.FillWeight = 102.6831F; + dataGridViewTextBoxColumn7.HeaderText = "消费时间"; + dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; + dataGridViewTextBoxColumn7.ReadOnly = true; // // clSpendNo // - this.clSpendNo.DataPropertyName = "delete_mk"; - this.clSpendNo.HeaderText = "Column1"; - this.clSpendNo.Name = "clSpendNo"; - this.clSpendNo.ReadOnly = true; - this.clSpendNo.Visible = false; + clSpendNo.DataPropertyName = "delete_mk"; + clSpendNo.HeaderText = "Column1"; + clSpendNo.Name = "clSpendNo"; + clSpendNo.ReadOnly = true; + clSpendNo.Visible = false; // // Column1 // - this.Column1.DataPropertyName = "datains_usr"; - this.Column1.HeaderText = "Column1"; - this.Column1.Name = "Column1"; - this.Column1.ReadOnly = true; - this.Column1.Visible = false; + Column1.DataPropertyName = "datains_usr"; + Column1.HeaderText = "Column1"; + Column1.Name = "Column1"; + Column1.ReadOnly = true; + Column1.Visible = false; // // Column2 // - this.Column2.DataPropertyName = "datains_date"; - this.Column2.HeaderText = "Column2"; - this.Column2.Name = "Column2"; - this.Column2.ReadOnly = true; - this.Column2.Visible = false; + Column2.DataPropertyName = "datains_date"; + Column2.HeaderText = "Column2"; + Column2.Name = "Column2"; + Column2.ReadOnly = true; + Column2.Visible = false; // // Column3 // - this.Column3.DataPropertyName = "datachg_usr"; - this.Column3.HeaderText = "Column3"; - this.Column3.Name = "Column3"; - this.Column3.ReadOnly = true; - this.Column3.Visible = false; + Column3.DataPropertyName = "datachg_usr"; + Column3.HeaderText = "Column3"; + Column3.Name = "Column3"; + Column3.ReadOnly = true; + Column3.Visible = false; // // Column4 // - this.Column4.DataPropertyName = "datachg_date"; - this.Column4.HeaderText = "Column4"; - this.Column4.Name = "Column4"; - this.Column4.ReadOnly = true; - this.Column4.Visible = false; + Column4.DataPropertyName = "datachg_date"; + Column4.HeaderText = "Column4"; + Column4.Name = "Column4"; + Column4.ReadOnly = true; + Column4.Visible = false; // // Column8 // - this.Column8.DataPropertyName = "MoneyState"; - this.Column8.HeaderText = "Column8"; - this.Column8.Name = "Column8"; - this.Column8.ReadOnly = true; - this.Column8.Visible = false; + Column8.DataPropertyName = "MoneyState"; + Column8.HeaderText = "Column8"; + Column8.Name = "Column8"; + Column8.ReadOnly = true; + Column8.Visible = false; // // lblDay // - this.lblDay.AutoSize = true; - this.lblDay.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblDay.Location = new System.Drawing.Point(572, 76); - this.lblDay.Name = "lblDay"; - this.lblDay.Size = new System.Drawing.Size(45, 25); - this.lblDay.TabIndex = 114; - this.lblDay.Text = "Null"; + lblDay.AutoSize = true; + lblDay.Font = new Font("Microsoft Sans Serif", 15F, FontStyle.Regular, GraphicsUnit.Point, 0); + lblDay.Location = new Point(572, 76); + lblDay.Name = "lblDay"; + lblDay.Size = new Size(45, 25); + lblDay.TabIndex = 114; + lblDay.Text = "Null"; // // lable00 // - this.lable00.AutoSize = true; - this.lable00.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lable00.Location = new System.Drawing.Point(492, 387); - this.lable00.Name = "lable00"; - this.lable00.Size = new System.Drawing.Size(89, 20); - this.lable00.TabIndex = 26; - this.lable00.Text = "折后金额："; + lable00.AutoSize = true; + lable00.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); + lable00.Location = new Point(456, 388); + lable00.Name = "lable00"; + lable00.Size = new Size(89, 20); + lable00.TabIndex = 26; + lable00.Text = "折后金额："; // // label29 // - this.label29.AutoSize = true; - this.label29.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label29.Location = new System.Drawing.Point(551, 24); - this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(88, 25); - this.label29.TabIndex = 113; - this.label29.Text = "已住天数"; + label29.AutoSize = true; + label29.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); + label29.Location = new Point(551, 24); + label29.Name = "label29"; + label29.Size = new Size(88, 25); + label29.TabIndex = 113; + label29.Text = "已住天数"; // // lblVIP // - this.lblVIP.AutoSize = true; - this.lblVIP.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblVIP.Location = new System.Drawing.Point(585, 360); - this.lblVIP.Name = "lblVIP"; - this.lblVIP.Size = new System.Drawing.Size(73, 20); - this.lblVIP.TabIndex = 24; - this.lblVIP.Text = "不 打 折"; + lblVIP.AutoSize = true; + lblVIP.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); + lblVIP.Location = new Point(549, 361); + lblVIP.Name = "lblVIP"; + lblVIP.Size = new Size(73, 20); + lblVIP.TabIndex = 24; + lblVIP.Text = "不 打 折"; // // dtpCheckTime // - this.dtpCheckTime.Cursor = System.Windows.Forms.Cursors.IBeam; - this.dtpCheckTime.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dtpCheckTime.Location = new System.Drawing.Point(376, 18); - this.dtpCheckTime.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.dtpCheckTime.MinimumSize = new System.Drawing.Size(1, 1); - this.dtpCheckTime.Name = "dtpCheckTime"; - this.dtpCheckTime.Padding = new System.Windows.Forms.Padding(5); - this.dtpCheckTime.Radius = 20; - this.dtpCheckTime.ReadOnly = true; - this.dtpCheckTime.ShowText = false; - this.dtpCheckTime.Size = new System.Drawing.Size(168, 35); - this.dtpCheckTime.Style = Sunny.UI.UIStyle.Custom; - this.dtpCheckTime.StyleCustomMode = true; - this.dtpCheckTime.Symbol = 559683; - this.dtpCheckTime.TabIndex = 111; - this.dtpCheckTime.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.dtpCheckTime.Watermark = ""; + dtpCheckTime.Cursor = Cursors.IBeam; + dtpCheckTime.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); + dtpCheckTime.Location = new Point(376, 18); + dtpCheckTime.Margin = new Padding(4, 5, 4, 5); + dtpCheckTime.MinimumSize = new Size(1, 1); + dtpCheckTime.Name = "dtpCheckTime"; + dtpCheckTime.Padding = new Padding(5); + dtpCheckTime.Radius = 20; + dtpCheckTime.ReadOnly = true; + dtpCheckTime.ShowText = false; + dtpCheckTime.Size = new Size(168, 35); + dtpCheckTime.Style = Sunny.UI.UIStyle.Custom; + dtpCheckTime.StyleCustomMode = true; + dtpCheckTime.Symbol = 559683; + dtpCheckTime.TabIndex = 111; + dtpCheckTime.TextAlignment = ContentAlignment.MiddleLeft; + dtpCheckTime.Watermark = ""; // // label25 // - this.label25.AutoSize = true; - this.label25.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label25.Location = new System.Drawing.Point(492, 358); - this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(89, 20); - this.label25.TabIndex = 23; - this.label25.Text = "会员折扣："; + label25.AutoSize = true; + label25.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); + label25.Location = new Point(456, 359); + label25.Name = "label25"; + label25.Size = new Size(89, 20); + label25.TabIndex = 23; + label25.Text = "会员折扣："; // // txtRoomNo // - this.txtRoomNo.Cursor = System.Windows.Forms.Cursors.IBeam; - 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(376, 70); - this.txtRoomNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - 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.ReadOnly = true; - this.txtRoomNo.ShowText = false; - this.txtRoomNo.Size = new System.Drawing.Size(168, 35); - this.txtRoomNo.Style = Sunny.UI.UIStyle.Custom; - this.txtRoomNo.StyleCustomMode = true; - this.txtRoomNo.TabIndex = 112; - this.txtRoomNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.txtRoomNo.Watermark = ""; + txtRoomNo.Cursor = Cursors.IBeam; + txtRoomNo.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); + txtRoomNo.Location = new Point(376, 70); + 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(168, 35); + txtRoomNo.Style = Sunny.UI.UIStyle.Custom; + txtRoomNo.StyleCustomMode = true; + txtRoomNo.TabIndex = 112; + txtRoomNo.TextAlignment = ContentAlignment.MiddleLeft; + txtRoomNo.Watermark = ""; // // label27 // - this.label27.AutoSize = true; - this.label27.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label27.Location = new System.Drawing.Point(285, 76); - this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(88, 25); - this.label27.TabIndex = 110; - this.label27.Text = "房间编号"; + 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 // - this.label28.AutoSize = true; - this.label28.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label28.Location = new System.Drawing.Point(285, 24); - this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(88, 25); - this.label28.TabIndex = 109; - this.label28.Text = "入住时间"; + 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 // - this.lblChange.AutoSize = true; - this.lblChange.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblChange.Location = new System.Drawing.Point(584, 444); - this.lblChange.Name = "lblChange"; - this.lblChange.Size = new System.Drawing.Size(40, 20); - this.lblChange.TabIndex = 21; - this.lblChange.Text = "0.00"; + lblChange.AutoSize = true; + lblChange.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); + lblChange.Location = new Point(548, 445); + lblChange.Name = "lblChange"; + lblChange.Size = new Size(40, 20); + lblChange.TabIndex = 21; + lblChange.Text = "0.00"; // // CustoNo // - this.CustoNo.Cursor = System.Windows.Forms.Cursors.IBeam; - this.CustoNo.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.CustoNo.Location = new System.Drawing.Point(117, 18); - this.CustoNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.CustoNo.MinimumSize = new System.Drawing.Size(1, 1); - this.CustoNo.Name = "CustoNo"; - this.CustoNo.Padding = new System.Windows.Forms.Padding(5); - this.CustoNo.Radius = 20; - this.CustoNo.ReadOnly = true; - this.CustoNo.ShowText = false; - this.CustoNo.Size = new System.Drawing.Size(144, 35); - this.CustoNo.Style = Sunny.UI.UIStyle.Custom; - this.CustoNo.StyleCustomMode = true; - this.CustoNo.TabIndex = 107; - this.CustoNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.CustoNo.Watermark = ""; + CustoNo.Cursor = Cursors.IBeam; + CustoNo.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); + CustoNo.Location = new Point(117, 18); + CustoNo.Margin = new Padding(4, 5, 4, 5); + CustoNo.MinimumSize = new Size(1, 1); + CustoNo.Name = "CustoNo"; + CustoNo.Padding = new Padding(5); + CustoNo.Radius = 20; + CustoNo.ReadOnly = true; + CustoNo.ShowText = false; + CustoNo.Size = new Size(144, 35); + CustoNo.Style = Sunny.UI.UIStyle.Custom; + CustoNo.StyleCustomMode = true; + CustoNo.TabIndex = 107; + CustoNo.TextAlignment = ContentAlignment.MiddleLeft; + CustoNo.Watermark = ""; // // label21 // - this.label21.AutoSize = true; - this.label21.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label21.Location = new System.Drawing.Point(491, 445); - this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(89, 20); - this.label21.TabIndex = 20; - this.label21.Text = "找 零："; + label21.AutoSize = true; + label21.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); + label21.Location = new Point(455, 446); + label21.Name = "label21"; + label21.Size = new Size(89, 20); + label21.TabIndex = 20; + label21.Text = "找 零："; // // CustoName // - this.CustoName.Cursor = System.Windows.Forms.Cursors.IBeam; - this.CustoName.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.CustoName.Location = new System.Drawing.Point(117, 70); - this.CustoName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.CustoName.MinimumSize = new System.Drawing.Size(1, 1); - this.CustoName.Name = "CustoName"; - this.CustoName.Padding = new System.Windows.Forms.Padding(5); - this.CustoName.Radius = 20; - this.CustoName.ReadOnly = true; - this.CustoName.ShowText = false; - this.CustoName.Size = new System.Drawing.Size(144, 35); - this.CustoName.Style = Sunny.UI.UIStyle.Custom; - this.CustoName.StyleCustomMode = true; - this.CustoName.TabIndex = 108; - this.CustoName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.CustoName.Watermark = ""; + CustoName.Cursor = Cursors.IBeam; + CustoName.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); + CustoName.Location = new Point(117, 70); + CustoName.Margin = new Padding(4, 5, 4, 5); + CustoName.MinimumSize = new Size(1, 1); + CustoName.Name = "CustoName"; + CustoName.Padding = new Padding(5); + CustoName.Radius = 20; + CustoName.ReadOnly = true; + CustoName.ShowText = false; + CustoName.Size = new Size(144, 35); + CustoName.Style = Sunny.UI.UIStyle.Custom; + CustoName.StyleCustomMode = true; + CustoName.TabIndex = 108; + CustoName.TextAlignment = ContentAlignment.MiddleLeft; + CustoName.Watermark = ""; // // lblGetReceipts // - this.lblGetReceipts.AutoSize = true; - this.lblGetReceipts.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblGetReceipts.Location = new System.Drawing.Point(584, 416); - this.lblGetReceipts.Name = "lblGetReceipts"; - this.lblGetReceipts.Size = new System.Drawing.Size(40, 20); - this.lblGetReceipts.TabIndex = 19; - this.lblGetReceipts.Text = "0.00"; + lblGetReceipts.AutoSize = true; + lblGetReceipts.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); + lblGetReceipts.Location = new Point(548, 417); + lblGetReceipts.Name = "lblGetReceipts"; + lblGetReceipts.Size = new Size(40, 20); + lblGetReceipts.TabIndex = 19; + lblGetReceipts.Text = "0.00"; // // 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(26, 76); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(88, 25); - this.label1.TabIndex = 106; - this.label1.Text = "客户姓名"; + label1.AutoSize = true; + label1.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); + label1.Location = new Point(26, 76); + label1.Name = "label1"; + label1.Size = new Size(88, 25); + label1.TabIndex = 106; + label1.Text = "客户姓名"; // // label24 // - this.label24.AutoSize = true; - this.label24.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label24.Location = new System.Drawing.Point(26, 24); - this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(88, 25); - this.label24.TabIndex = 105; - this.label24.Text = "客户编号"; + label24.AutoSize = true; + label24.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); + label24.Location = new Point(26, 24); + label24.Name = "label24"; + label24.Size = new Size(88, 25); + label24.TabIndex = 105; + label24.Text = "客户编号"; // // label17 // - this.label17.AutoSize = true; - this.label17.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label17.Location = new System.Drawing.Point(491, 329); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(89, 20); - this.label17.TabIndex = 14; - this.label17.Text = "实收金额："; + label17.AutoSize = true; + label17.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); + label17.Location = new Point(455, 330); + label17.Name = "label17"; + label17.Size = new Size(89, 20); + label17.TabIndex = 14; + label17.Text = "实收金额："; // // label18 // - this.label18.AutoSize = true; - this.label18.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label18.Location = new System.Drawing.Point(491, 416); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(89, 20); - this.label18.TabIndex = 15; - this.label18.Text = "应收金额："; + label18.AutoSize = true; + label18.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); + label18.Location = new Point(455, 417); + label18.Name = "label18"; + label18.Size = new Size(89, 20); + label18.TabIndex = 15; + label18.Text = "应收金额："; // // cboCustoType // - this.cboCustoType.DataSource = null; - this.cboCustoType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cboCustoType.FillColor = System.Drawing.Color.White; - this.cboCustoType.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cboCustoType.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); - this.cboCustoType.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.cboCustoType.Location = new System.Drawing.Point(437, 19); - this.cboCustoType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cboCustoType.MinimumSize = new System.Drawing.Size(63, 0); - this.cboCustoType.Name = "cboCustoType"; - this.cboCustoType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cboCustoType.Radius = 20; - this.cboCustoType.ReadOnly = true; - this.cboCustoType.Size = new System.Drawing.Size(203, 35); - this.cboCustoType.Style = Sunny.UI.UIStyle.Custom; - this.cboCustoType.SymbolSize = 24; - this.cboCustoType.TabIndex = 125; - this.cboCustoType.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.cboCustoType.Watermark = ""; + cboCustoType.DataSource = null; + cboCustoType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; + cboCustoType.FillColor = Color.White; + cboCustoType.Font = new Font("微软雅黑", 15.75F); + cboCustoType.ItemHoverColor = Color.FromArgb(155, 200, 255); + cboCustoType.ItemSelectForeColor = Color.FromArgb(235, 243, 255); + cboCustoType.Location = new Point(437, 19); + cboCustoType.Margin = new Padding(4, 5, 4, 5); + cboCustoType.MinimumSize = new Size(63, 0); + cboCustoType.Name = "cboCustoType"; + cboCustoType.Padding = new Padding(0, 0, 30, 2); + cboCustoType.Radius = 20; + cboCustoType.ReadOnly = true; + cboCustoType.Size = new Size(203, 35); + cboCustoType.Style = Sunny.UI.UIStyle.Custom; + cboCustoType.SymbolSize = 24; + cboCustoType.TabIndex = 125; + cboCustoType.TextAlignment = ContentAlignment.MiddleLeft; + cboCustoType.Watermark = ""; // // cboPassportType // - this.cboPassportType.DataSource = null; - this.cboPassportType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cboPassportType.FillColor = System.Drawing.Color.White; - this.cboPassportType.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cboPassportType.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); - this.cboPassportType.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.cboPassportType.Location = new System.Drawing.Point(437, 70); - this.cboPassportType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cboPassportType.MinimumSize = new System.Drawing.Size(63, 0); - this.cboPassportType.Name = "cboPassportType"; - this.cboPassportType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cboPassportType.Radius = 20; - this.cboPassportType.ReadOnly = true; - this.cboPassportType.Size = new System.Drawing.Size(203, 35); - this.cboPassportType.Style = Sunny.UI.UIStyle.Custom; - this.cboPassportType.SymbolSize = 24; - this.cboPassportType.TabIndex = 124; - this.cboPassportType.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.cboPassportType.Watermark = ""; + cboPassportType.DataSource = null; + cboPassportType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; + cboPassportType.FillColor = Color.White; + cboPassportType.Font = new Font("微软雅黑", 15.75F); + cboPassportType.ItemHoverColor = Color.FromArgb(155, 200, 255); + cboPassportType.ItemSelectForeColor = Color.FromArgb(235, 243, 255); + cboPassportType.Location = new Point(437, 70); + cboPassportType.Margin = new Padding(4, 5, 4, 5); + cboPassportType.MinimumSize = new Size(63, 0); + cboPassportType.Name = "cboPassportType"; + cboPassportType.Padding = new Padding(0, 0, 30, 2); + cboPassportType.Radius = 20; + cboPassportType.ReadOnly = true; + cboPassportType.Size = new Size(203, 35); + cboPassportType.Style = Sunny.UI.UIStyle.Custom; + cboPassportType.SymbolSize = 24; + cboPassportType.TabIndex = 124; + cboPassportType.TextAlignment = ContentAlignment.MiddleLeft; + cboPassportType.Watermark = ""; // // cboCustoSex // - this.cboCustoSex.DataSource = null; - this.cboCustoSex.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cboCustoSex.FillColor = System.Drawing.Color.White; - this.cboCustoSex.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cboCustoSex.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); - this.cboCustoSex.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.cboCustoSex.Location = new System.Drawing.Point(134, 124); - this.cboCustoSex.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cboCustoSex.MinimumSize = new System.Drawing.Size(63, 0); - this.cboCustoSex.Name = "cboCustoSex"; - this.cboCustoSex.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cboCustoSex.Radius = 20; - this.cboCustoSex.ReadOnly = true; - this.cboCustoSex.Size = new System.Drawing.Size(203, 35); - this.cboCustoSex.Style = Sunny.UI.UIStyle.Custom; - this.cboCustoSex.SymbolSize = 24; - this.cboCustoSex.TabIndex = 123; - this.cboCustoSex.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.cboCustoSex.Watermark = ""; + cboCustoSex.DataSource = null; + cboCustoSex.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; + cboCustoSex.FillColor = Color.White; + cboCustoSex.Font = new Font("微软雅黑", 15.75F); + cboCustoSex.ItemHoverColor = Color.FromArgb(155, 200, 255); + cboCustoSex.ItemSelectForeColor = Color.FromArgb(235, 243, 255); + cboCustoSex.Location = new Point(134, 124); + cboCustoSex.Margin = new Padding(4, 5, 4, 5); + cboCustoSex.MinimumSize = new Size(63, 0); + cboCustoSex.Name = "cboCustoSex"; + cboCustoSex.Padding = new Padding(0, 0, 30, 2); + cboCustoSex.Radius = 20; + cboCustoSex.ReadOnly = true; + cboCustoSex.Size = new Size(203, 35); + cboCustoSex.Style = Sunny.UI.UIStyle.Custom; + cboCustoSex.SymbolSize = 24; + cboCustoSex.TabIndex = 123; + cboCustoSex.TextAlignment = ContentAlignment.MiddleLeft; + cboCustoSex.Watermark = ""; // // txtCustoNo // - this.txtCustoNo.Cursor = System.Windows.Forms.Cursors.IBeam; - 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(134, 20); - this.txtCustoNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - 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.ShowText = false; - this.txtCustoNo.Size = new System.Drawing.Size(203, 35); - this.txtCustoNo.Style = Sunny.UI.UIStyle.Custom; - this.txtCustoNo.StyleCustomMode = true; - this.txtCustoNo.TabIndex = 122; - this.txtCustoNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.txtCustoNo.Watermark = ""; + txtCustoNo.Cursor = Cursors.IBeam; + txtCustoNo.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); + txtCustoNo.Location = new Point(134, 20); + 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(203, 35); + txtCustoNo.Style = Sunny.UI.UIStyle.Custom; + txtCustoNo.StyleCustomMode = true; + txtCustoNo.TabIndex = 122; + txtCustoNo.TextAlignment = ContentAlignment.MiddleLeft; + txtCustoNo.Watermark = ""; // // txtCustoName // - this.txtCustoName.Cursor = System.Windows.Forms.Cursors.IBeam; - 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(134, 72); - this.txtCustoName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - 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.ShowText = false; - this.txtCustoName.Size = new System.Drawing.Size(203, 35); - this.txtCustoName.Style = Sunny.UI.UIStyle.Custom; - this.txtCustoName.StyleCustomMode = true; - this.txtCustoName.TabIndex = 121; - this.txtCustoName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.txtCustoName.Watermark = ""; + txtCustoName.Cursor = Cursors.IBeam; + txtCustoName.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); + txtCustoName.Location = new Point(134, 72); + 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(203, 35); + txtCustoName.Style = Sunny.UI.UIStyle.Custom; + txtCustoName.StyleCustomMode = true; + txtCustoName.TabIndex = 121; + txtCustoName.TextAlignment = ContentAlignment.MiddleLeft; + txtCustoName.Watermark = ""; // // txtPassportNum // - this.txtPassportNum.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtPassportNum.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtPassportNum.Location = new System.Drawing.Point(437, 121); - this.txtPassportNum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtPassportNum.MinimumSize = new System.Drawing.Size(1, 1); - this.txtPassportNum.Name = "txtPassportNum"; - this.txtPassportNum.Padding = new System.Windows.Forms.Padding(5); - this.txtPassportNum.Radius = 20; - this.txtPassportNum.ReadOnly = true; - this.txtPassportNum.ShowText = false; - this.txtPassportNum.Size = new System.Drawing.Size(203, 35); - this.txtPassportNum.Style = Sunny.UI.UIStyle.Custom; - this.txtPassportNum.StyleCustomMode = true; - this.txtPassportNum.TabIndex = 120; - this.txtPassportNum.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.txtPassportNum.Watermark = ""; + txtPassportNum.Cursor = Cursors.IBeam; + txtPassportNum.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); + txtPassportNum.Location = new Point(437, 121); + txtPassportNum.Margin = new Padding(4, 5, 4, 5); + txtPassportNum.MinimumSize = new Size(1, 1); + txtPassportNum.Name = "txtPassportNum"; + txtPassportNum.Padding = new Padding(5); + txtPassportNum.Radius = 20; + txtPassportNum.ReadOnly = true; + txtPassportNum.ShowText = false; + txtPassportNum.Size = new Size(203, 35); + txtPassportNum.Style = Sunny.UI.UIStyle.Custom; + txtPassportNum.StyleCustomMode = true; + txtPassportNum.TabIndex = 120; + txtPassportNum.TextAlignment = ContentAlignment.MiddleLeft; + txtPassportNum.Watermark = ""; // // txtTel // - this.txtTel.Cursor = System.Windows.Forms.Cursors.IBeam; - 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(437, 172); - this.txtTel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - 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.ReadOnly = true; - this.txtTel.ShowText = false; - this.txtTel.Size = new System.Drawing.Size(203, 35); - this.txtTel.Style = Sunny.UI.UIStyle.Custom; - this.txtTel.StyleCustomMode = true; - this.txtTel.TabIndex = 119; - this.txtTel.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.txtTel.Watermark = ""; + txtTel.Cursor = Cursors.IBeam; + txtTel.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); + txtTel.Location = new Point(437, 172); + 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.ReadOnly = true; + txtTel.ShowText = false; + txtTel.Size = new Size(203, 35); + txtTel.Style = Sunny.UI.UIStyle.Custom; + txtTel.StyleCustomMode = true; + txtTel.TabIndex = 119; + txtTel.TextAlignment = ContentAlignment.MiddleLeft; + txtTel.Watermark = ""; // // dtpBirth // - this.dtpBirth.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.dtpBirth.FillColor = System.Drawing.Color.White; - this.dtpBirth.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F); - this.dtpBirth.Location = new System.Drawing.Point(134, 176); - this.dtpBirth.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.dtpBirth.MaxLength = 10; - this.dtpBirth.MinimumSize = new System.Drawing.Size(63, 0); - this.dtpBirth.Name = "dtpBirth"; - this.dtpBirth.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.dtpBirth.Radius = 20; - this.dtpBirth.ReadOnly = true; - this.dtpBirth.Size = new System.Drawing.Size(203, 31); - this.dtpBirth.Style = Sunny.UI.UIStyle.Custom; - this.dtpBirth.SymbolDropDown = 61555; - this.dtpBirth.SymbolNormal = 61555; - this.dtpBirth.SymbolSize = 24; - this.dtpBirth.TabIndex = 118; - this.dtpBirth.Text = "2020-11-24"; - this.dtpBirth.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.dtpBirth.Value = new System.DateTime(2020, 11, 24, 22, 50, 36, 791); - this.dtpBirth.Watermark = ""; + dtpBirth.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; + dtpBirth.FillColor = Color.White; + dtpBirth.Font = new Font("Microsoft Sans Serif", 15.75F); + dtpBirth.Location = new Point(134, 176); + dtpBirth.Margin = new Padding(4, 5, 4, 5); + dtpBirth.MaxLength = 10; + dtpBirth.MinimumSize = new Size(63, 0); + dtpBirth.Name = "dtpBirth"; + dtpBirth.Padding = new Padding(0, 0, 30, 2); + dtpBirth.Radius = 20; + dtpBirth.ReadOnly = true; + dtpBirth.Size = new Size(203, 31); + dtpBirth.Style = Sunny.UI.UIStyle.Custom; + dtpBirth.SymbolDropDown = 61555; + dtpBirth.SymbolNormal = 61555; + dtpBirth.SymbolSize = 24; + dtpBirth.TabIndex = 118; + dtpBirth.Text = "2020-11-24"; + dtpBirth.TextAlignment = ContentAlignment.MiddleLeft; + dtpBirth.Value = new DateTime(2020, 11, 24, 22, 50, 36, 791); + dtpBirth.Watermark = ""; // // txtAddress // - this.txtAddress.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtAddress.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtAddress.Location = new System.Drawing.Point(132, 224); - this.txtAddress.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtAddress.MinimumSize = new System.Drawing.Size(1, 1); - this.txtAddress.Name = "txtAddress"; - this.txtAddress.Padding = new System.Windows.Forms.Padding(5); - this.txtAddress.Radius = 20; - this.txtAddress.ReadOnly = true; - this.txtAddress.ShowText = false; - this.txtAddress.Size = new System.Drawing.Size(508, 35); - this.txtAddress.Style = Sunny.UI.UIStyle.Custom; - this.txtAddress.StyleCustomMode = true; - this.txtAddress.TabIndex = 117; - this.txtAddress.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.txtAddress.Watermark = ""; + txtAddress.Cursor = Cursors.IBeam; + txtAddress.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); + txtAddress.Location = new Point(132, 224); + 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.ReadOnly = true; + txtAddress.ShowText = false; + txtAddress.Size = new Size(508, 35); + txtAddress.Style = Sunny.UI.UIStyle.Custom; + txtAddress.StyleCustomMode = true; + txtAddress.TabIndex = 117; + txtAddress.TextAlignment = ContentAlignment.MiddleLeft; + txtAddress.Watermark = ""; // // 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(25, 234); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(88, 25); - this.label2.TabIndex = 115; - this.label2.Text = "居住地址"; + 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 // - 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(344, 179); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(88, 25); - this.label3.TabIndex = 114; - this.label3.Text = "联系方式"; + 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 // - 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(344, 128); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(88, 25); - this.label4.TabIndex = 113; - this.label4.Text = "证件号码"; + 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 // - 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(344, 77); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(88, 25); - this.label5.TabIndex = 112; - this.label5.Text = "证件类型"; + 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 // - 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(344, 26); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(88, 25); - this.label16.TabIndex = 111; - this.label16.Text = "客户类型"; + 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 // - this.label22.AutoSize = true; - this.label22.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label22.Location = new System.Drawing.Point(27, 182); - this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(88, 25); - this.label22.TabIndex = 110; - this.label22.Text = "出生日期"; + 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 // - this.label30.AutoSize = true; - this.label30.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label30.Location = new System.Drawing.Point(27, 130); - this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(86, 25); - this.label30.TabIndex = 109; - this.label30.Text = "性 别"; + 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 // - this.label31.AutoSize = true; - this.label31.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label31.Location = new System.Drawing.Point(27, 78); - this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(88, 25); - this.label31.TabIndex = 108; - this.label31.Text = "客户姓名"; + 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 // - this.label32.AutoSize = true; - this.label32.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label32.Location = new System.Drawing.Point(27, 26); - this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(88, 25); - this.label32.TabIndex = 107; - this.label32.Text = "客户编号"; + 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 = "客户编号"; // // dgvWti // - this.dgvWti.AllowUserToAddRows = false; - this.dgvWti.AllowUserToDeleteRows = false; - this.dgvWti.AllowUserToResizeColumns = false; - this.dgvWti.AllowUserToResizeRows = false; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.dgvWti.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; - this.dgvWti.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dgvWti.BackgroundColor = System.Drawing.Color.White; - this.dgvWti.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 12F); - dataGridViewCellStyle6.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvWti.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; - this.dgvWti.ColumnHeadersHeight = 32; - this.dgvWti.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - this.dgvWti.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column11, - this.clRoomNo, - this.clCustoNo, - this.clStartTime, - this.clDealTime, - this.clWater, - this.clElectric, - this.clMarkUser, - this.Column5, - this.Column6, - this.Column7, - this.Column9, - this.Column10}); - this.dgvWti.EnableHeadersVisualStyles = false; - this.dgvWti.Font = new System.Drawing.Font("微软雅黑", 12F); - this.dgvWti.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.dgvWti.Location = new System.Drawing.Point(3, 3); - this.dgvWti.Name = "dgvWti"; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 12F); - dataGridViewCellStyle7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvWti.RowHeadersDefaultCellStyle = dataGridViewCellStyle7; - this.dgvWti.RowHeadersVisible = false; - dataGridViewCellStyle8.BackColor = System.Drawing.Color.White; - this.dgvWti.RowsDefaultCellStyle = dataGridViewCellStyle8; - this.dgvWti.RowTemplate.Height = 29; - this.dgvWti.SelectedIndex = -1; - this.dgvWti.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvWti.Size = new System.Drawing.Size(656, 291); - this.dgvWti.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.dgvWti.Style = Sunny.UI.UIStyle.Custom; - this.dgvWti.TabIndex = 0; + dgvWti.AllowUserToAddRows = false; + dgvWti.AllowUserToDeleteRows = false; + dgvWti.AllowUserToResizeColumns = false; + dgvWti.AllowUserToResizeRows = false; + dataGridViewCellStyle5.BackColor = Color.FromArgb(235, 243, 255); + dgvWti.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; + dgvWti.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + dgvWti.BackgroundColor = Color.White; + dgvWti.ColumnHeadersBorderStyle = DataGridViewHeaderBorderStyle.Single; + dataGridViewCellStyle6.Alignment = DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle6.BackColor = Color.FromArgb(80, 160, 255); + dataGridViewCellStyle6.Font = new Font("微软雅黑", 12F); + dataGridViewCellStyle6.ForeColor = Color.White; + dataGridViewCellStyle6.SelectionBackColor = SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = SystemColors.HighlightText; + dataGridViewCellStyle6.WrapMode = DataGridViewTriState.True; + dgvWti.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; + dgvWti.ColumnHeadersHeight = 32; + dgvWti.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + dgvWti.Columns.AddRange(new DataGridViewColumn[] { Column11, token, clRoomNo, clCustoNo, clStartTime, clDealTime, clWater, clElectric, clMarkUser, Column5, Column6, Column7, Column9, Column10 }); + dgvWti.EnableHeadersVisualStyles = false; + dgvWti.Font = new Font("微软雅黑", 12F); + dgvWti.GridColor = Color.FromArgb(80, 160, 255); + dgvWti.Location = new Point(3, 3); + dgvWti.Name = "dgvWti"; + dataGridViewCellStyle7.Alignment = DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle7.BackColor = Color.FromArgb(235, 243, 255); + dataGridViewCellStyle7.Font = new Font("微软雅黑", 12F); + dataGridViewCellStyle7.ForeColor = Color.FromArgb(48, 48, 48); + dataGridViewCellStyle7.SelectionBackColor = Color.FromArgb(80, 160, 255); + dataGridViewCellStyle7.SelectionForeColor = Color.White; + dataGridViewCellStyle7.WrapMode = DataGridViewTriState.True; + dgvWti.RowHeadersDefaultCellStyle = dataGridViewCellStyle7; + dgvWti.RowHeadersVisible = false; + dataGridViewCellStyle8.BackColor = Color.White; + dgvWti.RowsDefaultCellStyle = dataGridViewCellStyle8; + dgvWti.RowTemplate.Height = 29; + dgvWti.SelectedIndex = -1; + dgvWti.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dgvWti.Size = new Size(656, 291); + dgvWti.StripeOddColor = Color.FromArgb(235, 243, 255); + dgvWti.Style = Sunny.UI.UIStyle.Custom; + dgvWti.TabIndex = 0; + // + // 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(txtReceipts); + tabPage1.Controls.Add(btnBalance); + tabPage1.Controls.Add(label24); + tabPage1.Controls.Add(lblVIPPrice); + tabPage1.Controls.Add(label18); + tabPage1.Controls.Add(label15); + tabPage1.Controls.Add(dgvSpendList); + 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(CustoName); + tabPage1.Controls.Add(lblVIP); + tabPage1.Controls.Add(label21); + tabPage1.Controls.Add(dtpCheckTime); + tabPage1.Controls.Add(CustoNo); + tabPage1.Controls.Add(label25); + tabPage1.Controls.Add(lblChange); + tabPage1.Controls.Add(txtRoomNo); + 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; + // + // txtReceipts + // + txtReceipts.Cursor = Cursors.IBeam; + txtReceipts.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); + txtReceipts.Location = new Point(548, 329); + txtReceipts.Margin = new Padding(4, 5, 4, 5); + txtReceipts.MinimumSize = new Size(1, 16); + txtReceipts.Name = "txtReceipts"; + txtReceipts.Padding = new Padding(5); + txtReceipts.ShowText = false; + txtReceipts.Size = new Size(74, 26); + txtReceipts.TabIndex = 117; + txtReceipts.TextAlignment = ContentAlignment.MiddleCenter; + txtReceipts.Watermark = ""; + txtReceipts.TextChanged += txtReceipts_TextChanged; + // + // tabPage2 + // + tabPage2.Controls.Add(cboCustoType); + tabPage2.Controls.Add(label32); + tabPage2.Controls.Add(cboPassportType); + tabPage2.Controls.Add(label31); + tabPage2.Controls.Add(cboCustoSex); + tabPage2.Controls.Add(label30); + tabPage2.Controls.Add(txtCustoNo); + tabPage2.Controls.Add(label22); + tabPage2.Controls.Add(txtCustoName); + tabPage2.Controls.Add(label16); + tabPage2.Controls.Add(txtPassportNum); + tabPage2.Controls.Add(label5); + tabPage2.Controls.Add(txtTel); + tabPage2.Controls.Add(label4); + tabPage2.Controls.Add(dtpBirth); + tabPage2.Controls.Add(label3); + tabPage2.Controls.Add(txtAddress); + 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; + // + // 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; // // Column11 // - this.Column11.DataPropertyName = "WtiNo"; - this.Column11.HeaderText = "Column11"; - this.Column11.Name = "Column11"; - this.Column11.Visible = false; + Column11.DataPropertyName = "WtiNo"; + Column11.HeaderText = "Column11"; + Column11.Name = "Column11"; + Column11.Visible = false; + // + // token + // + token.DataPropertyName = "user_token"; + token.HeaderText = "token"; + token.Name = "token"; + token.Visible = false; // // clRoomNo // - this.clRoomNo.DataPropertyName = "RoomNo"; - this.clRoomNo.HeaderText = "房间号"; - this.clRoomNo.Name = "clRoomNo"; + clRoomNo.DataPropertyName = "RoomNo"; + clRoomNo.HeaderText = "房间号"; + clRoomNo.Name = "clRoomNo"; // // clCustoNo // - this.clCustoNo.DataPropertyName = "CustoNo"; - this.clCustoNo.HeaderText = "客户编号"; - this.clCustoNo.Name = "clCustoNo"; + clCustoNo.DataPropertyName = "CustoNo"; + clCustoNo.HeaderText = "客户编号"; + clCustoNo.Name = "clCustoNo"; // // clStartTime // - this.clStartTime.DataPropertyName = "UseDate"; - this.clStartTime.HeaderText = "开始时间"; - this.clStartTime.Name = "clStartTime"; + clStartTime.DataPropertyName = "UseDate"; + clStartTime.HeaderText = "开始时间"; + clStartTime.Name = "clStartTime"; // // clDealTime // - this.clDealTime.DataPropertyName = "EndDate"; - this.clDealTime.HeaderText = "结束时间"; - this.clDealTime.Name = "clDealTime"; + clDealTime.DataPropertyName = "EndDate"; + clDealTime.HeaderText = "结束时间"; + clDealTime.Name = "clDealTime"; // // clWater // - this.clWater.DataPropertyName = "WaterUse"; - this.clWater.HeaderText = "水费"; - this.clWater.Name = "clWater"; + clWater.DataPropertyName = "WaterUse"; + clWater.HeaderText = "水费"; + clWater.Name = "clWater"; // // clElectric // - this.clElectric.DataPropertyName = "PowerUse"; - this.clElectric.HeaderText = "电费"; - this.clElectric.Name = "clElectric"; + clElectric.DataPropertyName = "PowerUse"; + clElectric.HeaderText = "电费"; + clElectric.Name = "clElectric"; // // clMarkUser // - this.clMarkUser.DataPropertyName = "Record"; - this.clMarkUser.HeaderText = "记录员"; - this.clMarkUser.Name = "clMarkUser"; + clMarkUser.DataPropertyName = "Record"; + clMarkUser.HeaderText = "记录员"; + clMarkUser.Name = "clMarkUser"; // // Column5 // - this.Column5.DataPropertyName = "delete_mk"; - this.Column5.HeaderText = "Column5"; - this.Column5.Name = "Column5"; - this.Column5.Visible = false; + Column5.DataPropertyName = "delete_mk"; + Column5.HeaderText = "Column5"; + Column5.Name = "Column5"; + Column5.Visible = false; // // Column6 // - this.Column6.DataPropertyName = "datains_usr"; - this.Column6.HeaderText = "Column6"; - this.Column6.Name = "Column6"; - this.Column6.Visible = false; + Column6.DataPropertyName = "datains_usr"; + Column6.HeaderText = "Column6"; + Column6.Name = "Column6"; + Column6.Visible = false; // // Column7 // - this.Column7.DataPropertyName = "datains_date"; - this.Column7.HeaderText = "Column7"; - this.Column7.Name = "Column7"; - this.Column7.Visible = false; + Column7.DataPropertyName = "datains_date"; + Column7.HeaderText = "Column7"; + Column7.Name = "Column7"; + Column7.Visible = false; // // Column9 // - this.Column9.DataPropertyName = "datachg_usr"; - this.Column9.HeaderText = "Column9"; - this.Column9.Name = "Column9"; - this.Column9.Visible = false; + Column9.DataPropertyName = "datachg_usr"; + Column9.HeaderText = "Column9"; + Column9.Name = "Column9"; + Column9.Visible = false; // // Column10 // - this.Column10.DataPropertyName = "datachg_date"; - this.Column10.HeaderText = "Column10"; - this.Column10.Name = "Column10"; - this.Column10.Visible = false; - // - // uiTabControlMenu2 - // - this.uiTabControlMenu2.Alignment = System.Windows.Forms.TabAlignment.Left; - this.uiTabControlMenu2.Controls.Add(this.tabPage1); - this.uiTabControlMenu2.Controls.Add(this.tabPage2); - this.uiTabControlMenu2.Controls.Add(this.tabPage3); - this.uiTabControlMenu2.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed; - this.uiTabControlMenu2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiTabControlMenu2.Location = new System.Drawing.Point(3, 38); - this.uiTabControlMenu2.MenuStyle = Sunny.UI.UIMenuStyle.Custom; - this.uiTabControlMenu2.Multiline = true; - this.uiTabControlMenu2.Name = "uiTabControlMenu2"; - this.uiTabControlMenu2.SelectedIndex = 0; - this.uiTabControlMenu2.Size = new System.Drawing.Size(865, 550); - this.uiTabControlMenu2.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; - this.uiTabControlMenu2.TabBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.uiTabControlMenu2.TabIndex = 15; - this.uiTabControlMenu2.TabSelectedColor = System.Drawing.Color.Snow; - // - // tabPage1 - // - this.tabPage1.Controls.Add(this.txtReceipts); - this.tabPage1.Controls.Add(this.btnBalance); - this.tabPage1.Controls.Add(this.label24); - this.tabPage1.Controls.Add(this.lblVIPPrice); - this.tabPage1.Controls.Add(this.label18); - this.tabPage1.Controls.Add(this.label15); - this.tabPage1.Controls.Add(this.dgvSpendList); - this.tabPage1.Controls.Add(this.label17); - this.tabPage1.Controls.Add(this.lblDay); - this.tabPage1.Controls.Add(this.label1); - this.tabPage1.Controls.Add(this.lable00); - this.tabPage1.Controls.Add(this.lblGetReceipts); - this.tabPage1.Controls.Add(this.label29); - this.tabPage1.Controls.Add(this.CustoName); - this.tabPage1.Controls.Add(this.lblVIP); - this.tabPage1.Controls.Add(this.label21); - this.tabPage1.Controls.Add(this.dtpCheckTime); - this.tabPage1.Controls.Add(this.CustoNo); - this.tabPage1.Controls.Add(this.label25); - this.tabPage1.Controls.Add(this.lblChange); - this.tabPage1.Controls.Add(this.txtRoomNo); - this.tabPage1.Controls.Add(this.label28); - this.tabPage1.Controls.Add(this.label27); - this.tabPage1.Location = new System.Drawing.Point(201, 0); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.Size = new System.Drawing.Size(664, 550); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "退房结算"; - this.tabPage1.UseVisualStyleBackColor = true; - // - // txtReceipts - // - this.txtReceipts.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtReceipts.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtReceipts.Location = new System.Drawing.Point(584, 328); - this.txtReceipts.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtReceipts.MinimumSize = new System.Drawing.Size(1, 16); - this.txtReceipts.Name = "txtReceipts"; - this.txtReceipts.Padding = new System.Windows.Forms.Padding(5); - this.txtReceipts.ShowText = false; - this.txtReceipts.Size = new System.Drawing.Size(74, 26); - this.txtReceipts.TabIndex = 117; - this.txtReceipts.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; - this.txtReceipts.Watermark = ""; - this.txtReceipts.TextChanged += new System.EventHandler(this.txtReceipts_TextChanged); - // - // tabPage2 - // - this.tabPage2.Controls.Add(this.cboCustoType); - this.tabPage2.Controls.Add(this.label32); - this.tabPage2.Controls.Add(this.cboPassportType); - this.tabPage2.Controls.Add(this.label31); - this.tabPage2.Controls.Add(this.cboCustoSex); - this.tabPage2.Controls.Add(this.label30); - this.tabPage2.Controls.Add(this.txtCustoNo); - this.tabPage2.Controls.Add(this.label22); - this.tabPage2.Controls.Add(this.txtCustoName); - this.tabPage2.Controls.Add(this.label16); - this.tabPage2.Controls.Add(this.txtPassportNum); - this.tabPage2.Controls.Add(this.label5); - this.tabPage2.Controls.Add(this.txtTel); - this.tabPage2.Controls.Add(this.label4); - this.tabPage2.Controls.Add(this.dtpBirth); - this.tabPage2.Controls.Add(this.label3); - this.tabPage2.Controls.Add(this.txtAddress); - this.tabPage2.Controls.Add(this.label2); - this.tabPage2.Location = new System.Drawing.Point(201, 0); - this.tabPage2.Name = "tabPage2"; - this.tabPage2.Size = new System.Drawing.Size(664, 550); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "客户信息"; - this.tabPage2.UseVisualStyleBackColor = true; - // - // tabPage3 - // - this.tabPage3.Controls.Add(this.dgvWti); - this.tabPage3.Location = new System.Drawing.Point(201, 0); - this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(664, 550); - this.tabPage3.TabIndex = 2; - this.tabPage3.Text = "历史水电情况"; - this.tabPage3.UseVisualStyleBackColor = true; + Column10.DataPropertyName = "datachg_date"; + Column10.HeaderText = "Column10"; + Column10.Name = "Column10"; + Column10.Visible = false; // // FrmCheckOutForm // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.ClientSize = new System.Drawing.Size(873, 593); - this.Controls.Add(this.uiTabControlMenu2); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "FrmCheckOutForm"; - this.ShowTitleIcon = true; - this.Text = "退房结算"; - this.ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 888, 603); - this.Load += new System.EventHandler(this.FrmCheckOutForm_Load); - this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.FrmCheckOutForm_MouseDown); - this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.FrmCheckOutForm_MouseMove); - ((System.ComponentModel.ISupportInitialize)(this.dgvSpendList)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dgvWti)).EndInit(); - this.uiTabControlMenu2.ResumeLayout(false); - this.tabPage1.ResumeLayout(false); - this.tabPage1.PerformLayout(); - this.tabPage2.ResumeLayout(false); - this.tabPage2.PerformLayout(); - this.tabPage3.ResumeLayout(false); - this.ResumeLayout(false); - + 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; + ((System.ComponentModel.ISupportInitialize)dgvSpendList).EndInit(); + ((System.ComponentModel.ISupportInitialize)dgvWti).EndInit(); + uiTabControlMenu2.ResumeLayout(false); + tabPage1.ResumeLayout(false); + tabPage1.PerformLayout(); + tabPage2.ResumeLayout(false); + tabPage2.PerformLayout(); + tabPage3.ResumeLayout(false); + ResumeLayout(false); } #endregion @@ -1151,23 +1131,24 @@ private System.Windows.Forms.Label label31; private System.Windows.Forms.Label label32; private Sunny.UI.UIDataGridView dgvWti; - private System.Windows.Forms.DataGridViewTextBoxColumn Column11; - private System.Windows.Forms.DataGridViewTextBoxColumn clRoomNo; - private System.Windows.Forms.DataGridViewTextBoxColumn clCustoNo; - private System.Windows.Forms.DataGridViewTextBoxColumn clStartTime; - private System.Windows.Forms.DataGridViewTextBoxColumn clDealTime; - private System.Windows.Forms.DataGridViewTextBoxColumn clWater; - private System.Windows.Forms.DataGridViewTextBoxColumn clElectric; - private System.Windows.Forms.DataGridViewTextBoxColumn clMarkUser; - private System.Windows.Forms.DataGridViewTextBoxColumn Column5; - private System.Windows.Forms.DataGridViewTextBoxColumn Column6; - private System.Windows.Forms.DataGridViewTextBoxColumn Column7; - private System.Windows.Forms.DataGridViewTextBoxColumn Column9; - private System.Windows.Forms.DataGridViewTextBoxColumn Column10; private Sunny.UI.UITabControlMenu uiTabControlMenu2; private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.TabPage tabPage2; private System.Windows.Forms.TabPage tabPage3; private Sunny.UI.UITextBox txtReceipts; + private DataGridViewTextBoxColumn Column11; + private DataGridViewTextBoxColumn token; + private DataGridViewTextBoxColumn clRoomNo; + private DataGridViewTextBoxColumn clCustoNo; + private DataGridViewTextBoxColumn clStartTime; + private DataGridViewTextBoxColumn clDealTime; + private DataGridViewTextBoxColumn clWater; + private DataGridViewTextBoxColumn clElectric; + private DataGridViewTextBoxColumn clMarkUser; + private DataGridViewTextBoxColumn Column5; + private DataGridViewTextBoxColumn Column6; + private DataGridViewTextBoxColumn Column7; + private DataGridViewTextBoxColumn Column9; + private DataGridViewTextBoxColumn Column10; } } \ No newline at end of file diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.cs index 4afe80c38ec04e7c26c29d166550da3aed3c11ef..c04d876f62bc1bd04e434b0701ae9090f29405e3 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,14 +22,10 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.Drawing; using System.Transactions; -using System.Windows.Forms; namespace EOM.TSHotelManager.FormUI { @@ -253,7 +249,7 @@ namespace EOM.TSHotelManager.FormUI { { "roomno",txtRoomNo.Text.Trim()} }; - result = HttpHelper.Request("Wti/ListWtiInfoByRoomNo", null, dic); + result = HttpHelper.Request("HydroelectricPower/ListWtiInfoByRoomNo", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("ListWtiInfoByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); @@ -374,7 +370,7 @@ namespace EOM.TSHotelManager.FormUI bool n = result.message.ToString().Equals("true"); if (n) { - result = HttpHelper.Request("Wti​/InsertWtiInfo", HttpHelper.ModelToJson(w)); + result = HttpHelper.Request("HydroelectricPower​/InsertWtiInfo", HttpHelper.ModelToJson(w)); if (result.statusCode != 200) { UIMessageBox.ShowError("InsertWtiInfo+接口服务异常，请提交Issue或尝试更新版本！"); @@ -388,6 +384,7 @@ namespace EOM.TSHotelManager.FormUI } UIMessageBox.Show("结算成功！", "系统提示", UIStyle.Green); FrmRoomManager.Reload(""); + FrmRoomManager._RefreshRoomCount(); #region 获取添加操作日志所需的信息 RecordHelper.Record(LoginInfo.WorkerClub + "-" + LoginInfo.WorkerPosition + "-" + LoginInfo.WorkerName + "于" + Convert.ToDateTime(DateTime.Now) + "帮助" + txtCustoNo.Text + "进行了退房结算操作！", 3); @@ -422,7 +419,7 @@ namespace EOM.TSHotelManager.FormUI bool n = result.message.ToString().Equals("true"); if (n) { - result = HttpHelper.Request("Wti​/InsertWtiInfo", HttpHelper.ModelToJson(w)); + result = HttpHelper.Request("HydroelectricPower​/InsertWtiInfo", HttpHelper.ModelToJson(w)); if (result.statusCode != 200) { UIMessageBox.ShowError("InsertWtiInfo+接口服务异常，请提交Issue或尝试更新版本！"); @@ -436,6 +433,7 @@ namespace EOM.TSHotelManager.FormUI } UIMessageBox.Show("结算成功！", "系统提示", UIStyle.Green); FrmRoomManager.Reload(""); + FrmRoomManager._RefreshRoomCount(); #region 获取添加操作日志所需的信息 RecordHelper.Record(LoginInfo.WorkerClub + "-" + LoginInfo.WorkerPosition + "-" + LoginInfo.WorkerName + "于" + Convert.ToDateTime(DateTime.Now) + "帮助" + txtCustoNo.Text + "进行了退房结算操作！", 3); #endregion diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.resx index 7a9c24118697cc3354a27e63a513a06c9a4d9637..ca0e1a4096fe6e94041167349c7d81a4251a9205 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.resx +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.resx @@ -1,17 +1,17 @@  - @@ -162,6 +162,9 @@ True + + True + True diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.cs index f3a6b7bdd498a99a03ec78fef9f9c8c4a3527374..bc2d0af53860726a5c03768be55947fe7b9f3807 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,16 +22,11 @@ * */ -using EOM.TSHotelManager.Common.Core; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.Windows.Forms; -using System.Data; -using System.Linq; -using System.ComponentModel; using AntdUI; +using EOM.TSHotelManager.Common; +using EOM.TSHotelManager.Common.Core; using jvncorelib.EntityLib; +using System.Data; namespace EOM.TSHotelManager.FormUI { @@ -102,7 +97,7 @@ namespace EOM.TSHotelManager.FormUI result = HttpHelper.Request("Custo/SelectCustoAll", null, dic); if (result.statusCode != 200) { - AntdUI.Message.error(this,"SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); + AntdUI.Message.error(this, "SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); return null!; } OSelectAllDto custos = HttpHelper.JsonToModel>(result.message); @@ -183,7 +178,7 @@ namespace EOM.TSHotelManager.FormUI result = HttpHelper.Request("Custo/SelectCustoByInfo", null, dic); if (result.statusCode != 200) { - AntdUI.Message.error(this,"SelectCustoByInfo+接口服务异常，请提交Issue或尝试更新版本！"); + AntdUI.Message.error(this, "SelectCustoByInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } } diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.cs index f62ff7753a299b659f0d78da8794438a80cad2bc..328f5cdd17bd8a26a5ed0db482ac0f6a6302fad8 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.cs @@ -22,10 +22,9 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.cs index 01b7a0a97e78b3d81ad8eb90fe79e0e94e22b858..98de744081755dd9aacd6ad8a5d4502ad6fbcec6 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,13 +22,9 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.Threading; -using System.Windows.Forms; namespace EOM.TSHotelManager.FormUI { @@ -231,7 +227,7 @@ namespace EOM.TSHotelManager.FormUI LoadCustomer(); } } - + } } diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.cs index 701558554a52566978337395255b95de3cfd642b..9d92605616ae4d2ea552dcf8e4208656ca5b4878 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,14 +22,10 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using jvncorelib.EntityLib; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.cs index 07d3c936f7dc6b8c9ee5c47c57dc8ec89e8a7a71..b47651ccf93bf267cb1bcf07d7dc1717bdeee7e2 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,13 +22,9 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.cs index 1aeab6c51515cf925a310bf10702c727ee7d25f2..8c2c077a45b92fc6281b8f2e0cfccf6540a736b9 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -23,14 +23,9 @@ */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Linq; -using System.Windows.Forms; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.cs index c465a594a23f2359333436c706643452585c0b88..f64c3838c513c969bc3b367a2032934abdf57f0d 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,11 +22,9 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.cs index db6e417f3e971ea39cfe7f35bd24573899fd14cc..60315a8e63f7eb303ae7f4d28103dfd9281d41b8 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,15 +22,12 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using jvncorelib.EncryptorLib; using jvncorelib.EntityLib; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; using System.ComponentModel; -using System.Drawing; using System.Text.RegularExpressions; namespace EOM.TSHotelManager.FormUI diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmNation.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmNation.cs index 561dd400830e28efe1f61b1925ae6b670fa502a8..b9285d68264f51b79fdba8d33e7c1e0cd0a03d00 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmNation.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmNation.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -23,14 +23,9 @@ */ //using EOM.TSHotelManager.Common; +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Linq; -using System.Windows.Forms; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.cs index 477713710a28839ca0db669e3587c2a8664ab9a0..3bb500ce84e6014d773764c6c390e4c1960ef125 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,11 +22,9 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.cs index 52476e6b9b63fc0abcbde34af791a5b8c990dd91..6ff2c93244546e660fa8cdd931451c1a84415555 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,7 +22,6 @@ * */ using Sunny.UI; -using System; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.cs index b30662336cbf6483272e690761d3c38963d840f4..0e629affdaa91ee4a55ab74bcf9f72e431f56982 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,14 +22,9 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Linq; -using System.Windows.Forms; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmProgress.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmProgress.Designer.cs new file mode 100644 index 0000000000000000000000000000000000000000..cecda9c2a426bceaff3d5ff459702565f2d085cb --- /dev/null +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmProgress.Designer.cs @@ -0,0 +1,51 @@ +namespace EOM.TSHotelManager.FormUI +{ + partial class FrmProgress + { + /// + /// 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(FrmProgress)); + SuspendLayout(); + // + // FrmProgress + // + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(292, 39); + Icon = (Icon)resources.GetObject("$this.Icon"); + Name = "FrmProgress"; + StartPosition = FormStartPosition.CenterScreen; + Text = "FrmProgress"; + Load += FrmProgress_Load; + ResumeLayout(false); + } + + #endregion + + private AntdUI.Label label1; + } +} \ No newline at end of file diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmProgress.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmProgress.cs new file mode 100644 index 0000000000000000000000000000000000000000..56f7e6c97acac1933d9394afd495174400a4bcdc --- /dev/null +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmProgress.cs @@ -0,0 +1,33 @@ +using AntdUI; + +namespace EOM.TSHotelManager.FormUI +{ + public partial class FrmProgress : Window + { + public FrmProgress() + { + InitializeComponent(); + // 创建ProgressBar控件并配置 + ProgressBar progressBar = new ProgressBar + { + Dock = DockStyle.Fill, + Style = ProgressBarStyle.Marquee, + MarqueeAnimationSpeed = 30, + Size = new Size(196, 23) + }; + + this.Controls.Add(progressBar); + this.Text = "Loading..."; + this.TopMost = true; + this.Size = new System.Drawing.Size(196, 23); + this.FormBorderStyle = FormBorderStyle.FixedDialog; + this.StartPosition = FormStartPosition.CenterScreen; + this.ControlBox = false; + } + + private void FrmProgress_Load(object sender, EventArgs e) + { + + } + } +} diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmProgress.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmProgress.resx new file mode 100644 index 0000000000000000000000000000000000000000..0f0883d80c8f3a160de3488b836da689fc442771 --- /dev/null +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmProgress.resx @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMvSWgLT3ERC095BktPeQbTT3kGi09xESMvT + ZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANTXPijV2TvE1do86NTaPNTV2jv21do6/9Xa + Ov/V2T16AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANXTNzrW1TbA1NU8QtPITwLypAkc1NFDEtXV + OJrW1TT/1tU0+tPROyIAAAAAAAAAAAAAAAAAAAAAAAAAANbNNBrX0DGg1M8/CgAAAADzpApa86QKqvKk + CozQzlkC19AwvtjQLv/WzjFsAAAAAAAAAAAAAAAAAAAAAAAAAADYyix41ss3DPOkCQYAAAAA86QKAvOk + ChbzpAq2AAAAANjKLGDZyyj/2MoriAAAAAAAAAAAAAAAAAAAAADYxDAO2cUpTPOjCQDzownO86QKCPOk + CgrzpArI86QKPgAAAADZxSZM2sUi/9rFJXYAAAAAAAAAAAAAAAAAAAAA2cAoMtbCPAQAAAAA8qMJrPKk + Ci7ypAoI86QKsvKkCozzpAoE28AfctzAHP/bwSM8AAAAAAAAAAAAAAAAAAAAANa9OgoAAAAAAAAAAPOk + CYDzpApcAAAAAPOkCiryowo81LlSANy8GMTcvBjS1L5GAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPOk + ChTypAps86QKlPKjCSDypAoAAAAAAN22Fk7etxL83LgYQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AADzpApi86QKrvOkCq7zpAqu86QKDN6yEyrfsw3q3rQScs64cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AADZryoI264bDAAAAAAAAAAA2q4iBN+uDF7frwni3rAOYtCyTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA1rRGAN6tD1TfrAuQ4KwIqOCsCMrgrQiW2qkNHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA1as3ANqtKAjSqkICAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA//8AAP//AAD/HwAA/A8AAPvHAAD3JwAA/7MAAPt3AAD7NwAA++cAAP3vAAD43wAA/78AAPh/ + AAD//wAA//8AAA== + + + \ No newline at end of file diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.cs index b317d4edd0eb6832e220317a31e754a161afe2c3..c8dce2a9d92d8145003478552bedb1300590a81d 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -21,14 +21,10 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.Linq; using System.Transactions; -using System.Windows.Forms; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.cs index 01ba4609f4ccec661cf1c4cda6c66e43b10e9d5b..6b44ed16ab937da85165fe9d2181e3ef8a61b032 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -21,13 +21,9 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.cs index 24879ef3894535f451f81ec6dfd6b7c72f9ddb06..8ebf1dd4a2144665b67e5a14230f104dff825b6e 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -21,20 +21,11 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; +using EOM.TSHotelManager.Common.Util; using jvncorelib.EntityLib; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; -using EOM.TSHotelManager.Common.Util; namespace EOM.TSHotelManager.FormUI.AppFunction { @@ -50,7 +41,7 @@ namespace EOM.TSHotelManager.FormUI.AppFunction public void LoadRoomType() { - result = HttpHelper.Request("RoomType/SelectRoomTypesAll",null); + result = HttpHelper.Request("RoomType/SelectRoomTypesAll", null); if (result.statusCode != 200) { UIMessageBox.ShowError("SelectRoomTypesAll+接口服务异常，请提交Issue或尝试更新版本！"); @@ -159,7 +150,7 @@ namespace EOM.TSHotelManager.FormUI.AppFunction RoomName = txtRoomTypeName.Text.Trim(), RoomRent = Convert.ToDecimal(dudRent.Value), RoomDeposit = Convert.ToDecimal(dudDeposit.Value), - delete_mk = deleteMk == 0 ? 1:0, + delete_mk = deleteMk == 0 ? 1 : 0, datachg_usr = AdminInfo.Account }; if (ValidateHelper.Validate(roomType)) diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.cs index a188c255f24791eed3349e3191457afda3237e3c..ee4af3c9280ee5f91bd1b42ff5d24e2e9c5bc6a7 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -23,39 +23,34 @@ */ using AntdUI; -using EOM.TSHotelManager.Common.Core; -using Sunny.UI; using EOM.TSHotelManager.Common; +using EOM.TSHotelManager.Common.Core; using EOM.TSHotelManager.FormUI.AppUserControls; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Windows.Forms; using EOM.TSHotelManager.FormUI.Properties; +using Sunny.UI; namespace EOM.TSHotelManager.FormUI { public partial class FrmRoomManager : Form { - public static string co_CustoNo; - public static string co_RoomNo; - public static string co_CustoName; - public static string co_CheckTime; - public static string co_Day; + public delegate void ReLoadRoomList(string typeName); public delegate void ReadRoomInfo(); + public delegate void RefreshRoomCount(); + //定义委托类型的变量 public static ReadRoomInfo ReadInfo; public static ReLoadRoomList Reload; - + public static RefreshRoomCount _RefreshRoomCount; public FrmRoomManager() { InitializeComponent(); ReadInfo = LoadRoomInfo; Reload = LoadData; + _RefreshRoomCount = LoadRoomTypesAndStates; } Dictionary dic = null; @@ -72,126 +67,167 @@ namespace EOM.TSHotelManager.FormUI private void FrmRoomManager_Load(object sender, EventArgs e) { LoadRoomInfo(); - LoadRoomCount(); - LoadRoomState(); + LoadRoomTypesAndStates(); LoadRoomTypes(); LoadData(); } #endregion + private void LoadRoomTypesAndStates() + { + try + { + EmptyCount = "0"; + OccupiedCount = "0"; + DirtyCount = "0"; + UnderRepairCount = "0"; + ReservedCount = "0"; + + var requests = new Dictionary? parameters)> + { + { "Room/SelectCanUseRoomAllByRoomState", (null, null) }, + { "Room/SelectNotUseRoomAllByRoomState", (null, null) }, + { "Room/SelectNotClearRoomAllByRoomState", (null, null) }, + { "Room/SelectFixingRoomAllByRoomState", (null, null) }, + { "Room/SelectReseredRoomAllByRoomState", (null, null) } + }; + + var results = HttpHelper.RaiseRequests(requests); + + if (results["Room/SelectCanUseRoomAllByRoomState"].statusCode != 200) + { + throw new Exception("SelectCanUseRoomAllByRoomState+接口服务异常"); + } + EmptyCount = results["Room/SelectCanUseRoomAllByRoomState"].message!; + + if (results["Room/SelectNotUseRoomAllByRoomState"].statusCode != 200) + { + throw new Exception("SelectNotUseRoomAllByRoomState+接口服务异常"); + } + OccupiedCount = results["Room/SelectNotUseRoomAllByRoomState"].message!; + + if (results["Room/SelectNotClearRoomAllByRoomState"].statusCode != 200) + { + throw new Exception("SelectNotClearRoomAllByRoomState+接口服务异常"); + } + DirtyCount = results["Room/SelectNotClearRoomAllByRoomState"].message!; + + if (results["Room/SelectFixingRoomAllByRoomState"].statusCode != 200) + { + throw new Exception("SelectFixingRoomAllByRoomState+接口服务异常"); + } + UnderRepairCount = results["Room/SelectFixingRoomAllByRoomState"].message!; + + if (results["Room/SelectReseredRoomAllByRoomState"].statusCode != 200) + { + throw new Exception("SelectReseredRoomAllByRoomState+接口服务异常"); + } + ReservedCount = results["Room/SelectReseredRoomAllByRoomState"].message!; + + LoadRoomState(); + } + catch (Exception ex) + { + UIMessageBox.ShowError($"接口服务异常，请提交Issue或尝试更新版本！: {ex.Message}"); + } + } + private void LoadRoomState() { muRoomState.Items.Clear(); var stateList = RoomStateConstant.GetAll().ToList(); - MenuItem menuItem = null; + MenuItem? menuItem = null; if (!stateList.IsNullOrEmpty()) { foreach (var item in stateList) { menuItem = new MenuItem { - Text = item.Description + Text = item.Description + GetRoomCountText(item.Code), + Tag = item.Code }; - menuItem.Tag = item.Code; var roomState = RoomStateConstant.GetConstantByCode(item.Code); - if (roomState != null) { - menuItem.Text += roomState.Code switch - { - var code when code == RoomStateConstant.Empty.Code => "(" + EmptyCount + ")", - var code when code == RoomStateConstant.Occupied.Code => "(" + OccupiedCount + ")", - var code when code == RoomStateConstant.UnderRepair.Code => "(" + UnderRepairCount + ")", - var code when code == RoomStateConstant.Dirty.Code => "(" + DirtyCount + ")", - var code when code == RoomStateConstant.Reserved.Code => "(" + ReservedCount + ")", - _ => string.Empty - }; - - - menuItem.Icon = roomState.Code switch - { - var code when code == RoomStateConstant.Empty.Code => Resources.可住状态, - var code when code == RoomStateConstant.Occupied.Code => Resources.已住状态, - var code when code == RoomStateConstant.UnderRepair.Code => Resources.维修状态, - var code when code == RoomStateConstant.Dirty.Code => Resources.脏房状态, - var code when code == RoomStateConstant.Reserved.Code => Resources.预约状态, - _ => null - }; + menuItem.Icon = GetRoomCountIcon(roomState.Code); } + muRoomState.Items.Add(menuItem); } } - } - private void LoadRoomCount() + private string GetRoomCountText(string code) { - result = HttpHelper.Request("Room/SelectCanUseRoomAllByRoomState"); - if (result.statusCode != 200) - { - UIMessageBox.ShowError("SelectCanUseRoomAllByRoomState+接口服务异常，请提交Issue或尝试更新版本！"); - } - EmptyCount = result.message; - result = HttpHelper.Request("Room/SelectNotUseRoomAllByRoomState"); - if (result.statusCode != 200) - { - UIMessageBox.ShowError("SelectNotUseRoomAllByRoomState+接口服务异常，请提交Issue或尝试更新版本！"); - } - OccupiedCount = result.message; - result = HttpHelper.Request("Room/SelectNotClearRoomAllByRoomState"); - if (result.statusCode != 200) + return code switch { - UIMessageBox.ShowError("SelectNotClearRoomAllByRoomState+接口服务异常，请提交Issue或尝试更新版本！"); - } - DirtyCount = result.message; - result = HttpHelper.Request("Room/SelectFixingRoomAllByRoomState"); - if (result.statusCode != 200) - { - UIMessageBox.ShowError("SelectFixingRoomAllByRoomState+接口服务异常，请提交Issue或尝试更新版本！"); - } - UnderRepairCount = result.message; - result = HttpHelper.Request("Room/SelectReseredRoomAllByRoomState"); - if (result.statusCode != 200) - { - UIMessageBox.ShowError("SelectReseredRoomAllByRoomState+接口服务异常，请提交Issue或尝试更新版本！"); - } - ReservedCount = result.message; + var c when c == RoomStateConstant.Empty.Code => $"({EmptyCount})", + var c when c == RoomStateConstant.Occupied.Code => $"({OccupiedCount})", + var c when c == RoomStateConstant.UnderRepair.Code => $"({UnderRepairCount})", + var c when c == RoomStateConstant.Dirty.Code => $"({DirtyCount})", + var c when c == RoomStateConstant.Reserved.Code => $"({ReservedCount})", + _ => string.Empty + }; } - private void LoadRoomTypes() + private Bitmap? GetRoomCountIcon(string code) { - dic = new Dictionary() + return code switch { - { "isDelete","0"} + var c when c == RoomStateConstant.Empty.Code => Resources.可住状态, + var c when c == RoomStateConstant.Occupied.Code => Resources.已住状态, + var c when c == RoomStateConstant.UnderRepair.Code => Resources.维修状态, + var c when c == RoomStateConstant.Dirty.Code => Resources.脏房状态, + var c when c == RoomStateConstant.Reserved.Code => Resources.预约状态, + _ => null }; - result = HttpHelper.Request("RoomType/SelectRoomTypesAll", null, dic); - if (result.statusCode != 200) + } + + private void LoadRoomTypes() + { + try { - UIMessageBox.ShowError("SelectRoomTypesAll+接口服务异常，请提交Issue或尝试更新版本！"); - return; + var dic = new Dictionary { { "isDelete", "0" } }; + var result = HttpHelper.Request("RoomType/SelectRoomTypesAll", null, dic); + if (result.statusCode != 200) + { + throw new Exception("SelectRoomTypesAll+接口服务异常"); + } + + var listRoomTypes = HttpHelper.JsonToList(result.message!); + + if (listRoomTypes == null) + { + UIMessageBox.ShowError("Room types list is null"); + return; + } + + flpRoomTypes.Clear(); + + AddRoomTypeButton("全部房间", "btnAll", btnAll_Click); + foreach (var type in listRoomTypes) + { + AddRoomTypeButton(type.RoomName, Convert.ToString(type.Roomtype), btnRoomType_Click); + } } - var listRoomTypes = HttpHelper.JsonToList(result.message); - - flpRoomTypes.Clear(); - ucRoomType ucRoomType = null; - ucRoomType = new ucRoomType(); - ucRoomType.btnRoomType.Text = "全部房间"; - ucRoomType.btnRoomType.Name = "btnAll"; - ucRoomType.btnRoomType.Click += btnAll_Click; - flpRoomTypes.Controls.Add(ucRoomType); - foreach (var type in listRoomTypes) + catch (Exception ex) { - ucRoomType = new ucRoomType(); - ucRoomType.btnRoomType.Text = type.RoomName; - ucRoomType.btnRoomType.Name = Convert.ToString(type.Roomtype); - ucRoomType.btnRoomType.Click += btnRoomType_Click; - flpRoomTypes.Controls.Add(ucRoomType); + UIMessageBox.ShowError($"接口服务异常，请提交Issue或尝试更新版本！: {ex.Message}"); } } - private void btnRoomType_Click(object sender, EventArgs e) + private void AddRoomTypeButton(string text, string name, EventHandler clickEvent) + { + var ucRoomType = new ucRoomType(); + ucRoomType.btnRoomType.Text = text; + ucRoomType.btnRoomType.Name = name; + ucRoomType.btnRoomType.Click += clickEvent; + flpRoomTypes.Controls.Add(ucRoomType); + } + + private void btnRoomType_Click(object? sender, EventArgs e) { if (sender is UIButton button) { @@ -200,7 +236,7 @@ namespace EOM.TSHotelManager.FormUI } } - private void btnAll_Click(object sender, EventArgs e) + private void btnAll_Click(object? sender, EventArgs e) { LoadData(); } @@ -225,7 +261,7 @@ namespace EOM.TSHotelManager.FormUI UIMessageBox.ShowError("SelectRoomAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } - romsty = HttpHelper.JsonToList(result.message); + romsty = HttpHelper.JsonToList(result.message!)!; } else { @@ -239,7 +275,7 @@ namespace EOM.TSHotelManager.FormUI UIMessageBox.ShowError("SelectRoomByTypeName+接口服务异常，请提交Issue或尝试更新版本！"); return; } - romsty = HttpHelper.JsonToList(result.message); + romsty = HttpHelper.JsonToList(result.message!)!; } for (int i = 0; i < romsty.Count; i++) { @@ -271,7 +307,7 @@ namespace EOM.TSHotelManager.FormUI UIMessageBox.ShowError("SelectRoomByRoomState+接口服务异常，请提交Issue或尝试更新版本！"); return; } - romsty = HttpHelper.JsonToList(result.message); + romsty = HttpHelper.JsonToList(result.message!)!; for (int i = 0; i < romsty.Count; i++) { room = new ucRoom(); diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.cs index 5add2b925f789a1651de042ab2d749fa4f2cd2fc..8c629da458becd6bb93d11a9b844205067ab8ca9 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -23,11 +23,9 @@ */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; namespace EOM.TSHotelManager.FormUI.AppFunction { @@ -57,7 +55,7 @@ namespace EOM.TSHotelManager.FormUI.AppFunction { room = new ucRoom(); room.btnRoom.Text = string.Format("{0}\n\n{1}\n\n{2}", rooms[i].RoomName, rooms[i].RoomNo, rooms[i].CustoName); - room.lblMark = string.Empty; + room.lblMark = "Mark"; room.romRoomInfo = rooms[i]; flpRoom.Controls.Add(room); } diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.cs index f1ae670845f600047d3f976b4c8e20947fba5f4a..1f1915a42e64ec3bff2c9f1cce7b0e84d9d74e56 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,11 +22,9 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; namespace EOM.TSHotelManager.FormUI { @@ -84,6 +82,7 @@ namespace EOM.TSHotelManager.FormUI { UIMessageBox.Show("房间" + txtRoomNo.Text + "成功修改为" + cboState.Text, "修改提示", UIStyle.Green); FrmRoomManager.Reload(""); + FrmRoomManager._RefreshRoomCount(); this.Close(); } else diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.cs index a0c26ecafb6b27bfb65ae5c8da1568fa97978fe7..71e0845a43469e9af0799c5411dad8063c734fdb 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,12 +22,9 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using EOM.TSHotelManager.FormUI.AppUserControls; -using System; -using System.Collections.Generic; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.cs index 2eadef8fda2dc529065bf41196f0f6934186fd8d..029b4477bdfcc84968451d9d2576ab320058d3c2 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,15 +22,10 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using jvncorelib.EntityLib; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Linq; -using System.Windows.Forms; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.cs index c8d0f9d24921431063f4121988dcebfb92225cb7..27df2e748b2e533ba095d60bb482fc2f0538a80e 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,13 +22,9 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.cs index ab64efa6da3b2db8e189796cae3f5aede5585735..ffa64f785a4042323de4e9006df740562a2586ba 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -23,7 +23,6 @@ */ using Sunny.UI; -using System; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.cs index 75e12293bb5295f6a39653618e76bca0fbbd482d..3d5ac9429634ac6903e06fa4838f093d4044f59a 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,15 +22,11 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; using System.Runtime.InteropServices; -using System.Windows.Forms; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.cs index 9fa13f9436679a872559270831eb36c5f3b8aa84..45fffe10596d3e9fcbaaadbfa54d992c443ec032 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,13 +22,10 @@ * */ -using EOM.TSHotelManager.Common.Core; -using Sunny.UI; using EOM.TSHotelManager.Common; +using EOM.TSHotelManager.Common.Core; using EOM.TSHotelManager.FormUI.Properties; -using System; -using System.Collections.Generic; -using System.Linq; +using Sunny.UI; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.cs index b5f23deb3c07a97081a7fae8d1eeb9cddcd3eda2..b6628f0132406b3a812de3cbdbb47ddcf0ea0de1 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,12 +22,9 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.Windows.Forms; namespace EOM.TSHotelManager.FormUI { @@ -61,7 +58,7 @@ namespace EOM.TSHotelManager.FormUI /// private void LoadWtiInfo() { - result = HttpHelper.Request("Wti/SelectWtiInfoAll"); + result = HttpHelper.Request("HydroelectricPower/SelectWtiInfoAll"); if (result.statusCode != 200) { UIMessageTip.ShowError("SelectWtiInfoAll+接口服务异常，请提交issue"); @@ -87,7 +84,7 @@ namespace EOM.TSHotelManager.FormUI Record = AdminInfo.Account, datachg_usr = AdminInfo.Account, }; - result = HttpHelper.Request("Wti/UpdateWtiInfo", HttpHelper.ModelToJson(wti)); + result = HttpHelper.Request("HydroelectricPower/UpdateWtiInfo", HttpHelper.ModelToJson(wti)); if (result.statusCode != 200) { UIMessageTip.ShowError("UpdateWtiInfo+接口服务异常，请提交issue"); diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.cs index 3c6d07b4cdacd90164b811c2367dba7654cb5864..13e5de2ec56ed3a1442a3311b7887a74b9e1f8d2 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,11 +22,9 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.cs index 1aaeda81dfd87c1093c50e957d6216f5c5430a68..eab5f26bf5bb6cbe8a51e9473abbf93347a2d0c3 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,14 +22,10 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using jvncorelib.EncryptorLib; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.cs index e469c39ae3ca56cb4e8dc2665c9fca64bf63a0ac..75e0f1c1acc200c1a9fa49d688f2194f7e809ec4 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,12 +22,9 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.Windows.Forms; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.cs index ae2355ed4290429ebf4c216b915ec25de5a5055d..ddb6567c8ab529930c187c058de0ace18cf75f07 100644 --- a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,14 +22,10 @@ * */ -using EOM.TSHotelManager.Common.Core; -using Sunny.UI; using EOM.TSHotelManager.Common; +using EOM.TSHotelManager.Common.Core; using EOM.TSHotelManager.FormUI.Properties; -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Windows.Forms; +using Sunny.UI; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.cs b/EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.cs index dec24a9a6c9871e070caac8c5607ac1c8ade1fdb..02b3461ad4d815caa5e755e747fd2a0a43ae4372 100644 --- a/EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.cs +++ b/EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -22,21 +22,21 @@ * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using jvncorelib.EncryptorLib; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; using System.Text.RegularExpressions; namespace EOM.TSHotelManager.FormUI { public partial class FrmAdminEnter : UIForm { + private LoadingProgress _loadingProgress; public FrmAdminEnter() { InitializeComponent(); + _loadingProgress = new LoadingProgress(); } Dictionary dic = null; @@ -44,6 +44,8 @@ namespace EOM.TSHotelManager.FormUI private void btnCheckIn_Click(object sender, EventArgs e) { + _loadingProgress.Show(); + string account = txtAccount.Text.Trim();//获取超管账号 string pass = txtPassword.Text.Trim();//获取超管密码 if (!CheckInputString(account, pass)) @@ -77,9 +79,9 @@ namespace EOM.TSHotelManager.FormUI #region 获取添加操作日志所需的信息 RecordHelper.Record(AdminInfo.Account + "-" + AdminInfo.Name + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + AdminInfo.SoftwareVersion + "版本登入了后台管理系统！", 3); #endregion - FrmBackgroundSystem fm = new FrmBackgroundSystem(); - fm.ShowDialog(this);//打开主窗体 + FrmBackgroundSystem fm = new FrmBackgroundSystem(this, _loadingProgress); this.Hide();//隐藏登录窗体 + fm.ShowDialog(this);//打开主窗体 } else @@ -89,15 +91,9 @@ namespace EOM.TSHotelManager.FormUI } } - - private void btnCancel_Click(object sender, EventArgs e) - { - this.Close(); - } - private void FrmAdminEnter_Load(object sender, EventArgs e) { - //this.Owner.Hide(); + this.Owner.Hide(); txtAccount.Text = "admin"; txtPassword.Text = "admin"; } diff --git a/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.Designer.cs b/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.Designer.cs index a72e74c2d0a35fd57c990cd8a2a83eb554c270c3..a972fe173fe379ecd5b57a287e985d372bc964e9 100644 --- a/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.Designer.cs @@ -28,146 +28,86 @@ /// private void InitializeComponent() { - this.wbWaiting = new Sunny.UI.UIWaitingBar(); - this.lblTips = new Sunny.UI.UILabel(); - this.uiTitlePanel1 = new Sunny.UI.UITitlePanel(); - this.lblSoftwareNewVersion = new Sunny.UI.UILabel(); - this.lblDllVersion = new Sunny.UI.UILabel(); - this.lblSoftwareVersion = new Sunny.UI.UILabel(); - this.uiLabel4 = new Sunny.UI.UILabel(); - this.uiLabel3 = new Sunny.UI.UILabel(); - this.uiLabel2 = new Sunny.UI.UILabel(); - this.uiTitlePanel1.SuspendLayout(); - this.SuspendLayout(); - // - // wbWaiting - // - this.wbWaiting.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.wbWaiting.Font = new System.Drawing.Font("微软雅黑", 12F); - this.wbWaiting.Location = new System.Drawing.Point(12, 40); - this.wbWaiting.MinimumSize = new System.Drawing.Size(70, 23); - this.wbWaiting.Name = "wbWaiting"; - this.wbWaiting.Size = new System.Drawing.Size(556, 23); - this.wbWaiting.TabIndex = 0; - this.wbWaiting.Text = "uiWaitingBar1"; + lblTips = new Sunny.UI.UILabel(); + uiTitlePanel1 = new Sunny.UI.UITitlePanel(); + lblSoftwareVersion = new Sunny.UI.UILabel(); + uiLabel2 = new Sunny.UI.UILabel(); + uiTitlePanel1.SuspendLayout(); + SuspendLayout(); // // lblTips // - this.lblTips.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblTips.Location = new System.Drawing.Point(108, 80); - this.lblTips.Name = "lblTips"; - this.lblTips.Size = new System.Drawing.Size(364, 23); - this.lblTips.TabIndex = 1; - this.lblTips.Text = "检测新版本中，请让计算机保持联网状态....."; - this.lblTips.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + lblTips.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + lblTips.ForeColor = Color.FromArgb(48, 48, 48); + lblTips.Location = new Point(44, 51); + lblTips.Name = "lblTips"; + lblTips.Size = new Size(247, 23); + lblTips.TabIndex = 1; + lblTips.Text = "检测新版本中，请让计算机保持联网状态....."; + lblTips.TextAlign = ContentAlignment.MiddleCenter; // // uiTitlePanel1 // - this.uiTitlePanel1.Controls.Add(this.lblSoftwareNewVersion); - this.uiTitlePanel1.Controls.Add(this.lblDllVersion); - this.uiTitlePanel1.Controls.Add(this.lblSoftwareVersion); - this.uiTitlePanel1.Controls.Add(this.uiLabel4); - this.uiTitlePanel1.Controls.Add(this.uiLabel3); - this.uiTitlePanel1.Controls.Add(this.uiLabel2); - this.uiTitlePanel1.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiTitlePanel1.ForeColor = System.Drawing.Color.White; - this.uiTitlePanel1.Location = new System.Drawing.Point(166, 120); - this.uiTitlePanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.uiTitlePanel1.MinimumSize = new System.Drawing.Size(1, 1); - this.uiTitlePanel1.Name = "uiTitlePanel1"; - this.uiTitlePanel1.Padding = new System.Windows.Forms.Padding(0, 25, 0, 0); - this.uiTitlePanel1.ShowCollapse = true; - this.uiTitlePanel1.Size = new System.Drawing.Size(247, 124); - this.uiTitlePanel1.TabIndex = 2; - this.uiTitlePanel1.Text = "软件版本信息"; - this.uiTitlePanel1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; - this.uiTitlePanel1.TitleHeight = 25; - // - // lblSoftwareNewVersion - // - this.lblSoftwareNewVersion.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblSoftwareNewVersion.Location = new System.Drawing.Point(122, 93); - this.lblSoftwareNewVersion.Name = "lblSoftwareNewVersion"; - this.lblSoftwareNewVersion.Size = new System.Drawing.Size(111, 23); - this.lblSoftwareNewVersion.TabIndex = 8; - this.lblSoftwareNewVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // lblDllVersion - // - this.lblDllVersion.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblDllVersion.Location = new System.Drawing.Point(122, 63); - this.lblDllVersion.Name = "lblDllVersion"; - this.lblDllVersion.Size = new System.Drawing.Size(111, 23); - this.lblDllVersion.TabIndex = 7; - this.lblDllVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + uiTitlePanel1.Controls.Add(lblSoftwareVersion); + uiTitlePanel1.Controls.Add(uiLabel2); + uiTitlePanel1.Font = new Font("微软雅黑", 12F); + uiTitlePanel1.ForeColor = Color.White; + uiTitlePanel1.Location = new Point(44, 91); + uiTitlePanel1.Margin = new Padding(4, 5, 4, 5); + uiTitlePanel1.MinimumSize = new Size(1, 1); + uiTitlePanel1.Name = "uiTitlePanel1"; + uiTitlePanel1.Padding = new Padding(0, 25, 0, 0); + uiTitlePanel1.ShowCollapse = true; + uiTitlePanel1.ShowText = false; + uiTitlePanel1.Size = new Size(247, 66); + uiTitlePanel1.TabIndex = 2; + uiTitlePanel1.Text = "软件版本信息"; + uiTitlePanel1.TextAlignment = ContentAlignment.MiddleCenter; + uiTitlePanel1.TitleHeight = 25; // // lblSoftwareVersion // - this.lblSoftwareVersion.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblSoftwareVersion.Location = new System.Drawing.Point(123, 33); - this.lblSoftwareVersion.Name = "lblSoftwareVersion"; - this.lblSoftwareVersion.Size = new System.Drawing.Size(110, 23); - this.lblSoftwareVersion.TabIndex = 6; - this.lblSoftwareVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // uiLabel4 - // - this.uiLabel4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiLabel4.Location = new System.Drawing.Point(14, 93); - this.uiLabel4.Name = "uiLabel4"; - this.uiLabel4.Size = new System.Drawing.Size(111, 23); - this.uiLabel4.TabIndex = 5; - this.uiLabel4.Text = "程序最新版本号："; - this.uiLabel4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // uiLabel3 - // - this.uiLabel3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiLabel3.Location = new System.Drawing.Point(14, 63); - this.uiLabel3.Name = "uiLabel3"; - this.uiLabel3.Size = new System.Drawing.Size(111, 23); - this.uiLabel3.TabIndex = 4; - this.uiLabel3.Text = "本地链库版本号："; - this.uiLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + lblSoftwareVersion.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + lblSoftwareVersion.ForeColor = Color.FromArgb(48, 48, 48); + lblSoftwareVersion.Location = new Point(123, 33); + lblSoftwareVersion.Name = "lblSoftwareVersion"; + lblSoftwareVersion.Size = new Size(110, 23); + lblSoftwareVersion.TabIndex = 6; + lblSoftwareVersion.TextAlign = ContentAlignment.MiddleLeft; // // uiLabel2 // - this.uiLabel2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiLabel2.Location = new System.Drawing.Point(15, 33); - this.uiLabel2.Name = "uiLabel2"; - this.uiLabel2.Size = new System.Drawing.Size(110, 23); - this.uiLabel2.TabIndex = 3; - this.uiLabel2.Text = "本地程序版本号："; - this.uiLabel2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + uiLabel2.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiLabel2.ForeColor = Color.FromArgb(48, 48, 48); + uiLabel2.Location = new Point(15, 33); + uiLabel2.Name = "uiLabel2"; + uiLabel2.Size = new Size(110, 23); + uiLabel2.TabIndex = 3; + uiLabel2.Text = "本地程序版本号："; + uiLabel2.TextAlign = ContentAlignment.MiddleCenter; // // FrmLoading // - this.AllowShowTitle = false; - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(580, 256); - this.Controls.Add(this.uiTitlePanel1); - this.Controls.Add(this.lblTips); - this.Controls.Add(this.wbWaiting); - this.Name = "FrmLoading"; - this.Padding = new System.Windows.Forms.Padding(0); - this.ShowTitle = false; - this.Text = "FrmLoading"; - this.Load += new System.EventHandler(this.FrmLoading_Load); - this.uiTitlePanel1.ResumeLayout(false); - this.ResumeLayout(false); - + AllowShowTitle = false; + AutoScaleMode = AutoScaleMode.None; + ClientSize = new Size(335, 180); + Controls.Add(uiTitlePanel1); + Controls.Add(lblTips); + Name = "FrmLoading"; + Padding = new Padding(0); + ShowTitle = false; + Text = "FrmLoading"; + ZoomScaleRect = new Rectangle(15, 15, 580, 256); + Load += FrmLoading_Load; + uiTitlePanel1.ResumeLayout(false); + ResumeLayout(false); } #endregion - - private Sunny.UI.UIWaitingBar wbWaiting; private Sunny.UI.UILabel lblTips; private Sunny.UI.UITitlePanel uiTitlePanel1; - private Sunny.UI.UILabel lblSoftwareNewVersion; private Sunny.UI.UILabel lblDllVersion; private Sunny.UI.UILabel lblSoftwareVersion; - private Sunny.UI.UILabel uiLabel4; private Sunny.UI.UILabel uiLabel3; private Sunny.UI.UILabel uiLabel2; } diff --git a/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.cs b/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.cs index 680469a643412d31e757ad8cbae5c51e28d39c2f..ce8343bbb6c150ea98cd8136cf197c83be87da98 100644 --- a/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.cs +++ b/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -21,31 +21,203 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; +using Newtonsoft.Json; using Sunny.UI; -using EOM.TSHotelManager.Common; -using System; +using System.Diagnostics; using System.Reflection; -using System.Threading; -using System.Windows.Forms; -using Sunny.UI.Win32; namespace EOM.TSHotelManager.FormUI { public partial class FrmLoading : UIForm { + private string CurrentVersion => ApplicationUtil.GetApplicationVersion().ToString(); + private string GithubRepoUrl = "https://api.github.com/repos/easy-open-meta/TopskyHotelManagerSystem/releases/latest"; + private string FileName { get; set; } + private string CurrentExecutablePath => Application.ExecutablePath; + private string CurrentExecutableName => Path.GetFileName(CurrentExecutablePath); + private string FallbackUrl = "https://pan.gkhive.com/TS%E9%85%92%E5%BA%97%E7%AE%A1%E7%90%86%E7%B3%BB%E7%BB%9F%E7%89%88%E6%9C%AC%E5%BA%93"; + + private ProgressBar progressBar; + public FrmLoading() { InitializeComponent(); + progressBar = new ProgressBar + { + Minimum = 0, + Maximum = 100, + Dock = DockStyle.Top + }; + this.Controls.Add(progressBar); + } + + private async void CheckForUpdate() + { + try + { + using var client = new HttpClient { Timeout = TimeSpan.FromSeconds(10) }; + client.DefaultRequestHeaders.Add("User-Agent", await GetDefaultUserAgentAsync()); + var response = await client.GetAsync(GithubRepoUrl); + + if (response.IsSuccessStatusCode) + { + var result = await response.Content.ReadAsStringAsync(); + var release = JsonConvert.DeserializeObject(result); + + var latestVersion = release!.TagName.Replace("v", "", StringComparison.OrdinalIgnoreCase); + var currentVersion = CurrentVersion.Replace("v", "", StringComparison.OrdinalIgnoreCase); + + var versionCompareResult = string.Compare(latestVersion, currentVersion, StringComparison.OrdinalIgnoreCase); + + if (versionCompareResult > 0) + { + var updateAsset = release.Assets.FirstOrDefault(a => a.Name.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)); + if (updateAsset != null) + { + FileName = $"{updateAsset.Name}_{DateTime.Now.ToString("yyyyMMddHHmmsss")}"; + var isUpdated = await DownloadAndInstallUpdate(updateAsset.BrowserDownloadUrl, updateAsset.Name, new Progress(ReportProgress)); + if (isUpdated) + { + UIMessageBox.ShowWarning("旧版已停止使用，稍后将自动下载最新发行版！"); + ExitApplication(); + } + else + { + UIMessageBox.ShowWarning("更新失败，请手动下载最新版本。"); + } + } + else + { + UIMessageBox.ShowWarning("最新版本中未找到可更新的 .exe 文件。"); + } + } + else if (versionCompareResult == 0) + { + UIMessageBox.ShowInfo("当前已为最新版本，无需更新！"); + await Task.Run(() => threadPro()); + } + } + else + { + UIMessageBox.Show("无法获取最新版本信息，请检查网络连接。"); + ExitApplication(); + } + } + catch (OperationCanceledException) + { + UIMessageBox.Show("网络连接超时，无法检查更新。即将跳转到网盘版本库"); + OpenFallbackUrl(); + ExitApplication(); + } + catch (Exception ex) + { + UIMessageBox.Show($"检查更新时发生错误: {ex.Message}"); + } + } + + private async Task GetDefaultUserAgentAsync() + { + using var webBrowser = new WebBrowser(); + webBrowser.ScriptErrorsSuppressed = true; + var tcs = new TaskCompletionSource(); + webBrowser.DocumentCompleted += (sender, e) => tcs.TrySetResult(true); + + webBrowser.Navigate(FallbackUrl); + + await tcs.Task; + + string? userAgent = webBrowser.Document?.InvokeScript("eval", new object[] { "navigator.userAgent;" })?.ToString(); + return userAgent ?? string.Empty; + } + + private async Task DownloadAndInstallUpdate(string downloadUrl, string fileName, IProgress progress) + { + try + { + using var client = new HttpClient { Timeout = TimeSpan.FromSeconds(10) }; + var tempFilePath = Path.Combine(Path.GetTempPath(), fileName); + + var response = await client.GetAsync(downloadUrl, HttpCompletionOption.ResponseHeadersRead); + var contentLength = response.Content.Headers.ContentLength; + + using var fileStream = new FileStream(tempFilePath, FileMode.Create, FileAccess.Write, FileShare.None); + using var stream = await response.Content.ReadAsStreamAsync(); + + var totalBytesRead = 0L; + var buffer = new byte[8192]; + int bytesRead; + + while ((bytesRead = await stream.ReadAsync(buffer, 0, buffer.Length)) > 0) + { + await fileStream.WriteAsync(buffer, 0, bytesRead); + totalBytesRead += bytesRead; + + if (contentLength.HasValue) + { + var progressPercentage = (double)totalBytesRead / contentLength.Value * 100; + progress.Report(progressPercentage); + } + } + + Process.Start(new ProcessStartInfo + { + FileName = "explorer.exe", + Arguments = $"/select, \"{tempFilePath}\"", + UseShellExecute = false, + CreateNoWindow = true + }); + + ExitApplication(); + + return true; + } + catch (OperationCanceledException) + { + UIMessageBox.Show("网络连接超时，无法下载更新。"); + OpenFallbackUrl(); + } + catch (Exception ex) + { + UIMessageBox.Show($"下载更新时发生错误: {ex.Message}"); + OpenFallbackUrl(); + } + return false; + } + + private void ReportProgress(double percentage) + { + if (InvokeRequired) + { + Invoke(new Action(ReportProgress), percentage); + } + else + { + progressBar.Value = (int)percentage; + } + } + + private void OpenFallbackUrl() + { + try + { + Process.Start(new ProcessStartInfo + { + FileName = FallbackUrl, + UseShellExecute = true + }); + } + catch (Exception ex) + { + UIMessageBox.Show($"打开浏览器时发生错误: {ex.Message}"); + } } private void FrmLoading_Load(object sender, EventArgs e) { lblSoftwareVersion.Text = ApplicationUtil.GetApplicationVersion().ToString(); - lblDllVersion.Text = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(); - CheckUpdate(); - //Thread thread2 = new Thread(threadPro);//创建新线程 - //thread2.Start(); + CheckForUpdate(); } public void threadPro() @@ -61,40 +233,31 @@ namespace EOM.TSHotelManager.FormUI this.Close(); } - ResponseMsg result = new ResponseMsg(); + private void FrmLoading_FormClosing(object sender, FormClosingEventArgs e) + { + } - #region 判断版本号 - private void CheckUpdate() + private void ExitApplication() { - result = HttpHelper.Request("App/CheckBaseVersion"); - if (result.statusCode != 200) - { - UIMessageBox.ShowError("CheckBaseVersion+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - var newversion = HttpHelper.JsonToModel(result.message); + Application.Exit(); + } - var targetVersion = new System.Version(newversion.base_version); - var assembly = Assembly.GetExecutingAssembly(); - var currentVersion = assembly.GetName().Version; + public class GitHubRelease + { + [JsonProperty("tag_name")] + public string TagName { get; set; } - if (!currentVersion!.Equals(targetVersion)) - { - lblTips.Text = "旧版已停止使用，请到github或gitee仓库更新最新发行版！"; - System.Windows.Forms.Application.Exit(); - this.Visible = false; - //调用系统默认的浏览器 - System.Diagnostics.Process.Start("https://gitee.com/java-and-net/TopskyHotelManagerSystem/releases"); - } - else - { - lblSoftwareNewVersion.Text = newversion.base_version; - lblTips.Text = "当前已为最新版本，无需更新！"; - Thread thread2 = new Thread(threadPro);//创建新线程 - thread2.Start(); - } + [JsonProperty("assets")] + public List Assets { get; set; } } - #endregion + public class GitHubAsset + { + [JsonProperty("name")] + public string Name { get; set; } + + [JsonProperty("browser_download_url")] + public string BrowserDownloadUrl { get; set; } + } } } diff --git a/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.resx b/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.resx index 1af7de150c99c12dd67a509fe57c10d63e4eeb04..8b2ff64a11300290ddac7e7d9bc26e5e0a766508 100644 --- a/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.resx +++ b/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.resx @@ -1,17 +1,17 @@  - diff --git a/EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.cs b/EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.cs index 39a44aa94c5cd2a19c9f5cd16f282766596ca0b6..04e8630b03ec42eeedbc7512c920f5f7119e8e71 100644 --- a/EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.cs +++ b/EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -23,24 +23,20 @@ */ using AntdUI; -using EOM.TSHotelManager.Common.Core; -using Sunny.UI; using EOM.TSHotelManager.Common; +using EOM.TSHotelManager.Common.Core; using EOM.TSHotelManager.FormUI.Properties; -using System; -using System.Drawing; -using System.Windows.Forms; -using System.Linq; +using Sunny.UI; namespace EOM.TSHotelManager.FormUI { public partial class FrmLogin : Window { - //FrmStart f = null; - public FrmLogin(/*FrmStart frm*/) + private LoadingProgress _loadingProgress; + public FrmLogin() { InitializeComponent(); - //f = frm; + _loadingProgress = new LoadingProgress(); #region 防止背景闪屏方法 this.DoubleBuffered = true;//设置本窗体 SetStyle(ControlStyles.UserPaint, true); @@ -158,6 +154,7 @@ namespace EOM.TSHotelManager.FormUI #region 登录图片点击事件 private void picLogin_Click(object sender, EventArgs e) { + _loadingProgress.Show(); try { if (CheckInput())//检验输入完整性 @@ -189,10 +186,9 @@ namespace EOM.TSHotelManager.FormUI LoginInfo.WorkerPosition = w.PositionName; LoginInfo.SoftwareVersion = ApplicationUtil.GetApplicationVersion().ToString(); LoginInfo.UserToken = w.user_token; - FrmMain frm = new FrmMain(this); + FrmMain frm = new FrmMain(this, _loadingProgress); this.Hide();//隐藏登录窗体 - frm.ShowDialog();//打开主窗体 - + frm.ShowDialog(this);//打开主窗体 } else { @@ -206,6 +202,9 @@ namespace EOM.TSHotelManager.FormUI //Console.WriteLine(ex); UIMessageBox.Show("服务器维护中，请稍后再试！", "温馨提示", UIStyle.Red); } + finally + { + } } #endregion @@ -213,7 +212,6 @@ namespace EOM.TSHotelManager.FormUI { FrmAdminEnter frmAdminEnter = new FrmAdminEnter(); frmAdminEnter.ShowDialog(this); - this.Close(); } private void picFormSize_MouseDown(object sender, MouseEventArgs e) diff --git a/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.Designer.cs b/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.Designer.cs index 1d5285ccc6723172d78a9ed769d4c6a2f4235be1..edb5a873dcb1efb5eac2ecfbfd3bb4b01e99f700 100644 --- a/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.Designer.cs @@ -29,90 +29,61 @@ namespace EOM.TSHotelManager.FormUI /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("职位类型维护"); - System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("民族类型维护"); - System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("学历类型维护"); - System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("部门信息维护"); - System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("基础信息", new System.Windows.Forms.TreeNode[] { - treeNode1, - treeNode2, - treeNode3, - treeNode4}); - System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("员工工资账单"); - System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("内部财务账单"); - System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("酒店盈利情况"); - System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("财务信息", new System.Windows.Forms.TreeNode[] { - treeNode6, - treeNode7, - treeNode8}); - System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("水电信息"); - System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("水电管理", new System.Windows.Forms.TreeNode[] { - treeNode10}); - System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("监管部门情况"); - System.Windows.Forms.TreeNode treeNode13 = new System.Windows.Forms.TreeNode("监管统计", new System.Windows.Forms.TreeNode[] { - treeNode12}); - System.Windows.Forms.TreeNode treeNode14 = new System.Windows.Forms.TreeNode("房态图一览"); - System.Windows.Forms.TreeNode treeNode15 = new System.Windows.Forms.TreeNode("新增客房"); - System.Windows.Forms.TreeNode treeNode16 = new System.Windows.Forms.TreeNode("客房配置"); - System.Windows.Forms.TreeNode treeNode17 = new System.Windows.Forms.TreeNode("客房管理", new System.Windows.Forms.TreeNode[] { - treeNode14, - treeNode15, - treeNode16}); - System.Windows.Forms.TreeNode treeNode18 = new System.Windows.Forms.TreeNode("会员等级规则"); - System.Windows.Forms.TreeNode treeNode19 = new System.Windows.Forms.TreeNode("客户信息管理"); - System.Windows.Forms.TreeNode treeNode20 = new System.Windows.Forms.TreeNode("顾客消费账单"); - System.Windows.Forms.TreeNode treeNode21 = new System.Windows.Forms.TreeNode("客户管理", new System.Windows.Forms.TreeNode[] { - treeNode18, - treeNode19, - treeNode20}); - System.Windows.Forms.TreeNode treeNode22 = new System.Windows.Forms.TreeNode("员工管理"); - System.Windows.Forms.TreeNode treeNode23 = new System.Windows.Forms.TreeNode("公告日志"); - System.Windows.Forms.TreeNode treeNode24 = new System.Windows.Forms.TreeNode("上传公告日志"); - System.Windows.Forms.TreeNode treeNode25 = new System.Windows.Forms.TreeNode("人事管理", new System.Windows.Forms.TreeNode[] { - treeNode22, - treeNode23, - treeNode24}); - System.Windows.Forms.TreeNode treeNode26 = new System.Windows.Forms.TreeNode("商品管理"); - System.Windows.Forms.TreeNode treeNode27 = new System.Windows.Forms.TreeNode("仓库物资"); - System.Windows.Forms.TreeNode treeNode28 = new System.Windows.Forms.TreeNode("物资管理", new System.Windows.Forms.TreeNode[] { - treeNode26, - treeNode27}); - System.Windows.Forms.TreeNode treeNode29 = new System.Windows.Forms.TreeNode("员工操作日志"); - System.Windows.Forms.TreeNode treeNode30 = new System.Windows.Forms.TreeNode("添加管理员"); - System.Windows.Forms.TreeNode treeNode31 = new System.Windows.Forms.TreeNode("权限分配"); - System.Windows.Forms.TreeNode treeNode32 = new System.Windows.Forms.TreeNode("启/禁用管理员"); - System.Windows.Forms.TreeNode treeNode33 = new System.Windows.Forms.TreeNode("系统模块管理"); - System.Windows.Forms.TreeNode treeNode34 = new System.Windows.Forms.TreeNode("系统管理", new System.Windows.Forms.TreeNode[] { - treeNode30, - treeNode31, - treeNode32, - treeNode33}); + components = new System.ComponentModel.Container(); + TreeNode treeNode1 = new TreeNode("职位类型维护"); + TreeNode treeNode2 = new TreeNode("民族类型维护"); + TreeNode treeNode3 = new TreeNode("学历类型维护"); + TreeNode treeNode4 = new TreeNode("部门信息维护"); + TreeNode treeNode5 = new TreeNode("基础信息", new TreeNode[] { treeNode1, treeNode2, treeNode3, treeNode4 }); + TreeNode treeNode6 = new TreeNode("内部财务账单"); + TreeNode treeNode7 = new TreeNode("财务信息", new TreeNode[] { treeNode6 }); + TreeNode treeNode8 = new TreeNode("水电信息"); + TreeNode treeNode9 = new TreeNode("水电管理", new TreeNode[] { treeNode8 }); + TreeNode treeNode10 = new TreeNode("监管部门情况"); + TreeNode treeNode11 = new TreeNode("监管统计", new TreeNode[] { treeNode10 }); + TreeNode treeNode12 = new TreeNode("房态图一览"); + TreeNode treeNode13 = new TreeNode("新增客房"); + TreeNode treeNode14 = new TreeNode("客房配置"); + TreeNode treeNode15 = new TreeNode("客房管理", new TreeNode[] { treeNode12, treeNode13, treeNode14 }); + TreeNode treeNode16 = new TreeNode("会员等级规则"); + TreeNode treeNode17 = new TreeNode("客户信息管理"); + TreeNode treeNode18 = new TreeNode("顾客消费账单"); + TreeNode treeNode19 = new TreeNode("客户管理", new TreeNode[] { treeNode16, treeNode17, treeNode18 }); + TreeNode treeNode20 = new TreeNode("员工管理"); + TreeNode treeNode21 = new TreeNode("人事管理", new TreeNode[] { treeNode20 }); + TreeNode treeNode22 = new TreeNode("商品管理"); + TreeNode treeNode23 = new TreeNode("物资管理", new TreeNode[] { treeNode22 }); + TreeNode treeNode24 = new TreeNode("员工操作日志"); + TreeNode treeNode25 = new TreeNode("添加管理员"); + TreeNode treeNode26 = new TreeNode("权限分配"); + TreeNode treeNode27 = new TreeNode("启/禁用管理员"); + TreeNode treeNode28 = new TreeNode("系统模块管理"); + TreeNode treeNode29 = new TreeNode("系统管理", new TreeNode[] { treeNode25, treeNode26, treeNode27, treeNode28 }); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmBackgroundSystem)); - this.Aside = new Sunny.UI.UINavMenu(); - this.pnlForm = new Sunny.UI.UIPanel(); - this.uiLabel1 = new Sunny.UI.UILabel(); - this.lblScroll = new Sunny.UI.UIScrollingText(); - this.lbTime = new Sunny.UI.UILabel(); - this.timer1 = new System.Windows.Forms.Timer(this.components); - this.cmsMenu = new Sunny.UI.UIContextMenuStrip(); - this.tsmiUpdatePwd = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.btnSetting = new Sunny.UI.UIButton(); - this.btnLocked = new Sunny.UI.UIButton(); - this.cmsMenu.SuspendLayout(); - this.SuspendLayout(); + Aside = new Sunny.UI.UINavMenu(); + pnlForm = new Sunny.UI.UIPanel(); + uiLabel1 = new Sunny.UI.UILabel(); + lblScroll = new Sunny.UI.UIScrollingText(); + lbTime = new Sunny.UI.UILabel(); + timer1 = new System.Windows.Forms.Timer(components); + cmsMenu = new Sunny.UI.UIContextMenuStrip(); + tsmiUpdatePwd = new ToolStripMenuItem(); + toolStripSeparator1 = new ToolStripSeparator(); + btnSetting = new Sunny.UI.UIButton(); + btnLocked = new Sunny.UI.UIButton(); + cmsMenu.SuspendLayout(); + SuspendLayout(); // // Aside // - this.Aside.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.Aside.DrawMode = System.Windows.Forms.TreeViewDrawMode.OwnerDrawText; - this.Aside.Font = new System.Drawing.Font("微软雅黑", 12F); - this.Aside.FullRowSelect = true; - this.Aside.ItemHeight = 50; - this.Aside.Location = new System.Drawing.Point(6, 87); - this.Aside.MenuStyle = Sunny.UI.UIMenuStyle.Custom; - this.Aside.Name = "Aside"; + Aside.BorderStyle = BorderStyle.None; + Aside.DrawMode = TreeViewDrawMode.OwnerDrawText; + Aside.Font = new Font("微软雅黑", 12F); + Aside.FullRowSelect = true; + Aside.ItemHeight = 50; + Aside.Location = new Point(6, 87); + Aside.MenuStyle = Sunny.UI.UIMenuStyle.Custom; + Aside.Name = "Aside"; treeNode1.Name = "节点1"; treeNode1.Text = "职位类型维护"; treeNode2.Name = "节点2"; @@ -123,240 +94,215 @@ namespace EOM.TSHotelManager.FormUI treeNode4.Text = "部门信息维护"; treeNode5.Name = "BaseInfo"; treeNode5.Text = "基础信息"; - treeNode6.Name = "节点0"; - treeNode6.Text = "员工工资账单"; - treeNode7.Name = "节点1"; - treeNode7.Text = "内部财务账单"; - treeNode8.Name = "节点2"; - treeNode8.Text = "酒店盈利情况"; - treeNode9.Name = "CashInfo"; - treeNode9.Text = "财务信息"; - treeNode10.Name = "节点0"; - treeNode10.Text = "水电信息"; - treeNode11.Name = "WtiInfo"; - treeNode11.Text = "水电管理"; - treeNode12.Name = "节点3"; - treeNode12.Text = "监管部门情况"; - treeNode13.Name = "CheckInfo"; - treeNode13.Text = "监管统计"; - treeNode14.Name = "节点6"; - treeNode14.Text = "房态图一览"; - treeNode15.Name = "节点7"; - treeNode15.Text = "新增客房"; + treeNode6.Name = "节点1"; + treeNode6.Text = "内部财务账单"; + treeNode7.Name = "CashInfo"; + treeNode7.Text = "财务信息"; + treeNode8.Name = "节点0"; + treeNode8.Text = "水电信息"; + treeNode9.Name = "WtiInfo"; + treeNode9.Text = "水电管理"; + treeNode10.Name = "节点3"; + treeNode10.Text = "监管部门情况"; + treeNode11.Name = "CheckInfo"; + treeNode11.Text = "监管统计"; + treeNode12.Name = "节点6"; + treeNode12.Text = "房态图一览"; + treeNode13.Name = "节点7"; + treeNode13.Text = "新增客房"; + treeNode14.Name = "节点0"; + treeNode14.Text = "客房配置"; + treeNode15.Name = "RoomManager"; + treeNode15.Text = "客房管理"; treeNode16.Name = "节点0"; - treeNode16.Text = "客房配置"; - treeNode17.Name = "RoomManager"; - treeNode17.Text = "客房管理"; - treeNode18.Name = "节点0"; - treeNode18.Text = "会员等级规则"; - treeNode19.Name = "节点8"; - treeNode19.Text = "客户信息管理"; - treeNode20.Name = "节点9"; - treeNode20.Text = "顾客消费账单"; - treeNode21.Name = "CustomerManager"; - treeNode21.Text = "客户管理"; - treeNode22.Name = "节点6"; - treeNode22.Text = "员工管理"; - treeNode23.Name = "节点15"; - treeNode23.Text = "公告日志"; - treeNode24.Name = "节点16"; - treeNode24.Text = "上传公告日志"; - treeNode25.Name = "HumanResourcesManager"; - treeNode25.Text = "人事管理"; - treeNode26.Name = "节点11"; - treeNode26.Text = "商品管理"; - treeNode27.Name = "节点12"; - treeNode27.Text = "仓库物资"; - treeNode28.Name = "MaterialManager"; - treeNode28.Text = "物资管理"; - treeNode29.Name = "OperationLogManager"; - treeNode29.Text = "员工操作日志"; - treeNode30.Name = "节点2"; - treeNode30.Text = "添加管理员"; - treeNode31.Name = "节点1"; - treeNode31.Text = "权限分配"; - treeNode32.Name = "节点3"; - treeNode32.Text = "启/禁用管理员"; - treeNode33.Name = "节点2"; - treeNode33.Text = "系统模块管理"; - treeNode34.Name = "AdminManager"; - treeNode34.Text = "系统管理"; - this.Aside.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode5, - treeNode9, - treeNode11, - treeNode13, - treeNode17, - treeNode21, - treeNode25, - treeNode28, - treeNode29, - treeNode34}); - this.Aside.ShowLines = false; - this.Aside.Size = new System.Drawing.Size(234, 624); - this.Aside.Style = Sunny.UI.UIStyle.Custom; - this.Aside.TabIndex = 0; - this.Aside.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.Aside.MenuItemClick += new Sunny.UI.UINavMenu.OnMenuItemClick(this.Aside_MenuItemClick); - this.Aside.Enter += new System.EventHandler(this.Aside_Enter); + treeNode16.Text = "会员等级规则"; + treeNode17.Name = "节点8"; + treeNode17.Text = "客户信息管理"; + treeNode18.Name = "节点9"; + treeNode18.Text = "顾客消费账单"; + treeNode19.Name = "CustomerManager"; + treeNode19.Text = "客户管理"; + treeNode20.Name = "节点6"; + treeNode20.Text = "员工管理"; + treeNode21.Name = "HumanResourcesManager"; + treeNode21.Text = "人事管理"; + treeNode22.Name = "节点11"; + treeNode22.Text = "商品管理"; + treeNode23.Name = "MaterialManager"; + treeNode23.Text = "物资管理"; + treeNode24.Name = "OperationLogManager"; + treeNode24.Text = "员工操作日志"; + treeNode25.Name = "节点2"; + treeNode25.Text = "添加管理员"; + treeNode26.Name = "节点1"; + treeNode26.Text = "权限分配"; + treeNode27.Name = "节点3"; + treeNode27.Text = "启/禁用管理员"; + treeNode28.Name = "节点2"; + treeNode28.Text = "系统模块管理"; + treeNode29.Name = "AdminManager"; + treeNode29.Text = "系统管理"; + Aside.Nodes.AddRange(new TreeNode[] { treeNode5, treeNode7, treeNode9, treeNode11, treeNode15, treeNode19, treeNode21, treeNode23, treeNode24, treeNode29 }); + Aside.ShowLines = false; + Aside.Size = new Size(234, 624); + Aside.Style = Sunny.UI.UIStyle.Custom; + Aside.TabIndex = 0; + Aside.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + Aside.MenuItemClick += Aside_MenuItemClick; + Aside.Enter += Aside_Enter; // // pnlForm // - this.pnlForm.Font = new System.Drawing.Font("微软雅黑", 12F); - this.pnlForm.Location = new System.Drawing.Point(247, 88); - this.pnlForm.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.pnlForm.MinimumSize = new System.Drawing.Size(1, 1); - this.pnlForm.Name = "pnlForm"; - this.pnlForm.Size = new System.Drawing.Size(1001, 623); - this.pnlForm.Style = Sunny.UI.UIStyle.Custom; - this.pnlForm.TabIndex = 1; - this.pnlForm.Text = "点击左侧导航栏"; - this.pnlForm.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; + pnlForm.Font = new Font("微软雅黑", 12F); + pnlForm.Location = new Point(247, 88); + pnlForm.Margin = new Padding(4, 5, 4, 5); + pnlForm.MinimumSize = new Size(1, 1); + pnlForm.Name = "pnlForm"; + pnlForm.Size = new Size(1001, 623); + pnlForm.Style = Sunny.UI.UIStyle.Custom; + pnlForm.TabIndex = 1; + pnlForm.Text = "点击左侧导航栏"; + pnlForm.TextAlignment = ContentAlignment.MiddleCenter; // // uiLabel1 // - this.uiLabel1.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - this.uiLabel1.Location = new System.Drawing.Point(250, 44); - this.uiLabel1.Name = "uiLabel1"; - this.uiLabel1.Size = new System.Drawing.Size(217, 35); - this.uiLabel1.Style = Sunny.UI.UIStyle.Custom; - this.uiLabel1.TabIndex = 32; - this.uiLabel1.Text = "早上好，Admin"; - this.uiLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + uiLabel1.Font = new Font("微软雅黑", 12F); + uiLabel1.ForeColor = Color.FromArgb(48, 48, 48); + uiLabel1.Location = new Point(250, 44); + uiLabel1.Name = "uiLabel1"; + uiLabel1.Size = new Size(217, 35); + uiLabel1.Style = Sunny.UI.UIStyle.Custom; + uiLabel1.TabIndex = 32; + uiLabel1.Text = "早上好，Admin"; + uiLabel1.TextAlign = ContentAlignment.MiddleLeft; // // lblScroll // - this.lblScroll.Active = true; - this.lblScroll.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.lblScroll.Font = new System.Drawing.Font("微软雅黑", 12F); - this.lblScroll.Interval = 800; - this.lblScroll.Location = new System.Drawing.Point(473, 41); - this.lblScroll.MinimumSize = new System.Drawing.Size(1, 1); - this.lblScroll.Name = "lblScroll"; - this.lblScroll.Offset = 20; - this.lblScroll.Size = new System.Drawing.Size(693, 42); - this.lblScroll.Style = Sunny.UI.UIStyle.Custom; - this.lblScroll.TabIndex = 33; - this.lblScroll.Text = "欢迎使用TS酒店管理后台安全系统，为了您的账号安全，离开座位请点击右侧锁定键锁定系统确保安全！"; + lblScroll.Active = true; + lblScroll.FillColor = Color.FromArgb(235, 243, 255); + lblScroll.Font = new Font("微软雅黑", 12F); + lblScroll.Interval = 800; + lblScroll.Location = new Point(473, 41); + lblScroll.MinimumSize = new Size(1, 1); + lblScroll.Name = "lblScroll"; + lblScroll.Offset = 20; + lblScroll.Size = new Size(693, 42); + lblScroll.Style = Sunny.UI.UIStyle.Custom; + lblScroll.TabIndex = 33; + lblScroll.Text = "欢迎使用TS酒店管理后台安全系统，为了您的账号安全，离开座位请点击右侧锁定键锁定系统确保安全！"; // // lbTime // - this.lbTime.Font = new System.Drawing.Font("微软雅黑", 12F); - this.lbTime.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - this.lbTime.Location = new System.Drawing.Point(11, 44); - this.lbTime.Name = "lbTime"; - this.lbTime.Size = new System.Drawing.Size(229, 35); - this.lbTime.Style = Sunny.UI.UIStyle.Custom; - this.lbTime.TabIndex = 34; - this.lbTime.Text = "早上好，Admin"; - this.lbTime.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + lbTime.Font = new Font("微软雅黑", 12F); + lbTime.ForeColor = Color.FromArgb(48, 48, 48); + lbTime.Location = new Point(11, 44); + lbTime.Name = "lbTime"; + lbTime.Size = new Size(229, 35); + lbTime.Style = Sunny.UI.UIStyle.Custom; + lbTime.TabIndex = 34; + lbTime.Text = "早上好，Admin"; + lbTime.TextAlign = ContentAlignment.MiddleLeft; // // timer1 // - this.timer1.Enabled = true; - this.timer1.Interval = 1000; - this.timer1.Tick += new System.EventHandler(this.timer1_Tick); + timer1.Enabled = true; + timer1.Interval = 1000; + timer1.Tick += timer1_Tick; // // cmsMenu // - this.cmsMenu.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255))))); - this.cmsMenu.Font = new System.Drawing.Font("微软雅黑", 12F); - this.cmsMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.tsmiUpdatePwd, - this.toolStripSeparator1}); - this.cmsMenu.Name = "cmsMenu"; - this.cmsMenu.Size = new System.Drawing.Size(181, 58); - this.cmsMenu.MouseDown += new System.Windows.Forms.MouseEventHandler(this.cmsMenu_MouseDown); + cmsMenu.BackColor = Color.FromArgb(243, 249, 255); + cmsMenu.Font = new Font("微软雅黑", 12F); + cmsMenu.Items.AddRange(new ToolStripItem[] { tsmiUpdatePwd, toolStripSeparator1 }); + cmsMenu.Name = "cmsMenu"; + cmsMenu.Size = new Size(145, 36); + cmsMenu.MouseDown += cmsMenu_MouseDown; // // tsmiUpdatePwd // - this.tsmiUpdatePwd.Image = global::EOM.TSHotelManager.FormUI.Properties.Resources.修改; - this.tsmiUpdatePwd.Name = "tsmiUpdatePwd"; - this.tsmiUpdatePwd.Size = new System.Drawing.Size(180, 26); - this.tsmiUpdatePwd.Text = "修改密码"; - this.tsmiUpdatePwd.Click += new System.EventHandler(this.tsmiUpdatePwd_Click); + tsmiUpdatePwd.Image = Properties.Resources.修改; + tsmiUpdatePwd.Name = "tsmiUpdatePwd"; + tsmiUpdatePwd.Size = new Size(144, 26); + tsmiUpdatePwd.Text = "修改密码"; + tsmiUpdatePwd.Click += tsmiUpdatePwd_Click; // // toolStripSeparator1 // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6); + toolStripSeparator1.Name = "toolStripSeparator1"; + toolStripSeparator1.Size = new Size(141, 6); // // btnSetting // - this.btnSetting.BackColor = System.Drawing.Color.Transparent; - this.btnSetting.BackgroundImage = global::EOM.TSHotelManager.FormUI.Properties.Resources.settings2; - this.btnSetting.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.btnSetting.Cursor = System.Windows.Forms.Cursors.Arrow; - this.btnSetting.FillColor = System.Drawing.Color.Transparent; - this.btnSetting.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnSetting.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(111)))), ((int)(((byte)(168)))), ((int)(((byte)(255))))); - this.btnSetting.ForeHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(111)))), ((int)(((byte)(168)))), ((int)(((byte)(255))))); - this.btnSetting.ForePressColor = System.Drawing.Color.FromArgb(((int)(((byte)(111)))), ((int)(((byte)(168)))), ((int)(((byte)(255))))); - this.btnSetting.ForeSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(111)))), ((int)(((byte)(168)))), ((int)(((byte)(255))))); - this.btnSetting.Location = new System.Drawing.Point(1172, 45); - this.btnSetting.MinimumSize = new System.Drawing.Size(1, 1); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Radius = 20; - this.btnSetting.Size = new System.Drawing.Size(35, 35); - this.btnSetting.Style = Sunny.UI.UIStyle.Custom; - this.btnSetting.StyleCustomMode = true; - this.btnSetting.TabIndex = 31; - this.btnSetting.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - this.btnSetting.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnSetting_MouseDown); - this.btnSetting.MouseLeave += new System.EventHandler(this.btnSetting_MouseLeave); - this.btnSetting.MouseHover += new System.EventHandler(this.btnSetting_MouseHover); + btnSetting.BackColor = Color.Transparent; + btnSetting.BackgroundImage = Properties.Resources.settings2; + btnSetting.BackgroundImageLayout = ImageLayout.Stretch; + btnSetting.FillColor = Color.Transparent; + btnSetting.Font = new Font("微软雅黑", 12F); + btnSetting.ForeColor = Color.FromArgb(111, 168, 255); + btnSetting.ForeHoverColor = Color.FromArgb(111, 168, 255); + btnSetting.ForePressColor = Color.FromArgb(111, 168, 255); + btnSetting.ForeSelectedColor = Color.FromArgb(111, 168, 255); + btnSetting.Location = new Point(1172, 45); + btnSetting.MinimumSize = new Size(1, 1); + btnSetting.Name = "btnSetting"; + btnSetting.Radius = 20; + btnSetting.Size = new Size(35, 35); + btnSetting.Style = Sunny.UI.UIStyle.Custom; + btnSetting.StyleCustomMode = true; + btnSetting.TabIndex = 31; + btnSetting.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + btnSetting.Click += btnSetting_Click; + btnSetting.MouseDown += btnSetting_MouseDown; + btnSetting.MouseLeave += btnSetting_MouseLeave; + btnSetting.MouseHover += btnSetting_MouseHover; // // btnLocked // - this.btnLocked.BackColor = System.Drawing.Color.Transparent; - this.btnLocked.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnLocked.BackgroundImage"))); - this.btnLocked.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.btnLocked.Cursor = System.Windows.Forms.Cursors.Arrow; - this.btnLocked.FillColor = System.Drawing.Color.Transparent; - this.btnLocked.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnLocked.ForeHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(111)))), ((int)(((byte)(168)))), ((int)(((byte)(255))))); - this.btnLocked.ForePressColor = System.Drawing.Color.FromArgb(((int)(((byte)(111)))), ((int)(((byte)(168)))), ((int)(((byte)(255))))); - this.btnLocked.ForeSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(111)))), ((int)(((byte)(168)))), ((int)(((byte)(255))))); - this.btnLocked.Location = new System.Drawing.Point(1213, 45); - this.btnLocked.MinimumSize = new System.Drawing.Size(1, 1); - this.btnLocked.Name = "btnLocked"; - this.btnLocked.Radius = 20; - this.btnLocked.Size = new System.Drawing.Size(35, 35); - this.btnLocked.Style = Sunny.UI.UIStyle.Custom; - this.btnLocked.StyleCustomMode = true; - this.btnLocked.TabIndex = 30; - this.btnLocked.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnLocked.Click += new System.EventHandler(this.btnLocked_Click); - this.btnLocked.MouseLeave += new System.EventHandler(this.btnLocked_MouseLeave); - this.btnLocked.MouseHover += new System.EventHandler(this.btnLocked_MouseHover); + btnLocked.BackColor = Color.Transparent; + btnLocked.BackgroundImage = (Image)resources.GetObject("btnLocked.BackgroundImage"); + btnLocked.BackgroundImageLayout = ImageLayout.Zoom; + btnLocked.FillColor = Color.Transparent; + btnLocked.Font = new Font("微软雅黑", 12F); + btnLocked.ForeHoverColor = Color.FromArgb(111, 168, 255); + btnLocked.ForePressColor = Color.FromArgb(111, 168, 255); + btnLocked.ForeSelectedColor = Color.FromArgb(111, 168, 255); + btnLocked.Location = new Point(1213, 45); + btnLocked.MinimumSize = new Size(1, 1); + btnLocked.Name = "btnLocked"; + btnLocked.Radius = 20; + btnLocked.Size = new Size(35, 35); + btnLocked.Style = Sunny.UI.UIStyle.Custom; + btnLocked.StyleCustomMode = true; + btnLocked.TabIndex = 30; + btnLocked.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + btnLocked.Click += btnLocked_Click; + btnLocked.MouseLeave += btnLocked_MouseLeave; + btnLocked.MouseHover += btnLocked_MouseHover; // // FrmBackgroundSystem // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1255, 718); - this.Controls.Add(this.lbTime); - this.Controls.Add(this.lblScroll); - this.Controls.Add(this.uiLabel1); - this.Controls.Add(this.btnSetting); - this.Controls.Add(this.btnLocked); - this.Controls.Add(this.pnlForm); - this.Controls.Add(this.Aside); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.IsForbidAltF4 = true; - this.MaximizeBox = false; - this.Name = "FrmBackgroundSystem"; - this.Style = Sunny.UI.UIStyle.Custom; - this.Text = "TS酒店管理后台安全系统"; - this.TextAlignment = System.Drawing.StringAlignment.Center; - this.ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 1255, 718); - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmBackgroundSystem_FormClosing); - this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmBackgroundSystem_FormClosed); - this.Load += new System.EventHandler(this.FrmBackgroundSystem_Load); - this.cmsMenu.ResumeLayout(false); - this.ResumeLayout(false); - + AutoScaleMode = AutoScaleMode.None; + ClientSize = new Size(1255, 718); + Controls.Add(lbTime); + Controls.Add(lblScroll); + Controls.Add(uiLabel1); + Controls.Add(btnSetting); + Controls.Add(btnLocked); + Controls.Add(pnlForm); + Controls.Add(Aside); + Icon = (Icon)resources.GetObject("$this.Icon"); + IsForbidAltF4 = true; + MaximizeBox = false; + Name = "FrmBackgroundSystem"; + Style = Sunny.UI.UIStyle.Custom; + Text = "TS酒店管理后台安全系统"; + TextAlignment = StringAlignment.Center; + ZoomScaleRect = new Rectangle(15, 15, 1255, 718); + FormClosing += FrmBackgroundSystem_FormClosing; + FormClosed += FrmBackgroundSystem_FormClosed; + Load += FrmBackgroundSystem_Load; + cmsMenu.ResumeLayout(false); + ResumeLayout(false); } #endregion diff --git a/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.cs b/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.cs index a1344e6b95d248bcf5435b408b63566d8c8d0511..87c82da43768926b324c8876d746acfe630a2ae2 100644 --- a/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.cs +++ b/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -23,29 +23,31 @@ */ -using EOM.TSHotelManager.Common.Core; -using Sunny.UI; using EOM.TSHotelManager.Common; +using EOM.TSHotelManager.Common.Core; using EOM.TSHotelManager.FormUI.AppFunction; -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Linq; -using System.Windows.Forms; +using Sunny.UI; namespace EOM.TSHotelManager.FormUI { public partial class FrmBackgroundSystem : UIForm { + private FrmAdminEnter returnForm1 = null; + + private LoadingProgress _loadingProgress; + public delegate void UpdPwd(); public static UpdPwd closeform; public static UpdPwd hideform; - public FrmBackgroundSystem() + public FrmBackgroundSystem(FrmAdminEnter F1, LoadingProgress loadingProgress) { InitializeComponent(); + _loadingProgress = loadingProgress; + + this.returnForm1 = F1; closeform = Closeform; hideform = HideWinform; @@ -61,7 +63,8 @@ namespace EOM.TSHotelManager.FormUI private void FrmBackgroundSystem_Load(object sender, EventArgs e) { - this.Owner.Close(); + this.Owner.Hide(); + //清除前台Token使其无效 LoginInfo.UserToken = null; @@ -82,6 +85,11 @@ namespace EOM.TSHotelManager.FormUI uiLabel1.Text = "下午好," + AdminInfo.Name; } + if (_loadingProgress != null) + { + _loadingProgress.Close(); + } + } /// @@ -94,6 +102,7 @@ namespace EOM.TSHotelManager.FormUI private void Aside_MenuItemClick(TreeNode node, NavMenuItem item, int pageIndex) { + _loadingProgress.Show(); if (!node.Text.IsNullOrEmpty()) { switch (node.Text) @@ -283,6 +292,7 @@ namespace EOM.TSHotelManager.FormUI break; } + _loadingProgress.Close(); } } diff --git a/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.resx b/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.resx index a45cd28884e7449275b4e580192cfeaa5bda590d..ea0ada331b4b9ee1e298a3fa871f00db3629bfb8 100644 --- a/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.resx +++ b/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.resx @@ -1,17 +1,17 @@  - @@ -126,14 +126,14 @@ - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAYJJREFUWEft - VztOw0AUzBEoKILtIhUFLSUNDdQIiYqGCiFEGVGkSk1DQWyTihPkDNwlJ+AGjzfS7Gq1XpPPvhRIHmmk - 1bx5s0/22pZHA/ZBsZTjopWLspFHEGtoLB8WuuFSKT1c0nYYJDZMknZbaPAs3KSoZV7Vcls0cqPrV9V+ - gvqMbTbQDa6DcBl/yhlLHieNnGtt7TzoYSkfGjZ1wWUtD5Q7UN9LMMCUcj7KVr78AAs5pdwBat6nPZTz - oYHfLphSL/wA2kMpHwhzwZR64XzooZQPhLlgSr1wPvRQ2g/jViZ6kOYgwlyw0/rofOhxGrIYux1w0oMg - G/7x9HSgDatOQD5XjN8MNftLbsjtzwTMUbMFzQfAIXsGsY5qKZoO0PnsQos8Me0GqD7kklYPaClvQNMr - 8ESrR9XIW8IX0nSAdbGQK9rhv4vqKdofQtp39m8EzFFzisMA/mODdVRL0XyAXfmPBqhauU8EZBGvbMZv - B7zZ3D3Opv47TN7liNEDAoxGv+Hphqh7QmzjAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAWVJREFUWEft + lj1OAzEQhXMECopgb5GKgpaShobUERIVDRVCiDKiSEVNQ0E8y1Y5Qc6Qu+QE3OChKXY1zHp/7PUWUfJJ + T4o8zzNPiXedyeREBKbAuclxYwnPLP7Ma9o3CpZQWAIaVGh/UjwDvdL7kmAJKznEOHxkDveGsDAO75bw + K+orvX8QxmEuh09/cKU9F4RrS9iLgHPticY4LKsADk+6XmIc3kSApa5HY3NsqgBrXOp6CdcqX46Nrkdj + Cbuysa5pxE+107VojjPANMeMHzWWDFCuNUkGKNe4l+7fCp900SiNWp6eGpawrTUYrq2e04j8yhOq/5k4 + lAB8yF5Zff16TiM9Gtau3Y5rOm2A7Bu3eg+vad9oASzhRe/JCJ8e32gB9maNO+F/8Hi0kgb41zDU30lo + w1B/J6ENQ/2d9G3ou6xalDxAqA4oQJbj0dNgkPiVree0wm82/WcjWoTF7AtnesYJ5g/h6YaoeYfIjwAA + AABJRU5ErkJggg== diff --git a/EOM.TSHotelManager.FormUI/AppMain/FrmMain.Designer.cs b/EOM.TSHotelManager.FormUI/AppMain/FrmMain.Designer.cs index d96b7c20127c64008ad7d23e2bc02bca499fd85e..0c38544535be3e252b38a694a1eb62eab1621319 100644 --- a/EOM.TSHotelManager.FormUI/AppMain/FrmMain.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppMain/FrmMain.Designer.cs @@ -391,6 +391,7 @@ muNavBar.Size = new Size(765, 45); muNavBar.TabIndex = 39; muNavBar.Text = "menu1"; + muNavBar.SelectChanged += muNavBar_SelectChanged; // // btnClose // diff --git a/EOM.TSHotelManager.FormUI/AppMain/FrmMain.cs b/EOM.TSHotelManager.FormUI/AppMain/FrmMain.cs index ccff9cb4dd39bed627d23ce4dc400630b442767b..b85544911fc5369b1ec8ef2b2faa4fd3fca390f9 100644 --- a/EOM.TSHotelManager.FormUI/AppMain/FrmMain.cs +++ b/EOM.TSHotelManager.FormUI/AppMain/FrmMain.cs @@ -1,6 +1,6 @@ /* * MIT License - *Copyright (c) 2021~2024 易开元(EOM) + *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 @@ -23,30 +23,26 @@ */ using AntdUI; -using EOM.TSHotelManager.Common.Core; -using Sunny.UI; using EOM.TSHotelManager.Common; +using EOM.TSHotelManager.Common.Core; using EOM.TSHotelManager.FormUI.AppUserControls; using EOM.TSHotelManager.FormUI.Properties; -using System; -using System.Collections.Generic; +using Sunny.UI; using System.Diagnostics; -using System.Drawing; -using System.Net; -using System.Reflection; using System.Runtime.InteropServices; -using System.Security.Policy; -using System.Windows.Forms; -using static System.Windows.Forms.DataFormats; namespace EOM.TSHotelManager.FormUI { public partial class FrmMain : Window { private FrmLogin returnForm1 = null; - public FrmMain(FrmLogin F1) + private LoadingProgress _loadingProgress; + + public FrmMain(FrmLogin F1, LoadingProgress loadingProgress) { InitializeComponent(); + _loadingProgress = loadingProgress; + #region 防止背景闪屏方法 this.DoubleBuffered = true;//设置本窗体 SetStyle(ControlStyles.UserPaint, true); @@ -260,49 +256,11 @@ namespace EOM.TSHotelManager.FormUI #endregion } - private void Navbar_MouseDown(object sender, MouseEventArgs e) - { - ucNavBar uc = sender as ucNavBar; // 使用sender参数获取事件的发起者 - if (uc != null) - { - switch (uc.Name) - { - case "客房管理": - uc.BackgroundImage = Resources.picRoom_ImageHover; - break; - case "用户管理": - uc.BackgroundImage = Resources.picCustomer_ImageHover; - break; - case "商品消费": - uc.BackgroundImage = Resources.picCommodity_ImageHover; - break; - } - } - } - - private void Navbar_MouseLeave(object sender, System.EventArgs e) - { - ucNavBar uc = sender as ucNavBar; // 使用sender参数获取事件的发起者 - if (uc != null) - { - switch (uc.Name) - { - case "客房管理": - uc.BackgroundImage = Resources.picRoom_Image; - break; - case "用户管理": - uc.BackgroundImage = Resources.picCustomer_Image; - break; - case "商品消费": - uc.BackgroundImage = Resources.picCommodity_Image; - break; - } - } - } - #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; @@ -354,6 +312,12 @@ namespace EOM.TSHotelManager.FormUI frm1.TopLevel = false; pnlMID.Controls.Add(frm1); frm1.Show(); + + if (_loadingProgress != null) + { + _loadingProgress.Close(); + } + } #endregion @@ -553,9 +517,17 @@ namespace EOM.TSHotelManager.FormUI { notifyIcon1.Dispose(); } - private void muNavBar_SelectChanged(object sender, MenuItem item) + + private void cpUITheme_ValueChanged(object sender, ColorEventArgs e) + { + AntdUI.Style.Db.SetPrimary(e.Value); + Refresh(); + } + + private void muNavBar_SelectChanged(object sender, MenuSelectEventArgs e) { - switch (item.Text) + _loadingProgress.Show(); + switch (e.Value.Text) { case "客房管理": pnlMID.Controls.Clear(); @@ -585,12 +557,8 @@ namespace EOM.TSHotelManager.FormUI frmSellThing.Show(); break; } - } + _loadingProgress.Close(); - private void cpUITheme_ValueChanged(object sender, ColorEventArgs e) - { - AntdUI.Style.Db.SetPrimary(e.Value); - Refresh(); } } } diff --git a/EOM.TSHotelManager.FormUI/AppMain/FrmMain.resx b/EOM.TSHotelManager.FormUI/AppMain/FrmMain.resx index f705fd09ecdbff8a7b9c287370293acec6fd20a2..4ac33fde91185271a938c08ef0422aee1582e54d 100644 --- a/EOM.TSHotelManager.FormUI/AppMain/FrmMain.resx +++ b/EOM.TSHotelManager.FormUI/AppMain/FrmMain.resx @@ -1,7 +1,7 @@  Form @@ -183,9 +164,6 @@ UserControl - - UserControl - UserControl @@ -202,6 +180,8 @@ True Settings.settings + + @@ -246,9 +226,17 @@ + + + + + + Always + + Always diff --git a/EOM.TSHotelManager.FormUI/InitConfig/Initialize.cs b/EOM.TSHotelManager.FormUI/InitConfig/Initialize.cs index 1da169856f6a95f68a01f79cff0a08b491cfb608..eff58be59aeff3713a17ac01ba311da1844379c9 100644 --- a/EOM.TSHotelManager.FormUI/InitConfig/Initialize.cs +++ b/EOM.TSHotelManager.FormUI/InitConfig/Initialize.cs @@ -1,10 +1,5 @@ using EOM.TSHotelManager.Common; -using System; -using System.Collections.Generic; -using System.Linq; using System.Reflection; -using System.Text; -using System.Threading.Tasks; namespace EOM.TSHotelManager.FormUI { diff --git a/EOM.TSHotelManager.FormUI/Program.cs b/EOM.TSHotelManager.FormUI/Program.cs index 8b2b88a0cd1d3f6ff683d2393ecb5d3e824456cf..9384bf06b3b61bada4c8ce2039bffa1616d6c70f 100644 --- a/EOM.TSHotelManager.FormUI/Program.cs +++ b/EOM.TSHotelManager.FormUI/Program.cs @@ -1,5 +1,3 @@ -using EOM.TSHotelManager.Common; - namespace EOM.TSHotelManager.FormUI { internal static class Program diff --git a/EOM.TSHotelManager.FormUI/Properties/Resources.Designer.cs b/EOM.TSHotelManager.FormUI/Properties/Resources.Designer.cs index 027a79109a7acce9ebf42ad6d92d99b11cfe3ba4..d06748f783f4a845ebbfa14fd8b67c4ca1c1b8dc 100644 --- a/EOM.TSHotelManager.FormUI/Properties/Resources.Designer.cs +++ b/EOM.TSHotelManager.FormUI/Properties/Resources.Designer.cs @@ -100,6 +100,31 @@ namespace EOM.TSHotelManager.FormUI.Properties { } } + /// + /// 查找类似 <?xml version="1.0"?> + ///<doc> + /// <assembly> + /// <name>EOM.TSHotelManager.Common.Core</name> + /// </assembly> + /// <members> + /// <member name="P:EOM.TSHotelManager.Common.Core.BaseDTO.datains_usr"> + /// <summary> + /// 资料创建人 + /// </summary> + /// </member> + /// <member name="P:EOM.TSHotelManager.Common.Core.BaseDTO.datains_date"> + /// <summary> + /// 资料创建时间 + /// </summary> + /// </member> + /// <member name="P:EOM.TSHotelManager.Common.Cor [字符串的其余部分被截断]"; 的本地化字符串。 + /// + internal static string EOM_TSHotelManager_Common_Core { + get { + return ResourceManager.GetString("EOM.TSHotelManager.Common.Core", resourceCulture); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/EOM.TSHotelManager.FormUI/Properties/Resources.resx b/EOM.TSHotelManager.FormUI/Properties/Resources.resx index 28a3c94e45fad7d32b8c1c76a4a316411474e612..f67e9c34ddbf046f3d804ab3f01973164df1949f 100644 --- a/EOM.TSHotelManager.FormUI/Properties/Resources.resx +++ b/EOM.TSHotelManager.FormUI/Properties/Resources.resx @@ -310,4 +310,7 @@ ..\Resources\黄金会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\EOM.TSHotelManager.Common.Core.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + \ No newline at end of file diff --git a/EOM.TSHotelManager.FormUI/Resources/EOM.TSHotelManager.Common.Core.xml b/EOM.TSHotelManager.FormUI/Resources/EOM.TSHotelManager.Common.Core.xml new file mode 100644 index 0000000000000000000000000000000000000000..dfbb6e9e223624dcb01ac6a287342539f009ea0e --- /dev/null +++ b/EOM.TSHotelManager.FormUI/Resources/EOM.TSHotelManager.Common.Core.xml @@ -0,0 +1,1504 @@ + + + + EOM.TSHotelManager.Common.Core + + + + + 资料创建人 + + + + + 资料创建时间 + + + + + 资料更新人 + + + + + 资料更新时间 + + + + + Token + + + + + 资产管理 + + + + + 资产编号 + + + + + 资产名称 + + + + + 资产总值 + + + + + 资产总值描述 + + + + + 所属部门 + + + + + 所属部门描述 + + + + + 入库时间 + + + + + 资产来源 + + + + + 资产经办人 + + + + + 资产经办人 + + + + + 删除标记 + + + + + 客户信息 + + + + + 客户编号 + + + + + 客户名称 + + + + + 客户性别 + + + + + 证件类型 + + + + + 性别 + + + + + 客户电话 + + + + + 出生日期 + + + + + 客户类型 + + + + + 证件类型 + + + + + 证件号码 + + + + + 居住地址 + + + + + 客户类型 + + + + + 删除标记 + + + + + 酒店盈利情况 + + + + + 年 + + + + + 总金额 + + + + + 客户类型 + + + + + 客户类型 + + + + + 类型名字 + + + + + 删除标记 + + + + + 证件类型 + + + + + 证件类型 + + + + + 证件名称 + + + + + 删除标记 + + + + + 性别 + + + + + 性别ID + + + + + 性别名称 + + + + + 删除标记 + + + + + 酒店宣传联动内容 + + + + + 宣传内容编号 + + + + + 宣传内容 + + + + + 水电信息 + + + + + 信息编号 + + + + + 房间编号 + + + + + 开始使用时间 + + + + + 结束使用时间 + + + + + 水费 + + + + + 电费 + + + + + 记录员 + + + + + 客户编号 + + + + + 删除标记 + + + + + 预约列表 + + + + + 预约编号 + + + + + 客户名称 + + + + + 预约电话 + + + + + 预约渠道 + + + + + 预约房号 + + + + + 预约起始 + + + + + 预约止日 + + + + + 删除标记 + + + + + 房间实体类 + + + + + 房间编号 + + + + + 房间类型 + + + + + 客户编号 + + + + + 客户姓名 + + + + + 最后一次入住时间 + + + + + 最后一次退房时间 + + + + + 房间状态ID + + + + + 房间状态 + + + + + 房间单价 + + + + + 房间押金 + + + + + 房间位置 + + + + + 客户类型名称 + + + + + 房间名称 + + + + + 最后一次入住时间 + + + + + 删除标记 + + + + + 房间状态 + + + + + 房间状态编号 + + + + + 房间状态 + + + + + 删除标记 + + + + + 房间类型 + + + + + 类型编号 + + + + + 房间类型 + + + + + 房间租金 + + + + + 房间押金 + + + + + 删除标记 + + + + + 删除标记描述 + + + + + 商品信息 + + + + + 商品编号 + + + + + 商品名称 + + + + + 商品价格 + + + + + 商品价格描述 + + + + + 规格型号 + + + + + 库存 + + + + + 删除标记 + + + + + 消费信息 + + + + + 房间编号 + + + + + 客户编号 + + + + + 商品名称 + + + + + 消费数量 + + + + + 商品单价 + + + + + 商品单价描述 + + + + + 消费金额 + + + + + 消费金额描述 + + + + + 消费时间 + + + + + 结算状态 + + + + + 删除标记 + + + + + 结算状态描述 + + + + + 结算状态常量 + + + + + 已结算状态常量 + + + + + 未结算状态常量 + + + + + 查询所有客户信息 + 输出DTO + + + + + 数据源 + + + + + 总数 + + + + + 导航控件实体类 + + + + + 导航控件ID + + + + + 导航控件名称 + + + + + 导航控件排序 + + + + + 导航控件图片 + + + + + 导航控件事件 + + + + + 导航控件事件 + + + + + 删除标记 + + + + + 应用版本 + + + + + 流水号 + + + + + 版本号 + + + + + 卡片代码 + + + + + 卡片代码 + + + + + 编号 + + + + + 省份 + + + + + 城市 + + + + + 地区 + + + + + 地区识别码 + + + + + 日志等级 + + + + + 普通警告 + + + + + 严重警告 + + + + + 危险警告 + + + + + 操作日志 + + + + + 日志ID + + + + + 操作时间 + + + + + 操作信息 + + + + + 操作账号 + + + + + 日志等级 + + + + + 删除标记 + + + + + 软件版本 + + + + + 登录IP + + + + + 日志等级 + + + + + 奖惩类型实体类 + + + + + 奖惩编号 + + + + + 奖惩名称 + + + + + 删除标记 + + + + + 员工信息 + + + + + 员工账号/工号 + + + + + 员工姓名 + + + + + 出生日期 + + + + + 员工性别 + + + + + 员工性别(名称描述) + + + + + 民族类型 + + + + + 民族名称 + + + + + 员工电话 + + + + + 所属部门 + + + + + 部门名称 + + + + + 居住地址 + + + + + 员工职位 + + + + + 职位名称 + + + + + 证件号码 + + + + + 员工密码 + + + + + 员工入职时间 + + + + + 员工面貌 + + + + + 群众面貌描述 + + + + + 教育程度 + + + + + 教育程度名称 + + + + + 删除标记 + + + + + 员工打卡考勤 + + + + + 编号 + + + + + 工号 + + + + + 打卡时间 + + + + + 打卡方式 + + + + + 打卡状态 + + + + + 打卡状态 + + + + + 删除标记 + + + + + 员工奖罚 + + + + + 编号 + + + + + 工号 + + + + + 奖惩信息 + + + + + 奖惩类型 + + + + + 奖惩操作人 + + + + + 奖惩操作人 + + + + + 奖惩时间 + + + + + 类型名称 + + + + + 删除标记 + + + + + 员工履历 + + + + + 编号 + + + + + 工号 + + + + + 开始时间 + + + + + 结束时间 + + + + + 职位 + + + + + 公司 + + + + + 删除标记 + + + + + 员工照片 + + + + + 自增长流水号 + + + + + 工号 + + + + + 照片路径 + + + + + 管理员实体类 + + + + + 构造函数 + + + + + 编号 + + + + + 管理员账号 + + + + + 管理员密码 + + + + + 管理员类型 + + + + + 管理员名称 + + + + + 是否为超级管理员 + + + + + 删除标记 + + + + + 管理员类型描述 + + + + + 管理员类型 + + + + + 删除标记描述 + + + + + 管理员类型 + + + + + 编号 + + + + + 管理员类型 + + + + + 类型名称 + + + + + 删除标记 + + + + + 系统信息 + + + + + 地址编号 + + + + + 地址 + + + + + 监管统计 + + + + + 监管统计编号 + + + + + 监管部门 + + + + + 监管进度 + + + + + + + + + + + + + + + + + + + + + + + + + 删除标记 + + + + + 部门表 + + + + + 部门编号 + + + + + 部门名称 + + + + + 部门描述 + + + + + 创建时间(部门) + + + + + 部门主管 + + + + + 部门主管 + + + + + 上级部门 + + + + + 上级部门 + + + + + 删除标记 + + + + + 学历 + + + + + 学历编号 + + + + + 学历名称 + + + + + 删除标记 + + + + + 模块实体 + + + + + 模块ID + + + + + 模块名称 + + + + + 模块描述 + + + + + 删除标记 + + + + + 系统模块常量类 + + + + + 基础信息 + + + + + 财务信息 + + + + + 水电管理 + + + + + 监管统计 + + + + + 客房管理 + + + + + 客户管理 + + + + + 人事管理 + + + + + 物资管理 + + + + + 员工操作日志 + + + + + 系统管理 + + + + + 模块权限表 + + + + + 模块ID + + + + + 管理员账号 + + + + + 模块名称 + + + + + 是否开启 + + + + + 民族 + + + + + 民族编号 + + + + + 民族名称 + + + + + 删除标记 + + + + + 任命公告 + + + + + 公告编号 + + + + + 公告主题 + + + + + 公告类型 + + + + + 公告类型(描述) + + + + + 公告时间 + + + + + 公告正文 + + + + + 发文部门 + + + + + 删除标记 + + + + + 职位 + + + + + 职位编号 + + + + + 职位名称 + + + + + 删除标记 + + + + + 会员等级规则类 + + + + + 索引ID + + + + + 会员规则流水号 + + + + + 会员规则名称 + + + + + 预设数值(历史消费总额) + + + + + 会员等级 + + + + + 删除标识 + + + + + 会员等级描述 + + + + diff --git a/EOM.TSHotelManager.FormUI/TableComponent/LoadingProgress.cs b/EOM.TSHotelManager.FormUI/TableComponent/LoadingProgress.cs new file mode 100644 index 0000000000000000000000000000000000000000..820fe2f87eb9ba8f8b6e43f67712766b80885793 --- /dev/null +++ b/EOM.TSHotelManager.FormUI/TableComponent/LoadingProgress.cs @@ -0,0 +1,31 @@ +namespace EOM.TSHotelManager.FormUI +{ + public class LoadingProgress + { + private FrmProgress _frmProgress; + + // 显示加载窗口 + public void Show() + { + if (_frmProgress == null || _frmProgress.IsDisposed) + { + _frmProgress = new FrmProgress(); + } + + // 异步显示窗体以确保不阻塞调用线程 + Task.Run(() => _frmProgress.ShowDialog()); + } + + // 关闭加载窗口 + public void Close() + { + if (_frmProgress != null && !_frmProgress.IsDisposed) + { + _frmProgress.Invoke(new Action(() => + { + _frmProgress.Close(); + })); + } + } + } +} diff --git a/EOM.TSHotelManager.FormUI/TableComponent/TableComHelper.cs b/EOM.TSHotelManager.FormUI/TableComponent/TableComHelper.cs index 7c7bf62a8714ed4753c34c6c0aa0dbc47ac33a85..84b79f511c2228d00bbb84aa92aab3795b87174c 100644 --- a/EOM.TSHotelManager.FormUI/TableComponent/TableComHelper.cs +++ b/EOM.TSHotelManager.FormUI/TableComponent/TableComHelper.cs @@ -1,11 +1,5 @@ using AntdUI; -using EOM.TSHotelManager.Common.Core; using EOM.TSHotelManager.Common.Util; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.IO; -using System.Linq; using System.Reflection; using System.Xml.Linq; @@ -17,15 +11,17 @@ namespace EOM.TSHotelManager.FormUI public TableComHelper() { - var xmlPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "EOM.TSHotelManager.Common.Core.xml"); - try { - _xmlDoc = XDocument.Load(xmlPath); + var xmlContent = Properties.Resources.EOM_TSHotelManager_Common_Core; + using (StringReader stringReader = new StringReader(xmlContent)) + { + _xmlDoc = XDocument.Load(stringReader); + } } catch (Exception ex) { - throw new InvalidOperationException($"无法加载XML文件: {xmlPath}", ex); + throw new InvalidOperationException("无法加载嵌入的XML内容", ex); } } @@ -162,7 +158,7 @@ namespace EOM.TSHotelManager.FormUI return tableColumns; } - + /// /// 获取字段对应注释 ///