diff --git a/EOM.Client.TopSkyHotelManagerSystem.sln b/EOM.Client.TopSkyHotelManagerSystem.sln index f847d43120e50abbca85d6462d8b2d3c3473b08e..406302158fae73fb6d07f59a005270f413d6c3f1 100644 --- a/EOM.Client.TopSkyHotelManagerSystem.sln +++ b/EOM.Client.TopSkyHotelManagerSystem.sln @@ -21,7 +21,7 @@ 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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.Common.Util", "topsky-hotel-manager-system-web-api\EOM.TSHotelManager.Common.Util\EOM.TSHotelManager.Common.Util.csproj", "{9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -57,10 +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 + {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -73,7 +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} + {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837} = {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 deleted file mode 100644 index dbdcea46b6e2047549bb86fc8f27032d25c0611f..0000000000000000000000000000000000000000 --- a/EOM.TSHotelManager.Common.Util/EOM.TSHotelManager.Common.Util.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - netstandard2.0 - - - diff --git a/EOM.TSHotelManager.Common.Util/Validator/NeedValidAttribute.cs b/EOM.TSHotelManager.Common.Util/Validator/NeedValidAttribute.cs deleted file mode 100644 index 1b1e088b645f4d3507c376d93427de56edc49bbc..0000000000000000000000000000000000000000 --- a/EOM.TSHotelManager.Common.Util/Validator/NeedValidAttribute.cs +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 94cf3ca7b0ca379aecd18753b2f4e4bb0bf3890f..0000000000000000000000000000000000000000 --- a/EOM.TSHotelManager.Common.Util/Validator/ValidateHelper.cs +++ /dev/null @@ -1,57 +0,0 @@ -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/App.config b/SYS.Common/App.config index 44ece1bd0778b3832aaa6cd5fa99a1677c5b7f90..13fef26e98fdf36f9825a88bde98c7cb5769174a 100644 --- a/SYS.Common/App.config +++ b/SYS.Common/App.config @@ -24,7 +24,7 @@ - + @@ -42,6 +42,10 @@ + + + + diff --git a/SYS.Common/SYS.Common.csproj b/SYS.Common/SYS.Common.csproj index 7e40ec74a4377477d252568d225d89f71955a17b..b440e1b179d543382c62def84e722a7e693a59d4 100644 --- a/SYS.Common/SYS.Common.csproj +++ b/SYS.Common/SYS.Common.csproj @@ -81,7 +81,7 @@ ..\packages\SixLabors.Fonts.1.0.0\lib\netstandard2.0\SixLabors.Fonts.dll - ..\packages\SixLabors.ImageSharp.2.1.4\lib\netstandard2.0\SixLabors.ImageSharp.dll + ..\packages\SixLabors.ImageSharp.2.1.8\lib\netstandard2.0\SixLabors.ImageSharp.dll @@ -102,8 +102,8 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll @@ -120,8 +120,8 @@ ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll - - ..\packages\System.Text.Encoding.CodePages.5.0.0\lib\net461\System.Text.Encoding.CodePages.dll + + ..\packages\System.Text.Encoding.CodePages.6.0.0\lib\net461\System.Text.Encoding.CodePages.dll ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll diff --git a/SYS.Common/packages.config b/SYS.Common/packages.config index 79fadf1b2fd6d26f0ef16325abe5b5e4e862a32b..18166f7e87c97dcf647269d2fe57f1aa18dee65b 100644 --- a/SYS.Common/packages.config +++ b/SYS.Common/packages.config @@ -9,16 +9,16 @@ - + - + - + \ No newline at end of file diff --git a/SYS.FormUI/App.config b/SYS.FormUI/App.config index 0491153fc7c88c775902d6ef64f9afac0b3e3af7..69efee671656fc0af0ab5715488ddc0072ef7adc 100644 --- a/SYS.FormUI/App.config +++ b/SYS.FormUI/App.config @@ -33,7 +33,7 @@ - + @@ -51,6 +51,10 @@ + + + + diff --git a/SYS.FormUI/AppFunction/FrmAddAdmin.cs b/SYS.FormUI/AppFunction/FrmAddAdmin.cs index 71f96dbcd86072b1de3867c719b1066084177ffb..705b30941163f0d4ef7257bab52108fcf2d5d47e 100644 --- a/SYS.FormUI/AppFunction/FrmAddAdmin.cs +++ b/SYS.FormUI/AppFunction/FrmAddAdmin.cs @@ -1,4 +1,5 @@ using EOM.TSHotelManager.Common.Core; +using EOM.TSHotelManager.Common.Util; using Sunny.UI; using SYS.Common; using System; @@ -47,7 +48,7 @@ namespace SYS.FormUI DeleteMk = 0, datains_usr = AdminInfo.Account }; - if (CheckInputs(admin)) + if (ValidateHelper.Validate(admin)) { result = HttpHelper.Request("Admin​/AddAdmin", HttpHelper.ModelToJson(admin)); if (result.statusCode != 200) @@ -78,32 +79,6 @@ namespace SYS.FormUI cbAccountType.DisplayMember = "type_name"; } - public bool CheckInputs(Admin admin) - { - bool result = true; - if (string.IsNullOrWhiteSpace(admin.AdminAccount)) - { - result = false; - } - if (string.IsNullOrWhiteSpace(admin.AdminPassword)) - { - result = false; - } - if (string.IsNullOrWhiteSpace(admin.AdminName)) - { - result = false; - } - if (string.IsNullOrWhiteSpace(admin.IsAdmin + "")) - { - result = false; - } - if (string.IsNullOrWhiteSpace(admin.AdminType)) - { - result = false; - } - return result; - } - private void cbAccountType_SelectedIndexChanged(object sender, EventArgs e) { if (cbAccountType.Text == "超级管理员") diff --git a/SYS.FormUI/AppFunction/FrmAddRoom.cs b/SYS.FormUI/AppFunction/FrmAddRoom.cs index 63e103481186bf350eacaf58003f89db4b48ab80..cd697b864d16364f6b3951b0abde2b45fc22aa35 100644 --- a/SYS.FormUI/AppFunction/FrmAddRoom.cs +++ b/SYS.FormUI/AppFunction/FrmAddRoom.cs @@ -22,6 +22,7 @@ * */ using EOM.TSHotelManager.Common.Core; +using EOM.TSHotelManager.Common.Util; using Sunny.UI; using SYS.Common; using System; @@ -58,18 +59,18 @@ namespace SYS.FormUI txtMoney.Text = Convert.ToDecimal(txtMoney.Text) <= 0 ? roomType.RoomRent.ToString() : txtMoney.Text; txtDeposit.Text = Convert.ToDecimal(txtDeposit.Text) <= 0 ? roomType.RoomDeposit.ToString() : txtDeposit.Text; - if (!string.IsNullOrWhiteSpace(txtRoomNo.Text) && !txtMoney.Text.IsNullOrWhiteSpace() && !txtDeposit.Text.IsNullOrWhiteSpace()) + rn = new Room() + { + RoomNo = txtRoomNo.Text, + RoomType = cboRoomType.SelectedIndex, + RoomMoney = Convert.ToDecimal(txtMoney.Text), + RoomPosition = txtRoomPosition.Text, + RoomStateId = 0, + RoomDeposit = Convert.ToDecimal(txtDeposit.Text), + datains_usr = AdminInfo.Account + }; + if (ValidateHelper.Validate(rn)) { - rn = new Room() - { - RoomNo = txtRoomNo.Text, - RoomType = cboRoomType.SelectedIndex, - RoomMoney = Convert.ToDecimal(txtMoney.Text), - RoomPosition = txtRoomPosition.Text, - RoomStateId = 0, - RoomDeposit = Convert.ToDecimal(txtDeposit.Text), - datains_usr = AdminInfo.Account - }; result = HttpHelper.Request("Room​/InsertRoom", HttpHelper.ModelToJson(rn)); if (result.statusCode != 200) { @@ -96,6 +97,7 @@ namespace SYS.FormUI { UIMessageBox.Show("房间信息不完整，请重试！"); } + } diff --git a/SYS.FormUI/AppFunction/FrmCash.cs b/SYS.FormUI/AppFunction/FrmCash.cs index 33f99cea9aff63940806c7036e97b9df15e7aec0..57355609ca05df42d13d6d1d66c3d2b14bf74b86 100644 --- a/SYS.FormUI/AppFunction/FrmCash.cs +++ b/SYS.FormUI/AppFunction/FrmCash.cs @@ -22,6 +22,7 @@ * */ using EOM.TSHotelManager.Common.Core; +using EOM.TSHotelManager.Common.Util; using Sunny.UI; using SYS.Common; using System; @@ -84,35 +85,6 @@ namespace SYS.FormUI dgvCashList.DataSource = HttpHelper.JsonToList(result.message); } - public bool CheckInput(Cash cash) - { - if (string.IsNullOrWhiteSpace(cash.CashNo)) - { - return false; - } - if (string.IsNullOrWhiteSpace(cash.CashName)) - { - return false; - } - if (string.IsNullOrWhiteSpace(cash.CashPerson)) - { - return false; - } - if (string.IsNullOrWhiteSpace(cash.CashPrice + "")) - { - return false; - } - if (string.IsNullOrWhiteSpace(cash.CashSource)) - { - return false; - } - if (string.IsNullOrWhiteSpace(cash.CashTime + "")) - { - return false; - } - return true; - } - private void btnOK_Click(object sender, EventArgs e) { Cash cash = new Cash() @@ -126,7 +98,7 @@ namespace SYS.FormUI CashPerson = cboCashPerson.SelectedValue.ToString(), datains_usr = AdminInfo.Account }; - if (CheckInput(cash)) + if (ValidateHelper.Validate(cash)) { bool dr = UIMessageBox.Show("请确认信息没有错误，一旦录入则无法修改！", "警告提醒", UIStyle.Orange, UIMessageBoxButtons.OKCancel); if (dr == true) diff --git a/SYS.FormUI/AppFunction/FrmChangePosition.Designer.cs b/SYS.FormUI/AppFunction/FrmChangePosition.Designer.cs index f968b4adf3059e3b7506980536ab923577c46987..fed194499a58595aab41bda2691b840a24dcb2e6 100644 --- a/SYS.FormUI/AppFunction/FrmChangePosition.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmChangePosition.Designer.cs @@ -88,22 +88,21 @@ // this.txtworkerId.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtworkerId.Enabled = false; - this.txtworkerId.FillColor = System.Drawing.Color.White; this.txtworkerId.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtworkerId.Location = new System.Drawing.Point(86, 44); this.txtworkerId.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtworkerId.Maximum = 2147483647D; - this.txtworkerId.Minimum = -2147483648D; this.txtworkerId.MinimumSize = new System.Drawing.Size(1, 1); this.txtworkerId.Name = "txtworkerId"; this.txtworkerId.Padding = new System.Windows.Forms.Padding(5); this.txtworkerId.Radius = 20; this.txtworkerId.ReadOnly = true; + this.txtworkerId.ShowText = false; this.txtworkerId.Size = new System.Drawing.Size(125, 29); this.txtworkerId.Style = Sunny.UI.UIStyle.Custom; this.txtworkerId.StyleCustomMode = true; this.txtworkerId.TabIndex = 106; this.txtworkerId.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtworkerId.Watermark = ""; // // label7 // @@ -118,22 +117,21 @@ // txtworkerName // this.txtworkerName.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtworkerName.FillColor = System.Drawing.Color.White; this.txtworkerName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtworkerName.Location = new System.Drawing.Point(86, 88); 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.ReadOnly = true; + this.txtworkerName.ShowText = false; this.txtworkerName.Size = new System.Drawing.Size(125, 29); this.txtworkerName.Style = Sunny.UI.UIStyle.Custom; this.txtworkerName.StyleCustomMode = true; this.txtworkerName.TabIndex = 108; this.txtworkerName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtworkerName.Watermark = ""; // // label8 // @@ -149,42 +147,41 @@ // this.txtPosition.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtPosition.Enabled = false; - this.txtPosition.FillColor = System.Drawing.Color.White; this.txtPosition.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtPosition.Location = new System.Drawing.Point(86, 177); this.txtPosition.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtPosition.Maximum = 2147483647D; - this.txtPosition.Minimum = -2147483648D; this.txtPosition.MinimumSize = new System.Drawing.Size(1, 1); this.txtPosition.Name = "txtPosition"; this.txtPosition.Padding = new System.Windows.Forms.Padding(5); this.txtPosition.Radius = 20; + this.txtPosition.ReadOnly = true; + this.txtPosition.ShowText = false; this.txtPosition.Size = new System.Drawing.Size(125, 29); this.txtPosition.Style = Sunny.UI.UIStyle.Custom; this.txtPosition.StyleCustomMode = true; this.txtPosition.TabIndex = 110; this.txtPosition.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtPosition.Watermark = ""; // // txtClub // this.txtClub.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtClub.Enabled = false; - this.txtClub.FillColor = System.Drawing.Color.White; this.txtClub.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtClub.Location = new System.Drawing.Point(86, 133); this.txtClub.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtClub.Maximum = 2147483647D; - this.txtClub.Minimum = -2147483648D; this.txtClub.MinimumSize = new System.Drawing.Size(1, 1); this.txtClub.Name = "txtClub"; this.txtClub.Padding = new System.Windows.Forms.Padding(5); this.txtClub.Radius = 20; this.txtClub.ReadOnly = true; + this.txtClub.ShowText = false; this.txtClub.Size = new System.Drawing.Size(125, 29); this.txtClub.Style = Sunny.UI.UIStyle.Custom; this.txtClub.StyleCustomMode = true; this.txtClub.TabIndex = 109; this.txtClub.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtClub.Watermark = ""; // // cboNewClub // @@ -192,6 +189,8 @@ this.cboNewClub.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboNewClub.FillColor = System.Drawing.Color.White; this.cboNewClub.Font = new System.Drawing.Font("微软雅黑", 12F); + this.cboNewClub.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); + this.cboNewClub.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.cboNewClub.Location = new System.Drawing.Point(299, 133); this.cboNewClub.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboNewClub.MinimumSize = new System.Drawing.Size(63, 0); @@ -199,8 +198,10 @@ this.cboNewClub.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cboNewClub.Radius = 20; this.cboNewClub.Size = new System.Drawing.Size(125, 29); + this.cboNewClub.SymbolSize = 24; this.cboNewClub.TabIndex = 111; this.cboNewClub.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.cboNewClub.Watermark = ""; this.cboNewClub.TextChanged += new System.EventHandler(this.cboNewClub_TextChanged); // // cboNewPosition @@ -209,6 +210,8 @@ this.cboNewPosition.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboNewPosition.FillColor = System.Drawing.Color.White; this.cboNewPosition.Font = new System.Drawing.Font("微软雅黑", 12F); + this.cboNewPosition.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); + this.cboNewPosition.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.cboNewPosition.Location = new System.Drawing.Point(299, 177); this.cboNewPosition.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboNewPosition.MinimumSize = new System.Drawing.Size(63, 0); @@ -216,8 +219,10 @@ this.cboNewPosition.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cboNewPosition.Radius = 20; this.cboNewPosition.Size = new System.Drawing.Size(125, 29); + this.cboNewPosition.SymbolSize = 24; this.cboNewPosition.TabIndex = 112; this.cboNewPosition.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.cboNewPosition.Watermark = ""; this.cboNewPosition.TextChanged += new System.EventHandler(this.cboNewPosition_TextChanged); // // btnOK @@ -231,12 +236,12 @@ this.btnOK.Size = new System.Drawing.Size(100, 40); this.btnOK.TabIndex = 113; this.btnOK.Text = "任 命"; + this.btnOK.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOK.Click += new System.EventHandler(this.btnOK_Click); // // FrmChangePosition // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(544, 216); this.Controls.Add(this.btnOK); this.Controls.Add(this.cboNewPosition); @@ -257,9 +262,9 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmChangePosition"; - this.ShowIcon = true; this.ShowTitleIcon = true; this.Text = "将XXX任命为XXX"; + this.ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 544, 216); this.Load += new System.EventHandler(this.FrmChangePosition_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/SYS.FormUI/AppFunction/FrmChangeRoom.cs b/SYS.FormUI/AppFunction/FrmChangeRoom.cs index 8a43eb914b526da641412e61120e0362929a142e..df8769039ee914b2e1962170490c62cec4f42d01 100644 --- a/SYS.FormUI/AppFunction/FrmChangeRoom.cs +++ b/SYS.FormUI/AppFunction/FrmChangeRoom.cs @@ -39,6 +39,7 @@ namespace SYS.FormUI ResponseMsg result = null; Dictionary dic = null; + static bool firstLoad = true; private void FrmChangeRoom_Load(object sender, EventArgs e) { @@ -52,110 +53,101 @@ namespace SYS.FormUI cboRoomList.DataSource = HttpHelper.JsonToList(result.message); cboRoomList.ValueMember = "RoomNo"; cboRoomList.DisplayMember = "RoomNo"; + firstLoad = false; } private void btnChangeRoom_Click(object sender, EventArgs e) { - using (TransactionScope scope = new TransactionScope()) + double sum = 0; + string lbu = LoginInfo.WorkerName; + string rno = ucRoomList.RoomNo.ToString(); + string nrno = cboRoomList.Text; + dic = new Dictionary() { - double sum = 0; - string lbu = LoginInfo.WorkerName; - string rno = ucRoomList.RoomNo.ToString(); - string nrno = cboRoomList.Text; - Room checkInRoom = new Room() - { - RoomNo = nrno, - CustoNo = ucRoomList.CustoNo, - RoomStateId = 1, - CheckTime = DateTime.Now, - datains_usr = LoginInfo.WorkerNo - }; - dic = new Dictionary() + { "no",rno} + }; + + result = HttpHelper.Request("Room/SelectRoomByRoomNo", null, dic); + if (result.statusCode != 200) + { + UIMessageBox.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + Room room = HttpHelper.JsonToModel(result.message); + Room checkInRoom = new Room() + { + RoomNo = nrno, + CustoNo = ucRoomList.CustoNo, + RoomStateId = 1, + CheckTime = DateTime.Now, + datains_usr = LoginInfo.WorkerNo + }; + dic = new Dictionary() { { "roomno",rno} }; - result = HttpHelper.Request("Room/DayByRoomNo", null, dic); - if (result.statusCode != 200) - { - UIMessageBox.ShowError("DayByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - if (rno.StartsWith("BD")) - { - sum = Convert.ToDouble(Convert.ToInt32(result.message) * 300); - } - if (rno.StartsWith("BS")) - { - sum = Convert.ToDouble(Convert.ToInt32(result.message) * 425); - } - if (rno.StartsWith("HD")) - { - sum = Convert.ToDouble(Convert.ToInt32(result.message) * 625); - } - if (rno.StartsWith("HS")) - { - sum = Convert.ToDouble(Convert.ToInt32(result.message) * 660); - } - if (rno.StartsWith("QL")) - { - sum = Convert.ToDouble(Convert.ToInt32(result.message) * 845); - } - if (rno.StartsWith("ZT")) - { - sum = Convert.ToDouble(Convert.ToInt32(result.message) * 1080); - } - Spend s = new Spend() - { - RoomNo = cboRoomList.Text, - SpendName = "居住" + rno + "共" + Convert.ToInt32(result.message) + "天", - SpendAmount = Convert.ToInt32(result.message), - CustoNo = ucRoomList.CustoNo, - SpendPrice = Convert.ToDecimal(sum), - SpendMoney = Convert.ToDecimal(sum), - SpendTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")), - MoneyState = SpendConsts.UnSettle, - }; + result = HttpHelper.Request("Room/DayByRoomNo", null, dic); + if (result.statusCode != 200) + { + UIMessageBox.ShowError("DayByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(result.message) * room.RoomMoney)); - result = HttpHelper.Request("Room​/UpdateRoomInfo", HttpHelper.ModelToJson(checkInRoom), null); - if (result.statusCode != 200) - { - UIMessageBox.ShowError("UpdateRoomInfo+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - bool result1 = result.message.ToString().Equals("true"); - dic = new Dictionary() + Spend s = new Spend() + { + RoomNo = cboRoomList.Text, + SpendName = "居住" + rno + "共" + Convert.ToInt32(result.message) + "天", + SpendAmount = Convert.ToInt32(result.message), + CustoNo = ucRoomList.CustoNo, + SpendPrice = Convert.ToDecimal(sum), + SpendMoney = Convert.ToDecimal(sum), + SpendTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")), + MoneyState = SpendConsts.UnSettle, + }; + + result = HttpHelper.Request("Room​/UpdateRoomInfo", HttpHelper.ModelToJson(checkInRoom), null); + if (result.statusCode != 200) + { + UIMessageBox.ShowError("UpdateRoomInfo+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + bool result1 = result.message.ToString().Equals("true"); + dic = new Dictionary() { { "room",rno} }; - result = HttpHelper.Request("Room​/UpdateRoomByRoomNo", null, dic); - if (result.statusCode != 200) - { - UIMessageBox.ShowError("UpdateRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - bool result2 = result.message.ToString().Equals("true"); - dic = new Dictionary() + result = HttpHelper.Request("Room​/UpdateRoomByRoomNo", null, dic); + if (result.statusCode != 200) + { + UIMessageBox.ShowError("UpdateRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + bool result2 = result.message.ToString().Equals("true"); + dic = new Dictionary() { { "No",rno} }; - result = HttpHelper.Request("Spend​/SelectSpendByCustoNo", null, dic); + result = HttpHelper.Request("Spend​/SelectSpendByCustoNo", null, dic); + if (result.statusCode != 200) + { + UIMessageBox.ShowError("SelectSpendByCustoNo+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + var result3 = HttpHelper.JsonToList(result.message); + if (result3.Count != 0) + { + Spend spend = new Spend() { RoomNo = nrno, CustoNo = ucRoomList.CustoNo }; + result = HttpHelper.Request("Spend​/UpdateSpendInfoByRoomNo", HttpHelper.ModelToJson(spend)); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectSpendByCustoNo+接口服务异常，请提交Issue或尝试更新版本！"); + UIMessageBox.ShowError("UpdateSpendInfoByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } - var result3 = HttpHelper.JsonToList(result.message); - if (result3.Count != 0) - { - Spend spend = new Spend() { RoomNo = nrno, CustoNo = ucRoomList.CustoNo }; - result = HttpHelper.Request("Spend​/UpdateSpendInfoByRoomNo", HttpHelper.ModelToJson(spend)); - if (result.statusCode != 200) - { - UIMessageBox.ShowError("UpdateSpendInfoByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - bool result4 = result.message.ToString().Equals("true"); - } + bool result4 = result.message.ToString().Equals("true"); + } + using (TransactionScope scope = new TransactionScope()) + { if (result1 && result2) { UIMessageBox.ShowSuccess("转房成功"); @@ -178,44 +170,23 @@ namespace SYS.FormUI UIMessageBox.ShowError("转房失败"); } } - - - - } - - private void btnClose_Click(object sender, EventArgs e) - { - this.Close(); } private void cboRoomList_TextChanged(object sender, EventArgs e) { - string str = cboRoomList.Text; - - if (str.Contains("BD")) - { - lblRoomType.Text = "标准单人间"; - } - else if (str.Contains("BS")) - { - lblRoomType.Text = "标准双人间"; - } - else if (str.Contains("HD")) - { - lblRoomType.Text = "豪华单人间"; - } - else if (str.Contains("HS")) + string str = firstLoad ? ucRoomList.RoomNo.ToString() : cboRoomList.SelectedValue.ToString(); + dic = new Dictionary() { - lblRoomType.Text = "豪华双人间"; - } - else if (str.Contains("QL")) - { - lblRoomType.Text = "情侣套房"; - } - else if (str.Contains("ZT")) + { "no",str} + }; + result = HttpHelper.Request("RoomType/SelectRoomTypeByRoomNo", null, dic); + if (result.statusCode != 200) { - lblRoomType.Text = "总统套房"; + UIMessageBox.ShowError("SelectRoomTypeByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); + return; } + RoomType roomType = HttpHelper.JsonToModel(result.message); + lblRoomType.Text = roomType.RoomName; } } } diff --git a/SYS.FormUI/AppFunction/FrmCheckOutForm.Designer.cs b/SYS.FormUI/AppFunction/FrmCheckOutForm.Designer.cs index 236a2d87251b3009b0f10b2e0f49826483f9561f..358e0946d3538a234bf1bfac7621736e19d0feb0 100644 --- a/SYS.FormUI/AppFunction/FrmCheckOutForm.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCheckOutForm.Designer.cs @@ -107,9 +107,9 @@ this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.uiTabControlMenu2 = new Sunny.UI.UITabControlMenu(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.txtReceipts = new Sunny.UI.UITextBox(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage3 = new System.Windows.Forms.TabPage(); - this.txtReceipts = new Sunny.UI.UITextBox(); ((System.ComponentModel.ISupportInitialize)(this.dgvSpendList)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvWti)).BeginInit(); this.uiTabControlMenu2.SuspendLayout(); @@ -131,6 +131,7 @@ this.btnBalance.TabIndex = 116; this.btnBalance.Text = "结 算"; this.btnBalance.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnBalance.Click += new System.EventHandler(this.btnBalance_Click); // // lblVIPPrice // @@ -382,6 +383,7 @@ this.dtpCheckTime.Size = new System.Drawing.Size(168, 35); this.dtpCheckTime.Style = Sunny.UI.UIStyle.Custom; this.dtpCheckTime.StyleCustomMode = true; + this.dtpCheckTime.Symbol = 559683; this.dtpCheckTime.TabIndex = 111; this.dtpCheckTime.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; this.dtpCheckTime.Watermark = ""; @@ -1012,6 +1014,22 @@ this.tabPage1.Text = "退房结算"; this.tabPage1.UseVisualStyleBackColor = true; // + // txtReceipts + // + this.txtReceipts.Cursor = System.Windows.Forms.Cursors.IBeam; + this.txtReceipts.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtReceipts.Location = new System.Drawing.Point(584, 328); + this.txtReceipts.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txtReceipts.MinimumSize = new System.Drawing.Size(1, 16); + this.txtReceipts.Name = "txtReceipts"; + this.txtReceipts.Padding = new System.Windows.Forms.Padding(5); + this.txtReceipts.ShowText = false; + this.txtReceipts.Size = new System.Drawing.Size(74, 26); + this.txtReceipts.TabIndex = 117; + this.txtReceipts.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; + this.txtReceipts.Watermark = ""; + this.txtReceipts.TextChanged += new System.EventHandler(this.txtReceipts_TextChanged); + // // tabPage2 // this.tabPage2.Controls.Add(this.cboCustoType); @@ -1034,7 +1052,7 @@ 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.Size = new System.Drawing.Size(664, 550); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "客户信息"; this.tabPage2.UseVisualStyleBackColor = true; @@ -1044,26 +1062,11 @@ 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.Size = new System.Drawing.Size(664, 550); 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.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; diff --git a/SYS.FormUI/AppFunction/FrmCheckOutForm.cs b/SYS.FormUI/AppFunction/FrmCheckOutForm.cs index 0a1176f737ff0095ee6ba45e9bb17006eaaa2964..63b90435cb53b66b2f5553db1da134debfeab152 100644 --- a/SYS.FormUI/AppFunction/FrmCheckOutForm.cs +++ b/SYS.FormUI/AppFunction/FrmCheckOutForm.cs @@ -147,11 +147,11 @@ namespace SYS.FormUI if (room.CheckTime == null) { - dtpCheckTime.Text = DateTime.Now.ToString("yyyy年MM月dd日"); + dtpCheckTime.Text = DateTime.Now.ToString("yyyy-MM-dd"); } else { - dtpCheckTime.Text = Convert.ToDateTime(room.CheckTime).ToString("yyyy年MM月dd日"); + dtpCheckTime.Text = Convert.ToDateTime(room.CheckTime).ToString("yyyy-MM-dd"); } dic = new Dictionary() { @@ -456,6 +456,5 @@ namespace SYS.FormUI } } #endregion - } } diff --git a/SYS.FormUI/AppMain/FrmMain.cs b/SYS.FormUI/AppMain/FrmMain.cs index e5c36bf03dfb34b9b5ffca80cafed2e0c45a2b63..039a99b7beca1be906afc53942a98252fc89ffab 100644 --- a/SYS.FormUI/AppMain/FrmMain.cs +++ b/SYS.FormUI/AppMain/FrmMain.cs @@ -309,6 +309,8 @@ namespace SYS.FormUI { ucNavBar = new ucNavBar(); ucNavBar.Name = listSource[i].nav_name; + ucNavBar.MouseDown += new MouseEventHandler(Navbar_MouseDown); + ucNavBar.MouseLeave += new System.EventHandler(Navbar_MouseLeave); switch (listSource[i].nav_name) { case "客房管理": @@ -336,6 +338,46 @@ namespace SYS.FormUI #endregion } + private void Navbar_MouseDown(object sender, MouseEventArgs e) + { + ucNavBar uc = sender as ucNavBar; // 使用sender参数获取事件的发起者 + if (uc != null) + { + switch (uc.Name) + { + case "客房管理": + uc.BackgroundImage = Resources.picRoom_ImageHover; + break; + case "用户管理": + uc.BackgroundImage = Resources.picCustomer_ImageHover; + break; + case "商品消费": + uc.BackgroundImage = Resources.picCommodity_ImageHover; + break; + } + } + } + + private void Navbar_MouseLeave(object sender, System.EventArgs e) + { + ucNavBar uc = sender as ucNavBar; // 使用sender参数获取事件的发起者 + if (uc != null) + { + switch (uc.Name) + { + case "客房管理": + uc.BackgroundImage = Resources.picRoom_Image; + break; + case "用户管理": + uc.BackgroundImage = Resources.picCustomer_Image; + break; + case "商品消费": + uc.BackgroundImage = Resources.picCommodity_Image; + break; + } + } + } + #region 窗体加载事件方法 private void FrmMain_Load(object sender, EventArgs e) { diff --git a/SYS.FormUI/AppUserControls/ucNavBar.Designer.cs b/SYS.FormUI/AppUserControls/ucNavBar.Designer.cs index d8014b310a9057200532c5f288d147348a45e0f0..f9f1157ba079eed0edd63618623401e384fbd4ba 100644 --- a/SYS.FormUI/AppUserControls/ucNavBar.Designer.cs +++ b/SYS.FormUI/AppUserControls/ucNavBar.Designer.cs @@ -32,11 +32,12 @@ // // ucNavBar // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.Transparent; + this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.Name = "ucNavBar"; - this.Size = new System.Drawing.Size(124, 83); + this.Size = new System.Drawing.Size(227, 145); this.ResumeLayout(false); } diff --git a/SYS.FormUI/Properties/Resources.Designer.cs b/SYS.FormUI/Properties/Resources.Designer.cs index e8d226cdc7a8b26d6f6f336e6429d5b8117165af..8bbdd48c20f3e5decbb7a99418b46956c66c4cd8 100644 --- a/SYS.FormUI/Properties/Resources.Designer.cs +++ b/SYS.FormUI/Properties/Resources.Designer.cs @@ -70,16 +70,6 @@ namespace SYS.FormUI.Properties { } } - /// - /// 查找 System.Byte[] 类型的本地化资源。 - /// - public static byte[] Alibaba_PuHuiTi_Regular { - get { - object obj = ResourceManager.GetObject("Alibaba_PuHuiTi_Regular", resourceCulture); - return ((byte[])(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -130,16 +120,6 @@ namespace SYS.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - public static System.Drawing.Bitmap picCommodity_ImagePress { - get { - object obj = ResourceManager.GetObject("picCommodity.ImagePress", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -160,16 +140,6 @@ namespace SYS.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - public static System.Drawing.Bitmap picCustomer_ImagePress { - get { - object obj = ResourceManager.GetObject("picCustomer.ImagePress", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -190,16 +160,6 @@ namespace SYS.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - public static System.Drawing.Bitmap picExtend_ImagePress { - get { - object obj = ResourceManager.GetObject("picExtend.ImagePress", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -230,26 +190,6 @@ namespace SYS.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - public static System.Drawing.Bitmap picRoom_ImagePress { - get { - object obj = ResourceManager.GetObject("picRoom.ImagePress", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - public static System.Drawing.Bitmap picRoom_ImageSelected { - get { - object obj = ResourceManager.GetObject("picRoom.ImageSelected", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -260,16 +200,6 @@ namespace SYS.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - public static System.Drawing.Bitmap uiButton1_BackgroundImage { - get { - object obj = ResourceManager.GetObject("uiButton1.BackgroundImage", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/SYS.FormUI/Properties/Resources.resx b/SYS.FormUI/Properties/Resources.resx index c334b59a1b3989665686f35edc2855b3f0aa2a19..845f4cd013afcc6881d97bc71f2d0aef71700391 100644 --- a/SYS.FormUI/Properties/Resources.resx +++ b/SYS.FormUI/Properties/Resources.resx @@ -148,9 +148,6 @@ ..\Resources\预约房(hover)icon.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 @@ -166,9 +163,6 @@ ..\Resources\常规部门卡片.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 - ..\Resources\财务部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -214,18 +208,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\可住房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 @@ -241,9 +229,6 @@ ..\Resources\picRoom.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\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 @@ -262,21 +247,12 @@ ..\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 - ..\icon\转换.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picRoom.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\uiButton1.BackgroundImage.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 @@ -289,9 +265,6 @@ ..\Resources\picCustomer.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\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 @@ -319,4 +292,10 @@ ..\images\lockicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\修改.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\系统管理员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/SYS.FormUI/Resources/770e7b52ecafc807247aad51bb6c6b43.jpg b/SYS.FormUI/Resources/770e7b52ecafc807247aad51bb6c6b43.jpg deleted file mode 100644 index c44405ef6ca21158e68f5979441e309a969cfae3..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/Resources/770e7b52ecafc807247aad51bb6c6b43.jpg and /dev/null differ diff --git a/SYS.FormUI/Resources/77377282_p0_master1200.jpg b/SYS.FormUI/Resources/77377282_p0_master1200.jpg deleted file mode 100644 index a27866ea71c679f9b402ddfdae1db8ef0570bcad..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/Resources/77377282_p0_master1200.jpg and /dev/null differ diff --git a/SYS.FormUI/Resources/Alibaba-PuHuiTi-Regular.ttf b/SYS.FormUI/Resources/Alibaba-PuHuiTi-Regular.ttf deleted file mode 100644 index 9f8ab8d8f14f47c7e6a85e9aef2b619a41bf3075..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/Resources/Alibaba-PuHuiTi-Regular.ttf and /dev/null differ diff --git a/SYS.FormUI/Resources/GFont.otf b/SYS.FormUI/Resources/GFont.otf deleted file mode 100644 index 741201b053b3af12909569d24998691a7b961874..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/Resources/GFont.otf and /dev/null differ diff --git a/SYS.FormUI/Resources/JetBrainsMono-Regular.ttf b/SYS.FormUI/Resources/JetBrainsMono-Regular.ttf deleted file mode 100644 index 4781cc7f57b55e3e5defaeecafcd6bd7c096fa21..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/Resources/JetBrainsMono-Regular.ttf and /dev/null differ diff --git a/SYS.FormUI/Resources/Mono.ttf b/SYS.FormUI/Resources/Mono.ttf deleted file mode 100644 index e03ff7e6990da914a9e855906422f3d64f119dec..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/Resources/Mono.ttf and /dev/null differ diff --git a/SYS.FormUI/Resources/delete2-a.png b/SYS.FormUI/Resources/delete2-a.png deleted file mode 100644 index ccb078fdaf0a303bc5b1258617c97272547c2cc9..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/Resources/delete2-a.png and /dev/null differ diff --git a/SYS.FormUI/Resources/delete2a.png b/SYS.FormUI/Resources/delete2a.png deleted file mode 100644 index 1aa0ef461ce5e97d19b520683d3588e83ec402c3..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/Resources/delete2a.png and /dev/null differ diff --git a/SYS.FormUI/Resources/minus (1).png b/SYS.FormUI/Resources/minus (1).png deleted file mode 100644 index fe329f1c6a44c254f6f1f5ea364d0673fe41e17c..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/Resources/minus (1).png and /dev/null differ diff --git a/SYS.FormUI/Resources/minus.png b/SYS.FormUI/Resources/minus.png deleted file mode 100644 index 52df7bf0d38413019fc9a85dfc4f57ea65d783dd..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/Resources/minus.png and /dev/null differ diff --git a/SYS.FormUI/Resources/picCommodity.ImagePress.png b/SYS.FormUI/Resources/picCommodity.ImagePress.png deleted file mode 100644 index a08c558c25e20db084f4416579941678764531f0..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/Resources/picCommodity.ImagePress.png and /dev/null differ diff --git a/SYS.FormUI/Resources/picCustomer.ImagePress.png b/SYS.FormUI/Resources/picCustomer.ImagePress.png deleted file mode 100644 index 03bc51b3bc95f4af8d205a95a752c4208a4619d2..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/Resources/picCustomer.ImagePress.png and /dev/null differ diff --git a/SYS.FormUI/Resources/picExtend.ImagePress.png b/SYS.FormUI/Resources/picExtend.ImagePress.png deleted file mode 100644 index 21d9df7b4bb8f5d91d8ff55f87a7f4c8f3e8c8ab..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/Resources/picExtend.ImagePress.png and /dev/null differ diff --git a/SYS.FormUI/Resources/picRoom.ImagePress.png b/SYS.FormUI/Resources/picRoom.ImagePress.png deleted file mode 100644 index f58d91c08c7cebf40d92af414e0b6e2b2ab2becb..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/Resources/picRoom.ImagePress.png and /dev/null differ diff --git a/SYS.FormUI/Resources/picRoom.ImageSelected.png b/SYS.FormUI/Resources/picRoom.ImageSelected.png deleted file mode 100644 index da2834a55f5a7d3279cba6973015e6021f40b850..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/Resources/picRoom.ImageSelected.png and /dev/null differ diff --git "a/SYS.FormUI/Resources/\344\270\273\351\241\265 (1).png" "b/SYS.FormUI/Resources/\344\270\273\351\241\265 (1).png" deleted file mode 100644 index ce108ca91de662cad9381c47cbaa6aaa7b0f46cc..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/Resources/\344\270\273\351\241\265 (1).png" and /dev/null differ diff --git "a/SYS.FormUI/Resources/\344\277\256\346\224\271a.png" "b/SYS.FormUI/Resources/\344\277\256\346\224\271a.png" deleted file mode 100644 index 23b1e8ccf35e33d75adbf56e9ba75b01f174cd77..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/Resources/\344\277\256\346\224\271a.png" and /dev/null differ diff --git "a/SYS.FormUI/Resources/\345\242\236\345\212\240 \346\267\273\345\212\240 \345\212\240\345\207\217 (1).png" "b/SYS.FormUI/Resources/\345\242\236\345\212\240 \346\267\273\345\212\240 \345\212\240\345\207\217 (1).png" deleted file mode 100644 index 8b1d03ac8f361a787ee47f995aeb66735f955c40..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/Resources/\345\242\236\345\212\240 \346\267\273\345\212\240 \345\212\240\345\207\217 (1).png" and /dev/null differ diff --git "a/SYS.FormUI/Resources/\345\257\274\345\207\272 (4).png" "b/SYS.FormUI/Resources/\345\257\274\345\207\272 (4).png" deleted file mode 100644 index a00adbad89f360e8da0d6040ea044b9a70b1f6c6..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/Resources/\345\257\274\345\207\272 (4).png" and /dev/null differ diff --git "a/SYS.FormUI/Resources/\345\257\274\345\207\272 (4)1.png" "b/SYS.FormUI/Resources/\345\257\274\345\207\272 (4)1.png" deleted file mode 100644 index a00adbad89f360e8da0d6040ea044b9a70b1f6c6..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/Resources/\345\257\274\345\207\272 (4)1.png" and /dev/null differ diff --git "a/SYS.FormUI/Resources/\346\220\234\347\264\242--1.png" "b/SYS.FormUI/Resources/\346\220\234\347\264\242--1.png" deleted file mode 100644 index dd4447d54534c04899d59895c810ca65835b1818..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/Resources/\346\220\234\347\264\242--1.png" and /dev/null differ diff --git "a/SYS.FormUI/Resources/\346\220\234\347\264\242--1a.png" "b/SYS.FormUI/Resources/\346\220\234\347\264\242--1a.png" deleted file mode 100644 index 8982ac99894114752c7cf7a9c5897b4263e2737c..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/Resources/\346\220\234\347\264\242--1a.png" and /dev/null differ diff --git "a/SYS.FormUI/Resources/\346\230\276\347\244\272.png" "b/SYS.FormUI/Resources/\346\230\276\347\244\272.png" deleted file mode 100644 index 6d6d2ee06294147634dbf63d24e7de5a628f5127..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/Resources/\346\230\276\347\244\272.png" and /dev/null differ diff --git "a/SYS.FormUI/Resources/\346\267\273 \345\212\240-a.png" "b/SYS.FormUI/Resources/\346\267\273 \345\212\240-a.png" deleted file mode 100644 index 7448305d71f3c04bf7a2bc1ed1e1d2e17e4cbc7f..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/Resources/\346\267\273 \345\212\240-a.png" and /dev/null differ diff --git "a/SYS.FormUI/Resources/\346\267\273 \345\212\240a.png" "b/SYS.FormUI/Resources/\346\267\273 \345\212\240a.png" deleted file mode 100644 index ab485b22771b5bc24d911283e05882c288cfacb0..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/Resources/\346\267\273 \345\212\240a.png" and /dev/null differ diff --git "a/SYS.FormUI/Resources/\346\267\273\345\212\240 \345\242\236\345\212\240 \345\212\240.png" "b/SYS.FormUI/Resources/\346\267\273\345\212\240 \345\242\236\345\212\240 \345\212\240.png" deleted file mode 100644 index 1a0809a4478ec9fae2534cf3fdc8400617b860a8..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/Resources/\346\267\273\345\212\240 \345\242\236\345\212\240 \345\212\240.png" and /dev/null differ diff --git "a/SYS.FormUI/Resources/\347\265\204\347\271\224\345\234\226\345\241\212.bmp" "b/SYS.FormUI/Resources/\347\265\204\347\271\224\345\234\226\345\241\212.bmp" deleted file mode 100644 index 32e99a63b70d33b580a52440a17f5b471add23f0..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/Resources/\347\265\204\347\271\224\345\234\226\345\241\212.bmp" and /dev/null differ diff --git "a/SYS.FormUI/Resources/\350\216\267\345\217\226\347\224\250\346\210\267\347\274\226\345\217\267-ia.png" "b/SYS.FormUI/Resources/\350\216\267\345\217\226\347\224\250\346\210\267\347\274\226\345\217\267-ia.png" deleted file mode 100644 index 7e53d4160408a78e26f589b5168bb591757f0b05..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/Resources/\350\216\267\345\217\226\347\224\250\346\210\267\347\274\226\345\217\267-ia.png" and /dev/null differ diff --git "a/SYS.FormUI/Resources/\350\216\267\345\217\226\347\224\250\346\210\267\347\274\226\345\217\267.png" "b/SYS.FormUI/Resources/\350\216\267\345\217\226\347\224\250\346\210\267\347\274\226\345\217\267.png" deleted file mode 100644 index 22a3919589f9180c2f7b9acfa3845f86577526ff..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/Resources/\350\216\267\345\217\226\347\224\250\346\210\267\347\274\226\345\217\267.png" and /dev/null differ diff --git "a/SYS.FormUI/Resources/\350\277\224\345\233\236 (1).png" "b/SYS.FormUI/Resources/\350\277\224\345\233\236 (1).png" deleted file mode 100644 index f8483843748fcf40dcaf7fa2d8e459158e2fd60a..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/Resources/\350\277\224\345\233\236 (1).png" and /dev/null differ diff --git "a/SYS.FormUI/Resources/\351\232\220\350\227\217.png" "b/SYS.FormUI/Resources/\351\232\220\350\227\217.png" deleted file mode 100644 index 1bacf95c3a24e5323e2f3f7c44bac3b4f59880b5..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/Resources/\351\232\220\350\227\217.png" and /dev/null differ diff --git a/SYS.FormUI/SYS.FormUI.csproj b/SYS.FormUI/SYS.FormUI.csproj index 7fcffd49c35642b8e2f1e825783eb4e4f0954205..1e4ce772abac5c1248500f20f96e3aa96642a24a 100644 --- a/SYS.FormUI/SYS.FormUI.csproj +++ b/SYS.FormUI/SYS.FormUI.csproj @@ -122,8 +122,8 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll @@ -137,8 +137,8 @@ ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll - - ..\packages\System.Text.Encoding.CodePages.5.0.0\lib\net461\System.Text.Encoding.CodePages.dll + + ..\packages\System.Text.Encoding.CodePages.6.0.0\lib\net461\System.Text.Encoding.CodePages.dll ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll @@ -686,9 +686,6 @@ Settings.settings True - - Always - @@ -697,48 +694,12 @@ PreserveNewest - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Always @@ -880,18 +841,13 @@ - - - - - @@ -902,14 +858,12 @@ - - @@ -939,17 +893,12 @@ - - - - - @@ -986,7 +935,6 @@ - @@ -1001,10 +949,6 @@ - - {3de4537c-6637-4d8d-9728-c923ea0b8b13} - EOM.TSHotelManager.Common.Util - {65501AF6-C629-448A-847E-1BCD60665865} SYS.Common @@ -1013,6 +957,10 @@ {48b3f864-88d2-4bd1-a766-b9ebf342aed1} EOM.TSHotelManager.Common.Core + + {9a62b6be-7c26-465f-a8d1-2cee66d6f837} + EOM.TSHotelManager.Common.Util + diff --git a/SYS.FormUI/packages.config b/SYS.FormUI/packages.config index 7ffd5d04a0dd6c6a04397f86e1d37d8651cfbcdf..e8f52b79c7769638497ca4aed1661127ada9604b 100644 --- a/SYS.FormUI/packages.config +++ b/SYS.FormUI/packages.config @@ -10,11 +10,11 @@ - + - + \ No newline at end of file diff --git a/topsky-hotel-manager-system-web-api b/topsky-hotel-manager-system-web-api index ca9fe55c27b1d4999e301136a0ce452c07620331..b426cbcee74f5c0adebcde4d3a761591eb206c6b 160000 --- a/topsky-hotel-manager-system-web-api +++ b/topsky-hotel-manager-system-web-api @@ -1 +1 @@ -Subproject commit ca9fe55c27b1d4999e301136a0ce452c07620331 +Subproject commit b426cbcee74f5c0adebcde4d3a761591eb206c6b