diff --git a/EOM.Client.TopSkyHotelManagerSystem.sln b/EOM.Client.TopSkyHotelManagerSystem.sln index 379799fa410a61efd7b19e3fc0a445d6e80b3238..ca1d1789bcb4324bd31033c16226d540ce6fd5ba 100644 --- a/EOM.Client.TopSkyHotelManagerSystem.sln +++ b/EOM.Client.TopSkyHotelManagerSystem.sln @@ -1,12 +1,7 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.4.33213.308 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SYS.FormUI", "SYS.FormUI\SYS.FormUI.csproj", "{8854DCB7-F2D7-4276-8D10-C7A124436145}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SYS.Common", "SYS.Common\SYS.Common.csproj", "{65501AF6-C629-448A-847E-1BCD60665865}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Api", "Api", "{6A3E4936-8B95-49E0-842B-E002C0E024CE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{3B8902EC-CAB9-406A-AAF7-24DABD885AC0}" @@ -23,20 +18,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.Common.C EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.Common.Util", "topsky-hotel-manager-system-web-api\EOM.TSHotelManager.Common.Util\EOM.TSHotelManager.Common.Util.csproj", "{9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.Common", "EOM.TSHotelManager.Common\EOM.TSHotelManager.Common.csproj", "{781CEE04-DDB4-4037-8175-9A6548716871}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.FormUI", "EOM.TSHotelManager.FormUI\EOM.TSHotelManager.FormUI.csproj", "{D89E76F5-007B-4915-91A8-265CCA6814BF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8854DCB7-F2D7-4276-8D10-C7A124436145}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8854DCB7-F2D7-4276-8D10-C7A124436145}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8854DCB7-F2D7-4276-8D10-C7A124436145}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8854DCB7-F2D7-4276-8D10-C7A124436145}.Release|Any CPU.Build.0 = Release|Any CPU - {65501AF6-C629-448A-847E-1BCD60665865}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65501AF6-C629-448A-847E-1BCD60665865}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65501AF6-C629-448A-847E-1BCD60665865}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65501AF6-C629-448A-847E-1BCD60665865}.Release|Any CPU.Build.0 = Release|Any CPU {B55975AB-2C89-4C01-B107-D87FCA21A5E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B55975AB-2C89-4C01-B107-D87FCA21A5E3}.Debug|Any CPU.Build.0 = Debug|Any CPU {B55975AB-2C89-4C01-B107-D87FCA21A5E3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -61,19 +52,27 @@ Global {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}.Debug|Any CPU.Build.0 = Debug|Any CPU {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}.Release|Any CPU.ActiveCfg = Release|Any CPU {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}.Release|Any CPU.Build.0 = Release|Any CPU + {781CEE04-DDB4-4037-8175-9A6548716871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {781CEE04-DDB4-4037-8175-9A6548716871}.Debug|Any CPU.Build.0 = Debug|Any CPU + {781CEE04-DDB4-4037-8175-9A6548716871}.Release|Any CPU.ActiveCfg = Release|Any CPU + {781CEE04-DDB4-4037-8175-9A6548716871}.Release|Any CPU.Build.0 = Release|Any CPU + {D89E76F5-007B-4915-91A8-265CCA6814BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D89E76F5-007B-4915-91A8-265CCA6814BF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D89E76F5-007B-4915-91A8-265CCA6814BF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D89E76F5-007B-4915-91A8-265CCA6814BF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {8854DCB7-F2D7-4276-8D10-C7A124436145} = {3B8902EC-CAB9-406A-AAF7-24DABD885AC0} - {65501AF6-C629-448A-847E-1BCD60665865} = {3B8902EC-CAB9-406A-AAF7-24DABD885AC0} {B55975AB-2C89-4C01-B107-D87FCA21A5E3} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} {8F5CF88A-1111-44CC-AFFA-4637EA10E191} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} {566D7064-EA90-45C1-93B7-F512BBAD7BA1} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} {5C7B9A47-90AD-4300-BF7F-64D9EBA9705C} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} {48B3F864-88D2-4BD1-A766-B9EBF342AED1} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} + {781CEE04-DDB4-4037-8175-9A6548716871} = {3B8902EC-CAB9-406A-AAF7-24DABD885AC0} + {D89E76F5-007B-4915-91A8-265CCA6814BF} = {3B8902EC-CAB9-406A-AAF7-24DABD885AC0} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B93ABE6D-89AD-45B3-94FB-65BD98597CC6} diff --git a/EOM.TSHotelManager.Common/AppConstant/Constant.cs b/EOM.TSHotelManager.Common/AppConstant/Constant.cs new file mode 100644 index 0000000000000000000000000000000000000000..197cd70fdf198c276c10b66690d63a7388f533b0 --- /dev/null +++ b/EOM.TSHotelManager.Common/AppConstant/Constant.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EOM.TSHotelManager.Common +{ + public class Constant where T : Constant + { + public string Code { get; } + public string Description { get; } + + private static List _constants = new List(); + + protected Constant(string code, string description) + { + Code = code; + Description = description; + _constants.Add((T)this); + } + + public static IEnumerable GetAll() + { + return _constants; + } + + public static string GetDescriptionByCode(string code) + { + var constant = _constants.SingleOrDefault(c => c.Code == code); + return constant?.Description ?? string.Empty; + } + + public static string GetCodeByDescription(string description) + { + var constant = _constants.SingleOrDefault(c => c.Description == description); + return constant?.Code ?? string.Empty; + } + + public static T? GetConstantByCode(string code) + { + var constant = _constants.FirstOrDefault(c => c.Code == code); + return constant ?? null; + } + } +} diff --git a/EOM.TSHotelManager.Common/AppConstant/CustomTypeConstant.cs b/EOM.TSHotelManager.Common/AppConstant/CustomTypeConstant.cs new file mode 100644 index 0000000000000000000000000000000000000000..caf0285a3c3aef4dcaa22df17be449111680d3eb --- /dev/null +++ b/EOM.TSHotelManager.Common/AppConstant/CustomTypeConstant.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EOM.TSHotelManager.Common +{ + public class CustomTypeConstant:Constant + { + // 普通会员 + public static readonly CustomTypeConstant RegularMember = new CustomTypeConstant("0", "普通会员"); + // 钻石会员 + public static readonly CustomTypeConstant DiamondMember = new CustomTypeConstant("1", "钻石会员"); + // 白金会员 + public static readonly CustomTypeConstant PlatinumMember = new CustomTypeConstant("2", "白金会员"); + // 黄金会员 + public static readonly CustomTypeConstant GoldMember = new CustomTypeConstant("3", "黄金会员"); + + private CustomTypeConstant(string code, string description) : base(code, description) + { + } + } +} diff --git a/EOM.TSHotelManager.Common/AppConstant/PassportConstant.cs b/EOM.TSHotelManager.Common/AppConstant/PassportConstant.cs new file mode 100644 index 0000000000000000000000000000000000000000..475df45393110e491c543a82b1f9d0b82816b3f2 --- /dev/null +++ b/EOM.TSHotelManager.Common/AppConstant/PassportConstant.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EOM.TSHotelManager.Common +{ + public class PassportConstant:Constant + { + // 中国居民身份证 + public static readonly PassportConstant ChineseResidentIdentityCard = new PassportConstant("0", "中国居民身份证"); + // 港澳居民来往内地通行证 + public static readonly PassportConstant MainlandTravelPermitforHKandMOResidents = new PassportConstant("1", "港澳居民来往内地通行证"); + // 台湾居民来往大陆通行证 + public static readonly PassportConstant MainlandTravelPermitforTWResidents = new PassportConstant("2", "台湾居民来往大陆通行证"); + // 军官证 + public static readonly PassportConstant OfficerCertificate = new PassportConstant("3", "军官证"); + // 外国护照 + public static readonly PassportConstant ForeignPassport = new PassportConstant("4", "外国护照"); + + private PassportConstant(string code, string description) : base(code, description) + { + } + } +} diff --git a/EOM.TSHotelManager.Common/AppConstant/RoomStateConstant.cs b/EOM.TSHotelManager.Common/AppConstant/RoomStateConstant.cs new file mode 100644 index 0000000000000000000000000000000000000000..870274e9b708316db81cf3cd36521d79b0dc0b03 --- /dev/null +++ b/EOM.TSHotelManager.Common/AppConstant/RoomStateConstant.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EOM.TSHotelManager.Common +{ + public class RoomStateConstant : Constant + { + // 空房 + public static readonly RoomStateConstant Empty = new RoomStateConstant("0", "空房"); + // 已住 + public static readonly RoomStateConstant Occupied = new RoomStateConstant("1", "已住"); + // 维修 + public static readonly RoomStateConstant UnderRepair = new RoomStateConstant("2", "维修"); + // 脏房 + public static readonly RoomStateConstant Dirty = new RoomStateConstant("3", "脏房"); + // 预约 + public static readonly RoomStateConstant Reserved = new RoomStateConstant("4", "预约"); + + private RoomStateConstant(string code, string description) : base(code, description) + { + } + } +} diff --git a/EOM.TSHotelManager.Common/AppConstant/SexConstant.cs b/EOM.TSHotelManager.Common/AppConstant/SexConstant.cs new file mode 100644 index 0000000000000000000000000000000000000000..cee11f7adc5cd69d86439a280c7d649f25be1c91 --- /dev/null +++ b/EOM.TSHotelManager.Common/AppConstant/SexConstant.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EOM.TSHotelManager.Common +{ + public class SexConstant : Constant + { + // 女 + public static readonly SexConstant Female = new SexConstant("0", "女"); + // 男 + public static readonly SexConstant Male = new SexConstant("1", "男"); + + private SexConstant(string code, string description) : base(code, description) + { + } + } +} diff --git a/SYS.Common/SYS.Common.csproj b/EOM.TSHotelManager.Common/EOM.TSHotelManager.Common.csproj similarity index 31% rename from SYS.Common/SYS.Common.csproj rename to EOM.TSHotelManager.Common/EOM.TSHotelManager.Common.csproj index 214bf513f80f73f480d6436bceacb89192a3b968..885b5518342a35a562e830a4243188939ebb6aad 100644 --- a/SYS.Common/SYS.Common.csproj +++ b/EOM.TSHotelManager.Common/EOM.TSHotelManager.Common.csproj @@ -1,37 +1,23 @@  + - net8.0-windows - Library - - - - - false - true - true + net8.0 + enable + enable - - x64 - - + - - + + - - - - - - - - + - \ No newline at end of file + + diff --git a/SYS.Common/HttpHelper/HttpHelper.cs b/EOM.TSHotelManager.Common/HttpHelper/HttpHelper.cs similarity index 98% rename from SYS.Common/HttpHelper/HttpHelper.cs rename to EOM.TSHotelManager.Common/HttpHelper/HttpHelper.cs index 9748bd36efaa38d5b9b46105025415cde5d1e851..7b2b3525d028e67ce68d9c7feaf12585f89744c2 100644 --- a/SYS.Common/HttpHelper/HttpHelper.cs +++ b/EOM.TSHotelManager.Common/HttpHelper/HttpHelper.cs @@ -15,7 +15,7 @@ using System.Text.RegularExpressions; using System.Web; using System.Windows.Input; -namespace SYS.Common +namespace EOM.TSHotelManager.Common { /// /// 文件上传帮助类 @@ -45,7 +45,7 @@ namespace SYS.Common /// /// WebApi URL(debug) /// - //public const string apiUrl = ""; + //public const string apiUrl = "1/F8hHIvdiAzWpBv3RqANkv1On8CAw01xgL+WewjgIA=·0*%#^f*a0d?d*#0< /// 管理员信息静态类(后台管理员登入后的本地信息存储) diff --git a/SYS.Common/LocalInfo/LoginInfo.cs b/EOM.TSHotelManager.Common/LocalInfo/LoginInfo.cs similarity index 98% rename from SYS.Common/LocalInfo/LoginInfo.cs rename to EOM.TSHotelManager.Common/LocalInfo/LoginInfo.cs index 334f0b1108da938359a80561fc9c23113a0beb06..1efb15d6f01283924bf5461b58a525bd695fc3b1 100644 --- a/SYS.Common/LocalInfo/LoginInfo.cs +++ b/EOM.TSHotelManager.Common/LocalInfo/LoginInfo.cs @@ -22,7 +22,7 @@ * *模块说明：登录信息静态类(前台工作人员登入后的本地信息存储) */ -namespace SYS.Common +namespace EOM.TSHotelManager.Common { /// /// 登录信息静态类(前台工作人员登入后的本地信息存储) diff --git a/SYS.Common/Util/Util.cs b/EOM.TSHotelManager.Common/Util/ApplicationUtil.cs similarity index 72% rename from SYS.Common/Util/Util.cs rename to EOM.TSHotelManager.Common/Util/ApplicationUtil.cs index cd5548aea4888e1ddfc574e5358ccaf17d1188ce..00dd3baf555e1fcf42092969df01df27b72f3bb1 100644 --- a/SYS.Common/Util/Util.cs +++ b/EOM.TSHotelManager.Common/Util/ApplicationUtil.cs @@ -1,17 +1,22 @@ -using System; +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.Reflection; using System.Text; using System.Threading; +using System.Xml.Linq; -namespace SYS.Common +namespace EOM.TSHotelManager.Common { /// /// 静态工具 /// - public static class Util + public static class ApplicationUtil { //锁对象 private static readonly object lockTimeCode = new object(); @@ -133,29 +138,58 @@ namespace SYS.Common return null; } - } - - /// - /// 身份证实体类 - /// - public class Card - { - /// - /// 消息 - /// - public string message { get; set; } - /// - /// 性别 - /// - public string sex { get; set; } /// - /// 出生日期 + /// 请求列表数据 /// - public string birthday { get; set; } + /// + /// + /// + /// + // public static List GetDataList(HttpHelper.HttpRequestContext httpRequestContext,PageOptions pageOptions = null) + // { + // var result = HttpHelper.Request(httpRequestContext); + // var listDataSource = HttpHelper.JsonToList(result.message); + // if (pageOptions != null) + // { + // int skip = (pageOptions.index - 1) * pageOptions.pageSize; + // listDataSource = listDataSource + // .Skip(skip) + // .Take(pageOptions.pageSize) + // .ToList(); + // } + // return listDataSource; + // } + //} + + public class PageOptions + { + public int index { get; set; } + + public int pageSize { get; set; } + } + /// - /// 地址 + /// 身份证实体类 /// - public string address { get; set; } + public class Card + { + /// + /// 消息 + /// + public string message { get; set; } + /// + /// 性别 + /// + public string sex { get; set; } + /// + /// 出生日期 + /// + public string birthday { get; set; } + /// + /// 地址 + /// + public string address { get; set; } + } } } diff --git a/SYS.Common/Util/ExportHelper.cs b/EOM.TSHotelManager.Common/Util/ExportHelper.cs similarity index 67% rename from SYS.Common/Util/ExportHelper.cs rename to EOM.TSHotelManager.Common/Util/ExportHelper.cs index 59fb4e591aacb1508d3d76df06b68a7fc49395c1..6608497deb48a3f812dcb622053f39a2729af209 100644 --- a/SYS.Common/Util/ExportHelper.cs +++ b/EOM.TSHotelManager.Common/Util/ExportHelper.cs @@ -3,11 +3,11 @@ using NPOI.SS.UserModel; using NPOI.XSSF.UserModel; using System; using System.Collections.Generic; +using System.Data; using System.IO; using System.Linq; -using System.Windows.Forms; -namespace SYS.Common +namespace EOM.TSHotelManager.Common { /// /// 导出助手 @@ -15,48 +15,45 @@ namespace SYS.Common public class ExportHelper { /// - /// 导出DataGridView数据到Excel(默认当前页) + /// 导出DataTable数据到Excel /// - /// - /// - /// - public void ExportDataGridViewToExcel(DataGridView dataGridView, string filePath, List ignoreColumns = null) + /// 要导出的数据表 + /// 保存的文件路径 + /// 要忽略的列名列表 + public void ExportDataTableToExcel(DataTable dataTable, string filePath, List ignoreColumns = null) { var workbook = new XSSFWorkbook(); // 创建XSSFWorkbook实例 ISheet sheet = workbook.CreateSheet("Customer List"); // 创建工作表 - IRow headerRow = sheet.CreateRow(0); // 创建表头行 // 创建表头 - for (int i = 0; i < dataGridView.Columns.Count; i++) + IRow headerRow = sheet.CreateRow(0); + for (int i = 0; i < dataTable.Columns.Count; i++) { - if (!ignoreColumns.Contains(dataGridView.Columns[i].Name)) + if (ignoreColumns == null || !ignoreColumns.Contains(dataTable.Columns[i].ColumnName)) { var cell = headerRow.CreateCell(i); - cell.SetCellValue(dataGridView.Columns[i].HeaderText); + cell.SetCellValue(dataTable.Columns[i].ColumnName); } } // 写入数据行 int rowIndex = 1; - foreach (DataGridViewRow row in dataGridView.Rows) + foreach (DataRow row in dataTable.Rows) { - if (!row.IsNewRow) // 排除未提交的新行 + IRow sheetRow = sheet.CreateRow(rowIndex++); + for (int i = 0; i < row.ItemArray.Length; i++) { - IRow sheetRow = sheet.CreateRow(rowIndex++); - for (int i = 0; i < row.Cells.Count; i++) + var cell = sheetRow.CreateCell(i); + var cellValue = row.ItemArray[i]; + if (cellValue != DBNull.Value && (ignoreColumns == null || !ignoreColumns.Contains(dataTable.Columns[i].ColumnName))) { - var cell = sheetRow.CreateCell(i); - var cellValue = row.Cells[i].Value; - if (cellValue != null && !ignoreColumns.Contains(dataGridView.Columns[i].Name)) // 检查空值 + if (cellValue is DateTime) + { + cell.SetCellValue(Convert.ToDateTime(cellValue).ToString("yyyy-MM-dd")); + } + else { - if (cellValue is DateTime) - { - cell.SetCellValue(Convert.ToDateTime(row.Cells[i].Value).ToString("yyyy-MM-dd")); - } - else - { - cell.SetCellValue(row.Cells[i].Value.ToString()); - } + cell.SetCellValue(cellValue.ToString()); } } } diff --git a/SYS.Common/Util/RecordHelper.cs b/EOM.TSHotelManager.Common/Util/RecordHelper.cs similarity index 96% rename from SYS.Common/Util/RecordHelper.cs rename to EOM.TSHotelManager.Common/Util/RecordHelper.cs index 3fd63dc37304655de514d76bac5cf2a7aef6fe37..1084200b4da403dde67e196afa2cc4b8cef8643e 100644 --- a/SYS.Common/Util/RecordHelper.cs +++ b/EOM.TSHotelManager.Common/Util/RecordHelper.cs @@ -1,7 +1,7 @@ using EOM.TSHotelManager.Common.Core; using System; -namespace SYS.Common +namespace EOM.TSHotelManager.Common { /// /// 日志记录助手 diff --git a/EOM.TSHotelManager.FormUI/ApiExtractor/ApiConstant.cs b/EOM.TSHotelManager.FormUI/ApiExtractor/ApiConstant.cs new file mode 100644 index 0000000000000000000000000000000000000000..de6971b1c4ac514ee28dbaac435909fdccc31f68 --- /dev/null +++ b/EOM.TSHotelManager.FormUI/ApiExtractor/ApiConstant.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EOM.TSHotelManager.FormUI +{ + public static class ApiConstant + { + // 使用静态字段来存储路径名称 + public static HashSet Paths { get; } = new HashSet(); + } +} diff --git a/EOM.TSHotelManager.FormUI/ApiExtractor/SwaggerExtractor.cs b/EOM.TSHotelManager.FormUI/ApiExtractor/SwaggerExtractor.cs new file mode 100644 index 0000000000000000000000000000000000000000..7f5fe6c1ec793aba2e52ff2a6f829a2c8ae0b551 --- /dev/null +++ b/EOM.TSHotelManager.FormUI/ApiExtractor/SwaggerExtractor.cs @@ -0,0 +1,47 @@ +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 +{ + public class SwaggerExtractor + { + public void ExtractRoutesToFileAsync(string swaggerUrl) + { + var reponse = new RestResponse(); + var client = new RestClient(swaggerUrl); + var request = new RestRequest(); + + string resultContent = ""; + RestResponse rsp = null; + + rsp = client.ExecuteGet(request); + + resultContent = rsp.Content; + + var result = new ResponseMsg() { statusCode = (int)rsp.StatusCode, message = resultContent }; + + GetSwaggerJson(result.message); + } + + public void GetSwaggerJson(string json) + { + // 解析JSON内容 + dynamic swaggerObject = JsonConvert.DeserializeObject(json); + + // 遍历并打印所有的路径和HTTP方法 + foreach (var path in swaggerObject.paths) + { + // 只保存唯一的路径名称 + ApiConstant.Paths.Add(path.Name); + } + } + } +} diff --git a/SYS.FormUI/AppFunction/FrmAboutUs.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.Designer.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmAboutUs.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.Designer.cs index 80f320ec351ffb6c66c2e212ee7fee631c5599dc..24cdbd6508fbfb4ba2ffe09b8abd301bed88f6b9 100644 --- a/SYS.FormUI/AppFunction/FrmAboutUs.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmAboutUs { diff --git a/SYS.FormUI/AppFunction/FrmAboutUs.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmAboutUs.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.cs index c4c24a104f01510d94a63fcad59718a77fd00374..585a91625c33e1fcd381393749cc658e4f626ebd 100644 --- a/SYS.FormUI/AppFunction/FrmAboutUs.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.cs @@ -26,7 +26,7 @@ using System; using System.Drawing; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmAboutUs : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmAboutUs.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmAboutUs.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.resx diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.Designer.cs new file mode 100644 index 0000000000000000000000000000000000000000..84dd4c1df28ab6ecb1259dd149cd17373082267f --- /dev/null +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.Designer.cs @@ -0,0 +1,240 @@ + +namespace EOM.TSHotelManager.FormUI +{ + partial class FrmAddAdmin + { + /// + /// 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(FrmAddAdmin)); + label1 = new AntdUI.Label(); + txtAccount = new AntdUI.Input(); + txtPassword = new AntdUI.Input(); + label2 = new AntdUI.Label(); + label4 = new AntdUI.Label(); + cbAccountType = new AntdUI.Select(); + txtName = new AntdUI.Input(); + label5 = new AntdUI.Label(); + btnAdd = new AntdUI.Button(); + btnReset = new AntdUI.Button(); + dgvAdminList = new AntdUI.Table(); + pgnPageNavigate = new AntdUI.Pagination(); + windowBar1 = new AntdUI.WindowBar(); + SuspendLayout(); + // + // label1 + // + label1.Font = new Font("Microsoft YaHei UI", 12.5F); + label1.Location = new Point(174, 96); + label1.Name = "label1"; + label1.Size = new Size(86, 23); + label1.TabIndex = 122; + label1.Text = "账 号"; + label1.TextAlign = ContentAlignment.MiddleCenter; + label1.TooltipConfig = null; + // + // txtAccount + // + txtAccount.Font = new Font("Microsoft YaHei UI", 12F); + txtAccount.Location = new Point(257, 88); + txtAccount.Name = "txtAccount"; + txtAccount.PlaceholderText = "请输入管理员账户..."; + txtAccount.Size = new Size(175, 39); + txtAccount.TabIndex = 123; + // + // txtPassword + // + txtPassword.Font = new Font("Microsoft YaHei UI", 12F); + txtPassword.Location = new Point(535, 88); + txtPassword.Name = "txtPassword"; + txtPassword.PasswordChar = '*'; + txtPassword.PasswordCopy = true; + txtPassword.PlaceholderText = "请输入管理员密码..."; + txtPassword.Size = new Size(175, 39); + txtPassword.TabIndex = 125; + // + // label2 + // + label2.Font = new Font("Microsoft YaHei UI", 12.5F); + label2.Location = new Point(452, 96); + label2.Name = "label2"; + label2.Size = new Size(86, 23); + label2.TabIndex = 124; + label2.Text = "账号密码"; + label2.TextAlign = ContentAlignment.MiddleCenter; + label2.TooltipConfig = null; + // + // label4 + // + label4.Font = new Font("Microsoft YaHei UI", 12.5F); + label4.Location = new Point(174, 149); + label4.Name = "label4"; + label4.Size = new Size(86, 23); + label4.TabIndex = 126; + label4.Text = "账户类型"; + label4.TextAlign = ContentAlignment.MiddleCenter; + label4.TooltipConfig = null; + // + // cbAccountType + // + cbAccountType.Font = new Font("Microsoft YaHei UI", 12F); + cbAccountType.List = true; + cbAccountType.ListAutoWidth = true; + cbAccountType.Location = new Point(257, 140); + cbAccountType.Name = "cbAccountType"; + cbAccountType.PlaceholderText = "请选择管理员类型..."; + cbAccountType.Size = new Size(175, 39); + cbAccountType.TabIndex = 127; + // + // txtName + // + txtName.Font = new Font("Microsoft YaHei UI", 12F); + txtName.Location = new Point(535, 141); + txtName.Name = "txtName"; + txtName.PlaceholderText = "请输入管理员姓名..."; + txtName.Size = new Size(175, 39); + txtName.TabIndex = 129; + // + // label5 + // + label5.Font = new Font("Microsoft YaHei UI", 12.5F); + label5.Location = new Point(452, 149); + label5.Name = "label5"; + label5.Size = new Size(86, 23); + label5.TabIndex = 128; + label5.Text = "真实姓名"; + label5.TextAlign = ContentAlignment.MiddleCenter; + label5.TooltipConfig = null; + // + // btnAdd + // + btnAdd.Font = new Font("Microsoft YaHei UI", 12F); + btnAdd.Location = new Point(734, 88); + btnAdd.Name = "btnAdd"; + btnAdd.Size = new Size(93, 39); + btnAdd.TabIndex = 130; + btnAdd.Text = "添 加"; + btnAdd.Type = AntdUI.TTypeMini.Primary; + btnAdd.Click += btnAdd_Click; + // + // btnReset + // + btnReset.Font = new Font("Microsoft YaHei UI", 12F); + btnReset.Location = new Point(734, 140); + btnReset.Name = "btnReset"; + btnReset.Size = new Size(93, 39); + btnReset.TabIndex = 131; + btnReset.Text = "重 置"; + btnReset.Type = AntdUI.TTypeMini.Primary; + btnReset.Click += btnReset_Click; + // + // dgvAdminList + // + dgvAdminList.Bordered = true; + dgvAdminList.Location = new Point(12, 198); + dgvAdminList.Name = "dgvAdminList"; + dgvAdminList.Size = new Size(977, 380); + dgvAdminList.TabIndex = 0; + dgvAdminList.Text = "table1"; + // + // pgnPageNavigate + // + pgnPageNavigate.Location = new Point(12, 584); + pgnPageNavigate.Name = "pgnPageNavigate"; + pgnPageNavigate.ShowSizeChanger = true; + pgnPageNavigate.Size = new Size(977, 27); + pgnPageNavigate.TabIndex = 132; + pgnPageNavigate.Total = 100; + pgnPageNavigate.ValueChanged += pgnPageNavigate_ValueChanged; + pgnPageNavigate.ShowTotalChanged += pgnPageNavigate_ShowTotalChanged; + // + // windowBar1 + // + windowBar1.Font = new Font("Microsoft YaHei UI", 12F); + windowBar1.IsMax = false; + windowBar1.Location = new Point(2, 3); + windowBar1.MaximizeBox = false; + windowBar1.MinimizeBox = false; + windowBar1.Name = "windowBar1"; + windowBar1.Size = new Size(999, 40); + windowBar1.TabIndex = 133; + windowBar1.Text = "添加系统管理员"; + // + // FrmAddAdmin + // + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.FromArgb(235, 243, 255); + ClientSize = new Size(1001, 623); + ControlBox = false; + Controls.Add(windowBar1); + Controls.Add(pgnPageNavigate); + Controls.Add(dgvAdminList); + Controls.Add(btnReset); + Controls.Add(btnAdd); + Controls.Add(txtName); + Controls.Add(label5); + Controls.Add(cbAccountType); + Controls.Add(label4); + Controls.Add(txtPassword); + Controls.Add(label2); + Controls.Add(txtAccount); + Controls.Add(label1); + Icon = (Icon)resources.GetObject("$this.Icon"); + Margin = new Padding(2); + MaximizeBox = false; + MinimizeBox = false; + Name = "FrmAddAdmin"; + Text = "添加管理员"; + Load += FrmAddAdmin_Load; + ResumeLayout(false); + } + + #endregion + //private Sunny.UI.UITextBox txtName; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.DataGridViewTextBoxColumn clId; + private System.Windows.Forms.DataGridViewTextBoxColumn clAdminAccount; + private System.Windows.Forms.DataGridViewTextBoxColumn clAdminPassword; + private System.Windows.Forms.DataGridViewTextBoxColumn clAdminType; + private System.Windows.Forms.DataGridViewTextBoxColumn clAdminName; + private System.Windows.Forms.DataGridViewTextBoxColumn clIsAdmin; + private System.Windows.Forms.DataGridViewTextBoxColumn clDeleteMk; + private AntdUI.Label label1; + private AntdUI.Input txtAccount; + private AntdUI.Input txtPassword; + private AntdUI.Label label2; + private AntdUI.Label label4; + private AntdUI.Select cbAccountType; + private AntdUI.Input txtName; + private AntdUI.Label label5; + private AntdUI.Button btnAdd; + private AntdUI.Button btnReset; + private AntdUI.Table dgvAdminList; + private AntdUI.Pagination pgnPageNavigate; + private AntdUI.WindowBar windowBar1; + } +} \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmAddAdmin.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.cs similarity index 56% rename from SYS.FormUI/AppFunction/FrmAddAdmin.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.cs index 73aa375d59b49f09edba21bc9bf444c2f8e76c0b..a8bd5d79bb90d3cf74fb2b935ae3f7c90c91028c 100644 --- a/SYS.FormUI/AppFunction/FrmAddAdmin.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.cs @@ -21,20 +21,27 @@ *SOFTWARE. * */ +using AntdUI; using EOM.TSHotelManager.Common.Core; -using EOM.TSHotelManager.Common.Util; using Sunny.UI; -using SYS.Common; 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; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { - public partial class FrmAddAdmin : UIForm + public partial class FrmAddAdmin : Window { + TableComHelper tableComHelper = null; public FrmAddAdmin() { InitializeComponent(); + tableComHelper = new TableComHelper(); } ResponseMsg result = null; @@ -43,20 +50,63 @@ namespace SYS.FormUI private void FrmAddAdmin_Load(object sender, EventArgs e) { LoadAdminType(); - cbAccountType.SelectedIndex = 1; + cbAccountType.SelectedIndex = 0; LoadAdminList(); } public void LoadAdminList() + { + pgnPageNavigate.PageSizeOptions = new int[] { 10, 30, 50, 100 }; + var dataCount = 0; + dgvAdminList.Spin("正在加载中...", () => + { + TableComHelper tableComHelper = new TableComHelper(); + dgvAdminList.Columns = tableComHelper.ConvertToAntdColumns(tableComHelper.GenerateDataColumns()); + dgvAdminList.DataSource = GetPageData(pgnPageNavigate.Current, pgnPageNavigate.PageSize, ref dataCount); + pgnPageNavigate.PageSize = 10; + pgnPageNavigate.Total = dataCount; + }, () => + { + System.Diagnostics.Debug.WriteLine("加载结束"); + }); + } + + object GetPageData(int current, int pageSize, ref int totalCount) { result = HttpHelper.Request("Admin/GetAllAdmin"); if (result.statusCode != 200) { UIMessageBox.ShowError("GetAllAdmin+接口服务异常，请提交Issue或尝试更新版本！"); + return null; + } + var listDataSource = HttpHelper.JsonToList(result.message); + totalCount = listDataSource.Count; + var listTableSource = new List(); + + int skip = (current - 1) * pageSize; + listDataSource = listDataSource.OrderBy(a => a.Id).Skip(skip).Take(pageSize).ToList(); + + listTableSource = tableComHelper.ConvertToAntdItems(listDataSource); + return listTableSource; + } + + public void LoadAdminType() + { + result = HttpHelper.Request("Admin/GetAllAdminTypes"); + if (result.statusCode != 200) + { + UIMessageBox.ShowError("GetAllAdminTypes+接口服务异常，请提交Issue或尝试更新版本！"); return; } - dgvAdminList.AutoGenerateColumns = false; - dgvAdminList.DataSource = HttpHelper.JsonToList(result.message); + + cbAccountType.Items.AddRange(HttpHelper.JsonToList(result.message).Select(a => new SelectItem(a.type_name, a.type_id)).ToArray()); + } + + private void btnReset_Click(object sender, EventArgs e) + { + txtAccount.Text = string.Empty; + txtName.Text = string.Empty; + txtPassword.Text = string.Empty; } private void btnAdd_Click(object sender, EventArgs e) @@ -89,30 +139,26 @@ namespace SYS.FormUI } } - public void LoadAdminType() + private void pgnPageNavigate_ValueChanged(object sender, PagePageEventArgs e) { - result = HttpHelper.Request("Admin/GetAllAdminTypes"); - if (result.statusCode != 200) + var dataCount = 0; + dgvAdminList.Spin("正在加载中...", () => { - UIMessageBox.ShowError("GetAllAdminTypes+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - cbAccountType.DataSource = HttpHelper.JsonToList(result.message); - cbAccountType.ValueMember = "type_id"; - cbAccountType.DisplayMember = "type_name"; - } - - private void cbAccountType_SelectedIndexChanged(object sender, EventArgs e) - { - if (cbAccountType.Text == "超级管理员") + dgvAdminList.DataSource = GetPageData(e.Current, e.PageSize, ref dataCount); + pgnPageNavigate.PageSize = 10; + pgnPageNavigate.Total = dataCount; + }, () => { - UIMessageTip.ShowWarning("警告：赋予当前账号为超级管理员意味着其所作的所有行为将不受系统监管\n并有可能造成系统数据的缺失！", 3000); - return; - } + System.Diagnostics.Debug.WriteLine("加载结束"); + txtAccount.Text = string.Empty; + txtName.Text = string.Empty; + txtPassword.Text = string.Empty; + }); } - private void btnReset_Click(object sender, EventArgs e) + private string pgnPageNavigate_ShowTotalChanged(object sender, PagePageEventArgs e) { + return $"{e.PageSize} / {e.Total}条 {e.PageTotal}页"; } } } diff --git a/SYS.FormUI/AppFunction/FrmAddAdmin.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.resx similarity index 80% rename from SYS.FormUI/AppFunction/FrmAddAdmin.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.resx index 85d45dc74e51fe57eed6ba5d1b9052873d02d4f8..85ebd30e5775a2a052a501354b20d0803a1fcc65 100644 --- a/SYS.FormUI/AppFunction/FrmAddAdmin.resx +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.resx @@ -1,17 +1,17 @@  - @@ -117,27 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - True - - - True - - - True - - - True - - - True - - - True - diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.Designer.cs new file mode 100644 index 0000000000000000000000000000000000000000..759b4d13c1e8ea51d216fd8eedb7005da623f437 --- /dev/null +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.Designer.cs @@ -0,0 +1,235 @@ +namespace EOM.TSHotelManager.FormUI +{ + partial class FrmAddRoom + { + /// + /// 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() + { + components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAddRoom)); + flpRoom = new System.Windows.Forms.FlowLayoutPanel(); + ttTips = new Sunny.UI.UIToolTip(components); + txtRoomPosition = new AntdUI.Input(); + label5 = new AntdUI.Label(); + txtRoomNo = new AntdUI.Input(); + label7 = new AntdUI.Label(); + label8 = new AntdUI.Label(); + txtMoney = new AntdUI.InputNumber(); + label9 = new AntdUI.Label(); + cboRoomType = new AntdUI.Select(); + txtDeposit = new AntdUI.InputNumber(); + label10 = new AntdUI.Label(); + btnAddRoom = new AntdUI.Button(); + windowBar1 = new AntdUI.WindowBar(); + SuspendLayout(); + // + // flpRoom + // + flpRoom.AutoScroll = true; + flpRoom.BackColor = System.Drawing.Color.Transparent; + flpRoom.Location = new System.Drawing.Point(83, 56); + flpRoom.Name = "flpRoom"; + flpRoom.Size = new System.Drawing.Size(838, 424); + flpRoom.TabIndex = 116; + flpRoom.MouseEnter += flpRoom_MouseEnter; + // + // ttTips + // + ttTips.BackColor = System.Drawing.Color.FromArgb(54, 54, 54); + ttTips.ForeColor = System.Drawing.Color.FromArgb(239, 239, 239); + ttTips.OwnerDraw = true; + // + // txtRoomPosition + // + txtRoomPosition.Font = new System.Drawing.Font("Microsoft YaHei UI", 14.25F); + txtRoomPosition.Location = new System.Drawing.Point(493, 500); + txtRoomPosition.Name = "txtRoomPosition"; + txtRoomPosition.PasswordChar = '*'; + txtRoomPosition.PasswordCopy = true; + txtRoomPosition.PlaceholderText = "房间位置..."; + txtRoomPosition.Size = new System.Drawing.Size(127, 39); + txtRoomPosition.TabIndex = 129; + // + // label5 + // + label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 14.25F); + label5.Location = new System.Drawing.Point(385, 508); + label5.Name = "label5"; + label5.Size = new System.Drawing.Size(86, 23); + label5.TabIndex = 128; + label5.Text = "房间位置"; + label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // txtRoomNo + // + txtRoomNo.Font = new System.Drawing.Font("Microsoft YaHei UI", 14.25F); + txtRoomNo.Location = new System.Drawing.Point(238, 500); + txtRoomNo.Name = "txtRoomNo"; + txtRoomNo.PlaceholderText = "房号..."; + txtRoomNo.Size = new System.Drawing.Size(127, 39); + txtRoomNo.TabIndex = 127; + txtRoomNo.Validated += txtRoomNo_Validated; + // + // label7 + // + label7.Font = new System.Drawing.Font("Microsoft YaHei UI", 14.25F); + label7.Location = new System.Drawing.Point(130, 508); + label7.Name = "label7"; + label7.Size = new System.Drawing.Size(86, 23); + label7.TabIndex = 126; + label7.Text = "房间编号"; + label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label8 + // + label8.Font = new System.Drawing.Font("Microsoft YaHei UI", 14.25F); + label8.Location = new System.Drawing.Point(640, 508); + label8.Name = "label8"; + label8.Size = new System.Drawing.Size(86, 23); + label8.TabIndex = 130; + label8.Text = "房间单价"; + label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // txtMoney + // + txtMoney.DecimalPlaces = 2; + txtMoney.Font = new System.Drawing.Font("Microsoft YaHei UI", 14.25F); + txtMoney.Location = new System.Drawing.Point(748, 500); + txtMoney.Name = "txtMoney"; + txtMoney.PlaceholderText = "房间单价..."; + txtMoney.Size = new System.Drawing.Size(127, 39); + txtMoney.TabIndex = 131; + txtMoney.Text = "0.00"; + // + // label9 + // + label9.Font = new System.Drawing.Font("Microsoft YaHei UI", 14.25F); + label9.Location = new System.Drawing.Point(130, 572); + label9.Name = "label9"; + label9.Size = new System.Drawing.Size(86, 23); + label9.TabIndex = 132; + label9.Text = "房间类型"; + label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // cboRoomType + // + cboRoomType.Font = new System.Drawing.Font("Microsoft YaHei UI", 14.25F); + cboRoomType.Location = new System.Drawing.Point(238, 562); + cboRoomType.Name = "cboRoomType"; + cboRoomType.Size = new System.Drawing.Size(127, 39); + cboRoomType.TabIndex = 133; + cboRoomType.TextChanged += cboRoomType_TextChanged; + // + // txtDeposit + // + txtDeposit.DecimalPlaces = 2; + txtDeposit.Font = new System.Drawing.Font("Microsoft YaHei UI", 14.25F); + txtDeposit.Location = new System.Drawing.Point(493, 562); + txtDeposit.Name = "txtDeposit"; + txtDeposit.PlaceholderText = "房间单价..."; + txtDeposit.Size = new System.Drawing.Size(127, 39); + txtDeposit.TabIndex = 135; + txtDeposit.Text = "0.00"; + // + // label10 + // + label10.Font = new System.Drawing.Font("Microsoft YaHei UI", 14.25F); + label10.Location = new System.Drawing.Point(385, 570); + label10.Name = "label10"; + label10.Size = new System.Drawing.Size(86, 23); + label10.TabIndex = 134; + label10.Text = "房间押金"; + label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // btnAddRoom + // + btnAddRoom.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + btnAddRoom.Location = new System.Drawing.Point(748, 562); + btnAddRoom.Name = "btnAddRoom"; + btnAddRoom.Size = new System.Drawing.Size(127, 39); + btnAddRoom.TabIndex = 136; + btnAddRoom.Text = "新增客房"; + btnAddRoom.Type = AntdUI.TTypeMini.Primary; + btnAddRoom.Click += btnAddRoom_Click; + // + // windowBar1 + // + windowBar1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + windowBar1.Icon = (System.Drawing.Image)resources.GetObject("windowBar1.Icon"); + windowBar1.Location = new System.Drawing.Point(1, 3); + windowBar1.MaximizeBox = false; + windowBar1.MinimizeBox = false; + windowBar1.Name = "windowBar1"; + windowBar1.Size = new System.Drawing.Size(999, 40); + windowBar1.TabIndex = 137; + windowBar1.Text = "新增客房"; + // + // FrmAddRoom + // + AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + BackColor = System.Drawing.Color.FromArgb(235, 243, 255); + BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + ClientSize = new System.Drawing.Size(1001, 623); + ControlBox = false; + Controls.Add(windowBar1); + Controls.Add(btnAddRoom); + Controls.Add(txtDeposit); + Controls.Add(label10); + Controls.Add(cboRoomType); + Controls.Add(label9); + Controls.Add(txtMoney); + Controls.Add(label8); + Controls.Add(txtRoomPosition); + Controls.Add(label5); + Controls.Add(txtRoomNo); + Controls.Add(label7); + Controls.Add(flpRoom); + Icon = (System.Drawing.Icon)resources.GetObject("$this.Icon"); + MaximizeBox = false; + MinimizeBox = false; + Name = "FrmAddRoom"; + Text = "新增客房"; + Load += FrmAddRoom_Load; + ResumeLayout(false); + } + + #endregion + private System.Windows.Forms.FlowLayoutPanel flpRoom; + private Sunny.UI.UIToolTip ttTips; + private AntdUI.Input txtRoomPosition; + private AntdUI.Label label5; + private AntdUI.Input txtRoomNo; + private AntdUI.Label label7; + private AntdUI.Label label8; + private AntdUI.InputNumber txtMoney; + private AntdUI.Label label9; + private AntdUI.Select cboRoomType; + private AntdUI.InputNumber txtDeposit; + private AntdUI.Label label10; + private AntdUI.Button btnAddRoom; + private AntdUI.WindowBar windowBar1; + } +} \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmAddRoom.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.cs similarity index 91% rename from SYS.FormUI/AppFunction/FrmAddRoom.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.cs index d18afe53d8f804d570972d3cb97b94a48fd51515..c86ac788edc4675585f66fea27274be7c38c044e 100644 --- a/SYS.FormUI/AppFunction/FrmAddRoom.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.cs @@ -22,15 +22,17 @@ * */ using EOM.TSHotelManager.Common.Core; -using EOM.TSHotelManager.Common.Util; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; +using EOM.TSHotelManager.Common.Util; +using AntdUI; +using System.Linq; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { - public partial class FrmAddRoom : UIForm + public partial class FrmAddRoom : Window { public FrmAddRoom() { @@ -115,9 +117,7 @@ namespace SYS.FormUI UIMessageBox.ShowError("SelectRoomTypesAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } - cboRoomType.DataSource = HttpHelper.JsonToList(result.message); - cboRoomType.DisplayMember = "RoomName"; - cboRoomType.ValueMember = "RoomType"; + cboRoomType.Items.AddRange(HttpHelper.JsonToList(result.message).Select(a => new SelectItem(a.RoomName, a.Roomtype)).ToArray()); cboRoomType.SelectedIndex = 0; } @@ -133,12 +133,6 @@ namespace SYS.FormUI flpRoom.Controls.Clear(); for (int i = 0; i < rooms.Count; i++) { - //romt = new ucRoomList(); - //romt.lblMark.Text = "Mark"; //=Mark时，判断为房态图，禁用右键菜单 - //romt.lblRoomNo.Text = rooms[i].RoomNo; - //romt.lblCustoName.Text = rooms[i].CustoNo; - //romt.lblRoomType.Text = rooms[i].RoomName; - //romt.romRoomInfo = rooms[i]; 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]; diff --git a/SYS.FormUI/AppFunction/FrmAddRoom.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.resx similarity index 86% rename from SYS.FormUI/AppFunction/FrmAddRoom.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.resx index 1f6db577f0e2edfb9ef945739687c1a09b3bbf8d..b9f6ba627f39c1b28fd1c930342c3d9e07053bd3 100644 --- a/SYS.FormUI/AppFunction/FrmAddRoom.resx +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.resx @@ -1,17 +1,17 @@  - @@ -121,6 +121,17 @@ 17, 17 + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAARxJREFUWEftk08OwUAUxnsSCxunsJI4iJ04gZ0biAu4BZa9hBULh7Av35v+glRm + OqMqQX9JM96f770v7chCFEUxuzREM3IdC0bGI+GoHNEczdozNg5pehKdSnkJpWSQp+m1fGcinWunFpSS + QR6v19KlCXQeLXZq4YovgDxOr6VT+s3A0HKE7RvQwjG9tnxO+jMGVO9r6cEadW5JOyxnECaDPKzX0o01 + 6TzrGZB2OLUgTAa5X6+FK3rMwIT0DUrtGaBeC+3JIP8CA4Rvh/F/bEAXO7eH8Bn2t2agFvZ3Bn73DjDe + P596Z6Az0NiA3XRGReP+Hfz+fgM+GN/+J/DB+M6Af/4rlyeEu1gPkA6+gYVE+7KtOVUDFldzd7LsCvM7 + /TvRsI3tAAAAAElFTkSuQmCC + + AAABAAEAICAAAAEAGACHAQAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAAFz diff --git a/SYS.FormUI/AppFunction/FrmAdminManager.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmAdminManager.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.Designer.cs index eee23d89baf2b06ace606afef2b7e9317bff4e42..dd3d0500e9b209dd9c4b0d1ed299bb35eaff8cc8 100644 --- a/SYS.FormUI/AppFunction/FrmAdminManager.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.Designer.cs @@ -1,5 +1,5 @@  -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmAdminManager { diff --git a/SYS.FormUI/AppFunction/FrmAdminManager.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmAdminManager.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.cs index 12585f6a02bb9d94c2d021546140937e73573943..1c404eb62d151bba18707a30e9e896cbc3a1ec54 100644 --- a/SYS.FormUI/AppFunction/FrmAdminManager.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.cs @@ -23,11 +23,11 @@ */ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmAdminManager : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmAdminManager.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmAdminManager.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.resx diff --git a/SYS.FormUI/AppFunction/FrmAuthority.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmAuthority.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.Designer.cs index 280b727495c8c036c58bd54c5aec4ba0f88da2a6..654e8ce3cad84268ddfdfb14b6b44a5cd0de6752 100644 --- a/SYS.FormUI/AppFunction/FrmAuthority.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.Designer.cs @@ -1,5 +1,5 @@  -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmAuthority { diff --git a/SYS.FormUI/AppFunction/FrmAuthority.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmAuthority.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.cs index cb5a0a767649e6530fcc6560b62fef15fe639126..0de1b6ae62f87f5579fa41a050c063cc4bf832f7 100644 --- a/SYS.FormUI/AppFunction/FrmAuthority.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.cs @@ -24,12 +24,12 @@ using EOM.TSHotelManager.Common.Core; using jvncorelib.EntityLib; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Linq; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmAuthority : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmAuthority.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmAuthority.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.resx diff --git a/SYS.FormUI/AppFunction/FrmBaseManager.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmBaseManager.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.Designer.cs index eee278f94d64a636dd198f6aa025ec8d44bc98c6..4fad7734027a6a7aa34f1af72dd67f9df863be60 100644 --- a/SYS.FormUI/AppFunction/FrmBaseManager.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.Designer.cs @@ -1,5 +1,5 @@  -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmBaseManager { diff --git a/SYS.FormUI/AppFunction/FrmBaseManager.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.cs similarity index 97% rename from SYS.FormUI/AppFunction/FrmBaseManager.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.cs index 91c0ccc765a4e07a82c924c4ce900cb0600a77f2..8ee714e7c6cf0c2a5091fb3945952a547f6daa77 100644 --- a/SYS.FormUI/AppFunction/FrmBaseManager.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.cs @@ -24,7 +24,7 @@ using Sunny.UI; using System; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmBaseManager : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmBaseManager.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmBaseManager.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.resx diff --git a/SYS.FormUI/AppFunction/FrmCash.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCash.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmCash.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCash.Designer.cs index 90f9a2f3bfb04be7f7113edd4f232d5bc131c8fa..f82d86d0c44527fb44b3f1829337f492053231b0 100644 --- a/SYS.FormUI/AppFunction/FrmCash.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCash.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmCash { diff --git a/SYS.FormUI/AppFunction/FrmCash.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCash.cs similarity index 95% rename from SYS.FormUI/AppFunction/FrmCash.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCash.cs index df20bceeb2bd7ca93c3584f9b075807d16d964ab..90131f8006629e66764af78df5afcaf1b2a380a9 100644 --- a/SYS.FormUI/AppFunction/FrmCash.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCash.cs @@ -22,13 +22,13 @@ * */ using EOM.TSHotelManager.Common.Core; -using EOM.TSHotelManager.Common.Util; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Linq; +using EOM.TSHotelManager.Common.Util; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmCash : UIForm { @@ -64,7 +64,7 @@ namespace SYS.FormUI cboCashPerson.ValueMember = "WorkerId"; LoadCashInfo(); - txtCashNo.Text = Util.GetListNewId("CN", 3, 1, "-").FirstOrDefault(); + txtCashNo.Text = ApplicationUtil.GetListNewId("CN", 3, 1, "-").FirstOrDefault(); if (AdminInfo.Type != "GeneralManager" && AdminInfo.Type != "FinanceManager" && AdminInfo.isAdmin == false) { btnOK.Enabled = false; @@ -116,7 +116,7 @@ namespace SYS.FormUI LoadCashInfo(); #region 获取添加操作日志所需的信息 RecordHelper.Record(AdminInfo.Account + AdminInfo.Name + "于" + Convert.ToDateTime(DateTime.Now) + "进行资产录入，资产编号为：" + txtCashNo.Text.Trim(), 3); - txtCashNo.Text = Util.GetListNewId("CN", 3, 1, "-").FirstOrDefault(); + txtCashNo.Text = ApplicationUtil.GetListNewId("CN", 3, 1, "-").FirstOrDefault(); #endregion } else diff --git a/SYS.FormUI/AppFunction/FrmCash.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmCash.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmCash.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCash.resx diff --git a/SYS.FormUI/AppFunction/FrmChangeAdminPwd.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmChangeAdminPwd.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.Designer.cs index fe2c0227015496eebf784cd34bb9db10a8739f77..407191b016bcf578cceabab10d24142ce98a89f9 100644 --- a/SYS.FormUI/AppFunction/FrmChangeAdminPwd.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.Designer.cs @@ -1,5 +1,5 @@  -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmChangeAdminPwd { diff --git a/SYS.FormUI/AppFunction/FrmChangeAdminPwd.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmChangeAdminPwd.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.cs index 5fd0913c4775ee98743aa6350cdd8ee9b6bf6834..a462981407b9a6dbc0dc9c0c1dafff66e7d94cde 100644 --- a/SYS.FormUI/AppFunction/FrmChangeAdminPwd.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.cs @@ -24,13 +24,13 @@ using EOM.TSHotelManager.Common.Core; using jvncorelib.EntityLib; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Drawing; using System.Text.RegularExpressions; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmChangeAdminPwd : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmChangeAdminPwd.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmChangeAdminPwd.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.resx diff --git a/SYS.FormUI/AppFunction/FrmChangePosition.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmChangePosition.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.Designer.cs index fed194499a58595aab41bda2691b840a24dcb2e6..1e611cfcea9b0c2e0a18b78c342f490bac921883 100644 --- a/SYS.FormUI/AppFunction/FrmChangePosition.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmChangePosition { diff --git a/SYS.FormUI/AppFunction/FrmChangePosition.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmChangePosition.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.cs index 4f52a85544ad9210e56ff23ebef849597cdf6e3a..f9c930bcde14f162b40df8ad9513a1e5b774ca20 100644 --- a/SYS.FormUI/AppFunction/FrmChangePosition.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.cs @@ -24,11 +24,11 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmChangePosition : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmChangePosition.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmChangePosition.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.resx diff --git a/SYS.FormUI/AppFunction/FrmChangeRoom.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmChangeRoom.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.Designer.cs index 7c56a0106a330e73ffae06ba7bd4cc355ee48121..c67345fc510f4d35eca2fb2c8de60bca78cc8e74 100644 --- a/SYS.FormUI/AppFunction/FrmChangeRoom.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmChangeRoom { diff --git a/SYS.FormUI/AppFunction/FrmChangeRoom.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmChangeRoom.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.cs index d93da4c35d7f100d53c32c471c60967cc5c28ea1..4236e4e9d5fb4ed96e6032789ebf9089160b61e1 100644 --- a/SYS.FormUI/AppFunction/FrmChangeRoom.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.cs @@ -24,12 +24,12 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Transactions; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmChangeRoom : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmChangeRoom.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmChangeRoom.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.resx diff --git a/SYS.FormUI/AppFunction/FrmChart.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmChart.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmChart.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmChart.Designer.cs index d36ff341f0396d4f531a72e6f8c9f4ffd4b6d6c5..181be9b78a32c1f37519f3dcda030173eeaccba4 100644 --- a/SYS.FormUI/AppFunction/FrmChart.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmChart.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmChart { diff --git a/SYS.FormUI/AppFunction/FrmChart.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmChart.cs similarity index 97% rename from SYS.FormUI/AppFunction/FrmChart.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmChart.cs index 90af9883512f4ef2421acb5c8002186887b4c65d..aaa82eda5e3fbe7256bf33e8fbac699fe5952528 100644 --- a/SYS.FormUI/AppFunction/FrmChart.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmChart.cs @@ -21,12 +21,12 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; using System; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmChart : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmChart.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmChart.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmChart.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmChart.resx diff --git a/SYS.FormUI/AppFunction/FrmCheckIn.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmCheckIn.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.Designer.cs index 858764df2a8596c649d540aeedfc75f02070a48e..a6e1a11c88df7493ef7806744f298f6d9fcfd48b 100644 --- a/SYS.FormUI/AppFunction/FrmCheckIn.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmCheckIn { diff --git a/SYS.FormUI/AppFunction/FrmCheckIn.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmCheckIn.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.cs index 8ed305a431a9a9d88b7df7bf9b845d2a60ecf4c8..17a87249035f3cb7ea4dce07dc98caff58a945fa 100644 --- a/SYS.FormUI/AppFunction/FrmCheckIn.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.cs @@ -25,13 +25,13 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Linq; using System.Transactions; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmCheckIn : UIEditForm { diff --git a/SYS.FormUI/AppFunction/FrmCheckIn.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmCheckIn.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.resx diff --git a/SYS.FormUI/AppFunction/FrmCheckList.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmCheckList.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.Designer.cs index 23052f4491e584e91e16293d86f3f4ceba5804ee..155439673570617d5196da32bf426be97a17f8a8 100644 --- a/SYS.FormUI/AppFunction/FrmCheckList.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmCheckList { diff --git a/SYS.FormUI/AppFunction/FrmCheckList.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.cs similarity index 96% rename from SYS.FormUI/AppFunction/FrmCheckList.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.cs index d3e3b6845c6a8928b4765a54b11437111d14cfb3..7bd0d105f6787db1ff5ed49489c7b5c46da5b166 100644 --- a/SYS.FormUI/AppFunction/FrmCheckList.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.cs @@ -25,10 +25,10 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmCheckList : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmCheckList.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmCheckList.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.resx diff --git a/SYS.FormUI/AppFunction/FrmCheckOutForm.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmCheckOutForm.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.Designer.cs index 358e0946d3538a234bf1bfac7621736e19d0feb0..b301ae8d601cbc8095c22a05c1c06a071f93c64b 100644 --- a/SYS.FormUI/AppFunction/FrmCheckOutForm.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmCheckOutForm { diff --git a/SYS.FormUI/AppFunction/FrmCheckOutForm.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmCheckOutForm.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.cs index 3ee7f3399d00179da780fab0d1448973d95d0666..4afe80c38ec04e7c26c29d166550da3aed3c11ef 100644 --- a/SYS.FormUI/AppFunction/FrmCheckOutForm.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.cs @@ -24,14 +24,14 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Drawing; using System.Transactions; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmCheckOutForm : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmCheckOutForm.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmCheckOutForm.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.resx diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.Designer.cs new file mode 100644 index 0000000000000000000000000000000000000000..8e5380136888129f3de553d4609ada4c138e7394 --- /dev/null +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.Designer.cs @@ -0,0 +1,268 @@ +namespace EOM.TSHotelManager.FormUI +{ + partial class FrmCustoManager + { + /// + /// 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(FrmCustoManager)); + cmsCustoManager = new Sunny.UI.UIContextMenuStrip(); + tsmiCustoNo = new ToolStripMenuItem(); + dgvCustomerList = new AntdUI.Table(); + btnPg = new AntdUI.Pagination(); + windowBar1 = new AntdUI.WindowBar(); + txtCustoNo = new AntdUI.Input(); + txtCustoName = new AntdUI.Input(); + label2 = new AntdUI.Label(); + label1 = new AntdUI.Label(); + btnSerach = new AntdUI.Button(); + btnAddCusto = new AntdUI.Button(); + btnExport = new AntdUI.Button(); + btnUpdate = new AntdUI.Button(); + cbOnlyVip = new AntdUI.Checkbox(); + cbExportAll = new AntdUI.Checkbox(); + divider1 = new AntdUI.Divider(); + cmsCustoManager.SuspendLayout(); + SuspendLayout(); + // + // cmsCustoManager + // + cmsCustoManager.BackColor = Color.FromArgb(243, 249, 255); + cmsCustoManager.Font = new Font("微软雅黑", 12F); + cmsCustoManager.Items.AddRange(new ToolStripItem[] { tsmiCustoNo }); + cmsCustoManager.Name = "cmsCustoManager"; + cmsCustoManager.Size = new Size(177, 30); + // + // tsmiCustoNo + // + tsmiCustoNo.Image = Properties.Resources.复制; + tsmiCustoNo.Name = "tsmiCustoNo"; + tsmiCustoNo.Size = new Size(176, 26); + tsmiCustoNo.Text = "复制用户编号"; + tsmiCustoNo.Click += tsmiCustoNo_Click; + // + // dgvCustomerList + // + dgvCustomerList.Bordered = true; + dgvCustomerList.ContextMenuStrip = cmsCustoManager; + dgvCustomerList.Location = new Point(4, 49); + dgvCustomerList.Name = "dgvCustomerList"; + dgvCustomerList.Size = new Size(998, 476); + dgvCustomerList.TabIndex = 126; + dgvCustomerList.CellClick += dgvCustomerList_CellClick; + // + // btnPg + // + btnPg.Current = 0; + btnPg.Location = new Point(4, 531); + btnPg.Name = "btnPg"; + btnPg.PageSize = 15; + btnPg.ShowSizeChanger = true; + btnPg.Size = new Size(405, 31); + btnPg.TabIndex = 133; + btnPg.Total = 100; + btnPg.ValueChanged += btnPg_ValueChanged; + btnPg.ShowTotalChanged += btnPg_ShowTotalChanged; + // + // windowBar1 + // + windowBar1.Font = new Font("Microsoft YaHei UI", 12F); + windowBar1.Icon = (Image)resources.GetObject("windowBar1.Icon"); + windowBar1.IsMax = false; + windowBar1.Location = new Point(4, 3); + windowBar1.MaximizeBox = false; + windowBar1.MinimizeBox = false; + windowBar1.Name = "windowBar1"; + windowBar1.Size = new Size(999, 40); + windowBar1.TabIndex = 138; + windowBar1.Text = "客户信息管理"; + // + // txtCustoNo + // + txtCustoNo.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); + txtCustoNo.Location = new Point(104, 573); + txtCustoNo.Name = "txtCustoNo"; + txtCustoNo.PlaceholderText = "请输入客户编号..."; + txtCustoNo.Size = new Size(173, 42); + txtCustoNo.TabIndex = 139; + // + // txtCustoName + // + txtCustoName.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); + txtCustoName.Location = new Point(375, 573); + txtCustoName.Name = "txtCustoName"; + txtCustoName.PlaceholderText = "请输入客户姓名..."; + txtCustoName.Size = new Size(173, 42); + txtCustoName.TabIndex = 140; + // + // label2 + // + label2.Font = new Font("Microsoft YaHei UI", 12.5F); + label2.Location = new Point(12, 582); + label2.Name = "label2"; + label2.Size = new Size(86, 26); + label2.TabIndex = 141; + label2.Text = "客户编号"; + label2.TextAlign = ContentAlignment.MiddleCenter; + label2.TooltipConfig = null; + // + // label1 + // + label1.Font = new Font("Microsoft YaHei UI", 12.5F); + label1.Location = new Point(283, 582); + label1.Name = "label1"; + label1.Size = new Size(86, 26); + label1.TabIndex = 142; + label1.Text = "客户姓名"; + label1.TextAlign = ContentAlignment.MiddleCenter; + label1.TooltipConfig = null; + // + // btnSerach + // + btnSerach.Font = new Font("Microsoft YaHei UI", 12F); + btnSerach.Location = new Point(567, 568); + btnSerach.Name = "btnSerach"; + btnSerach.Size = new Size(93, 47); + btnSerach.TabIndex = 143; + btnSerach.Text = "搜 索"; + btnSerach.Type = AntdUI.TTypeMini.Primary; + btnSerach.Click += btnSerach_Click; + // + // btnAddCusto + // + btnAddCusto.Font = new Font("Microsoft YaHei UI", 12F); + btnAddCusto.Location = new Point(678, 568); + btnAddCusto.Name = "btnAddCusto"; + btnAddCusto.Size = new Size(93, 47); + btnAddCusto.TabIndex = 144; + btnAddCusto.Text = "添加客户"; + btnAddCusto.Type = AntdUI.TTypeMini.Primary; + btnAddCusto.Click += btnAddCusto_Click; + // + // btnExport + // + btnExport.Enabled = false; + btnExport.Font = new Font("Microsoft YaHei UI", 12F); + btnExport.Location = new Point(900, 568); + btnExport.Name = "btnExport"; + btnExport.Size = new Size(93, 47); + btnExport.TabIndex = 145; + btnExport.Text = "导出列表"; + btnExport.Type = AntdUI.TTypeMini.Primary; + btnExport.Click += btnExport_Click; + // + // btnUpdate + // + btnUpdate.Enabled = false; + btnUpdate.Font = new Font("Microsoft YaHei UI", 12F); + btnUpdate.Location = new Point(789, 568); + btnUpdate.Name = "btnUpdate"; + btnUpdate.Size = new Size(93, 47); + btnUpdate.TabIndex = 146; + btnUpdate.Text = "修改客户"; + btnUpdate.Type = AntdUI.TTypeMini.Primary; + btnUpdate.Click += btnUpdate_Click; + // + // cbOnlyVip + // + cbOnlyVip.AutoCheck = true; + cbOnlyVip.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); + cbOnlyVip.Location = new Point(422, 538); + cbOnlyVip.Name = "cbOnlyVip"; + cbOnlyVip.Size = new Size(120, 23); + cbOnlyVip.TabIndex = 147; + cbOnlyVip.Text = "仅查看会员"; + cbOnlyVip.CheckedChanged += cbOnlyVip_CheckedChanged; + // + // cbExportAll + // + cbExportAll.AutoCheck = true; + cbExportAll.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); + cbExportAll.Location = new Point(559, 538); + cbExportAll.Name = "cbExportAll"; + cbExportAll.Size = new Size(108, 23); + cbExportAll.TabIndex = 148; + cbExportAll.Text = "导出全部"; + // + // divider1 + // + divider1.ColorSplit = Color.Blue; + divider1.Font = new Font("Microsoft YaHei UI", 12F); + divider1.Location = new Point(678, 538); + divider1.Name = "divider1"; + divider1.Size = new Size(325, 23); + divider1.TabIndex = 149; + divider1.Text = "右键列表复制客户编号"; + // + // FrmCustoManager + // + AutoScaleMode = AutoScaleMode.None; + BackColor = Color.FromArgb(235, 243, 255); + ClientSize = new Size(1005, 623); + ControlBox = false; + Controls.Add(divider1); + Controls.Add(cbExportAll); + Controls.Add(cbOnlyVip); + Controls.Add(btnUpdate); + Controls.Add(btnExport); + Controls.Add(btnAddCusto); + Controls.Add(btnSerach); + Controls.Add(label1); + Controls.Add(label2); + Controls.Add(txtCustoName); + Controls.Add(txtCustoNo); + Controls.Add(windowBar1); + Controls.Add(btnPg); + Controls.Add(dgvCustomerList); + Icon = (Icon)resources.GetObject("$this.Icon"); + MaximizeBox = false; + MinimizeBox = false; + Name = "FrmCustoManager"; + Text = "客户信息管理"; + Load += FrmCustoManager_Load; + cmsCustoManager.ResumeLayout(false); + ResumeLayout(false); + } + + #endregion + private Sunny.UI.UIContextMenuStrip cmsCustoManager; + private System.Windows.Forms.ToolStripMenuItem tsmiCustoNo; + private AntdUI.Table dgvCustomerList; + private AntdUI.Pagination btnPg; + private AntdUI.WindowBar windowBar1; + private AntdUI.Input txtCustoNo; + private AntdUI.Input txtCustoName; + private AntdUI.Label label2; + private AntdUI.Label label1; + private AntdUI.Button btnSerach; + private AntdUI.Button btnAddCusto; + private AntdUI.Button btnExport; + private AntdUI.Button btnUpdate; + private AntdUI.Checkbox cbOnlyVip; + private AntdUI.Checkbox cbExportAll; + private AntdUI.Divider divider1; + } +} \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmCustoManager.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.cs similarity index 30% rename from SYS.FormUI/AppFunction/FrmCustoManager.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.cs index 2ac03084d2a827ba77640d538fb33cf1704b1bbf..f3a6b7bdd498a99a03ec78fef9f9c8c4a3527374 100644 --- a/SYS.FormUI/AppFunction/FrmCustoManager.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.cs @@ -23,15 +23,19 @@ */ using EOM.TSHotelManager.Common.Core; -using Sunny.UI; -using SYS.Common; +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 jvncorelib.EntityLib; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { - public partial class FrmCustoManager : UIForm + public partial class FrmCustoManager : Window { public static string cm_CustoNo; public static string cm_CustoName; @@ -48,11 +52,12 @@ namespace SYS.FormUI //定义委托类型的变量 public static ReloadCustomerList ReloadCusto; - + TableComHelper tableComHelper = null; public FrmCustoManager() { InitializeComponent(); ReloadCusto = LoadCustomer; + tableComHelper = new TableComHelper(); } Dictionary dic = null; @@ -60,31 +65,35 @@ namespace SYS.FormUI private void FrmCustoManager_Load(object sender, EventArgs e) { - //dgvCustomerList.AutoGenerateColumns = false; this.btnPg.PageSize = 15; LoadCustomer(); - LoadCustoType(); - //txtCustoNo.ReadOnly = true; - //cboSex.SelectedIndex = 0; - //cboCustoType.SelectedIndex = 3; - } - #region 加载客户类型事件方法 - public void LoadCustoType() - { - //cboCustoType.DataSource = CustoTypeManager.SelectCustoTypesAll(); - //cboCustoType.DisplayMember = "TypeName";//显示的列名 - //cboCustoType.ValueMember = "UserType";//绑定的值 } - #endregion - int count = 0; #region 加载用户信息列表 private void LoadCustomer(bool onlyVip = false) + { + var dataCount = 0; + btnPg.PageSizeOptions = new int[] { 15, 30, 50, 100 }; + dgvCustomerList.Spin("正在加载中...", () => + { + TableComHelper tableComHelper = new TableComHelper(); + dgvCustomerList.Columns = tableComHelper.ConvertToAntdColumns(tableComHelper.GenerateDataColumns()); + dgvCustomerList.DataSource = GetPageData(btnPg.Current, btnPg.PageSize, ref dataCount, onlyVip); + btnPg.PageSize = 15; + btnPg.Current = 1; + btnPg.Total = dataCount; + }, () => + { + System.Diagnostics.Debug.WriteLine("加载结束"); + }); + } + + object GetPageData(int current, int pageSize, ref int totalCount, bool onlyVip = false) { dic = new Dictionary() { - { "pageIndex","1"}, - { "pageSize","15"} + { "pageIndex",current <= 0 ? "1":current.ToString()}, + { "pageSize",pageSize.ToString()} }; if (onlyVip) { @@ -93,186 +102,231 @@ namespace SYS.FormUI result = HttpHelper.Request("Custo/SelectCustoAll", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); - return; + AntdUI.Message.error(this,"SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); + return null!; } OSelectAllDto custos = HttpHelper.JsonToModel>(result.message); - this.btnPg.TotalCount = custos.total; - this.dgvCustomerList.AutoGenerateColumns = false; - this.dgvCustomerList.DataSource = custos.listSource; + totalCount = custos.total; + var listTableSource = new List(); + + custos.listSource = custos.listSource.OrderBy(a => a.CustoNo).ThenBy(a => a.CustoName).ToList(); + + TableComHelper tableComHelper = new TableComHelper(); + listTableSource = tableComHelper.ConvertToAntdItems(custos.listSource); + + return listTableSource; } - #endregion + #endregion - #region 添加会员信息事件方法 - private void picAddCusto_Click_1(object sender, EventArgs e) + /// + /// 将DataGridView里的数据转换成DataTable + /// + /// + /// + public DataTable ConvertDataGridViewToDataTable(DataGridView dgv) { - FrmEditInputs frmInputs = new FrmEditInputs(); - frmInputs.ShowDialog(); - frmInputs.Text = "添加客户"; + // 创建一个新的DataTable对象 + DataTable dt = new DataTable(); + + // 为DataTable添加列，列名与DataGridView的列名相同 + foreach (DataGridViewColumn column in dgv.Columns) + { + dt.Columns.Add(column.Name, column.ValueType); + } + + // 遍历DataGridView的每一行，并将其添加到DataTable中 + foreach (DataGridViewRow row in dgv.Rows) + { + if (!row.IsNewRow) // 排除新行（未绑定的行） + { + DataRow dataRow = dt.NewRow(); + foreach (DataGridViewCell cell in row.Cells) + { + dataRow[cell.OwningColumn.Name] = cell.Value; + } + dt.Rows.Add(dataRow); + } + } + + return dt; } - #endregion - #region 修改会员信息事件方法 - private void picUpdateCusto_Click_1(object sender, EventArgs e) + private void tsmiCustoNo_Click(object sender, EventArgs e) { - if (dgvCustomerList.SelectedRows.Count < 0) + if (!cm_CustoNo.IsNullOrEmpty()) { - UIMessageBox.Show("未选中客户，无法继续操作！", "系统提示", UIStyle.Red, UIMessageBoxButtons.OK); - return; + Clipboard.SetText(cm_CustoNo); + AntdUI.Message.success(this, "复制完成！"); } - cm_CustoNo = dgvCustomerList.SelectedRows[0].Cells["CustoNo"].Value.ToString(); - cm_CustoName = dgvCustomerList.SelectedRows[0].Cells["CustoName"].Value.ToString(); - cm_CustoSex = (int)dgvCustomerList.SelectedRows[0].Cells["Column4"].Value; - cm_CustoTel = dgvCustomerList.SelectedRows[0].Cells["CustoTel"].Value.ToString(); - cm_PassportType = (int)dgvCustomerList.SelectedRows[0].Cells["Column1"].Value; - cm_CustoID = dgvCustomerList.SelectedRows[0].Cells["Column3"].Value.ToString(); - cm_CustoAddress = dgvCustomerList.SelectedRows[0].Cells["CustoAdress"].Value.ToString(); - cm_CustoBirth = Convert.ToDateTime(dgvCustomerList.SelectedRows[0].Cells["CustoBirth"].Value); - cm_CustoType = (int)dgvCustomerList.SelectedRows[0].Cells["Column2"].Value; - FrmEditInputs frmInputs = new FrmEditInputs(); - frmInputs.Text = "修改客户信息"; - frmInputs.ShowDialog(); } - #endregion - #region 搜索会员信息事件方法 - private void picSearch_Click_1(object sender, EventArgs e) + private void btnSerach_Click(object sender, EventArgs e) { - dgvCustomerList.ClearRows(); - dgvCustomerList.AutoGenerateColumns = false; OSelectAllDto custos = new OSelectAllDto(); - if (!txtCustoNo.Text.IsNullOrEmpty()) + if (!txtCustoNo.Text.IsNullOrEmpty() || !txtCustoName.Text.IsNullOrEmpty()) { - dic = new Dictionary - { - { "CustoNo", txtCustoNo.Text.Trim() } - }; - result = HttpHelper.Request("Custo/SelectCustoByInfo", null, dic); - if (result.statusCode != 200) + if (!txtCustoNo.Text.IsNullOrEmpty()) { - UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); - return; + dic = new Dictionary + { + { "CustoNo", txtCustoNo.Text.Trim() } + }; } - custos = HttpHelper.JsonToModel>(result.message); - } - else if (!txtCustoName.Text.IsNullOrEmpty()) - { - dic = new Dictionary + if (!txtCustoName.Text.IsNullOrEmpty()) { - { "CustoName", txtCustoName.Text.Trim() } - }; + dic = new Dictionary + { + { "CustoName", txtCustoName.Text.Trim() } + }; + } result = HttpHelper.Request("Custo/SelectCustoByInfo", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCustoByInfo+接口服务异常，请提交Issue或尝试更新版本！"); + AntdUI.Message.error(this,"SelectCustoByInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } - custos = HttpHelper.JsonToModel>(result.message); } else { result = HttpHelper.Request("Custo/SelectCustoAll?pageIndex=1&pageSize=15"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); + AntdUI.Message.error(this, "SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } - custos = HttpHelper.JsonToModel>(result.message); } + + custos = HttpHelper.JsonToModel>(result.message); + + var listTableSource = new List(); + + custos.listSource = custos.listSource.OrderBy(a => a.CustoNo).ThenBy(a => a.CustoName).ToList(); + + TableComHelper tableComHelper = new TableComHelper(); + listTableSource = tableComHelper.ConvertToAntdItems(custos.listSource); + + dgvCustomerList.Spin("正在加载中...", () => + { + dgvCustomerList.DataSource = listTableSource; + }, () => + { + System.Diagnostics.Debug.WriteLine("加载结束"); + }); + dgvCustomerList.DataSource = custos; } - #endregion - #region 导出事件方法 - private void picLoadOut_Click_1(object sender, EventArgs e) + private void btnAddCusto_Click(object sender, EventArgs e) { - // 调用之前定义的导出方法 - ExportHelper exportHelper = new ExportHelper(); - SaveFileDialog saveFileDialog = new SaveFileDialog(); - // 设置保存对话框的属性 - saveFileDialog.Filter = "2003~2007工作表*.xls|*.xls|2010及以上版本工作表*.xlsx|*.xlsx"; - saveFileDialog.Title = cbExportAll.Checked ? "导出Excel文件(导出全部)" : "导出Excel文件(导出当前页)"; - saveFileDialog.FileName = Convert.ToDateTime(DateTime.Now).ToString("yyyyMMddHHmmss") + "_" + "客户列表"; // 默认文件名 - saveFileDialog.CheckPathExists = true; // 检查目录是否存在 - - if (saveFileDialog.ShowDialog() == DialogResult.OK) - { - // 用户确认保存，获取选择的文件路径 - string filePath = saveFileDialog.FileName; - - try - { - if (cbExportAll.Checked) - { - dic = new Dictionary() - { - { "pageIndex",null}, - { "pageSize",null} - }; - ResponseMsg response = HttpHelper.Request("Custo/SelectCustoAll", null, dic); - if (response.statusCode != 200) - { - UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - OSelectAllDto custos = HttpHelper.JsonToModel>(response.message); - exportHelper.ExportDataToExcel(custos.listSource, filePath, new List { "CustoSex", "PassportType", "CustoID", "CustoType", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date" }); - } - else - { - exportHelper.ExportDataGridViewToExcel(dgvCustomerList, filePath, new List { "Column1", "Column2", "Column3", "Column4" }); - } - UIMessageBox.Show("导出成功！", "信息", UIStyle.Blue, UIMessageBoxButtons.OK); - System.Diagnostics.Process.Start("Explorer.exe", filePath); - #region 获取添加操作日志所需的信息 - RecordHelper.Record(LoginInfo.WorkerClub + LoginInfo.WorkerName + LoginInfo.WorkerPosition + LoginInfo.WorkerName + "于" + Convert.ToDateTime(DateTime.Now) + "导出了" + "后台用户信息!", 3); - #endregion - } - catch (Exception ex) - { - // 处理可能发生的任何错误 - UIMessageBox.Show($"导出失败: {ex.Message}", "错误", UIStyle.Red, UIMessageBoxButtons.OK); - } - } - // 如果用户取消了保存，则不执行任何操作 + FrmEditInputs frmInputs = new FrmEditInputs(); + frmInputs.ShowDialog(); + frmInputs.Text = "添加客户"; } - #endregion + private void btnExport_Click(object sender, EventArgs e) + { + //// 调用之前定义的导出方法 + //ExportHelper exportHelper = new ExportHelper(); + //SaveFileDialog saveFileDialog = new SaveFileDialog(); + //// 设置保存对话框的属性 + //saveFileDialog.Filter = "2003~2007工作表*.xls|*.xls|2010及以上版本工作表*.xlsx|*.xlsx"; + //saveFileDialog.Title = cbExportAll.Checked ? "导出Excel文件(导出全部)" : "导出Excel文件(导出当前页)"; + //saveFileDialog.FileName = Convert.ToDateTime(DateTime.Now).ToString("yyyyMMddHHmmss") + "_" + "客户列表"; // 默认文件名 + //saveFileDialog.CheckPathExists = true; // 检查目录是否存在 + + //if (saveFileDialog.ShowDialog() == DialogResult.OK) + //{ + // // 用户确认保存，获取选择的文件路径 + // string filePath = saveFileDialog.FileName; + + // try + // { + // if (cbExportAll.Checked) + // { + // dic = new Dictionary() + // { + // { "pageIndex",null}, + // { "pageSize",null} + // }; + // ResponseMsg response = HttpHelper.Request("Custo/SelectCustoAll", null, dic); + // if (response.statusCode != 200) + // { + // AntdUI.Message.error(this,"SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); + // return; + // } + // OSelectAllDto custos = HttpHelper.JsonToModel>(response.message); + // exportHelper.ExportDataToExcel(custos.listSource, filePath, new List { "CustoSex", "PassportType", "CustoID", "CustoType", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date" }); + // } + // else + // { + // exportHelper.ExportDataTableToExcel(ConvertDataGridViewToDataTable(dgvCustomerList.CopyData(dgvCustomerList.SelectedIndex), filePath, new List { "Column1", "Column2", "Column3", "Column4" }); + // } + // AntdUI.Message.success(this,"导出成功！"); + // System.Diagnostics.Process.Start("Explorer.exe", filePath); + // #region 获取添加操作日志所需的信息 + // RecordHelper.Record(LoginInfo.WorkerClub + LoginInfo.WorkerName + LoginInfo.WorkerPosition + LoginInfo.WorkerName + "于" + Convert.ToDateTime(DateTime.Now) + "导出了" + "后台用户信息!", 3); + // #endregion + // } + // catch (Exception ex) + // { + // // 处理可能发生的任何错误 + // AntdUI.Message.error(this, $"导出失败: {ex.Message}"); + // } + //} + //// 如果用户取消了保存，则不执行任何操作 + } - private void btnPg_PageChanged(object sender, object pagingSource, int pageIndex, int count) + private void btnUpdate_Click(object sender, EventArgs e) { - dic = new Dictionary() - { - { "pageIndex",pageIndex.ToString()}, - { "pageSize",count.ToString()} - }; - result = HttpHelper.Request("Custo/SelectCustoAll", null, dic); - if (result.statusCode != 200) + if (dgvCustomerList.SelectedIndex < 0) { - UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); + AntdUI.Message.error(this, "未选中客户，无法继续操作！"); return; } - OSelectAllDto custos = HttpHelper.JsonToModel>(result.message); - btnPg.TotalCount = custos.total; - this.dgvCustomerList.AutoGenerateColumns = false; - this.dgvCustomerList.DataSource = custos.listSource; + FrmEditInputs frmInputs = new FrmEditInputs(); + frmInputs.Text = "修改客户信息"; + frmInputs.ShowDialog(); } - private void btnPg_Paint(object sender, PaintEventArgs e) + private void dgvCustomerList_CellClick(object sender, TableClickEventArgs e) { + if (e.Record is IList data) + { + cm_CustoNo = data[0].value.ToString(); + cm_CustoName = data[1].value.ToString(); + cm_CustoSex = Convert.ToInt32(SexConstant.GetCodeByDescription(data[2].value.ToString())); + cm_CustoTel = data[3].value.ToString(); + cm_CustoBirth = Convert.ToDateTime(data[4].value.ToString()); + cm_CustoType = Convert.ToInt32(CustomTypeConstant.GetCodeByDescription(data[5].value.ToString())); + cm_PassportType = Convert.ToInt32(PassportConstant.GetCodeByDescription(data[6].value.ToString())); + cm_CustoID = data[7].value.ToString(); + cm_CustoAddress = data[8].value.ToString(); + btnUpdate.Enabled = true; + } + } + private void cbOnlyVip_CheckedChanged(object sender, BoolEventArgs e) + { + LoadCustomer(e.Value); } - private void tsmiCustoNo_Click(object sender, EventArgs e) + private void btnPg_ValueChanged(object sender, PagePageEventArgs e) { - Clipboard.SetText(dgvCustomerList.SelectedRows[0].Cells["CustoNo"].Value as string); - UIMessageTip.ShowOk("复制完成！", 1500); + var dataCount = 0; + dgvCustomerList.Spin("正在加载中...", () => + { + dgvCustomerList.DataSource = GetPageData(e.Current, e.PageSize, ref dataCount); + btnPg.Total = dataCount; + }, () => + { + System.Diagnostics.Debug.WriteLine("加载结束"); + }); } - private void cbOnlyVip_CheckedChanged(object sender, EventArgs e) + private string btnPg_ShowTotalChanged(object sender, PagePageEventArgs e) { - LoadCustomer(cbOnlyVip.Checked); + return $"{e.PageSize} / {e.Total}条 共{e.PageTotal}页"; } } } diff --git a/SYS.FormUI/AppFunction/FrmCustoManager.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.resx similarity index 74% rename from SYS.FormUI/AppFunction/FrmCustoManager.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.resx index bc5715e475b510e3395c4f059d23811715bde62f..284de1a7ebd6c5b1ff90ee04f89d98ec58a38360 100644 --- a/SYS.FormUI/AppFunction/FrmCustoManager.resx +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.resx @@ -1,17 +1,17 @@  - @@ -117,46 +117,32 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - 17, 17 + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAA6dJREFUWEe1l1mIT1Ecx8eaZYhhJEsoSXggiWR7IKUsWceaZE9IdgmJB6UGCSnk + QZYshRKDIllSI9my5sGDnXggzPh8z/3Of0zz95/7v8a3Pp1zftu5//u/95xzc+KqpKSkK0yGDXAcDsLq + 0tLScZDrsP8jJhoLD5korfDdgj4Or15ReCFzfPJEN6AQCmAO7MJ8274PMNVp1SMKjoTH8BaWME8TuyoI + 33JfhO5Se5v/TSpEwf3wDebZnFb468Nu+ArbbU4uJq9NoSnwDk5BF7v+KmLawCt4AQU2JxMF8mELPIHx + NmcUcY1hK7yHdTYnEwU6gV61a9Df5ozirtUjdib8hEM2JxMF+kAx6PZ3sjmjuICaxPal1cN4GdrZlb1I + 7gV6t89DD5szinnrEDvSF1AErezKXiR3g3NwB4bZnFHENWTulb6AM1DfruxFcmvYCXoLlsYpxrzNiTsN + ehULbU4uimj51er2HEbbnFZMrts/37/+GYyxK7moFRYiF70Cve2qJEIGOe4jzXqb/10U1Ntw2cVfwza6 + /aCe/cNhj/wS/eKQWJ2i6ADQHfjleTTRU/gMJR7/gGN0a9B2hI0wwSV0h7ozXgwD6IeLjyWCm5A0A+7T + /6vwf6EZDLPpP7DtAUyk25P2rG2vadbT5nmK9CIgn0AVu+nE76Bl+SSsg2EwGtbiPkqrJbhQsXFErO5Q + I09XUfj18B2OQkPwdRgBDR1SSYRp8yqIMqoWsbtpKm/tGFvCAQdpV1sFbe3OKFLaKy+OqLmIpoFTI2HQ + /60TjgIe04yzq0oRW1cXq9wyMX4Je0ELmuqlxPgENHN6qsAKO7Wnz7WrShGrZ6JYuWVifJWms0MUo636 + SOSNxLiIZnoIoJMLtzFq5VsTjDGlYn+K/LQHEmxhg3NYSmVOvWrax69CfjDGlOukRP5dmp52p4Rdx7Yz + UVS5ypwX6X+iXRwMWSgqUy5q6GA6yO6UsLeA81FUueQYog6tNp0Ojo8tcu6FShbjN7DM7pRwjcJe4dtC + YxVYAFpoNjk2K5GXB5MgrHYSfU00yiGK0VeVHrog+jpBT4U8OXfAV+yVbls2Ir/COkBNHecfwV3X/1Na + tmuFRJw6dn0Mg4RSMWoMD6VjiNgJNHVDMoOXkTmx9PrqAdO+EEvEboZoL6DzwvbEokYP6ACXbJJN64H+ + 620QdkiJvs6LA+nWCRdAR/+dTjSJoFjqq4lxLuNpcAFW2KwfORT2wSximtqMcnJ+A51F4FFBJFqrAAAA + AElFTkSuQmCC + + AAABAAEAICAAAAEAGAASBAAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAAFz diff --git a/SYS.FormUI/AppFunction/FrmCustoSpend.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmCustoSpend.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.Designer.cs index 319fdf70de17795f1d3ccb7feff6254129d6d5f1..7a840619fa447d1383e6709740e7cc8f245885f2 100644 --- a/SYS.FormUI/AppFunction/FrmCustoSpend.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmCustoSpend { diff --git a/SYS.FormUI/AppFunction/FrmCustoSpend.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.cs similarity index 96% rename from SYS.FormUI/AppFunction/FrmCustoSpend.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.cs index 1736b4f30980a1417ae1a2e1b815ea4ee1012862..f62ff7753a299b659f0d78da8794438a80cad2bc 100644 --- a/SYS.FormUI/AppFunction/FrmCustoSpend.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.cs @@ -24,10 +24,10 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmCustoSpend : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmCustoSpend.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmCustoSpend.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.resx diff --git a/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.Designer.cs index e615fd1cb851942bbab11952e9e45eb1304db058..bb584a2d745352b4f3fe491cf385dc83eb6bc8e6 100644 --- a/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmCustomerManager { diff --git a/SYS.FormUI/AppFunction/FrmCustomerManager.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmCustomerManager.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.cs index a838080b1db47f454ca3946f0f87fd5083d75a8d..01b7a0a97e78b3d81ad8eb90fe79e0e94e22b858 100644 --- a/SYS.FormUI/AppFunction/FrmCustomerManager.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.cs @@ -24,13 +24,13 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Threading; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmCustomerManager : Form { diff --git a/SYS.FormUI/AppFunction/FrmCustomerManager.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmCustomerManager.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.resx diff --git a/SYS.FormUI/AppFunction/FrmDepartment.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmDepartment.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.Designer.cs index 518bae885fb6c1b3f0a2e157da159b14c0fafaab..5fcef8a61fe9535c98a514a9d8da7256108f0b74 100644 --- a/SYS.FormUI/AppFunction/FrmDepartment.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.Designer.cs @@ -1,5 +1,5 @@  -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmDepartment { diff --git a/SYS.FormUI/AppFunction/FrmDepartment.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmDepartment.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.cs index bfad5e500e057a43c62463d1de438ce265f219a0..701558554a52566978337395255b95de3cfd642b 100644 --- a/SYS.FormUI/AppFunction/FrmDepartment.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.cs @@ -25,13 +25,13 @@ using EOM.TSHotelManager.Common.Core; using jvncorelib.EntityLib; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Linq; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmDepartment : UIForm { @@ -52,7 +52,7 @@ namespace SYS.FormUI public void ReloadDeptList() { - txtDeptNo.Text = Util.GetListNewId("D", 3, 1, "-").FirstOrDefault(); + txtDeptNo.Text = ApplicationUtil.GetListNewId("D", 3, 1, "-").FirstOrDefault(); result = HttpHelper.Request("Base/SelectDeptAllCanUse"); if (result.statusCode != 200) { diff --git a/SYS.FormUI/AppFunction/FrmDepartment.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmDepartment.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.resx diff --git a/SYS.FormUI/AppFunction/FrmEditInputs.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmEditInputs.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.Designer.cs index d5c69b9b2fd311ab7496cc15df8f3638a2629a35..800b7dac42bf6cf69893abb33a564620f26350bc 100644 --- a/SYS.FormUI/AppFunction/FrmEditInputs.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmEditInputs { diff --git a/SYS.FormUI/AppFunction/FrmEditInputs.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmEditInputs.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.cs index f787a4359b31740403c312eed7324f7ebc325439..07d3c936f7dc6b8c9ee5c47c57dc8ec89e8a7a71 100644 --- a/SYS.FormUI/AppFunction/FrmEditInputs.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.cs @@ -24,13 +24,13 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Linq; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmEditInputs : UIEditForm { @@ -57,7 +57,7 @@ namespace SYS.FormUI private void FrmEditInputs_Load(object sender, EventArgs e) { - string cardId = Util.GetListNewId("TS", 3, 1, "-").FirstOrDefault(); + string cardId = ApplicationUtil.GetListNewId("TS", 3, 1, "-").FirstOrDefault(); txtCustoNo.Text = cardId; #region 加载客户类型信息 @@ -278,7 +278,7 @@ namespace SYS.FormUI if (identityCard.Length == 18) { - var result = Util.searchCode(identityCard); + var result = ApplicationUtil.searchCode(identityCard); if (result.message.IsNullOrEmpty()) //如果没有错误消息输出，则代表成功 { try diff --git a/SYS.FormUI/AppFunction/FrmEditInputs.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmEditInputs.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.resx diff --git a/SYS.FormUI/AppFunction/FrmEducation.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmEducation.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.Designer.cs index bb3e51f8917393cf6bec8426b545ce3c6864499a..75f7cb94b846156a30840e3d7f315e3eebdef268 100644 --- a/SYS.FormUI/AppFunction/FrmEducation.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.Designer.cs @@ -1,5 +1,5 @@  -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmEducation { diff --git a/SYS.FormUI/AppFunction/FrmEducation.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.cs similarity index 97% rename from SYS.FormUI/AppFunction/FrmEducation.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.cs index 2b15d7fc888175127f2616732ccd07a6a7d9cb7b..1aeab6c51515cf925a310bf10702c727ee7d25f2 100644 --- a/SYS.FormUI/AppFunction/FrmEducation.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.cs @@ -25,14 +25,14 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Drawing; using System.Linq; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmEducation : UIForm { @@ -62,7 +62,7 @@ namespace SYS.FormUI public void ReloadEducationList() { //flpInformation.Controls.Clear(); - txtEducationNo.Text = Util.GetListNewId("E", 3, 1, "-").FirstOrDefault(); + txtEducationNo.Text = ApplicationUtil.GetListNewId("E", 3, 1, "-").FirstOrDefault(); result = HttpHelper.Request("Base/SelectEducationAll"); if (result.statusCode != 200) { diff --git a/SYS.FormUI/AppFunction/FrmEducation.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmEducation.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.resx diff --git a/SYS.FormUI/AppFunction/FrmGoodOrBad.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmGoodOrBad.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.Designer.cs index aa09ada306efeb6a43ccf25da624cf30da4b3aaa..f34ee02a65e0baacc7a6c124754f69fd38f35410 100644 --- a/SYS.FormUI/AppFunction/FrmGoodOrBad.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmGoodOrBad { diff --git a/SYS.FormUI/AppFunction/FrmGoodOrBad.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmGoodOrBad.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.cs index 18d21b28e37684c245e324b2b0cbb54475ad9f4b..c465a594a23f2359333436c706643452585c0b88 100644 --- a/SYS.FormUI/AppFunction/FrmGoodOrBad.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.cs @@ -24,11 +24,11 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmGoodOrBad : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmGoodOrBad.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmGoodOrBad.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.resx diff --git a/SYS.FormUI/AppFunction/FrmMySpace.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmMySpace.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.Designer.cs index 81f063ef1ffc27b6a80e5c55754184460961734d..2a248769f0744db5f0339f911df2a61ec1275a11 100644 --- a/SYS.FormUI/AppFunction/FrmMySpace.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.Designer.cs @@ -1,5 +1,5 @@  -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmMySpace { diff --git a/SYS.FormUI/AppFunction/FrmMySpace.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmMySpace.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.cs index 8d4d19c76686ae4b5dc3eeba174c9967aa23fd45..db6e417f3e971ea39cfe7f35bd24573899fd14cc 100644 --- a/SYS.FormUI/AppFunction/FrmMySpace.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.cs @@ -26,14 +26,14 @@ using EOM.TSHotelManager.Common.Core; using jvncorelib.EncryptorLib; using jvncorelib.EntityLib; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.ComponentModel; using System.Drawing; using System.Text.RegularExpressions; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmMySpace : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmMySpace.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmMySpace.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.resx diff --git a/SYS.FormUI/AppFunction/FrmNation.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmNation.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmNation.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmNation.Designer.cs index 79e4712b855f70ada53e40190346bf4c4ca8b5ff..24d5a6d958e427546cef8ecebc49567f3b6b5bc3 100644 --- a/SYS.FormUI/AppFunction/FrmNation.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmNation.Designer.cs @@ -1,5 +1,5 @@  -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmNation { diff --git a/SYS.FormUI/AppFunction/FrmNation.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmNation.cs similarity index 97% rename from SYS.FormUI/AppFunction/FrmNation.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmNation.cs index 3cb83ea7bab3e10304e2d04a6c6178232ba62d77..561dd400830e28efe1f61b1925ae6b670fa502a8 100644 --- a/SYS.FormUI/AppFunction/FrmNation.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmNation.cs @@ -22,17 +22,17 @@ * */ -//using SYS.Common; +//using EOM.TSHotelManager.Common; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Drawing; using System.Linq; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmNation : UIForm { @@ -59,7 +59,7 @@ namespace SYS.FormUI public void ReloadNationList() { - txtNationNo.Text = Util.GetListNewId("N", 3, 1, "-").FirstOrDefault(); + txtNationNo.Text = ApplicationUtil.GetListNewId("N", 3, 1, "-").FirstOrDefault(); result = HttpHelper.Request("Base/SelectNationAll"); if (result.statusCode != 200) diff --git a/SYS.FormUI/AppFunction/FrmNation.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmNation.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmNation.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmNation.resx diff --git a/SYS.FormUI/AppFunction/FrmNotice.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmNotice.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmNotice.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmNotice.Designer.cs index 19cb27ad233cb927f3511c6ddf6ff025c6d20f5f..dd4de228a78f97a04ab7c14e6593037b2708b805 100644 --- a/SYS.FormUI/AppFunction/FrmNotice.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmNotice.Designer.cs @@ -1,5 +1,5 @@  -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmNotice { diff --git a/SYS.FormUI/AppFunction/FrmNotice.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmNotice.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmNotice.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmNotice.cs index ed5cb3ab1c86781bbc7fb938349032becb719787..ec28e6a1ed56e0e00bcc5b2710865e231b291534 100644 --- a/SYS.FormUI/AppFunction/FrmNotice.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmNotice.cs @@ -28,7 +28,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmNotice : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmNotice.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmNotice.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmNotice.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmNotice.resx diff --git a/SYS.FormUI/AppFunction/FrmOperation.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmOperation.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.Designer.cs index 07684b924b72ca6bfe3aa540d82c4dddb887f2a4..90d9976de180e3bbe7d9dcb5e6ef82d7b775c55b 100644 --- a/SYS.FormUI/AppFunction/FrmOperation.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmOperation { diff --git a/SYS.FormUI/AppFunction/FrmOperation.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.cs similarity index 97% rename from SYS.FormUI/AppFunction/FrmOperation.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.cs index ac84928f884f01dbed4bbcc557aa14f008284775..c8805985f4ee8323ff40f82594a312e4af059ae0 100644 --- a/SYS.FormUI/AppFunction/FrmOperation.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.cs @@ -24,11 +24,11 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmOperation : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmOperation.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmOperation.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.resx diff --git a/SYS.FormUI/AppFunction/FrmPleaseWait.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.Designer.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmPleaseWait.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.Designer.cs index 6e08c9d70bef2755ec846c2628d16a73bbb66492..4bd2ed50ffb356be53bcef8cafc1157257f900b4 100644 --- a/SYS.FormUI/AppFunction/FrmPleaseWait.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.Designer.cs @@ -1,5 +1,5 @@  -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmPleaseWait { diff --git a/SYS.FormUI/AppFunction/FrmPleaseWait.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.cs similarity index 97% rename from SYS.FormUI/AppFunction/FrmPleaseWait.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.cs index 451656e1a834ceb2b37a11aa0b4f2a3eeace3cb5..52476e6b9b63fc0abcbde34af791a5b8c990dd91 100644 --- a/SYS.FormUI/AppFunction/FrmPleaseWait.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.cs @@ -24,7 +24,7 @@ using Sunny.UI; using System; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmPleaseWait : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmPleaseWait.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmPleaseWait.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.resx diff --git a/SYS.FormUI/AppFunction/FrmPosition.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmPosition.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.Designer.cs index 4626598ddd97c01c0fec33025e0d77a4aea1fbfe..fbb27e33259c6059bdc709042196f8417bfa5299 100644 --- a/SYS.FormUI/AppFunction/FrmPosition.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.Designer.cs @@ -1,5 +1,5 @@  -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmPosition { diff --git a/SYS.FormUI/AppFunction/FrmPosition.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.cs similarity index 97% rename from SYS.FormUI/AppFunction/FrmPosition.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.cs index 2140c1ebf119e665fd23885b3a06383a7602e7c0..b30662336cbf6483272e690761d3c38963d840f4 100644 --- a/SYS.FormUI/AppFunction/FrmPosition.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.cs @@ -24,14 +24,14 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Drawing; using System.Linq; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmPosition : UIForm { @@ -61,7 +61,7 @@ namespace SYS.FormUI public void ReloadPositionList() { - txtPositionNo.Text = Util.GetListNewId("P", 3, 1, "-").FirstOrDefault(); + txtPositionNo.Text = ApplicationUtil.GetListNewId("P", 3, 1, "-").FirstOrDefault(); result = HttpHelper.Request("Base/SelectPositionAll"); if (result.statusCode != 200) { diff --git a/SYS.FormUI/AppFunction/FrmPosition.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmPosition.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.resx diff --git a/SYS.FormUI/AppFunction/FrmReserList.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmReserList.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.Designer.cs index fc45db75bb7f2a9e0081f2e07b285b69787c413f..7852d1fb853be8ff73e89edc5e29c14bb9faab5c 100644 --- a/SYS.FormUI/AppFunction/FrmReserList.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmReserList { diff --git a/SYS.FormUI/AppFunction/FrmReserList.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.cs similarity index 97% rename from SYS.FormUI/AppFunction/FrmReserList.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.cs index 3977b0570dd84475adae0edbc912f4d79dcfde43..b317d4edd0eb6832e220317a31e754a161afe2c3 100644 --- a/SYS.FormUI/AppFunction/FrmReserList.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.cs @@ -23,14 +23,14 @@ */ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Linq; using System.Transactions; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmReserList : UIForm { @@ -166,7 +166,7 @@ namespace SYS.FormUI private void dgvReserList_CellClick(object sender, DataGridViewCellEventArgs e) { - string custoNo = Util.GetListNewId("TS", 2, 1, "-").FirstOrDefault(); + string custoNo = ApplicationUtil.GetListNewId("TS", 2, 1, "-").FirstOrDefault(); txtCustoNo.Text = custoNo; txtCustoName.Text = dgvReserList.SelectedRows[0].Cells["clCustoNm"].Value.ToString(); txtTel.Text = dgvReserList.SelectedRows[0].Cells["clTel"].Value.ToString(); @@ -203,7 +203,7 @@ namespace SYS.FormUI if (identityCard.Length == 18) { - var result = Util.searchCode(identityCard); + var result = ApplicationUtil.searchCode(identityCard); if (result.message.IsNullOrEmpty()) //如果没有错误消息输出，则代表成功 { try diff --git a/SYS.FormUI/AppFunction/FrmReserList.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmReserList.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.resx diff --git a/SYS.FormUI/AppFunction/FrmReserManager.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmReserManager.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.Designer.cs index bbc9029e49c2b943f216f7485536734b0a960c0d..ca8f69868fcaf46c9fb8f754444d61cfa555e79e 100644 --- a/SYS.FormUI/AppFunction/FrmReserManager.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmReserManager { diff --git a/SYS.FormUI/AppFunction/FrmReserManager.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.cs similarity index 97% rename from SYS.FormUI/AppFunction/FrmReserManager.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.cs index f267218474e3717e0b4e5932b48a1db05860d82e..01ba4609f4ccec661cf1c4cda6c66e43b10e9d5b 100644 --- a/SYS.FormUI/AppFunction/FrmReserManager.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.cs @@ -23,13 +23,13 @@ */ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Linq; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmReserManager : UIForm { @@ -50,7 +50,7 @@ namespace SYS.FormUI private void btnReser_Click(object sender, EventArgs e) { Random random = new Random(); - string reserid = Util.GetListNewId("R", 3, 1, "-").FirstOrDefault(); + string reserid = ApplicationUtil.GetListNewId("R", 3, 1, "-").FirstOrDefault(); Reser reser = new Reser() { ReserId = reserid, diff --git a/SYS.FormUI/AppFunction/FrmReserManager.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmReserManager.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.resx diff --git a/SYS.FormUI/AppFunction/FrmRoomConfig.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmRoomConfig.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.Designer.cs index 942c46037014a05e37c7eb9f5ab804e37fcfe524..7813dab224bbfbfe445daef217f87b062e770183 100644 --- a/SYS.FormUI/AppFunction/FrmRoomConfig.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI.AppFunction +namespace EOM.TSHotelManager.FormUI.AppFunction { partial class FrmRoomConfig { diff --git a/SYS.FormUI/AppFunction/FrmRoomConfig.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmRoomConfig.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.cs index 652fbffe3f9198b46cc526968b3aab1008a62091..24879ef3894535f451f81ec6dfd6b7c72f9ddb06 100644 --- a/SYS.FormUI/AppFunction/FrmRoomConfig.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.cs @@ -22,10 +22,9 @@ * */ using EOM.TSHotelManager.Common.Core; -using EOM.TSHotelManager.Common.Util; using jvncorelib.EntityLib; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.ComponentModel; @@ -35,8 +34,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using EOM.TSHotelManager.Common.Util; -namespace SYS.FormUI.AppFunction +namespace EOM.TSHotelManager.FormUI.AppFunction { public partial class FrmRoomConfig : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmRoomConfig.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmRoomConfig.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.resx diff --git a/SYS.FormUI/AppFunction/FrmRoomManager.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.Designer.cs similarity index 45% rename from SYS.FormUI/AppFunction/FrmRoomManager.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.Designer.cs index dbfe14f17acf8138fd7c266eb04381497e1ae328..eb21f9c6e6b2eb25c905c5730a320916bddab35f 100644 --- a/SYS.FormUI/AppFunction/FrmRoomManager.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmRoomManager { @@ -28,18 +28,18 @@ /// private void InitializeComponent() { - flpRoom = new System.Windows.Forms.FlowLayoutPanel(); - pnlRoomInfo = new System.Windows.Forms.Panel(); - lblRoomState = new System.Windows.Forms.Label(); - label11 = new System.Windows.Forms.Label(); - lblRoomNo = new System.Windows.Forms.Label(); - lblCustoNo = new System.Windows.Forms.Label(); - lblRoomPosition = new System.Windows.Forms.Label(); - lblCheckTime = new System.Windows.Forms.Label(); - label4 = new System.Windows.Forms.Label(); - label3 = new System.Windows.Forms.Label(); - label2 = new System.Windows.Forms.Label(); - label1 = new System.Windows.Forms.Label(); + flpRoom = new FlowLayoutPanel(); + pnlRoomInfo = new Panel(); + lblRoomState = new Label(); + label11 = new Label(); + lblRoomNo = new Label(); + lblCustoName = new Label(); + lblRoomPosition = new Label(); + lblCheckTime = new Label(); + label4 = new Label(); + label3 = new Label(); + label2 = new Label(); + label1 = new Label(); flpRoomTypes = new Sunny.UI.UIFlowLayoutPanel(); muRoomState = new AntdUI.Menu(); pnlRoomInfo.SuspendLayout(); @@ -48,189 +48,189 @@ // flpRoom // flpRoom.AutoScroll = true; - flpRoom.BackColor = System.Drawing.Color.Transparent; - flpRoom.Location = new System.Drawing.Point(265, 103); - flpRoom.Margin = new System.Windows.Forms.Padding(4); + flpRoom.BackColor = Color.Transparent; + flpRoom.Location = new Point(265, 103); + flpRoom.Margin = new Padding(4); flpRoom.Name = "flpRoom"; - flpRoom.Size = new System.Drawing.Size(804, 383); + flpRoom.Size = new Size(804, 383); flpRoom.TabIndex = 71; // // pnlRoomInfo // - pnlRoomInfo.BackColor = System.Drawing.Color.Transparent; + pnlRoomInfo.BackColor = Color.Transparent; pnlRoomInfo.Controls.Add(lblRoomState); pnlRoomInfo.Controls.Add(label11); pnlRoomInfo.Controls.Add(lblRoomNo); - pnlRoomInfo.Controls.Add(lblCustoNo); + pnlRoomInfo.Controls.Add(lblCustoName); pnlRoomInfo.Controls.Add(lblRoomPosition); pnlRoomInfo.Controls.Add(lblCheckTime); pnlRoomInfo.Controls.Add(label4); pnlRoomInfo.Controls.Add(label3); pnlRoomInfo.Controls.Add(label2); pnlRoomInfo.Controls.Add(label1); - pnlRoomInfo.Location = new System.Drawing.Point(2, 312); - pnlRoomInfo.Margin = new System.Windows.Forms.Padding(4); + pnlRoomInfo.Location = new Point(2, 312); + pnlRoomInfo.Margin = new Padding(4); pnlRoomInfo.Name = "pnlRoomInfo"; - pnlRoomInfo.Size = new System.Drawing.Size(255, 174); + pnlRoomInfo.Size = new Size(255, 174); pnlRoomInfo.TabIndex = 72; // // lblRoomState // lblRoomState.AutoSize = true; - lblRoomState.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); - lblRoomState.Location = new System.Drawing.Point(86, 146); - lblRoomState.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + lblRoomState.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + lblRoomState.Location = new Point(86, 146); + lblRoomState.Margin = new Padding(4, 0, 4, 0); lblRoomState.Name = "lblRoomState"; - lblRoomState.Size = new System.Drawing.Size(10, 15); + lblRoomState.Size = new Size(10, 15); lblRoomState.TabIndex = 16; lblRoomState.Text = " "; // // label11 // label11.AutoSize = true; - label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); - label11.Location = new System.Drawing.Point(11, 146); - label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label11.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + label11.Location = new Point(11, 146); + label11.Margin = new Padding(4, 0, 4, 0); label11.Name = "label11"; - label11.Size = new System.Drawing.Size(67, 15); + label11.Size = new Size(67, 15); label11.TabIndex = 15; label11.Text = "房间状态："; // // lblRoomNo // lblRoomNo.AutoSize = true; - lblRoomNo.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); - lblRoomNo.Location = new System.Drawing.Point(86, 13); - lblRoomNo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + lblRoomNo.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + lblRoomNo.Location = new Point(86, 13); + lblRoomNo.Margin = new Padding(4, 0, 4, 0); lblRoomNo.Name = "lblRoomNo"; - lblRoomNo.Size = new System.Drawing.Size(10, 15); + lblRoomNo.Size = new Size(10, 15); lblRoomNo.TabIndex = 14; lblRoomNo.Text = " "; // - // lblCustoNo + // lblCustoName // - lblCustoNo.AutoSize = true; - lblCustoNo.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); - lblCustoNo.Location = new System.Drawing.Point(86, 46); - lblCustoNo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - lblCustoNo.Name = "lblCustoNo"; - lblCustoNo.Size = new System.Drawing.Size(10, 15); - lblCustoNo.TabIndex = 12; - lblCustoNo.Text = " "; + lblCustoName.AutoSize = true; + lblCustoName.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + lblCustoName.Location = new Point(86, 46); + lblCustoName.Margin = new Padding(4, 0, 4, 0); + lblCustoName.Name = "lblCustoName"; + lblCustoName.Size = new Size(10, 15); + lblCustoName.TabIndex = 12; + lblCustoName.Text = " "; // // lblRoomPosition // lblRoomPosition.AutoSize = true; - lblRoomPosition.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); - lblRoomPosition.Location = new System.Drawing.Point(86, 113); - lblRoomPosition.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + lblRoomPosition.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + lblRoomPosition.Location = new Point(86, 113); + lblRoomPosition.Margin = new Padding(4, 0, 4, 0); lblRoomPosition.Name = "lblRoomPosition"; - lblRoomPosition.Size = new System.Drawing.Size(10, 15); + lblRoomPosition.Size = new Size(10, 15); lblRoomPosition.TabIndex = 10; lblRoomPosition.Text = " "; // // lblCheckTime // lblCheckTime.AutoSize = true; - lblCheckTime.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); - lblCheckTime.Location = new System.Drawing.Point(86, 80); - lblCheckTime.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + lblCheckTime.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + lblCheckTime.Location = new Point(86, 80); + lblCheckTime.Margin = new Padding(4, 0, 4, 0); lblCheckTime.Name = "lblCheckTime"; - lblCheckTime.Size = new System.Drawing.Size(10, 15); + lblCheckTime.Size = new Size(10, 15); lblCheckTime.TabIndex = 9; lblCheckTime.Text = " "; // // label4 // label4.AutoSize = true; - label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); - label4.Location = new System.Drawing.Point(11, 113); - label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label4.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + label4.Location = new Point(11, 113); + label4.Margin = new Padding(4, 0, 4, 0); label4.Name = "label4"; - label4.Size = new System.Drawing.Size(67, 15); + label4.Size = new Size(67, 15); label4.TabIndex = 3; label4.Text = "所在区域："; // // label3 // label3.AutoSize = true; - label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); - label3.Location = new System.Drawing.Point(11, 80); - label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label3.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + label3.Location = new Point(11, 80); + label3.Margin = new Padding(4, 0, 4, 0); label3.Name = "label3"; - label3.Size = new System.Drawing.Size(67, 15); + label3.Size = new Size(67, 15); label3.TabIndex = 2; label3.Text = "入住时间："; // // label2 // label2.AutoSize = true; - label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); - label2.Location = new System.Drawing.Point(11, 46); - label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label2.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + label2.Location = new Point(11, 46); + label2.Margin = new Padding(4, 0, 4, 0); label2.Name = "label2"; - label2.Size = new System.Drawing.Size(67, 15); + label2.Size = new Size(67, 15); label2.TabIndex = 1; label2.Text = "客户名字："; // // label1 // label1.AutoSize = true; - label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); - label1.Location = new System.Drawing.Point(11, 13); - label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label1.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + label1.Location = new Point(11, 13); + label1.Margin = new Padding(4, 0, 4, 0); label1.Name = "label1"; - label1.Size = new System.Drawing.Size(67, 15); + label1.Size = new Size(67, 15); label1.TabIndex = 0; label1.Text = "房间号码："; // // flpRoomTypes // - flpRoomTypes.BackColor = System.Drawing.Color.Transparent; - flpRoomTypes.FillColor = System.Drawing.Color.Transparent; - flpRoomTypes.FillColor2 = System.Drawing.Color.Transparent; - flpRoomTypes.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); - flpRoomTypes.Location = new System.Drawing.Point(265, 4); - flpRoomTypes.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - flpRoomTypes.MinimumSize = new System.Drawing.Size(1, 1); + flpRoomTypes.BackColor = Color.Transparent; + flpRoomTypes.FillColor = Color.Transparent; + flpRoomTypes.FillColor2 = Color.Transparent; + flpRoomTypes.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); + flpRoomTypes.Location = new Point(265, 4); + flpRoomTypes.Margin = new Padding(4, 5, 4, 5); + flpRoomTypes.MinimumSize = new Size(1, 1); flpRoomTypes.Name = "flpRoomTypes"; - flpRoomTypes.Padding = new System.Windows.Forms.Padding(2); + flpRoomTypes.Padding = new Padding(2); flpRoomTypes.RadiusSides = Sunny.UI.UICornerRadiusSides.None; - flpRoomTypes.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; + flpRoomTypes.RectSides = ToolStripStatusLabelBorderSides.None; flpRoomTypes.ShowText = false; - flpRoomTypes.Size = new System.Drawing.Size(804, 90); + flpRoomTypes.Size = new Size(804, 90); flpRoomTypes.TabIndex = 95; flpRoomTypes.Text = "uiFlowLayoutPanel1"; - flpRoomTypes.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; + flpRoomTypes.TextAlignment = ContentAlignment.MiddleCenter; // // muRoomState // - muRoomState.Font = new System.Drawing.Font("Microsoft YaHei UI", 10F); + muRoomState.Font = new Font("Microsoft YaHei UI", 10F); muRoomState.Indent = true; - muRoomState.Location = new System.Drawing.Point(2, 4); + muRoomState.Location = new Point(2, 4); muRoomState.Mode = AntdUI.TMenuMode.Vertical; muRoomState.Name = "muRoomState"; - muRoomState.Size = new System.Drawing.Size(255, 301); + muRoomState.Size = new Size(255, 301); muRoomState.TabIndex = 96; muRoomState.SelectChanged += muRoomState_SelectChanged; // // FrmRoomManager // - AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); - AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - BackColor = System.Drawing.Color.FromArgb(235, 243, 255); - BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - ClientSize = new System.Drawing.Size(1072, 490); + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.FromArgb(235, 243, 255); + BackgroundImageLayout = ImageLayout.Stretch; + ClientSize = new Size(1072, 490); Controls.Add(muRoomState); Controls.Add(flpRoomTypes); Controls.Add(pnlRoomInfo); Controls.Add(flpRoom); DoubleBuffered = true; - FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - Margin = new System.Windows.Forms.Padding(4); + FormBorderStyle = FormBorderStyle.None; + Margin = new Padding(4); Name = "FrmRoomManager"; - StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - TransparencyKey = System.Drawing.Color.White; + StartPosition = FormStartPosition.CenterScreen; + TransparencyKey = Color.White; Load += FrmRoomManager_Load; pnlRoomInfo.ResumeLayout(false); pnlRoomInfo.PerformLayout(); @@ -247,7 +247,7 @@ private System.Windows.Forms.Label label1; public System.Windows.Forms.Label lblRoomState; public System.Windows.Forms.Label lblRoomNo; - public System.Windows.Forms.Label lblCustoNo; + public System.Windows.Forms.Label lblCustoName; public System.Windows.Forms.Label lblRoomPosition; public System.Windows.Forms.Label lblCheckTime; public System.Windows.Forms.Panel pnlRoomInfo; diff --git a/SYS.FormUI/AppFunction/FrmRoomManager.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.cs similarity index 81% rename from SYS.FormUI/AppFunction/FrmRoomManager.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.cs index e75c7bcd1fecae1f7987ed9f9d9a5e5fb4e91c69..a188c255f24791eed3349e3191457afda3237e3c 100644 --- a/SYS.FormUI/AppFunction/FrmRoomManager.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.cs @@ -25,15 +25,15 @@ using AntdUI; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; -using SYS.FormUI.AppUserControls; -using SYS.FormUI.Properties; +using EOM.TSHotelManager.Common; +using EOM.TSHotelManager.FormUI.AppUserControls; using System; using System.Collections.Generic; using System.ComponentModel; using System.Windows.Forms; +using EOM.TSHotelManager.FormUI.Properties; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmRoomManager : Form { @@ -82,8 +82,8 @@ namespace SYS.FormUI private void LoadRoomState() { muRoomState.Items.Clear(); - // 获取所有状态的详细信息列表 - List stateList = RoomStateConstant.StateInfo.GetAllStateDetails(); + + var stateList = RoomStateConstant.GetAll().ToList(); MenuItem menuItem = null; if (!stateList.IsNullOrEmpty()) { @@ -94,23 +94,30 @@ namespace SYS.FormUI Text = item.Description }; menuItem.Tag = item.Code; - if (Enum.TryParse(item.Code, out RoomStateConstant.State roomState)) + + var roomState = RoomStateConstant.GetConstantByCode(item.Code); + + if (roomState != null) { - menuItem.Text += roomState switch + menuItem.Text += roomState.Code switch { - RoomStateConstant.State.Empty => "(" + EmptyCount + ")", - RoomStateConstant.State.Occupied => "(" + OccupiedCount + ")", - RoomStateConstant.State.UnderRepair => "(" + UnderRepairCount + ")", - RoomStateConstant.State.Dirty => "(" + DirtyCount + ")", - RoomStateConstant.State.Reserved => "(" + ReservedCount + ")" + 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 switch + + + menuItem.Icon = roomState.Code switch { - RoomStateConstant.State.Empty => Resources.可住状态, - RoomStateConstant.State.Occupied => Resources.已住状态, - RoomStateConstant.State.UnderRepair => Resources.维修状态, - RoomStateConstant.State.Dirty => Resources.脏房状态, - RoomStateConstant.State.Reserved => Resources.预约状态 + 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 }; } muRoomState.Items.Add(menuItem); @@ -200,9 +207,8 @@ namespace SYS.FormUI public void LoadRoomInfo() { - lblRoomNo.Text = ucRoom.co_RoomNo; - lblCustoNo.Text = ucRoom.co_CustoNo; + lblCustoName.Text = ucRoom.co_CustoName; lblRoomPosition.Text = ucRoom.co_RoomPosition; lblCheckTime.Text = ucRoom.co_CheckTime == null ? "" : Convert.ToDateTime(ucRoom.co_CheckTime).ToString("yyyy-MM-dd"); lblRoomState.Text = ucRoom.co_RoomState; @@ -238,7 +244,7 @@ namespace SYS.FormUI for (int i = 0; i < romsty.Count; i++) { room = new ucRoom(); - room.btnRoom.Text = string.Format("{0}\n\n{1}\n\n{2}", romsty[i].RoomName, romsty[i].RoomNo, romsty[i].CustoName); + room.btnRoom.Text = string.Format("{0}\n\n{1}\n\n{2}", romsty[i].RoomName, romsty[i].RoomNo, romsty[i].CustoName ?? " "); room.lblMark = string.Empty; room.romRoomInfo = romsty[i]; room.romCustoInfo = new Custo { CustoNo = romsty[i].CustoNo, CustoName = romsty[i].CustoName }; @@ -247,7 +253,7 @@ namespace SYS.FormUI lblRoomNo.Text = ""; lblRoomPosition.Text = ""; lblRoomState.Text = ""; - lblCustoNo.Text = ""; + lblCustoName.Text = ""; lblCheckTime.Text = ""; LoadRoomInfo(); } @@ -278,30 +284,33 @@ namespace SYS.FormUI lblRoomNo.Text = ""; lblRoomPosition.Text = ""; lblRoomState.Text = ""; - lblCustoNo.Text = ""; + lblCustoName.Text = ""; lblCheckTime.Text = ""; } - private void muRoomState_SelectChanged(object sender, MenuItem item) + private void muRoomState_SelectChanged(object sender, MenuSelectEventArgs e) { flpRoom.Controls.Clear(); - if (Enum.TryParse(item.Tag.ToString(), out RoomStateConstant.State roomState)) + + var roomState = RoomStateConstant.GetConstantByCode(e.Value.Tag as string); + + if (roomState != null) { - switch (roomState) + switch (roomState.Code) { - case RoomStateConstant.State.Empty: + case var code when code == RoomStateConstant.Empty.Code: LoadRoomByState(0); break; - case RoomStateConstant.State.Occupied: + case var code when code == RoomStateConstant.Occupied.Code: LoadRoomByState(1); break; - case RoomStateConstant.State.UnderRepair: + case var code when code == RoomStateConstant.UnderRepair.Code: LoadRoomByState(2); break; - case RoomStateConstant.State.Dirty: + case var code when code == RoomStateConstant.Dirty.Code: LoadRoomByState(3); break; - case RoomStateConstant.State.Reserved: + case var code when code == RoomStateConstant.Reserved.Code: LoadRoomByState(4); break; } diff --git a/SYS.FormUI/AppFunction/FrmRoomManager.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmRoomManager.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.resx diff --git a/SYS.FormUI/AppFunction/FrmRoomMap.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.Designer.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmRoomMap.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.Designer.cs index dc97edba6bb7e7a93d71972a1da0c49ba7b77107..c3b1112d963702f54114502704501a0fde17ef41 100644 --- a/SYS.FormUI/AppFunction/FrmRoomMap.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.Designer.cs @@ -1,5 +1,5 @@  -namespace SYS.FormUI.AppFunction +namespace EOM.TSHotelManager.FormUI.AppFunction { partial class FrmRoomMap { diff --git a/SYS.FormUI/AppFunction/FrmRoomMap.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.cs similarity index 96% rename from SYS.FormUI/AppFunction/FrmRoomMap.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.cs index 243a46deeb5127c96c432c7e0d9adfd4c3f2f75a..5add2b925f789a1651de042ab2d749fa4f2cd2fc 100644 --- a/SYS.FormUI/AppFunction/FrmRoomMap.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.cs @@ -25,11 +25,11 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; -namespace SYS.FormUI.AppFunction +namespace EOM.TSHotelManager.FormUI.AppFunction { public partial class FrmRoomMap : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmRoomMap.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmRoomMap.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.resx diff --git a/SYS.FormUI/AppFunction/FrmRoomStateManager.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmRoomStateManager.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.Designer.cs index 172a71cda4b836021bae68d6a08dbd46ed8c3a84..c7e86e647d32353c1b4dc00de206368fbcbd64cc 100644 --- a/SYS.FormUI/AppFunction/FrmRoomStateManager.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmRoomStateManager { diff --git a/SYS.FormUI/AppFunction/FrmRoomStateManager.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmRoomStateManager.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.cs index 6587c0ae76433911eb147741844a85ee1508b50e..f1ae670845f600047d3f976b4c8e20947fba5f4a 100644 --- a/SYS.FormUI/AppFunction/FrmRoomStateManager.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.cs @@ -24,11 +24,11 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmRoomStateManager : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmRoomStateManager.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmRoomStateManager.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.resx diff --git a/SYS.FormUI/AppFunction/FrmSelectCustoInfo.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmSelectCustoInfo.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.Designer.cs index 9c35c272e9dee1bd2a4ede6fd82e9cc7ff234ae2..57234d5009429689d9748551ba25bd33ee57ddf7 100644 --- a/SYS.FormUI/AppFunction/FrmSelectCustoInfo.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmSelectCustoInfo { diff --git a/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.cs similarity index 97% rename from SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.cs index 10b44b5e11b85ef30f551f6522737cf293425c46..a0c26ecafb6b27bfb65ae5c8da1568fa97978fe7 100644 --- a/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.cs @@ -24,12 +24,12 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; -using SYS.FormUI.AppUserControls; +using EOM.TSHotelManager.Common; +using EOM.TSHotelManager.FormUI.AppUserControls; using System; using System.Collections.Generic; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmSelectCustoInfo : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmSelectCustoInfo.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmSelectCustoInfo.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.resx diff --git a/SYS.FormUI/AppFunction/FrmSellThing.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmSellThing.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.Designer.cs index 7e4ace3cb297a94271d57d1f66bba37716b0137d..5767652a3906418ab9ce7e5e750f74d7230c3076 100644 --- a/SYS.FormUI/AppFunction/FrmSellThing.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmSellThing { diff --git a/SYS.FormUI/AppFunction/FrmSellThing.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmSellThing.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.cs index 680f70294147aa1d955a481620fb35f0579c71be..2eadef8fda2dc529065bf41196f0f6934186fd8d 100644 --- a/SYS.FormUI/AppFunction/FrmSellThing.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.cs @@ -25,14 +25,14 @@ using EOM.TSHotelManager.Common.Core; using jvncorelib.EntityLib; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Drawing; using System.Linq; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmSellThing : Sunny.UI.UIForm { diff --git a/SYS.FormUI/AppFunction/FrmSellThing.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmSellThing.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.resx diff --git a/SYS.FormUI/AppFunction/FrmSellThingManager.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmSellThingManager.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.Designer.cs index 28670e44c326e317694d6abf4400cdd01021484d..9bd1c21684b567247f6aa9b5f9e868d73f96341d 100644 --- a/SYS.FormUI/AppFunction/FrmSellThingManager.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmSellThingManager { diff --git a/SYS.FormUI/AppFunction/FrmSellThingManager.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.cs similarity index 96% rename from SYS.FormUI/AppFunction/FrmSellThingManager.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.cs index 3117275ccd803786e91e91c645d924ed3d37baa2..c8d0f9d24921431063f4121988dcebfb92225cb7 100644 --- a/SYS.FormUI/AppFunction/FrmSellThingManager.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.cs @@ -24,13 +24,13 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Linq; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmSellThingManager : UIForm { @@ -58,7 +58,7 @@ namespace SYS.FormUI private void FrmSellThingManager_Load(object sender, EventArgs e) { - string SellId = Util.GetListNewId("ST", 3, 1, "-").FirstOrDefault(); + string SellId = ApplicationUtil.GetListNewId("ST", 3, 1, "-").FirstOrDefault(); txtSellNo.Text = SellId; LoadData(); } @@ -165,13 +165,13 @@ namespace SYS.FormUI RecordHelper.Record(AdminInfo.Account + "-" + AdminInfo.Name + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + AdminInfo.SoftwareVersion + "执行：" + "新增商品操作！新增值为：" + st.SellNo, 2); #endregion LoadData(); - string SellId = Util.GetListNewId("ST", 3, 1, "-").FirstOrDefault(); + string SellId = ApplicationUtil.GetListNewId("ST", 3, 1, "-").FirstOrDefault(); txtSellNo.Text = SellId; } else { UIMessageBox.ShowError("信息不完整，请检查！"); - string SellId = Util.GetListNewId("ST", 3, 1, "-").FirstOrDefault(); + string SellId = ApplicationUtil.GetListNewId("ST", 3, 1, "-").FirstOrDefault(); txtSellNo.Text = SellId; return; } diff --git a/SYS.FormUI/AppFunction/FrmSellThingManager.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmSellThingManager.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.resx diff --git a/SYS.FormUI/AppFunction/FrmSexType.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.Designer.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmSexType.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.Designer.cs index 5da1ce954c3cfc7ecb1d8ea783fee0559d4ccb5e..ce8475d2d6ae7446a972d0dee93e2166265299b3 100644 --- a/SYS.FormUI/AppFunction/FrmSexType.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.Designer.cs @@ -1,5 +1,5 @@  -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmSexType { diff --git a/SYS.FormUI/AppFunction/FrmSexType.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.cs similarity index 97% rename from SYS.FormUI/AppFunction/FrmSexType.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.cs index 59aedeb103ca4fb4341928c7d59a582c883385a8..ab64efa6da3b2db8e189796cae3f5aede5585735 100644 --- a/SYS.FormUI/AppFunction/FrmSexType.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.cs @@ -25,7 +25,7 @@ using Sunny.UI; using System; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmSexType : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmSexType.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmSexType.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.resx diff --git a/SYS.FormUI/AppFunction/FrmUnLockSystem.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.Designer.cs similarity index 96% rename from SYS.FormUI/AppFunction/FrmUnLockSystem.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.Designer.cs index e4ae4c6d0a1631ed7d721786b197b71f2743ca54..72d2e135e95916d11622f26cd159b3a6d5e607d5 100644 --- a/SYS.FormUI/AppFunction/FrmUnLockSystem.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmUnLockSystem { @@ -85,7 +85,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackgroundImage = global::SYS.FormUI.Properties.Resources.jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018_jpg_w1024_new_small; + this.BackgroundImage = global::EOM.TSHotelManager.FormUI.Properties.Resources.jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018_jpg_w1024_new_small; this.ClientSize = new System.Drawing.Size(498, 179); this.Controls.Add(this.btnUnLock); this.Controls.Add(this.txtUnLockPwd); diff --git a/SYS.FormUI/AppFunction/FrmUnLockSystem.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmUnLockSystem.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.cs index 1dfbbfd2437a2700d85e24400e17380f942a87b7..75e12293bb5295f6a39653618e76bca0fbbd482d 100644 --- a/SYS.FormUI/AppFunction/FrmUnLockSystem.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.cs @@ -24,7 +24,7 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Diagnostics; @@ -32,7 +32,7 @@ using System.IO; using System.Runtime.InteropServices; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmUnLockSystem : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmUnLockSystem.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmUnLockSystem.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.resx diff --git a/SYS.FormUI/AppFunction/FrmUpLoadNotice.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmUpLoadNotice.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmUpLoadNotice.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmUpLoadNotice.Designer.cs index af353c5aaa6884608edae180db5cff979fb0ad6e..896d795d13f30f02b5f618f5f3224e24136ec268 100644 --- a/SYS.FormUI/AppFunction/FrmUpLoadNotice.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmUpLoadNotice.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmUpLoadNotice { diff --git a/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmUpLoadNotice.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmUpLoadNotice.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmUpLoadNotice.cs index 6859020744975f577d0287430a9c43d93946eb4b..9d10794f5c3a3b6ac46940c38641f7c41c55ae75 100644 --- a/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmUpLoadNotice.cs @@ -29,7 +29,7 @@ using System.Collections.Generic; using System.Linq; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmUpLoadNotice : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmUpLoadNotice.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmUpLoadNotice.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmUpLoadNotice.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmUpLoadNotice.resx diff --git a/SYS.FormUI/AppFunction/FrmVipRule.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmVipRule.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.Designer.cs index 1732171bed61dbbefd0d73a1a60138c7730a44b9..758c211434b7d3612d1bf24bc65462e6090b4f9c 100644 --- a/SYS.FormUI/AppFunction/FrmVipRule.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.Designer.cs @@ -1,5 +1,5 @@  -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmVipRule { diff --git a/SYS.FormUI/AppFunction/FrmVipRule.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.cs similarity index 96% rename from SYS.FormUI/AppFunction/FrmVipRule.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.cs index b81458a4472764e1e35aac96c543215a28077fbc..9fa13f9436679a872559270831eb36c5f3b8aa84 100644 --- a/SYS.FormUI/AppFunction/FrmVipRule.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.cs @@ -24,13 +24,13 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; -using SYS.FormUI.Properties; +using EOM.TSHotelManager.Common; +using EOM.TSHotelManager.FormUI.Properties; using System; using System.Collections.Generic; using System.Linq; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmVipRule : UIForm { @@ -57,7 +57,7 @@ namespace SYS.FormUI this.cboCustoType.SelectedIndex = 0; #endregion //生成流水号 - txtRuleId.Text = Util.GetListNewId("VR", 3, 1, "-").FirstOrDefault(); + txtRuleId.Text = ApplicationUtil.GetListNewId("VR", 3, 1, "-").FirstOrDefault(); LoadVipType(); } diff --git a/SYS.FormUI/AppFunction/FrmVipRule.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmVipRule.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.resx diff --git a/SYS.FormUI/AppFunction/FrmWoEInfo.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmWoEInfo.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.Designer.cs index d7c1fe569371acef738f81440bd381a672ef3384..97a6d47cc60fc4babd86018b2d92b7d1700b984b 100644 --- a/SYS.FormUI/AppFunction/FrmWoEInfo.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmWoEInfo { diff --git a/SYS.FormUI/AppFunction/FrmWoEInfo.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmWoEInfo.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.cs index 44c72dab55fec865384de1c9935c61c155f96c2f..b5f23deb3c07a97081a7fae8d1eeb9cddcd3eda2 100644 --- a/SYS.FormUI/AppFunction/FrmWoEInfo.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.cs @@ -24,12 +24,12 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmWoEInfo : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmWoEInfo.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmWoEInfo.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.resx diff --git a/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs index 82da22b3f4021e7acaee201b7938cc513afbe996..1b0bebe34f36f6c85980798d74042d7cbdcff696 100644 --- a/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmWorkerCheckInfo { diff --git a/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.cs similarity index 97% rename from SYS.FormUI/AppFunction/FrmWorkerCheckInfo.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.cs index 9b60f3b39eb6eceb3d26c807eb1d88684b77819f..3c6d07b4cdacd90164b811c2367dba7654cb5864 100644 --- a/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.cs @@ -24,11 +24,11 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmWorkerCheckInfo : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmWorkerCheckInfo.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.resx diff --git a/SYS.FormUI/AppFunction/FrmWorkerInfo.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmWorkerInfo.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.Designer.cs index d1634e7d7d5a3c45b400e7f60532cff5ab17a48f..8da9e486cd75ad0b2107d8a54b69ecdf5d644c83 100644 --- a/SYS.FormUI/AppFunction/FrmWorkerInfo.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmWorkerInfo { @@ -486,7 +486,7 @@ // picWorkerPic // this.picWorkerPic.BackColor = System.Drawing.Color.Transparent; - this.picWorkerPic.BackgroundImage = global::SYS.FormUI.Properties.Resources.上传照片; + this.picWorkerPic.BackgroundImage = global::EOM.TSHotelManager.FormUI.Properties.Resources.上传照片; this.picWorkerPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picWorkerPic.Location = new System.Drawing.Point(614, 38); this.picWorkerPic.Name = "picWorkerPic"; diff --git a/SYS.FormUI/AppFunction/FrmWorkerInfo.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmWorkerInfo.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.cs index e1baf5223874bb301ffcbf3a479b0d9f21cc312e..1aaeda81dfd87c1093c50e957d6216f5c5430a68 100644 --- a/SYS.FormUI/AppFunction/FrmWorkerInfo.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.cs @@ -25,13 +25,13 @@ using EOM.TSHotelManager.Common.Core; using jvncorelib.EncryptorLib; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Linq; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmWorkerInfo : UIEditForm { @@ -192,7 +192,7 @@ namespace SYS.FormUI } else if (this.Text == "添加员工") { - WorkerNo.Text = Util.GetListNewId("WK", 3, 1, "-").FirstOrDefault(); + WorkerNo.Text = ApplicationUtil.GetListNewId("WK", 3, 1, "-").FirstOrDefault(); ucHistory = new ucHistory(); ucHistory.dtpStartDate.Enabled = true; ucHistory.dtpEndDate.Enabled = true; @@ -353,7 +353,7 @@ namespace SYS.FormUI if (identityCard.Length == 18) { - var result = Util.searchCode(identityCard); + var result = ApplicationUtil.searchCode(identityCard); if (result.message.IsNullOrEmpty()) //如果没有错误消息输出，则代表成功 { try diff --git a/SYS.FormUI/AppFunction/FrmWorkerInfo.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmWorkerInfo.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.resx diff --git a/SYS.FormUI/AppFunction/FrmWorkerManager.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmWorkerManager.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.Designer.cs index a27de4458bd814e6eb302bd7d33352439f339b7d..40ce454e3f84413f47667bcef8576a8ade4a8adf 100644 --- a/SYS.FormUI/AppFunction/FrmWorkerManager.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmWorkerManager { diff --git a/SYS.FormUI/AppFunction/FrmWorkerManager.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmWorkerManager.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.cs index bde94da627329a62c34d5f32851fff44e47dfe90..e469c39ae3ca56cb4e8dc2665c9fca64bf63a0ac 100644 --- a/SYS.FormUI/AppFunction/FrmWorkerManager.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.cs @@ -24,12 +24,12 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmWorkerManager : UIForm { diff --git a/SYS.FormUI/AppFunction/FrmWorkerManager.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmWorkerManager.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.resx diff --git a/SYS.FormUI/AppFunction/FrmWorkerPanel.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.Designer.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmWorkerPanel.Designer.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.Designer.cs index f00c42563d2ea77a24a1a7ee1515234bedb56e4f..6b912565a95ca28fd33d7dc54739c07361743b9e 100644 --- a/SYS.FormUI/AppFunction/FrmWorkerPanel.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmWorkerPanel { @@ -149,7 +149,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.BackgroundImage = global::SYS.FormUI.Properties.Resources.常规部门卡片; + this.BackgroundImage = global::EOM.TSHotelManager.FormUI.Properties.Resources.常规部门卡片; this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.ClientSize = new System.Drawing.Size(375, 239); this.Controls.Add(this.btnBlockAccount); diff --git a/SYS.FormUI/AppFunction/FrmWorkerPanel.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmWorkerPanel.cs rename to EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.cs index 392b7d08553a81143356f5e34b9037505fbd2920..ae2355ed4290429ebf4c216b915ec25de5a5055d 100644 --- a/SYS.FormUI/AppFunction/FrmWorkerPanel.cs +++ b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.cs @@ -24,14 +24,14 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; -using SYS.FormUI.Properties; +using EOM.TSHotelManager.Common; +using EOM.TSHotelManager.FormUI.Properties; using System; using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { /// /// 员工操作界面 diff --git a/SYS.FormUI/AppFunction/FrmWorkerPanel.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmWorkerPanel.resx rename to EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.resx diff --git a/SYS.FormUI/AppInterface/FrmAdminEnter.Designer.cs b/EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.Designer.cs similarity index 99% rename from SYS.FormUI/AppInterface/FrmAdminEnter.Designer.cs rename to EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.Designer.cs index d9072a622e0a2975c727c7ff806f617b8ad2ec1d..b39bf0af5e893ba72d63a7f5241677223f9a8382 100644 --- a/SYS.FormUI/AppInterface/FrmAdminEnter.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmAdminEnter { diff --git a/SYS.FormUI/AppInterface/FrmAdminEnter.cs b/EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.cs similarity index 96% rename from SYS.FormUI/AppInterface/FrmAdminEnter.cs rename to EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.cs index 6664fd5cfee4ce9e9caa433ebf453b4e7efb82d2..a764b7ad170c75c027c2eda6ab2245f2546950e1 100644 --- a/SYS.FormUI/AppInterface/FrmAdminEnter.cs +++ b/EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.cs @@ -25,12 +25,12 @@ using EOM.TSHotelManager.Common.Core; using jvncorelib.EncryptorLib; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Collections.Generic; using System.Text.RegularExpressions; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmAdminEnter : UIForm { @@ -72,7 +72,7 @@ namespace SYS.FormUI AdminInfo.Name = a.AdminName; AdminInfo.Account = a.AdminAccount; AdminInfo.isAdmin = a.IsAdmin == 0 ? false : true; - AdminInfo.SoftwareVersion = Util.GetApplicationVersion().ToString(); + AdminInfo.SoftwareVersion = ApplicationUtil.GetApplicationVersion().ToString(); AdminInfo.UserToken = a.user_token; #region 获取添加操作日志所需的信息 RecordHelper.Record(AdminInfo.Account + "-" + AdminInfo.Name + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + AdminInfo.SoftwareVersion + "版本登入了后台管理系统！", 3); diff --git a/SYS.FormUI/AppInterface/FrmAdminEnter.resx b/EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.resx similarity index 100% rename from SYS.FormUI/AppInterface/FrmAdminEnter.resx rename to EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.resx diff --git a/SYS.FormUI/AppInterface/FrmLoading.Designer.cs b/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.Designer.cs similarity index 99% rename from SYS.FormUI/AppInterface/FrmLoading.Designer.cs rename to EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.Designer.cs index cb9f1133d2f705b77b190838708eedd6cbb5ecd7..a72e74c2d0a35fd57c990cd8a2a83eb554c270c3 100644 --- a/SYS.FormUI/AppInterface/FrmLoading.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmLoading { diff --git a/SYS.FormUI/AppInterface/FrmLoading.cs b/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.cs similarity index 91% rename from SYS.FormUI/AppInterface/FrmLoading.cs rename to EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.cs index fc279825e8b15f94184ccb76de18bec52e349817..680469a643412d31e757ad8cbae5c51e28d39c2f 100644 --- a/SYS.FormUI/AppInterface/FrmLoading.cs +++ b/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.cs @@ -23,13 +23,14 @@ */ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; +using EOM.TSHotelManager.Common; using System; using System.Reflection; using System.Threading; using System.Windows.Forms; +using Sunny.UI.Win32; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmLoading : UIForm { @@ -40,7 +41,7 @@ namespace SYS.FormUI private void FrmLoading_Load(object sender, EventArgs e) { - lblSoftwareVersion.Text = Util.GetApplicationVersion().ToString(); + lblSoftwareVersion.Text = ApplicationUtil.GetApplicationVersion().ToString(); lblDllVersion.Text = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(); CheckUpdate(); //Thread thread2 = new Thread(threadPro);//创建新线程 @@ -73,11 +74,11 @@ namespace SYS.FormUI } var newversion = HttpHelper.JsonToModel(result.message); - var targetVersion = new Version(newversion.base_version); + var targetVersion = new System.Version(newversion.base_version); var assembly = Assembly.GetExecutingAssembly(); var currentVersion = assembly.GetName().Version; - if (!currentVersion.Equals(targetVersion)) + if (!currentVersion!.Equals(targetVersion)) { lblTips.Text = "旧版已停止使用，请到github或gitee仓库更新最新发行版！"; System.Windows.Forms.Application.Exit(); diff --git a/SYS.FormUI/AppInterface/FrmLoading.resx b/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.resx similarity index 100% rename from SYS.FormUI/AppInterface/FrmLoading.resx rename to EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.resx diff --git a/SYS.FormUI/AppInterface/FrmLogin.Designer.cs b/EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.Designer.cs similarity index 96% rename from SYS.FormUI/AppInterface/FrmLogin.Designer.cs rename to EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.Designer.cs index bbb7c4d42ed2e8b6084d0e052c0e796e8e5e7326..8cb726db310e4300e0391dc5f67217cdfc6aeaa2 100644 --- a/SYS.FormUI/AppInterface/FrmLogin.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmLogin { @@ -106,8 +106,7 @@ picFormSize.BackColor = System.Drawing.Color.Transparent; picFormSize.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); picFormSize.Ghost = true; - picFormSize.Image = Properties.Resources.arrow_down_b; - picFormSize.ImageSize = new System.Drawing.Size(32, 32); + picFormSize.BackgroundImage = Properties.Resources.arrow_down_b; picFormSize.Location = new System.Drawing.Point(822, 1); picFormSize.Name = "picFormSize"; picFormSize.Size = new System.Drawing.Size(41, 38); @@ -119,8 +118,7 @@ picClose.BackColor = System.Drawing.Color.Transparent; picClose.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); picClose.Ghost = true; - picClose.Image = Properties.Resources.close; - picClose.ImageSize = new System.Drawing.Size(32, 32); + picClose.BackgroundImage = Properties.Resources.close; picClose.Location = new System.Drawing.Point(875, 1); picClose.Name = "picClose"; picClose.Size = new System.Drawing.Size(41, 38); diff --git a/SYS.FormUI/AppInterface/FrmLogin.cs b/EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.cs similarity index 97% rename from SYS.FormUI/AppInterface/FrmLogin.cs rename to EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.cs index ad9e82e77dab7ee166a4d9fe4c07d77caba1185f..39a44aa94c5cd2a19c9f5cd16f282766596ca0b6 100644 --- a/SYS.FormUI/AppInterface/FrmLogin.cs +++ b/EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.cs @@ -25,13 +25,14 @@ using AntdUI; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; -using SYS.FormUI.Properties; +using EOM.TSHotelManager.Common; +using EOM.TSHotelManager.FormUI.Properties; using System; using System.Drawing; using System.Windows.Forms; +using System.Linq; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmLogin : Window { @@ -186,7 +187,7 @@ namespace SYS.FormUI LoginInfo.WorkerName = w.WorkerName; LoginInfo.WorkerClub = w.ClubName; LoginInfo.WorkerPosition = w.PositionName; - LoginInfo.SoftwareVersion = Util.GetApplicationVersion().ToString(); + LoginInfo.SoftwareVersion = ApplicationUtil.GetApplicationVersion().ToString(); LoginInfo.UserToken = w.user_token; FrmMain frm = new FrmMain(this); this.Hide();//隐藏登录窗体 diff --git a/SYS.FormUI/AppInterface/FrmLogin.resx b/EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.resx similarity index 100% rename from SYS.FormUI/AppInterface/FrmLogin.resx rename to EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.resx diff --git a/SYS.FormUI/AppInterface/FrmNewLogin.Designer.cs b/EOM.TSHotelManager.FormUI/AppInterface/FrmNewLogin.Designer.cs similarity index 96% rename from SYS.FormUI/AppInterface/FrmNewLogin.Designer.cs rename to EOM.TSHotelManager.FormUI/AppInterface/FrmNewLogin.Designer.cs index 2218a5bfb047d14564066627b495772b9bb9c07a..79b4e0032a4bfd88d5d04658360204c2c96e4868 100644 --- a/SYS.FormUI/AppInterface/FrmNewLogin.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppInterface/FrmNewLogin.Designer.cs @@ -1,5 +1,5 @@  -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmNewLogin { diff --git a/SYS.FormUI/AppInterface/FrmNewLogin.cs b/EOM.TSHotelManager.FormUI/AppInterface/FrmNewLogin.cs similarity index 92% rename from SYS.FormUI/AppInterface/FrmNewLogin.cs rename to EOM.TSHotelManager.FormUI/AppInterface/FrmNewLogin.cs index de03fd032030ad01cb06d8ef03c359e2e3eac1f2..99daf6ec031f340f78a3e607c9e7a95234a1c337 100644 --- a/SYS.FormUI/AppInterface/FrmNewLogin.cs +++ b/EOM.TSHotelManager.FormUI/AppInterface/FrmNewLogin.cs @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmNewLogin : UIForm { diff --git a/SYS.FormUI/AppInterface/FrmNewLogin.resx b/EOM.TSHotelManager.FormUI/AppInterface/FrmNewLogin.resx similarity index 100% rename from SYS.FormUI/AppInterface/FrmNewLogin.resx rename to EOM.TSHotelManager.FormUI/AppInterface/FrmNewLogin.resx diff --git a/SYS.FormUI/AppMain/FrmBackgroundSystem.Designer.cs b/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.Designer.cs similarity index 98% rename from SYS.FormUI/AppMain/FrmBackgroundSystem.Designer.cs rename to EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.Designer.cs index ef486c7dd349df7ec315245ca405691af52c50fc..1d5285ccc6723172d78a9ed769d4c6a2f4235be1 100644 --- a/SYS.FormUI/AppMain/FrmBackgroundSystem.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.Designer.cs @@ -1,5 +1,5 @@  -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmBackgroundSystem { @@ -271,7 +271,7 @@ namespace SYS.FormUI // // tsmiUpdatePwd // - this.tsmiUpdatePwd.Image = global::SYS.FormUI.Properties.Resources.修改; + 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 = "修改密码"; @@ -285,7 +285,7 @@ namespace SYS.FormUI // btnSetting // this.btnSetting.BackColor = System.Drawing.Color.Transparent; - this.btnSetting.BackgroundImage = global::SYS.FormUI.Properties.Resources.settings2; + 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; diff --git a/SYS.FormUI/AppMain/FrmBackgroundSystem.cs b/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.cs similarity index 99% rename from SYS.FormUI/AppMain/FrmBackgroundSystem.cs rename to EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.cs index 3cc533c311710369d89f8a88eccf7e99f72215f1..a1344e6b95d248bcf5435b408b63566d8c8d0511 100644 --- a/SYS.FormUI/AppMain/FrmBackgroundSystem.cs +++ b/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.cs @@ -25,15 +25,15 @@ using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; -using SYS.FormUI.AppFunction; +using EOM.TSHotelManager.Common; +using EOM.TSHotelManager.FormUI.AppFunction; using System; using System.Collections.Generic; using System.Drawing; using System.Linq; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmBackgroundSystem : UIForm { diff --git a/SYS.FormUI/AppMain/FrmBackgroundSystem.resx b/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.resx similarity index 100% rename from SYS.FormUI/AppMain/FrmBackgroundSystem.resx rename to EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.resx diff --git a/SYS.FormUI/AppMain/FrmMain.Designer.cs b/EOM.TSHotelManager.FormUI/AppMain/FrmMain.Designer.cs similarity index 47% rename from SYS.FormUI/AppMain/FrmMain.Designer.cs rename to EOM.TSHotelManager.FormUI/AppMain/FrmMain.Designer.cs index 040d84795252e7207c87f6b941ae221f47d0b6d7..d96b7c20127c64008ad7d23e2bc02bca499fd85e 100644 --- a/SYS.FormUI/AppMain/FrmMain.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppMain/FrmMain.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class FrmMain { @@ -30,39 +30,40 @@ { components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain)); - lblTime = new System.Windows.Forms.Label(); + lblTime = new Label(); tmrDate = new System.Windows.Forms.Timer(components); - lblSoftName = new System.Windows.Forms.Label(); - pnlMID = new System.Windows.Forms.Panel(); - notifyIcon1 = new System.Windows.Forms.NotifyIcon(components); - cmsMain = new System.Windows.Forms.ContextMenuStrip(components); - tsmiChangeUser = new System.Windows.Forms.ToolStripMenuItem(); - tsmiMySpace = new System.Windows.Forms.ToolStripMenuItem(); - tsmiExChange = new System.Windows.Forms.ToolStripMenuItem(); - toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - tsmiLockScreen = new System.Windows.Forms.ToolStripMenuItem(); - toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - tsmiLoginBackSystem = new System.Windows.Forms.ToolStripMenuItem(); - toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - tsmiCheckUpdate = new System.Windows.Forms.ToolStripMenuItem(); - tsmiAboutUs = new System.Windows.Forms.ToolStripMenuItem(); - tsmiExitSystem = new System.Windows.Forms.ToolStripMenuItem(); - linkLabel1 = new System.Windows.Forms.LinkLabel(); + lblSoftName = new Label(); + pnlMID = new Panel(); + notifyIcon1 = new NotifyIcon(components); + cmsMain = new ContextMenuStrip(components); + tsmiChangeUser = new ToolStripMenuItem(); + tsmiMySpace = new ToolStripMenuItem(); + tsmiExChange = new ToolStripMenuItem(); + toolStripSeparator3 = new ToolStripSeparator(); + tsmiLockScreen = new ToolStripMenuItem(); + toolStripSeparator4 = new ToolStripSeparator(); + tsmiLoginBackSystem = new ToolStripMenuItem(); + toolStripSeparator2 = new ToolStripSeparator(); + tsmiCheckUpdate = new ToolStripMenuItem(); + tsmiAboutUs = new ToolStripMenuItem(); + tsmiExitSystem = new ToolStripMenuItem(); + linkLabel1 = new LinkLabel(); lblScroll = new Sunny.UI.UIScrollingText(); tmrFont = new System.Windows.Forms.Timer(components); - label3 = new System.Windows.Forms.Label(); + label3 = new Label(); btnHello = new Sunny.UI.UIButton(); uiButton1 = new Sunny.UI.UIButton(); - pnlCheckInfo = new System.Windows.Forms.Panel(); - lblClose = new System.Windows.Forms.Label(); - label4 = new System.Windows.Forms.Label(); - lblCheckDay = new System.Windows.Forms.Label(); - label2 = new System.Windows.Forms.Label(); - picLogo = new System.Windows.Forms.PictureBox(); + pnlCheckInfo = new Panel(); + lblClose = new Label(); + label4 = new Label(); + lblCheckDay = new Label(); + label2 = new Label(); + picLogo = new PictureBox(); muNavBar = new AntdUI.Menu(); btnClose = new AntdUI.Button(); btnFormSize = new AntdUI.Button(); btnSetting = new AntdUI.Button(); + cpUITheme = new AntdUI.ColorPicker(); cmsMain.SuspendLayout(); pnlCheckInfo.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)picLogo).BeginInit(); @@ -70,15 +71,15 @@ // // lblTime // - lblTime.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; + lblTime.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; lblTime.AutoSize = true; - lblTime.BackColor = System.Drawing.Color.Transparent; - lblTime.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - lblTime.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); - lblTime.Location = new System.Drawing.Point(53, 141); - lblTime.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + lblTime.BackColor = Color.Transparent; + lblTime.FlatStyle = FlatStyle.Flat; + lblTime.Font = new Font("Microsoft Sans Serif", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); + lblTime.Location = new Point(53, 141); + lblTime.Margin = new Padding(4, 0, 4, 0); lblTime.Name = "lblTime"; - lblTime.Size = new System.Drawing.Size(92, 24); + lblTime.Size = new Size(92, 24); lblTime.TabIndex = 2; lblTime.Text = "NowTime"; // @@ -90,30 +91,30 @@ // // lblSoftName // - lblSoftName.BackColor = System.Drawing.Color.Transparent; - lblSoftName.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - lblSoftName.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 0); - lblSoftName.Location = new System.Drawing.Point(328, 7); - lblSoftName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + lblSoftName.BackColor = Color.Transparent; + lblSoftName.FlatStyle = FlatStyle.Flat; + lblSoftName.Font = new Font("Microsoft Sans Serif", 15F, FontStyle.Bold, GraphicsUnit.Point, 0); + lblSoftName.Location = new Point(328, 7); + lblSoftName.Margin = new Padding(4, 0, 4, 0); lblSoftName.Name = "lblSoftName"; - lblSoftName.Size = new System.Drawing.Size(597, 36); + lblSoftName.Size = new Size(547, 36); lblSoftName.TabIndex = 14; lblSoftName.Text = "TS酒店管理系统"; - lblSoftName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + lblSoftName.TextAlign = ContentAlignment.MiddleCenter; // // pnlMID // - pnlMID.BackColor = System.Drawing.Color.Transparent; - pnlMID.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - pnlMID.Location = new System.Drawing.Point(4, 225); - pnlMID.Margin = new System.Windows.Forms.Padding(4); + pnlMID.BackColor = Color.Transparent; + pnlMID.BackgroundImageLayout = ImageLayout.Stretch; + pnlMID.Location = new Point(4, 225); + pnlMID.Margin = new Padding(4); pnlMID.Name = "pnlMID"; - pnlMID.Size = new System.Drawing.Size(1072, 490); + pnlMID.Size = new Size(1072, 490); pnlMID.TabIndex = 23; // // notifyIcon1 // - notifyIcon1.Icon = (System.Drawing.Icon)resources.GetObject("notifyIcon1.Icon"); + notifyIcon1.Icon = (Icon)resources.GetObject("notifyIcon1.Icon"); notifyIcon1.Text = "TS酒店管理系统"; notifyIcon1.Visible = true; notifyIcon1.BalloonTipClosed += notifyIcon1_BalloonTipClosed; @@ -121,128 +122,128 @@ // // cmsMain // - cmsMain.Font = new System.Drawing.Font("Microsoft YaHei UI Light", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, 134); - cmsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { tsmiChangeUser, tsmiMySpace, tsmiExChange, toolStripSeparator3, tsmiLockScreen, toolStripSeparator4, tsmiLoginBackSystem, toolStripSeparator2, tsmiCheckUpdate, tsmiAboutUs, tsmiExitSystem }); + cmsMain.Font = new Font("Microsoft YaHei UI Light", 12F, FontStyle.Italic, GraphicsUnit.Point, 134); + cmsMain.Items.AddRange(new ToolStripItem[] { tsmiChangeUser, tsmiMySpace, tsmiExChange, toolStripSeparator3, tsmiLockScreen, toolStripSeparator4, tsmiLoginBackSystem, toolStripSeparator2, tsmiCheckUpdate, tsmiAboutUs, tsmiExitSystem }); cmsMain.Name = "cmsMain"; - cmsMain.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - cmsMain.Size = new System.Drawing.Size(208, 214); + cmsMain.RenderMode = ToolStripRenderMode.Professional; + cmsMain.Size = new Size(208, 214); // // tsmiChangeUser // - tsmiChangeUser.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + tsmiChangeUser.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); tsmiChangeUser.Image = Properties.Resources.切换账号; tsmiChangeUser.Name = "tsmiChangeUser"; - tsmiChangeUser.Size = new System.Drawing.Size(207, 24); + tsmiChangeUser.Size = new Size(207, 24); tsmiChangeUser.Text = "切换用户"; tsmiChangeUser.Click += tsmiChangeUser_Click; // // tsmiMySpace // - tsmiMySpace.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + tsmiMySpace.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); tsmiMySpace.Image = Properties.Resources.个人中心; tsmiMySpace.Name = "tsmiMySpace"; - tsmiMySpace.Size = new System.Drawing.Size(207, 24); + tsmiMySpace.Size = new Size(207, 24); tsmiMySpace.Text = "个人中心"; tsmiMySpace.Click += tsmiMySpace_Click; // // tsmiExChange // - tsmiExChange.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F); + tsmiExChange.Font = new Font("Microsoft Sans Serif", 12F); tsmiExChange.Name = "tsmiExChange"; - tsmiExChange.Size = new System.Drawing.Size(207, 24); + tsmiExChange.Size = new Size(207, 24); tsmiExChange.Text = "换班"; // // toolStripSeparator3 // toolStripSeparator3.Name = "toolStripSeparator3"; - toolStripSeparator3.Size = new System.Drawing.Size(204, 6); + toolStripSeparator3.Size = new Size(204, 6); // // tsmiLockScreen // - tsmiLockScreen.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + tsmiLockScreen.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); tsmiLockScreen.Image = Properties.Resources.锁屏; tsmiLockScreen.Name = "tsmiLockScreen"; - tsmiLockScreen.Size = new System.Drawing.Size(207, 24); + tsmiLockScreen.Size = new Size(207, 24); tsmiLockScreen.Text = "快速锁屏"; tsmiLockScreen.Click += tsmiLockScreen_Click; // // toolStripSeparator4 // toolStripSeparator4.Name = "toolStripSeparator4"; - toolStripSeparator4.Size = new System.Drawing.Size(204, 6); + toolStripSeparator4.Size = new Size(204, 6); // // tsmiLoginBackSystem // tsmiLoginBackSystem.Enabled = false; - tsmiLoginBackSystem.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + tsmiLoginBackSystem.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); tsmiLoginBackSystem.Image = Properties.Resources.系统管理员; tsmiLoginBackSystem.Name = "tsmiLoginBackSystem"; - tsmiLoginBackSystem.Size = new System.Drawing.Size(207, 24); + tsmiLoginBackSystem.Size = new Size(207, 24); tsmiLoginBackSystem.Text = "进入后台管理系统"; tsmiLoginBackSystem.Click += tsmiLoginBackSystem_Click; // // toolStripSeparator2 // toolStripSeparator2.Name = "toolStripSeparator2"; - toolStripSeparator2.Size = new System.Drawing.Size(204, 6); + toolStripSeparator2.Size = new Size(204, 6); // // tsmiCheckUpdate // - tsmiCheckUpdate.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + tsmiCheckUpdate.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); tsmiCheckUpdate.Image = Properties.Resources.检查更新__1_; tsmiCheckUpdate.Name = "tsmiCheckUpdate"; - tsmiCheckUpdate.Size = new System.Drawing.Size(207, 24); + tsmiCheckUpdate.Size = new Size(207, 24); tsmiCheckUpdate.Text = "检查更新"; tsmiCheckUpdate.Click += tsmiCheckUpdate_Click; // // tsmiAboutUs // - tsmiAboutUs.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + tsmiAboutUs.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); tsmiAboutUs.Image = Properties.Resources.关于我们; tsmiAboutUs.Name = "tsmiAboutUs"; - tsmiAboutUs.Size = new System.Drawing.Size(207, 24); + tsmiAboutUs.Size = new Size(207, 24); tsmiAboutUs.Text = "关于我们"; tsmiAboutUs.Click += tsmiAboutUs_Click; // // tsmiExitSystem // - tsmiExitSystem.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + tsmiExitSystem.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); tsmiExitSystem.Image = Properties.Resources.注销; tsmiExitSystem.Name = "tsmiExitSystem"; - tsmiExitSystem.Size = new System.Drawing.Size(207, 24); + tsmiExitSystem.Size = new Size(207, 24); tsmiExitSystem.Text = "退出系统"; tsmiExitSystem.Click += tsmiExitSystem_Click; // // linkLabel1 // linkLabel1.AutoSize = true; - linkLabel1.BackColor = System.Drawing.Color.Transparent; - linkLabel1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); - linkLabel1.LinkBehavior = System.Windows.Forms.LinkBehavior.HoverUnderline; - linkLabel1.Location = new System.Drawing.Point(214, 25); - linkLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + linkLabel1.BackColor = Color.Transparent; + linkLabel1.Font = new Font("Microsoft Sans Serif", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + linkLabel1.LinkBehavior = LinkBehavior.HoverUnderline; + linkLabel1.Location = new Point(214, 25); + linkLabel1.Margin = new Padding(4, 0, 4, 0); linkLabel1.Name = "linkLabel1"; - linkLabel1.Size = new System.Drawing.Size(50, 17); + linkLabel1.Size = new Size(50, 17); linkLabel1.TabIndex = 26; linkLabel1.TabStop = true; linkLabel1.Text = "未打卡"; - linkLabel1.VisitedLinkColor = System.Drawing.Color.Green; + linkLabel1.VisitedLinkColor = Color.Green; linkLabel1.LinkClicked += linkLabel1_LinkClicked; // // lblScroll // lblScroll.Active = true; - lblScroll.FillColor = System.Drawing.Color.FromArgb(235, 243, 255); - lblScroll.Font = new System.Drawing.Font("微软雅黑", 12F); + lblScroll.FillColor = Color.FromArgb(235, 243, 255); + lblScroll.Font = new Font("微软雅黑", 12F); lblScroll.Interval = 1000; - lblScroll.Location = new System.Drawing.Point(328, 58); - lblScroll.Margin = new System.Windows.Forms.Padding(4); - lblScroll.MinimumSize = new System.Drawing.Size(1, 1); + lblScroll.Location = new Point(328, 58); + lblScroll.Margin = new Padding(4); + lblScroll.MinimumSize = new Size(1, 1); lblScroll.Name = "lblScroll"; lblScroll.Radius = 0; - lblScroll.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; + lblScroll.RectSides = ToolStripStatusLabelBorderSides.None; lblScroll.ScrollingType = Sunny.UI.UIScrollingText.UIScrollingType.LeftToRight; - lblScroll.Size = new System.Drawing.Size(597, 33); + lblScroll.Size = new Size(597, 33); lblScroll.TabIndex = 0; // // tmrFont @@ -253,83 +254,83 @@ // // label3 // - label3.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; + label3.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; label3.AutoSize = true; - label3.BackColor = System.Drawing.Color.Transparent; - label3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F); - label3.Location = new System.Drawing.Point(53, 193); - label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label3.BackColor = Color.Transparent; + label3.FlatStyle = FlatStyle.Flat; + label3.Font = new Font("Microsoft Sans Serif", 14.25F); + label3.Location = new Point(53, 193); + label3.Margin = new Padding(4, 0, 4, 0); label3.Name = "label3"; - label3.Size = new System.Drawing.Size(54, 24); + label3.Size = new Size(54, 24); label3.TabIndex = 30; label3.Text = "Hello"; // // btnHello // - btnHello.BackColor = System.Drawing.Color.Transparent; - btnHello.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - btnHello.FillColor = System.Drawing.Color.Transparent; - btnHello.Font = new System.Drawing.Font("微软雅黑", 12F); - btnHello.Location = new System.Drawing.Point(5, 183); - btnHello.Margin = new System.Windows.Forms.Padding(4); - btnHello.MinimumSize = new System.Drawing.Size(1, 1); + btnHello.BackColor = Color.Transparent; + btnHello.BackgroundImageLayout = ImageLayout.Zoom; + btnHello.FillColor = Color.Transparent; + btnHello.Font = new Font("微软雅黑", 12F); + btnHello.Location = new Point(5, 183); + btnHello.Margin = new Padding(4); + btnHello.MinimumSize = new Size(1, 1); btnHello.Name = "btnHello"; btnHello.Radius = 20; btnHello.RadiusSides = Sunny.UI.UICornerRadiusSides.None; - btnHello.RectColor = System.Drawing.Color.Transparent; - btnHello.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; - btnHello.Size = new System.Drawing.Size(40, 34); + btnHello.RectColor = Color.Transparent; + btnHello.RectSides = ToolStripStatusLabelBorderSides.None; + btnHello.Size = new Size(40, 34); btnHello.Style = Sunny.UI.UIStyle.Custom; btnHello.StyleCustomMode = true; btnHello.TabIndex = 33; - btnHello.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + btnHello.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // uiButton1 // - uiButton1.BackColor = System.Drawing.Color.Transparent; - uiButton1.BackgroundImage = (System.Drawing.Image)resources.GetObject("uiButton1.BackgroundImage"); - uiButton1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - uiButton1.FillColor = System.Drawing.Color.Transparent; - uiButton1.Font = new System.Drawing.Font("微软雅黑", 12F); - uiButton1.Location = new System.Drawing.Point(6, 127); - uiButton1.Margin = new System.Windows.Forms.Padding(4); - uiButton1.MinimumSize = new System.Drawing.Size(1, 1); + uiButton1.BackColor = Color.Transparent; + uiButton1.BackgroundImage = (Image)resources.GetObject("uiButton1.BackgroundImage"); + uiButton1.BackgroundImageLayout = ImageLayout.Stretch; + uiButton1.FillColor = Color.Transparent; + uiButton1.Font = new Font("微软雅黑", 12F); + uiButton1.Location = new Point(6, 127); + uiButton1.Margin = new Padding(4); + uiButton1.MinimumSize = new Size(1, 1); uiButton1.Name = "uiButton1"; uiButton1.Radius = 20; uiButton1.RadiusSides = Sunny.UI.UICornerRadiusSides.None; - uiButton1.RectColor = System.Drawing.Color.Transparent; - uiButton1.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; - uiButton1.Size = new System.Drawing.Size(40, 39); + uiButton1.RectColor = Color.Transparent; + uiButton1.RectSides = ToolStripStatusLabelBorderSides.None; + uiButton1.Size = new Size(40, 39); uiButton1.Style = Sunny.UI.UIStyle.Custom; uiButton1.StyleCustomMode = true; uiButton1.TabIndex = 31; - uiButton1.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + uiButton1.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // pnlCheckInfo // - pnlCheckInfo.BackColor = System.Drawing.Color.Transparent; + pnlCheckInfo.BackColor = Color.Transparent; pnlCheckInfo.BackgroundImage = Properties.Resources.打卡2; - pnlCheckInfo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + pnlCheckInfo.BackgroundImageLayout = ImageLayout.Stretch; pnlCheckInfo.Controls.Add(lblClose); pnlCheckInfo.Controls.Add(label4); pnlCheckInfo.Controls.Add(lblCheckDay); pnlCheckInfo.Controls.Add(label2); - pnlCheckInfo.Location = new System.Drawing.Point(208, 58); - pnlCheckInfo.Margin = new System.Windows.Forms.Padding(4); + pnlCheckInfo.Location = new Point(208, 58); + pnlCheckInfo.Margin = new Padding(4); pnlCheckInfo.Name = "pnlCheckInfo"; - pnlCheckInfo.Size = new System.Drawing.Size(103, 103); + pnlCheckInfo.Size = new Size(103, 103); pnlCheckInfo.TabIndex = 27; pnlCheckInfo.Visible = false; // // lblClose // lblClose.AutoSize = true; - lblClose.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); - lblClose.Location = new System.Drawing.Point(77, 7); - lblClose.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + lblClose.Font = new Font("Microsoft Sans Serif", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + lblClose.Location = new Point(77, 7); + lblClose.Margin = new Padding(4, 0, 4, 0); lblClose.Name = "lblClose"; - lblClose.Size = new System.Drawing.Size(16, 17); + lblClose.Size = new Size(16, 17); lblClose.TabIndex = 3; lblClose.Text = "×"; lblClose.Click += lblClose_Click; @@ -337,107 +338,114 @@ // label4 // label4.AutoSize = true; - label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); - label4.Location = new System.Drawing.Point(21, 68); - label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label4.Font = new Font("Microsoft Sans Serif", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + label4.Location = new Point(21, 68); + label4.Margin = new Padding(4, 0, 4, 0); label4.Name = "label4"; - label4.Size = new System.Drawing.Size(22, 17); + label4.Size = new Size(22, 17); label4.TabIndex = 2; label4.Text = "天"; // // lblCheckDay // lblCheckDay.AutoSize = true; - lblCheckDay.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); - lblCheckDay.Location = new System.Drawing.Point(8, 40); - lblCheckDay.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + lblCheckDay.Font = new Font("Microsoft Sans Serif", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + lblCheckDay.Location = new Point(8, 40); + lblCheckDay.Margin = new Padding(4, 0, 4, 0); lblCheckDay.Name = "lblCheckDay"; - lblCheckDay.Size = new System.Drawing.Size(48, 17); + lblCheckDay.Size = new Size(48, 17); lblCheckDay.TabIndex = 1; lblCheckDay.Text = "36500"; // // label2 // label2.AutoSize = true; - label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); - label2.Location = new System.Drawing.Point(6, 6); - label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label2.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + label2.Location = new Point(6, 6); + label2.Margin = new Padding(4, 0, 4, 0); label2.Name = "label2"; - label2.Size = new System.Drawing.Size(67, 15); + label2.Size = new Size(67, 15); label2.TabIndex = 0; label2.Text = "您已打卡："; // // picLogo // - picLogo.BackColor = System.Drawing.Color.Transparent; - picLogo.BackgroundImage = (System.Drawing.Image)resources.GetObject("picLogo.BackgroundImage"); - picLogo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - picLogo.Cursor = System.Windows.Forms.Cursors.Hand; - picLogo.Location = new System.Drawing.Point(5, 7); - picLogo.Margin = new System.Windows.Forms.Padding(4); + picLogo.BackColor = Color.Transparent; + picLogo.BackgroundImage = (Image)resources.GetObject("picLogo.BackgroundImage"); + picLogo.BackgroundImageLayout = ImageLayout.Stretch; + picLogo.Cursor = Cursors.Hand; + picLogo.Location = new Point(5, 7); + picLogo.Margin = new Padding(4); picLogo.Name = "picLogo"; - picLogo.Size = new System.Drawing.Size(165, 111); + picLogo.Size = new Size(165, 111); picLogo.TabIndex = 15; picLogo.TabStop = false; picLogo.Click += picLogo_Click; // // muNavBar // - muNavBar.Font = new System.Drawing.Font("Microsoft YaHei UI", 14F); - muNavBar.Location = new System.Drawing.Point(311, 172); + muNavBar.Font = new Font("Microsoft YaHei UI", 14F); + muNavBar.Location = new Point(311, 172); muNavBar.Mode = AntdUI.TMenuMode.Horizontal; muNavBar.Name = "muNavBar"; - muNavBar.Size = new System.Drawing.Size(765, 45); + muNavBar.Size = new Size(765, 45); muNavBar.TabIndex = 39; muNavBar.Text = "menu1"; - muNavBar.SelectChanged += muNavBar_SelectChanged; // // btnClose // - btnClose.BackColor = System.Drawing.Color.Transparent; - btnClose.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + btnClose.BackColor = Color.Transparent; + btnClose.BackgroundImage = Properties.Resources.close; + btnClose.Font = new Font("Microsoft YaHei UI", 9F); btnClose.Ghost = true; - btnClose.Image = Properties.Resources.close; - btnClose.ImageSize = new System.Drawing.Size(32, 32); - btnClose.Location = new System.Drawing.Point(1032, 5); + btnClose.Location = new Point(1032, 5); btnClose.Name = "btnClose"; - btnClose.Size = new System.Drawing.Size(41, 38); + btnClose.Size = new Size(41, 38); btnClose.TabIndex = 41; btnClose.Click += picClose_Click; // // btnFormSize // - btnFormSize.BackColor = System.Drawing.Color.Transparent; - btnFormSize.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + btnFormSize.BackColor = Color.Transparent; + btnFormSize.BackgroundImage = Properties.Resources.arrow_down_b; + btnFormSize.Font = new Font("Microsoft YaHei UI", 9F); btnFormSize.Ghost = true; - btnFormSize.Image = Properties.Resources.arrow_down_b; - btnFormSize.ImageSize = new System.Drawing.Size(32, 32); - btnFormSize.Location = new System.Drawing.Point(982, 5); + btnFormSize.Location = new Point(982, 5); btnFormSize.Name = "btnFormSize"; - btnFormSize.Size = new System.Drawing.Size(41, 38); + btnFormSize.Size = new Size(41, 38); btnFormSize.TabIndex = 40; btnFormSize.Click += picFormSize_Click; // // btnSetting // - btnSetting.BackColor = System.Drawing.Color.Transparent; - btnSetting.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + btnSetting.BackColor = Color.Transparent; + btnSetting.BackgroundImage = Properties.Resources.settings2; + btnSetting.Font = new Font("Microsoft YaHei UI", 9F); btnSetting.Ghost = true; - btnSetting.Image = Properties.Resources.settings2; - btnSetting.ImageSize = new System.Drawing.Size(32, 32); - btnSetting.Location = new System.Drawing.Point(932, 5); + btnSetting.Location = new Point(932, 5); btnSetting.Name = "btnSetting"; - btnSetting.Size = new System.Drawing.Size(41, 38); + btnSetting.Size = new Size(41, 38); btnSetting.TabIndex = 42; btnSetting.Click += btnSetting_Click; // + // cpUITheme + // + cpUITheme.Location = new Point(882, 5); + cpUITheme.Name = "cpUITheme"; + cpUITheme.Size = new Size(41, 38); + cpUITheme.TabIndex = 43; + cpUITheme.Text = "colorPicker1"; + cpUITheme.Value = Color.FromArgb(22, 119, 255); + cpUITheme.ValueChanged += cpUITheme_ValueChanged; + // // FrmMain // - AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); - AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - BackColor = System.Drawing.Color.FromArgb(235, 243, 255); - BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - ClientSize = new System.Drawing.Size(1080, 721); + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.FromArgb(235, 243, 255); + BackgroundImageLayout = ImageLayout.Stretch; + ClientSize = new Size(1080, 721); + Controls.Add(cpUITheme); Controls.Add(lblScroll); Controls.Add(btnSetting); Controls.Add(btnClose); @@ -452,11 +460,11 @@ Controls.Add(picLogo); Controls.Add(lblSoftName); Controls.Add(lblTime); - FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - Icon = (System.Drawing.Icon)resources.GetObject("$this.Icon"); - Margin = new System.Windows.Forms.Padding(4); + FormBorderStyle = FormBorderStyle.None; + Icon = (Icon)resources.GetObject("$this.Icon"); + Margin = new Padding(4); Name = "FrmMain"; - StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + StartPosition = FormStartPosition.CenterScreen; Text = "TS酒店管理系统"; FormClosing += FrmMain_FormClosing; FormClosed += FrmMain_FormClosed; @@ -506,5 +514,6 @@ private AntdUI.Button btnClose; private AntdUI.Button btnFormSize; private AntdUI.Button btnSetting; + private AntdUI.ColorPicker cpUITheme; } } \ No newline at end of file diff --git a/SYS.FormUI/AppMain/FrmMain.cs b/EOM.TSHotelManager.FormUI/AppMain/FrmMain.cs similarity index 97% rename from SYS.FormUI/AppMain/FrmMain.cs rename to EOM.TSHotelManager.FormUI/AppMain/FrmMain.cs index 62b9e2a4d5abb041d7fc148dee4dddfa869a7405..ccff9cb4dd39bed627d23ce4dc400630b442767b 100644 --- a/SYS.FormUI/AppMain/FrmMain.cs +++ b/EOM.TSHotelManager.FormUI/AppMain/FrmMain.cs @@ -25,9 +25,9 @@ using AntdUI; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Common; -using SYS.FormUI.AppUserControls; -using SYS.FormUI.Properties; +using EOM.TSHotelManager.Common; +using EOM.TSHotelManager.FormUI.AppUserControls; +using EOM.TSHotelManager.FormUI.Properties; using System; using System.Collections.Generic; using System.Diagnostics; @@ -39,7 +39,7 @@ using System.Security.Policy; using System.Windows.Forms; using static System.Windows.Forms.DataFormats; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class FrmMain : Window { @@ -53,7 +53,7 @@ namespace SYS.FormUI SetStyle(ControlStyles.AllPaintingInWmPaint, true); // 禁止擦除背景. SetStyle(ControlStyles.DoubleBuffer, true); // 双缓冲 #endregion - + cpUITheme.ValueChanged += cpUITheme_ValueChanged; Control.CheckForIllegalCrossThreadCalls = false;//关闭线程检查 //Main = this;//储存主窗口实例对象 // 接受Form1对象 @@ -303,7 +303,7 @@ namespace SYS.FormUI #region 窗体加载事件方法 private void FrmMain_Load(object sender, EventArgs e) { - lblSoftName.Text = System.Windows.Forms.Application.ProductName.ToString() + "_V" + Util.GetApplicationVersion(); + lblSoftName.Text = System.Windows.Forms.Application.ProductName.ToString() + "_V" + ApplicationUtil.GetApplicationVersion(); tmrDate.Enabled = true; @@ -347,7 +347,7 @@ namespace SYS.FormUI linkLabel1.ForeColor = Color.Green; linkLabel1.LinkColor = Color.Green; } - notifyIcon1.Text = "TS酒店管理系统-" + LoginInfo.WorkerName + "-版本号：" + Util.GetApplicationVersion(); + notifyIcon1.Text = "TS酒店管理系统-" + LoginInfo.WorkerName + "-版本号：" + ApplicationUtil.GetApplicationVersion(); wk_WorkerName = LoginInfo.WorkerName; pnlMID.Controls.Clear(); FrmRoomManager frm1 = new FrmRoomManager(); @@ -587,6 +587,10 @@ namespace SYS.FormUI } } - + private void cpUITheme_ValueChanged(object sender, ColorEventArgs e) + { + AntdUI.Style.Db.SetPrimary(e.Value); + Refresh(); + } } } diff --git a/SYS.FormUI/AppMain/FrmMain.resx b/EOM.TSHotelManager.FormUI/AppMain/FrmMain.resx similarity index 100% rename from SYS.FormUI/AppMain/FrmMain.resx rename to EOM.TSHotelManager.FormUI/AppMain/FrmMain.resx diff --git a/SYS.FormUI/AppUserControls/ucHistory.Designer.cs b/EOM.TSHotelManager.FormUI/AppUserControls/ucHistory.Designer.cs similarity index 99% rename from SYS.FormUI/AppUserControls/ucHistory.Designer.cs rename to EOM.TSHotelManager.FormUI/AppUserControls/ucHistory.Designer.cs index e498b9c10390c71af366979fbefda5ae71e62dc4..9111e76e7e3cbbaa25bb0ae80cc94d063a580d16 100644 --- a/SYS.FormUI/AppUserControls/ucHistory.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppUserControls/ucHistory.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class ucHistory { diff --git a/SYS.FormUI/AppUserControls/ucHistory.cs b/EOM.TSHotelManager.FormUI/AppUserControls/ucHistory.cs similarity index 97% rename from SYS.FormUI/AppUserControls/ucHistory.cs rename to EOM.TSHotelManager.FormUI/AppUserControls/ucHistory.cs index f437e90c384b9198889d046f34cf96605459d4ab..07592213ead583de6b01cb96d4df177dd23d468b 100644 --- a/SYS.FormUI/AppUserControls/ucHistory.cs +++ b/EOM.TSHotelManager.FormUI/AppUserControls/ucHistory.cs @@ -24,7 +24,7 @@ using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class ucHistory : UserControl { diff --git a/SYS.FormUI/AppUserControls/ucHistory.resx b/EOM.TSHotelManager.FormUI/AppUserControls/ucHistory.resx similarity index 100% rename from SYS.FormUI/AppUserControls/ucHistory.resx rename to EOM.TSHotelManager.FormUI/AppUserControls/ucHistory.resx diff --git a/SYS.FormUI/AppUserControls/ucNavBar.Designer.cs b/EOM.TSHotelManager.FormUI/AppUserControls/ucNavBar.Designer.cs similarity index 96% rename from SYS.FormUI/AppUserControls/ucNavBar.Designer.cs rename to EOM.TSHotelManager.FormUI/AppUserControls/ucNavBar.Designer.cs index 67c2d40591841b3ce9bde3da42f1d6fdc6878727..589dd728c5be25aea3d4695facbfbac386709b2e 100644 --- a/SYS.FormUI/AppUserControls/ucNavBar.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppUserControls/ucNavBar.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI.AppUserControls +namespace EOM.TSHotelManager.FormUI.AppUserControls { partial class ucNavBar { diff --git a/SYS.FormUI/AppUserControls/ucNavBar.cs b/EOM.TSHotelManager.FormUI/AppUserControls/ucNavBar.cs similarity index 96% rename from SYS.FormUI/AppUserControls/ucNavBar.cs rename to EOM.TSHotelManager.FormUI/AppUserControls/ucNavBar.cs index 53bace50bb7293767c5085454e34ad22b8ddd5a2..8803e74b0305a9cff0409892fd6ef3a2a6e8415a 100644 --- a/SYS.FormUI/AppUserControls/ucNavBar.cs +++ b/EOM.TSHotelManager.FormUI/AppUserControls/ucNavBar.cs @@ -23,7 +23,7 @@ */ using System.Windows.Forms; -namespace SYS.FormUI.AppUserControls +namespace EOM.TSHotelManager.FormUI.AppUserControls { public partial class ucNavBar : UserControl { diff --git a/SYS.FormUI/AppUserControls/ucNavBar.resx b/EOM.TSHotelManager.FormUI/AppUserControls/ucNavBar.resx similarity index 100% rename from SYS.FormUI/AppUserControls/ucNavBar.resx rename to EOM.TSHotelManager.FormUI/AppUserControls/ucNavBar.resx diff --git a/SYS.FormUI/AppUserControls/ucRoom.Designer.cs b/EOM.TSHotelManager.FormUI/AppUserControls/ucRoom.Designer.cs similarity index 99% rename from SYS.FormUI/AppUserControls/ucRoom.Designer.cs rename to EOM.TSHotelManager.FormUI/AppUserControls/ucRoom.Designer.cs index 4a63c0ea458bcefeb1cb4073ab3b8290b362748d..f5981aff1334c09912b354d99c9cfac2e81c318e 100644 --- a/SYS.FormUI/AppUserControls/ucRoom.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppUserControls/ucRoom.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class ucRoom { diff --git a/SYS.FormUI/AppUserControls/ucRoom.cs b/EOM.TSHotelManager.FormUI/AppUserControls/ucRoom.cs similarity index 98% rename from SYS.FormUI/AppUserControls/ucRoom.cs rename to EOM.TSHotelManager.FormUI/AppUserControls/ucRoom.cs index 0c0ae8d920824d9556f1c40731e05b40987cc2e6..5e3959d9c8ac455ac2bf4eca6e437698f2ad710f 100644 --- a/SYS.FormUI/AppUserControls/ucRoom.cs +++ b/EOM.TSHotelManager.FormUI/AppUserControls/ucRoom.cs @@ -1,8 +1,8 @@ using EOM.TSHotelManager.Common.Core; using NPOI.SS.Formula.Functions; using Sunny.UI; -using SYS.Common; -using SYS.FormUI.Properties; +using EOM.TSHotelManager.Common; +using EOM.TSHotelManager.FormUI.Properties; using System; using System.Collections.Generic; using System.ComponentModel; @@ -15,7 +15,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class ucRoom : UserControl { @@ -26,13 +26,13 @@ namespace SYS.FormUI #region 存放房间信息类 + //用于结算、转房显示信息用 public static string rm_RoomNo; public static string rm_CustoNo; - public static string rm_CustoName; public static string rm_RoomType; public static string rm_RoomMoney; - public static DateTime? rm_CheckTime; public static int rm_RoomStateId; + public static string co_RoomNo; public static string co_CustoNo; public static DateTime? co_CheckTime; @@ -40,10 +40,10 @@ namespace SYS.FormUI public static string co_RoomState; public static string co_CustoName; public static string co_CustoType; - public static string co_PersonNum; #endregion #region 存放用户信息类 + //用于房态图、查看用户信息用 public static string us_CustoNo; public static string us_RoomNo; public static string us_CustoName; diff --git a/SYS.FormUI/AppUserControls/ucRoom.resx b/EOM.TSHotelManager.FormUI/AppUserControls/ucRoom.resx similarity index 100% rename from SYS.FormUI/AppUserControls/ucRoom.resx rename to EOM.TSHotelManager.FormUI/AppUserControls/ucRoom.resx diff --git a/SYS.FormUI/AppUserControls/ucRoomList.Designer.cs b/EOM.TSHotelManager.FormUI/AppUserControls/ucRoomList.Designer.cs similarity index 99% rename from SYS.FormUI/AppUserControls/ucRoomList.Designer.cs rename to EOM.TSHotelManager.FormUI/AppUserControls/ucRoomList.Designer.cs index 8eefdae65b1b71fcdd27e84a9e87ade739110bf2..26426afe4b0335422da3399511ba1b8cc344b33c 100644 --- a/SYS.FormUI/AppUserControls/ucRoomList.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppUserControls/ucRoomList.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class ucRoomList { diff --git a/SYS.FormUI/AppUserControls/ucRoomList.cs b/EOM.TSHotelManager.FormUI/AppUserControls/ucRoomList.cs similarity index 99% rename from SYS.FormUI/AppUserControls/ucRoomList.cs rename to EOM.TSHotelManager.FormUI/AppUserControls/ucRoomList.cs index 1549a6de972ab10b681dd6bfd45a8ad15706daed..66e369dc48d121e7f447c3017a0dd24a350def88 100644 --- a/SYS.FormUI/AppUserControls/ucRoomList.cs +++ b/EOM.TSHotelManager.FormUI/AppUserControls/ucRoomList.cs @@ -24,8 +24,8 @@ using EOM.TSHotelManager.Common.Core; using SqlSugar; using Sunny.UI; -using SYS.Common; -using SYS.FormUI.Properties; +using EOM.TSHotelManager.Common; +using EOM.TSHotelManager.FormUI.Properties; using System; using System.Collections.Generic; using System.ComponentModel; @@ -34,7 +34,7 @@ using System.Drawing.Drawing2D; using System.Runtime.InteropServices; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class ucRoomList : UserControl { diff --git a/SYS.FormUI/AppUserControls/ucRoomList.resx b/EOM.TSHotelManager.FormUI/AppUserControls/ucRoomList.resx similarity index 100% rename from SYS.FormUI/AppUserControls/ucRoomList.resx rename to EOM.TSHotelManager.FormUI/AppUserControls/ucRoomList.resx diff --git a/SYS.FormUI/AppUserControls/ucRoomType.Designer.cs b/EOM.TSHotelManager.FormUI/AppUserControls/ucRoomType.Designer.cs similarity index 97% rename from SYS.FormUI/AppUserControls/ucRoomType.Designer.cs rename to EOM.TSHotelManager.FormUI/AppUserControls/ucRoomType.Designer.cs index 17134586bbe21ea56a00a54f92690a4e19d6bd3f..a045bdd9866cdc38161e05251749c643c6693faf 100644 --- a/SYS.FormUI/AppUserControls/ucRoomType.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppUserControls/ucRoomType.Designer.cs @@ -1,4 +1,4 @@ -namespace SYS.FormUI.AppUserControls +namespace EOM.TSHotelManager.FormUI.AppUserControls { partial class ucRoomType { diff --git a/SYS.FormUI/AppUserControls/ucRoomType.cs b/EOM.TSHotelManager.FormUI/AppUserControls/ucRoomType.cs similarity index 87% rename from SYS.FormUI/AppUserControls/ucRoomType.cs rename to EOM.TSHotelManager.FormUI/AppUserControls/ucRoomType.cs index eddc143fbe5a75990661c53761e644ef8ae4d316..9417bfe489c6d81be2887a6e09630157797d5556 100644 --- a/SYS.FormUI/AppUserControls/ucRoomType.cs +++ b/EOM.TSHotelManager.FormUI/AppUserControls/ucRoomType.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace SYS.FormUI.AppUserControls +namespace EOM.TSHotelManager.FormUI.AppUserControls { public partial class ucRoomType : UserControl { diff --git a/SYS.FormUI/AppUserControls/ucRoomType.resx b/EOM.TSHotelManager.FormUI/AppUserControls/ucRoomType.resx similarity index 100% rename from SYS.FormUI/AppUserControls/ucRoomType.resx rename to EOM.TSHotelManager.FormUI/AppUserControls/ucRoomType.resx diff --git a/SYS.FormUI/AppUserControls/ucVipType.Designer.cs b/EOM.TSHotelManager.FormUI/AppUserControls/ucVipType.Designer.cs similarity index 95% rename from SYS.FormUI/AppUserControls/ucVipType.Designer.cs rename to EOM.TSHotelManager.FormUI/AppUserControls/ucVipType.Designer.cs index 1d88c06e1599ea0e4d9afc6235692defc3ec1012..77333420371af1f1284a77dedb1dfff074465a38 100644 --- a/SYS.FormUI/AppUserControls/ucVipType.Designer.cs +++ b/EOM.TSHotelManager.FormUI/AppUserControls/ucVipType.Designer.cs @@ -1,5 +1,5 @@  -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { partial class ucVipType { @@ -37,7 +37,7 @@ namespace SYS.FormUI // picVip // this.picVip.BackColor = System.Drawing.Color.Transparent; - this.picVip.BackgroundImage = global::SYS.FormUI.Properties.Resources.普通会员; + this.picVip.BackgroundImage = global::EOM.TSHotelManager.FormUI.Properties.Resources.普通会员; this.picVip.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picVip.Location = new System.Drawing.Point(0, 0); this.picVip.Name = "picVip"; diff --git a/SYS.FormUI/AppUserControls/ucVipType.cs b/EOM.TSHotelManager.FormUI/AppUserControls/ucVipType.cs similarity index 97% rename from SYS.FormUI/AppUserControls/ucVipType.cs rename to EOM.TSHotelManager.FormUI/AppUserControls/ucVipType.cs index aaab796d31afae2c11be854503aa40906ab8acae..d68466361d1635d07a85e1ec72ba7b6c3b8b85e4 100644 --- a/SYS.FormUI/AppUserControls/ucVipType.cs +++ b/EOM.TSHotelManager.FormUI/AppUserControls/ucVipType.cs @@ -24,7 +24,7 @@ using System; using System.Windows.Forms; -namespace SYS.FormUI +namespace EOM.TSHotelManager.FormUI { public partial class ucVipType : UserControl { diff --git a/SYS.FormUI/AppUserControls/ucVipType.resx b/EOM.TSHotelManager.FormUI/AppUserControls/ucVipType.resx similarity index 100% rename from SYS.FormUI/AppUserControls/ucVipType.resx rename to EOM.TSHotelManager.FormUI/AppUserControls/ucVipType.resx diff --git a/EOM.TSHotelManager.FormUI/EOM.TSHotelManager.FormUI.csproj b/EOM.TSHotelManager.FormUI/EOM.TSHotelManager.FormUI.csproj new file mode 100644 index 0000000000000000000000000000000000000000..3443575860bc5d62b13dd9ca9aba1ad2833ad9af --- /dev/null +++ b/EOM.TSHotelManager.FormUI/EOM.TSHotelManager.FormUI.csproj @@ -0,0 +1,265 @@ + + + + WinExe + net8.0-windows + enable + true + enable + true + 2.8.0.0 + EOM.TSHotelManager.FormUI.Program + x64 + TS酒店管理系统 + logo.ico + + + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + UserControl + + + UserControl + + + UserControl + + + UserControl + + + UserControl + + + UserControl + + + True + True + Resources.resx + + + True + True + Settings.settings + + + + + True + True + True + + + True + True + True + + + True + True + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always + ResXFileCodeGenerator + Resources.Designer.cs + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + \ No newline at end of file diff --git a/SYS.FormUI/FodyWeavers.xml b/EOM.TSHotelManager.FormUI/FodyWeavers.xml similarity index 92% rename from SYS.FormUI/FodyWeavers.xml rename to EOM.TSHotelManager.FormUI/FodyWeavers.xml index a5dcf04fd053e7f79196cd48f67499146c8110ca..345454c6d5a8f5d7320f2d4fb303c8d8868c3743 100644 --- a/SYS.FormUI/FodyWeavers.xml +++ b/EOM.TSHotelManager.FormUI/FodyWeavers.xml @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/EOM.TSHotelManager.FormUI/InitConfig/Initialize.cs b/EOM.TSHotelManager.FormUI/InitConfig/Initialize.cs new file mode 100644 index 0000000000000000000000000000000000000000..1da169856f6a95f68a01f79cff0a08b491cfb608 --- /dev/null +++ b/EOM.TSHotelManager.FormUI/InitConfig/Initialize.cs @@ -0,0 +1,65 @@ +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 +{ + public static class Initialize + { + public static void CustomizeInitialize() + { + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + Application.SetHighDpiMode(HighDpiMode.SystemAware); + + AppDomain.CurrentDomain.AssemblyLoad += OnAssemblyLoad; + InitializeConstantsInLoadedAssemblies(); + } + + static void OnAssemblyLoad(object sender, AssemblyLoadEventArgs args) + { + InitializeConstantsInAssembly(args.LoadedAssembly); + } + + static void InitializeConstantsInLoadedAssemblies() + { + foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) + { + InitializeConstantsInAssembly(assembly); + } + } + + static void InitializeConstantsInAssembly(Assembly assembly) + { + var constantTypes = assembly.GetTypes() + .Where(t => IsSubclassOfRawGeneric(typeof(Constant<>), t) && t.IsClass); + + foreach (var type in constantTypes) + { + var fields = type.GetFields(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static); + foreach (var field in fields) + { + var value = field.GetValue(null); + } + } + } + + static bool IsSubclassOfRawGeneric(Type generic, Type toCheck) + { + while (toCheck != null && toCheck != typeof(object)) + { + var cur = toCheck.IsGenericType ? toCheck.GetGenericTypeDefinition() : toCheck; + if (generic == cur) + { + return true; + } + toCheck = toCheck.BaseType; + } + return false; + } + } +} diff --git a/SYS.FormUI/Logo/bitbug_favicon (1).ico b/EOM.TSHotelManager.FormUI/Logo/bitbug_favicon (1).ico similarity index 100% rename from SYS.FormUI/Logo/bitbug_favicon (1).ico rename to EOM.TSHotelManager.FormUI/Logo/bitbug_favicon (1).ico diff --git a/EOM.TSHotelManager.FormUI/Program.cs b/EOM.TSHotelManager.FormUI/Program.cs new file mode 100644 index 0000000000000000000000000000000000000000..8b2b88a0cd1d3f6ff683d2393ecb5d3e824456cf --- /dev/null +++ b/EOM.TSHotelManager.FormUI/Program.cs @@ -0,0 +1,19 @@ +using EOM.TSHotelManager.Common; + +namespace EOM.TSHotelManager.FormUI +{ + internal static class Program + { + /// + /// The main entry point for the application. + /// + [STAThread] + static void Main() + { + // To customize application configuration such as set high DPI settings or default font, + // see https://aka.ms/applicationconfiguration. + Initialize.CustomizeInitialize(); + Application.Run(new FrmLoading()); + } + } +} \ No newline at end of file diff --git a/SYS.FormUI/Properties/Resources.Designer.cs b/EOM.TSHotelManager.FormUI/Properties/Resources.Designer.cs similarity index 83% rename from SYS.FormUI/Properties/Resources.Designer.cs rename to EOM.TSHotelManager.FormUI/Properties/Resources.Designer.cs index 4b6d6b66c499d49b9ffb66f683c7c8ee89db7ea1..027a79109a7acce9ebf42ad6d92d99b11cfe3ba4 100644 --- a/SYS.FormUI/Properties/Resources.Designer.cs +++ b/EOM.TSHotelManager.FormUI/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace SYS.FormUI.Properties { +namespace EOM.TSHotelManager.FormUI.Properties { using System; @@ -22,7 +22,7 @@ namespace SYS.FormUI.Properties { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class Resources { + internal class Resources { private static global::System.Resources.ResourceManager resourceMan; @@ -36,10 +36,10 @@ namespace SYS.FormUI.Properties { /// 返回此类使用的缓存的 ResourceManager 实例。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { + internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SYS.FormUI.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("EOM.TSHotelManager.FormUI.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -51,7 +51,7 @@ namespace SYS.FormUI.Properties { /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { + internal static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -63,7 +63,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap _lock { + internal static System.Drawing.Bitmap _lock { get { object obj = ResourceManager.GetObject("lock", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -73,7 +73,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap arrow_down_b { + internal static System.Drawing.Bitmap arrow_down_b { get { object obj = ResourceManager.GetObject("arrow-down-b", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -83,7 +83,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap blue_refresh { + internal static System.Drawing.Bitmap blue_refresh { get { object obj = ResourceManager.GetObject("blue_refresh", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -93,7 +93,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap close { + internal static System.Drawing.Bitmap close { get { object obj = ResourceManager.GetObject("close", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -103,7 +103,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018_jpg_w1024_new_small { + internal static System.Drawing.Bitmap jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018_jpg_w1024_new_small { get { object obj = ResourceManager.GetObject("jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -113,7 +113,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap picCommodity_Image { + internal static System.Drawing.Bitmap picCommodity_Image { get { object obj = ResourceManager.GetObject("picCommodity.Image", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -123,7 +123,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap picCommodity_ImageHover { + internal static System.Drawing.Bitmap picCommodity_ImageHover { get { object obj = ResourceManager.GetObject("picCommodity.ImageHover", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -133,7 +133,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap picCustomer_Image { + internal static System.Drawing.Bitmap picCustomer_Image { get { object obj = ResourceManager.GetObject("picCustomer.Image", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -143,7 +143,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap picCustomer_ImageHover { + internal static System.Drawing.Bitmap picCustomer_ImageHover { get { object obj = ResourceManager.GetObject("picCustomer.ImageHover", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -153,7 +153,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap picExtend_Image { + internal static System.Drawing.Bitmap picExtend_Image { get { object obj = ResourceManager.GetObject("picExtend.Image", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -163,7 +163,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap picExtend_ImageHover { + internal static System.Drawing.Bitmap picExtend_ImageHover { get { object obj = ResourceManager.GetObject("picExtend.ImageHover", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -173,7 +173,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap picLogo_BackgroundImage { + internal static System.Drawing.Bitmap picLogo_BackgroundImage { get { object obj = ResourceManager.GetObject("picLogo.BackgroundImage", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -183,7 +183,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap picRoom_Image { + internal static System.Drawing.Bitmap picRoom_Image { get { object obj = ResourceManager.GetObject("picRoom.Image", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -193,7 +193,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap picRoom_ImageHover { + internal static System.Drawing.Bitmap picRoom_ImageHover { get { object obj = ResourceManager.GetObject("picRoom.ImageHover", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -203,7 +203,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap settings2 { + internal static System.Drawing.Bitmap settings2 { get { object obj = ResourceManager.GetObject("settings2", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -213,7 +213,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 上传照片 { + internal static System.Drawing.Bitmap 上传照片 { get { object obj = ResourceManager.GetObject("上传照片", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -223,7 +223,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 个人中心 { + internal static System.Drawing.Bitmap 个人中心 { get { object obj = ResourceManager.GetObject("个人中心", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -233,7 +233,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 人力资源部卡片 { + internal static System.Drawing.Bitmap 人力资源部卡片 { get { object obj = ResourceManager.GetObject("人力资源部卡片", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -243,7 +243,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 修改 { + internal static System.Drawing.Bitmap 修改 { get { object obj = ResourceManager.GetObject("修改", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -253,7 +253,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 关于我们 { + internal static System.Drawing.Bitmap 关于我们 { get { object obj = ResourceManager.GetObject("关于我们", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -263,7 +263,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 内控部卡片 { + internal static System.Drawing.Bitmap 内控部卡片 { get { object obj = ResourceManager.GetObject("内控部卡片", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -273,7 +273,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 切换账号 { + internal static System.Drawing.Bitmap 切换账号 { get { object obj = ResourceManager.GetObject("切换账号", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -283,7 +283,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 可住房_hover_icon { + internal static System.Drawing.Bitmap 可住房_hover_icon { get { object obj = ResourceManager.GetObject("可住房(hover)icon", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -293,7 +293,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 可住房icon { + internal static System.Drawing.Bitmap 可住房icon { get { object obj = ResourceManager.GetObject("可住房icon", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -303,7 +303,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 可住状态 { + internal static System.Drawing.Bitmap 可住状态 { get { object obj = ResourceManager.GetObject("可住状态", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -313,7 +313,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 后勤部卡片 { + internal static System.Drawing.Bitmap 后勤部卡片 { get { object obj = ResourceManager.GetObject("后勤部卡片", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -323,7 +323,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 咖啡 { + internal static System.Drawing.Bitmap 咖啡 { get { object obj = ResourceManager.GetObject("咖啡", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -333,7 +333,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 商品部卡片 { + internal static System.Drawing.Bitmap 商品部卡片 { get { object obj = ResourceManager.GetObject("商品部卡片", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -343,7 +343,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 复制 { + internal static System.Drawing.Bitmap 复制 { get { object obj = ResourceManager.GetObject("复制", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -353,7 +353,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 密码 { + internal static System.Drawing.Bitmap 密码 { get { object obj = ResourceManager.GetObject("密码", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -363,7 +363,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 已住房_hover_icon { + internal static System.Drawing.Bitmap 已住房_hover_icon { get { object obj = ResourceManager.GetObject("已住房(hover)icon", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -373,7 +373,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 已住房icon { + internal static System.Drawing.Bitmap 已住房icon { get { object obj = ResourceManager.GetObject("已住房icon", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -383,7 +383,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 已住状态 { + internal static System.Drawing.Bitmap 已住状态 { get { object obj = ResourceManager.GetObject("已住状态", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -393,7 +393,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 常规部门卡片 { + internal static System.Drawing.Bitmap 常规部门卡片 { get { object obj = ResourceManager.GetObject("常规部门卡片", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -403,7 +403,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 总经办卡片 { + internal static System.Drawing.Bitmap 总经办卡片 { get { object obj = ResourceManager.GetObject("总经办卡片", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -413,7 +413,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 打卡2 { + internal static System.Drawing.Bitmap 打卡2 { get { object obj = ResourceManager.GetObject("打卡2", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -423,7 +423,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 早上 { + internal static System.Drawing.Bitmap 早上 { get { object obj = ResourceManager.GetObject("早上", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -433,7 +433,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 普通会员 { + internal static System.Drawing.Bitmap 普通会员 { get { object obj = ResourceManager.GetObject("普通会员", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -443,7 +443,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 月亮 { + internal static System.Drawing.Bitmap 月亮 { get { object obj = ResourceManager.GetObject("月亮", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -453,7 +453,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 检查更新__1_ { + internal static System.Drawing.Bitmap 检查更新__1_ { get { object obj = ResourceManager.GetObject("检查更新 (1)", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -463,7 +463,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 注销 { + internal static System.Drawing.Bitmap 注销 { get { object obj = ResourceManager.GetObject("注销", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -473,7 +473,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 用户登录 { + internal static System.Drawing.Bitmap 用户登录 { get { object obj = ResourceManager.GetObject("用户登录", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -483,7 +483,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 白金会员 { + internal static System.Drawing.Bitmap 白金会员 { get { object obj = ResourceManager.GetObject("白金会员", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -493,7 +493,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 监管小组卡片 { + internal static System.Drawing.Bitmap 监管小组卡片 { get { object obj = ResourceManager.GetObject("监管小组卡片", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -503,7 +503,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 系统管理员 { + internal static System.Drawing.Bitmap 系统管理员 { get { object obj = ResourceManager.GetObject("系统管理员", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -513,7 +513,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 经理部卡片 { + internal static System.Drawing.Bitmap 经理部卡片 { get { object obj = ResourceManager.GetObject("经理部卡片", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -523,7 +523,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 维修房_hover_icon { + internal static System.Drawing.Bitmap 维修房_hover_icon { get { object obj = ResourceManager.GetObject("维修房(hover)icon", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -533,7 +533,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 维修房icon { + internal static System.Drawing.Bitmap 维修房icon { get { object obj = ResourceManager.GetObject("维修房icon", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -543,7 +543,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 维修状态 { + internal static System.Drawing.Bitmap 维修状态 { get { object obj = ResourceManager.GetObject("维修状态", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -553,7 +553,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 维修部卡片 { + internal static System.Drawing.Bitmap 维修部卡片 { get { object obj = ResourceManager.GetObject("维修部卡片", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -563,7 +563,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 脏房_hover_icon { + internal static System.Drawing.Bitmap 脏房_hover_icon { get { object obj = ResourceManager.GetObject("脏房(hover)icon", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -573,7 +573,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 脏房icon1 { + internal static System.Drawing.Bitmap 脏房icon1 { get { object obj = ResourceManager.GetObject("脏房icon1", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -583,7 +583,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 脏房状态 { + internal static System.Drawing.Bitmap 脏房状态 { get { object obj = ResourceManager.GetObject("脏房状态", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -593,7 +593,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 财务部卡片 { + internal static System.Drawing.Bitmap 财务部卡片 { get { object obj = ResourceManager.GetObject("财务部卡片", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -603,7 +603,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 账号 { + internal static System.Drawing.Bitmap 账号 { get { object obj = ResourceManager.GetObject("账号", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -613,7 +613,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 转换 { + internal static System.Drawing.Bitmap 转换 { get { object obj = ResourceManager.GetObject("转换", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -623,7 +623,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 酒店部卡片 { + internal static System.Drawing.Bitmap 酒店部卡片 { get { object obj = ResourceManager.GetObject("酒店部卡片", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -633,7 +633,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 钻石会员 { + internal static System.Drawing.Bitmap 钻石会员 { get { object obj = ResourceManager.GetObject("钻石会员", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -643,7 +643,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 锁屏 { + internal static System.Drawing.Bitmap 锁屏 { get { object obj = ResourceManager.GetObject("锁屏", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -653,7 +653,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 预约房_hover_icon { + internal static System.Drawing.Bitmap 预约房_hover_icon { get { object obj = ResourceManager.GetObject("预约房(hover)icon", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -663,7 +663,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 预约房icon { + internal static System.Drawing.Bitmap 预约房icon { get { object obj = ResourceManager.GetObject("预约房icon", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -673,7 +673,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 预约状态 { + internal static System.Drawing.Bitmap 预约状态 { get { object obj = ResourceManager.GetObject("预约状态", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -683,7 +683,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 餐饮部卡片 { + internal static System.Drawing.Bitmap 餐饮部卡片 { get { object obj = ResourceManager.GetObject("餐饮部卡片", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -693,7 +693,7 @@ namespace SYS.FormUI.Properties { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - public static System.Drawing.Bitmap 黄金会员 { + internal static System.Drawing.Bitmap 黄金会员 { get { object obj = ResourceManager.GetObject("黄金会员", resourceCulture); return ((System.Drawing.Bitmap)(obj)); diff --git a/SYS.FormUI/Properties/Resources.resx b/EOM.TSHotelManager.FormUI/Properties/Resources.resx similarity index 97% rename from SYS.FormUI/Properties/Resources.resx rename to EOM.TSHotelManager.FormUI/Properties/Resources.resx index f722ae2643c56c2855ae1196d799a1c40b87cfb4..28a3c94e45fad7d32b8c1c76a4a316411474e612 100644 --- a/SYS.FormUI/Properties/Resources.resx +++ b/EOM.TSHotelManager.FormUI/Properties/Resources.resx @@ -118,143 +118,155 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\经理部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrow-down-b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\餐饮部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\blue_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\锁屏.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\普通会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picRoom.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\lockicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\月亮.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\picCommodity.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\人力资源部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\picCommodity.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\picCustomer.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\picCustomer.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\picExtend.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\picExtend.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\picLogo.BackgroundImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\picRoom.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\总经办卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\注销.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\picRoom.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\商品部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\settings2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\上传照片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\白金会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\个人中心.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\人力资源部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\修改.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\关于我们.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picCustomer.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\内控部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\切换账号.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\可住房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\可住房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\blue_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\黄金会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\picCommodity.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\财务部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\images\lockicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\维修部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\可住状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\早上.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\后勤部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\切换账号.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\咖啡.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\settings2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\商品部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\已住状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\复制.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\钻石会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\密码.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\已住房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\咖啡.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\脏房状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\已住房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\内控部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\已住状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picCommodity.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\常规部门卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\监管小组卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\总经办卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\打卡.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\常规部门卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\早上.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\维修状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\普通会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\后勤部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\月亮.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picCustomer.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\检查更新 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\个人中心.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\注销.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\预约房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\用户登录.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\预约状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\白金会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\监管小组卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\系统管理员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picLogo.BackgroundImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\经理部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\可住房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\维修房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\维修房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\维修状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\维修部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\脏房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -262,52 +274,40 @@ ..\Resources\脏房icon1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\arrow-down-b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\脏房状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picExtend.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\财务部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\维修房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\账号.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\复制.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\转换.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\酒店部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\预约房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\icon\转换.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\检查更新 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\可住状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\修改.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\钻石会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\维修房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\锁屏.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picExtend.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\预约房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\已住房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\预约房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\密码.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\预约状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\用户登录.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\餐饮部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\账号.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\黄金会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/SYS.FormUI/Properties/Settings.Designer.cs b/EOM.TSHotelManager.FormUI/Properties/Settings.Designer.cs similarity index 95% rename from SYS.FormUI/Properties/Settings.Designer.cs rename to EOM.TSHotelManager.FormUI/Properties/Settings.Designer.cs index c7794037934f6ca716920a8e140b5d6c48ea4f0b..25b386f273989e98d61b4dfe22e14272db72a894 100644 --- a/SYS.FormUI/Properties/Settings.Designer.cs +++ b/EOM.TSHotelManager.FormUI/Properties/Settings.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace SYS.FormUI.Properties { +namespace EOM.TSHotelManager.FormUI.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] diff --git a/SYS.FormUI/Properties/Settings.settings b/EOM.TSHotelManager.FormUI/Properties/Settings.settings similarity index 93% rename from SYS.FormUI/Properties/Settings.settings rename to EOM.TSHotelManager.FormUI/Properties/Settings.settings index 39645652af62950ebf3b28ec3a5400dcec30b1c4..049245f401462e7e3dfbb96385e122ca467a9dab 100644 --- a/SYS.FormUI/Properties/Settings.settings +++ b/EOM.TSHotelManager.FormUI/Properties/Settings.settings @@ -3,5 +3,4 @@ - diff --git a/SYS.FormUI/Resources/arrow-down-b.png b/EOM.TSHotelManager.FormUI/Resources/arrow-down-b.png similarity index 100% rename from SYS.FormUI/Resources/arrow-down-b.png rename to EOM.TSHotelManager.FormUI/Resources/arrow-down-b.png diff --git a/SYS.FormUI/images/blue_refresh.png b/EOM.TSHotelManager.FormUI/Resources/blue_refresh.png similarity index 100% rename from SYS.FormUI/images/blue_refresh.png rename to EOM.TSHotelManager.FormUI/Resources/blue_refresh.png diff --git a/SYS.FormUI/Resources/close.png b/EOM.TSHotelManager.FormUI/Resources/close.png similarity index 100% rename from SYS.FormUI/Resources/close.png rename to EOM.TSHotelManager.FormUI/Resources/close.png diff --git a/SYS.FormUI/Resources/jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png b/EOM.TSHotelManager.FormUI/Resources/jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png similarity index 100% rename from SYS.FormUI/Resources/jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png rename to EOM.TSHotelManager.FormUI/Resources/jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png diff --git a/SYS.FormUI/images/lockicon.png b/EOM.TSHotelManager.FormUI/Resources/lockicon.png similarity index 100% rename from SYS.FormUI/images/lockicon.png rename to EOM.TSHotelManager.FormUI/Resources/lockicon.png diff --git a/SYS.FormUI/Resources/picCommodity.Image.png b/EOM.TSHotelManager.FormUI/Resources/picCommodity.Image.png similarity index 100% rename from SYS.FormUI/Resources/picCommodity.Image.png rename to EOM.TSHotelManager.FormUI/Resources/picCommodity.Image.png diff --git a/SYS.FormUI/Resources/picCommodity.ImageHover.png b/EOM.TSHotelManager.FormUI/Resources/picCommodity.ImageHover.png similarity index 100% rename from SYS.FormUI/Resources/picCommodity.ImageHover.png rename to EOM.TSHotelManager.FormUI/Resources/picCommodity.ImageHover.png diff --git a/SYS.FormUI/Resources/picCustomer.Image.png b/EOM.TSHotelManager.FormUI/Resources/picCustomer.Image.png similarity index 100% rename from SYS.FormUI/Resources/picCustomer.Image.png rename to EOM.TSHotelManager.FormUI/Resources/picCustomer.Image.png diff --git a/SYS.FormUI/Resources/picCustomer.ImageHover.png b/EOM.TSHotelManager.FormUI/Resources/picCustomer.ImageHover.png similarity index 100% rename from SYS.FormUI/Resources/picCustomer.ImageHover.png rename to EOM.TSHotelManager.FormUI/Resources/picCustomer.ImageHover.png diff --git a/SYS.FormUI/Resources/picExtend.Image.png b/EOM.TSHotelManager.FormUI/Resources/picExtend.Image.png similarity index 100% rename from SYS.FormUI/Resources/picExtend.Image.png rename to EOM.TSHotelManager.FormUI/Resources/picExtend.Image.png diff --git a/SYS.FormUI/Resources/picExtend.ImageHover.png b/EOM.TSHotelManager.FormUI/Resources/picExtend.ImageHover.png similarity index 100% rename from SYS.FormUI/Resources/picExtend.ImageHover.png rename to EOM.TSHotelManager.FormUI/Resources/picExtend.ImageHover.png diff --git a/SYS.FormUI/Resources/picLogo.BackgroundImage.png b/EOM.TSHotelManager.FormUI/Resources/picLogo.BackgroundImage.png similarity index 100% rename from SYS.FormUI/Resources/picLogo.BackgroundImage.png rename to EOM.TSHotelManager.FormUI/Resources/picLogo.BackgroundImage.png diff --git a/SYS.FormUI/Resources/picRoom.Image.png b/EOM.TSHotelManager.FormUI/Resources/picRoom.Image.png similarity index 100% rename from SYS.FormUI/Resources/picRoom.Image.png rename to EOM.TSHotelManager.FormUI/Resources/picRoom.Image.png diff --git a/SYS.FormUI/Resources/picRoom.ImageHover.png b/EOM.TSHotelManager.FormUI/Resources/picRoom.ImageHover.png similarity index 100% rename from SYS.FormUI/Resources/picRoom.ImageHover.png rename to EOM.TSHotelManager.FormUI/Resources/picRoom.ImageHover.png diff --git a/SYS.FormUI/Resources/settings2.png b/EOM.TSHotelManager.FormUI/Resources/settings2.png similarity index 100% rename from SYS.FormUI/Resources/settings2.png rename to EOM.TSHotelManager.FormUI/Resources/settings2.png diff --git "a/SYS.FormUI/Resources/\344\270\212\344\274\240\347\205\247\347\211\207.png" "b/EOM.TSHotelManager.FormUI/Resources/\344\270\212\344\274\240\347\205\247\347\211\207.png" similarity index 100% rename from "SYS.FormUI/Resources/\344\270\212\344\274\240\347\205\247\347\211\207.png" rename to "EOM.TSHotelManager.FormUI/Resources/\344\270\212\344\274\240\347\205\247\347\211\207.png" diff --git "a/SYS.FormUI/Resources/\344\270\252\344\272\272\344\270\255\345\277\203.png" "b/EOM.TSHotelManager.FormUI/Resources/\344\270\252\344\272\272\344\270\255\345\277\203.png" similarity index 100% rename from "SYS.FormUI/Resources/\344\270\252\344\272\272\344\270\255\345\277\203.png" rename to "EOM.TSHotelManager.FormUI/Resources/\344\270\252\344\272\272\344\270\255\345\277\203.png" diff --git "a/SYS.FormUI/Resources/\344\272\272\345\212\233\350\265\204\346\272\220\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManager.FormUI/Resources/\344\272\272\345\212\233\350\265\204\346\272\220\351\203\250\345\215\241\347\211\207.png" similarity index 100% rename from "SYS.FormUI/Resources/\344\272\272\345\212\233\350\265\204\346\272\220\351\203\250\345\215\241\347\211\207.png" rename to "EOM.TSHotelManager.FormUI/Resources/\344\272\272\345\212\233\350\265\204\346\272\220\351\203\250\345\215\241\347\211\207.png" diff --git "a/SYS.FormUI/Resources/\344\277\256\346\224\271.png" "b/EOM.TSHotelManager.FormUI/Resources/\344\277\256\346\224\271.png" similarity index 100% rename from "SYS.FormUI/Resources/\344\277\256\346\224\271.png" rename to "EOM.TSHotelManager.FormUI/Resources/\344\277\256\346\224\271.png" diff --git "a/SYS.FormUI/Resources/\345\205\263\344\272\216\346\210\221\344\273\254.png" "b/EOM.TSHotelManager.FormUI/Resources/\345\205\263\344\272\216\346\210\221\344\273\254.png" similarity index 100% rename from "SYS.FormUI/Resources/\345\205\263\344\272\216\346\210\221\344\273\254.png" rename to "EOM.TSHotelManager.FormUI/Resources/\345\205\263\344\272\216\346\210\221\344\273\254.png" diff --git "a/SYS.FormUI/Resources/\345\206\205\346\216\247\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManager.FormUI/Resources/\345\206\205\346\216\247\351\203\250\345\215\241\347\211\207.png" similarity index 100% rename from "SYS.FormUI/Resources/\345\206\205\346\216\247\351\203\250\345\215\241\347\211\207.png" rename to "EOM.TSHotelManager.FormUI/Resources/\345\206\205\346\216\247\351\203\250\345\215\241\347\211\207.png" diff --git "a/SYS.FormUI/Resources/\345\210\207\346\215\242\350\264\246\345\217\267.png" "b/EOM.TSHotelManager.FormUI/Resources/\345\210\207\346\215\242\350\264\246\345\217\267.png" similarity index 100% rename from "SYS.FormUI/Resources/\345\210\207\346\215\242\350\264\246\345\217\267.png" rename to "EOM.TSHotelManager.FormUI/Resources/\345\210\207\346\215\242\350\264\246\345\217\267.png" diff --git "a/SYS.FormUI/Resources/\345\217\257\344\275\217\346\210\277(hover)icon.png" "b/EOM.TSHotelManager.FormUI/Resources/\345\217\257\344\275\217\346\210\277(hover)icon.png" similarity index 100% rename from "SYS.FormUI/Resources/\345\217\257\344\275\217\346\210\277(hover)icon.png" rename to "EOM.TSHotelManager.FormUI/Resources/\345\217\257\344\275\217\346\210\277(hover)icon.png" diff --git "a/SYS.FormUI/Resources/\345\217\257\344\275\217\346\210\277icon.png" "b/EOM.TSHotelManager.FormUI/Resources/\345\217\257\344\275\217\346\210\277icon.png" similarity index 100% rename from "SYS.FormUI/Resources/\345\217\257\344\275\217\346\210\277icon.png" rename to "EOM.TSHotelManager.FormUI/Resources/\345\217\257\344\275\217\346\210\277icon.png" diff --git "a/SYS.FormUI/Resources/\345\217\257\344\275\217\347\212\266\346\200\201.png" "b/EOM.TSHotelManager.FormUI/Resources/\345\217\257\344\275\217\347\212\266\346\200\201.png" similarity index 100% rename from "SYS.FormUI/Resources/\345\217\257\344\275\217\347\212\266\346\200\201.png" rename to "EOM.TSHotelManager.FormUI/Resources/\345\217\257\344\275\217\347\212\266\346\200\201.png" diff --git "a/SYS.FormUI/Resources/\345\220\216\345\213\244\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManager.FormUI/Resources/\345\220\216\345\213\244\351\203\250\345\215\241\347\211\207.png" similarity index 100% rename from "SYS.FormUI/Resources/\345\220\216\345\213\244\351\203\250\345\215\241\347\211\207.png" rename to "EOM.TSHotelManager.FormUI/Resources/\345\220\216\345\213\244\351\203\250\345\215\241\347\211\207.png" diff --git "a/SYS.FormUI/Resources/\345\222\226\345\225\241.png" "b/EOM.TSHotelManager.FormUI/Resources/\345\222\226\345\225\241.png" similarity index 100% rename from "SYS.FormUI/Resources/\345\222\226\345\225\241.png" rename to "EOM.TSHotelManager.FormUI/Resources/\345\222\226\345\225\241.png" diff --git "a/SYS.FormUI/Resources/\345\225\206\345\223\201\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManager.FormUI/Resources/\345\225\206\345\223\201\351\203\250\345\215\241\347\211\207.png" similarity index 100% rename from "SYS.FormUI/Resources/\345\225\206\345\223\201\351\203\250\345\215\241\347\211\207.png" rename to "EOM.TSHotelManager.FormUI/Resources/\345\225\206\345\223\201\351\203\250\345\215\241\347\211\207.png" diff --git "a/SYS.FormUI/images/\345\244\215\345\210\266.png" "b/EOM.TSHotelManager.FormUI/Resources/\345\244\215\345\210\266.png" similarity index 100% rename from "SYS.FormUI/images/\345\244\215\345\210\266.png" rename to "EOM.TSHotelManager.FormUI/Resources/\345\244\215\345\210\266.png" diff --git "a/SYS.FormUI/Resources/\345\257\206\347\240\201.png" "b/EOM.TSHotelManager.FormUI/Resources/\345\257\206\347\240\201.png" similarity index 100% rename from "SYS.FormUI/Resources/\345\257\206\347\240\201.png" rename to "EOM.TSHotelManager.FormUI/Resources/\345\257\206\347\240\201.png" diff --git "a/SYS.FormUI/Resources/\345\267\262\344\275\217\346\210\277(hover)icon.png" "b/EOM.TSHotelManager.FormUI/Resources/\345\267\262\344\275\217\346\210\277(hover)icon.png" similarity index 100% rename from "SYS.FormUI/Resources/\345\267\262\344\275\217\346\210\277(hover)icon.png" rename to "EOM.TSHotelManager.FormUI/Resources/\345\267\262\344\275\217\346\210\277(hover)icon.png" diff --git "a/SYS.FormUI/Resources/\345\267\262\344\275\217\346\210\277icon.png" "b/EOM.TSHotelManager.FormUI/Resources/\345\267\262\344\275\217\346\210\277icon.png" similarity index 100% rename from "SYS.FormUI/Resources/\345\267\262\344\275\217\346\210\277icon.png" rename to "EOM.TSHotelManager.FormUI/Resources/\345\267\262\344\275\217\346\210\277icon.png" diff --git "a/SYS.FormUI/Resources/\345\267\262\344\275\217\347\212\266\346\200\201.png" "b/EOM.TSHotelManager.FormUI/Resources/\345\267\262\344\275\217\347\212\266\346\200\201.png" similarity index 100% rename from "SYS.FormUI/Resources/\345\267\262\344\275\217\347\212\266\346\200\201.png" rename to "EOM.TSHotelManager.FormUI/Resources/\345\267\262\344\275\217\347\212\266\346\200\201.png" diff --git "a/SYS.FormUI/Resources/\345\270\270\350\247\204\351\203\250\351\227\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManager.FormUI/Resources/\345\270\270\350\247\204\351\203\250\351\227\250\345\215\241\347\211\207.png" similarity index 100% rename from "SYS.FormUI/Resources/\345\270\270\350\247\204\351\203\250\351\227\250\345\215\241\347\211\207.png" rename to "EOM.TSHotelManager.FormUI/Resources/\345\270\270\350\247\204\351\203\250\351\227\250\345\215\241\347\211\207.png" diff --git "a/SYS.FormUI/Resources/\346\200\273\347\273\217\345\212\236\345\215\241\347\211\207.png" "b/EOM.TSHotelManager.FormUI/Resources/\346\200\273\347\273\217\345\212\236\345\215\241\347\211\207.png" similarity index 100% rename from "SYS.FormUI/Resources/\346\200\273\347\273\217\345\212\236\345\215\241\347\211\207.png" rename to "EOM.TSHotelManager.FormUI/Resources/\346\200\273\347\273\217\345\212\236\345\215\241\347\211\207.png" diff --git "a/SYS.FormUI/Resources/\346\211\223\345\215\241.png" "b/EOM.TSHotelManager.FormUI/Resources/\346\211\223\345\215\241.png" similarity index 100% rename from "SYS.FormUI/Resources/\346\211\223\345\215\241.png" rename to "EOM.TSHotelManager.FormUI/Resources/\346\211\223\345\215\241.png" diff --git "a/SYS.FormUI/Resources/\346\227\251\344\270\212.png" "b/EOM.TSHotelManager.FormUI/Resources/\346\227\251\344\270\212.png" similarity index 100% rename from "SYS.FormUI/Resources/\346\227\251\344\270\212.png" rename to "EOM.TSHotelManager.FormUI/Resources/\346\227\251\344\270\212.png" diff --git "a/SYS.FormUI/Resources/\346\231\256\351\200\232\344\274\232\345\221\230.png" "b/EOM.TSHotelManager.FormUI/Resources/\346\231\256\351\200\232\344\274\232\345\221\230.png" similarity index 100% rename from "SYS.FormUI/Resources/\346\231\256\351\200\232\344\274\232\345\221\230.png" rename to "EOM.TSHotelManager.FormUI/Resources/\346\231\256\351\200\232\344\274\232\345\221\230.png" diff --git "a/SYS.FormUI/Resources/\346\234\210\344\272\256.png" "b/EOM.TSHotelManager.FormUI/Resources/\346\234\210\344\272\256.png" similarity index 100% rename from "SYS.FormUI/Resources/\346\234\210\344\272\256.png" rename to "EOM.TSHotelManager.FormUI/Resources/\346\234\210\344\272\256.png" diff --git "a/SYS.FormUI/Resources/\346\243\200\346\237\245\346\233\264\346\226\260 (1).png" "b/EOM.TSHotelManager.FormUI/Resources/\346\243\200\346\237\245\346\233\264\346\226\260 (1).png" similarity index 100% rename from "SYS.FormUI/Resources/\346\243\200\346\237\245\346\233\264\346\226\260 (1).png" rename to "EOM.TSHotelManager.FormUI/Resources/\346\243\200\346\237\245\346\233\264\346\226\260 (1).png" diff --git "a/SYS.FormUI/Resources/\346\263\250\351\224\200.png" "b/EOM.TSHotelManager.FormUI/Resources/\346\263\250\351\224\200.png" similarity index 100% rename from "SYS.FormUI/Resources/\346\263\250\351\224\200.png" rename to "EOM.TSHotelManager.FormUI/Resources/\346\263\250\351\224\200.png" diff --git "a/SYS.FormUI/Resources/\347\224\250\346\210\267\347\231\273\345\275\225.png" "b/EOM.TSHotelManager.FormUI/Resources/\347\224\250\346\210\267\347\231\273\345\275\225.png" similarity index 100% rename from "SYS.FormUI/Resources/\347\224\250\346\210\267\347\231\273\345\275\225.png" rename to "EOM.TSHotelManager.FormUI/Resources/\347\224\250\346\210\267\347\231\273\345\275\225.png" diff --git "a/SYS.FormUI/Resources/\347\231\275\351\207\221\344\274\232\345\221\230.png" "b/EOM.TSHotelManager.FormUI/Resources/\347\231\275\351\207\221\344\274\232\345\221\230.png" similarity index 100% rename from "SYS.FormUI/Resources/\347\231\275\351\207\221\344\274\232\345\221\230.png" rename to "EOM.TSHotelManager.FormUI/Resources/\347\231\275\351\207\221\344\274\232\345\221\230.png" diff --git "a/SYS.FormUI/Resources/\347\233\221\347\256\241\345\260\217\347\273\204\345\215\241\347\211\207.png" "b/EOM.TSHotelManager.FormUI/Resources/\347\233\221\347\256\241\345\260\217\347\273\204\345\215\241\347\211\207.png" similarity index 100% rename from "SYS.FormUI/Resources/\347\233\221\347\256\241\345\260\217\347\273\204\345\215\241\347\211\207.png" rename to "EOM.TSHotelManager.FormUI/Resources/\347\233\221\347\256\241\345\260\217\347\273\204\345\215\241\347\211\207.png" diff --git "a/SYS.FormUI/Resources/\347\263\273\347\273\237\347\256\241\347\220\206\345\221\230.png" "b/EOM.TSHotelManager.FormUI/Resources/\347\263\273\347\273\237\347\256\241\347\220\206\345\221\230.png" similarity index 100% rename from "SYS.FormUI/Resources/\347\263\273\347\273\237\347\256\241\347\220\206\345\221\230.png" rename to "EOM.TSHotelManager.FormUI/Resources/\347\263\273\347\273\237\347\256\241\347\220\206\345\221\230.png" diff --git "a/SYS.FormUI/Resources/\347\273\217\347\220\206\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManager.FormUI/Resources/\347\273\217\347\220\206\351\203\250\345\215\241\347\211\207.png" similarity index 100% rename from "SYS.FormUI/Resources/\347\273\217\347\220\206\351\203\250\345\215\241\347\211\207.png" rename to "EOM.TSHotelManager.FormUI/Resources/\347\273\217\347\220\206\351\203\250\345\215\241\347\211\207.png" diff --git "a/SYS.FormUI/Resources/\347\273\264\344\277\256\346\210\277(hover)icon.png" "b/EOM.TSHotelManager.FormUI/Resources/\347\273\264\344\277\256\346\210\277(hover)icon.png" similarity index 100% rename from "SYS.FormUI/Resources/\347\273\264\344\277\256\346\210\277(hover)icon.png" rename to "EOM.TSHotelManager.FormUI/Resources/\347\273\264\344\277\256\346\210\277(hover)icon.png" diff --git "a/SYS.FormUI/Resources/\347\273\264\344\277\256\346\210\277icon.png" "b/EOM.TSHotelManager.FormUI/Resources/\347\273\264\344\277\256\346\210\277icon.png" similarity index 100% rename from "SYS.FormUI/Resources/\347\273\264\344\277\256\346\210\277icon.png" rename to "EOM.TSHotelManager.FormUI/Resources/\347\273\264\344\277\256\346\210\277icon.png" diff --git "a/SYS.FormUI/Resources/\347\273\264\344\277\256\347\212\266\346\200\201.png" "b/EOM.TSHotelManager.FormUI/Resources/\347\273\264\344\277\256\347\212\266\346\200\201.png" similarity index 100% rename from "SYS.FormUI/Resources/\347\273\264\344\277\256\347\212\266\346\200\201.png" rename to "EOM.TSHotelManager.FormUI/Resources/\347\273\264\344\277\256\347\212\266\346\200\201.png" diff --git "a/SYS.FormUI/Resources/\347\273\264\344\277\256\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManager.FormUI/Resources/\347\273\264\344\277\256\351\203\250\345\215\241\347\211\207.png" similarity index 100% rename from "SYS.FormUI/Resources/\347\273\264\344\277\256\351\203\250\345\215\241\347\211\207.png" rename to "EOM.TSHotelManager.FormUI/Resources/\347\273\264\344\277\256\351\203\250\345\215\241\347\211\207.png" diff --git "a/SYS.FormUI/Resources/\350\204\217\346\210\277(hover)icon.png" "b/EOM.TSHotelManager.FormUI/Resources/\350\204\217\346\210\277(hover)icon.png" similarity index 100% rename from "SYS.FormUI/Resources/\350\204\217\346\210\277(hover)icon.png" rename to "EOM.TSHotelManager.FormUI/Resources/\350\204\217\346\210\277(hover)icon.png" diff --git "a/SYS.FormUI/Resources/\350\204\217\346\210\277icon1.png" "b/EOM.TSHotelManager.FormUI/Resources/\350\204\217\346\210\277icon1.png" similarity index 100% rename from "SYS.FormUI/Resources/\350\204\217\346\210\277icon1.png" rename to "EOM.TSHotelManager.FormUI/Resources/\350\204\217\346\210\277icon1.png" diff --git "a/SYS.FormUI/Resources/\350\204\217\346\210\277\347\212\266\346\200\201.png" "b/EOM.TSHotelManager.FormUI/Resources/\350\204\217\346\210\277\347\212\266\346\200\201.png" similarity index 100% rename from "SYS.FormUI/Resources/\350\204\217\346\210\277\347\212\266\346\200\201.png" rename to "EOM.TSHotelManager.FormUI/Resources/\350\204\217\346\210\277\347\212\266\346\200\201.png" diff --git "a/SYS.FormUI/Resources/\350\264\242\345\212\241\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManager.FormUI/Resources/\350\264\242\345\212\241\351\203\250\345\215\241\347\211\207.png" similarity index 100% rename from "SYS.FormUI/Resources/\350\264\242\345\212\241\351\203\250\345\215\241\347\211\207.png" rename to "EOM.TSHotelManager.FormUI/Resources/\350\264\242\345\212\241\351\203\250\345\215\241\347\211\207.png" diff --git "a/SYS.FormUI/Resources/\350\264\246\345\217\267.png" "b/EOM.TSHotelManager.FormUI/Resources/\350\264\246\345\217\267.png" similarity index 100% rename from "SYS.FormUI/Resources/\350\264\246\345\217\267.png" rename to "EOM.TSHotelManager.FormUI/Resources/\350\264\246\345\217\267.png" diff --git "a/SYS.FormUI/icon/\350\275\254\346\215\242.ico" "b/EOM.TSHotelManager.FormUI/Resources/\350\275\254\346\215\242.ico" similarity index 100% rename from "SYS.FormUI/icon/\350\275\254\346\215\242.ico" rename to "EOM.TSHotelManager.FormUI/Resources/\350\275\254\346\215\242.ico" diff --git "a/SYS.FormUI/Resources/\351\205\222\345\272\227\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManager.FormUI/Resources/\351\205\222\345\272\227\351\203\250\345\215\241\347\211\207.png" similarity index 100% rename from "SYS.FormUI/Resources/\351\205\222\345\272\227\351\203\250\345\215\241\347\211\207.png" rename to "EOM.TSHotelManager.FormUI/Resources/\351\205\222\345\272\227\351\203\250\345\215\241\347\211\207.png" diff --git "a/SYS.FormUI/Resources/\351\222\273\347\237\263\344\274\232\345\221\230.png" "b/EOM.TSHotelManager.FormUI/Resources/\351\222\273\347\237\263\344\274\232\345\221\230.png" similarity index 100% rename from "SYS.FormUI/Resources/\351\222\273\347\237\263\344\274\232\345\221\230.png" rename to "EOM.TSHotelManager.FormUI/Resources/\351\222\273\347\237\263\344\274\232\345\221\230.png" diff --git "a/SYS.FormUI/Resources/\351\224\201\345\261\217.png" "b/EOM.TSHotelManager.FormUI/Resources/\351\224\201\345\261\217.png" similarity index 100% rename from "SYS.FormUI/Resources/\351\224\201\345\261\217.png" rename to "EOM.TSHotelManager.FormUI/Resources/\351\224\201\345\261\217.png" diff --git "a/SYS.FormUI/Resources/\351\242\204\347\272\246\346\210\277(hover)icon.png" "b/EOM.TSHotelManager.FormUI/Resources/\351\242\204\347\272\246\346\210\277(hover)icon.png" similarity index 100% rename from "SYS.FormUI/Resources/\351\242\204\347\272\246\346\210\277(hover)icon.png" rename to "EOM.TSHotelManager.FormUI/Resources/\351\242\204\347\272\246\346\210\277(hover)icon.png" diff --git "a/SYS.FormUI/Resources/\351\242\204\347\272\246\346\210\277icon.png" "b/EOM.TSHotelManager.FormUI/Resources/\351\242\204\347\272\246\346\210\277icon.png" similarity index 100% rename from "SYS.FormUI/Resources/\351\242\204\347\272\246\346\210\277icon.png" rename to "EOM.TSHotelManager.FormUI/Resources/\351\242\204\347\272\246\346\210\277icon.png" diff --git "a/SYS.FormUI/Resources/\351\242\204\347\272\246\347\212\266\346\200\201.png" "b/EOM.TSHotelManager.FormUI/Resources/\351\242\204\347\272\246\347\212\266\346\200\201.png" similarity index 100% rename from "SYS.FormUI/Resources/\351\242\204\347\272\246\347\212\266\346\200\201.png" rename to "EOM.TSHotelManager.FormUI/Resources/\351\242\204\347\272\246\347\212\266\346\200\201.png" diff --git "a/SYS.FormUI/Resources/\351\244\220\351\245\256\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManager.FormUI/Resources/\351\244\220\351\245\256\351\203\250\345\215\241\347\211\207.png" similarity index 100% rename from "SYS.FormUI/Resources/\351\244\220\351\245\256\351\203\250\345\215\241\347\211\207.png" rename to "EOM.TSHotelManager.FormUI/Resources/\351\244\220\351\245\256\351\203\250\345\215\241\347\211\207.png" diff --git "a/SYS.FormUI/Resources/\351\273\204\351\207\221\344\274\232\345\221\230.png" "b/EOM.TSHotelManager.FormUI/Resources/\351\273\204\351\207\221\344\274\232\345\221\230.png" similarity index 100% rename from "SYS.FormUI/Resources/\351\273\204\351\207\221\344\274\232\345\221\230.png" rename to "EOM.TSHotelManager.FormUI/Resources/\351\273\204\351\207\221\344\274\232\345\221\230.png" diff --git a/EOM.TSHotelManager.FormUI/TableComponent/TableComHelper.cs b/EOM.TSHotelManager.FormUI/TableComponent/TableComHelper.cs new file mode 100644 index 0000000000000000000000000000000000000000..7c7bf62a8714ed4753c34c6c0aa0dbc47ac33a85 --- /dev/null +++ b/EOM.TSHotelManager.FormUI/TableComponent/TableComHelper.cs @@ -0,0 +1,200 @@ +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; + +namespace EOM.TSHotelManager.FormUI +{ + public class TableComHelper + { + private XDocument _xmlDoc; + + public TableComHelper() + { + var xmlPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "EOM.TSHotelManager.Common.Core.xml"); + + try + { + _xmlDoc = XDocument.Load(xmlPath); + } + catch (Exception ex) + { + throw new InvalidOperationException($"无法加载XML文件: {xmlPath}", ex); + } + } + + /// + /// 转换字段为AntdUI Table组件的Column类型 + /// + /// + /// + public ColumnCollection ConvertToAntdColumns(List tableColumns) + { + var columnCollection = new ColumnCollection(); + + foreach (var tableColumn in tableColumns) + { + var column = new Column( + tableColumn.Field, // 列名 + tableColumn.Description, // 列标题 + ColumnAlign.Center // 对齐方式 + ) + { + Visible = true, + SortOrder = true, + Align = ColumnAlign.Center, + ColAlign = ColumnAlign.Center, + LineBreak = true + }; + + columnCollection.Add(column); + } + + return columnCollection; + } + + /// + /// 转换字段为AntdUI Table组件的AntItem类型 + /// + /// + /// + /// + public List ConvertToAntdItems(List datas) + { + var listTableSource = new List(); + var properties = typeof(T).GetProperties(); // 获取泛型实体T的所有属性 + + foreach (var data in datas) + { + var antItems = new List(); + + foreach (var prop in properties) + { + // 获取 UIDisplay 特性 + var displayAttribute = prop.GetCustomAttribute(); + + // 如果没有 UIDisplay 特性，则跳过 + if (displayAttribute == null) + { + continue; + } + + var propName = prop.Name; // 获取属性名 + var propValue = prop.GetValue(data); // 获取属性值 + var propType = prop.PropertyType; // 获取属性的类型 + + // 根据字段的类型做特定处理 + if (propType == typeof(bool) || propType == typeof(int)) + { + var boolValue = Convert.ToBoolean(propValue); + var cellTag = boolValue ? new AntdUI.CellTag("是", AntdUI.TTypeMini.Error) : new AntdUI.CellTag("否", AntdUI.TTypeMini.Success); + antItems.Add(new AntdUI.AntItem(propName, cellTag)); + } + else if (propType == typeof(string)) + { + antItems.Add(new AntdUI.AntItem(propName, propValue?.ToString())); + } + else if (propType == typeof(DateTime)) + { + var dateValue = (DateTime)propValue; + + if (dateValue.Hour == 0 && dateValue.Minute == 0 && dateValue.Second == 0) + { + antItems.Add(new AntdUI.AntItem(propName, dateValue.ToString("yyyy-MM-dd"))); + } + else + { + antItems.Add(new AntdUI.AntItem(propName, dateValue.ToString("yyyy-MM-dd HH:mm:ss"))); + } + } + else + { + // 对于其他类型，默认显示字段名和字段值 + antItems.Add(new AntdUI.AntItem(propName, propValue?.ToString())); + } + } + + listTableSource.Add(antItems.ToArray()); // 添加处理后的AntdItem数组到结果集中 + } + return listTableSource; + } + + /// + /// 获取实体字段名 + /// + /// + /// + /// + public List GenerateDataColumns() where T : class + { + var tableColumns = new List(); + var properties = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance); + + foreach (var property in properties) + { + // 获取 UIDisplay 特性 + var displayAttribute = property.GetCustomAttribute(); + + // 如果没有 UIDisplay 特性，则跳过 + if (displayAttribute == null) + { + continue; + } + var propertyName = property.Name; + string comment; + try + { + comment = GetPropertyComment(_xmlDoc, typeof(T).FullName, propertyName); + } + catch (Exception ex) + { + comment = $"注释获取失败: {ex.Message}"; + } + + tableColumns.Add(new TableColumn(propertyName, displayAttribute.DisplayName ?? comment)); + } + + return tableColumns; + } + + /// + /// 获取字段对应注释 + /// + /// + /// + /// + /// + public string GetPropertyComment(XDocument xmlDoc, string typeName, string propertyName) + { + var propertyNameInXml = $"{typeName}.{propertyName}"; + var commentElement = xmlDoc + .Descendants("member") + .FirstOrDefault(x => x.Attribute("name")?.Value == $"P:{propertyNameInXml}") + ?.Descendants("summary") + .FirstOrDefault(); + + return commentElement?.Value.Trim() ?? "No comment"; + } + + /// + /// 表字段 + /// + public class TableColumn + { + public TableColumn(string field, string description) + { + Field = field; + Description = description; + } + + public string Field { get; set; } + public string Description { get; set; } + } + } +} diff --git a/SYS.FormUI/icon/add to card.ico b/EOM.TSHotelManager.FormUI/icon/add to card.ico similarity index 100% rename from SYS.FormUI/icon/add to card.ico rename to EOM.TSHotelManager.FormUI/icon/add to card.ico diff --git a/SYS.FormUI/icon/add_person.ico b/EOM.TSHotelManager.FormUI/icon/add_person.ico similarity index 100% rename from SYS.FormUI/icon/add_person.ico rename to EOM.TSHotelManager.FormUI/icon/add_person.ico diff --git a/SYS.FormUI/icon/check-out2.ico b/EOM.TSHotelManager.FormUI/icon/check-out2.ico similarity index 100% rename from SYS.FormUI/icon/check-out2.ico rename to EOM.TSHotelManager.FormUI/icon/check-out2.ico diff --git a/SYS.FormUI/icon/checkin.ico b/EOM.TSHotelManager.FormUI/icon/checkin.ico similarity index 100% rename from SYS.FormUI/icon/checkin.ico rename to EOM.TSHotelManager.FormUI/icon/checkin.ico diff --git a/SYS.FormUI/icon/customers.ico b/EOM.TSHotelManager.FormUI/icon/customers.ico similarity index 100% rename from SYS.FormUI/icon/customers.ico rename to EOM.TSHotelManager.FormUI/icon/customers.ico diff --git a/SYS.FormUI/icon/time.ico b/EOM.TSHotelManager.FormUI/icon/time.ico similarity index 100% rename from SYS.FormUI/icon/time.ico rename to EOM.TSHotelManager.FormUI/icon/time.ico diff --git "a/SYS.FormUI/icon/\344\274\240\350\276\223_\344\270\212\344\274\240.ico" "b/EOM.TSHotelManager.FormUI/icon/\344\274\240\350\276\223_\344\270\212\344\274\240.ico" similarity index 100% rename from "SYS.FormUI/icon/\344\274\240\350\276\223_\344\270\212\344\274\240.ico" rename to "EOM.TSHotelManager.FormUI/icon/\344\274\240\350\276\223_\344\270\212\344\274\240.ico" diff --git "a/SYS.FormUI/icon/\345\205\263\344\272\216\346\210\221\344\273\254.ico" "b/EOM.TSHotelManager.FormUI/icon/\345\205\263\344\272\216\346\210\221\344\273\254.ico" similarity index 100% rename from "SYS.FormUI/icon/\345\205\263\344\272\216\346\210\221\344\273\254.ico" rename to "EOM.TSHotelManager.FormUI/icon/\345\205\263\344\272\216\346\210\221\344\273\254.ico" diff --git "a/SYS.FormUI/icon/\345\216\206\345\217\262\345\205\254\345\221\212.ico" "b/EOM.TSHotelManager.FormUI/icon/\345\216\206\345\217\262\345\205\254\345\221\212.ico" similarity index 100% rename from "SYS.FormUI/icon/\345\216\206\345\217\262\345\205\254\345\221\212.ico" rename to "EOM.TSHotelManager.FormUI/icon/\345\216\206\345\217\262\345\205\254\345\221\212.ico" diff --git "a/SYS.FormUI/icon/\345\221\230\345\267\245\344\273\273\345\221\275.ico" "b/EOM.TSHotelManager.FormUI/icon/\345\221\230\345\267\245\344\273\273\345\221\275.ico" similarity index 100% rename from "SYS.FormUI/icon/\345\221\230\345\267\245\344\273\273\345\221\275.ico" rename to "EOM.TSHotelManager.FormUI/icon/\345\221\230\345\267\245\344\273\273\345\221\275.ico" diff --git "a/SYS.FormUI/icon/\345\221\230\345\267\245\347\256\241\347\220\206.ico" "b/EOM.TSHotelManager.FormUI/icon/\345\221\230\345\267\245\347\256\241\347\220\206.ico" similarity index 100% rename from "SYS.FormUI/icon/\345\221\230\345\267\245\347\256\241\347\220\206.ico" rename to "EOM.TSHotelManager.FormUI/icon/\345\221\230\345\267\245\347\256\241\347\220\206.ico" diff --git "a/SYS.FormUI/icon/\345\225\206\345\223\201\347\256\241\347\220\206.ico" "b/EOM.TSHotelManager.FormUI/icon/\345\225\206\345\223\201\347\256\241\347\220\206.ico" similarity index 100% rename from "SYS.FormUI/icon/\345\225\206\345\223\201\347\256\241\347\220\206.ico" rename to "EOM.TSHotelManager.FormUI/icon/\345\225\206\345\223\201\347\256\241\347\220\206.ico" diff --git "a/SYS.FormUI/icon/\345\245\226\346\203\251.ico" "b/EOM.TSHotelManager.FormUI/icon/\345\245\226\346\203\251.ico" similarity index 100% rename from "SYS.FormUI/icon/\345\245\226\346\203\251.ico" rename to "EOM.TSHotelManager.FormUI/icon/\345\245\226\346\203\251.ico" diff --git "a/SYS.FormUI/icon/\345\255\246\345\216\206.ico" "b/EOM.TSHotelManager.FormUI/icon/\345\255\246\345\216\206.ico" similarity index 100% rename from "SYS.FormUI/icon/\345\255\246\345\216\206.ico" rename to "EOM.TSHotelManager.FormUI/icon/\345\255\246\345\216\206.ico" diff --git "a/SYS.FormUI/icon/\345\256\242\346\210\267\344\277\241\346\201\257.ico" "b/EOM.TSHotelManager.FormUI/icon/\345\256\242\346\210\267\344\277\241\346\201\257.ico" similarity index 100% rename from "SYS.FormUI/icon/\345\256\242\346\210\267\344\277\241\346\201\257.ico" rename to "EOM.TSHotelManager.FormUI/icon/\345\256\242\346\210\267\344\277\241\346\201\257.ico" diff --git "a/SYS.FormUI/icon/\345\256\242\346\210\267\347\256\241\347\220\206.ico" "b/EOM.TSHotelManager.FormUI/icon/\345\256\242\346\210\267\347\256\241\347\220\206.ico" similarity index 100% rename from "SYS.FormUI/icon/\345\256\242\346\210\267\347\256\241\347\220\206.ico" rename to "EOM.TSHotelManager.FormUI/icon/\345\256\242\346\210\267\347\256\241\347\220\206.ico" diff --git "a/SYS.FormUI/icon/\346\200\247 \345\210\253.ico" "b/EOM.TSHotelManager.FormUI/icon/\346\200\247 \345\210\253.ico" similarity index 100% rename from "SYS.FormUI/icon/\346\200\247 \345\210\253.ico" rename to "EOM.TSHotelManager.FormUI/icon/\346\200\247 \345\210\253.ico" diff --git "a/SYS.FormUI/icon/\346\210\277\346\200\201\345\233\276.ico" "b/EOM.TSHotelManager.FormUI/icon/\346\210\277\346\200\201\345\233\276.ico" similarity index 100% rename from "SYS.FormUI/icon/\346\210\277\346\200\201\345\233\276.ico" rename to "EOM.TSHotelManager.FormUI/icon/\346\210\277\346\200\201\345\233\276.ico" diff --git "a/SYS.FormUI/icon/\346\210\277\351\227\264\344\277\256\346\224\271.ico" "b/EOM.TSHotelManager.FormUI/icon/\346\210\277\351\227\264\344\277\256\346\224\271.ico" similarity index 100% rename from "SYS.FormUI/icon/\346\210\277\351\227\264\344\277\256\346\224\271.ico" rename to "EOM.TSHotelManager.FormUI/icon/\346\210\277\351\227\264\344\277\256\346\224\271.ico" diff --git "a/SYS.FormUI/icon/\346\212\245\350\241\250.ico" "b/EOM.TSHotelManager.FormUI/icon/\346\212\245\350\241\250.ico" similarity index 100% rename from "SYS.FormUI/icon/\346\212\245\350\241\250.ico" rename to "EOM.TSHotelManager.FormUI/icon/\346\212\245\350\241\250.ico" diff --git "a/SYS.FormUI/icon/\346\223\215\344\275\234\350\256\260\345\275\225.ico" "b/EOM.TSHotelManager.FormUI/icon/\346\223\215\344\275\234\350\256\260\345\275\225.ico" similarity index 100% rename from "SYS.FormUI/icon/\346\223\215\344\275\234\350\256\260\345\275\225.ico" rename to "EOM.TSHotelManager.FormUI/icon/\346\223\215\344\275\234\350\256\260\345\275\225.ico" diff --git "a/SYS.FormUI/icon/\346\226\260\345\242\236.ico" "b/EOM.TSHotelManager.FormUI/icon/\346\226\260\345\242\236.ico" similarity index 100% rename from "SYS.FormUI/icon/\346\226\260\345\242\236.ico" rename to "EOM.TSHotelManager.FormUI/icon/\346\226\260\345\242\236.ico" diff --git "a/SYS.FormUI/icon/\346\235\203\351\231\220.ico" "b/EOM.TSHotelManager.FormUI/icon/\346\235\203\351\231\220.ico" similarity index 100% rename from "SYS.FormUI/icon/\346\235\203\351\231\220.ico" rename to "EOM.TSHotelManager.FormUI/icon/\346\235\203\351\231\220.ico" diff --git "a/SYS.FormUI/icon/\346\260\221\346\227\217.ico" "b/EOM.TSHotelManager.FormUI/icon/\346\260\221\346\227\217.ico" similarity index 100% rename from "SYS.FormUI/icon/\346\260\221\346\227\217.ico" rename to "EOM.TSHotelManager.FormUI/icon/\346\260\221\346\227\217.ico" diff --git "a/SYS.FormUI/icon/\346\260\264\347\224\265.ico" "b/EOM.TSHotelManager.FormUI/icon/\346\260\264\347\224\265.ico" similarity index 100% rename from "SYS.FormUI/icon/\346\260\264\347\224\265.ico" rename to "EOM.TSHotelManager.FormUI/icon/\346\260\264\347\224\265.ico" diff --git "a/SYS.FormUI/icon/\346\266\210\350\264\271\350\264\246\345\215\225.ico" "b/EOM.TSHotelManager.FormUI/icon/\346\266\210\350\264\271\350\264\246\345\215\225.ico" similarity index 100% rename from "SYS.FormUI/icon/\346\266\210\350\264\271\350\264\246\345\215\225.ico" rename to "EOM.TSHotelManager.FormUI/icon/\346\266\210\350\264\271\350\264\246\345\215\225.ico" diff --git "a/SYS.FormUI/icon/\346\267\273\345\212\240\345\221\230\345\267\245.ico" "b/EOM.TSHotelManager.FormUI/icon/\346\267\273\345\212\240\345\221\230\345\267\245.ico" similarity index 100% rename from "SYS.FormUI/icon/\346\267\273\345\212\240\345\221\230\345\267\245.ico" rename to "EOM.TSHotelManager.FormUI/icon/\346\267\273\345\212\240\345\221\230\345\267\245.ico" diff --git "a/SYS.FormUI/icon/\346\267\273\345\212\240\347\256\241\347\220\206\345\221\230.ico" "b/EOM.TSHotelManager.FormUI/icon/\346\267\273\345\212\240\347\256\241\347\220\206\345\221\230.ico" similarity index 100% rename from "SYS.FormUI/icon/\346\267\273\345\212\240\347\256\241\347\220\206\345\221\230.ico" rename to "EOM.TSHotelManager.FormUI/icon/\346\267\273\345\212\240\347\256\241\347\220\206\345\221\230.ico" diff --git "a/SYS.FormUI/icon/\347\233\221\347\256\241\347\273\237\350\256\241.ico" "b/EOM.TSHotelManager.FormUI/icon/\347\233\221\347\256\241\347\273\237\350\256\241.ico" similarity index 100% rename from "SYS.FormUI/icon/\347\233\221\347\256\241\347\273\237\350\256\241.ico" rename to "EOM.TSHotelManager.FormUI/icon/\347\233\221\347\256\241\347\273\237\350\256\241.ico" diff --git "a/SYS.FormUI/icon/\347\233\276\347\211\214.ico" "b/EOM.TSHotelManager.FormUI/icon/\347\233\276\347\211\214.ico" similarity index 100% rename from "SYS.FormUI/icon/\347\233\276\347\211\214.ico" rename to "EOM.TSHotelManager.FormUI/icon/\347\233\276\347\211\214.ico" diff --git "a/SYS.FormUI/icon/\347\246\201\347\224\250.ico" "b/EOM.TSHotelManager.FormUI/icon/\347\246\201\347\224\250.ico" similarity index 100% rename from "SYS.FormUI/icon/\347\246\201\347\224\250.ico" rename to "EOM.TSHotelManager.FormUI/icon/\347\246\201\347\224\250.ico" diff --git "a/SYS.FormUI/icon/\347\255\211\347\272\247.ico" "b/EOM.TSHotelManager.FormUI/icon/\347\255\211\347\272\247.ico" similarity index 100% rename from "SYS.FormUI/icon/\347\255\211\347\272\247.ico" rename to "EOM.TSHotelManager.FormUI/icon/\347\255\211\347\272\247.ico" diff --git "a/SYS.FormUI/icon/\350\201\214\344\275\215.ico" "b/EOM.TSHotelManager.FormUI/icon/\350\201\214\344\275\215.ico" similarity index 100% rename from "SYS.FormUI/icon/\350\201\214\344\275\215.ico" rename to "EOM.TSHotelManager.FormUI/icon/\350\201\214\344\275\215.ico" diff --git "a/SYS.FormUI/icon/\350\247\204\345\210\231.ico" "b/EOM.TSHotelManager.FormUI/icon/\350\247\204\345\210\231.ico" similarity index 100% rename from "SYS.FormUI/icon/\350\247\204\345\210\231.ico" rename to "EOM.TSHotelManager.FormUI/icon/\350\247\204\345\210\231.ico" diff --git "a/SYS.FormUI/icon/\350\264\242\345\212\241\350\264\246\345\215\225.ico" "b/EOM.TSHotelManager.FormUI/icon/\350\264\242\345\212\241\350\264\246\345\215\225.ico" similarity index 100% rename from "SYS.FormUI/icon/\350\264\242\345\212\241\350\264\246\345\215\225.ico" rename to "EOM.TSHotelManager.FormUI/icon/\350\264\242\345\212\241\350\264\246\345\215\225.ico" diff --git "a/EOM.TSHotelManager.FormUI/icon/\350\275\254\346\215\242.ico" "b/EOM.TSHotelManager.FormUI/icon/\350\275\254\346\215\242.ico" new file mode 100644 index 0000000000000000000000000000000000000000..b46c53843b6a97d820faedb9bd2e2a2c1ec73666 Binary files /dev/null and "b/EOM.TSHotelManager.FormUI/icon/\350\275\254\346\215\242.ico" differ diff --git "a/SYS.FormUI/icon/\351\203\250\351\227\250.ico" "b/EOM.TSHotelManager.FormUI/icon/\351\203\250\351\227\250.ico" similarity index 100% rename from "SYS.FormUI/icon/\351\203\250\351\227\250.ico" rename to "EOM.TSHotelManager.FormUI/icon/\351\203\250\351\227\250.ico" diff --git "a/SYS.FormUI/icon/\351\242\204\347\272\246.ico" "b/EOM.TSHotelManager.FormUI/icon/\351\242\204\347\272\246.ico" similarity index 100% rename from "SYS.FormUI/icon/\351\242\204\347\272\246.ico" rename to "EOM.TSHotelManager.FormUI/icon/\351\242\204\347\272\246.ico" diff --git a/EOM.TSHotelManager.FormUI/images/blue_refresh.png b/EOM.TSHotelManager.FormUI/images/blue_refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..f12826d742262b64f217d8cc273420a4e5300ebe Binary files /dev/null and b/EOM.TSHotelManager.FormUI/images/blue_refresh.png differ diff --git a/EOM.TSHotelManager.FormUI/images/lockicon.png b/EOM.TSHotelManager.FormUI/images/lockicon.png new file mode 100644 index 0000000000000000000000000000000000000000..5f9a73a6e179192ce4b2daf0799671a770c858be Binary files /dev/null and b/EOM.TSHotelManager.FormUI/images/lockicon.png differ diff --git "a/EOM.TSHotelManager.FormUI/images/\345\244\215\345\210\266.png" "b/EOM.TSHotelManager.FormUI/images/\345\244\215\345\210\266.png" new file mode 100644 index 0000000000000000000000000000000000000000..50f8026d0cd6989120c2e0799ff645a197aff492 Binary files /dev/null and "b/EOM.TSHotelManager.FormUI/images/\345\244\215\345\210\266.png" differ diff --git a/SYS.FormUI/logo.ico b/EOM.TSHotelManager.FormUI/logo.ico similarity index 100% rename from SYS.FormUI/logo.ico rename to EOM.TSHotelManager.FormUI/logo.ico diff --git a/SYS.Common/.gitignore b/SYS.Common/.gitignore deleted file mode 100644 index 6d5679c87e25eb547ff425a90a1da36fffca93ea..0000000000000000000000000000000000000000 --- a/SYS.Common/.gitignore +++ /dev/null @@ -1,365 +0,0 @@ -.vs -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates -*.cache - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -packages/ -x64/ -x86/ -[Ww][Ii][Nn]32/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# ASP.NET Scaffolding -ScaffoldingReadMe.txt - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Coverlet is a free, cross platform Code Coverage Tool -coverage*.json -coverage*.xml -coverage*.info - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ - -# Fody - auto-generated XML schema -FodyWeavers.xsd \ No newline at end of file diff --git a/SYS.Common/App.config b/SYS.Common/App.config deleted file mode 100644 index 13fef26e98fdf36f9825a88bde98c7cb5769174a..0000000000000000000000000000000000000000 --- a/SYS.Common/App.config +++ /dev/null @@ -1,51 +0,0 @@ - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SYS.Common/AppConstant/RoomStateConstant.cs b/SYS.Common/AppConstant/RoomStateConstant.cs deleted file mode 100644 index a8d1b045b1608c72edf6f5fb3a579764577e50bb..0000000000000000000000000000000000000000 --- a/SYS.Common/AppConstant/RoomStateConstant.cs +++ /dev/null @@ -1,60 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Common -{ - public static class RoomStateConstant - { - // 定义一个枚举来表示房间状态 - public enum State - { - Empty, // 空房 - Occupied, // 已住 - UnderRepair, // 维修 - Dirty, // 脏房 - Reserved, // 预约 - } - - // 使用一个静态类来存储状态的详细信息 - public static class StateInfo - { - // 定义一个结构体来存储每个状态的详细信息 - public struct StateDetail - { - public string Code { get; } - public string Description { get; } - - public StateDetail(string code, string description) - { - Code = code; - Description = description; - } - } - - // 使用一个字典来存储状态信息 - private static readonly Dictionary _stateDetails = new Dictionary - { - { State.Empty, new StateDetail("0", "空房") }, - { State.Occupied, new StateDetail("1", "已住") }, - { State.UnderRepair, new StateDetail("2", "维修") }, - { State.Dirty, new StateDetail("3", "脏房") }, - { State.Reserved, new StateDetail("4", "预约") } - }; - - // 获取状态的详细信息 - public static StateDetail GetStateDetail(State state) - { - return _stateDetails.TryGetValue(state, out var detail) ? detail : default; - } - - // 获取所有状态的详细信息列表 - public static List GetAllStateDetails() - { - return _stateDetails.Values.ToList(); - } - } - } -} diff --git a/SYS.FormUI/.gitignore b/SYS.FormUI/.gitignore deleted file mode 100644 index 6d5679c87e25eb547ff425a90a1da36fffca93ea..0000000000000000000000000000000000000000 --- a/SYS.FormUI/.gitignore +++ /dev/null @@ -1,365 +0,0 @@ -.vs -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates -*.cache - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -packages/ -x64/ -x86/ -[Ww][Ii][Nn]32/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# ASP.NET Scaffolding -ScaffoldingReadMe.txt - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Coverlet is a free, cross platform Code Coverage Tool -coverage*.json -coverage*.xml -coverage*.info - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ - -# Fody - auto-generated XML schema -FodyWeavers.xsd \ No newline at end of file diff --git a/SYS.FormUI/App.config b/SYS.FormUI/App.config deleted file mode 100644 index 0f467911a83d14f6a81ac673d0a5cf770571384e..0000000000000000000000000000000000000000 --- a/SYS.FormUI/App.config +++ /dev/null @@ -1,64 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SYS.FormUI/AppFunction/FrmAddAdmin.Designer.cs b/SYS.FormUI/AppFunction/FrmAddAdmin.Designer.cs deleted file mode 100644 index fad1dbfda0631eb112363f1b416fb094c0e6e636..0000000000000000000000000000000000000000 --- a/SYS.FormUI/AppFunction/FrmAddAdmin.Designer.cs +++ /dev/null @@ -1,384 +0,0 @@ - -namespace SYS.FormUI -{ - partial class FrmAddAdmin - { - /// - /// 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.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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAddAdmin)); - this.cbAccountType = new Sunny.UI.UIComboBox(); - this.txtAccount = new Sunny.UI.UITextBox(); - this.txtName = new Sunny.UI.UITextBox(); - this.label6 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.txtPassword = new Sunny.UI.UITextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.dgvAdminList = new Sunny.UI.UIDataGridView(); - this.clId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clAdminAccount = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clAdminPassword = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clAdminType = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clAdminName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clIsAdmin = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clDeleteMk = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.uiGroupBox1 = new Sunny.UI.UIGroupBox(); - this.btnAdd = new Sunny.UI.UIButton(); - this.btnReset = new Sunny.UI.UIButton(); - ((System.ComponentModel.ISupportInitialize)(this.dgvAdminList)).BeginInit(); - this.SuspendLayout(); - // - // cbAccountType - // - this.cbAccountType.DataSource = null; - this.cbAccountType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cbAccountType.FillColor = System.Drawing.Color.White; - this.cbAccountType.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cbAccountType.Location = new System.Drawing.Point(175, 124); - this.cbAccountType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cbAccountType.MinimumSize = new System.Drawing.Size(63, 0); - this.cbAccountType.Name = "cbAccountType"; - this.cbAccountType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cbAccountType.Radius = 20; - this.cbAccountType.Size = new System.Drawing.Size(250, 35); - this.cbAccountType.TabIndex = 118; - this.cbAccountType.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.cbAccountType.Watermark = ""; - this.cbAccountType.SelectedIndexChanged += new System.EventHandler(this.cbAccountType_SelectedIndexChanged); - // - // txtAccount - // - this.txtAccount.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtAccount.FillColor = System.Drawing.Color.White; - this.txtAccount.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtAccount.Location = new System.Drawing.Point(173, 63); - this.txtAccount.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtAccount.Maximum = 2147483647D; - this.txtAccount.Minimum = -2147483648D; - this.txtAccount.MinimumSize = new System.Drawing.Size(1, 1); - this.txtAccount.Name = "txtAccount"; - this.txtAccount.Padding = new System.Windows.Forms.Padding(5); - this.txtAccount.Radius = 20; - this.txtAccount.Size = new System.Drawing.Size(250, 35); - this.txtAccount.Style = Sunny.UI.UIStyle.Custom; - this.txtAccount.StyleCustomMode = true; - this.txtAccount.TabIndex = 111; - this.txtAccount.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // txtName - // - this.txtName.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtName.FillColor = System.Drawing.Color.White; - this.txtName.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtName.Location = new System.Drawing.Point(563, 124); - this.txtName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtName.Maximum = 2147483647D; - this.txtName.Minimum = -2147483648D; - this.txtName.MinimumSize = new System.Drawing.Size(1, 1); - this.txtName.Name = "txtName"; - this.txtName.Padding = new System.Windows.Forms.Padding(5); - this.txtName.Radius = 20; - this.txtName.Size = new System.Drawing.Size(250, 35); - this.txtName.Style = Sunny.UI.UIStyle.Custom; - this.txtName.StyleCustomMode = true; - this.txtName.TabIndex = 119; - this.txtName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(62, 131); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(88, 25); - this.label6.TabIndex = 109; - this.label6.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(450, 131); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(88, 25); - this.label3.TabIndex = 108; - this.label3.Text = "真实姓名"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(62, 69); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(86, 25); - this.label2.TabIndex = 107; - this.label2.Text = "账 号"; - // - // txtPassword - // - this.txtPassword.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtPassword.FillColor = System.Drawing.Color.White; - this.txtPassword.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtPassword.Location = new System.Drawing.Point(561, 63); - this.txtPassword.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtPassword.Maximum = 2147483647D; - this.txtPassword.Minimum = -2147483648D; - this.txtPassword.MinimumSize = new System.Drawing.Size(1, 1); - this.txtPassword.Name = "txtPassword"; - this.txtPassword.Padding = new System.Windows.Forms.Padding(5); - this.txtPassword.PasswordChar = '*'; - this.txtPassword.Radius = 20; - this.txtPassword.Size = new System.Drawing.Size(250, 35); - this.txtPassword.Style = Sunny.UI.UIStyle.Custom; - this.txtPassword.StyleCustomMode = true; - this.txtPassword.TabIndex = 117; - this.txtPassword.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // 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(448, 69); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(88, 25); - this.label4.TabIndex = 115; - this.label4.Text = "账号密码"; - // - // dgvAdminList - // - this.dgvAdminList.AllowUserToAddRows = false; - this.dgvAdminList.AllowUserToDeleteRows = false; - this.dgvAdminList.AllowUserToResizeColumns = false; - this.dgvAdminList.AllowUserToResizeRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.dgvAdminList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dgvAdminList.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dgvAdminList.BackgroundColor = System.Drawing.Color.White; - this.dgvAdminList.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.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvAdminList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; - this.dgvAdminList.ColumnHeadersHeight = 32; - this.dgvAdminList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - this.dgvAdminList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.clId, - this.clAdminAccount, - this.clAdminPassword, - this.clAdminType, - this.clAdminName, - this.clIsAdmin, - this.clDeleteMk}); - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; - 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)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvAdminList.DefaultCellStyle = dataGridViewCellStyle3; - this.dgvAdminList.EnableHeadersVisualStyles = false; - this.dgvAdminList.Font = new System.Drawing.Font("微软雅黑", 12F); - this.dgvAdminList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.dgvAdminList.Location = new System.Drawing.Point(11, 224); - this.dgvAdminList.Name = "dgvAdminList"; - this.dgvAdminList.ReadOnly = true; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F); - dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvAdminList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; - this.dgvAdminList.RowHeadersVisible = false; - //this.dgvAdminList.RowHeight = 29; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; - this.dgvAdminList.RowsDefaultCellStyle = dataGridViewCellStyle5; - this.dgvAdminList.RowTemplate.Height = 29; - this.dgvAdminList.SelectedIndex = -1; - this.dgvAdminList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - //this.dgvAdminList.ShowGridLine = true; - this.dgvAdminList.Size = new System.Drawing.Size(979, 386); - this.dgvAdminList.TabIndex = 118; - // - // clId - // - this.clId.DataPropertyName = "Id"; - this.clId.HeaderText = "编号"; - this.clId.Name = "clId"; - this.clId.ReadOnly = true; - // - // clAdminAccount - // - this.clAdminAccount.DataPropertyName = "AdminAccount"; - this.clAdminAccount.HeaderText = "管理员账号"; - this.clAdminAccount.Name = "clAdminAccount"; - this.clAdminAccount.ReadOnly = true; - // - // clAdminPassword - // - this.clAdminPassword.DataPropertyName = "AdminPassword"; - this.clAdminPassword.HeaderText = "管理员密码"; - this.clAdminPassword.Name = "clAdminPassword"; - this.clAdminPassword.ReadOnly = true; - this.clAdminPassword.Visible = false; - // - // clAdminType - // - this.clAdminType.DataPropertyName = "TypeName"; - this.clAdminType.HeaderText = "管理员类型"; - this.clAdminType.Name = "clAdminType"; - this.clAdminType.ReadOnly = true; - // - // clAdminName - // - this.clAdminName.DataPropertyName = "AdminName"; - this.clAdminName.HeaderText = "真实姓名"; - this.clAdminName.Name = "clAdminName"; - this.clAdminName.ReadOnly = true; - // - // clIsAdmin - // - this.clIsAdmin.DataPropertyName = "IsAdminNm"; - this.clIsAdmin.HeaderText = "是否为超级管理"; - this.clIsAdmin.Name = "clIsAdmin"; - this.clIsAdmin.ReadOnly = true; - // - // clDeleteMk - // - this.clDeleteMk.DataPropertyName = "DeleteMk"; - this.clDeleteMk.HeaderText = "删除标记"; - this.clDeleteMk.Name = "clDeleteMk"; - this.clDeleteMk.ReadOnly = true; - this.clDeleteMk.Visible = false; - // - // uiGroupBox1 - // - this.uiGroupBox1.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiGroupBox1.Location = new System.Drawing.Point(4, 189); - this.uiGroupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.uiGroupBox1.MinimumSize = new System.Drawing.Size(1, 1); - this.uiGroupBox1.Name = "uiGroupBox1"; - this.uiGroupBox1.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0); - this.uiGroupBox1.Size = new System.Drawing.Size(994, 429); - this.uiGroupBox1.TabIndex = 119; - this.uiGroupBox1.Text = "现有管理员列表"; - this.uiGroupBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; - this.uiGroupBox1.TitleAlignment = System.Windows.Forms.HorizontalAlignment.Center; - // - // btnAdd - // - this.btnAdd.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnAdd.Location = new System.Drawing.Point(836, 63); - this.btnAdd.MinimumSize = new System.Drawing.Size(1, 1); - this.btnAdd.Name = "btnAdd"; - this.btnAdd.Radius = 20; - this.btnAdd.Size = new System.Drawing.Size(101, 35); - this.btnAdd.TabIndex = 120; - this.btnAdd.Text = "添 加"; - this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); - // - // btnReset - // - this.btnReset.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnReset.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnReset.Location = new System.Drawing.Point(838, 124); - this.btnReset.MinimumSize = new System.Drawing.Size(1, 1); - this.btnReset.Name = "btnReset"; - this.btnReset.Radius = 20; - this.btnReset.Size = new System.Drawing.Size(101, 35); - this.btnReset.TabIndex = 121; - this.btnReset.Text = "重 置"; - this.btnReset.Click += new System.EventHandler(this.btnReset_Click); - // - // FrmAddAdmin - // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1001, 623); - this.ControlBox = false; - this.Controls.Add(this.btnReset); - this.Controls.Add(this.btnAdd); - this.Controls.Add(this.dgvAdminList); - this.Controls.Add(this.txtPassword); - this.Controls.Add(this.label4); - this.Controls.Add(this.cbAccountType); - this.Controls.Add(this.txtAccount); - this.Controls.Add(this.txtName); - this.Controls.Add(this.label6); - this.Controls.Add(this.label3); - this.Controls.Add(this.label2); - this.Controls.Add(this.uiGroupBox1); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.IsForbidAltF4 = true; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "FrmAddAdmin"; - this.ShowIcon = true; - this.ShowTitleIcon = true; - this.Text = "添加管理员"; - this.Load += new System.EventHandler(this.FrmAddAdmin_Load); - ((System.ComponentModel.ISupportInitialize)(this.dgvAdminList)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private Sunny.UI.UIComboBox cbAccountType; - private Sunny.UI.UITextBox txtAccount; - private Sunny.UI.UITextBox txtName; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label2; - private Sunny.UI.UITextBox txtPassword; - private System.Windows.Forms.Label label4; - private Sunny.UI.UIDataGridView dgvAdminList; - private Sunny.UI.UIGroupBox uiGroupBox1; - private Sunny.UI.UIButton btnAdd; - private Sunny.UI.UIButton btnReset; - private System.Windows.Forms.DataGridViewTextBoxColumn clId; - private System.Windows.Forms.DataGridViewTextBoxColumn clAdminAccount; - private System.Windows.Forms.DataGridViewTextBoxColumn clAdminPassword; - private System.Windows.Forms.DataGridViewTextBoxColumn clAdminType; - private System.Windows.Forms.DataGridViewTextBoxColumn clAdminName; - private System.Windows.Forms.DataGridViewTextBoxColumn clIsAdmin; - private System.Windows.Forms.DataGridViewTextBoxColumn clDeleteMk; - } -} \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmAddRoom.Designer.cs b/SYS.FormUI/AppFunction/FrmAddRoom.Designer.cs deleted file mode 100644 index 4c4ed9cd7233a4bdcb81f0b557ca9a4329791649..0000000000000000000000000000000000000000 --- a/SYS.FormUI/AppFunction/FrmAddRoom.Designer.cs +++ /dev/null @@ -1,275 +0,0 @@ -namespace SYS.FormUI -{ - partial class FrmAddRoom - { - /// - /// 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() - { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAddRoom)); - this.txtRoomNo = new Sunny.UI.UITextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.txtRoomPosition = new Sunny.UI.UITextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.txtMoney = new Sunny.UI.UITextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.cboRoomType = new Sunny.UI.UIComboBox(); - this.txtDeposit = new Sunny.UI.UITextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.btnAddRoom = new Sunny.UI.UIButton(); - this.flpRoom = new System.Windows.Forms.FlowLayoutPanel(); - this.ttTips = new Sunny.UI.UIToolTip(this.components); - this.SuspendLayout(); - // - // 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(238, 501); - 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.ShowText = false; - this.txtRoomNo.Size = new System.Drawing.Size(127, 35); - this.txtRoomNo.Style = Sunny.UI.UIStyle.Custom; - this.txtRoomNo.StyleCustomMode = true; - this.txtRoomNo.TabIndex = 106; - this.txtRoomNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.txtRoomNo.Watermark = ""; - this.txtRoomNo.Validated += new System.EventHandler(this.txtRoomNo_Validated); - // - // 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(130, 507); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(88, 25); - this.label3.TabIndex = 105; - this.label3.Text = "房间编号"; - // - // txtRoomPosition - // - this.txtRoomPosition.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtRoomPosition.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtRoomPosition.Location = new System.Drawing.Point(493, 501); - this.txtRoomPosition.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtRoomPosition.MinimumSize = new System.Drawing.Size(1, 1); - this.txtRoomPosition.Name = "txtRoomPosition"; - this.txtRoomPosition.Padding = new System.Windows.Forms.Padding(5); - this.txtRoomPosition.Radius = 20; - this.txtRoomPosition.ShowText = false; - this.txtRoomPosition.Size = new System.Drawing.Size(127, 35); - this.txtRoomPosition.Style = Sunny.UI.UIStyle.Custom; - this.txtRoomPosition.StyleCustomMode = true; - this.txtRoomPosition.TabIndex = 108; - this.txtRoomPosition.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.txtRoomPosition.Watermark = ""; - // - // 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(385, 507); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(88, 25); - this.label1.TabIndex = 107; - this.label1.Text = "房间位置"; - // - // txtMoney - // - this.txtMoney.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtMoney.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtMoney.Location = new System.Drawing.Point(748, 501); - this.txtMoney.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtMoney.MinimumSize = new System.Drawing.Size(1, 1); - this.txtMoney.Name = "txtMoney"; - this.txtMoney.Padding = new System.Windows.Forms.Padding(5); - this.txtMoney.Radius = 20; - this.txtMoney.ShowText = false; - this.txtMoney.Size = new System.Drawing.Size(127, 35); - this.txtMoney.Style = Sunny.UI.UIStyle.Custom; - this.txtMoney.StyleCustomMode = true; - this.txtMoney.TabIndex = 110; - this.txtMoney.Text = "0.00"; - this.txtMoney.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.ttTips.SetToolTip(this.txtMoney, "如未填写或为0，将自动获取房间类型配置数据"); - this.txtMoney.Type = Sunny.UI.UITextBox.UIEditType.Double; - this.txtMoney.Watermark = ""; - // - // 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(640, 507); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(88, 25); - this.label4.TabIndex = 109; - this.label4.Text = "房间单价"; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(130, 568); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(88, 25); - this.label6.TabIndex = 111; - this.label6.Text = "房间类型"; - // - // cboRoomType - // - this.cboRoomType.DataSource = null; - this.cboRoomType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cboRoomType.FillColor = System.Drawing.Color.White; - this.cboRoomType.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cboRoomType.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); - this.cboRoomType.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.cboRoomType.Location = new System.Drawing.Point(238, 564); - this.cboRoomType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cboRoomType.MinimumSize = new System.Drawing.Size(63, 0); - this.cboRoomType.Name = "cboRoomType"; - this.cboRoomType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cboRoomType.Radius = 20; - this.cboRoomType.Size = new System.Drawing.Size(127, 35); - this.cboRoomType.SymbolSize = 24; - this.cboRoomType.TabIndex = 112; - this.cboRoomType.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.cboRoomType.Watermark = ""; - this.cboRoomType.TextChanged += new System.EventHandler(this.cboRoomType_TextChanged); - // - // txtDeposit - // - this.txtDeposit.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtDeposit.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtDeposit.Location = new System.Drawing.Point(490, 564); - this.txtDeposit.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtDeposit.MinimumSize = new System.Drawing.Size(1, 1); - this.txtDeposit.Name = "txtDeposit"; - this.txtDeposit.Padding = new System.Windows.Forms.Padding(5); - this.txtDeposit.Radius = 20; - this.txtDeposit.ShowText = false; - this.txtDeposit.Size = new System.Drawing.Size(128, 35); - this.txtDeposit.Style = Sunny.UI.UIStyle.Custom; - this.txtDeposit.StyleCustomMode = true; - this.txtDeposit.TabIndex = 114; - this.txtDeposit.Text = "0.00"; - this.txtDeposit.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.ttTips.SetToolTip(this.txtDeposit, "如未填写或为0，将自动获取房间类型配置数据"); - this.txtDeposit.Type = Sunny.UI.UITextBox.UIEditType.Double; - this.txtDeposit.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(385, 568); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(88, 25); - this.label2.TabIndex = 113; - this.label2.Text = "房间押金"; - // - // btnAddRoom - // - this.btnAddRoom.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnAddRoom.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnAddRoom.Location = new System.Drawing.Point(748, 564); - this.btnAddRoom.MinimumSize = new System.Drawing.Size(1, 1); - this.btnAddRoom.Name = "btnAddRoom"; - this.btnAddRoom.Radius = 30; - this.btnAddRoom.Size = new System.Drawing.Size(127, 35); - this.btnAddRoom.TabIndex = 115; - this.btnAddRoom.Text = "新增客房"; - this.btnAddRoom.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAddRoom.Click += new System.EventHandler(this.btnAddRoom_Click); - // - // flpRoom - // - this.flpRoom.AutoScroll = true; - this.flpRoom.BackColor = System.Drawing.Color.Transparent; - this.flpRoom.Location = new System.Drawing.Point(83, 56); - this.flpRoom.Name = "flpRoom"; - this.flpRoom.Size = new System.Drawing.Size(838, 424); - this.flpRoom.TabIndex = 116; - this.flpRoom.MouseEnter += new System.EventHandler(this.flpRoom_MouseEnter); - // - // ttTips - // - this.ttTips.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(54)))), ((int)(((byte)(54))))); - this.ttTips.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(239)))), ((int)(((byte)(239))))); - this.ttTips.OwnerDraw = true; - // - // FrmAddRoom - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.ClientSize = new System.Drawing.Size(1005, 623); - this.ControlBox = false; - this.Controls.Add(this.flpRoom); - this.Controls.Add(this.btnAddRoom); - this.Controls.Add(this.txtDeposit); - this.Controls.Add(this.label2); - this.Controls.Add(this.cboRoomType); - this.Controls.Add(this.label6); - this.Controls.Add(this.txtMoney); - this.Controls.Add(this.label4); - this.Controls.Add(this.txtRoomPosition); - this.Controls.Add(this.label1); - this.Controls.Add(this.txtRoomNo); - this.Controls.Add(this.label3); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "FrmAddRoom"; - this.ShowTitleIcon = true; - this.Text = "新增客房"; - this.ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 1005, 623); - this.Load += new System.EventHandler(this.FrmAddRoom_Load); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - private Sunny.UI.UITextBox txtRoomNo; - private System.Windows.Forms.Label label3; - private Sunny.UI.UITextBox txtRoomPosition; - private System.Windows.Forms.Label label1; - private Sunny.UI.UITextBox txtMoney; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label6; - private Sunny.UI.UIComboBox cboRoomType; - private Sunny.UI.UITextBox txtDeposit; - private System.Windows.Forms.Label label2; - private Sunny.UI.UIButton btnAddRoom; - private System.Windows.Forms.FlowLayoutPanel flpRoom; - private Sunny.UI.UIToolTip ttTips; - } -} \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs b/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs deleted file mode 100644 index 6d4d7c53525371a69423fbe0887895701bca4fcf..0000000000000000000000000000000000000000 --- a/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs +++ /dev/null @@ -1,500 +0,0 @@ -namespace SYS.FormUI -{ - partial class FrmCustoManager - { - /// - /// 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.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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmCustoManager)); - this.dgvCustomerList = new Sunny.UI.UIDataGridView(); - this.CustoNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.CustoName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.CustoSex = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.CustoTel = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.CustoBirth = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.typeName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.PassportName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.CustoAdress = 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.cmsCustoManager = new Sunny.UI.UIContextMenuStrip(); - this.btnSerach = new Sunny.UI.UIButton(); - this.btnAddCusto = new Sunny.UI.UIButton(); - this.btnExport = new Sunny.UI.UIButton(); - this.btnUpdate = new Sunny.UI.UIButton(); - this.uiGroupBox1 = new Sunny.UI.UIGroupBox(); - this.txtCustoName = new Sunny.UI.UITextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.txtCustoNo = new Sunny.UI.UITextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.btnPg = new Sunny.UI.UIPagination(); - this.uiLine1 = new Sunny.UI.UILine(); - this.cbExportAll = new Sunny.UI.UICheckBox(); - this.tsmiCustoNo = new System.Windows.Forms.ToolStripMenuItem(); - this.cbOnlyVip = new Sunny.UI.UICheckBox(); - ((System.ComponentModel.ISupportInitialize)(this.dgvCustomerList)).BeginInit(); - this.cmsCustoManager.SuspendLayout(); - this.uiGroupBox1.SuspendLayout(); - this.SuspendLayout(); - // - // dgvCustomerList - // - this.dgvCustomerList.AllowUserToAddRows = false; - this.dgvCustomerList.AllowUserToDeleteRows = false; - this.dgvCustomerList.AllowUserToResizeColumns = false; - this.dgvCustomerList.AllowUserToResizeRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.dgvCustomerList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dgvCustomerList.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dgvCustomerList.BackgroundColor = System.Drawing.Color.White; - this.dgvCustomerList.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dgvCustomerList.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; - this.dgvCustomerList.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.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvCustomerList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; - this.dgvCustomerList.ColumnHeadersHeight = 25; - this.dgvCustomerList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - this.dgvCustomerList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.CustoNo, - this.CustoName, - this.CustoSex, - this.CustoTel, - this.CustoBirth, - this.typeName, - this.PassportName, - this.CustoAdress, - this.Column1, - this.Column2, - this.Column3, - this.Column4}); - this.dgvCustomerList.ContextMenuStrip = this.cmsCustoManager; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; - 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)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvCustomerList.DefaultCellStyle = dataGridViewCellStyle3; - this.dgvCustomerList.EnableHeadersVisualStyles = false; - this.dgvCustomerList.Font = new System.Drawing.Font("微软雅黑", 12F); - this.dgvCustomerList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.dgvCustomerList.Location = new System.Drawing.Point(3, 38); - this.dgvCustomerList.Name = "dgvCustomerList"; - this.dgvCustomerList.ReadOnly = true; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F); - dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvCustomerList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; - this.dgvCustomerList.RowHeadersVisible = false; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; - this.dgvCustomerList.RowsDefaultCellStyle = dataGridViewCellStyle5; - this.dgvCustomerList.RowTemplate.Height = 29; - this.dgvCustomerList.SelectedIndex = -1; - this.dgvCustomerList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvCustomerList.Size = new System.Drawing.Size(999, 482); - this.dgvCustomerList.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.dgvCustomerList.Style = Sunny.UI.UIStyle.Custom; - this.dgvCustomerList.TabIndex = 111; - // - // CustoNo - // - this.CustoNo.DataPropertyName = "CustoNo"; - this.CustoNo.HeaderText = "客户编号"; - this.CustoNo.Name = "CustoNo"; - this.CustoNo.ReadOnly = true; - // - // CustoName - // - this.CustoName.DataPropertyName = "CustoName"; - this.CustoName.HeaderText = "客户姓名"; - this.CustoName.Name = "CustoName"; - this.CustoName.ReadOnly = true; - // - // CustoSex - // - this.CustoSex.DataPropertyName = "SexName"; - this.CustoSex.HeaderText = "性别"; - this.CustoSex.Name = "CustoSex"; - this.CustoSex.ReadOnly = true; - // - // CustoTel - // - this.CustoTel.DataPropertyName = "CustoTel"; - this.CustoTel.HeaderText = "联系方式"; - this.CustoTel.Name = "CustoTel"; - this.CustoTel.ReadOnly = true; - // - // CustoBirth - // - this.CustoBirth.DataPropertyName = "CustoBirth"; - this.CustoBirth.HeaderText = "出生日期"; - this.CustoBirth.Name = "CustoBirth"; - this.CustoBirth.ReadOnly = true; - // - // typeName - // - this.typeName.DataPropertyName = "typeName"; - this.typeName.HeaderText = "客户类型"; - this.typeName.Name = "typeName"; - this.typeName.ReadOnly = true; - // - // PassportName - // - this.PassportName.DataPropertyName = "PassportName"; - this.PassportName.HeaderText = "证件类型"; - this.PassportName.Name = "PassportName"; - this.PassportName.ReadOnly = true; - // - // CustoAdress - // - this.CustoAdress.DataPropertyName = "CustoAdress"; - this.CustoAdress.HeaderText = "客户地址"; - this.CustoAdress.Name = "CustoAdress"; - this.CustoAdress.ReadOnly = true; - // - // Column1 - // - this.Column1.DataPropertyName = "PassportType"; - this.Column1.HeaderText = "证照类型"; - this.Column1.Name = "Column1"; - this.Column1.ReadOnly = true; - this.Column1.Visible = false; - // - // Column2 - // - this.Column2.DataPropertyName = "CustoType"; - this.Column2.HeaderText = "客户类型"; - this.Column2.Name = "Column2"; - this.Column2.ReadOnly = true; - this.Column2.Visible = false; - // - // Column3 - // - this.Column3.DataPropertyName = "CustoID"; - this.Column3.HeaderText = "证件号码"; - this.Column3.Name = "Column3"; - this.Column3.ReadOnly = true; - this.Column3.Visible = false; - // - // Column4 - // - this.Column4.DataPropertyName = "CustoSex"; - this.Column4.HeaderText = "客户性别"; - this.Column4.Name = "Column4"; - this.Column4.ReadOnly = true; - this.Column4.Visible = false; - // - // cmsCustoManager - // - this.cmsCustoManager.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255))))); - this.cmsCustoManager.Font = new System.Drawing.Font("微软雅黑", 12F); - this.cmsCustoManager.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.tsmiCustoNo}); - this.cmsCustoManager.Name = "cmsCustoManager"; - this.cmsCustoManager.Size = new System.Drawing.Size(177, 30); - // - // btnSerach - // - this.btnSerach.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnSerach.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnSerach.Location = new System.Drawing.Point(583, 570); - this.btnSerach.MinimumSize = new System.Drawing.Size(1, 1); - this.btnSerach.Name = "btnSerach"; - this.btnSerach.Radius = 30; - this.btnSerach.Size = new System.Drawing.Size(97, 41); - this.btnSerach.Style = Sunny.UI.UIStyle.Custom; - this.btnSerach.TabIndex = 113; - this.btnSerach.Text = "搜 索"; - this.btnSerach.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSerach.Click += new System.EventHandler(this.picSearch_Click_1); - // - // btnAddCusto - // - this.btnAddCusto.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnAddCusto.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnAddCusto.Location = new System.Drawing.Point(688, 570); - this.btnAddCusto.MinimumSize = new System.Drawing.Size(1, 1); - this.btnAddCusto.Name = "btnAddCusto"; - this.btnAddCusto.Radius = 30; - this.btnAddCusto.Size = new System.Drawing.Size(97, 41); - this.btnAddCusto.Style = Sunny.UI.UIStyle.Custom; - this.btnAddCusto.TabIndex = 114; - this.btnAddCusto.Text = "添加客户"; - this.btnAddCusto.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAddCusto.Click += new System.EventHandler(this.picAddCusto_Click_1); - // - // btnExport - // - this.btnExport.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnExport.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnExport.Location = new System.Drawing.Point(793, 570); - this.btnExport.MinimumSize = new System.Drawing.Size(1, 1); - this.btnExport.Name = "btnExport"; - this.btnExport.Radius = 30; - this.btnExport.Size = new System.Drawing.Size(97, 41); - this.btnExport.Style = Sunny.UI.UIStyle.Custom; - this.btnExport.TabIndex = 115; - this.btnExport.Text = "导出列表"; - this.btnExport.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnExport.Click += new System.EventHandler(this.picLoadOut_Click_1); - // - // btnUpdate - // - this.btnUpdate.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnUpdate.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnUpdate.Location = new System.Drawing.Point(898, 570); - this.btnUpdate.MinimumSize = new System.Drawing.Size(1, 1); - this.btnUpdate.Name = "btnUpdate"; - this.btnUpdate.Radius = 30; - this.btnUpdate.Size = new System.Drawing.Size(97, 41); - this.btnUpdate.Style = Sunny.UI.UIStyle.Custom; - this.btnUpdate.TabIndex = 116; - this.btnUpdate.Text = "修改客户"; - this.btnUpdate.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnUpdate.Click += new System.EventHandler(this.picUpdateCusto_Click_1); - // - // uiGroupBox1 - // - this.uiGroupBox1.Controls.Add(this.txtCustoName); - this.uiGroupBox1.Controls.Add(this.label1); - this.uiGroupBox1.Controls.Add(this.txtCustoNo); - this.uiGroupBox1.Controls.Add(this.label3); - this.uiGroupBox1.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiGroupBox1.Location = new System.Drawing.Point(4, 552); - this.uiGroupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.uiGroupBox1.MinimumSize = new System.Drawing.Size(1, 1); - this.uiGroupBox1.Name = "uiGroupBox1"; - this.uiGroupBox1.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0); - this.uiGroupBox1.Size = new System.Drawing.Size(572, 62); - this.uiGroupBox1.Style = Sunny.UI.UIStyle.Custom; - this.uiGroupBox1.TabIndex = 117; - this.uiGroupBox1.Text = "条件搜索"; - this.uiGroupBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; - // - // txtCustoName - // - this.txtCustoName.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoName.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCustoName.Location = new System.Drawing.Point(385, 23); - 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.ShowText = false; - this.txtCustoName.Size = new System.Drawing.Size(173, 33); - this.txtCustoName.Style = Sunny.UI.UIStyle.Custom; - this.txtCustoName.TabIndex = 98; - this.txtCustoName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.txtCustoName.Watermark = ""; - // - // 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(290, 26); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(88, 25); - this.label1.TabIndex = 97; - this.label1.Text = "客户姓名"; - // - // txtCustoNo - // - this.txtCustoNo.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoNo.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCustoNo.Location = new System.Drawing.Point(110, 23); - 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.ShowText = false; - this.txtCustoNo.Size = new System.Drawing.Size(173, 33); - this.txtCustoNo.Style = Sunny.UI.UIStyle.Custom; - this.txtCustoNo.TabIndex = 96; - this.txtCustoNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.txtCustoNo.Watermark = ""; - // - // 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(15, 26); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(88, 25); - this.label3.TabIndex = 95; - this.label3.Text = "客户编号"; - // - // btnPg - // - this.btnPg.ButtonInterval = 5; - this.btnPg.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnPg.Location = new System.Drawing.Point(3, 528); - this.btnPg.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.btnPg.MinimumSize = new System.Drawing.Size(1, 1); - this.btnPg.Name = "btnPg"; - this.btnPg.PageSize = 15; - this.btnPg.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; - this.btnPg.ShowText = false; - this.btnPg.Size = new System.Drawing.Size(543, 34); - this.btnPg.Style = Sunny.UI.UIStyle.Custom; - this.btnPg.TabIndex = 121; - this.btnPg.Text = null; - this.btnPg.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; - this.btnPg.PageChanged += new Sunny.UI.UIPagination.OnPageChangeEventHandler(this.btnPg_PageChanged); - // - // uiLine1 - // - this.uiLine1.BackColor = System.Drawing.Color.Transparent; - this.uiLine1.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiLine1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - this.uiLine1.Location = new System.Drawing.Point(791, 533); - this.uiLine1.MinimumSize = new System.Drawing.Size(2, 2); - this.uiLine1.Name = "uiLine1"; - this.uiLine1.Size = new System.Drawing.Size(204, 29); - this.uiLine1.Style = Sunny.UI.UIStyle.Custom; - this.uiLine1.TabIndex = 123; - this.uiLine1.Text = "右键可复制客户编号"; - // - // cbExportAll - // - this.cbExportAll.Cursor = System.Windows.Forms.Cursors.Hand; - this.cbExportAll.Font = new System.Drawing.Font("微软雅黑", 12F); - this.cbExportAll.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - this.cbExportAll.Location = new System.Drawing.Point(687, 533); - this.cbExportAll.MinimumSize = new System.Drawing.Size(1, 1); - this.cbExportAll.Name = "cbExportAll"; - this.cbExportAll.Padding = new System.Windows.Forms.Padding(22, 0, 0, 0); - this.cbExportAll.Size = new System.Drawing.Size(98, 29); - this.cbExportAll.Style = Sunny.UI.UIStyle.Custom; - this.cbExportAll.TabIndex = 124; - this.cbExportAll.Text = "导出全部"; - // - // tsmiCustoNo - // - this.tsmiCustoNo.Image = global::SYS.FormUI.Properties.Resources.复制; - this.tsmiCustoNo.Name = "tsmiCustoNo"; - this.tsmiCustoNo.Size = new System.Drawing.Size(176, 26); - this.tsmiCustoNo.Text = "复制用户编号"; - this.tsmiCustoNo.Click += new System.EventHandler(this.tsmiCustoNo_Click); - // - // cbOnlyVip - // - this.cbOnlyVip.Cursor = System.Windows.Forms.Cursors.Hand; - this.cbOnlyVip.Font = new System.Drawing.Font("微软雅黑", 12F); - this.cbOnlyVip.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - this.cbOnlyVip.Location = new System.Drawing.Point(567, 533); - this.cbOnlyVip.MinimumSize = new System.Drawing.Size(1, 1); - this.cbOnlyVip.Name = "cbOnlyVip"; - this.cbOnlyVip.Padding = new System.Windows.Forms.Padding(22, 0, 0, 0); - this.cbOnlyVip.Size = new System.Drawing.Size(113, 29); - this.cbOnlyVip.Style = Sunny.UI.UIStyle.Custom; - this.cbOnlyVip.TabIndex = 125; - this.cbOnlyVip.Text = "仅查看会员"; - this.cbOnlyVip.CheckedChanged += new System.EventHandler(this.cbOnlyVip_CheckedChanged); - // - // FrmCustoManager - // - 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(1005, 623); - this.ControlBox = false; - this.Controls.Add(this.cbOnlyVip); - this.Controls.Add(this.cbExportAll); - this.Controls.Add(this.uiLine1); - this.Controls.Add(this.btnPg); - this.Controls.Add(this.uiGroupBox1); - this.Controls.Add(this.btnUpdate); - this.Controls.Add(this.btnExport); - this.Controls.Add(this.btnAddCusto); - this.Controls.Add(this.btnSerach); - this.Controls.Add(this.dgvCustomerList); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "FrmCustoManager"; - this.ShowTitleIcon = true; - this.Style = Sunny.UI.UIStyle.Custom; - this.Text = "客户信息管理"; - this.ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 1005, 623); - this.Load += new System.EventHandler(this.FrmCustoManager_Load); - ((System.ComponentModel.ISupportInitialize)(this.dgvCustomerList)).EndInit(); - this.cmsCustoManager.ResumeLayout(false); - this.uiGroupBox1.ResumeLayout(false); - this.uiGroupBox1.PerformLayout(); - this.ResumeLayout(false); - - } - - #endregion - private Sunny.UI.UIDataGridView dgvCustomerList; - private Sunny.UI.UIButton btnSerach; - private Sunny.UI.UIButton btnAddCusto; - private Sunny.UI.UIButton btnExport; - private Sunny.UI.UIButton btnUpdate; - private System.Windows.Forms.DataGridViewTextBoxColumn CustoNo; - private System.Windows.Forms.DataGridViewTextBoxColumn CustoName; - private System.Windows.Forms.DataGridViewTextBoxColumn CustoSex; - private System.Windows.Forms.DataGridViewTextBoxColumn CustoTel; - private System.Windows.Forms.DataGridViewTextBoxColumn CustoBirth; - private System.Windows.Forms.DataGridViewTextBoxColumn typeName; - private System.Windows.Forms.DataGridViewTextBoxColumn PassportName; - private System.Windows.Forms.DataGridViewTextBoxColumn CustoAdress; - private System.Windows.Forms.DataGridViewTextBoxColumn Column1; - private System.Windows.Forms.DataGridViewTextBoxColumn Column2; - private System.Windows.Forms.DataGridViewTextBoxColumn Column3; - private System.Windows.Forms.DataGridViewTextBoxColumn Column4; - private Sunny.UI.UIGroupBox uiGroupBox1; - private Sunny.UI.UITextBox txtCustoName; - private System.Windows.Forms.Label label1; - private Sunny.UI.UITextBox txtCustoNo; - private System.Windows.Forms.Label label3; - private Sunny.UI.UIPagination btnPg; - private Sunny.UI.UIContextMenuStrip cmsCustoManager; - private System.Windows.Forms.ToolStripMenuItem tsmiCustoNo; - private Sunny.UI.UILine uiLine1; - private Sunny.UI.UICheckBox cbExportAll; - private Sunny.UI.UICheckBox cbOnlyVip; - } -} \ No newline at end of file diff --git a/SYS.FormUI/Program.cs b/SYS.FormUI/Program.cs deleted file mode 100644 index 02ef4a63d50a4f141f136b2d46af342b9cbd04a1..0000000000000000000000000000000000000000 --- a/SYS.FormUI/Program.cs +++ /dev/null @@ -1,43 +0,0 @@ -/* - * MIT License - *Copyright (c) 2021 咖啡与网络(java-and-net) - - *Permission is hereby granted, free of charge, to any person obtaining a copy - *of this software and associated documentation files (the "Software"), to deal - *in the Software without restriction, including without limitation the rights - *to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - *copies of the Software, and to permit persons to whom the Software is - *furnished to do so, subject to the following conditions: - - *The above copyright notice and this permission notice shall be included in all - *copies or substantial portions of the Software. - - *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - *IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - *FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - *AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - *LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - *OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - *SOFTWARE. - * - */ -using System; -using System.Windows.Forms; - -namespace SYS.FormUI -{ - static class Program - { - /// - /// 应用程序的主入口点。 - /// - [STAThread] - static void Main() - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new FrmLoading()); - } - } - -} diff --git a/SYS.FormUI/Resources/lock.png b/SYS.FormUI/Resources/lock.png deleted file mode 100644 index 7dca57cb7ab090a7371a3ad3c60647c263eabb81..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/Resources/lock.png and /dev/null differ diff --git a/SYS.FormUI/Resources/uiButton1.BackgroundImage.png b/SYS.FormUI/Resources/uiButton1.BackgroundImage.png deleted file mode 100644 index e10e765208047c296b5c1aa39aed3f69a8333364..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/Resources/uiButton1.BackgroundImage.png and /dev/null differ diff --git "a/SYS.FormUI/Resources/\346\267\273\345\212\240\347\256\241\347\220\206\345\221\230.png" "b/SYS.FormUI/Resources/\346\267\273\345\212\240\347\256\241\347\220\206\345\221\230.png" deleted file mode 100644 index 6fa27c48ccf258a34bc4f3c7ad88ad68d2e18863..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/Resources/\346\267\273\345\212\240\347\256\241\347\220\206\345\221\230.png" and /dev/null differ diff --git a/SYS.FormUI/SYS.FormUI.csproj b/SYS.FormUI/SYS.FormUI.csproj deleted file mode 100644 index 84444fd4ded65b86d43b55e651fbbe1d6f819e9f..0000000000000000000000000000000000000000 --- a/SYS.FormUI/SYS.FormUI.csproj +++ /dev/null @@ -1,395 +0,0 @@ - - - net8.0-windows - WinExe - TS酒店管理系统 - false - true - true - true - true - win-x64 - true - true - true - 2.8.0.0 - 2.8.0.0 - 2.8.0.0 - 2.8.0.0 - - - bin\Debug\ - - - bin\Release\ - - - Logo\bitbug_favicon %281%29.ico - - - 4CFC6407EAAE3B4D84510B17FBE22638DBF289B5 - - - TSHotelManagerSystem_TemporaryKey.pfx - - - SYS.FormUI.Program - 2.8.0.0 - 2.8.0.0 - 2.8.0.0 - 2.8.0.0 - - - - UserControl - - - UserControl - - - UserControl - - - UserControl - - - True - True - Resources.resx - - - True - True - Settings.settings - - - - - - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Always - PublicResXFileCodeGenerator - Resources.Designer.cs - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - \ No newline at end of file diff --git a/SYS.FormUI/bitbug_favicon (1).ico b/SYS.FormUI/bitbug_favicon (1).ico deleted file mode 100644 index deaead31de45df54f39388e2b4727a00a4f99eca..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/bitbug_favicon (1).ico and /dev/null differ diff --git a/SYS.FormUI/bitbug_favicon.ico b/SYS.FormUI/bitbug_favicon.ico deleted file mode 100644 index ce98a5e111b065f5db29c76e2ed44d6411d56d5e..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/bitbug_favicon.ico and /dev/null differ diff --git a/topsky-hotel-manager-system-web-api b/topsky-hotel-manager-system-web-api index 0fa519aa95a8d29e50831867a58c3723fd0ae035..203ab072c0a4332aac48c5fbc46f0fb28009cdec 160000 --- a/topsky-hotel-manager-system-web-api +++ b/topsky-hotel-manager-system-web-api @@ -1 +1 @@ -Subproject commit 0fa519aa95a8d29e50831867a58c3723fd0ae035 +Subproject commit 203ab072c0a4332aac48c5fbc46f0fb28009cdec