From a76f63deebabb51a15d288b6906c666427fcb4dc Mon Sep 17 00:00:00 2001 From: Chunkit Yeung Date: Sun, 24 Mar 2024 15:46:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D-=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E5=85=AC=E5=91=8A=E6=9F=A5=E7=9C=8Bbug=EF=BC=9B=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D-=E4=B8=8A=E4=BC=A0=E5=85=AC=E5=91=8A=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=90=8E=E4=B8=8D=E4=BC=9A=E8=87=AA=E5=8A=A8=E6=B8=85?= =?UTF-8?q?=E9=99=A4=E5=B7=B2=E5=A1=AB=E5=86=99=E7=9A=84=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E5=A4=8D-=E5=91=98=E5=B7=A5=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=93=8D=E4=BD=9C=E7=95=8C=E9=9D=A2=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=A1=E6=81=AF=E6=8C=89=E9=92=AE=E6=97=B6?= =?UTF-8?q?=E6=8F=90=E7=A4=BAWorkPic=E6=8E=A5=E5=8F=A3=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=EF=BC=9B=20=E4=BC=98=E5=8C=96-=E5=91=98=E5=B7=A5=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=BF=97=E9=9C=80=E8=A6=81=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=EF=BC=9B=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D-=E6=9D=83=E9=99=90=E5=88=86=E9=85=8D=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=97=B6=E6=8F=90=E7=A4=BA500=E5=86=85?= =?UTF-8?q?=E9=83=A8=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=94=99=E8=AF=AF=E3=80=82?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D-=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=BF?= =?UTF-8?q?=E6=97=B6=E6=88=BF=E5=8F=B7=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=8F=90=E7=A4=BA500=E5=86=85=E9=83=A8?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=94=99=E8=AF=AF=E3=80=82=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96-=E5=90=8E=E5=8F=B0=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=9A=84=E9=94=81=E5=B1=8F=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E4=B8=8E=E7=95=8C=E9=9D=A2=E4=B8=8D=E4=B8=80=E8=87=B4=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E6=9B=B4=E6=8D=A2=E4=B8=BA=E7=99=BD=E8=89=B2=E9=94=81?= =?UTF-8?q?=E5=B1=8F=E5=9B=BE=E6=A0=87=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EOM.Client.TopSkyHotelManagerSystem.sln | 7 + .../EOM.TSHotelManager.Common.Util.csproj | 7 + .../Validator/NeedValidAttribute.cs | 13 + .../Validator/ValidateHelper.cs | 57 ++ SYS.Common/SYS.Common.csproj | 1 - SYS.Common/Util/RecordHelper.cs | 5 +- SYS.Common/Util/Temp_OperationLog.cs | 103 --- SYS.FormUI/AppFunction/FrmAddRoom.Designer.cs | 41 +- SYS.FormUI/AppFunction/FrmAddRoom.cs | 6 +- SYS.FormUI/AppFunction/FrmAddRoom.resx | 3 + SYS.FormUI/AppFunction/FrmAuthority.cs | 3 +- SYS.FormUI/AppFunction/FrmChangePosition.cs | 12 +- .../AppFunction/FrmCheckOutForm.Designer.cs | 629 +++++++++--------- SYS.FormUI/AppFunction/FrmCustoManager.cs | 14 +- SYS.FormUI/AppFunction/FrmCustomerManager.cs | 6 +- SYS.FormUI/AppFunction/FrmEducation.cs | 3 + SYS.FormUI/AppFunction/FrmMySpace.Designer.cs | 334 +++++----- SYS.FormUI/AppFunction/FrmNation.cs | 3 + SYS.FormUI/AppFunction/FrmNotice.Designer.cs | 10 +- .../AppFunction/FrmOperation.Designer.cs | 26 +- SYS.FormUI/AppFunction/FrmOperation.cs | 38 +- .../AppFunction/FrmRoomConfig.Designer.cs | 406 +++++++++++ SYS.FormUI/AppFunction/FrmRoomConfig.cs | 167 +++++ SYS.FormUI/AppFunction/FrmRoomConfig.resx | 227 +++++++ SYS.FormUI/AppFunction/FrmUpLoadNotice.cs | 5 + SYS.FormUI/AppFunction/FrmWorkerCheckInfo.cs | 4 +- ....Designer.cs => FrmWorkerInfo.Designer.cs} | 66 +- .../{FrmAddWorker.cs => FrmWorkerInfo.cs} | 66 +- .../{FrmAddWorker.resx => FrmWorkerInfo.resx} | 0 SYS.FormUI/AppFunction/FrmWorkerManager.cs | 4 +- ...Designer.cs => FrmWorkerPanel.Designer.cs} | 4 +- .../{FrmChangeWorker.cs => FrmWorkerPanel.cs} | 8 +- ...mChangeWorker.resx => FrmWorkerPanel.resx} | 0 .../AppMain/FrmBackgroundSystem.Designer.cs | 167 +++-- SYS.FormUI/AppMain/FrmBackgroundSystem.cs | 12 +- SYS.FormUI/AppMain/FrmBackgroundSystem.resx | 56 +- .../AppUserControls/ucRoomList.Designer.cs | 40 +- SYS.FormUI/Properties/AssemblyInfo.cs | 4 +- SYS.FormUI/Properties/Resources.resx | 90 +-- SYS.FormUI/SYS.FormUI.csproj | 34 +- SYS.FormUI/images/lockicon.png | Bin 0 -> 594 bytes 41 files changed, 1767 insertions(+), 914 deletions(-) create mode 100644 EOM.TSHotelManager.Common.Util/EOM.TSHotelManager.Common.Util.csproj create mode 100644 EOM.TSHotelManager.Common.Util/Validator/NeedValidAttribute.cs create mode 100644 EOM.TSHotelManager.Common.Util/Validator/ValidateHelper.cs delete mode 100644 SYS.Common/Util/Temp_OperationLog.cs create mode 100644 SYS.FormUI/AppFunction/FrmRoomConfig.Designer.cs create mode 100644 SYS.FormUI/AppFunction/FrmRoomConfig.cs create mode 100644 SYS.FormUI/AppFunction/FrmRoomConfig.resx rename SYS.FormUI/AppFunction/{FrmAddWorker.Designer.cs => FrmWorkerInfo.Designer.cs} (90%) rename SYS.FormUI/AppFunction/{FrmAddWorker.cs => FrmWorkerInfo.cs} (90%) rename SYS.FormUI/AppFunction/{FrmAddWorker.resx => FrmWorkerInfo.resx} (100%) rename SYS.FormUI/AppFunction/{FrmChangeWorker.Designer.cs => FrmWorkerPanel.Designer.cs} (99%) rename SYS.FormUI/AppFunction/{FrmChangeWorker.cs => FrmWorkerPanel.cs} (98%) rename SYS.FormUI/AppFunction/{FrmChangeWorker.resx => FrmWorkerPanel.resx} (100%) create mode 100644 SYS.FormUI/images/lockicon.png diff --git a/EOM.Client.TopSkyHotelManagerSystem.sln b/EOM.Client.TopSkyHotelManagerSystem.sln index 813fc0f..f847d43 100644 --- a/EOM.Client.TopSkyHotelManagerSystem.sln +++ b/EOM.Client.TopSkyHotelManagerSystem.sln @@ -21,6 +21,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Library", "topsky-hotel-man EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.Common.Core", "topsky-hotel-manager-system-web-api\EOM.TSHotelManager.Common.Core\EOM.TSHotelManager.Common.Core.csproj", "{48B3F864-88D2-4BD1-A766-B9EBF342AED1}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EOM.TSHotelManager.Common.Util", "EOM.TSHotelManager.Common.Util\EOM.TSHotelManager.Common.Util.csproj", "{3DE4537C-6637-4D8D-9728-C923EA0B8B13}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -55,6 +57,10 @@ Global {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Debug|Any CPU.Build.0 = Debug|Any CPU {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Release|Any CPU.ActiveCfg = Release|Any CPU {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Release|Any CPU.Build.0 = Release|Any CPU + {3DE4537C-6637-4D8D-9728-C923EA0B8B13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3DE4537C-6637-4D8D-9728-C923EA0B8B13}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3DE4537C-6637-4D8D-9728-C923EA0B8B13}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3DE4537C-6637-4D8D-9728-C923EA0B8B13}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -67,6 +73,7 @@ Global {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} + {3DE4537C-6637-4D8D-9728-C923EA0B8B13} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B93ABE6D-89AD-45B3-94FB-65BD98597CC6} diff --git a/EOM.TSHotelManager.Common.Util/EOM.TSHotelManager.Common.Util.csproj b/EOM.TSHotelManager.Common.Util/EOM.TSHotelManager.Common.Util.csproj new file mode 100644 index 0000000..dbdcea4 --- /dev/null +++ b/EOM.TSHotelManager.Common.Util/EOM.TSHotelManager.Common.Util.csproj @@ -0,0 +1,7 @@ + + + + netstandard2.0 + + + diff --git a/EOM.TSHotelManager.Common.Util/Validator/NeedValidAttribute.cs b/EOM.TSHotelManager.Common.Util/Validator/NeedValidAttribute.cs new file mode 100644 index 0000000..1b1e088 --- /dev/null +++ b/EOM.TSHotelManager.Common.Util/Validator/NeedValidAttribute.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EOM.TSHotelManager.Common.Util +{ + [AttributeUsage(AttributeTargets.Property)] + public class NeedValidAttribute : Attribute + { + } +} diff --git a/EOM.TSHotelManager.Common.Util/Validator/ValidateHelper.cs b/EOM.TSHotelManager.Common.Util/Validator/ValidateHelper.cs new file mode 100644 index 0000000..94cf3ca --- /dev/null +++ b/EOM.TSHotelManager.Common.Util/Validator/ValidateHelper.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace EOM.TSHotelManager.Common.Util +{ + public static class ValidateHelper + { + public static bool Validate(object obj) + { + Type type = obj.GetType(); + + // 遍历所有属性 + foreach (PropertyInfo property in type.GetProperties(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance)) + { + // 检查属性是否具有 NeedValid 特性 + if (Attribute.IsDefined(property, typeof(NeedValidAttribute))) + { + // 获取属性的值 + object value = property.GetValue(obj); + + // 根据不同的类型进行校验 + if (value is string strValue && string.IsNullOrEmpty(strValue)) + { + return false; + } + else if (value is int intValue && intValue < 0) + { + return false; + } + else if (value is decimal decValue && decValue < 0) + { + return false; + } + else if (value is double doubleValue && doubleValue < 0) + { + return false; + } + else if (value is float floatValue && floatValue < 0) + { + return false; + } + else if (value is DateTime dateTimeValue && dateTimeValue == default) + { + return false; + } + } + } + + // 如果所有校验均通过 + return true; + } + } +} diff --git a/SYS.Common/SYS.Common.csproj b/SYS.Common/SYS.Common.csproj index 66d4757..7e40ec7 100644 --- a/SYS.Common/SYS.Common.csproj +++ b/SYS.Common/SYS.Common.csproj @@ -146,7 +146,6 @@ - diff --git a/SYS.Common/Util/RecordHelper.cs b/SYS.Common/Util/RecordHelper.cs index eecb5b4..80652d6 100644 --- a/SYS.Common/Util/RecordHelper.cs +++ b/SYS.Common/Util/RecordHelper.cs @@ -1,4 +1,5 @@ -using System; +using EOM.TSHotelManager.Common.Core; +using System; namespace SYS.Common { @@ -15,7 +16,7 @@ namespace SYS.Common public static void Record(string operationLog, int level) { string api = "App/AddLog"; - var logDetail = new Temp_OperationLog + var logDetail = new OperationLog { OperationTime = DateTime.Now, LogContent = operationLog, diff --git a/SYS.Common/Util/Temp_OperationLog.cs b/SYS.Common/Util/Temp_OperationLog.cs deleted file mode 100644 index 9cece95..0000000 --- a/SYS.Common/Util/Temp_OperationLog.cs +++ /dev/null @@ -1,103 +0,0 @@ -/* - * MIT License - *Copyright (c) 2021 易开元(Easy-Open-Meta) - - *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; - -namespace SYS.Common -{ - /// - /// 日志等级 - /// - public enum RecordLevel - { - /// - /// 普通警告 - /// - Normal = 100, - /// - /// 严重警告 - /// - Warning = 200, - /// - /// 危险警告 - /// - Danger = 300, - } - - /// - /// 操作日志 - /// - public class Temp_OperationLog - { - /// - /// 操作时间 - /// - public DateTime? OperationTime { get; set; } - /// - /// 操作信息 - /// - public string LogContent { get; set; } - /// - /// 操作账号 - /// - public string OperationAccount { get; set; } - /// - /// 日志等级 - /// - public RecordLevel OperationLevel { get; set; } - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 软件版本 - /// - public string SoftwareVersion { get; set; } - /// - /// 登录IP - /// - public string login_ip { get; set; } - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } - - /// - /// 日志等级 - /// - public string OperationLevelNm { get; set; } - - } -} diff --git a/SYS.FormUI/AppFunction/FrmAddRoom.Designer.cs b/SYS.FormUI/AppFunction/FrmAddRoom.Designer.cs index 26c206d..4c4ed9c 100644 --- a/SYS.FormUI/AppFunction/FrmAddRoom.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmAddRoom.Designer.cs @@ -28,6 +28,7 @@ /// 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(); @@ -41,26 +42,26 @@ 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.FillColor = System.Drawing.Color.White; this.txtRoomNo.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtRoomNo.Location = new System.Drawing.Point(238, 501); this.txtRoomNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtRoomNo.Maximum = 2147483647D; - this.txtRoomNo.Minimum = -2147483648D; this.txtRoomNo.MinimumSize = new System.Drawing.Size(1, 1); this.txtRoomNo.Name = "txtRoomNo"; this.txtRoomNo.Padding = new System.Windows.Forms.Padding(5); this.txtRoomNo.Radius = 20; + this.txtRoomNo.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 @@ -76,21 +77,20 @@ // txtRoomPosition // this.txtRoomPosition.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtRoomPosition.FillColor = System.Drawing.Color.White; 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.Maximum = 2147483647D; - this.txtRoomPosition.Minimum = -2147483648D; 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 // @@ -105,23 +105,23 @@ // txtMoney // this.txtMoney.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtMoney.FillColor = System.Drawing.Color.White; 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.Maximum = 2147483647D; - this.txtMoney.Minimum = -2147483648D; 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 // @@ -149,6 +149,8 @@ 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); @@ -156,30 +158,32 @@ 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.FillColor = System.Drawing.Color.White; 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.Maximum = 2147483647D; - this.txtDeposit.Minimum = -2147483648D; 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 // @@ -202,6 +206,7 @@ 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 @@ -214,10 +219,15 @@ 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.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + 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); @@ -238,9 +248,9 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmAddRoom"; - this.ShowIcon = true; 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(); @@ -260,5 +270,6 @@ 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/FrmAddRoom.cs b/SYS.FormUI/AppFunction/FrmAddRoom.cs index 1d005e3..63e1034 100644 --- a/SYS.FormUI/AppFunction/FrmAddRoom.cs +++ b/SYS.FormUI/AppFunction/FrmAddRoom.cs @@ -103,7 +103,11 @@ namespace SYS.FormUI private void FrmAddRoom_Load(object sender, EventArgs e) { LoadRoom(); - result = HttpHelper.Request("RoomType/SelectRoomTypesAll"); + dic = new Dictionary + { + { "isDelete","0"} + }; + result = HttpHelper.Request("RoomType/SelectRoomTypesAll",null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("SelectRoomTypesAll+接口服务异常，请提交Issue或尝试更新版本！"); diff --git a/SYS.FormUI/AppFunction/FrmAddRoom.resx b/SYS.FormUI/AppFunction/FrmAddRoom.resx index 1a1bbf9..1f6db57 100644 --- a/SYS.FormUI/AppFunction/FrmAddRoom.resx +++ b/SYS.FormUI/AppFunction/FrmAddRoom.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + diff --git a/SYS.FormUI/AppFunction/FrmAuthority.cs b/SYS.FormUI/AppFunction/FrmAuthority.cs index f990ab1..5cc1fa0 100644 --- a/SYS.FormUI/AppFunction/FrmAuthority.cs +++ b/SYS.FormUI/AppFunction/FrmAuthority.cs @@ -103,7 +103,8 @@ namespace SYS.FormUI { { "AdminAccount",txtAccount.Text.Trim() } }; - result = HttpHelper.Request("Module/GetAllModuleByAdmin", null, dic); + var admin = new Admin { AdminAccount = txtAccount.Text.Trim() }; + result = HttpHelper.Request("Module/GetAllModuleByAdmin", HttpHelper.ModelToJson(admin), null); if (result.statusCode != 200) { UIMessageBox.ShowError("GetAllModuleByAdmin+接口服务异常，请提交Issue或尝试更新版本！"); diff --git a/SYS.FormUI/AppFunction/FrmChangePosition.cs b/SYS.FormUI/AppFunction/FrmChangePosition.cs index 3ff102e..55d1982 100644 --- a/SYS.FormUI/AppFunction/FrmChangePosition.cs +++ b/SYS.FormUI/AppFunction/FrmChangePosition.cs @@ -45,10 +45,10 @@ namespace SYS.FormUI private void FrmChangePosition_Load(object sender, EventArgs e) { - txtworkerId.Text = FrmChangeWorker.wk_WorkerNo; - txtworkerName.Text = FrmChangeWorker.wk_WorkerName; - txtClub.Text = FrmChangeWorker.wk_WorkerClub; - txtPosition.Text = FrmChangeWorker.wk_WorkerPosition; + txtworkerId.Text = FrmWorkerPanel.wk_WorkerNo; + txtworkerName.Text = FrmWorkerPanel.wk_WorkerName; + txtClub.Text = FrmWorkerPanel.wk_WorkerClub; + txtPosition.Text = FrmWorkerPanel.wk_WorkerPosition; //获取所有职位信息 dic = new Dictionary() { @@ -77,12 +77,12 @@ namespace SYS.FormUI private void cboNewClub_TextChanged(object sender, EventArgs e) { - this.Text = "将" + FrmChangeWorker.wk_WorkerClub + "：" + FrmChangeWorker.wk_WorkerName + "任命为：" + cboNewClub.Text + "的" + cboNewPosition.Text + ""; + this.Text = "将" + FrmWorkerPanel.wk_WorkerClub + "：" + FrmWorkerPanel.wk_WorkerName + "任命为：" + cboNewClub.Text + "的" + cboNewPosition.Text + ""; } private void cboNewPosition_TextChanged(object sender, EventArgs e) { - this.Text = "将" + FrmChangeWorker.wk_WorkerClub + "：" + FrmChangeWorker.wk_WorkerName + "任命为：" + cboNewClub.Text + "的" + cboNewPosition.Text + ""; + this.Text = "将" + FrmWorkerPanel.wk_WorkerClub + "：" + FrmWorkerPanel.wk_WorkerName + "任命为：" + cboNewClub.Text + "的" + cboNewPosition.Text + ""; } diff --git a/SYS.FormUI/AppFunction/FrmCheckOutForm.Designer.cs b/SYS.FormUI/AppFunction/FrmCheckOutForm.Designer.cs index 58ad595..236a2d8 100644 --- a/SYS.FormUI/AppFunction/FrmCheckOutForm.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCheckOutForm.Designer.cs @@ -37,20 +37,9 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmCheckOutForm)); + this.btnBalance = new Sunny.UI.UIButton(); this.lblVIPPrice = new System.Windows.Forms.Label(); - this.lable00 = new System.Windows.Forms.Label(); - this.lblVIP = new System.Windows.Forms.Label(); - this.label25 = new System.Windows.Forms.Label(); - this.lblChange = new System.Windows.Forms.Label(); - this.label21 = new System.Windows.Forms.Label(); - this.lblGetReceipts = new System.Windows.Forms.Label(); - this.txtReceipts = new System.Windows.Forms.TextBox(); - this.label18 = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); this.label15 = new System.Windows.Forms.Label(); - this.uiTabControlMenu1 = new Sunny.UI.UITabControlMenu(); - this.tpCheckOut = new System.Windows.Forms.TabPage(); - this.btnBalance = new Sunny.UI.UIButton(); this.dgvSpendList = new Sunny.UI.UIDataGridView(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.clPrice = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -67,16 +56,23 @@ this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.lblDay = new System.Windows.Forms.Label(); + this.lable00 = new System.Windows.Forms.Label(); this.label29 = new System.Windows.Forms.Label(); + this.lblVIP = new System.Windows.Forms.Label(); this.dtpCheckTime = new Sunny.UI.UITextBox(); + this.label25 = new System.Windows.Forms.Label(); this.txtRoomNo = new Sunny.UI.UITextBox(); this.label27 = new System.Windows.Forms.Label(); this.label28 = new System.Windows.Forms.Label(); + this.lblChange = new System.Windows.Forms.Label(); this.CustoNo = new Sunny.UI.UITextBox(); + this.label21 = new System.Windows.Forms.Label(); this.CustoName = new Sunny.UI.UITextBox(); + this.lblGetReceipts = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.label24 = new System.Windows.Forms.Label(); - this.tpCustoInfo = new System.Windows.Forms.TabPage(); + this.label17 = new System.Windows.Forms.Label(); + this.label18 = new System.Windows.Forms.Label(); this.cboCustoType = new Sunny.UI.UIComboBox(); this.cboPassportType = new Sunny.UI.UIComboBox(); this.cboCustoSex = new Sunny.UI.UIComboBox(); @@ -95,7 +91,6 @@ this.label30 = new System.Windows.Forms.Label(); this.label31 = new System.Windows.Forms.Label(); this.label32 = new System.Windows.Forms.Label(); - this.tpWti = new System.Windows.Forms.TabPage(); this.dgvWti = new Sunny.UI.UIDataGridView(); this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.clRoomNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -110,190 +105,53 @@ this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.uiTabControlMenu1.SuspendLayout(); - this.tpCheckOut.SuspendLayout(); + this.uiTabControlMenu2 = new Sunny.UI.UITabControlMenu(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.tabPage3 = new System.Windows.Forms.TabPage(); + this.txtReceipts = new Sunny.UI.UITextBox(); ((System.ComponentModel.ISupportInitialize)(this.dgvSpendList)).BeginInit(); - this.tpCustoInfo.SuspendLayout(); - this.tpWti.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvWti)).BeginInit(); + this.uiTabControlMenu2.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.tabPage2.SuspendLayout(); + this.tabPage3.SuspendLayout(); this.SuspendLayout(); // + // btnBalance + // + this.btnBalance.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnBalance.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnBalance.Location = new System.Drawing.Point(495, 485); + this.btnBalance.MinimumSize = new System.Drawing.Size(1, 1); + this.btnBalance.Name = "btnBalance"; + this.btnBalance.Radius = 30; + this.btnBalance.Size = new System.Drawing.Size(162, 46); + this.btnBalance.Style = Sunny.UI.UIStyle.Custom; + this.btnBalance.TabIndex = 116; + this.btnBalance.Text = "结 算"; + this.btnBalance.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + // // lblVIPPrice // this.lblVIPPrice.AutoSize = true; this.lblVIPPrice.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblVIPPrice.Location = new System.Drawing.Point(565, 379); + this.lblVIPPrice.Location = new System.Drawing.Point(585, 388); this.lblVIPPrice.Name = "lblVIPPrice"; this.lblVIPPrice.Size = new System.Drawing.Size(40, 20); this.lblVIPPrice.TabIndex = 28; this.lblVIPPrice.Text = "0.00"; // - // lable00 - // - this.lable00.AutoSize = true; - this.lable00.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lable00.Location = new System.Drawing.Point(472, 378); - this.lable00.Name = "lable00"; - this.lable00.Size = new System.Drawing.Size(89, 20); - this.lable00.TabIndex = 26; - this.lable00.Text = "折后金额："; - // - // lblVIP - // - this.lblVIP.AutoSize = true; - this.lblVIP.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblVIP.Location = new System.Drawing.Point(565, 351); - this.lblVIP.Name = "lblVIP"; - this.lblVIP.Size = new System.Drawing.Size(73, 20); - this.lblVIP.TabIndex = 24; - this.lblVIP.Text = "不 打 折"; - // - // label25 - // - this.label25.AutoSize = true; - this.label25.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label25.Location = new System.Drawing.Point(472, 349); - this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(89, 20); - this.label25.TabIndex = 23; - this.label25.Text = "会员折扣："; - // - // lblChange - // - this.lblChange.AutoSize = true; - this.lblChange.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblChange.Location = new System.Drawing.Point(564, 435); - this.lblChange.Name = "lblChange"; - this.lblChange.Size = new System.Drawing.Size(40, 20); - this.lblChange.TabIndex = 21; - this.lblChange.Text = "0.00"; - // - // label21 - // - this.label21.AutoSize = true; - this.label21.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label21.Location = new System.Drawing.Point(471, 436); - this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(89, 20); - this.label21.TabIndex = 20; - this.label21.Text = "找 零："; - // - // lblGetReceipts - // - this.lblGetReceipts.AutoSize = true; - this.lblGetReceipts.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblGetReceipts.Location = new System.Drawing.Point(564, 407); - this.lblGetReceipts.Name = "lblGetReceipts"; - this.lblGetReceipts.Size = new System.Drawing.Size(40, 20); - this.lblGetReceipts.TabIndex = 19; - this.lblGetReceipts.Text = "0.00"; - // - // txtReceipts - // - this.txtReceipts.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtReceipts.Location = new System.Drawing.Point(564, 317); - this.txtReceipts.MaxLength = 10; - this.txtReceipts.Name = "txtReceipts"; - this.txtReceipts.Size = new System.Drawing.Size(74, 26); - this.txtReceipts.TabIndex = 16; - this.txtReceipts.TextChanged += new System.EventHandler(this.txtReceipts_TextChanged); - // - // label18 - // - this.label18.AutoSize = true; - this.label18.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label18.Location = new System.Drawing.Point(471, 407); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(89, 20); - this.label18.TabIndex = 15; - this.label18.Text = "应收金额："; - // - // label17 - // - this.label17.AutoSize = true; - this.label17.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label17.Location = new System.Drawing.Point(471, 320); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(89, 20); - this.label17.TabIndex = 14; - this.label17.Text = "实收金额："; - // // label15 // this.label15.AutoSize = true; this.label15.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label15.ForeColor = System.Drawing.Color.Red; - this.label15.Location = new System.Drawing.Point(3, 514); + this.label15.Location = new System.Drawing.Point(7, 525); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(253, 17); this.label15.TabIndex = 11; - this.label15.Text = "Tips：请提醒客户不要忘记带齐行李哦~"; - // - // uiTabControlMenu1 - // - this.uiTabControlMenu1.Alignment = System.Windows.Forms.TabAlignment.Left; - this.uiTabControlMenu1.Controls.Add(this.tpCheckOut); - this.uiTabControlMenu1.Controls.Add(this.tpCustoInfo); - this.uiTabControlMenu1.Controls.Add(this.tpWti); - this.uiTabControlMenu1.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed; - this.uiTabControlMenu1.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiTabControlMenu1.ItemSize = new System.Drawing.Size(40, 200); - this.uiTabControlMenu1.Location = new System.Drawing.Point(13, 49); - this.uiTabControlMenu1.MenuStyle = Sunny.UI.UIMenuStyle.Custom; - this.uiTabControlMenu1.Multiline = true; - this.uiTabControlMenu1.Name = "uiTabControlMenu1"; - this.uiTabControlMenu1.SelectedIndex = 0; - this.uiTabControlMenu1.Size = new System.Drawing.Size(863, 537); - this.uiTabControlMenu1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; - this.uiTabControlMenu1.TabBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.uiTabControlMenu1.TabIndex = 13; - this.uiTabControlMenu1.TabSelectedColor = System.Drawing.Color.Snow; - // - // tpCheckOut - // - this.tpCheckOut.Controls.Add(this.btnBalance); - this.tpCheckOut.Controls.Add(this.lblVIPPrice); - this.tpCheckOut.Controls.Add(this.label15); - this.tpCheckOut.Controls.Add(this.dgvSpendList); - this.tpCheckOut.Controls.Add(this.lblDay); - this.tpCheckOut.Controls.Add(this.lable00); - this.tpCheckOut.Controls.Add(this.label29); - this.tpCheckOut.Controls.Add(this.lblVIP); - this.tpCheckOut.Controls.Add(this.dtpCheckTime); - this.tpCheckOut.Controls.Add(this.label25); - this.tpCheckOut.Controls.Add(this.txtRoomNo); - this.tpCheckOut.Controls.Add(this.label27); - this.tpCheckOut.Controls.Add(this.label28); - this.tpCheckOut.Controls.Add(this.lblChange); - this.tpCheckOut.Controls.Add(this.CustoNo); - this.tpCheckOut.Controls.Add(this.label21); - this.tpCheckOut.Controls.Add(this.CustoName); - this.tpCheckOut.Controls.Add(this.lblGetReceipts); - this.tpCheckOut.Controls.Add(this.label1); - this.tpCheckOut.Controls.Add(this.label24); - this.tpCheckOut.Controls.Add(this.label17); - this.tpCheckOut.Controls.Add(this.txtReceipts); - this.tpCheckOut.Controls.Add(this.label18); - this.tpCheckOut.Location = new System.Drawing.Point(201, 0); - this.tpCheckOut.Name = "tpCheckOut"; - this.tpCheckOut.Size = new System.Drawing.Size(662, 537); - this.tpCheckOut.TabIndex = 0; - this.tpCheckOut.Text = "退房结算"; - this.tpCheckOut.UseVisualStyleBackColor = true; - // - // btnBalance - // - this.btnBalance.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnBalance.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnBalance.Location = new System.Drawing.Point(476, 473); - this.btnBalance.MinimumSize = new System.Drawing.Size(1, 1); - this.btnBalance.Name = "btnBalance"; - this.btnBalance.Radius = 30; - this.btnBalance.Size = new System.Drawing.Size(162, 46); - this.btnBalance.Style = Sunny.UI.UIStyle.Custom; - this.btnBalance.TabIndex = 116; - this.btnBalance.Text = "结 算"; - this.btnBalance.Click += new System.EventHandler(this.btnBalance_Click); + this.label15.Text = "Tips：请提醒客人不要忘记带齐行李哦~"; // // dgvSpendList // @@ -334,7 +192,7 @@ this.dgvSpendList.EnableHeadersVisualStyles = false; this.dgvSpendList.Font = new System.Drawing.Font("微软雅黑", 12F); this.dgvSpendList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - this.dgvSpendList.Location = new System.Drawing.Point(6, 102); + this.dgvSpendList.Location = new System.Drawing.Point(10, 113); this.dgvSpendList.Name = "dgvSpendList"; this.dgvSpendList.ReadOnly = true; dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; @@ -353,6 +211,7 @@ this.dgvSpendList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dgvSpendList.ShowRowErrors = false; this.dgvSpendList.Size = new System.Drawing.Size(648, 202); + this.dgvSpendList.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.dgvSpendList.Style = Sunny.UI.UIStyle.Custom; this.dgvSpendList.TabIndex = 115; // @@ -472,67 +331,95 @@ // this.lblDay.AutoSize = true; this.lblDay.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblDay.Location = new System.Drawing.Point(568, 65); + this.lblDay.Location = new System.Drawing.Point(572, 76); this.lblDay.Name = "lblDay"; this.lblDay.Size = new System.Drawing.Size(45, 25); this.lblDay.TabIndex = 114; this.lblDay.Text = "Null"; // + // lable00 + // + this.lable00.AutoSize = true; + this.lable00.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lable00.Location = new System.Drawing.Point(492, 387); + this.lable00.Name = "lable00"; + this.lable00.Size = new System.Drawing.Size(89, 20); + this.lable00.TabIndex = 26; + this.lable00.Text = "折后金额："; + // // label29 // this.label29.AutoSize = true; this.label29.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label29.Location = new System.Drawing.Point(547, 13); + this.label29.Location = new System.Drawing.Point(551, 24); this.label29.Name = "label29"; this.label29.Size = new System.Drawing.Size(88, 25); this.label29.TabIndex = 113; this.label29.Text = "已住天数"; // + // lblVIP + // + this.lblVIP.AutoSize = true; + this.lblVIP.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblVIP.Location = new System.Drawing.Point(585, 360); + this.lblVIP.Name = "lblVIP"; + this.lblVIP.Size = new System.Drawing.Size(73, 20); + this.lblVIP.TabIndex = 24; + this.lblVIP.Text = "不 打 折"; + // // dtpCheckTime // this.dtpCheckTime.Cursor = System.Windows.Forms.Cursors.IBeam; - this.dtpCheckTime.FillColor = System.Drawing.Color.White; this.dtpCheckTime.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dtpCheckTime.Location = new System.Drawing.Point(372, 7); + this.dtpCheckTime.Location = new System.Drawing.Point(376, 18); this.dtpCheckTime.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.dtpCheckTime.Maximum = 2147483647D; - this.dtpCheckTime.Minimum = -2147483648D; this.dtpCheckTime.MinimumSize = new System.Drawing.Size(1, 1); this.dtpCheckTime.Name = "dtpCheckTime"; this.dtpCheckTime.Padding = new System.Windows.Forms.Padding(5); this.dtpCheckTime.Radius = 20; this.dtpCheckTime.ReadOnly = true; + this.dtpCheckTime.ShowText = false; this.dtpCheckTime.Size = new System.Drawing.Size(168, 35); this.dtpCheckTime.Style = Sunny.UI.UIStyle.Custom; this.dtpCheckTime.StyleCustomMode = true; this.dtpCheckTime.TabIndex = 111; this.dtpCheckTime.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.dtpCheckTime.Watermark = ""; + // + // label25 + // + this.label25.AutoSize = true; + this.label25.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label25.Location = new System.Drawing.Point(492, 358); + this.label25.Name = "label25"; + this.label25.Size = new System.Drawing.Size(89, 20); + this.label25.TabIndex = 23; + this.label25.Text = "会员折扣："; // // txtRoomNo // this.txtRoomNo.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtRoomNo.FillColor = System.Drawing.Color.White; this.txtRoomNo.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtRoomNo.Location = new System.Drawing.Point(372, 59); + this.txtRoomNo.Location = new System.Drawing.Point(376, 70); this.txtRoomNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtRoomNo.Maximum = 2147483647D; - this.txtRoomNo.Minimum = -2147483648D; this.txtRoomNo.MinimumSize = new System.Drawing.Size(1, 1); this.txtRoomNo.Name = "txtRoomNo"; this.txtRoomNo.Padding = new System.Windows.Forms.Padding(5); this.txtRoomNo.Radius = 20; this.txtRoomNo.ReadOnly = true; + this.txtRoomNo.ShowText = false; this.txtRoomNo.Size = new System.Drawing.Size(168, 35); this.txtRoomNo.Style = Sunny.UI.UIStyle.Custom; this.txtRoomNo.StyleCustomMode = true; this.txtRoomNo.TabIndex = 112; this.txtRoomNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtRoomNo.Watermark = ""; // // label27 // this.label27.AutoSize = true; this.label27.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label27.Location = new System.Drawing.Point(281, 65); + this.label27.Location = new System.Drawing.Point(285, 76); this.label27.Name = "label27"; this.label27.Size = new System.Drawing.Size(88, 25); this.label27.TabIndex = 110; @@ -542,57 +429,85 @@ // this.label28.AutoSize = true; this.label28.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label28.Location = new System.Drawing.Point(281, 13); + this.label28.Location = new System.Drawing.Point(285, 24); this.label28.Name = "label28"; this.label28.Size = new System.Drawing.Size(88, 25); this.label28.TabIndex = 109; this.label28.Text = "入住时间"; // + // lblChange + // + this.lblChange.AutoSize = true; + this.lblChange.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblChange.Location = new System.Drawing.Point(584, 444); + this.lblChange.Name = "lblChange"; + this.lblChange.Size = new System.Drawing.Size(40, 20); + this.lblChange.TabIndex = 21; + this.lblChange.Text = "0.00"; + // // CustoNo // this.CustoNo.Cursor = System.Windows.Forms.Cursors.IBeam; - this.CustoNo.FillColor = System.Drawing.Color.White; this.CustoNo.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.CustoNo.Location = new System.Drawing.Point(113, 7); + this.CustoNo.Location = new System.Drawing.Point(117, 18); this.CustoNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.CustoNo.Maximum = 2147483647D; - this.CustoNo.Minimum = -2147483648D; this.CustoNo.MinimumSize = new System.Drawing.Size(1, 1); this.CustoNo.Name = "CustoNo"; this.CustoNo.Padding = new System.Windows.Forms.Padding(5); this.CustoNo.Radius = 20; this.CustoNo.ReadOnly = true; + this.CustoNo.ShowText = false; this.CustoNo.Size = new System.Drawing.Size(144, 35); this.CustoNo.Style = Sunny.UI.UIStyle.Custom; this.CustoNo.StyleCustomMode = true; this.CustoNo.TabIndex = 107; this.CustoNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.CustoNo.Watermark = ""; + // + // label21 + // + this.label21.AutoSize = true; + this.label21.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label21.Location = new System.Drawing.Point(491, 445); + this.label21.Name = "label21"; + this.label21.Size = new System.Drawing.Size(89, 20); + this.label21.TabIndex = 20; + this.label21.Text = "找 零："; // // CustoName // this.CustoName.Cursor = System.Windows.Forms.Cursors.IBeam; - this.CustoName.FillColor = System.Drawing.Color.White; this.CustoName.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.CustoName.Location = new System.Drawing.Point(113, 59); + this.CustoName.Location = new System.Drawing.Point(117, 70); this.CustoName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.CustoName.Maximum = 2147483647D; - this.CustoName.Minimum = -2147483648D; this.CustoName.MinimumSize = new System.Drawing.Size(1, 1); this.CustoName.Name = "CustoName"; this.CustoName.Padding = new System.Windows.Forms.Padding(5); this.CustoName.Radius = 20; this.CustoName.ReadOnly = true; + this.CustoName.ShowText = false; this.CustoName.Size = new System.Drawing.Size(144, 35); this.CustoName.Style = Sunny.UI.UIStyle.Custom; this.CustoName.StyleCustomMode = true; this.CustoName.TabIndex = 108; this.CustoName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.CustoName.Watermark = ""; + // + // lblGetReceipts + // + this.lblGetReceipts.AutoSize = true; + this.lblGetReceipts.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblGetReceipts.Location = new System.Drawing.Point(584, 416); + this.lblGetReceipts.Name = "lblGetReceipts"; + this.lblGetReceipts.Size = new System.Drawing.Size(40, 20); + this.lblGetReceipts.TabIndex = 19; + this.lblGetReceipts.Text = "0.00"; // // 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(22, 65); + this.label1.Location = new System.Drawing.Point(26, 76); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(88, 25); this.label1.TabIndex = 106; @@ -602,38 +517,31 @@ // this.label24.AutoSize = true; this.label24.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label24.Location = new System.Drawing.Point(22, 13); + this.label24.Location = new System.Drawing.Point(26, 24); this.label24.Name = "label24"; this.label24.Size = new System.Drawing.Size(88, 25); this.label24.TabIndex = 105; this.label24.Text = "客户编号"; // - // tpCustoInfo - // - this.tpCustoInfo.Controls.Add(this.cboCustoType); - this.tpCustoInfo.Controls.Add(this.cboPassportType); - this.tpCustoInfo.Controls.Add(this.cboCustoSex); - this.tpCustoInfo.Controls.Add(this.txtCustoNo); - this.tpCustoInfo.Controls.Add(this.txtCustoName); - this.tpCustoInfo.Controls.Add(this.txtPassportNum); - this.tpCustoInfo.Controls.Add(this.txtTel); - this.tpCustoInfo.Controls.Add(this.dtpBirth); - this.tpCustoInfo.Controls.Add(this.txtAddress); - this.tpCustoInfo.Controls.Add(this.label2); - this.tpCustoInfo.Controls.Add(this.label3); - this.tpCustoInfo.Controls.Add(this.label4); - this.tpCustoInfo.Controls.Add(this.label5); - this.tpCustoInfo.Controls.Add(this.label16); - this.tpCustoInfo.Controls.Add(this.label22); - this.tpCustoInfo.Controls.Add(this.label30); - this.tpCustoInfo.Controls.Add(this.label31); - this.tpCustoInfo.Controls.Add(this.label32); - this.tpCustoInfo.Location = new System.Drawing.Point(201, 0); - this.tpCustoInfo.Name = "tpCustoInfo"; - this.tpCustoInfo.Size = new System.Drawing.Size(662, 537); - this.tpCustoInfo.TabIndex = 1; - this.tpCustoInfo.Text = "客户信息"; - this.tpCustoInfo.UseVisualStyleBackColor = true; + // label17 + // + this.label17.AutoSize = true; + this.label17.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label17.Location = new System.Drawing.Point(491, 329); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(89, 20); + this.label17.TabIndex = 14; + this.label17.Text = "实收金额："; + // + // label18 + // + this.label18.AutoSize = true; + this.label18.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label18.Location = new System.Drawing.Point(491, 416); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(89, 20); + this.label18.TabIndex = 15; + this.label18.Text = "应收金额："; // // cboCustoType // @@ -641,7 +549,9 @@ this.cboCustoType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboCustoType.FillColor = System.Drawing.Color.White; this.cboCustoType.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cboCustoType.Location = new System.Drawing.Point(436, 8); + this.cboCustoType.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); + this.cboCustoType.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.cboCustoType.Location = new System.Drawing.Point(437, 19); this.cboCustoType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboCustoType.MinimumSize = new System.Drawing.Size(63, 0); this.cboCustoType.Name = "cboCustoType"; @@ -650,6 +560,7 @@ this.cboCustoType.ReadOnly = true; this.cboCustoType.Size = new System.Drawing.Size(203, 35); this.cboCustoType.Style = Sunny.UI.UIStyle.Custom; + this.cboCustoType.SymbolSize = 24; this.cboCustoType.TabIndex = 125; this.cboCustoType.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; this.cboCustoType.Watermark = ""; @@ -660,7 +571,9 @@ this.cboPassportType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboPassportType.FillColor = System.Drawing.Color.White; this.cboPassportType.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cboPassportType.Location = new System.Drawing.Point(436, 59); + this.cboPassportType.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); + this.cboPassportType.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.cboPassportType.Location = new System.Drawing.Point(437, 70); this.cboPassportType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboPassportType.MinimumSize = new System.Drawing.Size(63, 0); this.cboPassportType.Name = "cboPassportType"; @@ -669,8 +582,10 @@ this.cboPassportType.ReadOnly = true; this.cboPassportType.Size = new System.Drawing.Size(203, 35); this.cboPassportType.Style = Sunny.UI.UIStyle.Custom; + this.cboPassportType.SymbolSize = 24; this.cboPassportType.TabIndex = 124; this.cboPassportType.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.cboPassportType.Watermark = ""; // // cboCustoSex // @@ -678,7 +593,9 @@ this.cboCustoSex.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboCustoSex.FillColor = System.Drawing.Color.White; this.cboCustoSex.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cboCustoSex.Location = new System.Drawing.Point(133, 113); + this.cboCustoSex.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); + this.cboCustoSex.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.cboCustoSex.Location = new System.Drawing.Point(134, 124); this.cboCustoSex.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboCustoSex.MinimumSize = new System.Drawing.Size(63, 0); this.cboCustoSex.Name = "cboCustoSex"; @@ -687,95 +604,93 @@ this.cboCustoSex.ReadOnly = true; this.cboCustoSex.Size = new System.Drawing.Size(203, 35); this.cboCustoSex.Style = Sunny.UI.UIStyle.Custom; + this.cboCustoSex.SymbolSize = 24; this.cboCustoSex.TabIndex = 123; this.cboCustoSex.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.cboCustoSex.Watermark = ""; // // txtCustoNo // this.txtCustoNo.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoNo.FillColor = System.Drawing.Color.White; this.txtCustoNo.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCustoNo.Location = new System.Drawing.Point(133, 9); + this.txtCustoNo.Location = new System.Drawing.Point(134, 20); this.txtCustoNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCustoNo.Maximum = 2147483647D; - this.txtCustoNo.Minimum = -2147483648D; this.txtCustoNo.MinimumSize = new System.Drawing.Size(1, 1); this.txtCustoNo.Name = "txtCustoNo"; this.txtCustoNo.Padding = new System.Windows.Forms.Padding(5); this.txtCustoNo.Radius = 20; this.txtCustoNo.ReadOnly = true; + this.txtCustoNo.ShowText = false; this.txtCustoNo.Size = new System.Drawing.Size(203, 35); this.txtCustoNo.Style = Sunny.UI.UIStyle.Custom; this.txtCustoNo.StyleCustomMode = true; this.txtCustoNo.TabIndex = 122; this.txtCustoNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtCustoNo.Watermark = ""; // // txtCustoName // this.txtCustoName.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoName.FillColor = System.Drawing.Color.White; this.txtCustoName.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCustoName.Location = new System.Drawing.Point(133, 61); + this.txtCustoName.Location = new System.Drawing.Point(134, 72); this.txtCustoName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCustoName.Maximum = 2147483647D; - this.txtCustoName.Minimum = -2147483648D; this.txtCustoName.MinimumSize = new System.Drawing.Size(1, 1); this.txtCustoName.Name = "txtCustoName"; this.txtCustoName.Padding = new System.Windows.Forms.Padding(5); this.txtCustoName.Radius = 20; this.txtCustoName.ReadOnly = true; + this.txtCustoName.ShowText = false; this.txtCustoName.Size = new System.Drawing.Size(203, 35); this.txtCustoName.Style = Sunny.UI.UIStyle.Custom; this.txtCustoName.StyleCustomMode = true; this.txtCustoName.TabIndex = 121; this.txtCustoName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtCustoName.Watermark = ""; // // txtPassportNum // this.txtPassportNum.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtPassportNum.FillColor = System.Drawing.Color.White; this.txtPassportNum.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtPassportNum.Location = new System.Drawing.Point(436, 110); + this.txtPassportNum.Location = new System.Drawing.Point(437, 121); this.txtPassportNum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtPassportNum.Maximum = 2147483647D; - this.txtPassportNum.Minimum = -2147483648D; this.txtPassportNum.MinimumSize = new System.Drawing.Size(1, 1); this.txtPassportNum.Name = "txtPassportNum"; this.txtPassportNum.Padding = new System.Windows.Forms.Padding(5); this.txtPassportNum.Radius = 20; this.txtPassportNum.ReadOnly = true; + this.txtPassportNum.ShowText = false; this.txtPassportNum.Size = new System.Drawing.Size(203, 35); this.txtPassportNum.Style = Sunny.UI.UIStyle.Custom; this.txtPassportNum.StyleCustomMode = true; this.txtPassportNum.TabIndex = 120; this.txtPassportNum.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtPassportNum.Watermark = ""; // // txtTel // this.txtTel.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtTel.FillColor = System.Drawing.Color.White; this.txtTel.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtTel.Location = new System.Drawing.Point(436, 161); + this.txtTel.Location = new System.Drawing.Point(437, 172); this.txtTel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtTel.Maximum = 2147483647D; - this.txtTel.Minimum = -2147483648D; this.txtTel.MinimumSize = new System.Drawing.Size(1, 1); this.txtTel.Name = "txtTel"; this.txtTel.Padding = new System.Windows.Forms.Padding(5); this.txtTel.Radius = 20; this.txtTel.ReadOnly = true; + this.txtTel.ShowText = false; this.txtTel.Size = new System.Drawing.Size(203, 35); this.txtTel.Style = Sunny.UI.UIStyle.Custom; this.txtTel.StyleCustomMode = true; this.txtTel.TabIndex = 119; this.txtTel.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtTel.Watermark = ""; // // dtpBirth // this.dtpBirth.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.dtpBirth.FillColor = System.Drawing.Color.White; this.dtpBirth.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F); - this.dtpBirth.Location = new System.Drawing.Point(133, 165); + this.dtpBirth.Location = new System.Drawing.Point(134, 176); this.dtpBirth.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dtpBirth.MaxLength = 10; this.dtpBirth.MinimumSize = new System.Drawing.Size(63, 0); @@ -787,36 +702,37 @@ this.dtpBirth.Style = Sunny.UI.UIStyle.Custom; this.dtpBirth.SymbolDropDown = 61555; this.dtpBirth.SymbolNormal = 61555; + this.dtpBirth.SymbolSize = 24; this.dtpBirth.TabIndex = 118; this.dtpBirth.Text = "2020-11-24"; this.dtpBirth.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; this.dtpBirth.Value = new System.DateTime(2020, 11, 24, 22, 50, 36, 791); + this.dtpBirth.Watermark = ""; // // txtAddress // this.txtAddress.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtAddress.FillColor = System.Drawing.Color.White; this.txtAddress.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtAddress.Location = new System.Drawing.Point(131, 213); + this.txtAddress.Location = new System.Drawing.Point(132, 224); this.txtAddress.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtAddress.Maximum = 2147483647D; - this.txtAddress.Minimum = -2147483648D; this.txtAddress.MinimumSize = new System.Drawing.Size(1, 1); this.txtAddress.Name = "txtAddress"; this.txtAddress.Padding = new System.Windows.Forms.Padding(5); this.txtAddress.Radius = 20; this.txtAddress.ReadOnly = true; + this.txtAddress.ShowText = false; this.txtAddress.Size = new System.Drawing.Size(508, 35); this.txtAddress.Style = Sunny.UI.UIStyle.Custom; this.txtAddress.StyleCustomMode = true; this.txtAddress.TabIndex = 117; this.txtAddress.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtAddress.Watermark = ""; // // 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(24, 223); + this.label2.Location = new System.Drawing.Point(25, 234); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(88, 25); this.label2.TabIndex = 115; @@ -826,7 +742,7 @@ // 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(343, 168); + this.label3.Location = new System.Drawing.Point(344, 179); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(88, 25); this.label3.TabIndex = 114; @@ -836,7 +752,7 @@ // 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(343, 117); + this.label4.Location = new System.Drawing.Point(344, 128); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(88, 25); this.label4.TabIndex = 113; @@ -846,7 +762,7 @@ // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(343, 66); + this.label5.Location = new System.Drawing.Point(344, 77); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(88, 25); this.label5.TabIndex = 112; @@ -856,7 +772,7 @@ // this.label16.AutoSize = true; this.label16.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label16.Location = new System.Drawing.Point(343, 15); + this.label16.Location = new System.Drawing.Point(344, 26); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(88, 25); this.label16.TabIndex = 111; @@ -866,7 +782,7 @@ // this.label22.AutoSize = true; this.label22.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label22.Location = new System.Drawing.Point(26, 171); + this.label22.Location = new System.Drawing.Point(27, 182); this.label22.Name = "label22"; this.label22.Size = new System.Drawing.Size(88, 25); this.label22.TabIndex = 110; @@ -876,7 +792,7 @@ // this.label30.AutoSize = true; this.label30.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label30.Location = new System.Drawing.Point(26, 119); + this.label30.Location = new System.Drawing.Point(27, 130); this.label30.Name = "label30"; this.label30.Size = new System.Drawing.Size(86, 25); this.label30.TabIndex = 109; @@ -886,7 +802,7 @@ // this.label31.AutoSize = true; this.label31.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label31.Location = new System.Drawing.Point(26, 67); + this.label31.Location = new System.Drawing.Point(27, 78); this.label31.Name = "label31"; this.label31.Size = new System.Drawing.Size(88, 25); this.label31.TabIndex = 108; @@ -896,22 +812,12 @@ // this.label32.AutoSize = true; this.label32.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label32.Location = new System.Drawing.Point(26, 15); + this.label32.Location = new System.Drawing.Point(27, 26); this.label32.Name = "label32"; this.label32.Size = new System.Drawing.Size(88, 25); this.label32.TabIndex = 107; this.label32.Text = "客户编号"; // - // tpWti - // - this.tpWti.Controls.Add(this.dgvWti); - this.tpWti.Location = new System.Drawing.Point(201, 0); - this.tpWti.Name = "tpWti"; - this.tpWti.Size = new System.Drawing.Size(662, 537); - this.tpWti.TabIndex = 2; - this.tpWti.Text = "水电情况"; - this.tpWti.UseVisualStyleBackColor = true; - // // dgvWti // this.dgvWti.AllowUserToAddRows = false; @@ -967,6 +873,7 @@ this.dgvWti.SelectedIndex = -1; this.dgvWti.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dgvWti.Size = new System.Drawing.Size(656, 291); + this.dgvWti.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.dgvWti.Style = Sunny.UI.UIStyle.Custom; this.dgvWti.TabIndex = 0; // @@ -1054,63 +961,174 @@ this.Column10.Name = "Column10"; this.Column10.Visible = false; // + // uiTabControlMenu2 + // + this.uiTabControlMenu2.Alignment = System.Windows.Forms.TabAlignment.Left; + this.uiTabControlMenu2.Controls.Add(this.tabPage1); + this.uiTabControlMenu2.Controls.Add(this.tabPage2); + this.uiTabControlMenu2.Controls.Add(this.tabPage3); + this.uiTabControlMenu2.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed; + this.uiTabControlMenu2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiTabControlMenu2.Location = new System.Drawing.Point(3, 38); + this.uiTabControlMenu2.MenuStyle = Sunny.UI.UIMenuStyle.Custom; + this.uiTabControlMenu2.Multiline = true; + this.uiTabControlMenu2.Name = "uiTabControlMenu2"; + this.uiTabControlMenu2.SelectedIndex = 0; + this.uiTabControlMenu2.Size = new System.Drawing.Size(865, 550); + this.uiTabControlMenu2.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; + this.uiTabControlMenu2.TabBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.uiTabControlMenu2.TabIndex = 15; + this.uiTabControlMenu2.TabSelectedColor = System.Drawing.Color.Snow; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.txtReceipts); + this.tabPage1.Controls.Add(this.btnBalance); + this.tabPage1.Controls.Add(this.label24); + this.tabPage1.Controls.Add(this.lblVIPPrice); + this.tabPage1.Controls.Add(this.label18); + this.tabPage1.Controls.Add(this.label15); + this.tabPage1.Controls.Add(this.dgvSpendList); + this.tabPage1.Controls.Add(this.label17); + this.tabPage1.Controls.Add(this.lblDay); + this.tabPage1.Controls.Add(this.label1); + this.tabPage1.Controls.Add(this.lable00); + this.tabPage1.Controls.Add(this.lblGetReceipts); + this.tabPage1.Controls.Add(this.label29); + this.tabPage1.Controls.Add(this.CustoName); + this.tabPage1.Controls.Add(this.lblVIP); + this.tabPage1.Controls.Add(this.label21); + this.tabPage1.Controls.Add(this.dtpCheckTime); + this.tabPage1.Controls.Add(this.CustoNo); + this.tabPage1.Controls.Add(this.label25); + this.tabPage1.Controls.Add(this.lblChange); + this.tabPage1.Controls.Add(this.txtRoomNo); + this.tabPage1.Controls.Add(this.label28); + this.tabPage1.Controls.Add(this.label27); + this.tabPage1.Location = new System.Drawing.Point(201, 0); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Size = new System.Drawing.Size(664, 550); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "退房结算"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.cboCustoType); + this.tabPage2.Controls.Add(this.label32); + this.tabPage2.Controls.Add(this.cboPassportType); + this.tabPage2.Controls.Add(this.label31); + this.tabPage2.Controls.Add(this.cboCustoSex); + this.tabPage2.Controls.Add(this.label30); + this.tabPage2.Controls.Add(this.txtCustoNo); + this.tabPage2.Controls.Add(this.label22); + this.tabPage2.Controls.Add(this.txtCustoName); + this.tabPage2.Controls.Add(this.label16); + this.tabPage2.Controls.Add(this.txtPassportNum); + this.tabPage2.Controls.Add(this.label5); + this.tabPage2.Controls.Add(this.txtTel); + this.tabPage2.Controls.Add(this.label4); + this.tabPage2.Controls.Add(this.dtpBirth); + this.tabPage2.Controls.Add(this.label3); + this.tabPage2.Controls.Add(this.txtAddress); + this.tabPage2.Controls.Add(this.label2); + this.tabPage2.Location = new System.Drawing.Point(201, 0); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Size = new System.Drawing.Size(664, 658); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "客户信息"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // tabPage3 + // + this.tabPage3.Controls.Add(this.dgvWti); + this.tabPage3.Location = new System.Drawing.Point(201, 0); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Size = new System.Drawing.Size(664, 658); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "历史水电情况"; + this.tabPage3.UseVisualStyleBackColor = true; + // + // txtReceipts + // + this.txtReceipts.Cursor = System.Windows.Forms.Cursors.IBeam; + this.txtReceipts.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtReceipts.Location = new System.Drawing.Point(584, 328); + this.txtReceipts.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txtReceipts.MinimumSize = new System.Drawing.Size(1, 16); + this.txtReceipts.Name = "txtReceipts"; + this.txtReceipts.Padding = new System.Windows.Forms.Padding(5); + this.txtReceipts.ShowText = false; + this.txtReceipts.Size = new System.Drawing.Size(74, 26); + this.txtReceipts.TabIndex = 117; + this.txtReceipts.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; + this.txtReceipts.Watermark = ""; + // // FrmCheckOutForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + 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(888, 603); - this.Controls.Add(this.uiTabControlMenu1); + this.ClientSize = new System.Drawing.Size(873, 593); + this.Controls.Add(this.uiTabControlMenu2); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmCheckOutForm"; - this.ShowIcon = true; this.ShowTitleIcon = true; this.Text = "退房结算"; + this.ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 888, 603); this.Load += new System.EventHandler(this.FrmCheckOutForm_Load); this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.FrmCheckOutForm_MouseDown); this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.FrmCheckOutForm_MouseMove); - this.uiTabControlMenu1.ResumeLayout(false); - this.tpCheckOut.ResumeLayout(false); - this.tpCheckOut.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvSpendList)).EndInit(); - this.tpCustoInfo.ResumeLayout(false); - this.tpCustoInfo.PerformLayout(); - this.tpWti.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dgvWti)).EndInit(); + this.uiTabControlMenu2.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.tabPage1.PerformLayout(); + this.tabPage2.ResumeLayout(false); + this.tabPage2.PerformLayout(); + this.tabPage3.ResumeLayout(false); this.ResumeLayout(false); } #endregion - private System.Windows.Forms.Label label15; - private System.Windows.Forms.TextBox txtReceipts; - private System.Windows.Forms.Label label18; - private System.Windows.Forms.Label label17; - private System.Windows.Forms.Label lblGetReceipts; - private System.Windows.Forms.Label lblChange; - private System.Windows.Forms.Label label21; - private System.Windows.Forms.Label lblVIP; - private System.Windows.Forms.Label label25; + private Sunny.UI.UIButton btnBalance; private System.Windows.Forms.Label lblVIPPrice; - private System.Windows.Forms.Label lable00; - private Sunny.UI.UITabControlMenu uiTabControlMenu1; - private System.Windows.Forms.TabPage tpCheckOut; - private System.Windows.Forms.TabPage tpCustoInfo; - private System.Windows.Forms.TabPage tpWti; + private System.Windows.Forms.Label label15; + private Sunny.UI.UIDataGridView dgvSpendList; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; + private System.Windows.Forms.DataGridViewTextBoxColumn clPrice; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7; + private System.Windows.Forms.DataGridViewTextBoxColumn clSpendNo; + 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 System.Windows.Forms.DataGridViewTextBoxColumn Column8; private System.Windows.Forms.Label lblDay; + private System.Windows.Forms.Label lable00; private System.Windows.Forms.Label label29; + private System.Windows.Forms.Label lblVIP; private Sunny.UI.UITextBox dtpCheckTime; + private System.Windows.Forms.Label label25; private Sunny.UI.UITextBox txtRoomNo; private System.Windows.Forms.Label label27; private System.Windows.Forms.Label label28; + private System.Windows.Forms.Label lblChange; private Sunny.UI.UITextBox CustoNo; + private System.Windows.Forms.Label label21; private Sunny.UI.UITextBox CustoName; + private System.Windows.Forms.Label lblGetReceipts; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label24; - private Sunny.UI.UIDataGridView dgvSpendList; - private Sunny.UI.UIButton btnBalance; + private System.Windows.Forms.Label label17; + private System.Windows.Forms.Label label18; private Sunny.UI.UIComboBox cboCustoType; private Sunny.UI.UIComboBox cboPassportType; private Sunny.UI.UIComboBox cboCustoSex; @@ -1143,19 +1161,10 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column7; private System.Windows.Forms.DataGridViewTextBoxColumn Column9; private System.Windows.Forms.DataGridViewTextBoxColumn Column10; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; - private System.Windows.Forms.DataGridViewTextBoxColumn clPrice; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7; - private System.Windows.Forms.DataGridViewTextBoxColumn clSpendNo; - 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 System.Windows.Forms.DataGridViewTextBoxColumn Column8; + private Sunny.UI.UITabControlMenu uiTabControlMenu2; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.TabPage tabPage3; + private Sunny.UI.UITextBox txtReceipts; } } \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmCustoManager.cs b/SYS.FormUI/AppFunction/FrmCustoManager.cs index 5a700df..7872b31 100644 --- a/SYS.FormUI/AppFunction/FrmCustoManager.cs +++ b/SYS.FormUI/AppFunction/FrmCustoManager.cs @@ -95,7 +95,7 @@ namespace SYS.FormUI UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } - OSelectCustoAllDto custos = HttpHelper.JsonToModel(result.message); + OSelectAllDto custos = HttpHelper.JsonToModel>(result.message); this.btnPg.TotalCount = custos.total; this.dgvCustomerList.AutoGenerateColumns = false; this.dgvCustomerList.DataSource = custos.listSource; @@ -140,7 +140,7 @@ namespace SYS.FormUI { dgvCustomerList.ClearRows(); dgvCustomerList.AutoGenerateColumns = false; - OSelectCustoAllDto custos = new OSelectCustoAllDto(); + OSelectAllDto custos = new OSelectAllDto(); if (!txtCustoNo.Text.IsNullOrEmpty()) { dic = new Dictionary @@ -153,7 +153,7 @@ namespace SYS.FormUI UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } - custos = HttpHelper.JsonToModel(result.message); + custos = HttpHelper.JsonToModel>(result.message); } else if (!txtCustoName.Text.IsNullOrEmpty()) { @@ -167,7 +167,7 @@ namespace SYS.FormUI UIMessageBox.ShowError("SelectCustoByInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } - custos = HttpHelper.JsonToModel(result.message); + custos = HttpHelper.JsonToModel>(result.message); } else { @@ -177,7 +177,7 @@ namespace SYS.FormUI UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } - custos = HttpHelper.JsonToModel(result.message); + custos = HttpHelper.JsonToModel>(result.message); } dgvCustomerList.DataSource = custos; } @@ -215,7 +215,7 @@ namespace SYS.FormUI UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } - OSelectCustoAllDto custos = HttpHelper.JsonToModel(response.message); + 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 @@ -252,7 +252,7 @@ namespace SYS.FormUI UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } - OSelectCustoAllDto custos = HttpHelper.JsonToModel(result.message); + OSelectAllDto custos = HttpHelper.JsonToModel>(result.message); btnPg.TotalCount = custos.total; this.dgvCustomerList.AutoGenerateColumns = false; this.dgvCustomerList.DataSource = custos.listSource; diff --git a/SYS.FormUI/AppFunction/FrmCustomerManager.cs b/SYS.FormUI/AppFunction/FrmCustomerManager.cs index 594400e..edda17e 100644 --- a/SYS.FormUI/AppFunction/FrmCustomerManager.cs +++ b/SYS.FormUI/AppFunction/FrmCustomerManager.cs @@ -74,7 +74,7 @@ namespace SYS.FormUI UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } - OSelectCustoAllDto custos = HttpHelper.JsonToModel(result.message); + OSelectAllDto custos = HttpHelper.JsonToModel>(result.message); btnPg.TotalCount = custos.total; this.dgvCustomerList.AutoGenerateColumns = false; this.dgvCustomerList.DataSource = custos.listSource; @@ -118,7 +118,7 @@ namespace SYS.FormUI else { result = HttpHelper.Request("Custo/SelectCustoAll?pageIndex=1&pageSize=15"); - var listSource = HttpHelper.JsonToModel(result.message); + var listSource = HttpHelper.JsonToModel>(result.message); custos = listSource.listSource; } dgvCustomerList.DataSource = custos; @@ -178,7 +178,7 @@ namespace SYS.FormUI UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } - OSelectCustoAllDto custos = HttpHelper.JsonToModel(result.message); + OSelectAllDto custos = HttpHelper.JsonToModel>(result.message); this.btnPg.TotalCount = custos.total; this.dgvCustomerList.AutoGenerateColumns = false; this.dgvCustomerList.DataSource = custos.listSource; diff --git a/SYS.FormUI/AppFunction/FrmEducation.cs b/SYS.FormUI/AppFunction/FrmEducation.cs index 74f244d..d86e81d 100644 --- a/SYS.FormUI/AppFunction/FrmEducation.cs +++ b/SYS.FormUI/AppFunction/FrmEducation.cs @@ -122,6 +122,7 @@ namespace SYS.FormUI UIMessageTip.ShowError("UpdEducation+接口服务异常，请提交Issue或尝试更新版本！", 1500); return; } + ReloadEducationList(); } private void btnDeleteEducation_Click(object sender, EventArgs e) @@ -135,6 +136,7 @@ namespace SYS.FormUI { education_no = txtEducationNo.Text.Trim(), education_name = txtEducationName.Text.Trim(), + delete_mk = 1, datachg_usr = AdminInfo.Account, }; result = HttpHelper.Request("Base​/DelEducation", HttpHelper.ModelToJson(edu)); @@ -144,6 +146,7 @@ namespace SYS.FormUI return; } UIMessageTip.ShowOk("删除成功！"); + ReloadEducationList(); return; } diff --git a/SYS.FormUI/AppFunction/FrmMySpace.Designer.cs b/SYS.FormUI/AppFunction/FrmMySpace.Designer.cs index a9cd262..81f063e 100644 --- a/SYS.FormUI/AppFunction/FrmMySpace.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmMySpace.Designer.cs @@ -30,8 +30,6 @@ namespace SYS.FormUI private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMySpace)); - this.uiTabControlMenu1 = new Sunny.UI.UITabControlMenu(); - this.tpWorkerInfo = new System.Windows.Forms.TabPage(); this.label7 = new System.Windows.Forms.Label(); this.btnUpdWorker = new Sunny.UI.UIButton(); this.cbWorkerNation = new Sunny.UI.UIComboBox(); @@ -49,7 +47,6 @@ namespace SYS.FormUI this.label30 = new System.Windows.Forms.Label(); this.label31 = new System.Windows.Forms.Label(); this.label32 = new System.Windows.Forms.Label(); - this.tpSecurity = new System.Windows.Forms.TabPage(); this.btnUpdPwd = new Sunny.UI.UIButton(); this.lblNewMsg = new Sunny.UI.UILabel(); this.lblOldMsg = new Sunny.UI.UILabel(); @@ -59,68 +56,24 @@ namespace SYS.FormUI this.txtNewPwd = new Sunny.UI.UITextBox(); this.label4 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); - this.tpPhoto = new System.Windows.Forms.TabPage(); - this.uiLabel1 = new Sunny.UI.UILabel(); - this.picWorkerPic = new System.Windows.Forms.PictureBox(); this.openPic = new System.Windows.Forms.OpenFileDialog(); - this.uiTabControlMenu1.SuspendLayout(); - this.tpWorkerInfo.SuspendLayout(); - this.tpSecurity.SuspendLayout(); - this.tpPhoto.SuspendLayout(); + this.uiTabControlMenu2 = new Sunny.UI.UITabControlMenu(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.tabPage3 = new System.Windows.Forms.TabPage(); + this.picWorkerPic = new System.Windows.Forms.PictureBox(); + this.uiTabControlMenu2.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.tabPage2.SuspendLayout(); + this.tabPage3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.picWorkerPic)).BeginInit(); this.SuspendLayout(); // - // uiTabControlMenu1 - // - this.uiTabControlMenu1.Alignment = System.Windows.Forms.TabAlignment.Left; - this.uiTabControlMenu1.Controls.Add(this.tpWorkerInfo); - this.uiTabControlMenu1.Controls.Add(this.tpSecurity); - this.uiTabControlMenu1.Controls.Add(this.tpPhoto); - this.uiTabControlMenu1.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed; - this.uiTabControlMenu1.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiTabControlMenu1.ItemSize = new System.Drawing.Size(40, 200); - this.uiTabControlMenu1.Location = new System.Drawing.Point(3, 38); - this.uiTabControlMenu1.MenuStyle = Sunny.UI.UIMenuStyle.Custom; - this.uiTabControlMenu1.Multiline = true; - this.uiTabControlMenu1.Name = "uiTabControlMenu1"; - this.uiTabControlMenu1.SelectedIndex = 0; - this.uiTabControlMenu1.Size = new System.Drawing.Size(867, 546); - this.uiTabControlMenu1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; - this.uiTabControlMenu1.TabBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.uiTabControlMenu1.TabIndex = 14; - this.uiTabControlMenu1.TabSelectedColor = System.Drawing.Color.Snow; - // - // tpWorkerInfo - // - this.tpWorkerInfo.Controls.Add(this.label7); - this.tpWorkerInfo.Controls.Add(this.btnUpdWorker); - this.tpWorkerInfo.Controls.Add(this.cbWorkerNation); - this.tpWorkerInfo.Controls.Add(this.label1); - this.tpWorkerInfo.Controls.Add(this.cboWorkerClub); - this.tpWorkerInfo.Controls.Add(this.cboWorkerPosition); - this.tpWorkerInfo.Controls.Add(this.cboSex); - this.tpWorkerInfo.Controls.Add(this.txtWorkerNo); - this.tpWorkerInfo.Controls.Add(this.txtWorkerName); - this.tpWorkerInfo.Controls.Add(this.txtTel); - this.tpWorkerInfo.Controls.Add(this.txtAddress); - this.tpWorkerInfo.Controls.Add(this.label2); - this.tpWorkerInfo.Controls.Add(this.label5); - this.tpWorkerInfo.Controls.Add(this.label16); - this.tpWorkerInfo.Controls.Add(this.label30); - this.tpWorkerInfo.Controls.Add(this.label31); - this.tpWorkerInfo.Controls.Add(this.label32); - this.tpWorkerInfo.Location = new System.Drawing.Point(201, 0); - this.tpWorkerInfo.Name = "tpWorkerInfo"; - this.tpWorkerInfo.Size = new System.Drawing.Size(666, 546); - this.tpWorkerInfo.TabIndex = 1; - this.tpWorkerInfo.Text = "个人信息"; - this.tpWorkerInfo.UseVisualStyleBackColor = true; - // // label7 // this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(26, 168); + this.label7.Location = new System.Drawing.Point(58, 171); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(88, 25); this.label7.TabIndex = 131; @@ -130,13 +83,14 @@ namespace SYS.FormUI // this.btnUpdWorker.Cursor = System.Windows.Forms.Cursors.Hand; this.btnUpdWorker.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnUpdWorker.Location = new System.Drawing.Point(530, 267); + this.btnUpdWorker.Location = new System.Drawing.Point(562, 270); this.btnUpdWorker.MinimumSize = new System.Drawing.Size(1, 1); this.btnUpdWorker.Name = "btnUpdWorker"; this.btnUpdWorker.Radius = 20; this.btnUpdWorker.Size = new System.Drawing.Size(109, 42); this.btnUpdWorker.TabIndex = 130; this.btnUpdWorker.Text = "修 改"; + this.btnUpdWorker.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdWorker.Click += new System.EventHandler(this.btnUpdWorker_Click); // // cbWorkerNation @@ -145,7 +99,9 @@ namespace SYS.FormUI this.cbWorkerNation.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cbWorkerNation.FillColor = System.Drawing.Color.White; this.cbWorkerNation.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cbWorkerNation.Location = new System.Drawing.Point(434, 113); + this.cbWorkerNation.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); + this.cbWorkerNation.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.cbWorkerNation.Location = new System.Drawing.Point(466, 116); this.cbWorkerNation.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cbWorkerNation.MinimumSize = new System.Drawing.Size(63, 0); this.cbWorkerNation.Name = "cbWorkerNation"; @@ -153,15 +109,17 @@ namespace SYS.FormUI this.cbWorkerNation.Radius = 20; this.cbWorkerNation.Size = new System.Drawing.Size(203, 35); this.cbWorkerNation.Style = Sunny.UI.UIStyle.Custom; + this.cbWorkerNation.SymbolSize = 24; this.cbWorkerNation.TabIndex = 129; this.cbWorkerNation.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.cbWorkerNation.Watermark = ""; this.cbWorkerNation.SelectedIndexChanged += new System.EventHandler(this.cbWorkerNation_SelectedIndexChanged); // // 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(337, 116); + this.label1.Location = new System.Drawing.Point(369, 119); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(86, 25); this.label1.TabIndex = 128; @@ -173,7 +131,9 @@ namespace SYS.FormUI this.cboWorkerClub.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboWorkerClub.FillColor = System.Drawing.Color.White; this.cboWorkerClub.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cboWorkerClub.Location = new System.Drawing.Point(435, 9); + this.cboWorkerClub.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); + this.cboWorkerClub.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.cboWorkerClub.Location = new System.Drawing.Point(467, 12); this.cboWorkerClub.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboWorkerClub.MinimumSize = new System.Drawing.Size(63, 0); this.cboWorkerClub.Name = "cboWorkerClub"; @@ -182,6 +142,7 @@ namespace SYS.FormUI this.cboWorkerClub.ReadOnly = true; this.cboWorkerClub.Size = new System.Drawing.Size(203, 35); this.cboWorkerClub.Style = Sunny.UI.UIStyle.Custom; + this.cboWorkerClub.SymbolSize = 24; this.cboWorkerClub.TabIndex = 125; this.cboWorkerClub.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; this.cboWorkerClub.Watermark = ""; @@ -192,7 +153,9 @@ namespace SYS.FormUI this.cboWorkerPosition.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboWorkerPosition.FillColor = System.Drawing.Color.White; this.cboWorkerPosition.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cboWorkerPosition.Location = new System.Drawing.Point(435, 61); + this.cboWorkerPosition.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); + this.cboWorkerPosition.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.cboWorkerPosition.Location = new System.Drawing.Point(467, 64); this.cboWorkerPosition.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboWorkerPosition.MinimumSize = new System.Drawing.Size(63, 0); this.cboWorkerPosition.Name = "cboWorkerPosition"; @@ -201,8 +164,10 @@ namespace SYS.FormUI this.cboWorkerPosition.ReadOnly = true; this.cboWorkerPosition.Size = new System.Drawing.Size(203, 35); this.cboWorkerPosition.Style = Sunny.UI.UIStyle.Custom; + this.cboWorkerPosition.SymbolSize = 24; this.cboWorkerPosition.TabIndex = 124; this.cboWorkerPosition.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.cboWorkerPosition.Watermark = ""; // // cboSex // @@ -210,7 +175,9 @@ namespace SYS.FormUI this.cboSex.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboSex.FillColor = System.Drawing.Color.White; this.cboSex.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cboSex.Location = new System.Drawing.Point(123, 113); + this.cboSex.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); + this.cboSex.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.cboSex.Location = new System.Drawing.Point(155, 116); this.cboSex.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboSex.MinimumSize = new System.Drawing.Size(63, 0); this.cboSex.Name = "cboSex"; @@ -218,61 +185,59 @@ namespace SYS.FormUI this.cboSex.Radius = 20; this.cboSex.Size = new System.Drawing.Size(203, 35); this.cboSex.Style = Sunny.UI.UIStyle.Custom; + this.cboSex.SymbolSize = 24; this.cboSex.TabIndex = 123; this.cboSex.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.cboSex.Watermark = ""; // // txtWorkerNo // this.txtWorkerNo.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtWorkerNo.FillColor = System.Drawing.Color.White; this.txtWorkerNo.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtWorkerNo.Location = new System.Drawing.Point(124, 9); + this.txtWorkerNo.Location = new System.Drawing.Point(156, 12); this.txtWorkerNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtWorkerNo.Maximum = 2147483647D; - this.txtWorkerNo.Minimum = -2147483648D; this.txtWorkerNo.MinimumSize = new System.Drawing.Size(1, 1); this.txtWorkerNo.Name = "txtWorkerNo"; this.txtWorkerNo.Padding = new System.Windows.Forms.Padding(5); this.txtWorkerNo.Radius = 20; this.txtWorkerNo.ReadOnly = true; + this.txtWorkerNo.ShowText = false; this.txtWorkerNo.Size = new System.Drawing.Size(203, 35); this.txtWorkerNo.Style = Sunny.UI.UIStyle.Custom; this.txtWorkerNo.StyleCustomMode = true; this.txtWorkerNo.TabIndex = 122; this.txtWorkerNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtWorkerNo.Watermark = ""; // // txtWorkerName // this.txtWorkerName.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtWorkerName.FillColor = System.Drawing.Color.White; this.txtWorkerName.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtWorkerName.Location = new System.Drawing.Point(124, 61); + this.txtWorkerName.Location = new System.Drawing.Point(156, 64); this.txtWorkerName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtWorkerName.Maximum = 2147483647D; - this.txtWorkerName.Minimum = -2147483648D; this.txtWorkerName.MinimumSize = new System.Drawing.Size(1, 1); this.txtWorkerName.Name = "txtWorkerName"; this.txtWorkerName.Padding = new System.Windows.Forms.Padding(5); this.txtWorkerName.Radius = 20; + this.txtWorkerName.ShowText = false; this.txtWorkerName.Size = new System.Drawing.Size(203, 35); this.txtWorkerName.Style = Sunny.UI.UIStyle.Custom; this.txtWorkerName.StyleCustomMode = true; this.txtWorkerName.TabIndex = 121; this.txtWorkerName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtWorkerName.Watermark = ""; // // txtTel // this.txtTel.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtTel.FillColor = System.Drawing.Color.White; this.txtTel.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtTel.Location = new System.Drawing.Point(124, 161); + this.txtTel.Location = new System.Drawing.Point(156, 164); this.txtTel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtTel.Maximum = 2147483647D; - this.txtTel.Minimum = -2147483648D; this.txtTel.MinimumSize = new System.Drawing.Size(1, 1); this.txtTel.Name = "txtTel"; this.txtTel.Padding = new System.Windows.Forms.Padding(5); this.txtTel.Radius = 20; + this.txtTel.ShowText = false; this.txtTel.Size = new System.Drawing.Size(515, 35); this.txtTel.Style = Sunny.UI.UIStyle.Custom; this.txtTel.StyleCustomMode = true; @@ -283,27 +248,26 @@ namespace SYS.FormUI // txtAddress // this.txtAddress.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtAddress.FillColor = System.Drawing.Color.White; this.txtAddress.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtAddress.Location = new System.Drawing.Point(124, 213); + this.txtAddress.Location = new System.Drawing.Point(156, 216); this.txtAddress.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtAddress.Maximum = 2147483647D; - this.txtAddress.Minimum = -2147483648D; this.txtAddress.MinimumSize = new System.Drawing.Size(1, 1); this.txtAddress.Name = "txtAddress"; this.txtAddress.Padding = new System.Windows.Forms.Padding(5); this.txtAddress.Radius = 20; + this.txtAddress.ShowText = false; this.txtAddress.Size = new System.Drawing.Size(515, 35); this.txtAddress.Style = Sunny.UI.UIStyle.Custom; this.txtAddress.StyleCustomMode = true; this.txtAddress.TabIndex = 117; this.txtAddress.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtAddress.Watermark = ""; // // 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(26, 218); + this.label2.Location = new System.Drawing.Point(58, 221); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(88, 25); this.label2.TabIndex = 115; @@ -313,7 +277,7 @@ namespace SYS.FormUI // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(337, 66); + this.label5.Location = new System.Drawing.Point(369, 69); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(88, 25); this.label5.TabIndex = 112; @@ -323,7 +287,7 @@ namespace SYS.FormUI // this.label16.AutoSize = true; this.label16.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label16.Location = new System.Drawing.Point(337, 15); + this.label16.Location = new System.Drawing.Point(369, 18); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(88, 25); this.label16.TabIndex = 111; @@ -333,7 +297,7 @@ namespace SYS.FormUI // this.label30.AutoSize = true; this.label30.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label30.Location = new System.Drawing.Point(26, 116); + this.label30.Location = new System.Drawing.Point(58, 119); this.label30.Name = "label30"; this.label30.Size = new System.Drawing.Size(86, 25); this.label30.TabIndex = 109; @@ -343,7 +307,7 @@ namespace SYS.FormUI // this.label31.AutoSize = true; this.label31.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label31.Location = new System.Drawing.Point(26, 66); + this.label31.Location = new System.Drawing.Point(58, 69); this.label31.Name = "label31"; this.label31.Size = new System.Drawing.Size(88, 25); this.label31.TabIndex = 108; @@ -353,48 +317,31 @@ namespace SYS.FormUI // this.label32.AutoSize = true; this.label32.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label32.Location = new System.Drawing.Point(26, 15); + this.label32.Location = new System.Drawing.Point(58, 18); this.label32.Name = "label32"; this.label32.Size = new System.Drawing.Size(88, 25); this.label32.TabIndex = 107; this.label32.Text = "员工编号"; // - // tpSecurity - // - this.tpSecurity.Controls.Add(this.btnUpdPwd); - this.tpSecurity.Controls.Add(this.lblNewMsg); - this.tpSecurity.Controls.Add(this.lblOldMsg); - this.tpSecurity.Controls.Add(this.lgCheckNewPwd); - this.tpSecurity.Controls.Add(this.lgCheckOldPwd); - this.tpSecurity.Controls.Add(this.txtOldPwd); - this.tpSecurity.Controls.Add(this.txtNewPwd); - this.tpSecurity.Controls.Add(this.label4); - this.tpSecurity.Controls.Add(this.label6); - this.tpSecurity.Location = new System.Drawing.Point(201, 0); - this.tpSecurity.Name = "tpSecurity"; - this.tpSecurity.Size = new System.Drawing.Size(666, 546); - this.tpSecurity.TabIndex = 2; - this.tpSecurity.Text = "账号安全"; - this.tpSecurity.UseVisualStyleBackColor = true; - this.tpSecurity.Click += new System.EventHandler(this.tpSecurity_Click); - // // btnUpdPwd // this.btnUpdPwd.Cursor = System.Windows.Forms.Cursors.Hand; this.btnUpdPwd.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnUpdPwd.Location = new System.Drawing.Point(244, 260); + this.btnUpdPwd.Location = new System.Drawing.Point(277, 251); this.btnUpdPwd.MinimumSize = new System.Drawing.Size(1, 1); this.btnUpdPwd.Name = "btnUpdPwd"; this.btnUpdPwd.Radius = 20; this.btnUpdPwd.Size = new System.Drawing.Size(175, 42); this.btnUpdPwd.TabIndex = 131; this.btnUpdPwd.Text = "修 改"; + this.btnUpdPwd.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdPwd.Click += new System.EventHandler(this.btnUpdPwd_Click); // // lblNewMsg // this.lblNewMsg.Font = new System.Drawing.Font("微软雅黑", 12F); - this.lblNewMsg.Location = new System.Drawing.Point(209, 196); + this.lblNewMsg.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + this.lblNewMsg.Location = new System.Drawing.Point(242, 187); this.lblNewMsg.Name = "lblNewMsg"; this.lblNewMsg.Size = new System.Drawing.Size(267, 23); this.lblNewMsg.Style = Sunny.UI.UIStyle.Custom; @@ -404,7 +351,8 @@ namespace SYS.FormUI // lblOldMsg // this.lblOldMsg.Font = new System.Drawing.Font("微软雅黑", 12F); - this.lblOldMsg.Location = new System.Drawing.Point(209, 105); + this.lblOldMsg.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + this.lblOldMsg.Location = new System.Drawing.Point(242, 96); this.lblOldMsg.Name = "lblOldMsg"; this.lblOldMsg.Size = new System.Drawing.Size(267, 23); this.lblOldMsg.Style = Sunny.UI.UIStyle.Custom; @@ -415,7 +363,7 @@ namespace SYS.FormUI // this.lgCheckNewPwd.CenterColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(248)))), ((int)(((byte)(232))))); this.lgCheckNewPwd.Font = new System.Drawing.Font("微软雅黑", 12F); - this.lgCheckNewPwd.Location = new System.Drawing.Point(499, 144); + this.lgCheckNewPwd.Location = new System.Drawing.Point(532, 135); this.lgCheckNewPwd.MinimumSize = new System.Drawing.Size(1, 1); this.lgCheckNewPwd.Name = "lgCheckNewPwd"; this.lgCheckNewPwd.OnCenterColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(248)))), ((int)(((byte)(232))))); @@ -429,7 +377,7 @@ namespace SYS.FormUI // this.lgCheckOldPwd.CenterColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(248)))), ((int)(((byte)(232))))); this.lgCheckOldPwd.Font = new System.Drawing.Font("微软雅黑", 12F); - this.lgCheckOldPwd.Location = new System.Drawing.Point(499, 56); + this.lgCheckOldPwd.Location = new System.Drawing.Point(532, 47); this.lgCheckOldPwd.MinimumSize = new System.Drawing.Size(1, 1); this.lgCheckOldPwd.Name = "lgCheckOldPwd"; this.lgCheckOldPwd.OnCenterColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(248)))), ((int)(((byte)(232))))); @@ -442,51 +390,49 @@ namespace SYS.FormUI // txtOldPwd // this.txtOldPwd.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtOldPwd.FillColor = System.Drawing.Color.White; this.txtOldPwd.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtOldPwd.Location = new System.Drawing.Point(204, 56); + this.txtOldPwd.Location = new System.Drawing.Point(237, 47); this.txtOldPwd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtOldPwd.Maximum = 2147483647D; - this.txtOldPwd.Minimum = -2147483648D; this.txtOldPwd.MinimumSize = new System.Drawing.Size(1, 1); this.txtOldPwd.Name = "txtOldPwd"; this.txtOldPwd.Padding = new System.Windows.Forms.Padding(5); this.txtOldPwd.PasswordChar = '*'; this.txtOldPwd.Radius = 20; + this.txtOldPwd.ShowText = false; this.txtOldPwd.Size = new System.Drawing.Size(272, 35); this.txtOldPwd.Style = Sunny.UI.UIStyle.Custom; this.txtOldPwd.StyleCustomMode = true; this.txtOldPwd.TabIndex = 126; this.txtOldPwd.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtOldPwd.Watermark = ""; this.txtOldPwd.Validated += new System.EventHandler(this.txtOldPwd_Validated); this.txtOldPwd.TextChanged += new System.EventHandler(this.txtOldPwd_TextChanged); // // txtNewPwd // this.txtNewPwd.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtNewPwd.FillColor = System.Drawing.Color.White; this.txtNewPwd.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtNewPwd.Location = new System.Drawing.Point(204, 144); + this.txtNewPwd.Location = new System.Drawing.Point(237, 135); this.txtNewPwd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtNewPwd.Maximum = 2147483647D; - this.txtNewPwd.Minimum = -2147483648D; this.txtNewPwd.MinimumSize = new System.Drawing.Size(1, 1); this.txtNewPwd.Name = "txtNewPwd"; this.txtNewPwd.Padding = new System.Windows.Forms.Padding(5); this.txtNewPwd.PasswordChar = '*'; this.txtNewPwd.Radius = 20; + this.txtNewPwd.ShowText = false; this.txtNewPwd.Size = new System.Drawing.Size(272, 35); this.txtNewPwd.Style = Sunny.UI.UIStyle.Custom; this.txtNewPwd.StyleCustomMode = true; this.txtNewPwd.TabIndex = 125; this.txtNewPwd.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtNewPwd.Watermark = ""; this.txtNewPwd.Validated += new System.EventHandler(this.txtNewPwd_Validated); // // 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(128, 148); + this.label4.Location = new System.Drawing.Point(161, 139); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(69, 25); this.label4.TabIndex = 124; @@ -496,83 +442,124 @@ namespace SYS.FormUI // 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(128, 60); + this.label6.Location = new System.Drawing.Point(161, 51); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(69, 25); this.label6.TabIndex = 123; this.label6.Text = "旧密码"; // - // tpPhoto - // - this.tpPhoto.Controls.Add(this.uiLabel1); - this.tpPhoto.Controls.Add(this.picWorkerPic); - this.tpPhoto.Location = new System.Drawing.Point(201, 0); - this.tpPhoto.Name = "tpPhoto"; - this.tpPhoto.Size = new System.Drawing.Size(666, 546); - this.tpPhoto.TabIndex = 3; - this.tpPhoto.Text = "我的头像"; - this.tpPhoto.UseVisualStyleBackColor = true; - // - // uiLabel1 - // - this.uiLabel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiLabel1.ForeColor = System.Drawing.Color.Red; - this.uiLabel1.Location = new System.Drawing.Point(128, 400); - this.uiLabel1.Name = "uiLabel1"; - this.uiLabel1.Size = new System.Drawing.Size(410, 23); - this.uiLabel1.Style = Sunny.UI.UIStyle.Custom; - this.uiLabel1.TabIndex = 57; - this.uiLabel1.Text = "点击上方头像框即可更换头像，记得不要超过2MB哦~"; - this.uiLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // picWorkerPic - // - this.picWorkerPic.BackColor = System.Drawing.Color.Transparent; - this.picWorkerPic.BackgroundImage = global::SYS.FormUI.Properties.Resources.上传照片; - this.picWorkerPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.picWorkerPic.Location = new System.Drawing.Point(250, 35); - this.picWorkerPic.Name = "picWorkerPic"; - this.picWorkerPic.Size = new System.Drawing.Size(167, 211); - this.picWorkerPic.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.picWorkerPic.TabIndex = 56; - this.picWorkerPic.TabStop = false; - this.picWorkerPic.Click += new System.EventHandler(this.picWorkerPic_Click); - // // openPic // this.openPic.FileName = "openFileDialog1"; this.openPic.Filter = "PNG文件|*.png|JPG文件|*.jpg|位图文件|*.bmp"; this.openPic.FileOk += new System.ComponentModel.CancelEventHandler(this.openPic_FileOk); // + // uiTabControlMenu2 + // + this.uiTabControlMenu2.Alignment = System.Windows.Forms.TabAlignment.Left; + this.uiTabControlMenu2.Controls.Add(this.tabPage1); + this.uiTabControlMenu2.Controls.Add(this.tabPage2); + this.uiTabControlMenu2.Controls.Add(this.tabPage3); + this.uiTabControlMenu2.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed; + this.uiTabControlMenu2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiTabControlMenu2.Location = new System.Drawing.Point(3, 38); + this.uiTabControlMenu2.MenuStyle = Sunny.UI.UIMenuStyle.Custom; + this.uiTabControlMenu2.Multiline = true; + this.uiTabControlMenu2.Name = "uiTabControlMenu2"; + this.uiTabControlMenu2.SelectedIndex = 0; + this.uiTabControlMenu2.Size = new System.Drawing.Size(929, 546); + this.uiTabControlMenu2.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; + this.uiTabControlMenu2.TabBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.uiTabControlMenu2.TabIndex = 15; + this.uiTabControlMenu2.TabSelectedColor = System.Drawing.Color.Snow; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.label7); + this.tabPage1.Controls.Add(this.label32); + this.tabPage1.Controls.Add(this.btnUpdWorker); + this.tabPage1.Controls.Add(this.label31); + this.tabPage1.Controls.Add(this.cbWorkerNation); + this.tabPage1.Controls.Add(this.label30); + this.tabPage1.Controls.Add(this.label1); + this.tabPage1.Controls.Add(this.label16); + this.tabPage1.Controls.Add(this.cboWorkerClub); + this.tabPage1.Controls.Add(this.label5); + this.tabPage1.Controls.Add(this.cboWorkerPosition); + this.tabPage1.Controls.Add(this.label2); + this.tabPage1.Controls.Add(this.cboSex); + this.tabPage1.Controls.Add(this.txtAddress); + this.tabPage1.Controls.Add(this.txtWorkerNo); + this.tabPage1.Controls.Add(this.txtTel); + this.tabPage1.Controls.Add(this.txtWorkerName); + this.tabPage1.Location = new System.Drawing.Point(201, 0); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Size = new System.Drawing.Size(728, 546); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "个人信息"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.btnUpdPwd); + this.tabPage2.Controls.Add(this.label6); + this.tabPage2.Controls.Add(this.lblNewMsg); + this.tabPage2.Controls.Add(this.label4); + this.tabPage2.Controls.Add(this.lblOldMsg); + this.tabPage2.Controls.Add(this.txtNewPwd); + this.tabPage2.Controls.Add(this.lgCheckNewPwd); + this.tabPage2.Controls.Add(this.txtOldPwd); + this.tabPage2.Controls.Add(this.lgCheckOldPwd); + this.tabPage2.Location = new System.Drawing.Point(201, 0); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Size = new System.Drawing.Size(728, 546); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "账号安全"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // tabPage3 + // + this.tabPage3.Controls.Add(this.picWorkerPic); + this.tabPage3.Location = new System.Drawing.Point(201, 0); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Size = new System.Drawing.Size(728, 546); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "账号头像"; + this.tabPage3.UseVisualStyleBackColor = true; + // + // picWorkerPic + // + this.picWorkerPic.Location = new System.Drawing.Point(286, 62); + this.picWorkerPic.Name = "picWorkerPic"; + this.picWorkerPic.Size = new System.Drawing.Size(157, 179); + this.picWorkerPic.TabIndex = 0; + this.picWorkerPic.TabStop = false; + // // FrmMySpace // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 587); - this.Controls.Add(this.uiTabControlMenu1); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.ClientSize = new System.Drawing.Size(937, 589); + this.Controls.Add(this.uiTabControlMenu2); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmMySpace"; - this.ShowIcon = true; this.ShowTitleIcon = true; this.Text = "个人中心"; + this.ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 873, 587); this.Load += new System.EventHandler(this.FrmMySpace_Load); - this.uiTabControlMenu1.ResumeLayout(false); - this.tpWorkerInfo.ResumeLayout(false); - this.tpWorkerInfo.PerformLayout(); - this.tpSecurity.ResumeLayout(false); - this.tpSecurity.PerformLayout(); - this.tpPhoto.ResumeLayout(false); + this.uiTabControlMenu2.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.tabPage1.PerformLayout(); + this.tabPage2.ResumeLayout(false); + this.tabPage2.PerformLayout(); + this.tabPage3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.picWorkerPic)).EndInit(); this.ResumeLayout(false); } #endregion - - private Sunny.UI.UITabControlMenu uiTabControlMenu1; - private System.Windows.Forms.TabPage tpWorkerInfo; private Sunny.UI.UIComboBox cbWorkerNation; private System.Windows.Forms.Label label1; private Sunny.UI.UIComboBox cboWorkerClub; @@ -588,7 +575,6 @@ namespace SYS.FormUI private System.Windows.Forms.Label label30; private System.Windows.Forms.Label label31; private System.Windows.Forms.Label label32; - private System.Windows.Forms.TabPage tpSecurity; private Sunny.UI.UITextBox txtOldPwd; private Sunny.UI.UITextBox txtNewPwd; private System.Windows.Forms.Label label4; @@ -600,9 +586,11 @@ namespace SYS.FormUI private Sunny.UI.UILabel lblNewMsg; private Sunny.UI.UIButton btnUpdPwd; private System.Windows.Forms.Label label7; - private System.Windows.Forms.TabPage tpPhoto; - private Sunny.UI.UILabel uiLabel1; - private System.Windows.Forms.PictureBox picWorkerPic; private System.Windows.Forms.OpenFileDialog openPic; + private Sunny.UI.UITabControlMenu uiTabControlMenu2; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.TabPage tabPage3; + private System.Windows.Forms.PictureBox picWorkerPic; } } \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmNation.cs b/SYS.FormUI/AppFunction/FrmNation.cs index 747263e..2fb82f7 100644 --- a/SYS.FormUI/AppFunction/FrmNation.cs +++ b/SYS.FormUI/AppFunction/FrmNation.cs @@ -132,6 +132,7 @@ namespace SYS.FormUI { nation_no = txtNationNo.Text.Trim(), nation_name = txtNationName.Text.Trim(), + delete_mk = 1, datachg_usr = AdminInfo.Account, }; result = HttpHelper.Request("Base​/DelNation", HttpHelper.ModelToJson(nat)); @@ -141,6 +142,7 @@ namespace SYS.FormUI return; } UIMessageTip.ShowOk("删除成功！"); + ReloadNationList(); return; } @@ -176,6 +178,7 @@ namespace SYS.FormUI UIMessageTip.ShowError("UpdNation+接口服务异常，请提交Issue或尝试更新版本！", 1500); return; } + ReloadNationList(); } } } diff --git a/SYS.FormUI/AppFunction/FrmNotice.Designer.cs b/SYS.FormUI/AppFunction/FrmNotice.Designer.cs index 75bb832..19cb27a 100644 --- a/SYS.FormUI/AppFunction/FrmNotice.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmNotice.Designer.cs @@ -59,22 +59,22 @@ namespace SYS.FormUI // this.dgvNoticeList.FillColor = System.Drawing.Color.White; this.dgvNoticeList.Font = new System.Drawing.Font("微软雅黑", 12F); - this.dgvNoticeList.FormatString = ""; + this.dgvNoticeList.HoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); this.dgvNoticeList.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.dgvNoticeList.Location = new System.Drawing.Point(4, 84); this.dgvNoticeList.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dgvNoticeList.MinimumSize = new System.Drawing.Size(1, 1); this.dgvNoticeList.Name = "dgvNoticeList"; this.dgvNoticeList.Padding = new System.Windows.Forms.Padding(2); + this.dgvNoticeList.ShowText = false; this.dgvNoticeList.Size = new System.Drawing.Size(195, 534); this.dgvNoticeList.TabIndex = 113; this.dgvNoticeList.Text = "uiListBox1"; - //this.dgvNoticeList.ItemClick += new System.EventHandler(this.dgvNoticeList_ItemClick); + this.dgvNoticeList.Click += new System.EventHandler(this.dgvNoticeList_ItemClick); // // FrmNotice // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(1005, 623); this.ControlBox = false; this.Controls.Add(this.dgvNoticeList); @@ -84,9 +84,9 @@ namespace SYS.FormUI this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmNotice"; - this.ShowIcon = true; this.ShowTitleIcon = true; this.Text = "历史公告"; + this.ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 1005, 623); this.Load += new System.EventHandler(this.FrmNotice_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/SYS.FormUI/AppFunction/FrmOperation.Designer.cs b/SYS.FormUI/AppFunction/FrmOperation.Designer.cs index d8cc029..07684b9 100644 --- a/SYS.FormUI/AppFunction/FrmOperation.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmOperation.Designer.cs @@ -46,6 +46,7 @@ this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.clOperationLevel = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btnPg = new Sunny.UI.UIPagination(); ((System.ComponentModel.ISupportInitialize)(this.dgvOperationlog)).BeginInit(); this.SuspendLayout(); // @@ -113,6 +114,7 @@ this.dgvOperationlog.SelectedIndex = -1; this.dgvOperationlog.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dgvOperationlog.Size = new System.Drawing.Size(998, 522); + this.dgvOperationlog.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.dgvOperationlog.TabIndex = 1; // // clOperationTime @@ -209,21 +211,38 @@ this.Column6.ReadOnly = true; this.Column6.Visible = false; // + // btnPg + // + this.btnPg.ButtonInterval = 5; + this.btnPg.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnPg.Location = new System.Drawing.Point(4, 575); + 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(997, 34); + 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); + // // FrmOperation // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + 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.btnPg); this.Controls.Add(this.dgvOperationlog); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmOperation"; - this.ShowIcon = true; this.ShowTitleIcon = true; this.Text = "员工操作日志"; + this.ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 1005, 623); this.Load += new System.EventHandler(this.FrmOperation_Load); ((System.ComponentModel.ISupportInitialize)(this.dgvOperationlog)).EndInit(); this.ResumeLayout(false); @@ -244,5 +263,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column5; private System.Windows.Forms.DataGridViewTextBoxColumn clOperationLevel; private System.Windows.Forms.DataGridViewTextBoxColumn Column6; + private Sunny.UI.UIPagination btnPg; } } \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmOperation.cs b/SYS.FormUI/AppFunction/FrmOperation.cs index 42eb91a..0a260d5 100644 --- a/SYS.FormUI/AppFunction/FrmOperation.cs +++ b/SYS.FormUI/AppFunction/FrmOperation.cs @@ -41,14 +41,46 @@ namespace SYS.FormUI private void FrmOperation_Load(object sender, EventArgs e) { - result = HttpHelper.Request("App/SelectOperationlogAll"); + this.btnPg.PageSize = 15; + LoadOperationLog(); + } + + private void LoadOperationLog() + { + dic = new Dictionary() + { + { "pageIndex","1"}, + { "pageSize","15"} + }; + result = HttpHelper.Request("App/SelectOperationlogAll", null, dic); + if (result.statusCode != 200) + { + UIMessageBox.ShowError("SelectOperationlogAll+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + OSelectAllDto custos = HttpHelper.JsonToModel>(result.message); + this.btnPg.TotalCount = custos.total; + this.dgvOperationlog.AutoGenerateColumns = false; + this.dgvOperationlog.DataSource = custos.listSource; + } + + private void btnPg_PageChanged(object sender, object pagingSource, int pageIndex, int count) + { + dic = new Dictionary() + { + { "pageIndex",pageIndex.ToString()}, + { "pageSize",count.ToString()} + }; + result = HttpHelper.Request("App/SelectOperationlogAll", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("SelectOperationlogAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } - dgvOperationlog.AutoGenerateColumns = false; - dgvOperationlog.DataSource = HttpHelper.JsonToList(result.message); + OSelectAllDto custos = HttpHelper.JsonToModel>(result.message); + this.btnPg.TotalCount = custos.total; + this.dgvOperationlog.AutoGenerateColumns = false; + this.dgvOperationlog.DataSource = custos.listSource; } } } diff --git a/SYS.FormUI/AppFunction/FrmRoomConfig.Designer.cs b/SYS.FormUI/AppFunction/FrmRoomConfig.Designer.cs new file mode 100644 index 0000000..942c460 --- /dev/null +++ b/SYS.FormUI/AppFunction/FrmRoomConfig.Designer.cs @@ -0,0 +1,406 @@ +namespace SYS.FormUI.AppFunction +{ + partial class FrmRoomConfig + { + /// + /// 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(FrmRoomConfig)); + this.btnDeleteRoomType = new Sunny.UI.UIButton(); + this.btnUpdateRoomType = new Sunny.UI.UIButton(); + this.btnAddRoomType = new Sunny.UI.UIButton(); + this.label7 = new System.Windows.Forms.Label(); + this.txtRoomTypeName = new Sunny.UI.UITextBox(); + this.label20 = new System.Windows.Forms.Label(); + this.txtRoomTypeId = new Sunny.UI.UITextBox(); + this.dgvRoomTypeList = new Sunny.UI.UIDataGridView(); + this.label1 = new System.Windows.Forms.Label(); + this.dudRent = new Sunny.UI.UIDoubleUpDown(); + this.label2 = new System.Windows.Forms.Label(); + this.dudDeposit = new Sunny.UI.UIDoubleUpDown(); + this.clRoomType = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clRoomTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clRoomRent = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clRoomDeposit = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clDeleteMk = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clDeleteMark = 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.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dgvRoomTypeList)).BeginInit(); + this.SuspendLayout(); + // + // btnDeleteRoomType + // + this.btnDeleteRoomType.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnDeleteRoomType.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnDeleteRoomType.Location = new System.Drawing.Point(821, 519); + this.btnDeleteRoomType.MinimumSize = new System.Drawing.Size(1, 1); + this.btnDeleteRoomType.Name = "btnDeleteRoomType"; + this.btnDeleteRoomType.Radius = 20; + this.btnDeleteRoomType.Size = new System.Drawing.Size(165, 33); + this.btnDeleteRoomType.TabIndex = 206; + this.btnDeleteRoomType.Text = "删除状态"; + this.btnDeleteRoomType.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnDeleteRoomType.Click += new System.EventHandler(this.btnDeleteRoomType_Click); + // + // btnUpdateRoomType + // + this.btnUpdateRoomType.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnUpdateRoomType.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnUpdateRoomType.Location = new System.Drawing.Point(821, 470); + this.btnUpdateRoomType.MinimumSize = new System.Drawing.Size(1, 1); + this.btnUpdateRoomType.Name = "btnUpdateRoomType"; + this.btnUpdateRoomType.Radius = 20; + this.btnUpdateRoomType.Size = new System.Drawing.Size(165, 33); + this.btnUpdateRoomType.TabIndex = 205; + this.btnUpdateRoomType.Text = "更新状态"; + this.btnUpdateRoomType.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnUpdateRoomType.Click += new System.EventHandler(this.btnUpdateRoomType_Click); + // + // btnAddRoomType + // + this.btnAddRoomType.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnAddRoomType.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnAddRoomType.Location = new System.Drawing.Point(821, 421); + this.btnAddRoomType.MinimumSize = new System.Drawing.Size(1, 1); + this.btnAddRoomType.Name = "btnAddRoomType"; + this.btnAddRoomType.Radius = 20; + this.btnAddRoomType.Size = new System.Drawing.Size(165, 33); + this.btnAddRoomType.TabIndex = 204; + this.btnAddRoomType.Text = "新增状态"; + this.btnAddRoomType.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnAddRoomType.Click += new System.EventHandler(this.btnAddRoomType_Click); + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label7.Location = new System.Drawing.Point(859, 169); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(85, 19); + this.label7.TabIndex = 203; + this.label7.Text = "状态描述"; + // + // txtRoomTypeName + // + this.txtRoomTypeName.Cursor = System.Windows.Forms.Cursors.IBeam; + this.txtRoomTypeName.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtRoomTypeName.Location = new System.Drawing.Point(821, 204); + this.txtRoomTypeName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txtRoomTypeName.MinimumSize = new System.Drawing.Size(1, 1); + this.txtRoomTypeName.Name = "txtRoomTypeName"; + this.txtRoomTypeName.Padding = new System.Windows.Forms.Padding(5); + this.txtRoomTypeName.Radius = 20; + this.txtRoomTypeName.ShowText = false; + this.txtRoomTypeName.Size = new System.Drawing.Size(165, 29); + this.txtRoomTypeName.Style = Sunny.UI.UIStyle.Custom; + this.txtRoomTypeName.StyleCustomMode = true; + this.txtRoomTypeName.TabIndex = 202; + this.txtRoomTypeName.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; + this.txtRoomTypeName.Watermark = ""; + // + // label20 + // + this.label20.AutoSize = true; + this.label20.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label20.Location = new System.Drawing.Point(859, 89); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(85, 19); + this.label20.TabIndex = 201; + this.label20.Text = "状态编码"; + // + // txtRoomTypeId + // + this.txtRoomTypeId.Cursor = System.Windows.Forms.Cursors.IBeam; + this.txtRoomTypeId.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtRoomTypeId.Location = new System.Drawing.Point(821, 124); + this.txtRoomTypeId.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txtRoomTypeId.MinimumSize = new System.Drawing.Size(1, 1); + this.txtRoomTypeId.Name = "txtRoomTypeId"; + this.txtRoomTypeId.Padding = new System.Windows.Forms.Padding(5); + this.txtRoomTypeId.Radius = 20; + this.txtRoomTypeId.ShowText = false; + this.txtRoomTypeId.Size = new System.Drawing.Size(165, 29); + this.txtRoomTypeId.Style = Sunny.UI.UIStyle.Custom; + this.txtRoomTypeId.StyleCustomMode = true; + this.txtRoomTypeId.TabIndex = 200; + this.txtRoomTypeId.Text = "0"; + this.txtRoomTypeId.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; + this.txtRoomTypeId.Type = Sunny.UI.UITextBox.UIEditType.Integer; + this.txtRoomTypeId.Watermark = ""; + // + // dgvRoomTypeList + // + this.dgvRoomTypeList.AllowUserToAddRows = false; + this.dgvRoomTypeList.AllowUserToDeleteRows = false; + this.dgvRoomTypeList.AllowUserToResizeColumns = false; + this.dgvRoomTypeList.AllowUserToResizeRows = false; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.dgvRoomTypeList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dgvRoomTypeList.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dgvRoomTypeList.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.dgvRoomTypeList.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.dgvRoomTypeList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.dgvRoomTypeList.ColumnHeadersHeight = 32; + this.dgvRoomTypeList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.dgvRoomTypeList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.clRoomType, + this.clRoomTypeName, + this.clRoomRent, + this.clRoomDeposit, + this.clDeleteMk, + this.clDeleteMark, + this.Column2, + this.Column3, + this.Column4, + this.Column5}); + 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.dgvRoomTypeList.DefaultCellStyle = dataGridViewCellStyle3; + this.dgvRoomTypeList.EnableHeadersVisualStyles = false; + this.dgvRoomTypeList.Font = new System.Drawing.Font("微软雅黑", 12F); + this.dgvRoomTypeList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); + this.dgvRoomTypeList.Location = new System.Drawing.Point(3, 38); + this.dgvRoomTypeList.MultiSelect = false; + this.dgvRoomTypeList.Name = "dgvRoomTypeList"; + this.dgvRoomTypeList.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.dgvRoomTypeList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; + this.dgvRoomTypeList.RowHeadersVisible = false; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; + this.dgvRoomTypeList.RowsDefaultCellStyle = dataGridViewCellStyle5; + this.dgvRoomTypeList.RowTemplate.Height = 29; + this.dgvRoomTypeList.SelectedIndex = -1; + this.dgvRoomTypeList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dgvRoomTypeList.Size = new System.Drawing.Size(788, 582); + this.dgvRoomTypeList.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.dgvRoomTypeList.TabIndex = 199; + this.dgvRoomTypeList.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvRoomTypeList_CellMouseClick); + // + // 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(859, 249); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(85, 19); + this.label1.TabIndex = 208; + this.label1.Text = "租金配置"; + // + // dudRent + // + this.dudRent.Font = new System.Drawing.Font("微软雅黑", 15.75F); + this.dudRent.Location = new System.Drawing.Point(821, 284); + this.dudRent.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.dudRent.MinimumSize = new System.Drawing.Size(100, 0); + this.dudRent.Name = "dudRent"; + this.dudRent.Radius = 20; + this.dudRent.ShowText = false; + this.dudRent.Size = new System.Drawing.Size(165, 35); + this.dudRent.Step = 1D; + this.dudRent.TabIndex = 209; + this.dudRent.Text = null; + this.dudRent.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; + // + // 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(859, 335); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(85, 19); + this.label2.TabIndex = 210; + this.label2.Text = "押金配置"; + // + // dudDeposit + // + this.dudDeposit.Font = new System.Drawing.Font("微软雅黑", 15.75F); + this.dudDeposit.Location = new System.Drawing.Point(821, 370); + this.dudDeposit.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.dudDeposit.MinimumSize = new System.Drawing.Size(100, 0); + this.dudDeposit.Name = "dudDeposit"; + this.dudDeposit.Radius = 20; + this.dudDeposit.ShowText = false; + this.dudDeposit.Size = new System.Drawing.Size(165, 35); + this.dudDeposit.Step = 1D; + this.dudDeposit.TabIndex = 211; + this.dudDeposit.Text = null; + this.dudDeposit.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; + // + // clRoomType + // + this.clRoomType.DataPropertyName = "Roomtype"; + this.clRoomType.HeaderText = "状态编码"; + this.clRoomType.Name = "clRoomType"; + this.clRoomType.ReadOnly = true; + // + // clRoomTypeName + // + this.clRoomTypeName.DataPropertyName = "RoomName"; + this.clRoomTypeName.HeaderText = "状态描述"; + this.clRoomTypeName.Name = "clRoomTypeName"; + this.clRoomTypeName.ReadOnly = true; + // + // clRoomRent + // + this.clRoomRent.DataPropertyName = "RoomRent"; + this.clRoomRent.HeaderText = "租金"; + this.clRoomRent.Name = "clRoomRent"; + this.clRoomRent.ReadOnly = true; + // + // clRoomDeposit + // + this.clRoomDeposit.DataPropertyName = "RoomDeposit"; + this.clRoomDeposit.HeaderText = "押金"; + this.clRoomDeposit.Name = "clRoomDeposit"; + this.clRoomDeposit.ReadOnly = true; + // + // clDeleteMk + // + this.clDeleteMk.DataPropertyName = "DeleteMkNm"; + this.clDeleteMk.HeaderText = "删除标记"; + this.clDeleteMk.Name = "clDeleteMk"; + this.clDeleteMk.ReadOnly = true; + // + // clDeleteMark + // + this.clDeleteMark.DataPropertyName = "delete_mk"; + this.clDeleteMark.HeaderText = "Column1"; + this.clDeleteMark.Name = "clDeleteMark"; + this.clDeleteMark.ReadOnly = true; + this.clDeleteMark.Visible = false; + // + // Column2 + // + this.Column2.DataPropertyName = "datains_usr"; + this.Column2.HeaderText = "Column2"; + this.Column2.Name = "Column2"; + this.Column2.ReadOnly = true; + this.Column2.Visible = false; + // + // Column3 + // + this.Column3.DataPropertyName = "datains_date"; + this.Column3.HeaderText = "Column3"; + this.Column3.Name = "Column3"; + this.Column3.ReadOnly = true; + this.Column3.Visible = false; + // + // Column4 + // + this.Column4.DataPropertyName = "datachg_usr"; + this.Column4.HeaderText = "Column4"; + this.Column4.Name = "Column4"; + this.Column4.ReadOnly = true; + this.Column4.Visible = false; + // + // Column5 + // + this.Column5.DataPropertyName = "datachg_date"; + this.Column5.HeaderText = "Column5"; + this.Column5.Name = "Column5"; + this.Column5.ReadOnly = true; + this.Column5.Visible = false; + // + // FrmRoomConfig + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.ClientSize = new System.Drawing.Size(1005, 623); + this.Controls.Add(this.label2); + this.Controls.Add(this.dudDeposit); + this.Controls.Add(this.label1); + this.Controls.Add(this.btnDeleteRoomType); + this.Controls.Add(this.dudRent); + this.Controls.Add(this.btnUpdateRoomType); + this.Controls.Add(this.btnAddRoomType); + this.Controls.Add(this.label7); + this.Controls.Add(this.txtRoomTypeName); + this.Controls.Add(this.label20); + this.Controls.Add(this.txtRoomTypeId); + this.Controls.Add(this.dgvRoomTypeList); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Name = "FrmRoomConfig"; + this.ShowTitleIcon = true; + this.Text = "客房配置"; + this.ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 800, 450); + this.Load += new System.EventHandler(this.FrmRoomConfig_Load); + ((System.ComponentModel.ISupportInitialize)(this.dgvRoomTypeList)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private Sunny.UI.UIButton btnDeleteRoomType; + private Sunny.UI.UIButton btnUpdateRoomType; + private Sunny.UI.UIButton btnAddRoomType; + private System.Windows.Forms.Label label7; + private Sunny.UI.UITextBox txtRoomTypeName; + private System.Windows.Forms.Label label20; + private Sunny.UI.UITextBox txtRoomTypeId; + private Sunny.UI.UIDataGridView dgvRoomTypeList; + private System.Windows.Forms.Label label1; + private Sunny.UI.UIDoubleUpDown dudRent; + private System.Windows.Forms.Label label2; + private Sunny.UI.UIDoubleUpDown dudDeposit; + private System.Windows.Forms.DataGridViewTextBoxColumn clRoomType; + private System.Windows.Forms.DataGridViewTextBoxColumn clRoomTypeName; + private System.Windows.Forms.DataGridViewTextBoxColumn clRoomRent; + private System.Windows.Forms.DataGridViewTextBoxColumn clRoomDeposit; + private System.Windows.Forms.DataGridViewTextBoxColumn clDeleteMk; + private System.Windows.Forms.DataGridViewTextBoxColumn clDeleteMark; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private System.Windows.Forms.DataGridViewTextBoxColumn Column5; + } +} \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmRoomConfig.cs b/SYS.FormUI/AppFunction/FrmRoomConfig.cs new file mode 100644 index 0000000..9e598c4 --- /dev/null +++ b/SYS.FormUI/AppFunction/FrmRoomConfig.cs @@ -0,0 +1,167 @@ +using EOM.TSHotelManager.Common.Core; +using EOM.TSHotelManager.Common.Util; +using jvncorelib_fr.EntityLib; +using Sunny.UI; +using SYS.Common; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace SYS.FormUI.AppFunction +{ + public partial class FrmRoomConfig : UIForm + { + public FrmRoomConfig() + { + InitializeComponent(); + } + + ResponseMsg result = null; + Dictionary dic = null; + + public void LoadRoomType() + { + result = HttpHelper.Request("RoomType/SelectRoomTypesAll",null); + if (result.statusCode != 200) + { + UIMessageBox.ShowError("SelectRoomTypesAll+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + List roomTypes = HttpHelper.JsonToList(result.message); + dgvRoomTypeList.AutoGenerateColumns = false; + dgvRoomTypeList.DataSource = roomTypes; + } + + private void FrmRoomConfig_Load(object sender, EventArgs e) + { + LoadRoomType(); + } + + private void btnAddRoomType_Click(object sender, EventArgs e) + { + dic = new Dictionary + { + { "roomTypeId",txtRoomTypeId.IntValue.ToString()} + }; + var result = HttpHelper.Request("RoomType/SelectRoomTypeByType", null, dic); + if (result.statusCode != 200) + { + UIMessageBox.ShowError("SelectRoomTypeByType+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + var roomType = HttpHelper.JsonToModel(result.message); + if (!roomType.IsNullOrEmpty()) + { + UIMessageBox.ShowError("房间状态已存在，请重新检查"); + txtRoomTypeId.IntValue = 0; + txtRoomTypeName.Text = null; + dudDeposit.Value = 0; + dudRent.Value = 0; + return; + } + roomType = new RoomType + { + Roomtype = txtRoomTypeId.IntValue, + RoomName = txtRoomTypeName.Text.Trim(), + RoomRent = Convert.ToDecimal(dudRent.Value), + RoomDeposit = Convert.ToDecimal(dudDeposit.Value), + delete_mk = 0, + datains_usr = AdminInfo.Account + }; + if (ValidateHelper.Validate(roomType)) + { + result = HttpHelper.Request("RoomType/InsertRoomType", HttpHelper.ModelToJson(roomType)); + if (result.statusCode != 200) + { + UIMessageBox.ShowError("InsertRoomType+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + UIMessageBox.ShowSuccess("提交成功，房间状态已添加！"); + RecordHelper.Record(AdminInfo.Account + AdminInfo.Name + "于" + DateTime.Now + "新增了房间状态，状态编码为：" + txtRoomTypeId.IntValue, 2); + txtRoomTypeId.IntValue = 0; + txtRoomTypeName.Text = null; + dudDeposit.Value = 0; + dudRent.Value = 0; + LoadRoomType(); + return; + } + UIMessageBox.ShowError("字段校验未通过，请检查"); + return; + } + + private void btnUpdateRoomType_Click(object sender, EventArgs e) + { + var roomType = new RoomType + { + Roomtype = txtRoomTypeId.IntValue, + RoomName = txtRoomTypeName.Text.Trim(), + RoomRent = Convert.ToDecimal(dudRent.Value), + RoomDeposit = Convert.ToDecimal(dudDeposit.Value), + delete_mk = 0, + datachg_usr = AdminInfo.Account + }; + if (ValidateHelper.Validate(roomType)) + { + result = HttpHelper.Request("RoomType/UpdateRoomType", HttpHelper.ModelToJson(roomType)); + if (result.statusCode != 200) + { + UIMessageBox.ShowError("UpdateRoomType+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + UIMessageBox.ShowSuccess("提交成功，状态信息已修改！"); + RecordHelper.Record(AdminInfo.Account + AdminInfo.Name + "于" + DateTime.Now + "修改了房间状态配置，状态编码为：" + txtRoomTypeId.IntValue, 2); + LoadRoomType(); + txtRoomTypeId.IntValue = 0; + txtRoomTypeName.Text = null; + dudDeposit.Value = 0; + dudRent.Value = 0; + return; + } + UIMessageBox.ShowError("字段校验未通过，请检查"); + return; + } + + private void btnDeleteRoomType_Click(object sender, EventArgs e) + { + var deleteMk = Convert.ToInt32(dgvRoomTypeList.SelectedRows[0].Cells["clDeleteMark"].Value); + var roomType = new RoomType + { + Roomtype = txtRoomTypeId.IntValue, + RoomName = txtRoomTypeName.Text.Trim(), + RoomRent = Convert.ToDecimal(dudRent.Value), + RoomDeposit = Convert.ToDecimal(dudDeposit.Value), + delete_mk = deleteMk == 0 ? 1:0, + datachg_usr = AdminInfo.Account + }; + if (ValidateHelper.Validate(roomType)) + { + result = HttpHelper.Request("RoomType/DeleteRoomType", HttpHelper.ModelToJson(roomType)); + if (result.statusCode != 200) + { + UIMessageBox.ShowError("DeleteRoomType+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + UIMessageBox.ShowSuccess("提交成功，状态信息已删除！"); + RecordHelper.Record(AdminInfo.Account + AdminInfo.Name + "于" + DateTime.Now + "删除了房间状态配置，状态编码为：" + txtRoomTypeId.IntValue, 2); + LoadRoomType(); + return; + } + UIMessageBox.ShowError("字段校验未通过，请检查"); + return; + } + + private void dgvRoomTypeList_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e) + { + txtRoomTypeId.IntValue = Convert.ToInt32(dgvRoomTypeList.SelectedRows[0].Cells["clRoomType"].Value); + txtRoomTypeName.Text = dgvRoomTypeList.SelectedRows[0].Cells["clRoomTypeName"].Value.ToString(); + dudRent.Value = Convert.ToDouble(dgvRoomTypeList.SelectedRows[0].Cells["clRoomRent"].Value); + dudDeposit.Value = Convert.ToDouble(dgvRoomTypeList.SelectedRows[0].Cells["clRoomDeposit"].Value); + } + } +} diff --git a/SYS.FormUI/AppFunction/FrmRoomConfig.resx b/SYS.FormUI/AppFunction/FrmRoomConfig.resx new file mode 100644 index 0000000..d3e8c10 --- /dev/null +++ b/SYS.FormUI/AppFunction/FrmRoomConfig.resx @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + + + AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////VP///6v///////////////////////////////////////////// + /////////////////////////////////////////////////////////////////4n///9OAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///+t//////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + /78AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Iv//////////////v////7////+/////v/// + /7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v/// + /7///////////////ywAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///9A//////////////+BAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////gf//////////////QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///0D///////////// + /4EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAD///+B//////////////9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////QP// + ////////////gQAAAAD///9A////QP///0D///9A////QP///0D///9A////QP///0D///9A////QP// + /0D///9A////QP///0AAAAAAAAAAAP///4H//////////////0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAD///9A//////////////+BAAAAAP////////////////////////////////////////////////// + /////////////////////////////////4EAAAAA////gf//////////////QAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAP///0D//////////////4EAAAAA//////////////////////////////////////// + ////////////////////////////////////////////gQAAAAD///+B//////////////9AAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////QP//////////////gQAAAAD///+B////fv///4H///+B////gf// + /4H///+B////gf///4H///+B////gf///4H///+B////gf///4H///8qAAAAAP///4H///////////// + /0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///9A//////////////+BAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////gf// + ////////////QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///0D//////////////4EAAAAAAAAAAP// + /yD////V////9////+X////R////v////1QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAD///+B//////////////9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////QP//////////////gQAA + AAAAAAAA////Nv///////////////////////////////////1QAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAP///4H//////////////0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///9A//////// + //////+BAAAAAAAAAAD///8m//////////////9U////eP////3//////////////1QAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////gf//////////////QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// + /0D//////////////4EAAAAAAAAAAP///xT//////////////zYAAAAA////Tv////f///////////// + /1QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///+B//////////////9AAAAAAAAAAAAAAAAAAAAAAAAA + AAD///8u////QP//////////////gQAAAAAAAAAA////BP///9//////////qwAAAAAAAAAA////SP// + /+///////////////1QAAAAAAAAAAAAAAAAAAAAAAAAAAP///4H//////////////0D///8oAAAAAAAA + AAD///8Y////y/////////////////////////+BAAAAAAAAAAAAAAAA////VP//////////////qwAA + AAAAAAAA////QP///+n//////////////1QAAAAAAAAAAAAAAAAAAAAA////gf////////////////// + ///////H////Fv///6///////////////////////////////4EAAAAAAAAAAAAAAAAAAAAA////VP// + ////////////qwAAAAAAAAAA////OP///+P//////////////1QAAAAAAAAAAAAAAAD///+B//////// + //////////////////////+t////7f/////////n////QP///0D///9A////QAAAAAAAAAAAAAAAAAAA + AAAAAAAA////VP//////////////qwAAAAAAAAAA////Mv///93//////////////1QAAAAAAAAAAP// + /0D///9A////QP///0D////r//////////H///+n////////////////////RgAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////VP//////////////qwAAAAAAAAAA////LP///9f/////////3wAA + AAAAAAAAAAAAAAAAAAD///9O////////////////////gQAAAAD///+v////////////////////ZAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////VP//////////////qwAAAAD///9i//////// + ///////JAAAAAAAAAAAAAAAA////dv///////////////////7UAAAAAAAAAAAAAAAD///+F//////// + ////////////gwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////VP//////////////q/// + ////////////yf///yIAAAAAAAAAAP///53///////////////////+VAAAAAAAAAAAAAAAAAAAAAAAA + AAD///9a////////////////////owAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////VP// + /////////////////7v///8WAAAAAAAAAAD///+3////////////////////dAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAD///84////////////////////wf///xwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////VP///9////+r////CgAAAAD///8m////z////////////////////1YAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8k////7///////////////3////zgAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Tv///+f///////////////X///82AAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8O////xf///////////////f// + /1QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///2r////////////////////Z////FgAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////m/// + /////////////////3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///+D////////////////////vwAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////g////////////////////48AAAAAAAAAAAAAAAAAAAAA////m/////////////////// + /6MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////bv///////////////////6v///8c////Hv///7H///////////// + //////+HAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Wv///////////////////8f////J//////// + ////////////agAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Rv///+P///////////// + ////////////5////04AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////MP// + /5/////f////2////5n///80AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA+AAAH/AAAA/wAAAP8f//j/H//4/x//+P8QAAj/EAAI/xQAGP8f//j/HB + /4/xwP+P8cx/j/HOP4/xxx+PgeOPgQHxx4Af+OP4D/xx8If+MeHB/wOD8P+HD/h/zh/8P/w//h/4f/8P + 4P//g8H//+GD///wD///+B////w///////8= + + + \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs b/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs index 704f172..6859020 100644 --- a/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs +++ b/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs @@ -90,6 +90,10 @@ namespace SYS.FormUI return; } UIMessageBox.ShowSuccess("上传成功！"); + txtNoticeTheme.Text = string.Empty; + rtbNoticeContent.Html = string.Empty; + cbNoticeType.SelectedIndex = 0; + cboSelectClub.SelectedIndex = 0; #region 获取添加操作日志所需的信息 RecordHelper.Record(AdminInfo.Account + "-" + AdminInfo.Name + "在" + DateTime.Now + "位于" + AdminInfo.SoftwareVersion + "执行：" + "上传公告操作！新增值为：" + notice.NoticeNo, 2); #endregion @@ -116,6 +120,7 @@ namespace SYS.FormUI private void FrmUpLoad_Load(object sender, EventArgs e) { + dtpUpLoadDate.Value = DateTime.Now; result = HttpHelper.Request("Base/SelectDeptAllCanUse"); if (result.statusCode != 200) { diff --git a/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.cs b/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.cs index ac29b2e..4ed2197 100644 --- a/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.cs +++ b/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.cs @@ -42,10 +42,10 @@ namespace SYS.FormUI private void FrmWorkerCheckInfo_Load(object sender, EventArgs e) { - lblWorkerInfo.Text = "以下为员工：" + FrmChangeWorker.wk_WorkerNo + "-员工姓名：" + FrmChangeWorker.wk_WorkerName + "的所有打卡考勤记录:"; + lblWorkerInfo.Text = "以下为员工：" + FrmWorkerPanel.wk_WorkerNo + "-员工姓名：" + FrmWorkerPanel.wk_WorkerName + "的所有打卡考勤记录:"; dic = new Dictionary() { - { "wid",FrmChangeWorker.wk_WorkerNo} + { "wid",FrmWorkerPanel.wk_WorkerNo} }; result = HttpHelper.Request("WorkerCheck/SelectCheckInfoByWorkerNo", null, dic); if (result.statusCode != 200) diff --git a/SYS.FormUI/AppFunction/FrmAddWorker.Designer.cs b/SYS.FormUI/AppFunction/FrmWorkerInfo.Designer.cs similarity index 90% rename from SYS.FormUI/AppFunction/FrmAddWorker.Designer.cs rename to SYS.FormUI/AppFunction/FrmWorkerInfo.Designer.cs index 25312ed..d1634e7 100644 --- a/SYS.FormUI/AppFunction/FrmAddWorker.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmWorkerInfo.Designer.cs @@ -1,6 +1,6 @@ namespace SYS.FormUI { - partial class FrmAddWorker + partial class FrmWorkerInfo { /// /// Required designer variable. @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAddWorker)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmWorkerInfo)); this.label15 = new System.Windows.Forms.Label(); this.cboSex = new Sunny.UI.UIComboBox(); this.WorkerNo = new Sunny.UI.UITextBox(); @@ -94,6 +94,8 @@ this.cboSex.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboSex.FillColor = System.Drawing.Color.White; this.cboSex.Font = new System.Drawing.Font("微软雅黑", 15.75F); + this.cboSex.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); + this.cboSex.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.cboSex.Location = new System.Drawing.Point(120, 151); this.cboSex.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboSex.MinimumSize = new System.Drawing.Size(63, 0); @@ -101,28 +103,29 @@ this.cboSex.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cboSex.Radius = 20; this.cboSex.Size = new System.Drawing.Size(166, 35); + this.cboSex.SymbolSize = 24; this.cboSex.TabIndex = 113; this.cboSex.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.cboSex.Watermark = ""; // // WorkerNo // this.WorkerNo.Cursor = System.Windows.Forms.Cursors.IBeam; - this.WorkerNo.FillColor = System.Drawing.Color.White; this.WorkerNo.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.WorkerNo.Location = new System.Drawing.Point(120, 45); this.WorkerNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.WorkerNo.Maximum = 2147483647D; - this.WorkerNo.Minimum = -2147483648D; this.WorkerNo.MinimumSize = new System.Drawing.Size(1, 1); this.WorkerNo.Name = "WorkerNo"; this.WorkerNo.Padding = new System.Windows.Forms.Padding(5); this.WorkerNo.Radius = 20; this.WorkerNo.ReadOnly = true; + this.WorkerNo.ShowText = false; this.WorkerNo.Size = new System.Drawing.Size(166, 35); this.WorkerNo.Style = Sunny.UI.UIStyle.Custom; this.WorkerNo.StyleCustomMode = true; this.WorkerNo.TabIndex = 111; this.WorkerNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.WorkerNo.Watermark = ""; // // dtpBirthday // @@ -139,10 +142,12 @@ this.dtpBirthday.Size = new System.Drawing.Size(166, 31); this.dtpBirthday.SymbolDropDown = 61555; this.dtpBirthday.SymbolNormal = 61555; + this.dtpBirthday.SymbolSize = 24; this.dtpBirthday.TabIndex = 110; this.dtpBirthday.Text = "2020-11-24"; this.dtpBirthday.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; this.dtpBirthday.Value = new System.DateTime(2020, 11, 24, 22, 50, 36, 791); + this.dtpBirthday.Watermark = ""; // // label13 // @@ -190,6 +195,8 @@ this.cboWorkerPosition.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboWorkerPosition.FillColor = System.Drawing.Color.White; this.cboWorkerPosition.Font = new System.Drawing.Font("微软雅黑", 15.75F); + this.cboWorkerPosition.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); + this.cboWorkerPosition.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.cboWorkerPosition.Location = new System.Drawing.Point(433, 151); this.cboWorkerPosition.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboWorkerPosition.MinimumSize = new System.Drawing.Size(63, 0); @@ -197,27 +204,28 @@ this.cboWorkerPosition.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cboWorkerPosition.Radius = 20; this.cboWorkerPosition.Size = new System.Drawing.Size(178, 35); + this.cboWorkerPosition.SymbolSize = 24; this.cboWorkerPosition.TabIndex = 121; this.cboWorkerPosition.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.cboWorkerPosition.Watermark = ""; // // WorkerName // this.WorkerName.Cursor = System.Windows.Forms.Cursors.IBeam; - this.WorkerName.FillColor = System.Drawing.Color.White; this.WorkerName.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.WorkerName.Location = new System.Drawing.Point(433, 45); this.WorkerName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.WorkerName.Maximum = 2147483647D; - this.WorkerName.Minimum = -2147483648D; this.WorkerName.MinimumSize = new System.Drawing.Size(1, 1); this.WorkerName.Name = "WorkerName"; this.WorkerName.Padding = new System.Windows.Forms.Padding(5); this.WorkerName.Radius = 20; + this.WorkerName.ShowText = false; this.WorkerName.Size = new System.Drawing.Size(178, 35); this.WorkerName.Style = Sunny.UI.UIStyle.Custom; this.WorkerName.StyleCustomMode = true; this.WorkerName.TabIndex = 119; this.WorkerName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.WorkerName.Watermark = ""; // // dtpTime // @@ -235,10 +243,12 @@ this.dtpTime.Size = new System.Drawing.Size(166, 31); this.dtpTime.SymbolDropDown = 61555; this.dtpTime.SymbolNormal = 61555; + this.dtpTime.SymbolSize = 24; this.dtpTime.TabIndex = 118; this.dtpTime.Text = "2020-11-24"; this.dtpTime.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; this.dtpTime.Value = new System.DateTime(2020, 11, 24, 22, 50, 36, 791); + this.dtpTime.Watermark = ""; // // label19 // @@ -286,6 +296,8 @@ this.cboClub.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboClub.FillColor = System.Drawing.Color.White; this.cboClub.Font = new System.Drawing.Font("微软雅黑", 15.75F); + this.cboClub.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); + this.cboClub.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.cboClub.Location = new System.Drawing.Point(433, 204); this.cboClub.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboClub.MinimumSize = new System.Drawing.Size(63, 0); @@ -293,8 +305,10 @@ this.cboClub.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cboClub.Radius = 20; this.cboClub.Size = new System.Drawing.Size(178, 35); + this.cboClub.SymbolSize = 24; this.cboClub.TabIndex = 123; this.cboClub.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.cboClub.Watermark = ""; // // label23 // @@ -312,6 +326,8 @@ this.cboEducation.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboEducation.FillColor = System.Drawing.Color.White; this.cboEducation.Font = new System.Drawing.Font("微软雅黑", 15.75F); + this.cboEducation.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); + this.cboEducation.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.cboEducation.Location = new System.Drawing.Point(433, 257); this.cboEducation.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboEducation.MinimumSize = new System.Drawing.Size(63, 0); @@ -319,8 +335,10 @@ this.cboEducation.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cboEducation.Radius = 20; this.cboEducation.Size = new System.Drawing.Size(338, 35); + this.cboEducation.SymbolSize = 24; this.cboEducation.TabIndex = 125; this.cboEducation.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.cboEducation.Watermark = ""; // // label24 // @@ -335,21 +353,20 @@ // txtAddress // this.txtAddress.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtAddress.FillColor = System.Drawing.Color.White; this.txtAddress.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtAddress.Location = new System.Drawing.Point(120, 310); this.txtAddress.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtAddress.Maximum = 2147483647D; - this.txtAddress.Minimum = -2147483648D; this.txtAddress.MinimumSize = new System.Drawing.Size(1, 1); this.txtAddress.Name = "txtAddress"; this.txtAddress.Padding = new System.Windows.Forms.Padding(5); this.txtAddress.Radius = 20; + this.txtAddress.ShowText = false; this.txtAddress.Size = new System.Drawing.Size(651, 35); this.txtAddress.Style = Sunny.UI.UIStyle.Custom; this.txtAddress.StyleCustomMode = true; this.txtAddress.TabIndex = 127; this.txtAddress.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtAddress.Watermark = ""; // // label25 // @@ -364,21 +381,20 @@ // WorkerID // this.WorkerID.Cursor = System.Windows.Forms.Cursors.IBeam; - this.WorkerID.FillColor = System.Drawing.Color.White; this.WorkerID.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.WorkerID.Location = new System.Drawing.Point(120, 363); this.WorkerID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.WorkerID.Maximum = 2147483647D; - this.WorkerID.Minimum = -2147483648D; this.WorkerID.MinimumSize = new System.Drawing.Size(1, 1); this.WorkerID.Name = "WorkerID"; this.WorkerID.Padding = new System.Windows.Forms.Padding(5); this.WorkerID.Radius = 20; + this.WorkerID.ShowText = false; this.WorkerID.Size = new System.Drawing.Size(651, 35); this.WorkerID.Style = Sunny.UI.UIStyle.Custom; this.WorkerID.StyleCustomMode = true; this.WorkerID.TabIndex = 129; this.WorkerID.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.WorkerID.Watermark = ""; this.WorkerID.Validated += new System.EventHandler(this.WorkerID_Validated); // // label26 @@ -394,21 +410,20 @@ // WorkerTel // this.WorkerTel.Cursor = System.Windows.Forms.Cursors.IBeam; - this.WorkerTel.FillColor = System.Drawing.Color.White; this.WorkerTel.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.WorkerTel.Location = new System.Drawing.Point(120, 416); this.WorkerTel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.WorkerTel.Maximum = 2147483647D; - this.WorkerTel.Minimum = -2147483648D; this.WorkerTel.MinimumSize = new System.Drawing.Size(1, 1); this.WorkerTel.Name = "WorkerTel"; this.WorkerTel.Padding = new System.Windows.Forms.Padding(5); this.WorkerTel.Radius = 20; + this.WorkerTel.ShowText = false; this.WorkerTel.Size = new System.Drawing.Size(651, 35); this.WorkerTel.Style = Sunny.UI.UIStyle.Custom; this.WorkerTel.StyleCustomMode = true; this.WorkerTel.TabIndex = 131; this.WorkerTel.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.WorkerTel.Watermark = ""; // // label27 // @@ -426,6 +441,8 @@ this.cboWorkerFace.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboWorkerFace.FillColor = System.Drawing.Color.White; this.cboWorkerFace.Font = new System.Drawing.Font("微软雅黑", 15.75F); + this.cboWorkerFace.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); + this.cboWorkerFace.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.cboWorkerFace.Location = new System.Drawing.Point(433, 98); this.cboWorkerFace.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboWorkerFace.MinimumSize = new System.Drawing.Size(63, 0); @@ -433,8 +450,10 @@ this.cboWorkerFace.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cboWorkerFace.Radius = 20; this.cboWorkerFace.Size = new System.Drawing.Size(178, 35); + this.cboWorkerFace.SymbolSize = 24; this.cboWorkerFace.TabIndex = 132; this.cboWorkerFace.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.cboWorkerFace.Watermark = ""; // // flpHistory // @@ -450,6 +469,8 @@ this.cbWorkerNation.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cbWorkerNation.FillColor = System.Drawing.Color.White; this.cbWorkerNation.Font = new System.Drawing.Font("微软雅黑", 15.75F); + this.cbWorkerNation.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); + this.cbWorkerNation.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.cbWorkerNation.Location = new System.Drawing.Point(120, 98); this.cbWorkerNation.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cbWorkerNation.MinimumSize = new System.Drawing.Size(63, 0); @@ -457,8 +478,10 @@ this.cbWorkerNation.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cbWorkerNation.Radius = 20; this.cbWorkerNation.Size = new System.Drawing.Size(166, 35); + this.cbWorkerNation.SymbolSize = 24; this.cbWorkerNation.TabIndex = 135; this.cbWorkerNation.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.cbWorkerNation.Watermark = ""; // // picWorkerPic // @@ -479,10 +502,9 @@ this.openPic.Filter = "PNG文件|*.png|JPG文件|*.jpg|位图文件|*.bmp"; this.openPic.FileOk += new System.ComponentModel.CancelEventHandler(this.openPic_FileOk); // - // FrmAddWorker + // FrmWorkerInfo // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.ClientSize = new System.Drawing.Size(785, 760); this.Controls.Add(this.cbWorkerNation); @@ -515,10 +537,10 @@ this.Controls.Add(this.label17); this.Controls.Add(this.label18); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Name = "FrmAddWorker"; - this.ShowIcon = true; + this.Name = "FrmWorkerInfo"; this.ShowTitleIcon = true; this.Text = "添加员工"; + this.ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 785, 760); this.ButtonOkClick += new System.EventHandler(this.FrmAddWorker_ButtonOkClick); this.ButtonCancelClick += new System.EventHandler(this.FrmAddWorker_ButtonCancelClick); this.Load += new System.EventHandler(this.FrmAddWorker_Load); diff --git a/SYS.FormUI/AppFunction/FrmAddWorker.cs b/SYS.FormUI/AppFunction/FrmWorkerInfo.cs similarity index 90% rename from SYS.FormUI/AppFunction/FrmAddWorker.cs rename to SYS.FormUI/AppFunction/FrmWorkerInfo.cs index 8a67601..dfd2831 100644 --- a/SYS.FormUI/AppFunction/FrmAddWorker.cs +++ b/SYS.FormUI/AppFunction/FrmWorkerInfo.cs @@ -32,9 +32,9 @@ using System.Windows.Forms; namespace SYS.FormUI { - public partial class FrmAddWorker : UIEditForm + public partial class FrmWorkerInfo : UIEditForm { - public FrmAddWorker() + public FrmWorkerInfo() { InitializeComponent(); } @@ -133,30 +133,30 @@ namespace SYS.FormUI } btnOK.Visible = false; btnCancel.Visible = false; - WorkerNo.Text = FrmChangeWorker.wk_WorkerNo; - WorkerName.Text = FrmChangeWorker.wk_WorkerName; - cboSex.Text = FrmChangeWorker.wk_WorkerSex; - cboWorkerPosition.Text = FrmChangeWorker.wk_WorkerPosition; - cboWorkerFace.Text = FrmChangeWorker.wk_WorkerFace; - cbWorkerNation.Text = FrmChangeWorker.wk_WorkerNation; - dtpBirthday.Value = Convert.ToDateTime(FrmChangeWorker.wk_WorkerBirthday); - dtpTime.Value = Convert.ToDateTime(FrmChangeWorker.wk_WorkerTime); - WorkerID.Text = FrmChangeWorker.wk_WorkerID; - txtAddress.Text = FrmChangeWorker.wk_WorkerAddress; - WorkerTel.Text = FrmChangeWorker.wk_WorkerTel; - cboEducation.Text = FrmChangeWorker.wk_WorkerEducation; - cboClub.Text = FrmChangeWorker.wk_WorkerClub; + WorkerNo.Text = FrmWorkerPanel.wk_WorkerNo; + WorkerName.Text = FrmWorkerPanel.wk_WorkerName; + cboSex.Text = FrmWorkerPanel.wk_WorkerSex; + cboWorkerPosition.Text = FrmWorkerPanel.wk_WorkerPosition; + cboWorkerFace.Text = FrmWorkerPanel.wk_WorkerFace; + cbWorkerNation.Text = FrmWorkerPanel.wk_WorkerNation; + dtpBirthday.Value = Convert.ToDateTime(FrmWorkerPanel.wk_WorkerBirthday); + dtpTime.Value = Convert.ToDateTime(FrmWorkerPanel.wk_WorkerTime); + WorkerID.Text = FrmWorkerPanel.wk_WorkerID; + txtAddress.Text = FrmWorkerPanel.wk_WorkerAddress; + WorkerTel.Text = FrmWorkerPanel.wk_WorkerTel; + cboEducation.Text = FrmWorkerPanel.wk_WorkerEducation; + cboClub.Text = FrmWorkerPanel.wk_WorkerClub; dic = new Dictionary { { "WorkerId", WorkerNo.Text.Trim() } }; result = HttpHelper.Request("WorkerPicture/WorkerPic", null, dic); - //if (result.statusCode != 200) - //{ - // UIMessageBox.ShowError("WorkerPic+接口服务异常，请提交Issue或尝试更新版本！"); - // return; - //} + if (result.statusCode != 200) + { + UIMessageBox.ShowError("WorkerPic+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } var workerPicSource = HttpHelper.JsonToModel(result.message); if (workerPicSource != null && !string.IsNullOrEmpty(workerPicSource.Pic)) { @@ -209,19 +209,19 @@ namespace SYS.FormUI bool dr = UIMessageBox.Show("修改操作仅能修改姓名、性别、电话号码、联系地址、民族、面貌以及最高学历，以上是否知晓？点击确定继续进行修改！", "修改提醒", UIStyle.Orange, UIMessageBoxButtons.OKCancel); if (dr) { - WorkerNo.Text = FrmChangeWorker.wk_WorkerNo; - WorkerName.Text = FrmChangeWorker.wk_WorkerName; - cboSex.Text = FrmChangeWorker.wk_WorkerSex; - cboWorkerPosition.Text = FrmChangeWorker.wk_WorkerPosition; - cboWorkerFace.Text = FrmChangeWorker.wk_WorkerFace; - cbWorkerNation.Text = FrmChangeWorker.wk_WorkerNation; - dtpBirthday.Value = Convert.ToDateTime(FrmChangeWorker.wk_WorkerBirthday); - dtpTime.Value = Convert.ToDateTime(FrmChangeWorker.wk_WorkerTime); - WorkerID.Text = FrmChangeWorker.wk_WorkerID; - txtAddress.Text = FrmChangeWorker.wk_WorkerAddress; - WorkerTel.Text = FrmChangeWorker.wk_WorkerTel; - cboEducation.Text = FrmChangeWorker.wk_WorkerEducation; - cboClub.Text = FrmChangeWorker.wk_WorkerClub; + WorkerNo.Text = FrmWorkerPanel.wk_WorkerNo; + WorkerName.Text = FrmWorkerPanel.wk_WorkerName; + cboSex.Text = FrmWorkerPanel.wk_WorkerSex; + cboWorkerPosition.Text = FrmWorkerPanel.wk_WorkerPosition; + cboWorkerFace.Text = FrmWorkerPanel.wk_WorkerFace; + cbWorkerNation.Text = FrmWorkerPanel.wk_WorkerNation; + dtpBirthday.Value = Convert.ToDateTime(FrmWorkerPanel.wk_WorkerBirthday); + dtpTime.Value = Convert.ToDateTime(FrmWorkerPanel.wk_WorkerTime); + WorkerID.Text = FrmWorkerPanel.wk_WorkerID; + txtAddress.Text = FrmWorkerPanel.wk_WorkerAddress; + WorkerTel.Text = FrmWorkerPanel.wk_WorkerTel; + cboEducation.Text = FrmWorkerPanel.wk_WorkerEducation; + cboClub.Text = FrmWorkerPanel.wk_WorkerClub; dic = new Dictionary(); dic.Add("WorkerId", WorkerNo.Text.Trim()); diff --git a/SYS.FormUI/AppFunction/FrmAddWorker.resx b/SYS.FormUI/AppFunction/FrmWorkerInfo.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmAddWorker.resx rename to SYS.FormUI/AppFunction/FrmWorkerInfo.resx diff --git a/SYS.FormUI/AppFunction/FrmWorkerManager.cs b/SYS.FormUI/AppFunction/FrmWorkerManager.cs index 140e275..46aacce 100644 --- a/SYS.FormUI/AppFunction/FrmWorkerManager.cs +++ b/SYS.FormUI/AppFunction/FrmWorkerManager.cs @@ -104,7 +104,7 @@ namespace SYS.FormUI wk_WorkerEducation = dgvWorkerList.SelectedRows[0].Cells["clWorkerEducation"].Value.ToString(); wk_WorkerNation = dgvWorkerList.SelectedRows[0].Cells["clWorkerNation"].Value.ToString(); wk_WorkerStatus = dgvWorkerList.SelectedRows[0].Cells["Column1"].Value.ToString(); - FrmChangeWorker aff = new FrmChangeWorker(); + FrmWorkerPanel aff = new FrmWorkerPanel(); aff.ShowDialog(); } @@ -114,7 +114,7 @@ namespace SYS.FormUI private void btnAddWorker_Click(object sender, EventArgs e) { - FrmAddWorker frm = new FrmAddWorker(); + FrmWorkerInfo frm = new FrmWorkerInfo(); frm.Show(); } diff --git a/SYS.FormUI/AppFunction/FrmChangeWorker.Designer.cs b/SYS.FormUI/AppFunction/FrmWorkerPanel.Designer.cs similarity index 99% rename from SYS.FormUI/AppFunction/FrmChangeWorker.Designer.cs rename to SYS.FormUI/AppFunction/FrmWorkerPanel.Designer.cs index 8767a7d..f00c425 100644 --- a/SYS.FormUI/AppFunction/FrmChangeWorker.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmWorkerPanel.Designer.cs @@ -1,6 +1,6 @@ namespace SYS.FormUI { - partial class FrmChangeWorker + partial class FrmWorkerPanel { /// /// Required designer variable. @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmChangeWorker)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmWorkerPanel)); this.lblWorker = new System.Windows.Forms.Label(); this.btnWatchInfo = new Sunny.UI.UIButton(); this.btnUpWorker = new Sunny.UI.UIButton(); diff --git a/SYS.FormUI/AppFunction/FrmChangeWorker.cs b/SYS.FormUI/AppFunction/FrmWorkerPanel.cs similarity index 98% rename from SYS.FormUI/AppFunction/FrmChangeWorker.cs rename to SYS.FormUI/AppFunction/FrmWorkerPanel.cs index 1659819..dcb3b58 100644 --- a/SYS.FormUI/AppFunction/FrmChangeWorker.cs +++ b/SYS.FormUI/AppFunction/FrmWorkerPanel.cs @@ -35,7 +35,7 @@ namespace SYS.FormUI /// /// 员工操作界面 /// - public partial class FrmChangeWorker : Form + public partial class FrmWorkerPanel : Form { public static string wk_WorkerNo; public static string wk_WorkerName; @@ -53,7 +53,7 @@ namespace SYS.FormUI public static string wk_WorkerEducation; public static string wk_WorkerStatus; - public FrmChangeWorker() + public FrmWorkerPanel() { InitializeComponent(); } @@ -219,7 +219,7 @@ namespace SYS.FormUI private void btnWatchInfo_Click(object sender, EventArgs e) { - FrmAddWorker aff = new FrmAddWorker(); + FrmWorkerInfo aff = new FrmWorkerInfo(); aff.Text = "员工信息查看页"; aff.ShowDialog(); } @@ -249,7 +249,7 @@ namespace SYS.FormUI private void btnUpdate_Click(object sender, EventArgs e) { - FrmAddWorker frmAddWorker = new FrmAddWorker(); + FrmWorkerInfo frmAddWorker = new FrmWorkerInfo(); frmAddWorker.Text = "员工信息修改页"; frmAddWorker.Show(); } diff --git a/SYS.FormUI/AppFunction/FrmChangeWorker.resx b/SYS.FormUI/AppFunction/FrmWorkerPanel.resx similarity index 100% rename from SYS.FormUI/AppFunction/FrmChangeWorker.resx rename to SYS.FormUI/AppFunction/FrmWorkerPanel.resx diff --git a/SYS.FormUI/AppMain/FrmBackgroundSystem.Designer.cs b/SYS.FormUI/AppMain/FrmBackgroundSystem.Designer.cs index 87f10c8..ef486c7 100644 --- a/SYS.FormUI/AppMain/FrmBackgroundSystem.Designer.cs +++ b/SYS.FormUI/AppMain/FrmBackgroundSystem.Designer.cs @@ -54,48 +54,48 @@ namespace SYS.FormUI treeNode12}); System.Windows.Forms.TreeNode treeNode14 = new System.Windows.Forms.TreeNode("房态图一览"); System.Windows.Forms.TreeNode treeNode15 = new System.Windows.Forms.TreeNode("新增客房"); - System.Windows.Forms.TreeNode treeNode16 = new System.Windows.Forms.TreeNode("客房管理", new System.Windows.Forms.TreeNode[] { + System.Windows.Forms.TreeNode treeNode16 = new System.Windows.Forms.TreeNode("客房配置"); + System.Windows.Forms.TreeNode treeNode17 = new System.Windows.Forms.TreeNode("客房管理", new System.Windows.Forms.TreeNode[] { treeNode14, - treeNode15}); - System.Windows.Forms.TreeNode treeNode17 = new System.Windows.Forms.TreeNode("会员等级规则"); - System.Windows.Forms.TreeNode treeNode18 = new System.Windows.Forms.TreeNode("客户信息管理"); - System.Windows.Forms.TreeNode treeNode19 = new System.Windows.Forms.TreeNode("顾客消费账单"); - System.Windows.Forms.TreeNode treeNode20 = new System.Windows.Forms.TreeNode("客户管理", new System.Windows.Forms.TreeNode[] { - treeNode17, + treeNode15, + treeNode16}); + System.Windows.Forms.TreeNode treeNode18 = new System.Windows.Forms.TreeNode("会员等级规则"); + System.Windows.Forms.TreeNode treeNode19 = new System.Windows.Forms.TreeNode("客户信息管理"); + System.Windows.Forms.TreeNode treeNode20 = new System.Windows.Forms.TreeNode("顾客消费账单"); + System.Windows.Forms.TreeNode treeNode21 = new System.Windows.Forms.TreeNode("客户管理", new System.Windows.Forms.TreeNode[] { treeNode18, - treeNode19}); - System.Windows.Forms.TreeNode treeNode21 = new System.Windows.Forms.TreeNode("员工管理"); - System.Windows.Forms.TreeNode treeNode22 = new System.Windows.Forms.TreeNode("公告日志"); - System.Windows.Forms.TreeNode treeNode23 = new System.Windows.Forms.TreeNode("上传公告日志"); - System.Windows.Forms.TreeNode treeNode24 = new System.Windows.Forms.TreeNode("人事管理", new System.Windows.Forms.TreeNode[] { - treeNode21, + treeNode19, + treeNode20}); + System.Windows.Forms.TreeNode treeNode22 = new System.Windows.Forms.TreeNode("员工管理"); + System.Windows.Forms.TreeNode treeNode23 = new System.Windows.Forms.TreeNode("公告日志"); + System.Windows.Forms.TreeNode treeNode24 = new System.Windows.Forms.TreeNode("上传公告日志"); + System.Windows.Forms.TreeNode treeNode25 = new System.Windows.Forms.TreeNode("人事管理", new System.Windows.Forms.TreeNode[] { treeNode22, - treeNode23}); - System.Windows.Forms.TreeNode treeNode25 = new System.Windows.Forms.TreeNode("商品管理"); - System.Windows.Forms.TreeNode treeNode26 = new System.Windows.Forms.TreeNode("仓库物资"); - System.Windows.Forms.TreeNode treeNode27 = new System.Windows.Forms.TreeNode("物资管理", new System.Windows.Forms.TreeNode[] { - treeNode25, - treeNode26}); - System.Windows.Forms.TreeNode treeNode28 = new System.Windows.Forms.TreeNode("员工操作日志"); - System.Windows.Forms.TreeNode treeNode29 = new System.Windows.Forms.TreeNode("添加管理员"); - System.Windows.Forms.TreeNode treeNode30 = new System.Windows.Forms.TreeNode("权限分配"); - System.Windows.Forms.TreeNode treeNode31 = new System.Windows.Forms.TreeNode("启/禁用管理员"); - System.Windows.Forms.TreeNode treeNode32 = new System.Windows.Forms.TreeNode("系统模块管理"); - System.Windows.Forms.TreeNode treeNode33 = new System.Windows.Forms.TreeNode("系统管理", new System.Windows.Forms.TreeNode[] { - treeNode29, + treeNode23, + treeNode24}); + System.Windows.Forms.TreeNode treeNode26 = new System.Windows.Forms.TreeNode("商品管理"); + System.Windows.Forms.TreeNode treeNode27 = new System.Windows.Forms.TreeNode("仓库物资"); + System.Windows.Forms.TreeNode treeNode28 = new System.Windows.Forms.TreeNode("物资管理", new System.Windows.Forms.TreeNode[] { + treeNode26, + treeNode27}); + System.Windows.Forms.TreeNode treeNode29 = new System.Windows.Forms.TreeNode("员工操作日志"); + System.Windows.Forms.TreeNode treeNode30 = new System.Windows.Forms.TreeNode("添加管理员"); + System.Windows.Forms.TreeNode treeNode31 = new System.Windows.Forms.TreeNode("权限分配"); + System.Windows.Forms.TreeNode treeNode32 = new System.Windows.Forms.TreeNode("启/禁用管理员"); + System.Windows.Forms.TreeNode treeNode33 = new System.Windows.Forms.TreeNode("系统模块管理"); + System.Windows.Forms.TreeNode treeNode34 = new System.Windows.Forms.TreeNode("系统管理", new System.Windows.Forms.TreeNode[] { treeNode30, treeNode31, - treeNode32}); + treeNode32, + treeNode33}); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmBackgroundSystem)); this.Aside = new Sunny.UI.UINavMenu(); - this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.pnlForm = new Sunny.UI.UIPanel(); this.uiLabel1 = new Sunny.UI.UILabel(); this.lblScroll = new Sunny.UI.UIScrollingText(); this.lbTime = new Sunny.UI.UILabel(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.cmsMenu = new Sunny.UI.UIContextMenuStrip(); - this.tsmiMySpace = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiUpdatePwd = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.btnSetting = new Sunny.UI.UIButton(); @@ -143,53 +143,55 @@ namespace SYS.FormUI treeNode14.Text = "房态图一览"; treeNode15.Name = "节点7"; treeNode15.Text = "新增客房"; - treeNode16.Name = "RoomManager"; - treeNode16.Text = "客房管理"; - treeNode17.Name = "节点0"; - treeNode17.Text = "会员等级规则"; - treeNode18.Name = "节点8"; - treeNode18.Text = "客户信息管理"; - treeNode19.Name = "节点9"; - treeNode19.Text = "顾客消费账单"; - treeNode20.Name = "CustomerManager"; - treeNode20.Text = "客户管理"; - treeNode21.Name = "节点6"; - treeNode21.Text = "员工管理"; - treeNode22.Name = "节点15"; - treeNode22.Text = "公告日志"; - treeNode23.Name = "节点16"; - treeNode23.Text = "上传公告日志"; - treeNode24.Name = "HumanResourcesManager"; - treeNode24.Text = "人事管理"; - treeNode25.Name = "节点11"; - treeNode25.Text = "商品管理"; - treeNode26.Name = "节点12"; - treeNode26.Text = "仓库物资"; - treeNode27.Name = "MaterialManager"; - treeNode27.Text = "物资管理"; - treeNode28.Name = "OperationLogManager"; - treeNode28.Text = "员工操作日志"; - treeNode29.Name = "节点2"; - treeNode29.Text = "添加管理员"; - treeNode30.Name = "节点1"; - treeNode30.Text = "权限分配"; - treeNode31.Name = "节点3"; - treeNode31.Text = "启/禁用管理员"; - treeNode32.Name = "节点2"; - treeNode32.Text = "系统模块管理"; - treeNode33.Name = "AdminManager"; - treeNode33.Text = "系统管理"; + treeNode16.Name = "节点0"; + treeNode16.Text = "客房配置"; + treeNode17.Name = "RoomManager"; + treeNode17.Text = "客房管理"; + treeNode18.Name = "节点0"; + treeNode18.Text = "会员等级规则"; + treeNode19.Name = "节点8"; + treeNode19.Text = "客户信息管理"; + treeNode20.Name = "节点9"; + treeNode20.Text = "顾客消费账单"; + treeNode21.Name = "CustomerManager"; + treeNode21.Text = "客户管理"; + treeNode22.Name = "节点6"; + treeNode22.Text = "员工管理"; + treeNode23.Name = "节点15"; + treeNode23.Text = "公告日志"; + treeNode24.Name = "节点16"; + treeNode24.Text = "上传公告日志"; + treeNode25.Name = "HumanResourcesManager"; + treeNode25.Text = "人事管理"; + treeNode26.Name = "节点11"; + treeNode26.Text = "商品管理"; + treeNode27.Name = "节点12"; + treeNode27.Text = "仓库物资"; + treeNode28.Name = "MaterialManager"; + treeNode28.Text = "物资管理"; + treeNode29.Name = "OperationLogManager"; + treeNode29.Text = "员工操作日志"; + treeNode30.Name = "节点2"; + treeNode30.Text = "添加管理员"; + treeNode31.Name = "节点1"; + treeNode31.Text = "权限分配"; + treeNode32.Name = "节点3"; + treeNode32.Text = "启/禁用管理员"; + treeNode33.Name = "节点2"; + treeNode33.Text = "系统模块管理"; + treeNode34.Name = "AdminManager"; + treeNode34.Text = "系统管理"; this.Aside.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { treeNode5, treeNode9, treeNode11, treeNode13, - treeNode16, - treeNode20, - treeNode24, - treeNode27, + treeNode17, + treeNode21, + treeNode25, treeNode28, - treeNode33}); + treeNode29, + treeNode34}); this.Aside.ShowLines = false; this.Aside.Size = new System.Drawing.Size(234, 624); this.Aside.Style = Sunny.UI.UIStyle.Custom; @@ -198,12 +200,6 @@ namespace SYS.FormUI this.Aside.MenuItemClick += new Sunny.UI.UINavMenu.OnMenuItemClick(this.Aside_MenuItemClick); this.Aside.Enter += new System.EventHandler(this.Aside_Enter); // - // imageList1 - // - this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); - this.imageList1.TransparentColor = System.Drawing.Color.Transparent; - this.imageList1.Images.SetKeyName(0, "财务.png"); - // // pnlForm // this.pnlForm.Font = new System.Drawing.Font("微软雅黑", 12F); @@ -267,33 +263,24 @@ namespace SYS.FormUI this.cmsMenu.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255))))); this.cmsMenu.Font = new System.Drawing.Font("微软雅黑", 12F); this.cmsMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.tsmiMySpace, this.tsmiUpdatePwd, this.toolStripSeparator1}); this.cmsMenu.Name = "cmsMenu"; - this.cmsMenu.Size = new System.Drawing.Size(145, 62); + this.cmsMenu.Size = new System.Drawing.Size(181, 58); this.cmsMenu.MouseDown += new System.Windows.Forms.MouseEventHandler(this.cmsMenu_MouseDown); // - // tsmiMySpace - // - this.tsmiMySpace.Image = global::SYS.FormUI.Properties.Resources.个人中心; - this.tsmiMySpace.Name = "tsmiMySpace"; - this.tsmiMySpace.Size = new System.Drawing.Size(144, 26); - this.tsmiMySpace.Text = "个人中心"; - this.tsmiMySpace.Click += new System.EventHandler(this.tsmiMySpace_Click); - // // tsmiUpdatePwd // this.tsmiUpdatePwd.Image = global::SYS.FormUI.Properties.Resources.修改; this.tsmiUpdatePwd.Name = "tsmiUpdatePwd"; - this.tsmiUpdatePwd.Size = new System.Drawing.Size(144, 26); + this.tsmiUpdatePwd.Size = new System.Drawing.Size(180, 26); this.tsmiUpdatePwd.Text = "修改密码"; this.tsmiUpdatePwd.Click += new System.EventHandler(this.tsmiUpdatePwd_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(141, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6); // // btnSetting // @@ -324,7 +311,7 @@ namespace SYS.FormUI // btnLocked // this.btnLocked.BackColor = System.Drawing.Color.Transparent; - this.btnLocked.BackgroundImage = global::SYS.FormUI.Properties.Resources._lock; + this.btnLocked.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnLocked.BackgroundImage"))); this.btnLocked.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.btnLocked.Cursor = System.Windows.Forms.Cursors.Arrow; this.btnLocked.FillColor = System.Drawing.Color.Transparent; @@ -375,7 +362,6 @@ namespace SYS.FormUI #endregion private Sunny.UI.UINavMenu Aside; - private System.Windows.Forms.ImageList imageList1; private Sunny.UI.UIPanel pnlForm; private Sunny.UI.UIButton btnLocked; private Sunny.UI.UIButton btnSetting; @@ -386,6 +372,5 @@ namespace SYS.FormUI private Sunny.UI.UIContextMenuStrip cmsMenu; private System.Windows.Forms.ToolStripMenuItem tsmiUpdatePwd; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - private System.Windows.Forms.ToolStripMenuItem tsmiMySpace; } } \ No newline at end of file diff --git a/SYS.FormUI/AppMain/FrmBackgroundSystem.cs b/SYS.FormUI/AppMain/FrmBackgroundSystem.cs index 6846633..8bce7dc 100644 --- a/SYS.FormUI/AppMain/FrmBackgroundSystem.cs +++ b/SYS.FormUI/AppMain/FrmBackgroundSystem.cs @@ -186,6 +186,13 @@ namespace SYS.FormUI pnlForm.Controls.Add(frmAddRoom); frmAddRoom.Show(); break; + case "客房配置": + pnlForm.Controls.Clear(); + FrmRoomConfig frmRoomConfig = new FrmRoomConfig(); + frmRoomConfig.TopLevel = false; + pnlForm.Controls.Add(frmRoomConfig); + frmRoomConfig.Show(); + break; case "客户管理": break; case "会员等级规则": @@ -382,8 +389,9 @@ namespace SYS.FormUI private void tsmiMySpace_Click(object sender, EventArgs e) { - //FrmMySpace frmMySpace = new FrmMySpace(); - //frmMySpace.ShowDialog(); + FrmMySpace frmMySpace = new FrmMySpace(); + frmMySpace.Text = AdminInfo.Name + "的个人中心"; + frmMySpace.ShowDialog(); } private void FrmBackgroundSystem_FormClosing(object sender, FormClosingEventArgs e) diff --git a/SYS.FormUI/AppMain/FrmBackgroundSystem.resx b/SYS.FormUI/AppMain/FrmBackgroundSystem.resx index 57c37df..a45cd28 100644 --- a/SYS.FormUI/AppMain/FrmBackgroundSystem.resx +++ b/SYS.FormUI/AppMain/FrmBackgroundSystem.resx @@ -117,50 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC6 - BwAAAk1TRnQBSQFMAwEBAAHAAQABwAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA - AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA - AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA - AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm - AwABmQMAAcwCAAEzAwACMwIAATMBZgIAATMBmQIAATMBzAIAATMB/wIAAWYDAAFmATMCAAJmAgABZgGZ - AgABZgHMAgABZgH/AgABmQMAAZkBMwIAAZkBZgIAApkCAAGZAcwCAAGZAf8CAAHMAwABzAEzAgABzAFm - AgABzAGZAgACzAIAAcwB/wIAAf8BZgIAAf8BmQIAAf8BzAEAATMB/wIAAf8BAAEzAQABMwEAAWYBAAEz - AQABmQEAATMBAAHMAQABMwEAAf8BAAH/ATMCAAMzAQACMwFmAQACMwGZAQACMwHMAQACMwH/AQABMwFm - AgABMwFmATMBAAEzAmYBAAEzAWYBmQEAATMBZgHMAQABMwFmAf8BAAEzAZkCAAEzAZkBMwEAATMBmQFm - AQABMwKZAQABMwGZAcwBAAEzAZkB/wEAATMBzAIAATMBzAEzAQABMwHMAWYBAAEzAcwBmQEAATMCzAEA - ATMBzAH/AQABMwH/ATMBAAEzAf8BZgEAATMB/wGZAQABMwH/AcwBAAEzAv8BAAFmAwABZgEAATMBAAFm - AQABZgEAAWYBAAGZAQABZgEAAcwBAAFmAQAB/wEAAWYBMwIAAWYCMwEAAWYBMwFmAQABZgEzAZkBAAFm - ATMBzAEAAWYBMwH/AQACZgIAAmYBMwEAA2YBAAJmAZkBAAJmAcwBAAFmAZkCAAFmAZkBMwEAAWYBmQFm - AQABZgKZAQABZgGZAcwBAAFmAZkB/wEAAWYBzAIAAWYBzAEzAQABZgHMAZkBAAFmAswBAAFmAcwB/wEA - AWYB/wIAAWYB/wEzAQABZgH/AZkBAAFmAf8BzAEAAcwBAAH/AQAB/wEAAcwBAAKZAgABmQEzAZkBAAGZ - AQABmQEAAZkBAAHMAQABmQMAAZkCMwEAAZkBAAFmAQABmQEzAcwBAAGZAQAB/wEAAZkBZgIAAZkBZgEz - AQABmQEzAWYBAAGZAWYBmQEAAZkBZgHMAQABmQEzAf8BAAKZATMBAAKZAWYBAAOZAQACmQHMAQACmQH/ - AQABmQHMAgABmQHMATMBAAFmAcwBZgEAAZkBzAGZAQABmQLMAQABmQHMAf8BAAGZAf8CAAGZAf8BMwEA - AZkBzAFmAQABmQH/AZkBAAGZAf8BzAEAAZkC/wEAAcwDAAGZAQABMwEAAcwBAAFmAQABzAEAAZkBAAHM - AQABzAEAAZkBMwIAAcwCMwEAAcwBMwFmAQABzAEzAZkBAAHMATMBzAEAAcwBMwH/AQABzAFmAgABzAFm - ATMBAAGZAmYBAAHMAWYBmQEAAcwBZgHMAQABmQFmAf8BAAHMAZkCAAHMAZkBMwEAAcwBmQFmAQABzAKZ - AQABzAGZAcwBAAHMAZkB/wEAAswCAALMATMBAALMAWYBAALMAZkBAAPMAQACzAH/AQABzAH/AgABzAH/ - ATMBAAGZAf8BZgEAAcwB/wGZAQABzAH/AcwBAAHMAv8BAAHMAQABMwEAAf8BAAFmAQAB/wEAAZkBAAHM - ATMCAAH/AjMBAAH/ATMBZgEAAf8BMwGZAQAB/wEzAcwBAAH/ATMB/wEAAf8BZgIAAf8BZgEzAQABzAJm - AQAB/wFmAZkBAAH/AWYBzAEAAcwBZgH/AQAB/wGZAgAB/wGZATMBAAH/AZkBZgEAAf8CmQEAAf8BmQHM - AQAB/wGZAf8BAAH/AcwCAAH/AcwBMwEAAf8BzAFmAQAB/wHMAZkBAAH/AswBAAH/AcwB/wEAAv8BMwEA - AcwB/wFmAQAC/wGZAQAC/wHMAQACZgH/AQABZgH/AWYBAAFmAv8BAAH/AmYBAAH/AWYB/wEAAv8BZgEA - ASEBAAGlAQADXwEAA3cBAAOGAQADlgEAA8sBAAOyAQAD1wEAA90BAAPjAQAD6gEAA/EBAAP4AQAB8AH7 - Af8BAAGkAqABAAOAAwAB/wIAAf8DAAL/AQAB/wMAAf8BAAH/AQAC/wIAA/9CAAH0Df8yAAH/BgAB9AUA - Af8yAAH/BgAB9AUAAf8yAAH/BgAB9AUAAf8yAAH/BAAF9AMAAf8yAAH/AwAB/wX0AwAB/zIAAf8FAAH/ - AvQEAAH/MgAB/wQAAf8CAAL0AwAB/zIAAf8MAAH/MgAN/wH0MwAM9DQADPQ2AAj/AfSzAAFCAU0BPgcA - AT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/AQAC/wYAAYABAQYAAb8BfQYAAb8BfQYAAb8BfQYA - AbwBHQYAAbgBHQYAAb4BPQYAAb0BnQYAAb8B/QYAAYABAQYAAcABAwYAAcABAwYAAfABBwYAAv8GAAL/ - BgAL - - 143, 17 @@ -168,6 +124,18 @@ 239, 17 + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAYJJREFUWEft + VztOw0AUzBEoKILtIhUFLSUNDdQIiYqGCiFEGVGkSk1DQWyTihPkDNwlJ+AGjzfS7Gq1XpPPvhRIHmmk + 1bx5s0/22pZHA/ZBsZTjopWLspFHEGtoLB8WuuFSKT1c0nYYJDZMknZbaPAs3KSoZV7Vcls0cqPrV9V+ + gvqMbTbQDa6DcBl/yhlLHieNnGtt7TzoYSkfGjZ1wWUtD5Q7UN9LMMCUcj7KVr78AAs5pdwBat6nPZTz + oYHfLphSL/wA2kMpHwhzwZR64XzooZQPhLlgSr1wPvRQ2g/jViZ6kOYgwlyw0/rofOhxGrIYux1w0oMg + G/7x9HSgDatOQD5XjN8MNftLbsjtzwTMUbMFzQfAIXsGsY5qKZoO0PnsQos8Me0GqD7kklYPaClvQNMr + 8ESrR9XIW8IX0nSAdbGQK9rhv4vqKdofQtp39m8EzFFzisMA/mODdVRL0XyAXfmPBqhauU8EZBGvbMZv + B7zZ3D3Opv47TN7liNEDAoxGv+Hphqh7QmzjAAAAAElFTkSuQmCC + + AAABAAEAICAAAAEAGABcAgAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAAFz diff --git a/SYS.FormUI/AppUserControls/ucRoomList.Designer.cs b/SYS.FormUI/AppUserControls/ucRoomList.Designer.cs index 2098b29..af78be7 100644 --- a/SYS.FormUI/AppUserControls/ucRoomList.Designer.cs +++ b/SYS.FormUI/AppUserControls/ucRoomList.Designer.cs @@ -55,48 +55,48 @@ this.tsmiSelectUserInfo, this.tsmiChangeState}); this.cmsMain.Name = "cmsMain"; - this.cmsMain.Size = new System.Drawing.Size(211, 208); + this.cmsMain.Size = new System.Drawing.Size(149, 136); this.cmsMain.Opening += new System.ComponentModel.CancelEventHandler(this.cmsMain_Opening); // // tsmiReserRoom // this.tsmiReserRoom.Name = "tsmiReserRoom"; - this.tsmiReserRoom.Size = new System.Drawing.Size(210, 34); + this.tsmiReserRoom.Size = new System.Drawing.Size(148, 22); this.tsmiReserRoom.Text = "预约房间"; this.tsmiReserRoom.Click += new System.EventHandler(this.tsmiReserRoom_Click); // // tsmiCheckIn // this.tsmiCheckIn.Name = "tsmiCheckIn"; - this.tsmiCheckIn.Size = new System.Drawing.Size(210, 34); + this.tsmiCheckIn.Size = new System.Drawing.Size(148, 22); this.tsmiCheckIn.Text = "入住房间"; this.tsmiCheckIn.Click += new System.EventHandler(this.tsmiCheckIn_Click); // // tsmiCheckOut // this.tsmiCheckOut.Name = "tsmiCheckOut"; - this.tsmiCheckOut.Size = new System.Drawing.Size(210, 34); + this.tsmiCheckOut.Size = new System.Drawing.Size(148, 22); this.tsmiCheckOut.Text = "结算退房"; this.tsmiCheckOut.Click += new System.EventHandler(this.tsmiCheckOut_Click); // // tsmiChangeRoom // this.tsmiChangeRoom.Name = "tsmiChangeRoom"; - this.tsmiChangeRoom.Size = new System.Drawing.Size(210, 34); + this.tsmiChangeRoom.Size = new System.Drawing.Size(148, 22); this.tsmiChangeRoom.Text = "转换房间"; this.tsmiChangeRoom.Click += new System.EventHandler(this.tsmiChangeRoom_Click); // // tsmiSelectUserInfo // this.tsmiSelectUserInfo.Name = "tsmiSelectUserInfo"; - this.tsmiSelectUserInfo.Size = new System.Drawing.Size(210, 34); + this.tsmiSelectUserInfo.Size = new System.Drawing.Size(148, 22); this.tsmiSelectUserInfo.Text = "查看用户信息"; this.tsmiSelectUserInfo.Click += new System.EventHandler(this.tsmiSelectUserInfo_Click); // // tsmiChangeState // this.tsmiChangeState.Name = "tsmiChangeState"; - this.tsmiChangeState.Size = new System.Drawing.Size(210, 34); + this.tsmiChangeState.Size = new System.Drawing.Size(148, 22); this.tsmiChangeState.Text = "修改房间状态"; this.tsmiChangeState.Click += new System.EventHandler(this.tsmiChangeState_Click); // @@ -106,10 +106,9 @@ this.lblCustoNo.BackColor = System.Drawing.Color.Transparent; this.lblCustoNo.ContextMenuStrip = this.cmsMain; this.lblCustoNo.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblCustoNo.Location = new System.Drawing.Point(40, 103); - this.lblCustoNo.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lblCustoNo.Location = new System.Drawing.Point(26, 59); this.lblCustoNo.Name = "lblCustoNo"; - this.lblCustoNo.Size = new System.Drawing.Size(111, 29); + this.lblCustoNo.Size = new System.Drawing.Size(62, 17); this.lblCustoNo.TabIndex = 10; this.lblCustoNo.Text = "CustoNo"; this.lblCustoNo.MouseClick += new System.Windows.Forms.MouseEventHandler(this.lblCustoNo_MouseClick); @@ -120,10 +119,9 @@ this.lblRoomType.BackColor = System.Drawing.Color.Transparent; this.lblRoomType.ContextMenuStrip = this.cmsMain; this.lblRoomType.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblRoomType.Location = new System.Drawing.Point(42, 5); - this.lblRoomType.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lblRoomType.Location = new System.Drawing.Point(27, 3); this.lblRoomType.Name = "lblRoomType"; - this.lblRoomType.Size = new System.Drawing.Size(109, 29); + this.lblRoomType.Size = new System.Drawing.Size(61, 17); this.lblRoomType.TabIndex = 9; this.lblRoomType.Text = "RoomTy"; this.lblRoomType.MouseClick += new System.Windows.Forms.MouseEventHandler(this.lblRoomType_MouseClick); @@ -135,10 +133,9 @@ this.lblRoomNo.ContextMenuStrip = this.cmsMain; this.lblRoomNo.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblRoomNo.ForeColor = System.Drawing.Color.Black; - this.lblRoomNo.Location = new System.Drawing.Point(42, 54); - this.lblRoomNo.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lblRoomNo.Location = new System.Drawing.Point(27, 31); this.lblRoomNo.Name = "lblRoomNo"; - this.lblRoomNo.Size = new System.Drawing.Size(113, 29); + this.lblRoomNo.Size = new System.Drawing.Size(63, 17); this.lblRoomNo.TabIndex = 8; this.lblRoomNo.Text = "RoomNo"; this.lblRoomNo.MouseClick += new System.Windows.Forms.MouseEventHandler(this.lblRoomNo_MouseClick); @@ -154,10 +151,10 @@ // lblMark // this.lblMark.Font = new System.Drawing.Font("微软雅黑", 12F); - this.lblMark.Location = new System.Drawing.Point(68, 84); - this.lblMark.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lblMark.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + this.lblMark.Location = new System.Drawing.Point(36, 48); this.lblMark.Name = "lblMark"; - this.lblMark.Size = new System.Drawing.Size(28, 40); + this.lblMark.Size = new System.Drawing.Size(15, 23); this.lblMark.TabIndex = 11; this.lblMark.Text = "uiLabel1"; this.lblMark.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -165,7 +162,7 @@ // // ucRoomList // - this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.MenuHighlight; this.BackgroundImage = global::SYS.FormUI.Properties.Resources.可住状态; @@ -176,9 +173,8 @@ this.Controls.Add(this.lblRoomType); this.Controls.Add(this.lblRoomNo); this.DoubleBuffered = true; - this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.Name = "ucRoomList"; - this.Size = new System.Drawing.Size(174, 138); + this.Size = new System.Drawing.Size(95, 79); this.uttTips.SetToolTip(this, "a)、点击鼠标左键查看房间信息\r\nb)、点击鼠标右键打开选项菜单\r\nc)、快速双击鼠标左键可快速入住/查看信息"); this.Load += new System.EventHandler(this.ucRoomList_Load); this.SizeChanged += new System.EventHandler(this.ucRoomList_SizeChanged); diff --git a/SYS.FormUI/Properties/AssemblyInfo.cs b/SYS.FormUI/Properties/AssemblyInfo.cs index 7fc1ecd..896ee96 100644 --- a/SYS.FormUI/Properties/AssemblyInfo.cs +++ b/SYS.FormUI/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.0.1")] -[assembly: AssemblyFileVersion("2.0.0.1")] +[assembly: AssemblyVersion("2.0.0.2")] +[assembly: AssemblyFileVersion("2.0.0.2")] diff --git a/SYS.FormUI/Properties/Resources.resx b/SYS.FormUI/Properties/Resources.resx index e4980fb..c334b59 100644 --- a/SYS.FormUI/Properties/Resources.resx +++ b/SYS.FormUI/Properties/Resources.resx @@ -118,8 +118,11 @@ 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 + + ..\images\复制.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 @@ -127,9 +130,6 @@ ..\Resources\arrow-down-b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\餐饮部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\维修部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -148,8 +148,8 @@ ..\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\picCommodity.ImagePress.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 @@ -160,12 +160,12 @@ ..\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\picCommodity.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\picCustomer.ImagePress.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -190,9 +190,6 @@ ..\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\已住房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -211,20 +208,23 @@ ..\Resources\picRoom.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picCommodity.ImagePress.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\早上.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\注销.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\后勤部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\修改.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\可住房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\维修房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\后勤部卡片.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 @@ -244,14 +244,23 @@ ..\Resources\picRoom.ImageSelected.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\检查更新 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\脏房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\预约状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\总经办卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\上传照片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\picExtend.ImagePress.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -268,14 +277,14 @@ ..\Resources\uiButton1.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\picCommodity.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\脏房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\月亮.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\普通会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\picCustomer.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -283,11 +292,11 @@ ..\Resources\Alibaba-PuHuiTi-Regular.ttf;System.Byte[], mscorlib, 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\月亮.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\picExtend.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -295,28 +304,19 @@ ..\Resources\内控部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\lock.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\脏房icon1.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 - - ..\images\复制.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 + + ..\images\lockicon.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/SYS.FormUI.csproj b/SYS.FormUI/SYS.FormUI.csproj index f5aed1e..7fcffd4 100644 --- a/SYS.FormUI/SYS.FormUI.csproj +++ b/SYS.FormUI/SYS.FormUI.csproj @@ -238,6 +238,12 @@ FrmPosition.cs + + Form + + + FrmRoomConfig.cs + Form @@ -298,11 +304,11 @@ FrmAddRoom.cs - + Form - - FrmAddWorker.cs + + FrmWorkerInfo.cs Form @@ -334,11 +340,11 @@ FrmChangeRoom.cs - + Form - - FrmChangeWorker.cs + + FrmWorkerPanel.cs Form @@ -510,6 +516,9 @@ FrmPleaseWait.cs + + FrmRoomConfig.cs + FrmVipRule.cs @@ -529,8 +538,8 @@ FrmAddRoom.cs - - FrmAddWorker.cs + + FrmWorkerInfo.cs FrmDepartment.cs @@ -568,8 +577,8 @@ FrmChangeRoom.cs - - FrmChangeWorker.cs + + FrmWorkerPanel.cs FrmCheckIn.cs @@ -737,6 +746,7 @@ Always + Always @@ -991,6 +1001,10 @@ + + {3de4537c-6637-4d8d-9728-c923ea0b8b13} + EOM.TSHotelManager.Common.Util + {65501AF6-C629-448A-847E-1BCD60665865} SYS.Common diff --git a/SYS.FormUI/images/lockicon.png b/SYS.FormUI/images/lockicon.png new file mode 100644 index 0000000000000000000000000000000000000000..5f9a73a6e179192ce4b2daf0799671a770c858be GIT binary patch literal 594 zcmV-Y0Px%3`s;mR9Hvtm$7ftKorKm&q%B+3=kKIsU14<2hc9CgP2%aAyHz70f{a!AO;wK zt>i*knt=%f%)mhS4-gVaFja!HIxw&@)E_!GMlLw?|1LMch4dAd2yff zV)Q0q`LuQV6po-2Rc_{!JV4t`DpiK&z`WBwpo$+X3dcuJBVa!EvKg0q_#Q ziOd(m*(B!cDhOYI>m=@HV#2bG*)J1rb=4uUHUwBrVm@dDAna)a!cr!dV$OE>rA#<{ zs9Dzy*&fliZ7w$hVDuKif)lGUSiz_R8*%XfVB!iK>*-{W?%X?x)A<#+_8TWk;?{6~ zAmLqRn*jZ-HaE+DSK0+(S4$u^s_1L&kLaFq0Hfys&ecj#9sI&ZJpX6dD1hItuh#XB zDD8^>8o-(C+0djHa+8j!N23+^YwT8xX~)$Z0JpLD?J5Vw)6T4EL5JYHGio&l0HAFn zKH3FfbWgzQv;e*;#igXfH!fjl0VH;+dW_`@4u&q+N6 gy#5z>YE2aO3!oVLAvC23!2kdN07*qoM6N<$g2o05fdBvi literal 0 HcmV?d00001 -- Gitee From 4a536946dd0a153d4f1669b0602c3251a0a7330c Mon Sep 17 00:00:00 2001 From: Chunkit Yeung Date: Sun, 24 Mar 2024 15:46:41 +0800 Subject: [PATCH 2/2] add submodule --- topsky-hotel-manager-system-web-api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topsky-hotel-manager-system-web-api b/topsky-hotel-manager-system-web-api index 84a6690..ca9fe55 160000 --- a/topsky-hotel-manager-system-web-api +++ b/topsky-hotel-manager-system-web-api @@ -1 +1 @@ -Subproject commit 84a669090635d899e7d7d1a8611018280ba08eb0 +Subproject commit ca9fe55c27b1d4999e301136a0ce452c07620331 -- Gitee