diff --git a/EOM.TSHotelManagement.Common/UIControlIconConstant.cs b/EOM.TSHotelManagement.Common/UIControlIconConstant.cs index db5c2413c7718350d26782c56a5654a80078bd5f..95373597d0dffe64e0c2e0dffea9614cf2dcd421 100644 --- a/EOM.TSHotelManagement.Common/UIControlIconConstant.cs +++ b/EOM.TSHotelManagement.Common/UIControlIconConstant.cs @@ -21,5 +21,10 @@ public const string ChangeRoom = ""; public const string ChangeState = ""; public const string CustomerInformation = ""; + + + public const string Setting = ""; + public const string Minimize = ""; + public const string Close = ""; } } diff --git a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.cs b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.cs index f5c211665c583862e1fc2931f0b6a614031adc68..a15d2c397bcf71f9e2e5bcb1812b7eb23f414223 100644 --- a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.cs +++ b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.cs @@ -401,6 +401,7 @@ namespace EOM.TSHotelManagement.FormUI UIControlConstant.CheckInRoom => true, UIControlConstant.ReservationRoom => true, UIControlConstant.ChangeRoom => false, + UIControlConstant.ChangeStateRoom => true, UIControlConstant.CheckOutRoom => false, UIControlConstant.CustomerInformation => false, _ => item.Enabled @@ -412,6 +413,7 @@ namespace EOM.TSHotelManagement.FormUI UIControlConstant.CheckInRoom => false, UIControlConstant.ReservationRoom => false, UIControlConstant.ChangeRoom => true, + UIControlConstant.ChangeStateRoom => true, UIControlConstant.CheckOutRoom => true, UIControlConstant.CustomerInformation => true, _ => item.Enabled @@ -424,6 +426,7 @@ namespace EOM.TSHotelManagement.FormUI UIControlConstant.CheckInRoom => false, UIControlConstant.ReservationRoom => false, UIControlConstant.ChangeRoom => false, + UIControlConstant.ChangeStateRoom => true, UIControlConstant.CheckOutRoom => false, UIControlConstant.CustomerInformation => false, _ => item.Enabled @@ -435,6 +438,7 @@ namespace EOM.TSHotelManagement.FormUI UIControlConstant.CheckInRoom => true, UIControlConstant.ReservationRoom => false, UIControlConstant.ChangeRoom => false, + UIControlConstant.ChangeStateRoom => false, UIControlConstant.CheckOutRoom => false, UIControlConstant.CustomerInformation => false, _ => item.Enabled diff --git a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.Designer.cs index 568b526274167b59841ffe16d26046060eab079b..1bf2fe9ac4d15b3de51f694143598a55cc2cee3b 100644 --- a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.Designer.cs @@ -36,6 +36,7 @@ btnRoomType.Font = new Font("Noto Sans SC", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 0); btnRoomType.Location = new Point(2, 0); btnRoomType.Name = "btnRoomType"; + btnRoomType.Shape = AntdUI.TShape.Round; btnRoomType.Size = new Size(113, 37); btnRoomType.TabIndex = 0; btnRoomType.Type = AntdUI.TTypeMini.Info; diff --git a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucWindowHeader.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucWindowHeader.Designer.cs index 4a640905718af2a0a6a71233261eb24077369138..f5e048f4b7b44404fd65983c62fe51e67ce32093 100644 --- a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucWindowHeader.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucWindowHeader.Designer.cs @@ -62,11 +62,11 @@ btnClose.BackColor = Color.FromArgb(22, 119, 255); btnClose.DisplayStyle = AntdUI.TButtonDisplayStyle.Text; btnClose.Font = new Font("Noto Sans SC", 13F); - btnClose.Location = new Point(362, 4); + btnClose.Location = new Point(362, 5); btnClose.Name = "btnClose"; + btnClose.Shape = AntdUI.TShape.Round; btnClose.Size = new Size(23, 25); btnClose.TabIndex = 140; - btnClose.Text = "×"; btnClose.Type = AntdUI.TTypeMini.Info; btnClose.Click += btnClose_Click; // diff --git a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucWindowHeader.cs b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucWindowHeader.cs index a36d5def6e832ab1296f50eb1f5118ccd13c403c..9a550373df88c134d0f55178064fbcefc584ac68 100644 --- a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucWindowHeader.cs +++ b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucWindowHeader.cs @@ -1,4 +1,5 @@ -using System.Drawing.Drawing2D; +using EOM.TSHotelManagement.Common; +using System.Drawing.Drawing2D; namespace EOM.TSHotelManagement.FormUI { @@ -83,6 +84,7 @@ namespace EOM.TSHotelManagement.FormUI phCustoHeader.SubText = subTitle; phCustoHeader.ShowIcon = showIcon; phCustoHeader.Icon = icon; + btnClose.IconSvg = UIControlIconConstant.Close; btnClose.Visible = showClose; phCustoHeader.Refresh(); this.Refresh(); @@ -118,6 +120,7 @@ namespace EOM.TSHotelManagement.FormUI phCustoHeader.ShowIcon = showIcon; phCustoHeader.Icon = icon; btnClose.Visible = showClose; + btnClose.IconSvg = UIControlIconConstant.Close; phCustoHeader.Refresh(); this.Refresh(); } @@ -126,6 +129,7 @@ namespace EOM.TSHotelManagement.FormUI { phCustoHeader.Text = string.Empty; phCustoHeader.SubText = string.Empty; + btnClose.IconSvg = UIControlIconConstant.Close; } private void btnClose_Click(object sender, EventArgs e) diff --git a/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLoading.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLoading.Designer.cs index 7c931b976b7680f145698b3f7371fac4b3aa52d5..de1909200ddadf7d5aad83e2d376886e7f4a4d20 100644 --- a/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLoading.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLoading.Designer.cs @@ -110,14 +110,14 @@ lblReleaseLog.Location = new Point(12, 164); lblReleaseLog.Multiline = true; lblReleaseLog.Name = "lblReleaseLog"; - lblReleaseLog.Size = new Size(311, 179); + lblReleaseLog.Size = new Size(311, 341); lblReleaseLog.TabIndex = 9; // // FrmLoading // AutoScaleMode = AutoScaleMode.None; BackColor = Color.FromArgb(243, 249, 255); - ClientSize = new Size(335, 355); + ClientSize = new Size(335, 517); Controls.Add(lblReleaseLog); Controls.Add(label3); Controls.Add(lbInternetSoftwareVersion); diff --git a/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLoading.cs b/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLoading.cs index 933a4dc374695f2fea2ed3785f53ee8b3898e034..22de129c17103577c2e3bd2c431e18d2587ca91e 100644 --- a/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLoading.cs +++ b/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLoading.cs @@ -48,7 +48,7 @@ namespace EOM.TSHotelManagement.FormUI { Minimum = 0, Maximum = 100, - Dock = DockStyle.Top + Dock = DockStyle.Top, }; this.Controls.Add(progressBar); } diff --git a/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLogin.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLogin.Designer.cs index 8b3cb0c0d81a46ce9508cf9075596c2993dfaccb..189cfa68ab7d5793c0f5f045f0419e1c6d1fe9b9 100644 --- a/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLogin.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLogin.Designer.cs @@ -82,7 +82,6 @@ picLogin.Font = new Font("Noto Sans SC", 12F); picLogin.Location = new Point(658, 342); picLogin.Name = "picLogin"; - picLogin.Radius = 8; picLogin.Shape = AntdUI.TShape.Round; picLogin.Size = new Size(191, 57); picLogin.TabIndex = 34; @@ -128,10 +127,9 @@ btnMinimize.Font = new Font("Noto Sans SC", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 0); btnMinimize.Location = new Point(832, 2); btnMinimize.Name = "btnMinimize"; + btnMinimize.Shape = AntdUI.TShape.Round; btnMinimize.Size = new Size(38, 38); btnMinimize.TabIndex = 143; - btnMinimize.Text = "—"; - btnMinimize.TextAlign = ContentAlignment.BottomCenter; btnMinimize.Type = AntdUI.TTypeMini.Info; btnMinimize.Click += picMin_Click; // @@ -143,10 +141,9 @@ btnClose.Font = new Font("Noto Sans SC", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 0); btnClose.Location = new Point(876, 2); btnClose.Name = "btnClose"; + btnClose.Shape = AntdUI.TShape.Round; btnClose.Size = new Size(38, 38); btnClose.TabIndex = 142; - btnClose.Text = "×"; - btnClose.TextAlign = ContentAlignment.BottomCenter; btnClose.Type = AntdUI.TTypeMini.Info; btnClose.Click += picClose_Click; // @@ -171,6 +168,7 @@ Icon = (Icon)resources.GetObject("$this.Icon"); Margin = new Padding(4); Name = "FrmLogin"; + Resizable = false; StartPosition = FormStartPosition.CenterScreen; Text = "TS酒店管理系统"; Load += FrmLogin_Load; diff --git a/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLogin.cs b/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLogin.cs index 3b27600500365fc24f54f1aea72e2aa0410ddb63..ab62a35415077619c23ac642d6b2077c06fd02d9 100644 --- a/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLogin.cs +++ b/EOM.TSHotelManagement.FormUI/ClientEntrance/FrmLogin.cs @@ -92,6 +92,8 @@ namespace EOM.TSHotelManagement.FormUI private void FrmLogin_Load(object sender, EventArgs e) { this.Owner.Hide(); + btnMinimize.IconSvg = UIControlIconConstant.Minimize; + btnClose.IconSvg = UIControlIconConstant.Close; txtAccount.PlaceholderText = LocalizationHelper.GetLocalizedString("Please input employee number or email", "请输入员工编号或邮箱"); txtWorkerPwd.PlaceholderText = LocalizationHelper.GetLocalizedString("Please input employee password", "请输入员工密码"); } diff --git a/EOM.TSHotelManagement.FormUI/ClientMain/FrmMain.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientMain/FrmMain.Designer.cs index ff1693d7d43bd4b9f3ff0b795c67b8c76a95c383..acf83d45e4532e1905904769cc97f0f22c59609d 100644 --- a/EOM.TSHotelManagement.FormUI/ClientMain/FrmMain.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientMain/FrmMain.Designer.cs @@ -206,20 +206,21 @@ // // btnSetting // - btnSetting.BackColor = Color.Transparent; - btnSetting.BackgroundImage = Properties.Resources.settings2; + btnSetting.BackColor = Color.FromArgb(22, 119, 255); btnSetting.Font = new Font("Noto Sans SC", 9F, FontStyle.Regular, GraphicsUnit.Point, 0); - btnSetting.Ghost = true; btnSetting.Location = new Point(946, 4); btnSetting.Name = "btnSetting"; + btnSetting.Shape = AntdUI.TShape.Round; btnSetting.Size = new Size(41, 38); btnSetting.TabIndex = 42; + btnSetting.Type = AntdUI.TTypeMini.Info; btnSetting.MouseClick += btnSetting_MouseClick; // // cpUITheme // cpUITheme.Location = new Point(899, 4); cpUITheme.Name = "cpUITheme"; + cpUITheme.Round = true; cpUITheme.Size = new Size(41, 38); cpUITheme.TabIndex = 43; cpUITheme.Text = "col"; @@ -253,10 +254,9 @@ btnMinimize.Font = new Font("Noto Sans SC", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 0); btnMinimize.Location = new Point(993, 4); btnMinimize.Name = "btnMinimize"; + btnMinimize.Shape = AntdUI.TShape.Round; btnMinimize.Size = new Size(38, 38); btnMinimize.TabIndex = 145; - btnMinimize.Text = "—"; - btnMinimize.TextAlign = ContentAlignment.BottomCenter; btnMinimize.Type = AntdUI.TTypeMini.Info; btnMinimize.Click += picFormSize_Click; // @@ -268,10 +268,9 @@ btnClose.Font = new Font("Noto Sans SC", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 0); btnClose.Location = new Point(1037, 4); btnClose.Name = "btnClose"; + btnClose.Shape = AntdUI.TShape.Round; btnClose.Size = new Size(38, 38); btnClose.TabIndex = 144; - btnClose.Text = "×"; - btnClose.TextAlign = ContentAlignment.BottomCenter; btnClose.Type = AntdUI.TTypeMini.Info; btnClose.Click += picClose_Click; // diff --git a/EOM.TSHotelManagement.FormUI/ClientMain/FrmMain.cs b/EOM.TSHotelManagement.FormUI/ClientMain/FrmMain.cs index 2af201461cbd5931db8d664646fca5d30835ab8a..292737917a597ea3c2850c46391bf3b9ab3de3c3 100644 --- a/EOM.TSHotelManagement.FormUI/ClientMain/FrmMain.cs +++ b/EOM.TSHotelManagement.FormUI/ClientMain/FrmMain.cs @@ -30,6 +30,7 @@ using EOM.TSHotelManagement.FormUI.Properties; using jvncorelib.CodeLib; using jvncorelib.EntityLib; using System.Diagnostics; +using System.Runtime.InteropServices; namespace EOM.TSHotelManagement.FormUI { @@ -113,6 +114,30 @@ namespace EOM.TSHotelManagement.FormUI } #endregion + private const uint WS_EX_LAYERED = 0x80000; + private const int WS_EX_TRANSPARENT = 0x20; + private const int GWL_STYLE = (-16); + private const int GWL_EXSTYLE = (-20); + [DllImport("user32", EntryPoint = "SetWindowLong")] + private static extern uint SetWindowLong( + IntPtr hwnd, + int nIndex, + uint dwNewLong + ); + [DllImport("user32", EntryPoint = "GetWindowLong")] + private static extern uint GetWindowLong( + IntPtr hwnd, + int nIndex + ); + /// + /// 使窗口有鼠标穿透功能 + /// + public void CanPenetrate() + { + uint intExTemp = GetWindowLong(this.Handle, GWL_EXSTYLE); + uint oldGWLEx = SetWindowLong(this.Handle, GWL_EXSTYLE, WS_EX_TRANSPARENT | WS_EX_LAYERED); + } + ListOutputDto fonts = null; int fontn = 0; private void LoadFonts() @@ -191,6 +216,7 @@ namespace EOM.TSHotelManagement.FormUI { case "客房管理": menuItem.Icon = Resources.picRoom_Image; + menuItem.Select = true; break; case "客户管理": menuItem.Icon = Resources.picCustomer_Image; @@ -232,6 +258,11 @@ namespace EOM.TSHotelManagement.FormUI { this.Owner.Hide(); + + btnMinimize.IconSvg = UIControlIconConstant.Minimize; + btnClose.IconSvg = UIControlIconConstant.Close; + btnSetting.IconSvg = UIControlIconConstant.Setting; + lblSoftName.Text = ApplicationUtil.GetApplicationName() + " V" + ApplicationUtil.GetApplicationVersion(); LoadNavBar(); @@ -320,7 +351,7 @@ namespace EOM.TSHotelManagement.FormUI frmScreenLock.ShowDialog(); break; case UIControlConstant.UpdateLog: - AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("Update log", "更新日志"), LoginInfo.SoftwareReleaseLog, TType.Info); + NotificationService.ShowInfo(LoginInfo.SoftwareReleaseLog); break; case UIControlConstant.About: FrmAbout frmAbout = new(); diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmAccountSecurity.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmAccountSecurity.Designer.cs index 9dd8d60e929595cdf8d6ad4454be71f7c27511bc..807d38ec10c12e8b756c7e86a94bdcba8316b303 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmAccountSecurity.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmAccountSecurity.Designer.cs @@ -59,6 +59,7 @@ txtOldPassword.PasswordCopy = true; txtOldPassword.PlaceholderColorExtend = ""; txtOldPassword.PlaceholderText = ""; + txtOldPassword.Round = true; txtOldPassword.Size = new Size(238, 52); txtOldPassword.TabIndex = 53; // @@ -97,6 +98,7 @@ btnUpdatePassword.Font = new Font("Noto Sans SC", 12F); btnUpdatePassword.Location = new Point(76, 289); btnUpdatePassword.Name = "btnUpdatePassword"; + btnUpdatePassword.Shape = AntdUI.TShape.Round; btnUpdatePassword.Size = new Size(161, 51); btnUpdatePassword.TabIndex = 49; btnUpdatePassword.Text = "修改密码"; @@ -113,6 +115,7 @@ txtNewPassword.PasswordCopy = true; txtNewPassword.PlaceholderColorExtend = ""; txtNewPassword.PlaceholderText = ""; + txtNewPassword.Round = true; txtNewPassword.Size = new Size(238, 52); txtNewPassword.TabIndex = 48; // diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.Designer.cs index d99f2e286ca914a749db62c3955d793b3ffa7416..01d3d02f951ce31570473f505d2f506fa38fffc1 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.Designer.cs @@ -79,6 +79,7 @@ btnChangeRoom.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); btnChangeRoom.Location = new Point(155, 156); btnChangeRoom.Name = "btnChangeRoom"; + btnChangeRoom.Shape = AntdUI.TShape.Round; btnChangeRoom.Size = new Size(85, 45); btnChangeRoom.TabIndex = 163; btnChangeRoom.Text = "转 房"; @@ -93,6 +94,7 @@ cboRoomList.Location = new Point(91, 46); cboRoomList.Name = "cboRoomList"; cboRoomList.Placement = AntdUI.TAlignFrom.Bottom; + cboRoomList.Round = true; cboRoomList.Size = new Size(149, 45); cboRoomList.TabIndex = 179; cboRoomList.TextChanged += cboRoomList_TextChanged; diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.Designer.cs index 5464960e32436b92cedaa0ff5b37f213933a1757..d9177ae78397ae141a3b326cf0ee319220271087 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.Designer.cs @@ -167,9 +167,10 @@ // // btnCheckIn // - btnCheckIn.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnCheckIn.Font = new Font("Noto Sans SC", 12F); btnCheckIn.Location = new Point(548, 322); btnCheckIn.Name = "btnCheckIn"; + btnCheckIn.Shape = AntdUI.TShape.Round; btnCheckIn.Size = new Size(85, 45); btnCheckIn.TabIndex = 164; btnCheckIn.Text = "入 住"; @@ -178,9 +179,10 @@ // // btnCancel // - btnCancel.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnCancel.Font = new Font("Noto Sans SC", 12F); btnCancel.Location = new Point(639, 322); btnCancel.Name = "btnCancel"; + btnCancel.Shape = AntdUI.TShape.Round; btnCancel.Size = new Size(85, 45); btnCancel.TabIndex = 165; btnCancel.Text = "取 消"; @@ -193,6 +195,7 @@ txtRoomNo.Location = new Point(93, 51); txtRoomNo.Name = "txtRoomNo"; txtRoomNo.ReadOnly = true; + txtRoomNo.Round = true; txtRoomNo.Size = new Size(250, 45); txtRoomNo.TabIndex = 166; // @@ -202,6 +205,7 @@ txtState.Location = new Point(93, 104); txtState.Name = "txtState"; txtState.ReadOnly = true; + txtState.Round = true; txtState.Size = new Size(250, 45); txtState.TabIndex = 167; // @@ -211,6 +215,7 @@ txtRoomPosition.Location = new Point(93, 157); txtRoomPosition.Name = "txtRoomPosition"; txtRoomPosition.ReadOnly = true; + txtRoomPosition.Round = true; txtRoomPosition.Size = new Size(250, 45); txtRoomPosition.TabIndex = 168; // @@ -220,6 +225,7 @@ txtRent.Location = new Point(474, 104); txtRent.Name = "txtRent"; txtRent.ReadOnly = true; + txtRent.Round = true; txtRent.Size = new Size(250, 45); txtRent.TabIndex = 169; // @@ -229,6 +235,7 @@ txtDeposit.Location = new Point(474, 157); txtDeposit.Name = "txtDeposit"; txtDeposit.ReadOnly = true; + txtDeposit.Round = true; txtDeposit.Size = new Size(250, 45); txtDeposit.TabIndex = 170; // @@ -238,6 +245,7 @@ txtCustomerName.Location = new Point(474, 210); txtCustomerName.Name = "txtCustomerName"; txtCustomerName.ReadOnly = true; + txtCustomerName.Round = true; txtCustomerName.Size = new Size(250, 45); txtCustomerName.TabIndex = 171; // @@ -247,6 +255,7 @@ txtCustomerLevel.Location = new Point(474, 263); txtCustomerLevel.Name = "txtCustomerLevel"; txtCustomerLevel.ReadOnly = true; + txtCustomerLevel.Round = true; txtCustomerLevel.Size = new Size(250, 45); txtCustomerLevel.TabIndex = 172; // @@ -256,6 +265,7 @@ txtCustomerTel.Location = new Point(93, 263); txtCustomerTel.Name = "txtCustomerTel"; txtCustomerTel.ReadOnly = true; + txtCustomerTel.Round = true; txtCustomerTel.Size = new Size(250, 45); txtCustomerTel.TabIndex = 173; // @@ -264,6 +274,7 @@ txtCustomerNo.Font = new Font("Noto Sans SC", 12F); txtCustomerNo.Location = new Point(93, 210); txtCustomerNo.Name = "txtCustomerNo"; + txtCustomerNo.Round = true; txtCustomerNo.Size = new Size(250, 45); txtCustomerNo.TabIndex = 174; txtCustomerNo.Validated += txtCustoNo_Validated; @@ -274,6 +285,7 @@ txtRoomType.Location = new Point(474, 51); txtRoomType.Name = "txtRoomType"; txtRoomType.ReadOnly = true; + txtRoomType.Round = true; txtRoomType.Size = new Size(250, 45); txtRoomType.TabIndex = 175; // diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.Designer.cs index e7f08cd331edb64c31955f213373ac7aa39a321e..44eb3f3a7c724830d4ae3d45c77f94c49b014ce8 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.Designer.cs @@ -63,6 +63,7 @@ dtpCheckTime.Name = "dtpCheckTime"; dtpCheckTime.PlaceholderText = ""; dtpCheckTime.ReadOnly = true; + dtpCheckTime.Round = true; dtpCheckTime.Size = new Size(180, 42); dtpCheckTime.TabIndex = 185; // @@ -83,6 +84,7 @@ txtRoomNo.Name = "txtRoomNo"; txtRoomNo.PlaceholderText = ""; txtRoomNo.ReadOnly = true; + txtRoomNo.Round = true; txtRoomNo.Size = new Size(180, 42); txtRoomNo.TabIndex = 184; // @@ -103,6 +105,7 @@ CustoName.Name = "CustoName"; CustoName.PlaceholderText = ""; CustoName.ReadOnly = true; + CustoName.Round = true; CustoName.Size = new Size(214, 42); CustoName.TabIndex = 183; // @@ -123,6 +126,7 @@ CustoNo.Name = "CustoNo"; CustoNo.PlaceholderText = ""; CustoNo.ReadOnly = true; + CustoNo.Round = true; CustoNo.Size = new Size(214, 42); CustoNo.TabIndex = 182; // @@ -141,6 +145,7 @@ btnBalance.Font = new Font("Noto Sans SC", 12F); btnBalance.Location = new Point(544, 533); btnBalance.Name = "btnBalance"; + btnBalance.Shape = AntdUI.TShape.Round; btnBalance.Size = new Size(132, 48); btnBalance.TabIndex = 181; btnBalance.Text = "结 算"; @@ -164,7 +169,8 @@ txtReceipts.Location = new Point(404, 468); txtReceipts.Name = "txtReceipts"; txtReceipts.PlaceholderText = ""; - txtReceipts.Size = new Size(111, 36); + txtReceipts.Round = true; + txtReceipts.Size = new Size(201, 36); txtReceipts.TabIndex = 180; txtReceipts.TextChanged += txtReceipts_TextChanged; // diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.Designer.cs index 2958167c9ca82359afea39e2b040a09e8d889f62..9338d0e8f361c5783578204310febad01de3b88e 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.Designer.cs @@ -57,6 +57,7 @@ txtCustomerAddress.Name = "txtCustomerAddress"; txtCustomerAddress.PlaceholderText = ""; txtCustomerAddress.ReadOnly = true; + txtCustomerAddress.Round = true; txtCustomerAddress.Size = new Size(506, 42); txtCustomerAddress.TabIndex = 176; // @@ -67,6 +68,7 @@ txtDateOfBirth.Name = "txtDateOfBirth"; txtDateOfBirth.PlaceholderText = ""; txtDateOfBirth.ReadOnly = true; + txtDateOfBirth.Round = true; txtDateOfBirth.Size = new Size(203, 42); txtDateOfBirth.TabIndex = 175; // @@ -77,6 +79,7 @@ txtCustomerGender.Name = "txtCustomerGender"; txtCustomerGender.PlaceholderText = ""; txtCustomerGender.ReadOnly = true; + txtCustomerGender.Round = true; txtCustomerGender.Size = new Size(203, 42); txtCustomerGender.TabIndex = 174; // @@ -87,6 +90,7 @@ txtCustomerName.Name = "txtCustomerName"; txtCustomerName.PlaceholderText = ""; txtCustomerName.ReadOnly = true; + txtCustomerName.Round = true; txtCustomerName.Size = new Size(203, 42); txtCustomerName.TabIndex = 173; // @@ -97,6 +101,7 @@ txtCustomerNumber.Name = "txtCustomerNumber"; txtCustomerNumber.PlaceholderText = ""; txtCustomerNumber.ReadOnly = true; + txtCustomerNumber.Round = true; txtCustomerNumber.Size = new Size(203, 42); txtCustomerNumber.TabIndex = 172; // @@ -107,6 +112,7 @@ txtTel.Name = "txtTel"; txtTel.PlaceholderText = ""; txtTel.ReadOnly = true; + txtTel.Round = true; txtTel.Size = new Size(203, 42); txtTel.TabIndex = 171; // @@ -117,6 +123,7 @@ txtIdCardNumber.Name = "txtIdCardNumber"; txtIdCardNumber.PlaceholderText = ""; txtIdCardNumber.ReadOnly = true; + txtIdCardNumber.Round = true; txtIdCardNumber.Size = new Size(203, 42); txtIdCardNumber.TabIndex = 170; // @@ -127,6 +134,7 @@ txtPassportName.Name = "txtPassportName"; txtPassportName.PlaceholderText = ""; txtPassportName.ReadOnly = true; + txtPassportName.Round = true; txtPassportName.Size = new Size(203, 42); txtPassportName.TabIndex = 169; // @@ -137,6 +145,7 @@ txtCustomerType.Name = "txtCustomerType"; txtCustomerType.PlaceholderText = ""; txtCustomerType.ReadOnly = true; + txtCustomerType.Round = true; txtCustomerType.Size = new Size(203, 42); txtCustomerType.TabIndex = 168; // diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.Designer.cs index 0782ba18d9beaac8eb1ba37168810b684cecea65..303ea3c1995d6f536d0f5b027fc3cbfeef65a98e 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.Designer.cs @@ -55,6 +55,7 @@ btnSerach.Font = new Font("Noto Sans SC", 12F); btnSerach.Location = new Point(602, 441); btnSerach.Name = "btnSerach"; + btnSerach.Shape = AntdUI.TShape.Round; btnSerach.Size = new Size(93, 47); btnSerach.TabIndex = 127; btnSerach.Text = "搜 索"; @@ -67,6 +68,7 @@ btnAddCusto.IconPosition = AntdUI.TAlignMini.Top; btnAddCusto.Location = new Point(772, 441); btnAddCusto.Name = "btnAddCusto"; + btnAddCusto.Shape = AntdUI.TShape.Round; btnAddCusto.Size = new Size(93, 47); btnAddCusto.TabIndex = 128; btnAddCusto.Text = "添加客户"; @@ -80,6 +82,7 @@ btnUpdCustomer.Font = new Font("Noto Sans SC", 12F); btnUpdCustomer.Location = new Point(942, 441); btnUpdCustomer.Name = "btnUpdCustomer"; + btnUpdCustomer.Shape = AntdUI.TShape.Round; btnUpdCustomer.Size = new Size(93, 47); btnUpdCustomer.TabIndex = 129; btnUpdCustomer.Text = "修改客户"; @@ -150,6 +153,7 @@ txtCustoName.Location = new Point(375, 444); txtCustoName.Name = "txtCustoName"; txtCustoName.PlaceholderText = "请输入客户姓名..."; + txtCustoName.Round = true; txtCustoName.Size = new Size(173, 42); txtCustoName.TabIndex = 150; // @@ -159,6 +163,7 @@ txtCustoNo.Location = new Point(104, 444); txtCustoNo.Name = "txtCustoNo"; txtCustoNo.PlaceholderText = "请输入客户编号..."; + txtCustoNo.Round = true; txtCustoNo.Size = new Size(173, 42); txtCustoNo.TabIndex = 149; // diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.Designer.cs index 374c5143c665726474a783cafdfd78f9bc8bb646..a22ed947dfbb65ad20f0eb702806f28111f441d9 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.Designer.cs @@ -146,6 +146,7 @@ dtpDateOfBirth.Font = new Font("Noto Sans SC", 10F); dtpDateOfBirth.Location = new Point(94, 201); dtpDateOfBirth.Name = "dtpDateOfBirth"; + dtpDateOfBirth.Round = true; dtpDateOfBirth.Size = new Size(252, 43); dtpDateOfBirth.TabIndex = 166; // @@ -154,6 +155,7 @@ txtCustomerName.Font = new Font("Noto Sans SC", 12F); txtCustomerName.Location = new Point(95, 99); txtCustomerName.Name = "txtCustomerName"; + txtCustomerName.Round = true; txtCustomerName.Size = new Size(252, 45); txtCustomerName.TabIndex = 164; // @@ -163,6 +165,7 @@ txtCustomerId.Location = new Point(95, 48); txtCustomerId.Name = "txtCustomerId"; txtCustomerId.ReadOnly = true; + txtCustomerId.Round = true; txtCustomerId.Size = new Size(252, 45); txtCustomerId.TabIndex = 163; // @@ -171,6 +174,7 @@ txtCustomerCardID.Font = new Font("Noto Sans SC", 12F); txtCustomerCardID.Location = new Point(463, 148); txtCustomerCardID.Name = "txtCustomerCardID"; + txtCustomerCardID.Round = true; txtCustomerCardID.Size = new Size(250, 45); txtCustomerCardID.TabIndex = 168; txtCustomerCardID.Validated += txtCardID_Validated; @@ -180,6 +184,7 @@ txtCustomerTel.Font = new Font("Noto Sans SC", 12F); txtCustomerTel.Location = new Point(463, 198); txtCustomerTel.Name = "txtCustomerTel"; + txtCustomerTel.Round = true; txtCustomerTel.Size = new Size(250, 45); txtCustomerTel.TabIndex = 167; // @@ -188,6 +193,7 @@ txtCustomerAddress.Font = new Font("Noto Sans SC", 12F); txtCustomerAddress.Location = new Point(95, 250); txtCustomerAddress.Name = "txtCustomerAddress"; + txtCustomerAddress.Round = true; txtCustomerAddress.Size = new Size(618, 45); txtCustomerAddress.TabIndex = 171; // @@ -203,6 +209,7 @@ btnOk.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); btnOk.Location = new Point(579, 307); btnOk.Name = "btnOk"; + btnOk.Shape = AntdUI.TShape.Round; btnOk.Size = new Size(135, 45); btnOk.TabIndex = 173; btnOk.Text = "保 存"; @@ -217,6 +224,7 @@ cboGender.Location = new Point(95, 150); cboGender.Name = "cboGender"; cboGender.Placement = AntdUI.TAlignFrom.Bottom; + cboGender.Round = true; cboGender.Size = new Size(251, 45); cboGender.TabIndex = 174; // @@ -228,6 +236,7 @@ cboPassportType.Location = new Point(463, 98); cboPassportType.Name = "cboPassportType"; cboPassportType.Placement = AntdUI.TAlignFrom.Bottom; + cboPassportType.Round = true; cboPassportType.Size = new Size(251, 45); cboPassportType.TabIndex = 175; // @@ -239,6 +248,7 @@ cboCustomerType.Location = new Point(463, 48); cboCustomerType.Name = "cboCustomerType"; cboCustomerType.Placement = AntdUI.TAlignFrom.Bottom; + cboCustomerType.Round = true; cboCustomerType.Size = new Size(251, 45); cboCustomerType.TabIndex = 176; // diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.Designer.cs index 507d2a8d369a1fa67038f70ca64f2f18084303c9..d6f798df64c4153d3eb0cde8e562cd6a663bbd61 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.Designer.cs @@ -135,6 +135,7 @@ txtEmployeeId.Location = new Point(103, 51); txtEmployeeId.Name = "txtEmployeeId"; txtEmployeeId.ReadOnly = true; + txtEmployeeId.Round = true; txtEmployeeId.Size = new Size(205, 45); txtEmployeeId.TabIndex = 149; // @@ -143,6 +144,7 @@ txtEmployeeName.Font = new Font("Noto Sans SC", 12F); txtEmployeeName.Location = new Point(103, 102); txtEmployeeName.Name = "txtEmployeeName"; + txtEmployeeName.Round = true; txtEmployeeName.Size = new Size(205, 45); txtEmployeeName.TabIndex = 150; // @@ -151,6 +153,7 @@ txtEmployeeAddress.Font = new Font("Noto Sans SC", 12F); txtEmployeeAddress.Location = new Point(103, 251); txtEmployeeAddress.Name = "txtEmployeeAddress"; + txtEmployeeAddress.Round = true; txtEmployeeAddress.Size = new Size(515, 45); txtEmployeeAddress.TabIndex = 151; // @@ -159,6 +162,7 @@ txtEmployeeTel.Font = new Font("Noto Sans SC", 12F); txtEmployeeTel.Location = new Point(104, 202); txtEmployeeTel.Name = "txtEmployeeTel"; + txtEmployeeTel.Round = true; txtEmployeeTel.Size = new Size(515, 45); txtEmployeeTel.TabIndex = 152; // @@ -167,6 +171,7 @@ btnUpdate.Font = new Font("Noto Sans SC", 12F); btnUpdate.Location = new Point(530, 302); btnUpdate.Name = "btnUpdate"; + btnUpdate.Shape = AntdUI.TShape.Round; btnUpdate.Size = new Size(87, 43); btnUpdate.TabIndex = 157; btnUpdate.Text = "修 改"; @@ -181,6 +186,7 @@ cboGender.Location = new Point(103, 152); cboGender.Name = "cboGender"; cboGender.Placement = AntdUI.TAlignFrom.Bottom; + cboGender.Round = true; cboGender.Size = new Size(205, 45); cboGender.TabIndex = 175; // @@ -192,6 +198,7 @@ cboEmployeeNation.Location = new Point(413, 152); cboEmployeeNation.Name = "cboEmployeeNation"; cboEmployeeNation.Placement = AntdUI.TAlignFrom.Bottom; + cboEmployeeNation.Round = true; cboEmployeeNation.Size = new Size(204, 45); cboEmployeeNation.TabIndex = 176; // @@ -203,6 +210,7 @@ cboEmployeePosition.Location = new Point(413, 102); cboEmployeePosition.Name = "cboEmployeePosition"; cboEmployeePosition.Placement = AntdUI.TAlignFrom.Bottom; + cboEmployeePosition.Round = true; cboEmployeePosition.Size = new Size(205, 45); cboEmployeePosition.TabIndex = 177; // @@ -214,6 +222,7 @@ cboEmployeeDepartment.Location = new Point(413, 51); cboEmployeeDepartment.Name = "cboEmployeeDepartment"; cboEmployeeDepartment.Placement = AntdUI.TAlignFrom.Bottom; + cboEmployeeDepartment.Round = true; cboEmployeeDepartment.Size = new Size(205, 45); cboEmployeeDepartment.TabIndex = 178; // diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.Designer.cs index 0611e42b986340c964218979c5c080ed8cde85ae..f76b7f72170a5982b9e1f65374a37d647aa90d53 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.Designer.cs @@ -179,6 +179,7 @@ btnOk.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); btnOk.Location = new Point(14, 36); btnOk.Name = "btnOk"; + btnOk.Shape = AntdUI.TShape.Round; btnOk.Size = new Size(135, 45); btnOk.TabIndex = 139; btnOk.Text = "入住并注册"; @@ -190,6 +191,7 @@ txtCustomerName.Font = new Font("Noto Sans SC", 12F); txtCustomerName.Location = new Point(121, 343); txtCustomerName.Name = "txtCustomerName"; + txtCustomerName.Round = true; txtCustomerName.Size = new Size(252, 45); txtCustomerName.TabIndex = 155; // @@ -199,6 +201,7 @@ txtCustomerId.Location = new Point(121, 290); txtCustomerId.Name = "txtCustomerId"; txtCustomerId.ReadOnly = true; + txtCustomerId.Round = true; txtCustomerId.Size = new Size(252, 45); txtCustomerId.TabIndex = 154; // @@ -207,6 +210,7 @@ txtCustomerAddress.Font = new Font("Noto Sans SC", 12F); txtCustomerAddress.Location = new Point(121, 496); txtCustomerAddress.Name = "txtCustomerAddress"; + txtCustomerAddress.Round = true; txtCustomerAddress.Size = new Size(628, 45); txtCustomerAddress.TabIndex = 157; // @@ -215,6 +219,7 @@ txtCustomerTel.Font = new Font("Noto Sans SC", 12F); txtCustomerTel.Location = new Point(501, 444); txtCustomerTel.Name = "txtCustomerTel"; + txtCustomerTel.Round = true; txtCustomerTel.Size = new Size(250, 43); txtCustomerTel.TabIndex = 158; // @@ -223,6 +228,7 @@ txtCustomerCardID.Font = new Font("Noto Sans SC", 12F); txtCustomerCardID.Location = new Point(501, 394); txtCustomerCardID.Name = "txtCustomerCardID"; + txtCustomerCardID.Round = true; txtCustomerCardID.Size = new Size(250, 45); txtCustomerCardID.TabIndex = 159; txtCustomerCardID.Validated += txtCardID_Validated; @@ -232,6 +238,7 @@ dtpDateOfBirth.Font = new Font("Noto Sans SC", 10F); dtpDateOfBirth.Location = new Point(120, 444); dtpDateOfBirth.Name = "dtpDateOfBirth"; + dtpDateOfBirth.Round = true; dtpDateOfBirth.Size = new Size(252, 43); dtpDateOfBirth.TabIndex = 162; // @@ -243,6 +250,7 @@ cboCustomerType.Location = new Point(501, 293); cboCustomerType.Name = "cboCustomerType"; cboCustomerType.Placement = AntdUI.TAlignFrom.Bottom; + cboCustomerType.Round = true; cboCustomerType.Size = new Size(251, 45); cboCustomerType.TabIndex = 178; // @@ -254,6 +262,7 @@ cboPassportType.Location = new Point(501, 343); cboPassportType.Name = "cboPassportType"; cboPassportType.Placement = AntdUI.TAlignFrom.Bottom; + cboPassportType.Round = true; cboPassportType.Size = new Size(251, 45); cboPassportType.TabIndex = 177; // @@ -265,6 +274,7 @@ cboGender.Location = new Point(122, 394); cboGender.Name = "cboGender"; cboGender.Placement = AntdUI.TAlignFrom.Bottom; + cboGender.Round = true; cboGender.Size = new Size(251, 45); cboGender.TabIndex = 179; // diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.Designer.cs index 161560671fee8f22c7a67d50a8cc806e7b146268..f4cfef3c0865c8fccf82e2e269e048474bc20b1a 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.Designer.cs @@ -111,6 +111,7 @@ btnReserList.Font = new Font("Noto Sans SC", 12F); btnReserList.Location = new Point(316, 195); btnReserList.Name = "btnReserList"; + btnReserList.Shape = AntdUI.TShape.Round; btnReserList.Size = new Size(139, 43); btnReserList.TabIndex = 118; btnReserList.Text = "查看预约列表"; @@ -121,6 +122,7 @@ btnReser.Font = new Font("Noto Sans SC", 12F); btnReser.Location = new Point(461, 195); btnReser.Name = "btnReser"; + btnReser.Shape = AntdUI.TShape.Round; btnReser.Size = new Size(87, 43); btnReser.TabIndex = 119; btnReser.Text = "预 约"; @@ -132,7 +134,8 @@ txtCustoName.Font = new Font("Noto Sans SC", 12F); txtCustoName.Location = new Point(115, 49); txtCustoName.Name = "txtCustoName"; - txtCustoName.Size = new Size(162, 45); + txtCustoName.Round = true; + txtCustoName.Size = new Size(162, 40); txtCustoName.TabIndex = 121; // // txtCustoTel @@ -140,23 +143,26 @@ txtCustoTel.Font = new Font("Noto Sans SC", 12F); txtCustoTel.Location = new Point(376, 49); txtCustoTel.Name = "txtCustoTel"; - txtCustoTel.Size = new Size(161, 45); + txtCustoTel.Round = true; + txtCustoTel.Size = new Size(162, 40); txtCustoTel.TabIndex = 122; // // dtpStartDate // dtpStartDate.Font = new Font("Noto Sans SC", 10F); - dtpStartDate.Location = new Point(115, 146); + dtpStartDate.Location = new Point(115, 145); dtpStartDate.Name = "dtpStartDate"; - dtpStartDate.Size = new Size(162, 43); + dtpStartDate.Round = true; + dtpStartDate.Size = new Size(162, 40); dtpStartDate.TabIndex = 125; // // dtpEndDate // dtpEndDate.Font = new Font("Noto Sans SC", 10F); - dtpEndDate.Location = new Point(376, 146); + dtpEndDate.Location = new Point(376, 145); dtpEndDate.Name = "dtpEndDate"; - dtpEndDate.Size = new Size(161, 43); + dtpEndDate.Round = true; + dtpEndDate.Size = new Size(162, 40); dtpEndDate.TabIndex = 126; // // whReserRoomManagement @@ -171,9 +177,10 @@ cboReserChannel.Font = new Font("Noto Sans SC", 12F); cboReserChannel.List = true; cboReserChannel.ListAutoWidth = true; - cboReserChannel.Location = new Point(115, 100); + cboReserChannel.Location = new Point(115, 97); cboReserChannel.Name = "cboReserChannel"; cboReserChannel.Placement = AntdUI.TAlignFrom.Bottom; + cboReserChannel.Round = true; cboReserChannel.Size = new Size(162, 40); cboReserChannel.TabIndex = 175; // @@ -182,9 +189,10 @@ cboReserRoom.Font = new Font("Noto Sans SC", 12F); cboReserRoom.List = true; cboReserRoom.ListAutoWidth = true; - cboReserRoom.Location = new Point(376, 100); + cboReserRoom.Location = new Point(376, 97); cboReserRoom.Name = "cboReserRoom"; cboReserRoom.Placement = AntdUI.TAlignFrom.Bottom; + cboReserRoom.Round = true; cboReserRoom.Size = new Size(161, 40); cboReserRoom.TabIndex = 176; // diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomStateManagement.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomStateManagement.Designer.cs index aa7f6b3cd094c6cabb833b5fa46677f8688fdcec..1964a7e3730a4332a6049f70744be66d1ae46163 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomStateManagement.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomStateManagement.Designer.cs @@ -63,6 +63,7 @@ txtRoomNo.Location = new Point(99, 44); txtRoomNo.Name = "txtRoomNo"; txtRoomNo.ReadOnly = true; + txtRoomNo.Round = true; txtRoomNo.Size = new Size(203, 45); txtRoomNo.TabIndex = 137; // @@ -71,6 +72,7 @@ btnOk.Font = new Font("Noto Sans SC", 12F); btnOk.Location = new Point(215, 147); btnOk.Name = "btnOk"; + btnOk.Shape = AntdUI.TShape.Round; btnOk.Size = new Size(87, 43); btnOk.TabIndex = 140; btnOk.Text = "修 改"; @@ -92,6 +94,7 @@ cboRoomState.Location = new Point(99, 96); cboRoomState.Name = "cboRoomState"; cboRoomState.Placement = AntdUI.TAlignFrom.Bottom; + cboRoomState.Round = true; cboRoomState.Size = new Size(203, 45); cboRoomState.TabIndex = 180; cboRoomState.SelectedValueChanged += cboRoomState_SelectedValueChanged; diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.Designer.cs index 30665088bc8b60c6985d2474443505a35231da2e..8a5f7b824c0a43469d6e5cc69b6ef24aa9996a87 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.Designer.cs @@ -43,6 +43,7 @@ txtPassword.PlaceholderColor = Color.Gray; txtPassword.PlaceholderText = "请输入当前登录账号密码..."; txtPassword.Prefix = Properties.Resources._lock; + txtPassword.Round = true; txtPassword.Size = new Size(285, 45); txtPassword.TabIndex = 0; txtPassword.TextAlign = HorizontalAlignment.Center; @@ -53,6 +54,7 @@ btnUnlock.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); btnUnlock.Location = new Point(503, 334); btnUnlock.Name = "btnUnlock"; + btnUnlock.Shape = AntdUI.TShape.Round; btnUnlock.Size = new Size(85, 45); btnUnlock.TabIndex = 1; btnUnlock.Text = "解 锁"; diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.Designer.cs index e6ae042827d8e1d46595c6384c97b59ac42af7f6..0acb8b806b4dee6749b0af93f5aec7ac50cd323e 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.Designer.cs @@ -119,6 +119,7 @@ nudNum.Font = new Font("Noto Sans SC", 12F); nudNum.Location = new Point(319, 23); nudNum.Name = "nudNum"; + nudNum.Round = true; nudNum.Size = new Size(119, 38); nudNum.TabIndex = 34; nudNum.Text = "0"; @@ -130,6 +131,7 @@ txtPrice.Location = new Point(319, 69); txtPrice.Name = "txtPrice"; txtPrice.ReadOnly = true; + txtPrice.Round = true; txtPrice.Size = new Size(119, 38); txtPrice.TabIndex = 33; // @@ -139,6 +141,7 @@ txtSellName.Location = new Point(111, 69); txtSellName.Name = "txtSellName"; txtSellName.ReadOnly = true; + txtSellName.Round = true; txtSellName.Size = new Size(145, 38); txtSellName.TabIndex = 32; // @@ -148,6 +151,7 @@ txtSellNo.Location = new Point(111, 23); txtSellNo.Name = "txtSellNo"; txtSellNo.ReadOnly = true; + txtSellNo.Round = true; txtSellNo.Size = new Size(145, 38); txtSellNo.TabIndex = 31; // @@ -167,14 +171,16 @@ txtFind.Font = new Font("Noto Sans SC", 12F); txtFind.Location = new Point(200, 42); txtFind.Name = "txtFind"; + txtFind.Round = true; txtFind.Size = new Size(197, 38); txtFind.TabIndex = 27; // // btnFind // btnFind.Font = new Font("Noto Sans SC", 12F); - btnFind.Location = new Point(407, 44); + btnFind.Location = new Point(403, 42); btnFind.Name = "btnFind"; + btnFind.Shape = AntdUI.TShape.Round; btnFind.Size = new Size(101, 38); btnFind.TabIndex = 28; btnFind.Text = "查 找"; @@ -197,6 +203,7 @@ txtRoomNo.Font = new Font("Noto Sans SC", 12F); txtRoomNo.Location = new Point(617, 42); txtRoomNo.Name = "txtRoomNo"; + txtRoomNo.Round = true; txtRoomNo.Size = new Size(134, 38); txtRoomNo.TabIndex = 30; txtRoomNo.TextChanged += txtRoomNo_TextChanged; @@ -207,6 +214,7 @@ btnCheck.Font = new Font("Noto Sans SC", 12F); btnCheck.Location = new Point(764, 44); btnCheck.Name = "btnCheck"; + btnCheck.Shape = AntdUI.TShape.Round; btnCheck.Size = new Size(101, 38); btnCheck.TabIndex = 31; btnCheck.Text = "可否消费"; @@ -252,6 +260,7 @@ btnAdd.Font = new Font("Noto Sans SC", 12F); btnAdd.Location = new Point(496, 88); btnAdd.Name = "btnAdd"; + btnAdd.Shape = AntdUI.TShape.Round; btnAdd.Size = new Size(115, 38); btnAdd.TabIndex = 136; btnAdd.Text = "确定添加"; @@ -263,6 +272,7 @@ btnCancel.Font = new Font("Noto Sans SC", 12F); btnCancel.Location = new Point(496, 174); btnCancel.Name = "btnCancel"; + btnCancel.Shape = AntdUI.TShape.Round; btnCancel.Size = new Size(115, 38); btnCancel.TabIndex = 137; btnCancel.Text = "撤回添加"; diff --git a/EOM.TSHotelManagement.FormUI/Services/NotificationService.cs b/EOM.TSHotelManagement.FormUI/Services/NotificationService.cs index 3ec170cf7bcc76fc1dcbf340bc8737a9b338d26a..437ff5b8c4ddba65ebc184e5a668f70f32822ae1 100644 --- a/EOM.TSHotelManagement.FormUI/Services/NotificationService.cs +++ b/EOM.TSHotelManagement.FormUI/Services/NotificationService.cs @@ -12,7 +12,11 @@ namespace EOM.TSHotelManagement.FormUI { Draggable = true, CancelText = null, - OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Ok, UIMessageConstant.Chs_Ok) + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Ok, UIMessageConstant.Chs_Ok), + OnButtonStyle = (id, btn) => + { + btn.Shape = TShape.Round; + }, }); } @@ -22,7 +26,11 @@ namespace EOM.TSHotelManagement.FormUI { Draggable = true, CancelText = null, - OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Ok, UIMessageConstant.Chs_Ok) + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Ok, UIMessageConstant.Chs_Ok), + OnButtonStyle = (id, btn) => + { + btn.Shape = TShape.Round; + }, }); } @@ -32,7 +40,11 @@ namespace EOM.TSHotelManagement.FormUI { Draggable = true, CancelText = null, - OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Ok, UIMessageConstant.Chs_Ok) + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Ok, UIMessageConstant.Chs_Ok), + OnButtonStyle = (id, btn) => + { + btn.Shape = TShape.Round; + }, }); } @@ -42,7 +54,11 @@ namespace EOM.TSHotelManagement.FormUI { Draggable = true, CancelText = null, - OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Ok, UIMessageConstant.Chs_Ok) + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Ok, UIMessageConstant.Chs_Ok), + OnButtonStyle = (id, btn) => + { + btn.Shape = TShape.Round; + }, }); } }