diff --git a/EOM.TSHotelManagement.Common/BackendApi/ApiConstants.cs b/EOM.TSHotelManagement.Common/BackendApi/ApiConstants.cs index ac3a2abb03977309323f68ad2ad7f532bd4c3832..8114313a858ac58ec8897f8f91db71c85353b807 100644 --- a/EOM.TSHotelManagement.Common/BackendApi/ApiConstants.cs +++ b/EOM.TSHotelManagement.Common/BackendApi/ApiConstants.cs @@ -32,7 +32,6 @@ public const string Room_SelectRoomAll = "Room/SelectRoomAll"; public const string Room_SelectRoomByRoomNo = "Room/SelectRoomByRoomNo"; public const string Room_DayByRoomNo = "Room/DayByRoomNo"; - public const string Room_CheckoutRoomByRoomNo = "Room/CheckoutRoomByRoomNo"; public const string Room_SelectCanUseRoomAll = "Room/SelectCanUseRoomAll"; public const string Room_UpdateRoomInfo = "Room​/UpdateRoomInfo"; public const string Room_UpdateRoomInfoWithReser = "Room​/UpdateRoomInfoWithReser"; @@ -53,6 +52,7 @@ public const string Reser_DeleteReserInfo = "Reser/DeleteReserInfo"; public const string Reser_InsertReserInfo = "Reser​/InserReserInfo"; public const string Reser_SelectReserInfoByRoomNo = "Reser/SelectReserInfoByRoomNo"; + public const string Reser_SelectReserTypeAll = "Reser/SelectReserTypeAll"; // Room Type URLs public const string RoomType_SelectRoomTypeByRoomNo = "RoomType/SelectRoomTypeByRoomNo"; @@ -71,17 +71,10 @@ // Spend URLs public const string Spend_SelectSpendByRoomNo = "Spend/SelectSpendByRoomNo"; public const string Spend_SumConsumptionAmount = "Spend/SumConsumptionAmount"; - public const string Spend_UpdateMoneyState = "Spend/UpdateMoneyState"; - public const string Spend_UpdateSpendInfoByRoomNo = "Spend​/UpdateSpendInfoByRoomNo"; public const string Spend_AddCustomerSpend = "Spend​/AddCustomerSpend"; public const string Spend_SeletHistorySpendInfoAll = "Spend/SeletHistorySpendInfoAll"; - public const string Spend_UpdSpendInfo = "Spend/UpdSpendInfo"; public const string Spend_UndoCustomerSpend = "Spend/UndoCustomerSpend"; - // EnergyManagement URLs - public const string EnergyManagement_SelectEnergyManagementInfo = "EnergyManagement/SelectEnergyManagementInfo"; - public const string EnergyManagement_InsertEnergyManagementInfo = "EnergyManagement/InsertEnergyManagementInfo"; - // PromotionContent public const string PromotionContent_SelectPromotionContents = "PromotionContent/SelectPromotionContents"; @@ -93,7 +86,7 @@ // SellThing public const string Sellthing_SelectSellThingAll = "Sellthing/SelectSellThingAll"; - public const string Sellthing_UpdateSellthingInfo = "Sellthing/UpdateSellthingInfo"; + public const string Sellthing_UpdateSellthingInfo = "Sellthing/UpdateSellthing"; public const string Sellthing_SelectSellThingByNameAndPrice = "Sellthing/SelectSellThingByNameAndPrice"; // Utility diff --git a/EOM.TSHotelManagement.Common/EOM.TSHotelManagement.Common.csproj b/EOM.TSHotelManagement.Common/EOM.TSHotelManagement.Common.csproj index 640dd30dce3c1b26168e89d7c853c5c0cabbfb84..fc0d7c3486a79de3d9dfe73665d173d800799f61 100644 --- a/EOM.TSHotelManagement.Common/EOM.TSHotelManagement.Common.csproj +++ b/EOM.TSHotelManagement.Common/EOM.TSHotelManagement.Common.csproj @@ -13,9 +13,7 @@ - - diff --git a/EOM.TSHotelManagement.Common/Helper/HttpHelper.cs b/EOM.TSHotelManagement.Common/Helper/HttpHelper.cs index 104eb1313250e50b25068e83e2f75c205454371a..64f88b50bfc00502a72433e2516aa91a476868c5 100644 --- a/EOM.TSHotelManagement.Common/Helper/HttpHelper.cs +++ b/EOM.TSHotelManagement.Common/Helper/HttpHelper.cs @@ -402,28 +402,6 @@ namespace EOM.TSHotelManagement.Common return REG_URL_ENCODING.Replace(stringToEncode, m => m.Value.ToUpperInvariant()); } - /// - /// Json转数组列表 - /// - /// - /// - /// - public static List? JsonToList(string JsonStr) - { - return JsonConvert.DeserializeObject>(JsonStr); - } - - /// - /// Json转分页列表 - /// - /// - /// - /// - public static T? JsonToPageList(string json) where T : class - { - return JsonConvert.DeserializeObject(json); - } - /// /// Json转实体 /// @@ -434,27 +412,5 @@ namespace EOM.TSHotelManagement.Common { return JsonConvert.DeserializeObject(input); } - - /// - /// 实体转Json - /// - /// - /// - /// - public static string ModelToJson(this T input) - { - try - { - return JsonConvert.SerializeObject(input, new JsonSerializerSettings - { - Converters = { new IgnoreNullValuesConverter(true) }, - Formatting = Formatting.Indented // 如果需要格式化输出 - }); - } - catch (Exception ex) - { - return ex.Message; - } - } } } diff --git a/EOM.TSHotelManagement.Common/UIControlConstant.cs b/EOM.TSHotelManagement.Common/UIControlConstant.cs new file mode 100644 index 0000000000000000000000000000000000000000..5ba682dca99445aa8005fdb8bae68a5885c7d58b --- /dev/null +++ b/EOM.TSHotelManagement.Common/UIControlConstant.cs @@ -0,0 +1,25 @@ +namespace EOM.TSHotelManagement.Common +{ + public class UIControlConstant + { + public const string CheckInRoom = "入住房间"; + public const string ReservationRoom = "预约房间"; + public const string ChangeRoom = "更换房间"; + public const string ChangeStateRoom = "更换房间状态"; + public const string CheckOutRoom = "结算退房"; + public const string CustomerInformation = "客户信息"; + + public const string ChangeAccount = "切换账号"; + public const string SystemLock = "系统锁定"; + public const string ExitSystem = "退出系统"; + public const string Help = "帮助"; + public const string VisitOfficial = "访问官网"; + public const string About = "关于"; + public const string UpdateLog = "查看更新日志"; + + public const string PersonnalCenter = "个人中心"; + public const string PersonnalInformation = "我的信息"; + public const string AccountSecurity = "账号安全"; + public const string AccountAvator = "账号头像"; + } +} diff --git a/EOM.TSHotelManagement.Common/UIControlIconConstant.cs b/EOM.TSHotelManagement.Common/UIControlIconConstant.cs new file mode 100644 index 0000000000000000000000000000000000000000..db5c2413c7718350d26782c56a5654a80078bd5f --- /dev/null +++ b/EOM.TSHotelManagement.Common/UIControlIconConstant.cs @@ -0,0 +1,25 @@ +namespace EOM.TSHotelManagement.Common +{ + public class UIControlIconConstant + { + public const string ChangeAccount = ""; + public const string PersonnalCenter = ""; + public const string SystemLock = ""; + public const string Help = ""; + public const string Exit = ""; + public const string PersonnalInformation = ""; + public const string AccountSecurity = ""; + public const string AccountAvator = ""; + public const string Internet = ""; + public const string Log = ""; + public const string About = ""; + + + public const string Clock = ""; + public const string CheckIn = ""; + public const string CheckOut = ""; + public const string ChangeRoom = ""; + public const string ChangeState = ""; + public const string CustomerInformation = ""; + } +} diff --git a/EOM.TSHotelManagement.Common/UIMessageConstant.cs b/EOM.TSHotelManagement.Common/UIMessageConstant.cs new file mode 100644 index 0000000000000000000000000000000000000000..2e8483ac1df937e337bfc2d2dd510307e8c79743 --- /dev/null +++ b/EOM.TSHotelManagement.Common/UIMessageConstant.cs @@ -0,0 +1,21 @@ +namespace EOM.TSHotelManagement.Common +{ + public class UIMessageConstant + { + public const string Success = "成功"; + public const string Error = "错误"; + public const string Warning = "警告"; + public const string Information = "信息"; + public const string Ok = "确定"; + public const string Chs_Cancel = "取消"; + public const string Chs_Ok = "好的"; + public const string Eng_Ok = "OK"; + public const string Chs_Yes = "是"; + public const string Chs_No = "否"; + public const string Chs_Wait = "稍后"; + public const string Eng_Cancel = "Cancel"; + public const string Eng_Yes = "Yes"; + public const string Eng_No = "No"; + public const string Eng_Wait = "Wait a minute..."; + } +} diff --git a/EOM.TSHotelManagement.Common/Util/ApplicationUtil.cs b/EOM.TSHotelManagement.Common/Util/ApplicationUtil.cs index b0d326ebf24ac5a1f69ffccf0c2556763ed16825..d84931e8c03ec66e11c623c7b90dadfedb65fc6b 100644 --- a/EOM.TSHotelManagement.Common/Util/ApplicationUtil.cs +++ b/EOM.TSHotelManagement.Common/Util/ApplicationUtil.cs @@ -29,7 +29,7 @@ namespace EOM.TSHotelManagement.Common }; ResponseMsg result = HttpHelper.Request(ApiConstants.Utility_SelectCardCode, input.ModelToJson()); var response = HttpHelper.JsonToModel>(result.message); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { return new Card { message = "SelectCardCode+接口服务异常，请提交Issue或尝试更新版本！" }; } diff --git a/EOM.TSHotelManagement.Common/Util/RecordHelper.cs b/EOM.TSHotelManagement.Common/Util/RecordHelper.cs index a20c925395b7d37d5e32eae2dc3b924fbb9521d6..fbbb88c99f19b045c04d0bcd91c16eb1ab12d727 100644 --- a/EOM.TSHotelManagement.Common/Util/RecordHelper.cs +++ b/EOM.TSHotelManagement.Common/Util/RecordHelper.cs @@ -1,5 +1,7 @@ using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Core; +using jvncorelib.CodeLib; +using jvncorelib.EntityLib; namespace EOM.TSHotelManagement.Common { @@ -18,6 +20,7 @@ namespace EOM.TSHotelManagement.Common string api = ApiConstants.Utility_AddLog; var logDetail = new CreateOperationLogInputDto { + OperationId = new UniqueCode().GetNewId("OP-"), OperationTime = Convert.ToDateTime(DateTime.Now), LogContent = operationLog, OperationAccount = LoginInfo.WorkerNo, @@ -27,7 +30,7 @@ namespace EOM.TSHotelManagement.Common DataInsUsr = LoginInfo.WorkerNo, DataInsDate = Convert.ToDateTime(DateTime.Now) }; - HttpHelper.Request(api, HttpHelper.ModelToJson(logDetail)); + HttpHelper.Request(api, logDetail.ModelToJson()); } } diff --git a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucNavBar.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucNavBar.Designer.cs deleted file mode 100644 index e6eee04a1e5b366f7fc314d756974a1f8bbd4749..0000000000000000000000000000000000000000 --- a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucNavBar.Designer.cs +++ /dev/null @@ -1,47 +0,0 @@ -namespace EOM.TSHotelManagement.FormUI.AppUserControls -{ - partial class ucNavBar - { - /// - /// 必需的设计器变量。 - /// - private System.ComponentModel.IContainer components = null; - - /// - /// 清理所有正在使用的资源。 - /// - /// 如果应释放托管资源，为 true；否则为 false。 - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region 组件设计器生成的代码 - - /// - /// 设计器支持所需的方法 - 不要修改 - /// 使用代码编辑器修改此方法的内容。 - /// - private void InitializeComponent() - { - SuspendLayout(); - // - // ucNavBar - // - AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); - AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - BackColor = System.Drawing.Color.Transparent; - BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - Margin = new System.Windows.Forms.Padding(4); - Name = "ucNavBar"; - Size = new System.Drawing.Size(153, 113); - ResumeLayout(false); - } - - #endregion - } -} diff --git a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.Designer.cs index 8899f24b5f12f49cdc32cec4ced1ad13166f2a0a..22ef3f4d227b079bf811fdef932a6caeffe0abdb 100644 --- a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.Designer.cs @@ -28,16 +28,7 @@ /// private void InitializeComponent() { - components = new System.ComponentModel.Container(); btnRoom = new AntdUI.Button(); - cmsMain = new ContextMenuStrip(components); - tsmiReserRoom = new ToolStripMenuItem(); - tsmiCheckIn = new ToolStripMenuItem(); - tsmiCheckOut = new ToolStripMenuItem(); - tsmiChangeRoom = new ToolStripMenuItem(); - tsmiSelectUserInfo = new ToolStripMenuItem(); - tsmiChangeState = new ToolStripMenuItem(); - cmsMain.SuspendLayout(); SuspendLayout(); // // btnRoom @@ -45,9 +36,7 @@ btnRoom.AutoEllipsis = true; btnRoom.BackColor = Color.Transparent; btnRoom.BackgroundImage = Properties.Resources.可住状态; - btnRoom.BackgroundImageLayout = AntdUI.TFit.Cover; - btnRoom.ContextMenuStrip = cmsMain; - btnRoom.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + btnRoom.Font = new Font("Noto Sans SC", 9F); btnRoom.Ghost = true; btnRoom.IconRatio = 0.5F; btnRoom.JoinLeft = true; @@ -59,56 +48,7 @@ btnRoom.TabIndex = 0; btnRoom.Text = "总统套房\r\n\r\nBS001\r\n\r\n小T呀"; btnRoom.Click += btnRoom_Click; - // - // cmsMain - // - cmsMain.ImageScalingSize = new Size(28, 28); - cmsMain.Items.AddRange(new ToolStripItem[] { tsmiReserRoom, tsmiCheckIn, tsmiCheckOut, tsmiChangeRoom, tsmiSelectUserInfo, tsmiChangeState }); - cmsMain.Name = "cmsMain"; - cmsMain.Size = new Size(149, 136); - cmsMain.Opening += cmsMain_Opening; - // - // tsmiReserRoom - // - tsmiReserRoom.Name = "tsmiReserRoom"; - tsmiReserRoom.Size = new Size(148, 22); - tsmiReserRoom.Text = "预约房间"; - tsmiReserRoom.Click += tsmiReserRoom_Click; - // - // tsmiCheckIn - // - tsmiCheckIn.Name = "tsmiCheckIn"; - tsmiCheckIn.Size = new Size(148, 22); - tsmiCheckIn.Text = "入住房间"; - tsmiCheckIn.Click += tsmiCheckIn_Click; - // - // tsmiCheckOut - // - tsmiCheckOut.Name = "tsmiCheckOut"; - tsmiCheckOut.Size = new Size(148, 22); - tsmiCheckOut.Text = "结算退房"; - tsmiCheckOut.Click += tsmiCheckOut_Click; - // - // tsmiChangeRoom - // - tsmiChangeRoom.Name = "tsmiChangeRoom"; - tsmiChangeRoom.Size = new Size(148, 22); - tsmiChangeRoom.Text = "转换房间"; - tsmiChangeRoom.Click += tsmiChangeRoom_Click; - // - // tsmiSelectUserInfo - // - tsmiSelectUserInfo.Name = "tsmiSelectUserInfo"; - tsmiSelectUserInfo.Size = new Size(148, 22); - tsmiSelectUserInfo.Text = "查看用户信息"; - tsmiSelectUserInfo.Click += tsmiSelectUserInfo_Click; - // - // tsmiChangeState - // - tsmiChangeState.Name = "tsmiChangeState"; - tsmiChangeState.Size = new Size(148, 22); - tsmiChangeState.Text = "修改房间状态"; - tsmiChangeState.Click += tsmiChangeState_Click; + btnRoom.MouseClick += btnRoom_MouseClick; // // ucRoom // @@ -118,7 +58,6 @@ Name = "ucRoom"; Size = new Size(122, 102); Load += ucRoom_Load; - cmsMain.ResumeLayout(false); ResumeLayout(false); } @@ -126,12 +65,5 @@ public AntdUI.Button btnRoom; private AntdUI.Button button1; - private System.Windows.Forms.ContextMenuStrip cmsMain; - private System.Windows.Forms.ToolStripMenuItem tsmiReserRoom; - private System.Windows.Forms.ToolStripMenuItem tsmiCheckIn; - private System.Windows.Forms.ToolStripMenuItem tsmiCheckOut; - private System.Windows.Forms.ToolStripMenuItem tsmiChangeRoom; - private System.Windows.Forms.ToolStripMenuItem tsmiSelectUserInfo; - private System.Windows.Forms.ToolStripMenuItem tsmiChangeState; } } diff --git a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.cs b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.cs index 6a36dc1c5dcb64062d90a7b2e81b11d3ff81c1be..f5c211665c583862e1fc2931f0b6a614031adc68 100644 --- a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.cs +++ b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.cs @@ -1,9 +1,10 @@ -using EOM.TSHotelManagement.Common; +using AntdUI; +using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; +using EOM.TSHotelManagement.Common.Util; using EOM.TSHotelManagement.FormUI.Properties; using EOM.TSHotelManagement.Shared; -using Sunny.UI; -using System.ComponentModel; +using jvncorelib.EntityLib; using System.Drawing.Drawing2D; using System.Runtime.InteropServices; @@ -12,10 +13,12 @@ namespace EOM.TSHotelManagement.FormUI public partial class ucRoom : UserControl { private LoadingProgress _loadingProgress; - public ucRoom() + private FrmRoomManager _fromRoomManagement; + public ucRoom(FrmRoomManager frmRoomManagement) { InitializeComponent(); _loadingProgress = new LoadingProgress(); + _fromRoomManagement = frmRoomManagement; } @@ -60,14 +63,8 @@ namespace EOM.TSHotelManagement.FormUI public ReadCustomerOutputDto romCustoInfo { get; set; } #endregion - public string lblMark { get; set; } - private void btnRoom_Click(object sender, EventArgs e) { - if (lblMark == "Mark") - { - return; - } LoadRoomInfo(); FrmRoomManager.ReadInfo(); } @@ -152,6 +149,19 @@ namespace EOM.TSHotelManagement.FormUI uint oldGWLEx = SetWindowLong(this.Handle, GWL_EXSTYLE, WS_EX_TRANSPARENT | WS_EX_LAYERED); } + + AntdUI.IContextMenuStripItem[] menulist = new AntdUI.IContextMenuStripItem[] + { + new AntdUI.ContextMenuStripItem(UIControlConstant.ReservationRoom).SetIcon(UIControlIconConstant.Clock), + new AntdUI.ContextMenuStripItem(UIControlConstant.CheckInRoom).SetIcon(UIControlIconConstant.CheckIn), + new AntdUI.ContextMenuStripItem(UIControlConstant.CheckOutRoom).SetIcon(UIControlIconConstant.CheckOut), + + new AntdUI.ContextMenuStripItem(UIControlConstant.ChangeRoom).SetIcon(UIControlIconConstant.ChangeRoom), + new AntdUI.ContextMenuStripItem(UIControlConstant.ChangeStateRoom).SetIcon(UIControlIconConstant.ChangeState), + + new AntdUI.ContextMenuStripItem(UIControlConstant.CustomerInformation).SetIcon(UIControlIconConstant.CustomerInformation) + }; + public void LoadRoomInfo() { co_RoomNo = romRoomInfo.RoomNumber; @@ -200,7 +210,7 @@ namespace EOM.TSHotelManagement.FormUI btnRoom.BackgroundImage = Resources.预约状态; break; } - btnRoom.BackgroundImageLayout = AntdUI.TFit.Cover; + btnRoom.BackgroundImageLayout = AntdUI.TFit.Fill; } ReadRoomOutputDto r; @@ -209,109 +219,44 @@ namespace EOM.TSHotelManagement.FormUI FrmReserManager frm = new FrmReserManager(); frm.ShowDialog(); } - private void cmsMain_Opening(object sender, CancelEventArgs e) - { - if (lblMark == "Mark") - { - e.Cancel = true; - return; - } - var roomText = btnRoom.Text?.Split("\n\n"); - if (roomText == null || roomText.Length < 2) - { - UIMessageBox.Show("房间信息不完整！", "来自小T提示", UIStyle.Red); - return; - } - getParam = new Dictionary - { - { nameof(ReadRoomInputDto.RoomNumber), roomText[1] } - }; - result = HttpHelper.Request(ApiConstants.Room_SelectRoomByRoomNo, getParam); - var response = HttpHelper.JsonToModel>(result.message); - - if (response.Code != BusinessStatusCode.Success) - { - UIMessageBox.Show($"{ApiConstants.Room_SelectRoomByRoomNo}+接口服务异常！", "来自小T提示", UIStyle.Red); - return; - } - r = response.Data; - if (r.RoomStateId == (int)Common.Core.RoomState.Vacant) - { - tsmiCheckIn.Enabled = true; - tsmiCheckOut.Enabled = false; - tsmiSelectUserInfo.Enabled = false; - tsmiChangeState.Enabled = true; - tsmiChangeRoom.Enabled = false; - tsmiReserRoom.Enabled = true; - } - else if (r.RoomStateId == (int)Common.Core.RoomState.Occupied) - { - tsmiCheckIn.Enabled = false; - tsmiCheckOut.Enabled = true; - tsmiSelectUserInfo.Enabled = true; - tsmiChangeState.Enabled = false; - tsmiChangeRoom.Enabled = true; - tsmiReserRoom.Enabled = false; - } - else if (r.RoomStateId == (int)Common.Core.RoomState.Dirty || r.RoomStateId == (int)Common.Core.RoomState.Maintenance) - { - tsmiCheckIn.Enabled = false; - tsmiCheckOut.Enabled = false; - tsmiSelectUserInfo.Enabled = false; - tsmiChangeState.Enabled = true; - tsmiChangeRoom.Enabled = false; - tsmiReserRoom.Enabled = false; - } - else - { - tsmiCheckIn.Enabled = true; - tsmiCheckOut.Enabled = false; - tsmiSelectUserInfo.Enabled = false; - tsmiChangeState.Enabled = true; - tsmiChangeRoom.Enabled = false; - tsmiReserRoom.Enabled = false; - } - } private void tsmiCheckIn_Click(object sender, EventArgs e) { if (romCustoInfo != null && romRoomInfo != null) { + rm_CustoNo = romCustoInfo.CustomerNumber; + rm_RoomNo = romRoomInfo.RoomNumber; + rm_RoomType = romRoomInfo.RoomName; + rm_RoomMoney = Convert.ToDecimal(romRoomInfo.RoomRent).ToString(); if (r.RoomStateId == new EnumHelper().GetEnumValue(Common.Core.RoomState.Reserved)) { - rm_CustoNo = romCustoInfo.CustomerNumber; - rm_RoomNo = romRoomInfo.RoomNumber; - rm_RoomType = romRoomInfo.RoomName; - rm_RoomMoney = Convert.ToDecimal(romRoomInfo.RoomRent).ToString(); rm_RoomStateId = (int)Common.Core.RoomState.Reserved; - UIMessageBox.ShowInfo("欢迎入住，请先注册客户信息！"); + NotificationService.ShowInfo("欢迎入住，请先注册客户信息！"); FrmReserList frm = new FrmReserList(); frm.ShowDialog(); return; } else { - rm_CustoNo = romCustoInfo.CustomerNumber; - rm_RoomNo = romRoomInfo.RoomNumber; - rm_RoomType = romRoomInfo.RoomName; - rm_RoomMoney = Convert.ToDecimal(romRoomInfo.RoomRent).ToString(); FrmCheckIn frm = new FrmCheckIn(); frm.ShowDialog(); } } else { - UIMessageBox.Show("房间信息不完整！", "来自小T提示", UIStyle.Red); + NotificationService.ShowError("房间信息不完整！"); + return; } } private void tsmiCheckOut_Click(object sender, EventArgs e) { rm_CustoNo = romRoomInfo.CustomerNumber; + co_CustoName = romCustoInfo.CustomerName; rm_RoomNo = romRoomInfo.RoomNumber; rm_RoomType = romRoomInfo.RoomName; - FrmCheckOutForm frm = new FrmCheckOutForm(_loadingProgress); - frm.ShowDialog(this); + FrmCheckOutDetail frm = new FrmCheckOutDetail(); + frm.ShowDialog(); } public static string? RoomNo; @@ -321,8 +266,12 @@ namespace EOM.TSHotelManagement.FormUI { if (romCustoInfo != null && romRoomInfo != null) { - bool tf = UIMessageBox.Show("确定要进行转房吗？", "来自小T的提醒", UIStyle.Orange, UIMessageBoxButtons.OKCancel); - if (tf) + var dr = AntdUI.Modal.open(new AntdUI.Modal.Config(null, UIMessageConstant.Information, "是否要进行房间更换？", AntdUI.TType.Info) + { + CancelText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_No, UIMessageConstant.Chs_No), + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Yes, UIMessageConstant.Chs_Yes) + }); + if (dr == DialogResult.OK) { RoomNo = romRoomInfo.RoomNumber; CustoNo = romCustoInfo.CustomerNumber; @@ -333,14 +282,14 @@ namespace EOM.TSHotelManagement.FormUI } else { - UIMessageBox.Show("房间信息不完整！", "来自小T提示", UIStyle.Red); + NotificationService.ShowError("房间信息不完整！"); + return; } } private void tsmiSelectUserInfo_Click(object sender, EventArgs e) { - rm_CustoNo = romCustoInfo.CustomerNumber; - FrmSelectCustoInfo frm = new FrmSelectCustoInfo(); + FrmCustomerInfo frm = new FrmCustomerInfo(romCustoInfo.CustomerNumber); frm.ShowDialog(); } @@ -348,8 +297,12 @@ namespace EOM.TSHotelManagement.FormUI { if (r.RoomStateId == (int)Common.Core.RoomState.Reserved) { - bool tf = UIMessageBox.Show("当前房间已被预约，确认更改状态后将会删除原本预约状态及信息，你确定吗？", "来自小T的提醒", UIStyle.Red, UIMessageBoxButtons.OKCancel); - if (tf) + var dr = AntdUI.Modal.open(new AntdUI.Modal.Config(null, UIMessageConstant.Warning, "当前房间已被预约，确认更改状态后将会删除原本预约状态及信息，你确定吗？", AntdUI.TType.Warn) + { + CancelText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_No, UIMessageConstant.Chs_No), + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Yes, UIMessageConstant.Chs_Yes) + }); + if (dr == DialogResult.OK) { getParam = new Dictionary() { @@ -357,9 +310,9 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Reser_SelectReserInfoByRoomNo, getParam); var reserResponse = HttpHelper.JsonToModel>(result.message); - if (reserResponse.Code != BusinessStatusCode.Success) + if (reserResponse.Success == false) { - UIMessageBox.Show($"{ApiConstants.Reser_SelectReserInfoByRoomNo}+接口服务异常！", "来自小T提示", UIStyle.Red); + NotificationService.ShowError($"{ApiConstants.Reser_SelectReserInfoByRoomNo}+接口服务异常！"); return; } else @@ -368,11 +321,11 @@ namespace EOM.TSHotelManagement.FormUI { ReservationId = reserResponse.Data!.ReservationId }; - result = HttpHelper.Request(ApiConstants.Reser_DeleteReserInfo, HttpHelper.ModelToJson(reser)); + result = HttpHelper.Request(ApiConstants.Reser_DeleteReserInfo, reser.ModelToJson()); var reserResult = HttpHelper.JsonToModel(result.message); - if (reserResult.Code != BusinessStatusCode.Success) + if (reserResult.Success == false) { - UIMessageBox.Show($"{ApiConstants.Reser_DeleteReserInfo}+接口服务异常！", "来自小T提示", UIStyle.Red); + NotificationService.ShowError($"{ApiConstants.Reser_DeleteReserInfo}+接口服务异常！"); return; } } @@ -387,7 +340,119 @@ namespace EOM.TSHotelManagement.FormUI } else { - UIMessageBox.Show("房间信息不完整！", "来自小T提示", UIStyle.Red); + NotificationService.ShowError("房间信息不完整！"); + } + } + + private void RightKey(AntdUI.ContextMenuStripItem it) + { + switch (it.Text) + { + case UIControlConstant.ReservationRoom: + tsmiReserRoom_Click(this, EventArgs.Empty); + break; + case UIControlConstant.CheckInRoom: + tsmiCheckIn_Click(this, EventArgs.Empty); + break; + case UIControlConstant.ChangeRoom: + tsmiChangeRoom_Click(this, EventArgs.Empty); + break; + case UIControlConstant.CheckOutRoom: + tsmiCheckOut_Click(this, EventArgs.Empty); + break; + case UIControlConstant.CustomerInformation: + tsmiSelectUserInfo_Click(this, EventArgs.Empty); + break; + case UIControlConstant.ChangeStateRoom: + tsmiChangeState_Click(this, EventArgs.Empty); + break; + } + } + + private void ContextMenuItemHandler() + { + var roomText = btnRoom.Text?.Split("\n\n"); + if (roomText == null || roomText.Length < 2) + { + NotificationService.ShowError("房间信息不完整！"); + return; + } + getParam = new Dictionary + { + { nameof(ReadRoomInputDto.RoomNumber), roomText[1] } + }; + result = HttpHelper.Request(ApiConstants.Room_SelectRoomByRoomNo, getParam); + var response = HttpHelper.JsonToModel>(result.message); + + if (response.Success == false) + { + NotificationService.ShowError($"{ApiConstants.Room_SelectRoomByRoomNo}+接口服务异常！"); + return; + } + r = response.Data; + + foreach (ContextMenuStripItem item in menulist) + { + switch (r.RoomStateId) + { + case (int)Common.Core.RoomState.Vacant: + item.Enabled = item.Text switch + { + UIControlConstant.CheckInRoom => true, + UIControlConstant.ReservationRoom => true, + UIControlConstant.ChangeRoom => false, + UIControlConstant.CheckOutRoom => false, + UIControlConstant.CustomerInformation => false, + _ => item.Enabled + }; + break; + case (int)Common.Core.RoomState.Occupied: + item.Enabled = item.Text switch + { + UIControlConstant.CheckInRoom => false, + UIControlConstant.ReservationRoom => false, + UIControlConstant.ChangeRoom => true, + UIControlConstant.CheckOutRoom => true, + UIControlConstant.CustomerInformation => true, + _ => item.Enabled + }; + break; + case (int)Common.Core.RoomState.Dirty: + case (int)Common.Core.RoomState.Maintenance: + item.Enabled = item.Text switch + { + UIControlConstant.CheckInRoom => false, + UIControlConstant.ReservationRoom => false, + UIControlConstant.ChangeRoom => false, + UIControlConstant.CheckOutRoom => false, + UIControlConstant.CustomerInformation => false, + _ => item.Enabled + }; + break; + default: + item.Enabled = item.Text switch + { + UIControlConstant.CheckInRoom => true, + UIControlConstant.ReservationRoom => false, + UIControlConstant.ChangeRoom => false, + UIControlConstant.CheckOutRoom => false, + UIControlConstant.CustomerInformation => false, + _ => item.Enabled + }; + break; + } + } + + } + + private void btnRoom_MouseClick(object sender, MouseEventArgs e) + { + ContextMenuItemHandler(); + if (e.Button == MouseButtons.Right) + { + AntdUI.ContextMenuStrip.Config config = new AntdUI.ContextMenuStrip.Config(this, RightKey, menulist); + config.Font = new Font("Noto Sans SC", 9f, FontStyle.Bold); + AntdUI.ContextMenuStrip.open(config); } } } diff --git a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.resx b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.resx index 98b3243196168d3e1232b6dab2d7bda1900d3d0a..8b2ff64a11300290ddac7e7d9bc26e5e0a766508 100644 --- a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.resx +++ b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoom.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.Designer.cs index a7679ab7c534753ae6692af3b66d3d111f7681ed..568b526274167b59841ffe16d26046060eab079b 100644 --- a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.Designer.cs @@ -1,4 +1,4 @@ -namespace EOM.TSHotelManagement.FormUI.AppUserControls +namespace EOM.TSHotelManagement.FormUI { partial class ucRoomType { @@ -28,33 +28,30 @@ /// private void InitializeComponent() { - btnRoomType = new Sunny.UI.UIButton(); + btnRoomType = new AntdUI.Button(); SuspendLayout(); // // btnRoomType // - btnRoomType.Cursor = System.Windows.Forms.Cursors.Hand; - btnRoomType.Font = new System.Drawing.Font("微软雅黑", 12F); - btnRoomType.Location = new System.Drawing.Point(0, 2); - btnRoomType.Margin = new System.Windows.Forms.Padding(4); - btnRoomType.MinimumSize = new System.Drawing.Size(1, 1); + btnRoomType.Font = new Font("Noto Sans SC", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnRoomType.Location = new Point(2, 0); btnRoomType.Name = "btnRoomType"; - btnRoomType.Size = new System.Drawing.Size(107, 33); - btnRoomType.TabIndex = 1; - btnRoomType.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134); + btnRoomType.Size = new Size(113, 37); + btnRoomType.TabIndex = 0; + btnRoomType.Type = AntdUI.TTypeMini.Info; // // ucRoomType // - AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); - AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; Controls.Add(btnRoomType); Name = "ucRoomType"; - Size = new System.Drawing.Size(107, 37); + Size = new Size(117, 38); ResumeLayout(false); } #endregion - public Sunny.UI.UIButton btnRoomType; + public AntdUI.Button btnRoomType; } } diff --git a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.cs b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.cs index 45d8a40f35f8cba010f6d43b4272b7a172ea9338..7506853d98110ce8a5ce9e928e0f3f5ff4b4ae5e 100644 --- a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.cs +++ b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.cs @@ -1,4 +1,4 @@ -namespace EOM.TSHotelManagement.FormUI.AppUserControls +namespace EOM.TSHotelManagement.FormUI { public partial class ucRoomType : UserControl { diff --git a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.resx b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.resx index af32865ec12ff9e3beb4b98fb4cf5b8420e12d69..8b2ff64a11300290ddac7e7d9bc26e5e0a766508 100644 --- a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.resx +++ b/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucRoomType.resx @@ -1,7 +1,7 @@  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + + + AAABAAEAICAAAAEAGAASBAAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAAFz + UkdCAK7OHOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA7DAAAOwwHHb6hkAAADp0lEQVRYR7WXWYhP + URzHx5pliGEkSyhJeCCJZHsgpSxZx5pkT0h2CYkHpQYJKeRBliyFEoMiWVIj2bLmwYOdeCDM+HzP/c5/ + TPP3n/u/xrc+nXN+27n/+7/3nHNz4qqkpKQrTIYNcBwOwurS0tJxkOuw/yMmGgsPmSit8N2CPg6vXlF4 + IXN88kQ3oBAKYA7swnzbvg8w1WnVIwqOhMfwFpYwTxO7Kgjfcl+E7lJ7m/9NKkTB/fAN5tmcVvjrw274 + CtttTi4mr02hKfAOTkEXu/4qYtrAK3gBBTYnEwXyYQs8gfE2ZxRxjWErvId1NicTBTqBXrVr0N/mjOKu + 1SN2JvyEQzYnEwX6QDHo9neyOaO4gJrE9qXVw3gZ2tmVvUjuBXq3z0MPmzOKeesQO9IXUASt7MpeJHeD + c3AHhtmcUcQ1ZO6VvoAzUN+u7EVya9gJeguWxinGvM2JOw16FQttTi6KaPnV6vYcRtucVkyu2z/fv/4Z + jLEruagVFiIXvQK97aokQgY57iPNepv/XRTU23DZxV/DNrr9oJ79w2GP/BL94pBYnaLoANAd+OV5NNFT + +AwlHv+AY3Rr0HaEjTDBJXSHujNeDAPoh4uPJYKbkDQD7tP/q/B/oRkMs+k/sO0BTKTbk/asba9p1tPm + eYr0IiCfQBW76cTvoGX5JKyDYTAa1uI+SqsluFCxcUSs7lAjT1dR+PXwHY5CQ/B1GAENHVJJhGnzKogy + qhaxu2kqb+0YW8IBB2lXWwVt7c4oUtorL46ouYimgVMjYdD/rROOAh7TjLOrShFbVxer3DIxfgl7QQua + 6qXE+AQ0c3qqwAo7tafPtatKEatnoli5ZWJ8laazQxSjrfpI5I3EuIhmegigkwu3MWrlWxOMMaVif4r8 + tAcSbGGDc1hKZU69atrHr0J+MMaU66RE/l2annanhF3HtjNRVLnKnBfpf6JdHAxZKCpTLmroYDrI7pSw + t4DzUVS55BiiDq02nQ6Ojy1y7oVKFuM3sMzulHCNwl7h20JjFVgAWmg2OTYrkZcHkyCsdhJ9TTTKIYrR + V5UeuiD6OkFPhTw5d8BX7JVuWzYiv8I6QE0d5x/BXdf/U1q2a4VEnDp2fQyDhFIxagwPpWOI2Ak0dUMy + g5eRObH0+uoB074QS8RuhmgvoPPC9sSiRg/oAJdskk3rgf7rbRB2SIm+zosD6dYJF0BH/51ONImgWOqr + iXEu42lwAVbYrB85FPbBLGKa2oxycn4DnUXgUUEkWqsAAAAASUVORK5CYII= + + + \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.Designer.cs index 68f6f743ea1a600d4310869a8653ef97dcd2d773..afb7efb402b885390cf539834d9741eb95c03d7f 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.Designer.cs @@ -29,106 +29,106 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmChangeRoom)); - this.uiLabel1 = new Sunny.UI.UILabel(); - this.cboRoomList = new Sunny.UI.UIComboBox(); - this.uiLabel2 = new Sunny.UI.UILabel(); - this.lblRoomType = new Sunny.UI.UILabel(); - this.btnChangeRoom = new Sunny.UI.UIButton(); - this.SuspendLayout(); + ucWindowHeader1 = new ucWindowHeader(); + label24 = new Label(); + label1 = new Label(); + lblRoomType = new AntdUI.Label(); + btnChangeRoom = new AntdUI.Button(); + cboRoomList = new AntdUI.Select(); + SuspendLayout(); // - // uiLabel1 + // ucWindowHeader1 // - this.uiLabel1.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiLabel1.Location = new System.Drawing.Point(15, 54); - this.uiLabel1.Name = "uiLabel1"; - this.uiLabel1.Size = new System.Drawing.Size(202, 28); - this.uiLabel1.Style = Sunny.UI.UIStyle.Custom; - this.uiLabel1.TabIndex = 6; - this.uiLabel1.Text = "请选择需要转换的新房间："; - this.uiLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + ucWindowHeader1.Location = new Point(0, -1); + ucWindowHeader1.Name = "ucWindowHeader1"; + ucWindowHeader1.Size = new Size(249, 35); + ucWindowHeader1.TabIndex = 11; // - // cboRoomList + // label24 // - this.cboRoomList.DataSource = null; - this.cboRoomList.FillColor = System.Drawing.Color.White; - this.cboRoomList.Font = new System.Drawing.Font("微软雅黑", 12F); - this.cboRoomList.Location = new System.Drawing.Point(208, 55); - this.cboRoomList.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cboRoomList.MinimumSize = new System.Drawing.Size(63, 0); - this.cboRoomList.Name = "cboRoomList"; - this.cboRoomList.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cboRoomList.Radius = 15; - this.cboRoomList.Size = new System.Drawing.Size(150, 29); - this.cboRoomList.Style = Sunny.UI.UIStyle.Custom; - this.cboRoomList.TabIndex = 7; - this.cboRoomList.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.cboRoomList.TextChanged += new System.EventHandler(this.cboRoomList_TextChanged); + label24.AutoSize = true; + label24.Font = new Font("Noto Sans SC", 14F); + label24.Location = new Point(5, 58); + label24.Name = "label24"; + label24.Size = new Size(85, 19); + label24.TabIndex = 159; + label24.Text = "新房间："; // - // uiLabel2 + // label1 // - this.uiLabel2.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiLabel2.Location = new System.Drawing.Point(15, 96); - this.uiLabel2.Name = "uiLabel2"; - this.uiLabel2.Size = new System.Drawing.Size(183, 28); - this.uiLabel2.Style = Sunny.UI.UIStyle.Custom; - this.uiLabel2.TabIndex = 8; - this.uiLabel2.Text = "新 房 间 类 型 为："; - this.uiLabel2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + label1.AutoSize = true; + label1.Font = new Font("Noto Sans SC", 14F); + label1.Location = new Point(5, 108); + label1.Name = "label1"; + label1.Size = new Size(81, 19); + label1.TabIndex = 161; + label1.Text = "类 型："; // // lblRoomType // - this.lblRoomType.Font = new System.Drawing.Font("微软雅黑", 12F); - this.lblRoomType.Location = new System.Drawing.Point(208, 96); - this.lblRoomType.Name = "lblRoomType"; - this.lblRoomType.Size = new System.Drawing.Size(150, 28); - this.lblRoomType.Style = Sunny.UI.UIStyle.Custom; - this.lblRoomType.TabIndex = 9; - this.lblRoomType.Text = "新 房 间 类 型"; - this.lblRoomType.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + lblRoomType.Font = new Font("Noto Sans SC", 12F); + lblRoomType.Location = new Point(91, 99); + lblRoomType.Name = "lblRoomType"; + lblRoomType.Size = new Size(149, 36); + lblRoomType.TabIndex = 162; + lblRoomType.Text = ""; + lblRoomType.TextAlign = ContentAlignment.MiddleCenter; // // btnChangeRoom // - this.btnChangeRoom.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnChangeRoom.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnChangeRoom.Location = new System.Drawing.Point(133, 138); - this.btnChangeRoom.MinimumSize = new System.Drawing.Size(1, 1); - this.btnChangeRoom.Name = "btnChangeRoom"; - this.btnChangeRoom.Radius = 15; - this.btnChangeRoom.Size = new System.Drawing.Size(107, 40); - this.btnChangeRoom.Style = Sunny.UI.UIStyle.Custom; - this.btnChangeRoom.TabIndex = 10; - this.btnChangeRoom.Text = "转 房"; - this.btnChangeRoom.Click += new System.EventHandler(this.btnChangeRoom_Click); + btnChangeRoom.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnChangeRoom.Location = new Point(155, 156); + btnChangeRoom.Name = "btnChangeRoom"; + btnChangeRoom.Size = new Size(85, 45); + btnChangeRoom.TabIndex = 163; + btnChangeRoom.Text = "转 房"; + btnChangeRoom.Type = AntdUI.TTypeMini.Primary; + btnChangeRoom.Click += btnChangeRoom_Click; + // + // cboRoomList + // + cboRoomList.Font = new Font("Noto Sans SC", 12F); + cboRoomList.List = true; + cboRoomList.ListAutoWidth = true; + cboRoomList.Location = new Point(91, 46); + cboRoomList.Name = "cboRoomList"; + cboRoomList.Placement = AntdUI.TAlignFrom.Bottom; + cboRoomList.Size = new Size(149, 45); + cboRoomList.TabIndex = 179; + cboRoomList.TextChanged += cboRoomList_TextChanged; // // FrmChangeRoom // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.ClientSize = new System.Drawing.Size(372, 198); - this.Controls.Add(this.btnChangeRoom); - this.Controls.Add(this.lblRoomType); - this.Controls.Add(this.uiLabel2); - this.Controls.Add(this.cboRoomList); - this.Controls.Add(this.uiLabel1); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "FrmChangeRoom"; - this.ShowIcon = true; - this.ShowTitleIcon = true; - this.Style = Sunny.UI.UIStyle.Custom; - this.Text = "转换房间"; - this.Load += new System.EventHandler(this.FrmChangeRoom_Load); - this.ResumeLayout(false); + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.FromArgb(235, 243, 255); + ClientSize = new Size(248, 210); + Controls.Add(cboRoomList); + Controls.Add(btnChangeRoom); + Controls.Add(lblRoomType); + Controls.Add(label1); + Controls.Add(label24); + Controls.Add(ucWindowHeader1); + FormBorderStyle = FormBorderStyle.FixedSingle; + Icon = (Icon)resources.GetObject("$this.Icon"); + Margin = new Padding(2); + MaximizeBox = false; + MinimizeBox = false; + Name = "FrmChangeRoom"; + StartPosition = FormStartPosition.CenterScreen; + Text = "转换房间"; + Load += FrmChangeRoom_Load; + ResumeLayout(false); + PerformLayout(); } #endregion - private Sunny.UI.UILabel uiLabel1; - private Sunny.UI.UIComboBox cboRoomList; - private Sunny.UI.UILabel uiLabel2; - private Sunny.UI.UILabel lblRoomType; - private Sunny.UI.UIButton btnChangeRoom; + private ucWindowHeader ucWindowHeader1; + private Label label24; + private Label label1; + private AntdUI.Label lblRoomType; + private AntdUI.Button btnChangeRoom; + private AntdUI.Select cboRoomList; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.cs index a9e3b766dbb47119e0c4130b32d09e171d1a2656..9f2d88951f036b0644a64d1cb77b87319d267cb2 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.cs @@ -22,18 +22,21 @@ * */ +using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using jvncorelib.EntityLib; -using Sunny.UI; namespace EOM.TSHotelManagement.FormUI { - public partial class FrmChangeRoom : UIForm + public partial class FrmChangeRoom : Window { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmChangeRoom)); public FrmChangeRoom() { InitializeComponent(); + + ucWindowHeader1.ApplySettingsWithoutMinimize("转换房间", string.Empty, (Image)resources.GetObject("FrmChangeRoom.Icon")!); } ResponseMsg result = null; @@ -43,14 +46,12 @@ namespace EOM.TSHotelManagement.FormUI { result = HttpHelper.Request(ApiConstants.Room_SelectCanUseRoomAll); var datas = HttpHelper.JsonToModel>(result.message); - if (datas.Success) + if (!datas.Success) { - UIMessageBox.ShowError($"{ApiConstants.Room_SelectCanUseRoomAll}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_SelectCanUseRoomAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - cboRoomList.DataSource = datas.Data.Items; - cboRoomList.DisplayMember = nameof(ReadRoomOutputDto.RoomNumber); - cboRoomList.ValueMember = nameof(ReadRoomOutputDto.RoomNumber); + this.cboRoomList.Items.AddRange(datas.Data.Items.Select(item => new AntdUI.SelectItem(item.RoomNumber, item.RoomNumber)).ToArray()); } private void btnChangeRoom_Click(object sender, EventArgs e) @@ -70,11 +71,11 @@ namespace EOM.TSHotelManagement.FormUI DataChgUsr = LoginInfo.WorkerNo, DataChgDate = Convert.ToDateTime(DateTime.Now) }; - result = HttpHelper.Request(ApiConstants.Room_TransferRoom, HttpHelper.ModelToJson(transferRoom)); + result = HttpHelper.Request(ApiConstants.Room_TransferRoom, transferRoom.ModelToJson()); var response = HttpHelper.JsonToModel(result.message!); - if (response.Code != BusinessStatusCode.Success) + if (!response.Success) { - UIMessageBox.ShowError($"{ApiConstants.Room_TransferRoom}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_TransferRoom}+接口服务异常，请提交Issue或尝试更新版本！"); return; } @@ -85,12 +86,12 @@ namespace EOM.TSHotelManagement.FormUI #region 获取添加操作日志所需的信息 RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + transferRoom.DataChgDate + "位于" + LoginInfo.SoftwareVersion + "执行：" + transferRoom.CustomerNumber + "于" + transferRoom.DataChgDate + "进行了换房！", Common.Core.LogLevel.Warning); #endregion - UIMessageBox.ShowSuccess("转房成功"); + NotificationService.ShowSuccess("转房成功"); this.Close(); } catch (Exception) { - UIMessageBox.ShowError("转房失败"); + NotificationService.ShowError("转房失败"); } } @@ -109,9 +110,9 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.RoomType_SelectRoomTypeByRoomNo, dic); var data = HttpHelper.JsonToModel>(result.message); - if (data.Code != BusinessStatusCode.Success) + if (data.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.RoomType_SelectRoomTypeByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.RoomType_SelectRoomTypeByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); return; } var roomType = data.Data; diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.resx index 211ed0936cc068c5ab8d5774f308bc5a332af403..1437888d8177178ae8d2cb13d733da0f1dd5004f 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.resx +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmChangeRoom.resx @@ -1,17 +1,17 @@  - diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.Designer.cs index 6ece672041c2bf5495c2981e914bad2d018dc2d2..317434d968dbe6a9ece95d74df729ab233de6b01 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.Designer.cs @@ -29,243 +29,89 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmCheckIn)); - txtRoomPosition = new Sunny.UI.UITextBox(); label3 = new Label(); - txtType = new Sunny.UI.UIComboBox(); - txtRoomNo = new Sunny.UI.UITextBox(); - txtState = new Sunny.UI.UITextBox(); - txtMoney = new Sunny.UI.UITextBox(); label13 = new Label(); label15 = new Label(); label19 = new Label(); label20 = new Label(); - txtCustoNo = new Sunny.UI.UITextBox(); - txtCustoName = new Sunny.UI.UITextBox(); label18 = new Label(); label16 = new Label(); - txtCustoTel = new Sunny.UI.UITextBox(); label14 = new Label(); - txtCustoType = new Sunny.UI.UITextBox(); label12 = new Label(); - txtDeposit = new Sunny.UI.UITextBox(); label1 = new Label(); - pnlBtm.SuspendLayout(); + ucWindowHeader1 = new ucWindowHeader(); + btnCheckIn = new AntdUI.Button(); + btnCancel = new AntdUI.Button(); + txtRoomNo = new AntdUI.Input(); + txtState = new AntdUI.Input(); + txtRoomPosition = new AntdUI.Input(); + txtRent = new AntdUI.Input(); + txtDeposit = new AntdUI.Input(); + txtCustomerName = new AntdUI.Input(); + txtCustomerLevel = new AntdUI.Input(); + txtCustomerTel = new AntdUI.Input(); + txtCustomerNo = new AntdUI.Input(); + txtRoomType = new AntdUI.Input(); SuspendLayout(); // - // pnlBtm - // - pnlBtm.Location = new Point(1, 328); - pnlBtm.Size = new Size(859, 53); - pnlBtm.Style = Sunny.UI.UIStyle.Custom; - // - // btnCancel - // - btnCancel.Location = new Point(731, 12); - btnCancel.Style = Sunny.UI.UIStyle.Custom; - // - // btnOK - // - btnOK.Location = new Point(616, 12); - btnOK.Style = Sunny.UI.UIStyle.Custom; - // - // txtRoomPosition - // - txtRoomPosition.Cursor = Cursors.IBeam; - txtRoomPosition.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtRoomPosition.Location = new Point(170, 163); - txtRoomPosition.Margin = new Padding(4, 5, 4, 5); - txtRoomPosition.MinimumSize = new Size(1, 1); - txtRoomPosition.Name = "txtRoomPosition"; - txtRoomPosition.Padding = new Padding(5); - txtRoomPosition.Radius = 20; - txtRoomPosition.ReadOnly = true; - txtRoomPosition.ShowText = false; - txtRoomPosition.Size = new Size(251, 35); - txtRoomPosition.Style = Sunny.UI.UIStyle.Custom; - txtRoomPosition.StyleCustomMode = true; - txtRoomPosition.TabIndex = 150; - txtRoomPosition.TextAlignment = ContentAlignment.MiddleLeft; - txtRoomPosition.Watermark = ""; - // // label3 // label3.AutoSize = true; - label3.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label3.Location = new Point(63, 168); + label3.Font = new Font("Noto Sans SC", 14.2499981F); + label3.Location = new Point(8, 169); label3.Name = "label3"; - label3.Size = new Size(88, 25); + label3.Size = new Size(85, 19); label3.TabIndex = 149; label3.Text = "房间位置"; // - // txtType - // - txtType.DataSource = null; - txtType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - txtType.FillColor = Color.White; - txtType.Font = new Font("微软雅黑", 15.75F); - txtType.ItemHoverColor = Color.FromArgb(155, 200, 255); - txtType.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - txtType.Location = new Point(547, 55); - txtType.Margin = new Padding(4, 5, 4, 5); - txtType.MinimumSize = new Size(63, 0); - txtType.Name = "txtType"; - txtType.Padding = new Padding(0, 0, 30, 2); - txtType.Radius = 20; - txtType.ReadOnly = true; - txtType.Size = new Size(250, 35); - txtType.Style = Sunny.UI.UIStyle.Custom; - txtType.SymbolSize = 24; - txtType.TabIndex = 148; - txtType.TextAlignment = ContentAlignment.MiddleLeft; - txtType.Watermark = ""; - // - // txtRoomNo - // - txtRoomNo.Cursor = Cursors.IBeam; - txtRoomNo.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtRoomNo.Location = new Point(171, 55); - txtRoomNo.Margin = new Padding(4, 5, 4, 5); - txtRoomNo.MinimumSize = new Size(1, 1); - txtRoomNo.Name = "txtRoomNo"; - txtRoomNo.Padding = new Padding(5); - txtRoomNo.Radius = 20; - txtRoomNo.ReadOnly = true; - txtRoomNo.ShowText = false; - txtRoomNo.Size = new Size(250, 35); - txtRoomNo.Style = Sunny.UI.UIStyle.Custom; - txtRoomNo.StyleCustomMode = true; - txtRoomNo.TabIndex = 147; - txtRoomNo.TextAlignment = ContentAlignment.MiddleLeft; - txtRoomNo.Watermark = ""; - // - // txtState - // - txtState.Cursor = Cursors.IBeam; - txtState.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtState.Location = new Point(171, 110); - txtState.Margin = new Padding(4, 5, 4, 5); - txtState.MinimumSize = new Size(1, 1); - txtState.Name = "txtState"; - txtState.Padding = new Padding(5); - txtState.Radius = 20; - txtState.ReadOnly = true; - txtState.ShowText = false; - txtState.Size = new Size(250, 35); - txtState.Style = Sunny.UI.UIStyle.Custom; - txtState.StyleCustomMode = true; - txtState.TabIndex = 146; - txtState.TextAlignment = ContentAlignment.MiddleLeft; - txtState.Watermark = ""; - // - // txtMoney - // - txtMoney.Cursor = Cursors.IBeam; - txtMoney.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtMoney.Location = new Point(547, 111); - txtMoney.Margin = new Padding(4, 5, 4, 5); - txtMoney.MinimumSize = new Size(1, 1); - txtMoney.Name = "txtMoney"; - txtMoney.Padding = new Padding(5); - txtMoney.Radius = 20; - txtMoney.ReadOnly = true; - txtMoney.ShowText = false; - txtMoney.Size = new Size(250, 35); - txtMoney.Style = Sunny.UI.UIStyle.Custom; - txtMoney.StyleCustomMode = true; - txtMoney.TabIndex = 145; - txtMoney.TextAlignment = ContentAlignment.MiddleLeft; - txtMoney.Watermark = ""; - // // label13 // label13.AutoSize = true; - label13.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label13.Location = new Point(443, 114); + label13.Font = new Font("Noto Sans SC", 14.2499981F); + label13.Location = new Point(387, 117); label13.Name = "label13"; - label13.Size = new Size(88, 25); + label13.Size = new Size(85, 19); label13.TabIndex = 144; label13.Text = "房间单价"; // // label15 // label15.AutoSize = true; - label15.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label15.Location = new Point(443, 62); + label15.Font = new Font("Noto Sans SC", 14.2499981F); + label15.Location = new Point(387, 64); label15.Name = "label15"; - label15.Size = new Size(88, 25); + label15.Size = new Size(85, 19); label15.TabIndex = 143; label15.Text = "房间类型"; // // label19 // label19.AutoSize = true; - label19.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label19.Location = new Point(64, 114); + label19.Font = new Font("Noto Sans SC", 14.2499981F); + label19.Location = new Point(9, 117); label19.Name = "label19"; - label19.Size = new Size(88, 25); + label19.Size = new Size(85, 19); label19.TabIndex = 142; label19.Text = "房间状态"; // // label20 // label20.AutoSize = true; - label20.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label20.Location = new Point(64, 62); + label20.Font = new Font("Noto Sans SC", 14.2499981F); + label20.Location = new Point(9, 64); label20.Name = "label20"; - label20.Size = new Size(88, 25); + label20.Size = new Size(85, 19); label20.TabIndex = 141; label20.Text = "房间编号"; // - // txtCustoNo - // - txtCustoNo.AutoCompleteMode = AutoCompleteMode.Suggest; - txtCustoNo.AutoCompleteSource = AutoCompleteSource.CustomSource; - txtCustoNo.BackColor = Color.Transparent; - txtCustoNo.Cursor = Cursors.IBeam; - txtCustoNo.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustoNo.Location = new Point(170, 218); - txtCustoNo.Margin = new Padding(4, 5, 4, 5); - txtCustoNo.MinimumSize = new Size(1, 1); - txtCustoNo.Name = "txtCustoNo"; - txtCustoNo.Padding = new Padding(5); - txtCustoNo.Radius = 20; - txtCustoNo.ShowText = false; - txtCustoNo.Size = new Size(250, 35); - txtCustoNo.Style = Sunny.UI.UIStyle.Custom; - txtCustoNo.StyleCustomMode = true; - txtCustoNo.TabIndex = 143; - txtCustoNo.TextAlignment = ContentAlignment.MiddleLeft; - txtCustoNo.Watermark = ""; - txtCustoNo.Validated += txtCustoNo_Validated; - // - // txtCustoName - // - txtCustoName.BackColor = Color.Transparent; - txtCustoName.Cursor = Cursors.IBeam; - txtCustoName.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustoName.Location = new Point(546, 218); - txtCustoName.Margin = new Padding(4, 5, 4, 5); - txtCustoName.MinimumSize = new Size(1, 1); - txtCustoName.Name = "txtCustoName"; - txtCustoName.Padding = new Padding(5); - txtCustoName.Radius = 20; - txtCustoName.ReadOnly = true; - txtCustoName.ShowText = false; - txtCustoName.Size = new Size(250, 35); - txtCustoName.Style = Sunny.UI.UIStyle.Custom; - txtCustoName.StyleCustomMode = true; - txtCustoName.TabIndex = 144; - txtCustoName.TextAlignment = ContentAlignment.MiddleLeft; - txtCustoName.Watermark = ""; - // // label18 // label18.AutoSize = true; label18.BackColor = Color.Transparent; - label18.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label18.Location = new Point(63, 225); + label18.Font = new Font("Noto Sans SC", 14.2499981F); + label18.Location = new Point(8, 222); label18.Name = "label18"; - label18.Size = new Size(88, 25); + label18.Size = new Size(85, 19); label18.TabIndex = 137; label18.Text = "客户编号"; // @@ -273,188 +119,228 @@ // label16.AutoSize = true; label16.BackColor = Color.Transparent; - label16.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label16.Location = new Point(63, 277); + label16.Font = new Font("Noto Sans SC", 14.2499981F); + label16.Location = new Point(8, 275); label16.Name = "label16"; - label16.Size = new Size(88, 25); + label16.Size = new Size(85, 19); label16.TabIndex = 138; label16.Text = "客户电话"; // - // txtCustoTel - // - txtCustoTel.BackColor = Color.Transparent; - txtCustoTel.Cursor = Cursors.IBeam; - txtCustoTel.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustoTel.Location = new Point(170, 273); - txtCustoTel.Margin = new Padding(4, 5, 4, 5); - txtCustoTel.MinimumSize = new Size(1, 1); - txtCustoTel.Name = "txtCustoTel"; - txtCustoTel.Padding = new Padding(5); - txtCustoTel.Radius = 20; - txtCustoTel.ReadOnly = true; - txtCustoTel.ShowText = false; - txtCustoTel.Size = new Size(250, 35); - txtCustoTel.Style = Sunny.UI.UIStyle.Custom; - txtCustoTel.StyleCustomMode = true; - txtCustoTel.TabIndex = 142; - txtCustoTel.TextAlignment = ContentAlignment.MiddleLeft; - txtCustoTel.Watermark = ""; - // // label14 // label14.AutoSize = true; label14.BackColor = Color.Transparent; - label14.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label14.Location = new Point(442, 225); + label14.Font = new Font("Noto Sans SC", 14.2499981F); + label14.Location = new Point(387, 222); label14.Name = "label14"; - label14.Size = new Size(88, 25); + label14.Size = new Size(85, 19); label14.TabIndex = 139; label14.Text = "客户姓名"; // - // txtCustoType - // - txtCustoType.BackColor = Color.Transparent; - txtCustoType.Cursor = Cursors.IBeam; - txtCustoType.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustoType.Location = new Point(546, 274); - txtCustoType.Margin = new Padding(4, 5, 4, 5); - txtCustoType.MinimumSize = new Size(1, 1); - txtCustoType.Name = "txtCustoType"; - txtCustoType.Padding = new Padding(5); - txtCustoType.Radius = 20; - txtCustoType.ReadOnly = true; - txtCustoType.ShowText = false; - txtCustoType.Size = new Size(250, 35); - txtCustoType.Style = Sunny.UI.UIStyle.Custom; - txtCustoType.StyleCustomMode = true; - txtCustoType.TabIndex = 141; - txtCustoType.TextAlignment = ContentAlignment.MiddleLeft; - txtCustoType.Watermark = ""; - // // label12 // label12.AutoSize = true; label12.BackColor = Color.Transparent; - label12.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label12.Location = new Point(442, 277); + label12.Font = new Font("Noto Sans SC", 14.2499981F); + label12.Location = new Point(387, 275); label12.Name = "label12"; - label12.Size = new Size(88, 25); + label12.Size = new Size(85, 19); label12.TabIndex = 140; label12.Text = "会员等级"; // - // txtDeposit - // - txtDeposit.Cursor = Cursors.IBeam; - txtDeposit.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtDeposit.Location = new Point(547, 163); - txtDeposit.Margin = new Padding(4, 5, 4, 5); - txtDeposit.MinimumSize = new Size(1, 1); - txtDeposit.Name = "txtDeposit"; - txtDeposit.Padding = new Padding(5); - txtDeposit.Radius = 20; - txtDeposit.ReadOnly = true; - txtDeposit.ShowText = false; - txtDeposit.Size = new Size(250, 35); - txtDeposit.Style = Sunny.UI.UIStyle.Custom; - txtDeposit.StyleCustomMode = true; - txtDeposit.TabIndex = 152; - txtDeposit.TextAlignment = ContentAlignment.MiddleLeft; - txtDeposit.Watermark = ""; - // // label1 // label1.AutoSize = true; - label1.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label1.Location = new Point(443, 168); + label1.Font = new Font("Noto Sans SC", 14.2499981F); + label1.Location = new Point(387, 169); label1.Name = "label1"; - label1.Size = new Size(88, 25); + label1.Size = new Size(85, 19); label1.TabIndex = 151; label1.Text = "房间押金"; // + // ucWindowHeader1 + // + ucWindowHeader1.Location = new Point(0, -1); + ucWindowHeader1.Name = "ucWindowHeader1"; + ucWindowHeader1.Size = new Size(732, 35); + ucWindowHeader1.TabIndex = 153; + // + // btnCheckIn + // + btnCheckIn.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnCheckIn.Location = new Point(548, 322); + btnCheckIn.Name = "btnCheckIn"; + btnCheckIn.Size = new Size(85, 45); + btnCheckIn.TabIndex = 164; + btnCheckIn.Text = "入 住"; + btnCheckIn.Type = AntdUI.TTypeMini.Primary; + btnCheckIn.Click += FrmCheckIn_ButtonOkClick; + // + // btnCancel + // + btnCancel.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnCancel.Location = new Point(639, 322); + btnCancel.Name = "btnCancel"; + btnCancel.Size = new Size(85, 45); + btnCancel.TabIndex = 165; + btnCancel.Text = "取 消"; + btnCancel.Type = AntdUI.TTypeMini.Primary; + btnCancel.Click += btnCancel_Click; + // + // txtRoomNo + // + txtRoomNo.Font = new Font("Noto Sans SC", 12F); + txtRoomNo.Location = new Point(93, 51); + txtRoomNo.Name = "txtRoomNo"; + txtRoomNo.ReadOnly = true; + txtRoomNo.Size = new Size(250, 45); + txtRoomNo.TabIndex = 166; + // + // txtState + // + txtState.Font = new Font("Noto Sans SC", 12F); + txtState.Location = new Point(93, 104); + txtState.Name = "txtState"; + txtState.ReadOnly = true; + txtState.Size = new Size(250, 45); + txtState.TabIndex = 167; + // + // txtRoomPosition + // + txtRoomPosition.Font = new Font("Noto Sans SC", 12F); + txtRoomPosition.Location = new Point(93, 157); + txtRoomPosition.Name = "txtRoomPosition"; + txtRoomPosition.ReadOnly = true; + txtRoomPosition.Size = new Size(250, 45); + txtRoomPosition.TabIndex = 168; + // + // txtRent + // + txtRent.Font = new Font("Noto Sans SC", 12F); + txtRent.Location = new Point(474, 104); + txtRent.Name = "txtRent"; + txtRent.ReadOnly = true; + txtRent.Size = new Size(250, 45); + txtRent.TabIndex = 169; + // + // txtDeposit + // + txtDeposit.Font = new Font("Noto Sans SC", 12F); + txtDeposit.Location = new Point(474, 157); + txtDeposit.Name = "txtDeposit"; + txtDeposit.ReadOnly = true; + txtDeposit.Size = new Size(250, 45); + txtDeposit.TabIndex = 170; + // + // txtCustomerName + // + txtCustomerName.Font = new Font("Noto Sans SC", 12F); + txtCustomerName.Location = new Point(474, 210); + txtCustomerName.Name = "txtCustomerName"; + txtCustomerName.ReadOnly = true; + txtCustomerName.Size = new Size(250, 45); + txtCustomerName.TabIndex = 171; + // + // txtCustomerLevel + // + txtCustomerLevel.Font = new Font("Noto Sans SC", 12F); + txtCustomerLevel.Location = new Point(474, 263); + txtCustomerLevel.Name = "txtCustomerLevel"; + txtCustomerLevel.ReadOnly = true; + txtCustomerLevel.Size = new Size(250, 45); + txtCustomerLevel.TabIndex = 172; + // + // txtCustomerTel + // + txtCustomerTel.Font = new Font("Noto Sans SC", 12F); + txtCustomerTel.Location = new Point(93, 263); + txtCustomerTel.Name = "txtCustomerTel"; + txtCustomerTel.ReadOnly = true; + txtCustomerTel.Size = new Size(250, 45); + txtCustomerTel.TabIndex = 173; + // + // txtCustomerNo + // + txtCustomerNo.Font = new Font("Noto Sans SC", 12F); + txtCustomerNo.Location = new Point(93, 210); + txtCustomerNo.Name = "txtCustomerNo"; + txtCustomerNo.Size = new Size(250, 45); + txtCustomerNo.TabIndex = 174; + txtCustomerNo.Validated += txtCustoNo_Validated; + // + // txtRoomType + // + txtRoomType.Font = new Font("Noto Sans SC", 12F); + txtRoomType.Location = new Point(474, 51); + txtRoomType.Name = "txtRoomType"; + txtRoomType.ReadOnly = true; + txtRoomType.Size = new Size(250, 45); + txtRoomType.TabIndex = 175; + // // FrmCheckIn // AutoScaleMode = AutoScaleMode.None; BackColor = Color.FromArgb(235, 243, 255); - ClientSize = new Size(861, 384); + ClientSize = new Size(731, 379); ControlBox = false; + Controls.Add(txtRoomType); + Controls.Add(txtCustomerNo); + Controls.Add(txtCustomerTel); + Controls.Add(txtCustomerLevel); + Controls.Add(txtCustomerName); Controls.Add(txtDeposit); - Controls.Add(label1); - Controls.Add(txtCustoNo); - Controls.Add(txtCustoName); + Controls.Add(txtRent); Controls.Add(txtRoomPosition); + Controls.Add(txtState); + Controls.Add(txtRoomNo); + Controls.Add(btnCancel); + Controls.Add(btnCheckIn); + Controls.Add(ucWindowHeader1); + Controls.Add(label1); Controls.Add(label18); Controls.Add(label3); Controls.Add(label16); - Controls.Add(txtType); - Controls.Add(txtCustoTel); - Controls.Add(txtRoomNo); Controls.Add(label14); - Controls.Add(txtState); - Controls.Add(txtCustoType); - Controls.Add(txtMoney); Controls.Add(label12); Controls.Add(label13); Controls.Add(label15); Controls.Add(label19); Controls.Add(label20); Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + FormBorderStyle = FormBorderStyle.FixedSingle; Icon = (Icon)resources.GetObject("$this.Icon"); - IsForbidAltF4 = true; Margin = new Padding(4, 5, 4, 5); Name = "FrmCheckIn"; - ShowTitleIcon = true; - Style = Sunny.UI.UIStyle.Custom; + StartPosition = FormStartPosition.CenterScreen; Text = "房间入住"; - ZoomScaleRect = new Rectangle(15, 15, 861, 384); - ButtonOkClick += FrmCheckIn_ButtonOkClick; - ButtonCancelClick += FrmCheckIn_ButtonCancelClick; Load += FrmCheckIn_Load; - Controls.SetChildIndex(label20, 0); - Controls.SetChildIndex(label19, 0); - Controls.SetChildIndex(label15, 0); - Controls.SetChildIndex(label13, 0); - Controls.SetChildIndex(label12, 0); - Controls.SetChildIndex(txtMoney, 0); - Controls.SetChildIndex(txtCustoType, 0); - Controls.SetChildIndex(txtState, 0); - Controls.SetChildIndex(label14, 0); - Controls.SetChildIndex(txtRoomNo, 0); - Controls.SetChildIndex(txtCustoTel, 0); - Controls.SetChildIndex(txtType, 0); - Controls.SetChildIndex(label16, 0); - Controls.SetChildIndex(label3, 0); - Controls.SetChildIndex(label18, 0); - Controls.SetChildIndex(txtRoomPosition, 0); - Controls.SetChildIndex(txtCustoName, 0); - Controls.SetChildIndex(txtCustoNo, 0); - Controls.SetChildIndex(label1, 0); - Controls.SetChildIndex(txtDeposit, 0); - Controls.SetChildIndex(pnlBtm, 0); - pnlBtm.ResumeLayout(false); ResumeLayout(false); PerformLayout(); } #endregion - private Sunny.UI.UITextBox txtRoomPosition; private System.Windows.Forms.Label label3; - private Sunny.UI.UIComboBox txtType; - private Sunny.UI.UITextBox txtRoomNo; - private Sunny.UI.UITextBox txtState; - private Sunny.UI.UITextBox txtMoney; private System.Windows.Forms.Label label13; private System.Windows.Forms.Label label15; private System.Windows.Forms.Label label19; private System.Windows.Forms.Label label20; - private Sunny.UI.UITextBox txtCustoNo; - private Sunny.UI.UITextBox txtCustoName; private System.Windows.Forms.Label label18; private System.Windows.Forms.Label label16; - private Sunny.UI.UITextBox txtCustoTel; private System.Windows.Forms.Label label14; - private Sunny.UI.UITextBox txtCustoType; private System.Windows.Forms.Label label12; - private Sunny.UI.UITextBox txtDeposit; private System.Windows.Forms.Label label1; + private ucWindowHeader ucWindowHeader1; + private AntdUI.Button btnCheckIn; + private AntdUI.Button btnCancel; + private AntdUI.Input txtRoomNo; + private AntdUI.Input txtState; + private AntdUI.Input txtRoomPosition; + private AntdUI.Input txtRent; + private AntdUI.Input txtDeposit; + private AntdUI.Input txtCustomerName; + private AntdUI.Input txtCustomerLevel; + private AntdUI.Input txtCustomerTel; + private AntdUI.Input txtCustomerNo; + private AntdUI.Input txtRoomType; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.cs index e2102fc8045f2b6ff9059ffcc1b7f33751a82f12..92453d0af46bda937da9c447c68333169e898107 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckIn.cs @@ -23,20 +23,23 @@ */ +using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Core; using jvncorelib.EntityLib; -using Sunny.UI; using System.Transactions; namespace EOM.TSHotelManagement.FormUI { - public partial class FrmCheckIn : UIEditForm + public partial class FrmCheckIn : Window { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmCheckIn)); public FrmCheckIn() { InitializeComponent(); + + ucWindowHeader1.ApplySettingsWithoutMinimize("入住房间", string.Empty, (Image)resources.GetObject("FrmCheckIn.Icon")!); } ResponseMsg result = new ResponseMsg(); @@ -50,51 +53,25 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Room_SelectRoomByRoomNo, pairs); var response = HttpHelper.JsonToModel>(result.message!); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - UIMessageTip.ShowError($"{ApiConstants.Room_SelectRoomByRoomNo}+接口服务异常，请提交issue"); + NotificationService.ShowError($"{ApiConstants.Room_SelectRoomByRoomNo}+接口服务异常，请提交issue"); return; } ReadRoomOutputDto r = response.Data; result = HttpHelper.Request(ApiConstants.RoomType_SelectRoomTypeByRoomNo, pairs); var roomTypeResponse = HttpHelper.JsonToModel>(result.message!); - if (roomTypeResponse.Code != BusinessStatusCode.Success) + if (roomTypeResponse.Success == false) { - UIMessageTip.ShowError($"{ApiConstants.RoomType_SelectRoomTypeByRoomNo}+接口服务异常，请提交issue"); + NotificationService.ShowError($"{ApiConstants.RoomType_SelectRoomTypeByRoomNo}+接口服务异常，请提交issue"); return; } ReadRoomTypeOutputDto t = roomTypeResponse.Data; - txtType.Text = t.RoomTypeName; - txtMoney.Text = r.RoomRent.ToString(); + txtRoomType.Text = t.RoomTypeName; + txtRent.Text = r.RoomRent.ToString(); txtRoomPosition.Text = r.RoomLocation; txtState.Text = r.RoomState; txtDeposit.Text = r.RoomDeposit.ToString(); - pairs = new Dictionary - { - { nameof(ReadCustomerInputDto.IgnorePaging) , "true" }, - { nameof(ReadCustomerInputDto.IsDelete) , "0" } - }; - result = HttpHelper.Request(ApiConstants.Customer_SelectCustomers, pairs); - var customerResponse = HttpHelper.JsonToModel>(result.message!); - if (customerResponse.Code != BusinessStatusCode.Success) - { - UIMessageTip.ShowError($"{ApiConstants.Customer_SelectCustomers}+接口服务异常，请提交issue"); - return; - } - var custoList = customerResponse.Data.Items; - if (custoList != null && custoList != null) - { - var ctos = custoList.Select(custo => custo.CustomerNumber).ToArray(); - txtCustoNo.AutoCompleteCustomSource.AddRange(ctos); - } - try - { - txtCustoNo.Text = ""; - } - catch - { - txtCustoNo.Text = ucRoom.rm_CustoNo; - } } private void txtCustoNo_Validated(object sender, EventArgs e) @@ -105,7 +82,7 @@ namespace EOM.TSHotelManagement.FormUI } catch (Exception ex) { - UIMessageTip.ShowError($"接口服务异常，请提交issue: {ex.Message}", 3000); + NotificationService.ShowError($"接口服务异常，请提交issue: {ex.Message}"); } } @@ -119,9 +96,9 @@ namespace EOM.TSHotelManagement.FormUI }; var result = HttpHelper.Request(ApiConstants.VipLevelRule_SelectVipRuleList, dic); var response = HttpHelper.JsonToModel>(result.message!); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - UIMessageTip.ShowError($"{ApiConstants.VipLevelRule_SelectVipRuleList}+接口服务异常，请提交issue: {response.Message}", 3000); + NotificationService.ShowError($"{ApiConstants.VipLevelRule_SelectVipRuleList}+接口服务异常，请提交issue: {response.Message}"); } var listVipRule = response.Data.Items @@ -130,12 +107,12 @@ namespace EOM.TSHotelManagement.FormUI .ToList(); // 查询用户消费记录 - var user = new Dictionary { { nameof(ReadSpendInputDto.CustomerNumber), txtCustoNo.Text.Trim() } }; + var user = new Dictionary { { nameof(ReadSpendInputDto.CustomerNumber), txtCustomerNo.Text.Trim() } }; result = HttpHelper.Request(ApiConstants.Spend_SeletHistorySpendInfoAll, user); var customerSpends = HttpHelper.JsonToModel>(result.message!); - if (customerSpends.Code != BusinessStatusCode.Success) + if (customerSpends.Success == false) { - UIMessageTip.ShowError($"{ApiConstants.Spend_SeletHistorySpendInfoAll}+接口服务异常，请提交issue: {response.Message}", 3000); + NotificationService.ShowError($"{ApiConstants.Spend_SeletHistorySpendInfoAll}+接口服务异常，请提交issue: {response.Message}"); } var listCustoSpend = customerSpends.Data.Items; @@ -151,9 +128,10 @@ namespace EOM.TSHotelManagement.FormUI // 如果会员等级有变，更新会员等级 if (new_type != 0) { - result = HttpHelper.Request(ApiConstants.Customer_UpdCustomerTypeByCustoNo, HttpHelper.ModelToJson(new UpdateCustomerInputDto { CustomerNumber = txtCustoNo.Text.Trim(), CustomerType = new_type })); + var customer = new UpdateCustomerInputDto { CustomerNumber = txtCustomerNo.Text.Trim(), CustomerType = new_type }; + result = HttpHelper.Request(ApiConstants.Customer_UpdCustomerTypeByCustoNo, customer.ModelToJson()); var updateResponse = HttpHelper.JsonToModel(result.message!); - if (updateResponse.Code != BusinessStatusCode.Success) + if (updateResponse.Success == false) { throw new Exception($"{ApiConstants.Customer_UpdCustomerTypeByCustoNo}+接口服务异常"); } @@ -161,29 +139,29 @@ namespace EOM.TSHotelManagement.FormUI } // 获取用户卡片信息 - if (!string.IsNullOrEmpty(txtCustoNo.Text)) + if (!string.IsNullOrEmpty(txtCustomerNo.Text)) { - user = new Dictionary { { nameof(ReadCustomerInputDto.CustomerNumber), txtCustoNo.Text.Trim() } }; + user = new Dictionary { { nameof(ReadCustomerInputDto.CustomerNumber), txtCustomerNo.Text.Trim() } }; result = HttpHelper.Request(ApiConstants.Customer_SelectCustoByInfo, user); var customerResponse = HttpHelper.JsonToModel>(result.message!); - if (customerResponse.Code != BusinessStatusCode.Success) + if (customerResponse.Success == false) { throw new Exception($"{ApiConstants.Customer_SelectCustoByInfo}+接口服务异常"); } var custo = customerResponse.Data; - txtCustoName.Text = custo?.CustomerNumber ?? ""; - txtCustoTel.Text = custo?.CustomerPhoneNumber ?? ""; - txtCustoType.Text = custo?.CustomerTypeName ?? ""; + txtCustomerName.Text = custo?.CustomerName ?? ""; + txtCustomerTel.Text = custo?.CustomerPhoneNumber ?? ""; + txtCustomerLevel.Text = custo?.CustomerTypeName ?? ""; } } private void FrmCheckIn_ButtonOkClick(object sender, EventArgs e) { - var user = new Dictionary { { nameof(ReadCustomerInputDto.CustomerNumber), txtCustoNo.Text.Trim() } }; + var user = new Dictionary { { nameof(ReadCustomerInputDto.CustomerNumber), txtCustomerNo.Text.Trim() } }; result = HttpHelper.Request(ApiConstants.Customer_SelectCustoByInfo, user); var customerResponse = HttpHelper.JsonToModel>(result.message!); - if (customerResponse.Code != BusinessStatusCode.Success) + if (customerResponse.Success == false) { throw new Exception($"{ApiConstants.Customer_SelectCustoByInfo}+接口服务异常"); } @@ -196,21 +174,21 @@ namespace EOM.TSHotelManagement.FormUI UpdateRoomInputDto r = new UpdateRoomInputDto() { LastCheckInTime = DateOnly.FromDateTime(DateTime.Now), - CustomerNumber = txtCustoNo.Text, + CustomerNumber = txtCustomerNo.Text, RoomStateId = (int)RoomState.Occupied, RoomNumber = txtRoomNo.Text, - DataChgUsr = LoginInfo.WorkerNo + DataChgUsr = LoginInfo.WorkerNo, + DataChgDate = DateTime.Now }; - result = HttpHelper.Request(ApiConstants.Room_UpdateRoomInfo, HttpHelper.ModelToJson(r)); + result = HttpHelper.Request(ApiConstants.Room_UpdateRoomInfo, r.ModelToJson()); var response = HttpHelper.JsonToModel(result.message!); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - UIMessageTip.ShowError($"{ApiConstants.Room_UpdateRoomInfo}+接口服务异常，请提交issue"); - UIMessageBox.Show("登记入住失败！", "登记提示", UIStyle.Red); + NotificationService.ShowError($"{ApiConstants.Room_UpdateRoomInfo}+接口服务异常，请提交issue"); return; } - UIMessageBox.Show("登记入住成功！", "登记提示", UIStyle.Green); - txtCustoNo.Text = ""; + NotificationService.ShowSuccess("登记入住成功！"); + txtCustomerNo.Text = ""; FrmRoomManager.Reload(""); FrmRoomManager._RefreshRoomCount(); #region 获取添加操作日志所需的信息 @@ -223,11 +201,11 @@ namespace EOM.TSHotelManagement.FormUI } else { - UIMessageBox.Show("所选客户不存在！", "系统提示", UIStyle.Red); + NotificationService.ShowError("所选客户不存在！"); } } - private void FrmCheckIn_ButtonCancelClick(object sender, EventArgs e) + private void btnCancel_Click(object sender, EventArgs e) { this.Close(); } diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.Designer.cs new file mode 100644 index 0000000000000000000000000000000000000000..e7f08cd331edb64c31955f213373ac7aa39a321e --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.Designer.cs @@ -0,0 +1,382 @@ +namespace EOM.TSHotelManagement.FormUI +{ + partial class FrmCheckOutDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmCheckOutDetail)); + dtpCheckTime = new AntdUI.Input(); + label24 = new Label(); + txtRoomNo = new AntdUI.Input(); + label27 = new Label(); + CustoName = new AntdUI.Input(); + label28 = new Label(); + CustoNo = new AntdUI.Input(); + lblChange = new Label(); + btnBalance = new AntdUI.Button(); + label25 = new Label(); + txtReceipts = new AntdUI.Input(); + label21 = new Label(); + btnPg = new AntdUI.Pagination(); + lblVIP = new Label(); + dgvSpendList = new AntdUI.Table(); + label29 = new Label(); + lblGetReceipts = new Label(); + lblVIPPrice = new Label(); + lable00 = new Label(); + label18 = new Label(); + label1 = new Label(); + label15 = new Label(); + lblDay = new Label(); + label17 = new Label(); + ucWindowHeader1 = new ucWindowHeader(); + SuspendLayout(); + // + // dtpCheckTime + // + dtpCheckTime.Font = new Font("Noto Sans SC", 12F); + dtpCheckTime.Location = new Point(408, 51); + dtpCheckTime.Name = "dtpCheckTime"; + dtpCheckTime.PlaceholderText = ""; + dtpCheckTime.ReadOnly = true; + dtpCheckTime.Size = new Size(180, 42); + dtpCheckTime.TabIndex = 185; + // + // label24 + // + label24.AutoSize = true; + label24.Font = new Font("Noto Sans SC", 14.2499981F); + label24.Location = new Point(18, 61); + label24.Name = "label24"; + label24.Size = new Size(85, 19); + label24.TabIndex = 172; + label24.Text = "客户编号"; + // + // txtRoomNo + // + txtRoomNo.Font = new Font("Noto Sans SC", 12F); + txtRoomNo.Location = new Point(408, 102); + txtRoomNo.Name = "txtRoomNo"; + txtRoomNo.PlaceholderText = ""; + txtRoomNo.ReadOnly = true; + txtRoomNo.Size = new Size(180, 42); + txtRoomNo.TabIndex = 184; + // + // label27 + // + label27.AutoSize = true; + label27.Font = new Font("Noto Sans SC", 14.2499981F); + label27.Location = new Point(323, 113); + label27.Name = "label27"; + label27.Size = new Size(85, 19); + label27.TabIndex = 175; + label27.Text = "房间编号"; + // + // CustoName + // + CustoName.Font = new Font("Noto Sans SC", 12F); + CustoName.Location = new Point(103, 102); + CustoName.Name = "CustoName"; + CustoName.PlaceholderText = ""; + CustoName.ReadOnly = true; + CustoName.Size = new Size(214, 42); + CustoName.TabIndex = 183; + // + // label28 + // + label28.AutoSize = true; + label28.Font = new Font("Noto Sans SC", 14.2499981F); + label28.Location = new Point(323, 61); + label28.Name = "label28"; + label28.Size = new Size(85, 19); + label28.TabIndex = 174; + label28.Text = "入住时间"; + // + // CustoNo + // + CustoNo.Font = new Font("Noto Sans SC", 12F); + CustoNo.Location = new Point(103, 51); + CustoNo.Name = "CustoNo"; + CustoNo.PlaceholderText = ""; + CustoNo.ReadOnly = true; + CustoNo.Size = new Size(214, 42); + CustoNo.TabIndex = 182; + // + // lblChange + // + lblChange.AutoSize = true; + lblChange.Font = new Font("Noto Sans SC", 11.9999981F); + lblChange.Location = new Point(605, 445); + lblChange.Name = "lblChange"; + lblChange.Size = new Size(38, 17); + lblChange.TabIndex = 167; + lblChange.Text = "0.00"; + // + // btnBalance + // + btnBalance.Font = new Font("Noto Sans SC", 12F); + btnBalance.Location = new Point(544, 533); + btnBalance.Name = "btnBalance"; + btnBalance.Size = new Size(132, 48); + btnBalance.TabIndex = 181; + btnBalance.Text = "结 算"; + btnBalance.Type = AntdUI.TTypeMini.Primary; + btnBalance.Click += btnBalance_Click; + // + // label25 + // + label25.AutoSize = true; + label25.Font = new Font("Noto Sans SC", 11.9999981F); + label25.Location = new Point(323, 444); + label25.Name = "label25"; + label25.Size = new Size(88, 17); + label25.TabIndex = 168; + label25.Text = "会员折扣："; + // + // txtReceipts + // + txtReceipts.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + txtReceipts.HandCursor = Cursors.IBeam; + txtReceipts.Location = new Point(404, 468); + txtReceipts.Name = "txtReceipts"; + txtReceipts.PlaceholderText = ""; + txtReceipts.Size = new Size(111, 36); + txtReceipts.TabIndex = 180; + txtReceipts.TextChanged += txtReceipts_TextChanged; + // + // label21 + // + label21.AutoSize = true; + label21.Font = new Font("Noto Sans SC", 11.9999981F); + label21.Location = new Point(517, 445); + label21.Name = "label21"; + label21.Size = new Size(88, 17); + label21.TabIndex = 166; + label21.Text = "找 零："; + // + // btnPg + // + btnPg.Font = new Font("Noto Sans SC", 9F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnPg.Location = new Point(12, 365); + btnPg.Name = "btnPg"; + btnPg.PageSize = 15; + btnPg.ShowSizeChanger = true; + btnPg.Size = new Size(654, 32); + btnPg.TabIndex = 179; + btnPg.Total = 1000000; + btnPg.ValueChanged += btnPg_ValueChanged; + btnPg.ShowTotalChanged += btnPg_ShowTotalChanged; + // + // lblVIP + // + lblVIP.AutoSize = true; + lblVIP.Font = new Font("Noto Sans SC", 11.9999981F); + lblVIP.Location = new Point(412, 444); + lblVIP.Name = "lblVIP"; + lblVIP.Size = new Size(72, 17); + lblVIP.TabIndex = 169; + lblVIP.Text = "不 打 折"; + // + // dgvSpendList + // + dgvSpendList.Font = new Font("Noto Sans SC", 9F, FontStyle.Regular, GraphicsUnit.Point, 0); + dgvSpendList.Gap = 12; + dgvSpendList.Location = new Point(12, 148); + dgvSpendList.Name = "dgvSpendList"; + dgvSpendList.Size = new Size(654, 208); + dgvSpendList.TabIndex = 178; + dgvSpendList.Text = "table1"; + // + // label29 + // + label29.AutoSize = true; + label29.Font = new Font("Noto Sans SC", 14.2499981F, FontStyle.Regular, GraphicsUnit.Point, 0); + label29.Location = new Point(591, 61); + label29.Name = "label29"; + label29.Size = new Size(85, 19); + label29.TabIndex = 176; + label29.Text = "已住天数"; + // + // lblGetReceipts + // + lblGetReceipts.AutoSize = true; + lblGetReceipts.Font = new Font("Noto Sans SC", 11.9999981F); + lblGetReceipts.Location = new Point(413, 412); + lblGetReceipts.Name = "lblGetReceipts"; + lblGetReceipts.Size = new Size(38, 17); + lblGetReceipts.TabIndex = 165; + lblGetReceipts.Text = "0.00"; + // + // lblVIPPrice + // + lblVIPPrice.AutoSize = true; + lblVIPPrice.Font = new Font("Noto Sans SC", 11.9999981F); + lblVIPPrice.Location = new Point(605, 413); + lblVIPPrice.Name = "lblVIPPrice"; + lblVIPPrice.Size = new Size(38, 17); + lblVIPPrice.TabIndex = 171; + lblVIPPrice.Text = "0.00"; + // + // lable00 + // + lable00.AutoSize = true; + lable00.Font = new Font("Noto Sans SC", 11.9999981F); + lable00.Location = new Point(517, 413); + lable00.Name = "lable00"; + lable00.Size = new Size(88, 17); + lable00.TabIndex = 170; + lable00.Text = "应付金额："; + // + // label18 + // + label18.AutoSize = true; + label18.Font = new Font("Noto Sans SC", 11.9999981F); + label18.Location = new Point(323, 412); + label18.Name = "label18"; + label18.Size = new Size(88, 17); + label18.TabIndex = 164; + label18.Text = "消费总额："; + // + // label1 + // + label1.AutoSize = true; + label1.Font = new Font("Noto Sans SC", 14.2499981F); + label1.Location = new Point(18, 113); + label1.Name = "label1"; + label1.Size = new Size(85, 19); + label1.TabIndex = 173; + label1.Text = "客户姓名"; + // + // label15 + // + label15.AutoSize = true; + label15.Font = new Font("Noto Sans SC Medium", 10.499999F, FontStyle.Regular, GraphicsUnit.Point, 0); + label15.ForeColor = Color.Red; + label15.Location = new Point(12, 567); + label15.Name = "label15"; + label15.Size = new Size(251, 14); + label15.TabIndex = 162; + label15.Text = "Tips：请提醒客人不要忘记带齐行李哦~"; + // + // lblDay + // + lblDay.AutoSize = true; + lblDay.Font = new Font("Noto Sans SC", 14.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + lblDay.Location = new Point(608, 112); + lblDay.Name = "lblDay"; + lblDay.Size = new Size(45, 20); + lblDay.TabIndex = 177; + lblDay.Text = "Null"; + // + // label17 + // + label17.AutoSize = true; + label17.Font = new Font("Noto Sans SC", 11.9999981F); + label17.Location = new Point(323, 479); + label17.Name = "label17"; + label17.Size = new Size(88, 17); + label17.TabIndex = 163; + label17.Text = "实收金额："; + // + // ucWindowHeader1 + // + ucWindowHeader1.Location = new Point(-1, 0); + ucWindowHeader1.Name = "ucWindowHeader1"; + ucWindowHeader1.Size = new Size(690, 35); + ucWindowHeader1.TabIndex = 186; + // + // FrmCheckOutDetail + // + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.FromArgb(235, 243, 255); + ClientSize = new Size(689, 590); + Controls.Add(ucWindowHeader1); + Controls.Add(dtpCheckTime); + Controls.Add(label24); + Controls.Add(txtRoomNo); + Controls.Add(label27); + Controls.Add(CustoName); + Controls.Add(label28); + Controls.Add(CustoNo); + Controls.Add(lblChange); + Controls.Add(btnBalance); + Controls.Add(label25); + Controls.Add(txtReceipts); + Controls.Add(label21); + Controls.Add(btnPg); + Controls.Add(lblVIP); + Controls.Add(dgvSpendList); + Controls.Add(label29); + Controls.Add(lblGetReceipts); + Controls.Add(lblVIPPrice); + Controls.Add(lable00); + Controls.Add(label18); + Controls.Add(label1); + Controls.Add(label15); + Controls.Add(lblDay); + Controls.Add(label17); + FormBorderStyle = FormBorderStyle.None; + Icon = (Icon)resources.GetObject("$this.Icon"); + Name = "FrmCheckOutDetail"; + Resizable = false; + StartPosition = FormStartPosition.CenterScreen; + Text = "FrmCheckOutDetail"; + Load += FrmCheckOutDetail_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private AntdUI.Input dtpCheckTime; + private Label label24; + private AntdUI.Input txtRoomNo; + private Label label27; + private AntdUI.Input CustoName; + private Label label28; + private AntdUI.Input CustoNo; + private Label lblChange; + private AntdUI.Button btnBalance; + private Label label25; + private AntdUI.Input txtReceipts; + private Label label21; + private AntdUI.Pagination btnPg; + private Label lblVIP; + private AntdUI.Table dgvSpendList; + private Label label29; + private Label lblGetReceipts; + private Label lblVIPPrice; + private Label lable00; + private Label label18; + private Label label1; + private Label label15; + private Label lblDay; + private Label label17; + private ucWindowHeader ucWindowHeader1; + } +} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutForm.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.cs similarity index 43% rename from EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutForm.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.cs index 919d9ebe504d80c0de9b6509f535f4b28fd86666..74ab54aad52449307e96180e4e8a8f234e576fa5 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutForm.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.cs @@ -1,102 +1,33 @@ -/* - * MIT License - *Copyright (c) 2021 易开元(EOM) - - *Permission is hereby granted, free of charge, to any person obtaining a copy - *of this software and associated documentation files (the "Software"), to deal - *in the Software without restriction, including without limitation the rights - *to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - *copies of the Software, and to permit persons to whom the Software is - *furnished to do so, subject to the following conditions: - - *The above copyright notice and this permission notice shall be included in all - *copies or substantial portions of the Software. - - *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - *IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - *FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - *AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - *LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - *OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - *SOFTWARE. - * - */ - +using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Shared; -using Sunny.UI; +using jvncorelib.EntityLib; +using System.Data; namespace EOM.TSHotelManagement.FormUI { - public partial class FrmCheckOutForm : UIForm + public partial class FrmCheckOutDetail : Window { - public static string co_CustoNo; - public static string co_RoomNo; - public static string co_CustoName; - public static string co_CustoBirthday; - public static string co_CustoSex; - public static string co_CustoTel; - public static string co_CustoPassportType; - public static string co_CustoAddress; - public static string co_CustoType; - public static string co_CustoID; - public static CreateEnergyManagementInputDto w; - private LoadingProgress _loadingProgress; - - public FrmCheckOutForm(LoadingProgress loadingProgress) + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmCheckOutDetail)); + public FrmCheckOutDetail() { InitializeComponent(); - _loadingProgress = loadingProgress; + + ucWindowHeader1.ApplySettingsWithoutMinimize("房间结算", string.Empty, (Image)resources.GetObject("FrmCheckOutDetail.Icon")!); } ResponseMsg result = null; Dictionary dic = null; + public static CreateEnergyManagementInputDto w; + public static decimal TotalConsumptionAmount = 0M; - #region 记录鼠标和窗体坐标的方法 - private Point mouseOld;//鼠标旧坐标 - private Point formOld;//窗体旧坐标 - #endregion - - #region 记录移动的窗体坐标 - private void FrmCheckOutForm_MouseDown(object sender, MouseEventArgs e) - { - formOld = this.Location; - mouseOld = MousePosition; - } - #endregion - - #region 记录窗体移动的坐标 - private void FrmCheckOutForm_MouseMove(object sender, MouseEventArgs e) - { - if (e.Button == MouseButtons.Left) - { - Point mouseNew = MousePosition; - int moveX = mouseNew.X - mouseOld.X; - int moveY = mouseNew.Y - mouseOld.Y; - this.Location = new Point(formOld.X + moveX, formOld.Y + moveY); - } - } - #endregion - - #region 窗体加载事件 - private void FrmCheckOutForm_Load(object sender, EventArgs e) + private void FrmCheckOutDetail_Load(object sender, EventArgs e) { - #region 加载客户类型信息 - result = HttpHelper.Request(ApiConstants.Base_SelectCustoTypeAllCanUse); - var customerTypes = HttpHelper.JsonToModel>(result.message); - if (customerTypes.Code != BusinessStatusCode.Success) - { - UIMessageBox.ShowError("SelectCustoTypeAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - List lstDataGrid = customerTypes.Data.Items; - #endregion - decimal sum = 0; - txtCustomerNumber.Text = ucRoom.rm_CustoNo; CustoNo.Text = ucRoom.rm_CustoNo; txtRoomNo.Text = ucRoom.rm_RoomNo; + CustoName.Text = ucRoom.co_CustoName; dic = new Dictionary() { @@ -105,9 +36,9 @@ namespace EOM.TSHotelManagement.FormUI result = HttpHelper.Request(ApiConstants.Room_SelectRoomByRoomNo, dic); var roomInfo = HttpHelper.JsonToModel>(result.message); - if (roomInfo.Code != BusinessStatusCode.Success) + if (roomInfo.Success == false) { - UIMessageBox.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } @@ -115,11 +46,11 @@ namespace EOM.TSHotelManagement.FormUI if (room.LastCheckInTime == null) { - dtpCheckTime.Text = Convert.ToDateTime(DateTime.Now).ToString("yyyy-MM-dd"); + dtpCheckTime.Text = Convert.ToDateTime(DateTime.Now).ToString("yyyy/MM/dd"); } else { - dtpCheckTime.Text = Convert.ToDateTime(room.LastCheckInTime).ToString("yyyy-MM-dd"); + dtpCheckTime.Text = Convert.ToDateTime(room.LastCheckInTime).ToString("yyyy/MM/dd"); } dic = new Dictionary() { @@ -127,9 +58,9 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Room_DayByRoomNo, dic); var stayDays = HttpHelper.JsonToModel>(result.message); - if (stayDays.Code != 200) + if (stayDays.Success == false) { - UIMessageBox.ShowError("DayByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError("DayByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } @@ -143,39 +74,6 @@ namespace EOM.TSHotelManagement.FormUI WaterUsage = Convert.ToDecimal(Convert.ToDouble(stayDays.Data.StayDays) * 80 * 0.002) }; - #region 加载客户信息 - dic = new Dictionary() - { - { nameof(ReadCustomerInputDto.CustomerNumber),CustoNo.Text.ToString() } - }; - result = HttpHelper.Request(ApiConstants.Customer_SelectCustoByInfo, dic); - SingleOutputDto customer = HttpHelper.JsonToModel>(result.message); - if (customer?.Code != BusinessStatusCode.Success) - { - UIMessageBox.ShowError("SelectCustoByInfo+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - try - { - CustoName.Text = customer?.Data.CustomerName; - txtCustomerName.Text = customer?.Data.CustomerName; - txtTel.Text = customer?.Data.CustomerPhoneNumber; - txtCustomerGender.Text = customer?.Data.GenderName ?? string.Empty; - txtCustomerType.Text = customer.Data.CustomerTypeName; - txtPassportName.Text = customer.Data.PassportName; - txtDateOfBirth.Text = customer.Data.DateOfBirth.ToString("yyyy/MM/dd"); - txtIdCardNumber.Text = customer.Data.IdCardNumber; - txtCustomerAddress.Text = customer.Data.CustomerAddress; - } - catch - { - - - } - - - #endregion - #region 加载消费信息 var dataCount = 0; @@ -195,34 +93,47 @@ namespace EOM.TSHotelManagement.FormUI #endregion - #region 加载水电费信息 - dgvWti.Spin("正在加载中...", config => + dic = new Dictionary() { - TableComHelper tableComHelper = new TableComHelper(); - dgvWti.Columns = tableComHelper.ConvertToAntdColumns(tableComHelper.GenerateDataColumns()); - dgvWti.DataSource = GetEnergyPageData(); - }, () => + { nameof(ReadCustomerInputDto.CustomerNumber), CustoNo.Text.Trim() } + }; + var request = HttpHelper.Request(ApiConstants.Customer_SelectCustoByInfo, dic); + var customerResponse = HttpHelper.JsonToModel>(request.message); + if (customerResponse.Success == false) { - System.Diagnostics.Debug.WriteLine("加载结束"); - }); - #endregion - - var customerType = lstDataGrid.SingleOrDefault(a => a.CustomerTypeName == txtCustomerType.Text); + NotificationService.ShowError($"{ApiConstants.Spend_SumConsumptionAmount}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + var customer = customerResponse.Data; - //计算消费总额 dic = new Dictionary() { - { nameof(ReadSpendInputDto.RoomNumber), txtRoomNo.Text.Trim() }, - { nameof(ReadSpendInputDto.CustomerNumber), txtCustomerNumber.Text.Trim() }, + { nameof(ReadCustoTypeInputDto.CustomerType), customer.CustomerType.ToString() } }; - result = HttpHelper.Request(ApiConstants.Spend_SumConsumptionAmount, dic); - var response = HttpHelper.JsonToModel>(result.message); - if (response.Code != BusinessStatusCode.Success) + request = HttpHelper.Request(ApiConstants.CustoType_SelectCustoTypeByTypeId, dic); + var customerTypeResponse = HttpHelper.JsonToModel>(request.message); + if (customerTypeResponse.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Spend_SumConsumptionAmount}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Spend_SumConsumptionAmount}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - decimal total = response.Data.ConsumptionAmount; + + var customerType = customerTypeResponse.Data; + + //计算消费总额 + //dic = new Dictionary() + //{ + // { nameof(ReadSpendInputDto.RoomNumber), txtRoomNo.Text.Trim() }, + // { nameof(ReadSpendInputDto.CustomerNumber), CustoNo.Text.Trim() }, + //}; + //result = HttpHelper.Request(ApiConstants.Spend_SumConsumptionAmount, dic); + //var spendResponse = HttpHelper.JsonToModel>(result.message); + //if (spendResponse.Success == false) + //{ + // NotificationService.ShowError($"{ApiConstants.Spend_SumConsumptionAmount}+接口服务异常，请提交Issue或尝试更新版本！"); + // return; + //} + decimal total = TotalConsumptionAmount; decimal m = total + sum; decimal discount = (customerType != null && customerType.Discount > 0 && customerType.Discount < 100) ? customerType.Discount / 100M @@ -230,81 +141,76 @@ namespace EOM.TSHotelManagement.FormUI lblGetReceipts.Text = m.ToString("#,##0.00"); lblVIPPrice.Text = (m * discount).ToString("#,##0.00"); lblVIP.Text = (discount < 1M) ? DiscountHelper.ToZheString(customerType.Discount) : "无折扣(100%)"; - Refresh(); } - #endregion - #region 实收金额文本框值改变时事件 - private void txtReceipts_TextChanged(object sender, EventArgs e) + object GetPageData(int current, int pageSize, ref int totalCount) { - if (txtReceipts.Text != "") + string RoomNo = txtRoomNo.Text; + dic = new Dictionary() { - try - { - double receipt = Convert.ToDouble(Convert.ToDecimal(txtReceipts.Text)); - double vipPrice = Convert.ToDouble(Convert.ToDecimal(lblVIPPrice.Text)); - lblChange.Text = Decimal.Parse((receipt - vipPrice).ToString()).ToString("#,##0.00"); - } - catch - { - UIMessageBox.Show("非法输入，请重新输入！", "系统提示", UIStyle.Orange); - txtReceipts.Clear(); - txtReceipts.Focus(); - return; - } - } - else + { nameof(ReadSpendInputDto.CustomerNumber) , CustoNo.Text.Trim() }, + { nameof(ReadSpendInputDto.SettlementStatus) , ConsumptionConstant.UnSettle.Code }, + { nameof(ReadSpendInputDto.RoomNumber) , RoomNo }, + { nameof(ReadAdministratorInputDto.IgnorePaging) , "true" } + }; + result = HttpHelper.Request(ApiConstants.Spend_SelectSpendByRoomNo, dic); + var spendInfo = HttpHelper.JsonToModel>(result.message); + if (spendInfo.Success == false) { - lblChange.Text = "-" + lblGetReceipts.Text; - return; + NotificationService.ShowError($"{ApiConstants.Spend_SelectSpendByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); } + + List spends = spendInfo.Data.Items; + totalCount = spendInfo.Data.TotalCount; + var listTableData = new List(); + + spends = spends.OrderBy(a => a.SpendNumber).ToList(); + + TableComHelper tableComHelper = new TableComHelper(); + listTableData = tableComHelper.ConvertToAntdItems(spends); + + TotalConsumptionAmount = spends.Count() == 0 ? 0 : spends.DefaultIfEmpty().Sum(a => a!.ConsumptionAmount); + + return listTableData; } - #endregion - #region 结算按钮点击事件 private void btnBalance_Click(object sender, EventArgs e) { if (!string.IsNullOrEmpty(txtReceipts.Text) && Convert.ToDecimal(txtReceipts.Text) > Convert.ToDecimal(lblVIPPrice.Text))//判断实收金额是否为空以及是否小于应收金额 { - result = HttpHelper.Request(ApiConstants.Room_CheckoutRoom, - HttpHelper.ModelToJson(new CheckoutRoomDto - { - RoomNumber = txtRoomNo.Text.Trim(), - CustomerNumber = txtCustomerNumber.Text.Trim(), - DataChgDate = DateTime.Now, - DataChgUsr = LoginInfo.WorkerNo, - ElectricityUsage = w.PowerUsage, - WaterUsage = w.WaterUsage - })); + var model = new CheckoutRoomDto + { + RoomNumber = txtRoomNo.Text.Trim(), + CustomerNumber = CustoNo.Text.Trim(), + DataChgDate = DateTime.Now, + DataChgUsr = LoginInfo.WorkerNo, + ElectricityUsage = w.PowerUsage, + WaterUsage = w.WaterUsage + }; + result = HttpHelper.Request(ApiConstants.Room_CheckoutRoom, model.ModelToJson()); var response = HttpHelper.JsonToModel(result.message); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Room_CheckoutRoom}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_CheckoutRoom}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - UIMessageBox.Show("结算成功！", "系统提示", UIStyle.Green); + NotificationService.ShowSuccess("结算成功！"); FrmRoomManager.Reload(""); FrmRoomManager._RefreshRoomCount(); #region 获取添加操作日志所需的信息 - RecordHelper.Record(LoginInfo.WorkerClub + "-" + LoginInfo.WorkerPosition + "-" + LoginInfo.WorkerName + "于" + Convert.ToDateTime(DateTime.Now) + "帮助" + txtCustomerNumber.Text + "进行了退房结算操作！", Common.Core.LogLevel.Critical); + RecordHelper.Record(LoginInfo.WorkerClub + "-" + LoginInfo.WorkerPosition + "-" + LoginInfo.WorkerName + "于" + Convert.ToDateTime(DateTime.Now) + "帮助" + CustoNo.Text + "进行了退房结算操作！", Common.Core.LogLevel.Critical); #endregion this.Close(); } else { - UIMessageBox.Show("实收金额不能为空或实收金额不能小于折后金额！", "系统提示", UIStyle.Orange); + NotificationService.ShowWarning("实收金额不能为空或实收金额不能小于应付金额！"); return; } } - #endregion - private string btnPg_ShowTotalChanged(object sender, AntdUI.PagePageEventArgs e) - { - return $"{e.PageSize} / {e.Total}条 共{e.PageTotal}页"; - } - - private void btnPg_ValueChanged(object sender, AntdUI.PagePageEventArgs e) + private void btnPg_ValueChanged(object sender, PagePageEventArgs e) { var dataCount = 0; dgvSpendList.Spin("正在加载中...", config => @@ -317,57 +223,34 @@ namespace EOM.TSHotelManagement.FormUI }); } - object GetPageData(int current, int pageSize, ref int totalCount) + private string btnPg_ShowTotalChanged(object sender, PagePageEventArgs e) { - string RoomNo = txtRoomNo.Text; - dic = new Dictionary() - { - { nameof(ReadSpendInputDto.RoomNumber) , RoomNo }, - { nameof(ReadAdministratorInputDto.IgnorePaging) , "true" } - }; - result = HttpHelper.Request(ApiConstants.Spend_SelectSpendByRoomNo, dic); - var spendInfo = HttpHelper.JsonToModel>(result.message); - if (spendInfo.Code != BusinessStatusCode.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Spend_SelectSpendByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); - } - - List spends = spendInfo.Data.Items; - totalCount = spendInfo.Data.TotalCount; - var listTableData = new List(); - - spends = spends.OrderBy(a => a.SpendNumber).ToList(); - - TableComHelper tableComHelper = new TableComHelper(); - listTableData = tableComHelper.ConvertToAntdItems(spends); - - return listTableData; + return $"{e.PageSize} / {e.Total}条 共{e.PageTotal}页"; } - object GetEnergyPageData() + private void txtReceipts_TextChanged(object sender, EventArgs e) { - dic = new Dictionary() + if (txtReceipts.Text != "") { - { nameof(ReadEnergyManagementInputDto.RoomNo),txtRoomNo.Text.Trim()} - }; - result = HttpHelper.Request(ApiConstants.EnergyManagement_SelectEnergyManagementInfo, dic); - var energyManagements = HttpHelper.JsonToModel>(result.message); - if (energyManagements.Code != BusinessStatusCode.Success) + try + { + double receipt = Convert.ToDouble(Convert.ToDecimal(txtReceipts.Text)); + double vipPrice = Convert.ToDouble(Convert.ToDecimal(lblVIPPrice.Text)); + lblChange.Text = Decimal.Parse((receipt - vipPrice).ToString()).ToString("#,##0.00"); + } + catch + { + NotificationService.ShowWarning("非法输入，请重新输入！"); + txtReceipts.Clear(); + txtReceipts.Focus(); + return; + } + } + else { - UIMessageBox.ShowError($"{ApiConstants.EnergyManagement_SelectEnergyManagementInfo}+接口服务异常，请提交Issue或尝试更新版本！"); + lblChange.Text = "-" + lblGetReceipts.Text; + return; } - - List energys = energyManagements.Data.Items; - var listTableData = new List(); - - energys = energys.OrderByDescending(a => a.StartDate).ToList(); - - TableComHelper tableComHelper = new TableComHelper(); - listTableData = tableComHelper.ConvertToAntdItems(energys); - - return listTableData; } - - } } diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutForm.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.resx similarity index 100% rename from EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutForm.resx rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutDetail.resx diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutForm.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutForm.Designer.cs deleted file mode 100644 index 05091947f076ab0c591ecb8a5172d3397d5c7f15..0000000000000000000000000000000000000000 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCheckOutForm.Designer.cs +++ /dev/null @@ -1,680 +0,0 @@ -namespace EOM.TSHotelManagement.FormUI -{ - partial class FrmCheckOutForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmCheckOutForm)); - lblVIPPrice = new Label(); - label15 = new Label(); - lblDay = new Label(); - lable00 = new Label(); - label29 = new Label(); - lblVIP = new Label(); - label25 = new Label(); - label27 = new Label(); - label28 = new Label(); - lblChange = new Label(); - label21 = new Label(); - lblGetReceipts = new Label(); - label1 = new Label(); - label24 = new Label(); - label17 = new Label(); - label18 = new Label(); - label2 = new Label(); - label3 = new Label(); - label4 = new Label(); - label5 = new Label(); - label16 = new Label(); - label22 = new Label(); - label30 = new Label(); - label31 = new Label(); - label32 = new Label(); - uiTabControlMenu2 = new Sunny.UI.UITabControlMenu(); - tabPage1 = new TabPage(); - dtpCheckTime = new AntdUI.Input(); - txtRoomNo = new AntdUI.Input(); - CustoName = new AntdUI.Input(); - CustoNo = new AntdUI.Input(); - btnBalance = new AntdUI.Button(); - txtReceipts = new AntdUI.Input(); - btnPg = new AntdUI.Pagination(); - dgvSpendList = new AntdUI.Table(); - tabPage2 = new TabPage(); - txtCustomerAddress = new AntdUI.Input(); - txtDateOfBirth = new AntdUI.Input(); - txtCustomerGender = new AntdUI.Input(); - txtCustomerName = new AntdUI.Input(); - txtCustomerNumber = new AntdUI.Input(); - txtTel = new AntdUI.Input(); - txtIdCardNumber = new AntdUI.Input(); - txtPassportName = new AntdUI.Input(); - txtCustomerType = new AntdUI.Input(); - tabPage3 = new TabPage(); - dgvWti = new AntdUI.Table(); - uiTabControlMenu2.SuspendLayout(); - tabPage1.SuspendLayout(); - tabPage2.SuspendLayout(); - tabPage3.SuspendLayout(); - SuspendLayout(); - // - // lblVIPPrice - // - lblVIPPrice.AutoSize = true; - lblVIPPrice.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); - lblVIPPrice.Location = new Point(509, 394); - lblVIPPrice.Name = "lblVIPPrice"; - lblVIPPrice.Size = new Size(40, 20); - lblVIPPrice.TabIndex = 28; - lblVIPPrice.Text = "0.00"; - // - // label15 - // - label15.AutoSize = true; - label15.Font = new Font("Microsoft Sans Serif", 10.5F, FontStyle.Bold, GraphicsUnit.Point, 0); - label15.ForeColor = Color.Red; - label15.Location = new Point(7, 525); - label15.Name = "label15"; - label15.Size = new Size(273, 17); - label15.TabIndex = 11; - label15.Text = "Tips：请提醒客人不要忘记带齐行李哦~"; - // - // lblDay - // - lblDay.AutoSize = true; - lblDay.Font = new Font("Microsoft Sans Serif", 15F, FontStyle.Regular, GraphicsUnit.Point, 0); - lblDay.Location = new Point(593, 76); - lblDay.Name = "lblDay"; - lblDay.Size = new Size(45, 25); - lblDay.TabIndex = 114; - lblDay.Text = "Null"; - // - // lable00 - // - lable00.AutoSize = true; - lable00.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); - lable00.Location = new Point(422, 394); - lable00.Name = "lable00"; - lable00.Size = new Size(89, 20); - lable00.TabIndex = 26; - lable00.Text = "应付金额："; - // - // label29 - // - label29.AutoSize = true; - label29.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label29.Location = new Point(572, 24); - label29.Name = "label29"; - label29.Size = new Size(88, 25); - label29.TabIndex = 113; - label29.Text = "已住天数"; - // - // lblVIP - // - lblVIP.AutoSize = true; - lblVIP.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); - lblVIP.Location = new Point(508, 362); - lblVIP.Name = "lblVIP"; - lblVIP.Size = new Size(73, 20); - lblVIP.TabIndex = 24; - lblVIP.Text = "不 打 折"; - // - // label25 - // - label25.AutoSize = true; - label25.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); - label25.Location = new Point(422, 362); - label25.Name = "label25"; - label25.Size = new Size(89, 20); - label25.TabIndex = 23; - label25.Text = "会员折扣："; - // - // label27 - // - label27.AutoSize = true; - label27.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label27.Location = new Point(285, 76); - label27.Name = "label27"; - label27.Size = new Size(88, 25); - label27.TabIndex = 110; - label27.Text = "房间编号"; - // - // label28 - // - label28.AutoSize = true; - label28.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label28.Location = new Point(285, 24); - label28.Name = "label28"; - label28.Size = new Size(88, 25); - label28.TabIndex = 109; - label28.Text = "入住时间"; - // - // lblChange - // - lblChange.AutoSize = true; - lblChange.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); - lblChange.Location = new Point(509, 458); - lblChange.Name = "lblChange"; - lblChange.Size = new Size(40, 20); - lblChange.TabIndex = 21; - lblChange.Text = "0.00"; - // - // label21 - // - label21.AutoSize = true; - label21.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); - label21.Location = new Point(421, 458); - label21.Name = "label21"; - label21.Size = new Size(89, 20); - label21.TabIndex = 20; - label21.Text = "找 零："; - // - // lblGetReceipts - // - lblGetReceipts.AutoSize = true; - lblGetReceipts.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); - lblGetReceipts.Location = new Point(509, 330); - lblGetReceipts.Name = "lblGetReceipts"; - lblGetReceipts.Size = new Size(40, 20); - lblGetReceipts.TabIndex = 19; - lblGetReceipts.Text = "0.00"; - // - // label1 - // - label1.AutoSize = true; - label1.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label1.Location = new Point(7, 76); - label1.Name = "label1"; - label1.Size = new Size(88, 25); - label1.TabIndex = 106; - label1.Text = "客户姓名"; - // - // label24 - // - label24.AutoSize = true; - label24.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label24.Location = new Point(7, 24); - label24.Name = "label24"; - label24.Size = new Size(88, 25); - label24.TabIndex = 105; - label24.Text = "客户编号"; - // - // label17 - // - label17.AutoSize = true; - label17.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); - label17.Location = new Point(421, 426); - label17.Name = "label17"; - label17.Size = new Size(89, 20); - label17.TabIndex = 14; - label17.Text = "实收金额："; - // - // label18 - // - label18.AutoSize = true; - label18.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 0); - label18.Location = new Point(422, 330); - label18.Name = "label18"; - label18.Size = new Size(89, 20); - label18.TabIndex = 15; - label18.Text = "消费总额："; - // - // label2 - // - label2.AutoSize = true; - label2.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label2.Location = new Point(25, 234); - label2.Name = "label2"; - label2.Size = new Size(88, 25); - label2.TabIndex = 115; - label2.Text = "居住地址"; - // - // label3 - // - label3.AutoSize = true; - label3.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label3.Location = new Point(344, 179); - label3.Name = "label3"; - label3.Size = new Size(88, 25); - label3.TabIndex = 114; - label3.Text = "联系方式"; - // - // label4 - // - label4.AutoSize = true; - label4.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label4.Location = new Point(344, 128); - label4.Name = "label4"; - label4.Size = new Size(88, 25); - label4.TabIndex = 113; - label4.Text = "证件号码"; - // - // label5 - // - label5.AutoSize = true; - label5.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label5.Location = new Point(344, 77); - label5.Name = "label5"; - label5.Size = new Size(88, 25); - label5.TabIndex = 112; - label5.Text = "证件类型"; - // - // label16 - // - label16.AutoSize = true; - label16.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label16.Location = new Point(344, 26); - label16.Name = "label16"; - label16.Size = new Size(88, 25); - label16.TabIndex = 111; - label16.Text = "客户类型"; - // - // label22 - // - label22.AutoSize = true; - label22.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label22.Location = new Point(27, 182); - label22.Name = "label22"; - label22.Size = new Size(88, 25); - label22.TabIndex = 110; - label22.Text = "出生日期"; - // - // label30 - // - label30.AutoSize = true; - label30.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label30.Location = new Point(27, 130); - label30.Name = "label30"; - label30.Size = new Size(86, 25); - label30.TabIndex = 109; - label30.Text = "性 别"; - // - // label31 - // - label31.AutoSize = true; - label31.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label31.Location = new Point(27, 78); - label31.Name = "label31"; - label31.Size = new Size(88, 25); - label31.TabIndex = 108; - label31.Text = "客户姓名"; - // - // label32 - // - label32.AutoSize = true; - label32.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label32.Location = new Point(27, 26); - label32.Name = "label32"; - label32.Size = new Size(88, 25); - label32.TabIndex = 107; - label32.Text = "客户编号"; - // - // uiTabControlMenu2 - // - uiTabControlMenu2.Alignment = TabAlignment.Left; - uiTabControlMenu2.Controls.Add(tabPage1); - uiTabControlMenu2.Controls.Add(tabPage2); - uiTabControlMenu2.Controls.Add(tabPage3); - uiTabControlMenu2.DrawMode = TabDrawMode.OwnerDrawFixed; - uiTabControlMenu2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiTabControlMenu2.Location = new Point(3, 38); - uiTabControlMenu2.MenuStyle = Sunny.UI.UIMenuStyle.Custom; - uiTabControlMenu2.Multiline = true; - uiTabControlMenu2.Name = "uiTabControlMenu2"; - uiTabControlMenu2.SelectedIndex = 0; - uiTabControlMenu2.Size = new Size(865, 550); - uiTabControlMenu2.SizeMode = TabSizeMode.Fixed; - uiTabControlMenu2.TabBackColor = Color.FromArgb(235, 243, 255); - uiTabControlMenu2.TabIndex = 15; - uiTabControlMenu2.TabSelectedColor = Color.Snow; - // - // tabPage1 - // - tabPage1.Controls.Add(dtpCheckTime); - tabPage1.Controls.Add(txtRoomNo); - tabPage1.Controls.Add(CustoName); - tabPage1.Controls.Add(CustoNo); - tabPage1.Controls.Add(btnBalance); - tabPage1.Controls.Add(txtReceipts); - tabPage1.Controls.Add(btnPg); - tabPage1.Controls.Add(dgvSpendList); - tabPage1.Controls.Add(label24); - tabPage1.Controls.Add(lblVIPPrice); - tabPage1.Controls.Add(label18); - tabPage1.Controls.Add(label15); - tabPage1.Controls.Add(label17); - tabPage1.Controls.Add(lblDay); - tabPage1.Controls.Add(label1); - tabPage1.Controls.Add(lable00); - tabPage1.Controls.Add(lblGetReceipts); - tabPage1.Controls.Add(label29); - tabPage1.Controls.Add(lblVIP); - tabPage1.Controls.Add(label21); - tabPage1.Controls.Add(label25); - tabPage1.Controls.Add(lblChange); - tabPage1.Controls.Add(label28); - tabPage1.Controls.Add(label27); - tabPage1.Location = new Point(201, 0); - tabPage1.Name = "tabPage1"; - tabPage1.Size = new Size(664, 550); - tabPage1.TabIndex = 0; - tabPage1.Text = "退房结算"; - tabPage1.UseVisualStyleBackColor = true; - // - // dtpCheckTime - // - dtpCheckTime.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - dtpCheckTime.Location = new Point(376, 16); - dtpCheckTime.Name = "dtpCheckTime"; - dtpCheckTime.PlaceholderText = ""; - dtpCheckTime.ReadOnly = true; - dtpCheckTime.Size = new Size(180, 42); - dtpCheckTime.TabIndex = 161; - // - // txtRoomNo - // - txtRoomNo.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtRoomNo.Location = new Point(376, 67); - txtRoomNo.Name = "txtRoomNo"; - txtRoomNo.PlaceholderText = ""; - txtRoomNo.ReadOnly = true; - txtRoomNo.Size = new Size(180, 42); - txtRoomNo.TabIndex = 160; - // - // CustoName - // - CustoName.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - CustoName.Location = new Point(98, 67); - CustoName.Name = "CustoName"; - CustoName.PlaceholderText = ""; - CustoName.ReadOnly = true; - CustoName.Size = new Size(180, 42); - CustoName.TabIndex = 159; - // - // CustoNo - // - CustoNo.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - CustoNo.Location = new Point(98, 16); - CustoNo.Name = "CustoNo"; - CustoNo.PlaceholderText = ""; - CustoNo.ReadOnly = true; - CustoNo.Size = new Size(180, 42); - CustoNo.TabIndex = 158; - // - // btnBalance - // - btnBalance.Location = new Point(422, 493); - btnBalance.Name = "btnBalance"; - btnBalance.Size = new Size(183, 48); - btnBalance.TabIndex = 157; - btnBalance.Text = "结 算"; - btnBalance.Type = AntdUI.TTypeMini.Primary; - btnBalance.Click += btnBalance_Click; - // - // txtReceipts - // - txtReceipts.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtReceipts.HandCursor = Cursors.IBeam; - txtReceipts.Location = new Point(508, 424); - txtReceipts.Name = "txtReceipts"; - txtReceipts.PlaceholderText = ""; - txtReceipts.Radius = 0; - txtReceipts.Size = new Size(97, 29); - txtReceipts.TabIndex = 156; - txtReceipts.TextChanged += txtReceipts_TextChanged; - // - // btnPg - // - btnPg.Current = 0; - btnPg.Location = new Point(7, 330); - btnPg.Name = "btnPg"; - btnPg.PageSize = 15; - btnPg.ShowSizeChanger = true; - btnPg.Size = new Size(403, 25); - btnPg.TabIndex = 135; - btnPg.Total = 1000000; - btnPg.ValueChanged += btnPg_ValueChanged; - btnPg.ShowTotalChanged += btnPg_ShowTotalChanged; - // - // dgvSpendList - // - dgvSpendList.Location = new Point(7, 113); - dgvSpendList.Name = "dgvSpendList"; - dgvSpendList.Size = new Size(654, 208); - dgvSpendList.TabIndex = 118; - dgvSpendList.Text = "table1"; - // - // tabPage2 - // - tabPage2.Controls.Add(txtCustomerAddress); - tabPage2.Controls.Add(txtDateOfBirth); - tabPage2.Controls.Add(txtCustomerGender); - tabPage2.Controls.Add(txtCustomerName); - tabPage2.Controls.Add(txtCustomerNumber); - tabPage2.Controls.Add(txtTel); - tabPage2.Controls.Add(txtIdCardNumber); - tabPage2.Controls.Add(txtPassportName); - tabPage2.Controls.Add(txtCustomerType); - tabPage2.Controls.Add(label32); - tabPage2.Controls.Add(label31); - tabPage2.Controls.Add(label30); - tabPage2.Controls.Add(label22); - tabPage2.Controls.Add(label16); - tabPage2.Controls.Add(label5); - tabPage2.Controls.Add(label4); - tabPage2.Controls.Add(label3); - tabPage2.Controls.Add(label2); - tabPage2.Location = new Point(201, 0); - tabPage2.Name = "tabPage2"; - tabPage2.Size = new Size(664, 550); - tabPage2.TabIndex = 1; - tabPage2.Text = "客户信息"; - tabPage2.UseVisualStyleBackColor = true; - // - // txtCustomerAddress - // - txtCustomerAddress.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustomerAddress.Location = new Point(134, 221); - txtCustomerAddress.Name = "txtCustomerAddress"; - txtCustomerAddress.PlaceholderText = ""; - txtCustomerAddress.ReadOnly = true; - txtCustomerAddress.Size = new Size(506, 42); - txtCustomerAddress.TabIndex = 158; - // - // txtDateOfBirth - // - txtDateOfBirth.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtDateOfBirth.Location = new Point(134, 170); - txtDateOfBirth.Name = "txtDateOfBirth"; - txtDateOfBirth.PlaceholderText = ""; - txtDateOfBirth.ReadOnly = true; - txtDateOfBirth.Size = new Size(203, 42); - txtDateOfBirth.TabIndex = 157; - // - // txtCustomerGender - // - txtCustomerGender.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustomerGender.Location = new Point(134, 119); - txtCustomerGender.Name = "txtCustomerGender"; - txtCustomerGender.PlaceholderText = ""; - txtCustomerGender.ReadOnly = true; - txtCustomerGender.Size = new Size(203, 42); - txtCustomerGender.TabIndex = 156; - // - // txtCustomerName - // - txtCustomerName.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustomerName.Location = new Point(134, 68); - txtCustomerName.Name = "txtCustomerName"; - txtCustomerName.PlaceholderText = ""; - txtCustomerName.ReadOnly = true; - txtCustomerName.Size = new Size(203, 42); - txtCustomerName.TabIndex = 155; - // - // txtCustomerNumber - // - txtCustomerNumber.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustomerNumber.Location = new Point(134, 17); - txtCustomerNumber.Name = "txtCustomerNumber"; - txtCustomerNumber.PlaceholderText = ""; - txtCustomerNumber.ReadOnly = true; - txtCustomerNumber.Size = new Size(203, 42); - txtCustomerNumber.TabIndex = 154; - // - // txtTel - // - txtTel.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtTel.Location = new Point(437, 170); - txtTel.Name = "txtTel"; - txtTel.PlaceholderText = ""; - txtTel.ReadOnly = true; - txtTel.Size = new Size(203, 42); - txtTel.TabIndex = 153; - // - // txtIdCardNumber - // - txtIdCardNumber.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtIdCardNumber.Location = new Point(437, 119); - txtIdCardNumber.Name = "txtIdCardNumber"; - txtIdCardNumber.PlaceholderText = ""; - txtIdCardNumber.ReadOnly = true; - txtIdCardNumber.Size = new Size(203, 42); - txtIdCardNumber.TabIndex = 152; - // - // txtPassportName - // - txtPassportName.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtPassportName.Location = new Point(437, 68); - txtPassportName.Name = "txtPassportName"; - txtPassportName.PlaceholderText = ""; - txtPassportName.ReadOnly = true; - txtPassportName.Size = new Size(203, 42); - txtPassportName.TabIndex = 151; - // - // txtCustomerType - // - txtCustomerType.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustomerType.Location = new Point(437, 17); - txtCustomerType.Name = "txtCustomerType"; - txtCustomerType.PlaceholderText = ""; - txtCustomerType.ReadOnly = true; - txtCustomerType.Size = new Size(203, 42); - txtCustomerType.TabIndex = 150; - // - // tabPage3 - // - tabPage3.Controls.Add(dgvWti); - tabPage3.Location = new Point(201, 0); - tabPage3.Name = "tabPage3"; - tabPage3.Size = new Size(664, 550); - tabPage3.TabIndex = 2; - tabPage3.Text = "历史水电情况"; - tabPage3.UseVisualStyleBackColor = true; - // - // dgvWti - // - dgvWti.Location = new Point(5, 7); - dgvWti.Name = "dgvWti"; - dgvWti.Size = new Size(654, 502); - dgvWti.TabIndex = 136; - dgvWti.Text = "table1"; - // - // FrmCheckOutForm - // - AutoScaleMode = AutoScaleMode.None; - BackColor = Color.FromArgb(235, 243, 255); - ClientSize = new Size(873, 593); - Controls.Add(uiTabControlMenu2); - Icon = (Icon)resources.GetObject("$this.Icon"); - MaximizeBox = false; - MinimizeBox = false; - Name = "FrmCheckOutForm"; - ShowTitleIcon = true; - Text = "退房结算"; - ZoomScaleRect = new Rectangle(15, 15, 888, 603); - Load += FrmCheckOutForm_Load; - MouseDown += FrmCheckOutForm_MouseDown; - MouseMove += FrmCheckOutForm_MouseMove; - uiTabControlMenu2.ResumeLayout(false); - tabPage1.ResumeLayout(false); - tabPage1.PerformLayout(); - tabPage2.ResumeLayout(false); - tabPage2.PerformLayout(); - tabPage3.ResumeLayout(false); - ResumeLayout(false); - } - - #endregion - private System.Windows.Forms.Label lblVIPPrice; - private System.Windows.Forms.Label label15; - private System.Windows.Forms.Label lblDay; - private System.Windows.Forms.Label lable00; - private System.Windows.Forms.Label label29; - private System.Windows.Forms.Label lblVIP; - private System.Windows.Forms.Label label25; - private System.Windows.Forms.Label label27; - private System.Windows.Forms.Label label28; - private System.Windows.Forms.Label lblChange; - private System.Windows.Forms.Label label21; - private System.Windows.Forms.Label lblGetReceipts; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label24; - private System.Windows.Forms.Label label17; - private System.Windows.Forms.Label label18; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label16; - private System.Windows.Forms.Label label22; - private System.Windows.Forms.Label label30; - private System.Windows.Forms.Label label31; - private System.Windows.Forms.Label label32; - private Sunny.UI.UITabControlMenu uiTabControlMenu2; - private System.Windows.Forms.TabPage tabPage1; - private System.Windows.Forms.TabPage tabPage2; - private System.Windows.Forms.TabPage tabPage3; - private AntdUI.Table dgvSpendList; - private AntdUI.Pagination btnPg; - private AntdUI.Input txtTel; - private AntdUI.Input txtIdCardNumber; - private AntdUI.Input txtPassportName; - private AntdUI.Input txtCustomerType; - private AntdUI.Input txtCustomerAddress; - private AntdUI.Input txtDateOfBirth; - private AntdUI.Input txtCustomerGender; - private AntdUI.Input txtCustomerName; - private AntdUI.Input txtCustomerNumber; - private AntdUI.Input txtReceipts; - private AntdUI.Button btnBalance; - private AntdUI.Input txtRoomNo; - private AntdUI.Input CustoName; - private AntdUI.Input CustoNo; - private AntdUI.Input dtpCheckTime; - private AntdUI.Table dgvWti; - } -} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.Designer.cs new file mode 100644 index 0000000000000000000000000000000000000000..2958167c9ca82359afea39e2b040a09e8d889f62 --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.Designer.cs @@ -0,0 +1,300 @@ +namespace EOM.TSHotelManagement.FormUI +{ + partial class FrmCustomerInfo + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmCustomerInfo)); + txtCustomerAddress = new AntdUI.Input(); + txtDateOfBirth = new AntdUI.Input(); + txtCustomerGender = new AntdUI.Input(); + txtCustomerName = new AntdUI.Input(); + txtCustomerNumber = new AntdUI.Input(); + txtTel = new AntdUI.Input(); + txtIdCardNumber = new AntdUI.Input(); + txtPassportName = new AntdUI.Input(); + txtCustomerType = new AntdUI.Input(); + label32 = new Label(); + label31 = new Label(); + label30 = new Label(); + label22 = new Label(); + label16 = new Label(); + label5 = new Label(); + label4 = new Label(); + label3 = new Label(); + label2 = new Label(); + ucWindowHeader1 = new ucWindowHeader(); + SuspendLayout(); + // + // txtCustomerAddress + // + txtCustomerAddress.Font = new Font("Noto Sans SC", 12F); + txtCustomerAddress.Location = new Point(95, 239); + txtCustomerAddress.Name = "txtCustomerAddress"; + txtCustomerAddress.PlaceholderText = ""; + txtCustomerAddress.ReadOnly = true; + txtCustomerAddress.Size = new Size(506, 42); + txtCustomerAddress.TabIndex = 176; + // + // txtDateOfBirth + // + txtDateOfBirth.Font = new Font("Noto Sans SC", 12F); + txtDateOfBirth.Location = new Point(95, 190); + txtDateOfBirth.Name = "txtDateOfBirth"; + txtDateOfBirth.PlaceholderText = ""; + txtDateOfBirth.ReadOnly = true; + txtDateOfBirth.Size = new Size(203, 42); + txtDateOfBirth.TabIndex = 175; + // + // txtCustomerGender + // + txtCustomerGender.Font = new Font("Noto Sans SC", 12F); + txtCustomerGender.Location = new Point(95, 141); + txtCustomerGender.Name = "txtCustomerGender"; + txtCustomerGender.PlaceholderText = ""; + txtCustomerGender.ReadOnly = true; + txtCustomerGender.Size = new Size(203, 42); + txtCustomerGender.TabIndex = 174; + // + // txtCustomerName + // + txtCustomerName.Font = new Font("Noto Sans SC", 12F); + txtCustomerName.Location = new Point(95, 92); + txtCustomerName.Name = "txtCustomerName"; + txtCustomerName.PlaceholderText = ""; + txtCustomerName.ReadOnly = true; + txtCustomerName.Size = new Size(203, 42); + txtCustomerName.TabIndex = 173; + // + // txtCustomerNumber + // + txtCustomerNumber.Font = new Font("Noto Sans SC", 12F); + txtCustomerNumber.Location = new Point(95, 43); + txtCustomerNumber.Name = "txtCustomerNumber"; + txtCustomerNumber.PlaceholderText = ""; + txtCustomerNumber.ReadOnly = true; + txtCustomerNumber.Size = new Size(203, 42); + txtCustomerNumber.TabIndex = 172; + // + // txtTel + // + txtTel.Font = new Font("Noto Sans SC", 12F); + txtTel.Location = new Point(398, 190); + txtTel.Name = "txtTel"; + txtTel.PlaceholderText = ""; + txtTel.ReadOnly = true; + txtTel.Size = new Size(203, 42); + txtTel.TabIndex = 171; + // + // txtIdCardNumber + // + txtIdCardNumber.Font = new Font("Noto Sans SC", 12F); + txtIdCardNumber.Location = new Point(398, 141); + txtIdCardNumber.Name = "txtIdCardNumber"; + txtIdCardNumber.PlaceholderText = ""; + txtIdCardNumber.ReadOnly = true; + txtIdCardNumber.Size = new Size(203, 42); + txtIdCardNumber.TabIndex = 170; + // + // txtPassportName + // + txtPassportName.Font = new Font("Noto Sans SC", 12F); + txtPassportName.Location = new Point(398, 92); + txtPassportName.Name = "txtPassportName"; + txtPassportName.PlaceholderText = ""; + txtPassportName.ReadOnly = true; + txtPassportName.Size = new Size(203, 42); + txtPassportName.TabIndex = 169; + // + // txtCustomerType + // + txtCustomerType.Font = new Font("Noto Sans SC", 12F); + txtCustomerType.Location = new Point(398, 43); + txtCustomerType.Name = "txtCustomerType"; + txtCustomerType.PlaceholderText = ""; + txtCustomerType.ReadOnly = true; + txtCustomerType.Size = new Size(203, 42); + txtCustomerType.TabIndex = 168; + // + // label32 + // + label32.AutoSize = true; + label32.Font = new Font("Noto Sans SC", 14.25F); + label32.Location = new Point(12, 54); + label32.Name = "label32"; + label32.Size = new Size(85, 19); + label32.TabIndex = 159; + label32.Text = "客户编号"; + // + // label31 + // + label31.AutoSize = true; + label31.Font = new Font("Noto Sans SC", 14.25F); + label31.Location = new Point(12, 103); + label31.Name = "label31"; + label31.Size = new Size(85, 19); + label31.TabIndex = 160; + label31.Text = "客户姓名"; + // + // label30 + // + label30.AutoSize = true; + label30.Font = new Font("Noto Sans SC", 14.25F); + label30.Location = new Point(12, 152); + label30.Name = "label30"; + label30.Size = new Size(87, 19); + label30.TabIndex = 161; + label30.Text = "性 别"; + // + // label22 + // + label22.AutoSize = true; + label22.Font = new Font("Noto Sans SC", 14.25F); + label22.Location = new Point(12, 201); + label22.Name = "label22"; + label22.Size = new Size(85, 19); + label22.TabIndex = 162; + label22.Text = "出生日期"; + // + // label16 + // + label16.AutoSize = true; + label16.Font = new Font("Noto Sans SC", 14.25F); + label16.Location = new Point(315, 54); + label16.Name = "label16"; + label16.Size = new Size(85, 19); + label16.TabIndex = 163; + label16.Text = "客户类型"; + // + // label5 + // + label5.AutoSize = true; + label5.Font = new Font("Noto Sans SC", 14.25F); + label5.Location = new Point(315, 103); + label5.Name = "label5"; + label5.Size = new Size(85, 19); + label5.TabIndex = 164; + label5.Text = "证件类型"; + // + // label4 + // + label4.AutoSize = true; + label4.Font = new Font("Noto Sans SC", 14.25F); + label4.Location = new Point(315, 152); + label4.Name = "label4"; + label4.Size = new Size(85, 19); + label4.TabIndex = 165; + label4.Text = "证件号码"; + // + // label3 + // + label3.AutoSize = true; + label3.Font = new Font("Noto Sans SC", 14.25F); + label3.Location = new Point(315, 201); + label3.Name = "label3"; + label3.Size = new Size(85, 19); + label3.TabIndex = 166; + label3.Text = "联系方式"; + // + // label2 + // + label2.AutoSize = true; + label2.Font = new Font("Noto Sans SC", 14.25F); + label2.Location = new Point(10, 250); + label2.Name = "label2"; + label2.Size = new Size(85, 19); + label2.TabIndex = 167; + label2.Text = "居住地址"; + // + // ucWindowHeader1 + // + ucWindowHeader1.Location = new Point(0, 0); + ucWindowHeader1.Name = "ucWindowHeader1"; + ucWindowHeader1.Size = new Size(610, 35); + ucWindowHeader1.TabIndex = 177; + // + // FrmCustomerInfo + // + AutoScaleMode = AutoScaleMode.None; + BackColor = Color.FromArgb(235, 243, 255); + ClientSize = new Size(608, 292); + Controls.Add(ucWindowHeader1); + Controls.Add(txtCustomerAddress); + Controls.Add(txtDateOfBirth); + Controls.Add(txtCustomerGender); + Controls.Add(txtCustomerName); + Controls.Add(txtCustomerNumber); + Controls.Add(txtTel); + Controls.Add(txtIdCardNumber); + Controls.Add(txtPassportName); + Controls.Add(txtCustomerType); + Controls.Add(label32); + Controls.Add(label31); + Controls.Add(label30); + Controls.Add(label22); + Controls.Add(label16); + Controls.Add(label5); + Controls.Add(label4); + Controls.Add(label3); + Controls.Add(label2); + FormBorderStyle = FormBorderStyle.None; + Icon = (Icon)resources.GetObject("$this.Icon"); + MaximizeBox = false; + MinimizeBox = false; + Name = "FrmCustomerInfo"; + Resizable = false; + StartPosition = FormStartPosition.CenterScreen; + Text = "客户信息"; + Load += FrmSelectCustoInfo_Load; + ResumeLayout(false); + PerformLayout(); + + } + + #endregion + + private AntdUI.Input txtCustomerAddress; + private AntdUI.Input txtDateOfBirth; + private AntdUI.Input txtCustomerGender; + private AntdUI.Input txtCustomerName; + private AntdUI.Input txtCustomerNumber; + private AntdUI.Input txtTel; + private AntdUI.Input txtIdCardNumber; + private AntdUI.Input txtPassportName; + private AntdUI.Input txtCustomerType; + private Label label32; + private Label label31; + private Label label30; + private Label label22; + private Label label16; + private Label label5; + private Label label4; + private Label label3; + private Label label2; + private ucWindowHeader ucWindowHeader1; + } +} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucNavBar.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.cs similarity index 37% rename from EOM.TSHotelManagement.FormUI/ClientCustomControls/ucNavBar.cs rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.cs index ca8cc1ddf9620fef2ca78e5abdd19ecf34e9182c..af592709f26fd09bf8b098da3617e58defe079ca 100644 --- a/EOM.TSHotelManagement.FormUI/ClientCustomControls/ucNavBar.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.cs @@ -21,13 +21,50 @@ *SOFTWARE. * */ -namespace EOM.TSHotelManagement.FormUI.AppUserControls + +using AntdUI; +using EOM.TSHotelManagement.Common; +using EOM.TSHotelManagement.Common.Contract; + +namespace EOM.TSHotelManagement.FormUI { - public partial class ucNavBar : UserControl + public partial class FrmCustomerInfo : Window { - public ucNavBar() + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmCustomerInfo)); + public string CustomerNumber { get; set; } + public FrmCustomerInfo(string customerNumber) { InitializeComponent(); + CustomerNumber = customerNumber; + + ucWindowHeader1.ApplySettingsWithoutMinimize("查看用户信息", string.Empty, (Image)resources.GetObject("FrmCustomerInfo.Icon")!); + } + + Dictionary dic = null; + ResponseMsg result = null; + + private void FrmSelectCustoInfo_Load(object sender, EventArgs e) + { + dic = new Dictionary() + { + { nameof(ReadCustomerInputDto.CustomerNumber), CustomerNumber } + }; + result = HttpHelper.Request(ApiConstants.Customer_SelectCustoByInfo, dic); + var c = HttpHelper.JsonToModel>(result.message); + if (c.Success == false) + { + NotificationService.ShowError($"{ApiConstants.Customer_SelectCustoByInfo}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + txtCustomerNumber.Text = c.Data.CustomerNumber; + txtCustomerAddress.Text = c.Data.CustomerAddress; + txtCustomerName.Text = c.Data.CustomerName; + txtIdCardNumber.Text = c.Data.IdCardNumber; + txtTel.Text = c.Data.CustomerPhoneNumber; + txtCustomerGender.Text = c.Data.CustomerGender == 1 ? "男" : "女"; + txtCustomerType.Text = c.Data.CustomerTypeName; + txtPassportName.Text = c.Data.PassportName; + txtDateOfBirth.Text = c.Data.DateOfBirth.ToString("yyyy/MM/dd"); } } } diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmSelectCustoInfo.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.resx similarity index 94% rename from EOM.TSHotelManagement.FormUI/ClientModule/FrmSelectCustoInfo.resx rename to EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.resx index e5b2e7fb654858eab67f6a44c1ca7a62c305933d..dc8897533deff45d1aae64e6b10b57d4d13098c1 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmSelectCustoInfo.resx +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerInfo.resx @@ -1,17 +1,17 @@  - diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.Designer.cs index e5aeaf09d67c9f203559286cc71ce3a4443b5803..0782ba18d9beaac8eb1ba37168810b684cecea65 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.Designer.cs @@ -30,19 +30,19 @@ { components = new System.ComponentModel.Container(); toolTip1 = new ToolTip(components); - cmsCustoManager = new Sunny.UI.UIContextMenuStrip(); - tsmiCustoNo = new ToolStripMenuItem(); - uiLine1 = new Sunny.UI.UILine(); btnSerach = new AntdUI.Button(); btnAddCusto = new AntdUI.Button(); btnUpdCustomer = new AntdUI.Button(); dgvCustomerList = new AntdUI.Table(); + cmsCustomerAction = new ContextMenuStrip(components); + tsmiCustoNoCopy = new ToolStripMenuItem(); btnPg = new AntdUI.Pagination(); label1 = new AntdUI.Label(); label2 = new AntdUI.Label(); txtCustoName = new AntdUI.Input(); txtCustoNo = new AntdUI.Input(); - cmsCustoManager.SuspendLayout(); + divider1 = new AntdUI.Divider(); + cmsCustomerAction.SuspendLayout(); SuspendLayout(); // // toolTip1 @@ -50,38 +50,9 @@ toolTip1.ToolTipIcon = ToolTipIcon.Info; toolTip1.ToolTipTitle = "获取账号"; // - // cmsCustoManager - // - cmsCustoManager.BackColor = Color.FromArgb(243, 249, 255); - cmsCustoManager.Font = new Font("微软雅黑", 12F); - cmsCustoManager.Items.AddRange(new ToolStripItem[] { tsmiCustoNo }); - cmsCustoManager.Name = "cmsCustoManager"; - cmsCustoManager.Size = new Size(177, 30); - // - // tsmiCustoNo - // - tsmiCustoNo.Image = Properties.Resources.复制; - tsmiCustoNo.Name = "tsmiCustoNo"; - tsmiCustoNo.Size = new Size(176, 26); - tsmiCustoNo.Text = "复制用户编号"; - tsmiCustoNo.Click += tsmiCustoNo_Click; - // - // uiLine1 - // - uiLine1.BackColor = Color.Transparent; - uiLine1.Font = new Font("微软雅黑", 12F); - uiLine1.ForeColor = Color.FromArgb(48, 48, 48); - uiLine1.Location = new Point(772, 411); - uiLine1.Margin = new Padding(4); - uiLine1.MinimumSize = new Size(2, 3); - uiLine1.Name = "uiLine1"; - uiLine1.Size = new Size(291, 24); - uiLine1.TabIndex = 124; - uiLine1.Text = "右键可复制快速客户编号"; - // // btnSerach // - btnSerach.Font = new Font("Microsoft YaHei UI", 12F); + btnSerach.Font = new Font("Noto Sans SC", 12F); btnSerach.Location = new Point(602, 441); btnSerach.Name = "btnSerach"; btnSerach.Size = new Size(93, 47); @@ -92,19 +63,21 @@ // // btnAddCusto // - btnAddCusto.Font = new Font("Microsoft YaHei UI", 12F); + btnAddCusto.Font = new Font("Noto Sans SC", 12F); + btnAddCusto.IconPosition = AntdUI.TAlignMini.Top; btnAddCusto.Location = new Point(772, 441); btnAddCusto.Name = "btnAddCusto"; btnAddCusto.Size = new Size(93, 47); btnAddCusto.TabIndex = 128; btnAddCusto.Text = "添加客户"; + btnAddCusto.TextCenterHasIcon = true; btnAddCusto.Type = AntdUI.TTypeMini.Primary; btnAddCusto.Click += btnAddCusto_BtnClick; // // btnUpdCustomer // btnUpdCustomer.Enabled = false; - btnUpdCustomer.Font = new Font("Microsoft YaHei UI", 12F); + btnUpdCustomer.Font = new Font("Noto Sans SC", 12F); btnUpdCustomer.Location = new Point(942, 441); btnUpdCustomer.Name = "btnUpdCustomer"; btnUpdCustomer.Size = new Size(93, 47); @@ -116,7 +89,8 @@ // dgvCustomerList // dgvCustomerList.Bordered = true; - dgvCustomerList.ContextMenuStrip = cmsCustoManager; + dgvCustomerList.ContextMenuStrip = cmsCustomerAction; + dgvCustomerList.Gap = 12; dgvCustomerList.Location = new Point(10, 7); dgvCustomerList.Name = "dgvCustomerList"; dgvCustomerList.Size = new Size(1053, 391); @@ -124,9 +98,22 @@ dgvCustomerList.CellClick += dgvCustomerList_CellClick; dgvCustomerList.CellDoubleClick += dgvCustomerList_CellDoubleClick; // + // cmsCustomerAction + // + cmsCustomerAction.Items.AddRange(new ToolStripItem[] { tsmiCustoNoCopy }); + cmsCustomerAction.Name = "cmsCustomerAction"; + cmsCustomerAction.Size = new Size(149, 26); + // + // tsmiCustoNoCopy + // + tsmiCustoNoCopy.Name = "tsmiCustoNoCopy"; + tsmiCustoNoCopy.Size = new Size(148, 22); + tsmiCustoNoCopy.Text = "复制用户编号"; + tsmiCustoNoCopy.Click += tsmiCustoNo_Click; + // // btnPg // - btnPg.Current = 0; + btnPg.Font = new Font("Noto Sans SC", 9F, FontStyle.Regular, GraphicsUnit.Point, 0); btnPg.Location = new Point(10, 404); btnPg.Name = "btnPg"; btnPg.PageSize = 15; @@ -139,7 +126,7 @@ // // label1 // - label1.Font = new Font("Microsoft YaHei UI", 12.5F); + label1.Font = new Font("Noto Sans SC", 12F); label1.Location = new Point(283, 453); label1.Name = "label1"; label1.Size = new Size(86, 26); @@ -149,7 +136,7 @@ // // label2 // - label2.Font = new Font("Microsoft YaHei UI", 12.5F); + label2.Font = new Font("Noto Sans SC", 12F); label2.Location = new Point(12, 453); label2.Name = "label2"; label2.Size = new Size(86, 26); @@ -159,7 +146,7 @@ // // txtCustoName // - txtCustoName.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); + txtCustoName.Font = new Font("Noto Sans SC", 12F); txtCustoName.Location = new Point(375, 444); txtCustoName.Name = "txtCustoName"; txtCustoName.PlaceholderText = "请输入客户姓名..."; @@ -168,19 +155,30 @@ // // txtCustoNo // - txtCustoNo.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); + txtCustoNo.Font = new Font("Noto Sans SC", 12F); txtCustoNo.Location = new Point(104, 444); txtCustoNo.Name = "txtCustoNo"; txtCustoNo.PlaceholderText = "请输入客户编号..."; txtCustoNo.Size = new Size(173, 42); txtCustoNo.TabIndex = 149; // + // divider1 + // + divider1.Font = new Font("Noto Sans SC", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 0); + divider1.Location = new Point(670, 406); + divider1.Name = "divider1"; + divider1.Size = new Size(393, 23); + divider1.TabIndex = 153; + divider1.Text = "右键可复制快速客户编号"; + divider1.Thickness = 1F; + // // FrmCustomerManager // AutoScaleDimensions = new SizeF(7F, 17F); AutoScaleMode = AutoScaleMode.Font; BackColor = Color.FromArgb(235, 243, 255); ClientSize = new Size(1072, 490); + Controls.Add(divider1); Controls.Add(label1); Controls.Add(label2); Controls.Add(txtCustoName); @@ -190,22 +188,18 @@ Controls.Add(btnUpdCustomer); Controls.Add(btnAddCusto); Controls.Add(btnSerach); - Controls.Add(uiLine1); FormBorderStyle = FormBorderStyle.None; Margin = new Padding(4); Name = "FrmCustomerManager"; StartPosition = FormStartPosition.CenterScreen; Text = "TS酒店管理系统"; Load += FrmCustomerManager_Load; - cmsCustoManager.ResumeLayout(false); + cmsCustomerAction.ResumeLayout(false); ResumeLayout(false); } #endregion private System.Windows.Forms.ToolTip toolTip1; - private Sunny.UI.UIContextMenuStrip cmsCustoManager; - private System.Windows.Forms.ToolStripMenuItem tsmiCustoNo; - private Sunny.UI.UILine uiLine1; private AntdUI.Button btnSerach; private AntdUI.Button btnAddCusto; private AntdUI.Button btnUpdCustomer; @@ -215,5 +209,8 @@ private AntdUI.Label label2; private AntdUI.Input txtCustoName; private AntdUI.Input txtCustoNo; + private ContextMenuStrip cmsCustomerAction; + private ToolStripMenuItem tsmiCustoNoCopy; + private AntdUI.Divider divider1; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.cs index f74d16f2ef290462aeb5baf7a9fe7922dbd51b41..692e14fad600cabbc0fe0b62e88883d8de3bbb2c 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.cs @@ -24,7 +24,7 @@ using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; -using Sunny.UI; +using jvncorelib.EntityLib; using System.Runtime.InteropServices; namespace EOM.TSHotelManagement.FormUI @@ -101,7 +101,7 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Customer_SelectCustomers, dic); var customers = HttpHelper.JsonToModel>(result.message); - if (customers.Code != BusinessStatusCode.Success) + if (customers.Success == false) { AntdUI.Message.error(this, "SelectCustomers+接口服务异常，请提交Issue或尝试更新版本！"); return null!; @@ -141,7 +141,7 @@ namespace EOM.TSHotelManagement.FormUI } result = HttpHelper.Request(ApiConstants.Customer_SelectCustomers, dic); response = HttpHelper.JsonToModel>(result.message); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { AntdUI.Message.error(this, $"{ApiConstants.Customer_SelectCustomers}+接口服务异常，请提交Issue或尝试更新版本！"); return; diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.resx index 05f7066207d7f4ce437ca6c3b5aeb7623cc43b89..8c8239e08389b63dff51c9bf07db9ce915fa7a01 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.resx +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmCustomerManagement.resx @@ -120,7 +120,7 @@ 17, 17 - - 179, 17 + + 125, 19 \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.Designer.cs index 0c0217c1286a85e19e2ab8b35788087161c8a98b..374c5143c665726474a783cafdfd78f9bc8bb646 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.Designer.cs @@ -29,368 +29,259 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmEditInputs)); - this.cbCustoType = new Sunny.UI.UIComboBox(); - this.cbPassportType = new Sunny.UI.UIComboBox(); - this.cbSex = new Sunny.UI.UIComboBox(); - this.txtCustoNo = new Sunny.UI.UITextBox(); - this.txtCustoName = new Sunny.UI.UITextBox(); - this.txtCardID = new Sunny.UI.UITextBox(); - this.txtTel = new Sunny.UI.UITextBox(); - this.dtpBirthday = new Sunny.UI.UIDatePicker(); - this.txtCustoAdress = new Sunny.UI.UITextBox(); - this.label10 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.pnlBtm.SuspendLayout(); - this.SuspendLayout(); - // - // pnlBtm - // - this.pnlBtm.Location = new System.Drawing.Point(1, 315); - this.pnlBtm.Size = new System.Drawing.Size(798, 55); - // - // btnCancel - // - this.btnCancel.Location = new System.Drawing.Point(670, 12); - this.btnCancel.Radius = 25; - this.btnCancel.Text = "关 闭"; - // - // btnOK - // - this.btnOK.Location = new System.Drawing.Point(555, 12); - this.btnOK.Radius = 25; - this.btnOK.Text = "保 存"; - // - // cbCustoType - // - this.cbCustoType.DataSource = null; - this.cbCustoType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cbCustoType.FillColor = System.Drawing.Color.White; - this.cbCustoType.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cbCustoType.Location = new System.Drawing.Point(518, 50); - this.cbCustoType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cbCustoType.MinimumSize = new System.Drawing.Size(63, 0); - this.cbCustoType.Name = "cbCustoType"; - this.cbCustoType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cbCustoType.Radius = 20; - this.cbCustoType.ReadOnly = true; - this.cbCustoType.Size = new System.Drawing.Size(250, 35); - this.cbCustoType.TabIndex = 124; - this.cbCustoType.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.cbCustoType.Watermark = ""; - // - // cbPassportType - // - this.cbPassportType.DataSource = null; - this.cbPassportType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cbPassportType.FillColor = System.Drawing.Color.White; - this.cbPassportType.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cbPassportType.Location = new System.Drawing.Point(518, 101); - this.cbPassportType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cbPassportType.MinimumSize = new System.Drawing.Size(63, 0); - this.cbPassportType.Name = "cbPassportType"; - this.cbPassportType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cbPassportType.Radius = 20; - this.cbPassportType.Size = new System.Drawing.Size(250, 35); - this.cbPassportType.TabIndex = 123; - this.cbPassportType.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // cbSex - // - this.cbSex.DataSource = null; - this.cbSex.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cbSex.FillColor = System.Drawing.Color.White; - this.cbSex.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cbSex.Location = new System.Drawing.Point(142, 155); - this.cbSex.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cbSex.MinimumSize = new System.Drawing.Size(63, 0); - this.cbSex.Name = "cbSex"; - this.cbSex.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cbSex.Radius = 20; - this.cbSex.Size = new System.Drawing.Size(250, 35); - this.cbSex.TabIndex = 122; - this.cbSex.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // txtCustoNo - // - this.txtCustoNo.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoNo.FillColor = System.Drawing.Color.White; - this.txtCustoNo.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCustoNo.Location = new System.Drawing.Point(142, 51); - this.txtCustoNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCustoNo.Maximum = 2147483647D; - this.txtCustoNo.Minimum = -2147483648D; - this.txtCustoNo.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCustoNo.Name = "txtCustoNo"; - this.txtCustoNo.Padding = new System.Windows.Forms.Padding(5); - this.txtCustoNo.Radius = 20; - this.txtCustoNo.ReadOnly = true; - this.txtCustoNo.Size = new System.Drawing.Size(250, 35); - this.txtCustoNo.Style = Sunny.UI.UIStyle.Custom; - this.txtCustoNo.StyleCustomMode = true; - this.txtCustoNo.TabIndex = 121; - this.txtCustoNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // txtCustoName - // - this.txtCustoName.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoName.FillColor = System.Drawing.Color.White; - this.txtCustoName.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCustoName.Location = new System.Drawing.Point(142, 103); - this.txtCustoName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCustoName.Maximum = 2147483647D; - this.txtCustoName.Minimum = -2147483648D; - this.txtCustoName.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCustoName.Name = "txtCustoName"; - this.txtCustoName.Padding = new System.Windows.Forms.Padding(5); - this.txtCustoName.Radius = 20; - this.txtCustoName.Size = new System.Drawing.Size(250, 35); - this.txtCustoName.Style = Sunny.UI.UIStyle.Custom; - this.txtCustoName.StyleCustomMode = true; - this.txtCustoName.TabIndex = 120; - this.txtCustoName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // txtCardID - // - this.txtCardID.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCardID.FillColor = System.Drawing.Color.White; - this.txtCardID.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCardID.Location = new System.Drawing.Point(518, 152); - this.txtCardID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCardID.Maximum = 2147483647D; - this.txtCardID.Minimum = -2147483648D; - this.txtCardID.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCardID.Name = "txtCardID"; - this.txtCardID.Padding = new System.Windows.Forms.Padding(5); - this.txtCardID.Radius = 20; - this.txtCardID.Size = new System.Drawing.Size(250, 35); - this.txtCardID.Style = Sunny.UI.UIStyle.Custom; - this.txtCardID.StyleCustomMode = true; - this.txtCardID.TabIndex = 119; - this.txtCardID.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.txtCardID.Validated += new System.EventHandler(this.txtCardID_Validated); - // - // txtTel - // - this.txtTel.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtTel.FillColor = System.Drawing.Color.White; - this.txtTel.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtTel.Location = new System.Drawing.Point(518, 203); - this.txtTel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtTel.Maximum = 2147483647D; - this.txtTel.Minimum = -2147483648D; - this.txtTel.MinimumSize = new System.Drawing.Size(1, 1); - this.txtTel.Name = "txtTel"; - this.txtTel.Padding = new System.Windows.Forms.Padding(5); - this.txtTel.Radius = 20; - this.txtTel.Size = new System.Drawing.Size(250, 35); - this.txtTel.Style = Sunny.UI.UIStyle.Custom; - this.txtTel.StyleCustomMode = true; - this.txtTel.TabIndex = 118; - this.txtTel.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // dtpBirthday - // - this.dtpBirthday.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.dtpBirthday.FillColor = System.Drawing.Color.White; - this.dtpBirthday.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F); - this.dtpBirthday.Location = new System.Drawing.Point(142, 207); - this.dtpBirthday.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.dtpBirthday.MaxLength = 10; - this.dtpBirthday.MinimumSize = new System.Drawing.Size(63, 0); - this.dtpBirthday.Name = "dtpBirthday"; - this.dtpBirthday.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.dtpBirthday.Radius = 20; - this.dtpBirthday.ReadOnly = true; - this.dtpBirthday.Size = new System.Drawing.Size(250, 31); - this.dtpBirthday.SymbolDropDown = 61555; - this.dtpBirthday.SymbolNormal = 61555; - this.dtpBirthday.TabIndex = 117; - this.dtpBirthday.Text = "2020-11-24"; - this.dtpBirthday.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.dtpBirthday.Value = new System.DateTime(2020, 11, 24, 22, 50, 36, 791); - // - // txtCustoAdress - // - this.txtCustoAdress.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoAdress.FillColor = System.Drawing.Color.White; - this.txtCustoAdress.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCustoAdress.Location = new System.Drawing.Point(140, 255); - this.txtCustoAdress.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCustoAdress.Maximum = 2147483647D; - this.txtCustoAdress.Minimum = -2147483648D; - this.txtCustoAdress.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCustoAdress.Name = "txtCustoAdress"; - this.txtCustoAdress.Padding = new System.Windows.Forms.Padding(5); - this.txtCustoAdress.Radius = 20; - this.txtCustoAdress.Size = new System.Drawing.Size(628, 35); - this.txtCustoAdress.Style = Sunny.UI.UIStyle.Custom; - this.txtCustoAdress.StyleCustomMode = true; - this.txtCustoAdress.TabIndex = 116; - this.txtCustoAdress.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + label10 = new Label(); + label9 = new Label(); + label8 = new Label(); + label7 = new Label(); + label6 = new Label(); + label5 = new Label(); + label4 = new Label(); + label3 = new Label(); + label2 = new Label(); + dtpDateOfBirth = new AntdUI.DatePicker(); + txtCustomerName = new AntdUI.Input(); + txtCustomerId = new AntdUI.Input(); + txtCustomerCardID = new AntdUI.Input(); + txtCustomerTel = new AntdUI.Input(); + txtCustomerAddress = new AntdUI.Input(); + ucWindowHeader1 = new ucWindowHeader(); + btnOk = new AntdUI.Button(); + cboGender = new AntdUI.Select(); + cboPassportType = new AntdUI.Select(); + cboCustomerType = new AntdUI.Select(); + SuspendLayout(); // // label10 // - this.label10.AutoSize = true; - this.label10.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label10.Location = new System.Drawing.Point(33, 265); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(88, 25); - this.label10.TabIndex = 115; - this.label10.Text = "居住地址"; + label10.AutoSize = true; + label10.Font = new Font("Noto Sans SC", 14.2499981F); + label10.Location = new Point(9, 263); + label10.Name = "label10"; + label10.Size = new Size(85, 19); + label10.TabIndex = 115; + label10.Text = "居住地址"; // // label9 // - this.label9.AutoSize = true; - this.label9.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(414, 210); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(88, 25); - this.label9.TabIndex = 114; - this.label9.Text = "联系方式"; + label9.AutoSize = true; + label9.Font = new Font("Noto Sans SC", 14.2499981F); + label9.Location = new Point(379, 212); + label9.Name = "label9"; + label9.Size = new Size(85, 19); + label9.TabIndex = 114; + label9.Text = "联系方式"; // // label8 // - this.label8.AutoSize = true; - this.label8.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(414, 159); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(88, 25); - this.label8.TabIndex = 113; - this.label8.Text = "证件号码"; + label8.AutoSize = true; + label8.Font = new Font("Noto Sans SC", 14.2499981F); + label8.Location = new Point(379, 161); + label8.Name = "label8"; + label8.Size = new Size(85, 19); + label8.TabIndex = 113; + label8.Text = "证件号码"; // // label7 // - this.label7.AutoSize = true; - this.label7.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(414, 108); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(88, 25); - this.label7.TabIndex = 112; - this.label7.Text = "证件类型"; + label7.AutoSize = true; + label7.Font = new Font("Noto Sans SC", 14.2499981F); + label7.Location = new Point(379, 110); + label7.Name = "label7"; + label7.Size = new Size(85, 19); + label7.TabIndex = 112; + label7.Text = "证件类型"; // // label6 // - this.label6.AutoSize = true; - this.label6.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(414, 57); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(88, 25); - this.label6.TabIndex = 111; - this.label6.Text = "客户类型"; + label6.AutoSize = true; + label6.Font = new Font("Noto Sans SC", 14.2499981F); + label6.Location = new Point(379, 59); + label6.Name = "label6"; + label6.Size = new Size(85, 19); + label6.TabIndex = 111; + label6.Text = "客户类型"; // // label5 // - this.label5.AutoSize = true; - this.label5.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(35, 213); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(88, 25); - this.label5.TabIndex = 110; - this.label5.Text = "出生日期"; + label5.AutoSize = true; + label5.Font = new Font("Noto Sans SC", 14.2499981F); + label5.Location = new Point(11, 212); + label5.Name = "label5"; + label5.Size = new Size(85, 19); + label5.TabIndex = 110; + label5.Text = "出生日期"; // // label4 // - this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(35, 161); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(74, 25); - this.label4.TabIndex = 109; - this.label4.Text = "性 别"; + label4.AutoSize = true; + label4.Font = new Font("Noto Sans SC", 14.2499981F); + label4.Location = new Point(11, 161); + label4.Name = "label4"; + label4.Size = new Size(82, 19); + label4.TabIndex = 109; + label4.Text = "性 别"; // // label3 // - this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(35, 109); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(88, 25); - this.label3.TabIndex = 108; - this.label3.Text = "客户姓名"; + label3.AutoSize = true; + label3.Font = new Font("Noto Sans SC", 14.2499981F); + label3.Location = new Point(11, 110); + label3.Name = "label3"; + label3.Size = new Size(85, 19); + label3.TabIndex = 108; + label3.Text = "客户姓名"; // // label2 // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(35, 57); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(88, 25); - this.label2.TabIndex = 107; - this.label2.Text = "客户编号"; + label2.AutoSize = true; + label2.Font = new Font("Noto Sans SC", 14.2499981F); + label2.Location = new Point(11, 59); + label2.Name = "label2"; + label2.Size = new Size(85, 19); + label2.TabIndex = 107; + label2.Text = "客户编号"; + // + // dtpDateOfBirth + // + dtpDateOfBirth.Font = new Font("Noto Sans SC", 10F); + dtpDateOfBirth.Location = new Point(94, 201); + dtpDateOfBirth.Name = "dtpDateOfBirth"; + dtpDateOfBirth.Size = new Size(252, 43); + dtpDateOfBirth.TabIndex = 166; + // + // txtCustomerName + // + txtCustomerName.Font = new Font("Noto Sans SC", 12F); + txtCustomerName.Location = new Point(95, 99); + txtCustomerName.Name = "txtCustomerName"; + txtCustomerName.Size = new Size(252, 45); + txtCustomerName.TabIndex = 164; + // + // txtCustomerId + // + txtCustomerId.Font = new Font("Noto Sans SC", 12F); + txtCustomerId.Location = new Point(95, 48); + txtCustomerId.Name = "txtCustomerId"; + txtCustomerId.ReadOnly = true; + txtCustomerId.Size = new Size(252, 45); + txtCustomerId.TabIndex = 163; + // + // txtCustomerCardID + // + txtCustomerCardID.Font = new Font("Noto Sans SC", 12F); + txtCustomerCardID.Location = new Point(463, 148); + txtCustomerCardID.Name = "txtCustomerCardID"; + txtCustomerCardID.Size = new Size(250, 45); + txtCustomerCardID.TabIndex = 168; + txtCustomerCardID.Validated += txtCardID_Validated; + // + // txtCustomerTel + // + txtCustomerTel.Font = new Font("Noto Sans SC", 12F); + txtCustomerTel.Location = new Point(463, 198); + txtCustomerTel.Name = "txtCustomerTel"; + txtCustomerTel.Size = new Size(250, 45); + txtCustomerTel.TabIndex = 167; + // + // txtCustomerAddress + // + txtCustomerAddress.Font = new Font("Noto Sans SC", 12F); + txtCustomerAddress.Location = new Point(95, 250); + txtCustomerAddress.Name = "txtCustomerAddress"; + txtCustomerAddress.Size = new Size(618, 45); + txtCustomerAddress.TabIndex = 171; + // + // ucWindowHeader1 + // + ucWindowHeader1.Location = new Point(0, 0); + ucWindowHeader1.Name = "ucWindowHeader1"; + ucWindowHeader1.Size = new Size(723, 35); + ucWindowHeader1.TabIndex = 172; + // + // btnOk + // + btnOk.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnOk.Location = new Point(579, 307); + btnOk.Name = "btnOk"; + btnOk.Size = new Size(135, 45); + btnOk.TabIndex = 173; + btnOk.Text = "保 存"; + btnOk.Type = AntdUI.TTypeMini.Info; + btnOk.Click += FrmEditInputs_ButtonOkClick; + // + // cboGender + // + cboGender.Font = new Font("Noto Sans SC", 12F); + cboGender.List = true; + cboGender.ListAutoWidth = true; + cboGender.Location = new Point(95, 150); + cboGender.Name = "cboGender"; + cboGender.Placement = AntdUI.TAlignFrom.Bottom; + cboGender.Size = new Size(251, 45); + cboGender.TabIndex = 174; + // + // cboPassportType + // + cboPassportType.Font = new Font("Noto Sans SC", 12F); + cboPassportType.List = true; + cboPassportType.ListAutoWidth = true; + cboPassportType.Location = new Point(463, 98); + cboPassportType.Name = "cboPassportType"; + cboPassportType.Placement = AntdUI.TAlignFrom.Bottom; + cboPassportType.Size = new Size(251, 45); + cboPassportType.TabIndex = 175; + // + // cboCustomerType + // + cboCustomerType.Font = new Font("Noto Sans SC", 12F); + cboCustomerType.List = true; + cboCustomerType.ListAutoWidth = true; + cboCustomerType.Location = new Point(463, 48); + cboCustomerType.Name = "cboCustomerType"; + cboCustomerType.Placement = AntdUI.TAlignFrom.Bottom; + cboCustomerType.Size = new Size(251, 45); + cboCustomerType.TabIndex = 176; // // FrmEditInputs // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 373); - this.Controls.Add(this.cbCustoType); - this.Controls.Add(this.cbPassportType); - this.Controls.Add(this.cbSex); - this.Controls.Add(this.txtCustoNo); - this.Controls.Add(this.txtCustoName); - this.Controls.Add(this.txtCardID); - this.Controls.Add(this.txtTel); - this.Controls.Add(this.dtpBirthday); - this.Controls.Add(this.txtCustoAdress); - this.Controls.Add(this.label10); - this.Controls.Add(this.label9); - this.Controls.Add(this.label8); - this.Controls.Add(this.label7); - this.Controls.Add(this.label6); - this.Controls.Add(this.label5); - this.Controls.Add(this.label4); - this.Controls.Add(this.label3); - this.Controls.Add(this.label2); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Name = "FrmEditInputs"; - this.ShowTitleIcon = true; - this.Text = "添加会员信息"; - this.ButtonOkClick += new System.EventHandler(this.FrmEditInputs_ButtonOkClick); - this.ButtonCancelClick += new System.EventHandler(this.FrmEditInputs_ButtonCancelClick); - this.Load += new System.EventHandler(this.FrmEditInputs_Load); - this.Controls.SetChildIndex(this.pnlBtm, 0); - this.Controls.SetChildIndex(this.label2, 0); - this.Controls.SetChildIndex(this.label3, 0); - this.Controls.SetChildIndex(this.label4, 0); - this.Controls.SetChildIndex(this.label5, 0); - this.Controls.SetChildIndex(this.label6, 0); - this.Controls.SetChildIndex(this.label7, 0); - this.Controls.SetChildIndex(this.label8, 0); - this.Controls.SetChildIndex(this.label9, 0); - this.Controls.SetChildIndex(this.label10, 0); - this.Controls.SetChildIndex(this.txtCustoAdress, 0); - this.Controls.SetChildIndex(this.dtpBirthday, 0); - this.Controls.SetChildIndex(this.txtTel, 0); - this.Controls.SetChildIndex(this.txtCardID, 0); - this.Controls.SetChildIndex(this.txtCustoName, 0); - this.Controls.SetChildIndex(this.txtCustoNo, 0); - this.Controls.SetChildIndex(this.cbSex, 0); - this.Controls.SetChildIndex(this.cbPassportType, 0); - this.Controls.SetChildIndex(this.cbCustoType, 0); - this.pnlBtm.ResumeLayout(false); - this.ResumeLayout(false); - this.PerformLayout(); + AutoScaleMode = AutoScaleMode.None; + BackColor = Color.FromArgb(235, 243, 255); + ClientSize = new Size(722, 364); + Controls.Add(cboCustomerType); + Controls.Add(cboPassportType); + Controls.Add(cboGender); + Controls.Add(btnOk); + Controls.Add(ucWindowHeader1); + Controls.Add(txtCustomerAddress); + Controls.Add(txtCustomerCardID); + Controls.Add(txtCustomerTel); + Controls.Add(dtpDateOfBirth); + Controls.Add(txtCustomerName); + Controls.Add(txtCustomerId); + Controls.Add(label10); + Controls.Add(label9); + Controls.Add(label8); + Controls.Add(label7); + Controls.Add(label6); + Controls.Add(label5); + Controls.Add(label4); + Controls.Add(label3); + Controls.Add(label2); + FormBorderStyle = FormBorderStyle.None; + Icon = (Icon)resources.GetObject("$this.Icon"); + MaximizeBox = false; + MinimizeBox = false; + Name = "FrmEditInputs"; + Resizable = false; + StartPosition = FormStartPosition.CenterScreen; + Text = "添加会员信息"; + Load += FrmEditInputs_Load; + ResumeLayout(false); + PerformLayout(); } #endregion - - private Sunny.UI.UIComboBox cbCustoType; - private Sunny.UI.UIComboBox cbPassportType; - private Sunny.UI.UIComboBox cbSex; - private Sunny.UI.UITextBox txtCustoNo; - private Sunny.UI.UITextBox txtCustoName; - private Sunny.UI.UITextBox txtCardID; - private Sunny.UI.UITextBox txtTel; - private Sunny.UI.UIDatePicker dtpBirthday; - private Sunny.UI.UITextBox txtCustoAdress; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label8; @@ -400,5 +291,16 @@ private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label2; + private AntdUI.DatePicker dtpDateOfBirth; + private AntdUI.Input txtCustomerName; + private AntdUI.Input txtCustomerId; + private AntdUI.Input txtCustomerCardID; + private AntdUI.Input txtCustomerTel; + private AntdUI.Input txtCustomerAddress; + private ucWindowHeader ucWindowHeader1; + private AntdUI.Button btnOk; + private AntdUI.Select cboGender; + private AntdUI.Select cboPassportType; + private AntdUI.Select cboCustomerType; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.cs index 8e5c0ef44d921398c93007512aa9ee2aec3f1a0b..ce87bc7bdc0fe707ff3a4f4d4011320da6339285 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.cs @@ -22,20 +22,27 @@ * */ +using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using jvncorelib.CodeLib; -using Sunny.UI; +using jvncorelib.EntityLib; namespace EOM.TSHotelManagement.FormUI { - public partial class FrmEditInputs : UIEditForm + public partial class FrmEditInputs : Window { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmEditInputs)); private LoadingProgress? _loadingProgress; public FrmEditInputs(LoadingProgress? loadingProgress = null) { InitializeComponent(); _loadingProgress = loadingProgress; + + ucWindowHeader1.ApplySettingsWithoutMinimize( + this.Text.Contains("修改") ? "修改客户信息" : "添加客户信息", + string.Empty, + (Image)resources.GetObject("FrmEditInputs.Icon")!); } Dictionary dic = null; @@ -44,37 +51,30 @@ namespace EOM.TSHotelManagement.FormUI private void FrmEditInputs_Load(object sender, EventArgs e) { string cardId = new UniqueCode().GetNewId("TS"); - txtCustoNo.Text = cardId; + txtCustomerId.Text = cardId; #region 加载客户类型信息 var result = HttpHelper.Request(ApiConstants.Base_SelectCustoTypeAllCanUse); var customerTypes = HttpHelper.JsonToModel>(result.message); - if (customerTypes.Code != BusinessStatusCode.Success) + if (customerTypes.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectCustoTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Base_SelectCustoTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); return; } var lstDataGrid = customerTypes.Data.Items; - this.cbCustoType.DataSource = lstDataGrid; - this.cbCustoType.DisplayMember = nameof(ReadCustoTypeOutputDto.CustomerTypeName); - this.cbCustoType.ValueMember = nameof(ReadCustoTypeOutputDto.CustomerType); - this.cbCustoType.SelectedIndex = 0; - this.cbCustoType.ReadOnly = true; + this.cboCustomerType.Items.AddRange(lstDataGrid.Select(item => new AntdUI.SelectItem(item.CustomerTypeName, item.CustomerType)).ToArray()); #endregion #region 加载证件类型信息 result = HttpHelper.Request(ApiConstants.Base_SelectPassPortTypeAllCanUse); var passportTypes = HttpHelper.JsonToModel>(result.message); - if (passportTypes.Code != BusinessStatusCode.Success) + if (passportTypes.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectPassPortTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Base_SelectPassPortTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); return; } var passPorts = passportTypes.Data.Items; - this.cbPassportType.DataSource = passPorts; - this.cbPassportType.DisplayMember = nameof(ReadPassportTypeOutputDto.PassportName); - this.cbPassportType.ValueMember = nameof(ReadPassportTypeOutputDto.PassportId); - this.cbPassportType.SelectedIndex = 0; + this.cboPassportType.Items.AddRange(passPorts.Select(item => new AntdUI.SelectItem(item.PassportName, item.PassportId)).ToArray()); #endregion #region 加载性别信息 @@ -85,41 +85,37 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Base_SelectGenderTypeAll, dic); var genderTypes = HttpHelper.JsonToModel>(result.message); - if (genderTypes.Code != BusinessStatusCode.Success) + if (genderTypes.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectGenderTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Base_SelectGenderTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } var listSexType = genderTypes.Data.Items; - this.cbSex.DataSource = listSexType; - this.cbSex.DisplayMember = nameof(ReadGenderTypeOutputDto.Description); - this.cbSex.ValueMember = nameof(ReadGenderTypeOutputDto.Id); - this.cbSex.SelectedIndex = 0; + this.cboGender.Items.AddRange(listSexType.Select(item => new AntdUI.SelectItem(item.Description, item.Id)).ToArray()); #endregion if (this.Text.Equals("修改客户信息")) { - txtCustoNo.Text = FrmCustomerManager.cm_CustoNo; - txtCustoName.Text = FrmCustomerManager.cm_CustoName; - txtCustoAdress.Text = FrmCustomerManager.cm_CustoAddress; - cbCustoType.SelectedValue = FrmCustomerManager.cm_CustoType; - cbSex.SelectedValue = FrmCustomerManager.cm_CustoSex; - cbPassportType.SelectedValue = FrmCustomerManager.cm_PassportType; - dtpBirthday.Value = FrmCustomerManager.cm_CustoBirth; - txtCardID.Text = FrmCustomerManager.cm_CustoIdCardNumber; - txtCustoAdress.Text = FrmCustomerManager.cm_CustoAddress; - txtTel.Text = FrmCustomerManager.cm_CustoTel; - btnOK.Text = "修改"; + txtCustomerId.Text = FrmCustomerManager.cm_CustoNo; + txtCustomerName.Text = FrmCustomerManager.cm_CustoName; + txtCustomerAddress.Text = FrmCustomerManager.cm_CustoAddress; + cboCustomerType.SelectedValue = FrmCustomerManager.cm_CustoType; + cboGender.SelectedValue = FrmCustomerManager.cm_CustoSex; + cboPassportType.SelectedValue = FrmCustomerManager.cm_PassportType; + dtpDateOfBirth.Value = FrmCustomerManager.cm_CustoBirth; + txtCustomerCardID.Text = FrmCustomerManager.cm_CustoIdCardNumber; + txtCustomerTel.Text = FrmCustomerManager.cm_CustoTel; + btnOk.Text = "修改"; - this.ButtonOkClick -= new EventHandler(FrmEditInputs_ButtonOkClick); - this.ButtonOkClick += new EventHandler(btnOK_UpdClick); + this.btnOk.Click -= new EventHandler(FrmEditInputs_ButtonOkClick); + this.btnOk.Click += new EventHandler(btnOK_UpdClick); - if (!cbPassportType.SelectedText.ToString().Contains("身份证")) - { - dtpBirthday.Enabled = true; - dtpBirthday.ReadOnly = false; - return; - } + //if (!cboPassportType.SelectedValue.ToString().Contains("身份证")) + //{ + // dtpBirthday.Enabled = true; + // dtpBirthday.ReadOnly = false; + // return; + //} } } @@ -129,47 +125,33 @@ namespace EOM.TSHotelManagement.FormUI UpdateCustomerInputDto custo = new UpdateCustomerInputDto() { Id = FrmCustomerManager.cm_CustoId, - CustomerNumber = txtCustoNo.Text, - CustomerName = txtCustoName.Text, - CustomerGender = Convert.ToInt32(cbSex.SelectedValue.ToString()), - DateOfBirth = DateOnly.FromDateTime(dtpBirthday.Value.Date), - CustomerType = Convert.ToInt32(cbCustoType.SelectedValue.ToString()), - PassportId = Convert.ToInt32(cbPassportType.SelectedValue), - IdCardNumber = txtCardID.Text, - CustomerPhoneNumber = txtTel.Text, - CustomerAddress = txtCustoAdress.Text, + CustomerNumber = txtCustomerId.Text, + CustomerName = txtCustomerName.Text, + CustomerGender = Convert.ToInt32(cboGender.SelectedValue.ToString()), + DateOfBirth = DateOnly.FromDateTime(Convert.ToDateTime(dtpDateOfBirth.Value).Date), + CustomerType = Convert.ToInt32(cboCustomerType.SelectedValue.ToString()), + PassportId = Convert.ToInt32(cboPassportType.SelectedValue), + IdCardNumber = txtCustomerCardID.Text, + CustomerPhoneNumber = txtCustomerTel.Text, + CustomerAddress = txtCustomerAddress.Text, IsDelete = 0, DataChgUsr = LoginInfo.WorkerNo, }; - result = HttpHelper.Request(ApiConstants.Customer_UpdCustomerInfo, HttpHelper.ModelToJson(custo)); + result = HttpHelper.Request(ApiConstants.Customer_UpdCustomerInfo, custo.ModelToJson()); var response = HttpHelper.JsonToModel(result.message); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - UIMessageBox.Show("修改失败", "系统提示", UIStyle.Red, UIMessageBoxButtons.OK); + NotificationService.ShowError("修改失败"); return; } - UIMessageBox.Show("修改成功", "系统提示", UIStyle.Green, UIMessageBoxButtons.OK); + NotificationService.ShowSuccess("修改成功"); #region 获取添加操作日志所需的信息 RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "修改了一名客户信息，客户编号为：" + custo.CustomerNumber, Common.Core.LogLevel.Critical); #endregion this.Close(); FrmCustomerManager.ReloadCustomer(false); - - foreach (Control Ctrol in this.Controls) - { - if (Ctrol is Sunny.UI.UITextBox) - { - Ctrol.Text = ""; - } - if (Ctrol is Sunny.UI.UIComboBox) - { - this.cbSex.SelectedIndex = 0; - this.cbCustoType.SelectedIndex = 0; - this.cbPassportType.SelectedIndex = 0; - } - } } private void FrmEditInputs_ButtonOkClick(object sender, EventArgs e) @@ -177,73 +159,52 @@ namespace EOM.TSHotelManagement.FormUI CreateCustomerInputDto custo = new CreateCustomerInputDto() { DataInsDate = DateTime.Now, - CustomerNumber = txtCustoNo.Text, - CustomerName = txtCustoName.Text, - CustomerGender = Convert.ToInt32(cbSex.SelectedValue.ToString()), - DateOfBirth = dtpBirthday.Value.Date, - CustomerType = Convert.ToInt32(cbCustoType.SelectedValue.ToString()), - PassportId = Convert.ToInt32(cbPassportType.SelectedValue.ToString()), - IdCardNumber = txtCardID.Text, - CustomerPhoneNumber = txtTel.Text, - CustomerAddress = txtCustoAdress.Text, + CustomerNumber = txtCustomerId.Text, + CustomerName = txtCustomerName.Text, + CustomerGender = Convert.ToInt32(cboGender.SelectedValue.ToString()), + DateOfBirth = Convert.ToDateTime(dtpDateOfBirth.Value).Date, + CustomerType = Convert.ToInt32(cboCustomerType.SelectedValue.ToString()), + PassportId = Convert.ToInt32(cboPassportType.SelectedValue.ToString()), + IdCardNumber = txtCustomerCardID.Text, + CustomerPhoneNumber = txtCustomerTel.Text, + CustomerAddress = txtCustomerAddress.Text, DataInsUsr = LoginInfo.WorkerNo, IsDelete = 0 }; - result = HttpHelper.Request(ApiConstants.Customer_InsertCustomerInfo, HttpHelper.ModelToJson(custo)); + result = HttpHelper.Request(ApiConstants.Customer_InsertCustomerInfo, custo.ModelToJson()); var response = HttpHelper.JsonToModel(result.message); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - UIMessageBox.Show($"添加失败\n{response.Message}", "系统提示", UIStyle.Red, UIMessageBoxButtons.OK); + NotificationService.ShowError($"添加失败\n{response.Message}"); return; } - UIMessageBox.Show("添加成功", "系统提示", UIStyle.Green, UIMessageBoxButtons.OK); + NotificationService.ShowSuccess("添加成功"); FrmCustomerManager.ReloadCustomer(false); #region 获取添加操作日志所需的信息 RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "添加了一名客户，客户编号为：" + custo.CustomerNumber, Common.Core.LogLevel.Critical); #endregion this.Close(); - - - foreach (Control Ctrol in this.Controls) - { - if (Ctrol is Sunny.UI.UITextBox) - { - Ctrol.Text = ""; - } - if (Ctrol is Sunny.UI.UIComboBox) - { - this.cbSex.SelectedIndex = 0; - this.cbCustoType.SelectedIndex = 0; - this.cbPassportType.SelectedIndex = 0; - } - } - } - - - private void FrmEditInputs_ButtonCancelClick(object sender, EventArgs e) - { - this.Close(); } private void txtCardID_Validated(object sender, EventArgs e) { //获取得到输入的身份证号码 - string identityCard = txtCardID.Text.Trim(); + string identityCard = txtCustomerCardID.Text.Trim(); - if (!cbPassportType.Text.ToString().Contains("身份证")) + if (!cboPassportType.Text.ToString().Contains("身份证")) { - dtpBirthday.Enabled = true; - dtpBirthday.ReadOnly = false; + dtpDateOfBirth.Enabled = true; + dtpDateOfBirth.ReadOnly = false; return; } if (string.IsNullOrEmpty(identityCard)) { //身份证号码不能为空，如果为空返回 - UIMessageBox.ShowError("身份证号码不能为空！"); - if (txtCardID.CanFocus) + NotificationService.ShowError("身份证号码不能为空！"); + if (txtCustomerCardID.CanFocus) { - txtCardID.Focus();//设置当前输入焦点为txtCardID_identityCard + txtCustomerCardID.Focus();//设置当前输入焦点为txtCardID_identityCard } return; } @@ -252,11 +213,7 @@ namespace EOM.TSHotelManagement.FormUI //身份证号码只能为15位或18位其它不合法 if (identityCard.Length != 15 && identityCard.Length != 18) { - UIMessageBox.ShowWarning("身份证号码为15位或18位，请检查！"); - if (txtCardID.CanFocus) - { - txtCardID.Focus(); - } + NotificationService.ShowWarning("身份证号码为15位或18位，请检查！"); return; } } @@ -264,36 +221,32 @@ namespace EOM.TSHotelManagement.FormUI if (identityCard.Length == 18) { var result = ApplicationUtil.SearchCode(identityCard); - if (result.message.IsNullOrEmpty()) //如果没有错误消息输出，则代表成功 + if (string.IsNullOrEmpty(result.message)) //如果没有错误消息输出，则代表成功 { try { - cbSex.Text = result.sex ?? string.Empty; - txtCustoAdress.Text = result.address ?? string.Empty; + cboGender.Text = result.sex ?? string.Empty; + txtCustomerAddress.Text = result.address ?? string.Empty; if (DateTime.TryParse(result.birthday, out DateTime parsedDate)) { - dtpBirthday.Value = parsedDate; + dtpDateOfBirth.Value = parsedDate; } else { - UIMessageBox.ShowError("请正确输入证件号码！"); + NotificationService.ShowError("请正确输入证件号码！"); return; } } catch { - UIMessageBox.ShowError("请正确输入证件号码！"); + NotificationService.ShowError("请正确输入证件号码！"); return; } - finally - { - cbPassportType.SelectedIndex = 0; - } } else { - UIMessageBox.ShowError(result.message); + NotificationService.ShowError(result.message); return; } } diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.resx index 79f7d218268707b7a8a373a6c304f22c06bddaac..a70dd336ed3503a079691d86a4b36368133755ee 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.resx +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmEditInputs.resx @@ -1,17 +1,17 @@  - diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmMySpace.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmMySpace.Designer.cs deleted file mode 100644 index 7c21ae0b90eebc6aac3201d553b053efa394f735..0000000000000000000000000000000000000000 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmMySpace.Designer.cs +++ /dev/null @@ -1,556 +0,0 @@ - -namespace EOM.TSHotelManagement.FormUI -{ - partial class FrmMySpace - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMySpace)); - label7 = new Label(); - btnUpdWorker = new Sunny.UI.UIButton(); - cbWorkerNation = new Sunny.UI.UIComboBox(); - label1 = new Label(); - cboWorkerClub = new Sunny.UI.UIComboBox(); - cboWorkerPosition = new Sunny.UI.UIComboBox(); - cboSex = new Sunny.UI.UIComboBox(); - txtWorkerNo = new Sunny.UI.UITextBox(); - txtWorkerName = new Sunny.UI.UITextBox(); - txtTel = new Sunny.UI.UITextBox(); - txtAddress = new Sunny.UI.UITextBox(); - label2 = new Label(); - label5 = new Label(); - label16 = new Label(); - label30 = new Label(); - label31 = new Label(); - label32 = new Label(); - openPic = new OpenFileDialog(); - uiTabControlMenu2 = new Sunny.UI.UITabControlMenu(); - tabPage1 = new TabPage(); - tabPage2 = new TabPage(); - avatar3 = new AntdUI.Avatar(); - txtOldPassword = new AntdUI.Input(); - lblEmployeeId = new AntdUI.Label(); - avatar2 = new AntdUI.Avatar(); - avatar1 = new AntdUI.Avatar(); - btnUpdatePassword = new AntdUI.Button(); - txtNewPassword = new AntdUI.Input(); - tabPage3 = new TabPage(); - label4 = new AntdUI.Label(); - picWorkerPic = new PictureBox(); - uiTabControlMenu2.SuspendLayout(); - tabPage1.SuspendLayout(); - tabPage2.SuspendLayout(); - tabPage3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)picWorkerPic).BeginInit(); - SuspendLayout(); - // - // label7 - // - label7.AutoSize = true; - label7.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label7.Location = new Point(58, 171); - label7.Name = "label7"; - label7.Size = new Size(88, 25); - label7.TabIndex = 131; - label7.Text = "联系方式"; - // - // btnUpdWorker - // - btnUpdWorker.Cursor = Cursors.Hand; - btnUpdWorker.Font = new Font("微软雅黑", 12F); - btnUpdWorker.Location = new Point(562, 270); - btnUpdWorker.MinimumSize = new Size(1, 1); - btnUpdWorker.Name = "btnUpdWorker"; - btnUpdWorker.Radius = 20; - btnUpdWorker.Size = new Size(109, 42); - btnUpdWorker.TabIndex = 130; - btnUpdWorker.Text = "修 改"; - btnUpdWorker.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - btnUpdWorker.Click += btnUpdWorker_Click; - // - // cbWorkerNation - // - cbWorkerNation.DataSource = null; - cbWorkerNation.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - cbWorkerNation.FillColor = Color.White; - cbWorkerNation.Font = new Font("微软雅黑", 15.75F); - cbWorkerNation.ItemHoverColor = Color.FromArgb(155, 200, 255); - cbWorkerNation.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - cbWorkerNation.Location = new Point(466, 116); - cbWorkerNation.Margin = new Padding(4, 5, 4, 5); - cbWorkerNation.MinimumSize = new Size(63, 0); - cbWorkerNation.Name = "cbWorkerNation"; - cbWorkerNation.Padding = new Padding(0, 0, 30, 2); - cbWorkerNation.Radius = 20; - cbWorkerNation.Size = new Size(203, 35); - cbWorkerNation.Style = Sunny.UI.UIStyle.Custom; - cbWorkerNation.SymbolSize = 24; - cbWorkerNation.TabIndex = 129; - cbWorkerNation.TextAlignment = ContentAlignment.MiddleLeft; - cbWorkerNation.Watermark = ""; - cbWorkerNation.SelectedIndexChanged += cbWorkerNation_SelectedIndexChanged; - // - // label1 - // - label1.AutoSize = true; - label1.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label1.Location = new Point(369, 119); - label1.Name = "label1"; - label1.Size = new Size(86, 25); - label1.TabIndex = 128; - label1.Text = "民 族"; - // - // cboWorkerClub - // - cboWorkerClub.DataSource = null; - cboWorkerClub.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - cboWorkerClub.FillColor = Color.White; - cboWorkerClub.Font = new Font("微软雅黑", 15.75F); - cboWorkerClub.ItemHoverColor = Color.FromArgb(155, 200, 255); - cboWorkerClub.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - cboWorkerClub.Location = new Point(467, 12); - cboWorkerClub.Margin = new Padding(4, 5, 4, 5); - cboWorkerClub.MinimumSize = new Size(63, 0); - cboWorkerClub.Name = "cboWorkerClub"; - cboWorkerClub.Padding = new Padding(0, 0, 30, 2); - cboWorkerClub.Radius = 20; - cboWorkerClub.ReadOnly = true; - cboWorkerClub.Size = new Size(203, 35); - cboWorkerClub.Style = Sunny.UI.UIStyle.Custom; - cboWorkerClub.SymbolSize = 24; - cboWorkerClub.TabIndex = 125; - cboWorkerClub.TextAlignment = ContentAlignment.MiddleLeft; - cboWorkerClub.Watermark = ""; - // - // cboWorkerPosition - // - cboWorkerPosition.DataSource = null; - cboWorkerPosition.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - cboWorkerPosition.FillColor = Color.White; - cboWorkerPosition.Font = new Font("微软雅黑", 15.75F); - cboWorkerPosition.ItemHoverColor = Color.FromArgb(155, 200, 255); - cboWorkerPosition.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - cboWorkerPosition.Location = new Point(467, 64); - cboWorkerPosition.Margin = new Padding(4, 5, 4, 5); - cboWorkerPosition.MinimumSize = new Size(63, 0); - cboWorkerPosition.Name = "cboWorkerPosition"; - cboWorkerPosition.Padding = new Padding(0, 0, 30, 2); - cboWorkerPosition.Radius = 20; - cboWorkerPosition.ReadOnly = true; - cboWorkerPosition.Size = new Size(203, 35); - cboWorkerPosition.Style = Sunny.UI.UIStyle.Custom; - cboWorkerPosition.SymbolSize = 24; - cboWorkerPosition.TabIndex = 124; - cboWorkerPosition.TextAlignment = ContentAlignment.MiddleLeft; - cboWorkerPosition.Watermark = ""; - // - // cboSex - // - cboSex.DataSource = null; - cboSex.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - cboSex.FillColor = Color.White; - cboSex.Font = new Font("微软雅黑", 15.75F); - cboSex.ItemHoverColor = Color.FromArgb(155, 200, 255); - cboSex.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - cboSex.Location = new Point(155, 116); - cboSex.Margin = new Padding(4, 5, 4, 5); - cboSex.MinimumSize = new Size(63, 0); - cboSex.Name = "cboSex"; - cboSex.Padding = new Padding(0, 0, 30, 2); - cboSex.Radius = 20; - cboSex.Size = new Size(203, 35); - cboSex.Style = Sunny.UI.UIStyle.Custom; - cboSex.SymbolSize = 24; - cboSex.TabIndex = 123; - cboSex.TextAlignment = ContentAlignment.MiddleLeft; - cboSex.Watermark = ""; - // - // txtWorkerNo - // - txtWorkerNo.Cursor = Cursors.IBeam; - txtWorkerNo.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtWorkerNo.Location = new Point(156, 12); - txtWorkerNo.Margin = new Padding(4, 5, 4, 5); - txtWorkerNo.MinimumSize = new Size(1, 1); - txtWorkerNo.Name = "txtWorkerNo"; - txtWorkerNo.Padding = new Padding(5); - txtWorkerNo.Radius = 20; - txtWorkerNo.ReadOnly = true; - txtWorkerNo.ShowText = false; - txtWorkerNo.Size = new Size(203, 35); - txtWorkerNo.Style = Sunny.UI.UIStyle.Custom; - txtWorkerNo.StyleCustomMode = true; - txtWorkerNo.TabIndex = 122; - txtWorkerNo.TextAlignment = ContentAlignment.MiddleLeft; - txtWorkerNo.Watermark = ""; - // - // txtWorkerName - // - txtWorkerName.Cursor = Cursors.IBeam; - txtWorkerName.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtWorkerName.Location = new Point(156, 64); - txtWorkerName.Margin = new Padding(4, 5, 4, 5); - txtWorkerName.MinimumSize = new Size(1, 1); - txtWorkerName.Name = "txtWorkerName"; - txtWorkerName.Padding = new Padding(5); - txtWorkerName.Radius = 20; - txtWorkerName.ShowText = false; - txtWorkerName.Size = new Size(203, 35); - txtWorkerName.Style = Sunny.UI.UIStyle.Custom; - txtWorkerName.StyleCustomMode = true; - txtWorkerName.TabIndex = 121; - txtWorkerName.TextAlignment = ContentAlignment.MiddleLeft; - txtWorkerName.Watermark = ""; - // - // txtTel - // - txtTel.Cursor = Cursors.IBeam; - txtTel.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtTel.Location = new Point(156, 164); - txtTel.Margin = new Padding(4, 5, 4, 5); - txtTel.MinimumSize = new Size(1, 1); - txtTel.Name = "txtTel"; - txtTel.Padding = new Padding(5); - txtTel.Radius = 20; - txtTel.ShowText = false; - txtTel.Size = new Size(515, 35); - txtTel.Style = Sunny.UI.UIStyle.Custom; - txtTel.StyleCustomMode = true; - txtTel.TabIndex = 119; - txtTel.TextAlignment = ContentAlignment.MiddleLeft; - txtTel.Watermark = ""; - // - // txtAddress - // - txtAddress.Cursor = Cursors.IBeam; - txtAddress.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtAddress.Location = new Point(156, 216); - txtAddress.Margin = new Padding(4, 5, 4, 5); - txtAddress.MinimumSize = new Size(1, 1); - txtAddress.Name = "txtAddress"; - txtAddress.Padding = new Padding(5); - txtAddress.Radius = 20; - txtAddress.ShowText = false; - txtAddress.Size = new Size(515, 35); - txtAddress.Style = Sunny.UI.UIStyle.Custom; - txtAddress.StyleCustomMode = true; - txtAddress.TabIndex = 117; - txtAddress.TextAlignment = ContentAlignment.MiddleLeft; - txtAddress.Watermark = ""; - // - // label2 - // - label2.AutoSize = true; - label2.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label2.Location = new Point(58, 221); - label2.Name = "label2"; - label2.Size = new Size(88, 25); - label2.TabIndex = 115; - label2.Text = "居住地址"; - // - // label5 - // - label5.AutoSize = true; - label5.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label5.Location = new Point(369, 69); - label5.Name = "label5"; - label5.Size = new Size(88, 25); - label5.TabIndex = 112; - label5.Text = "现任职位"; - // - // label16 - // - label16.AutoSize = true; - label16.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label16.Location = new Point(369, 18); - label16.Name = "label16"; - label16.Size = new Size(88, 25); - label16.TabIndex = 111; - label16.Text = "所在部门"; - // - // label30 - // - label30.AutoSize = true; - label30.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label30.Location = new Point(58, 119); - label30.Name = "label30"; - label30.Size = new Size(86, 25); - label30.TabIndex = 109; - label30.Text = "性 别"; - // - // label31 - // - label31.AutoSize = true; - label31.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label31.Location = new Point(58, 69); - label31.Name = "label31"; - label31.Size = new Size(88, 25); - label31.TabIndex = 108; - label31.Text = "员工姓名"; - // - // label32 - // - label32.AutoSize = true; - label32.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label32.Location = new Point(58, 18); - label32.Name = "label32"; - label32.Size = new Size(88, 25); - label32.TabIndex = 107; - label32.Text = "员工编号"; - // - // openPic - // - openPic.FileName = "openFileDialog1"; - openPic.Filter = "PNG文件|*.png|JPG文件|*.jpg|位图文件|*.bmp"; - openPic.FileOk += openPic_FileOk; - // - // uiTabControlMenu2 - // - uiTabControlMenu2.Alignment = TabAlignment.Left; - uiTabControlMenu2.Controls.Add(tabPage1); - uiTabControlMenu2.Controls.Add(tabPage2); - uiTabControlMenu2.Controls.Add(tabPage3); - uiTabControlMenu2.DrawMode = TabDrawMode.OwnerDrawFixed; - uiTabControlMenu2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiTabControlMenu2.Location = new Point(3, 38); - uiTabControlMenu2.MenuStyle = Sunny.UI.UIMenuStyle.Custom; - uiTabControlMenu2.Multiline = true; - uiTabControlMenu2.Name = "uiTabControlMenu2"; - uiTabControlMenu2.SelectedIndex = 0; - uiTabControlMenu2.Size = new Size(929, 546); - uiTabControlMenu2.SizeMode = TabSizeMode.Fixed; - uiTabControlMenu2.TabBackColor = Color.FromArgb(235, 243, 255); - uiTabControlMenu2.TabIndex = 15; - uiTabControlMenu2.TabSelectedColor = Color.Snow; - // - // tabPage1 - // - tabPage1.Controls.Add(label7); - tabPage1.Controls.Add(label32); - tabPage1.Controls.Add(btnUpdWorker); - tabPage1.Controls.Add(label31); - tabPage1.Controls.Add(cbWorkerNation); - tabPage1.Controls.Add(label30); - tabPage1.Controls.Add(label1); - tabPage1.Controls.Add(label16); - tabPage1.Controls.Add(cboWorkerClub); - tabPage1.Controls.Add(label5); - tabPage1.Controls.Add(cboWorkerPosition); - tabPage1.Controls.Add(label2); - tabPage1.Controls.Add(cboSex); - tabPage1.Controls.Add(txtAddress); - tabPage1.Controls.Add(txtWorkerNo); - tabPage1.Controls.Add(txtTel); - tabPage1.Controls.Add(txtWorkerName); - tabPage1.Location = new Point(201, 0); - tabPage1.Name = "tabPage1"; - tabPage1.Size = new Size(728, 546); - tabPage1.TabIndex = 0; - tabPage1.Text = "个人信息"; - tabPage1.UseVisualStyleBackColor = true; - // - // tabPage2 - // - tabPage2.Controls.Add(avatar3); - tabPage2.Controls.Add(txtOldPassword); - tabPage2.Controls.Add(lblEmployeeId); - tabPage2.Controls.Add(avatar2); - tabPage2.Controls.Add(avatar1); - tabPage2.Controls.Add(btnUpdatePassword); - tabPage2.Controls.Add(txtNewPassword); - tabPage2.Location = new Point(201, 0); - tabPage2.Name = "tabPage2"; - tabPage2.Size = new Size(728, 546); - tabPage2.TabIndex = 1; - tabPage2.Text = "账号安全"; - tabPage2.UseVisualStyleBackColor = true; - // - // avatar3 - // - avatar3.Image = (Image)resources.GetObject("avatar3.Image"); - avatar3.ImageFit = AntdUI.TFit.None; - avatar3.Location = new Point(224, 204); - avatar3.Name = "avatar3"; - avatar3.Size = new Size(45, 43); - avatar3.TabIndex = 47; - avatar3.Text = "a"; - // - // txtOldPassword - // - txtOldPassword.BackColor = Color.White; - txtOldPassword.Font = new Font("Microsoft YaHei UI", 14F); - txtOldPassword.Location = new Point(267, 201); - txtOldPassword.Name = "txtOldPassword"; - txtOldPassword.PasswordChar = '*'; - txtOldPassword.PasswordCopy = true; - txtOldPassword.PlaceholderColorExtend = ""; - txtOldPassword.PlaceholderText = ""; - txtOldPassword.Size = new Size(238, 52); - txtOldPassword.TabIndex = 46; - // - // lblEmployeeId - // - lblEmployeeId.Location = new Point(267, 131); - lblEmployeeId.Name = "lblEmployeeId"; - lblEmployeeId.Size = new Size(238, 43); - lblEmployeeId.TabIndex = 45; - lblEmployeeId.Text = ""; - lblEmployeeId.TextAlign = ContentAlignment.MiddleCenter; - // - // avatar2 - // - avatar2.Image = (Image)resources.GetObject("avatar2.Image"); - avatar2.ImageFit = AntdUI.TFit.None; - avatar2.Location = new Point(224, 284); - avatar2.Name = "avatar2"; - avatar2.Size = new Size(45, 43); - avatar2.TabIndex = 44; - avatar2.Text = "a"; - // - // avatar1 - // - avatar1.Image = (Image)resources.GetObject("avatar1.Image"); - avatar1.ImageFit = AntdUI.TFit.None; - avatar1.Location = new Point(224, 131); - avatar1.Name = "avatar1"; - avatar1.Size = new Size(45, 43); - avatar1.TabIndex = 43; - avatar1.Text = "a"; - // - // btnUpdatePassword - // - btnUpdatePassword.Font = new Font("Microsoft YaHei UI", 12F); - btnUpdatePassword.Location = new Point(277, 358); - btnUpdatePassword.Name = "btnUpdatePassword"; - btnUpdatePassword.Radius = 8; - btnUpdatePassword.Shape = AntdUI.TShape.Round; - btnUpdatePassword.Size = new Size(191, 57); - btnUpdatePassword.TabIndex = 42; - btnUpdatePassword.Text = "修改密码"; - btnUpdatePassword.Type = AntdUI.TTypeMini.Primary; - btnUpdatePassword.Click += btnUpdatePassword_Click; - // - // txtNewPassword - // - txtNewPassword.BackColor = Color.White; - txtNewPassword.Font = new Font("Microsoft YaHei UI", 14F); - txtNewPassword.Location = new Point(267, 280); - txtNewPassword.Name = "txtNewPassword"; - txtNewPassword.PasswordChar = '*'; - txtNewPassword.PasswordCopy = true; - txtNewPassword.PlaceholderColorExtend = ""; - txtNewPassword.PlaceholderText = ""; - txtNewPassword.Size = new Size(238, 52); - txtNewPassword.TabIndex = 41; - // - // tabPage3 - // - tabPage3.Controls.Add(label4); - tabPage3.Controls.Add(picWorkerPic); - tabPage3.Location = new Point(201, 0); - tabPage3.Name = "tabPage3"; - tabPage3.Size = new Size(728, 546); - tabPage3.TabIndex = 2; - tabPage3.Text = "账号头像"; - tabPage3.UseVisualStyleBackColor = true; - // - // label4 - // - label4.Location = new Point(257, 416); - label4.Name = "label4"; - label4.Size = new Size(215, 23); - label4.TabIndex = 1; - label4.Text = "Tips:头像大小不能超过1MB"; - // - // picWorkerPic - // - picWorkerPic.BackgroundImage = Properties.Resources.账号; - picWorkerPic.BackgroundImageLayout = ImageLayout.Stretch; - picWorkerPic.Location = new Point(257, 150); - picWorkerPic.Name = "picWorkerPic"; - picWorkerPic.Size = new Size(215, 246); - picWorkerPic.SizeMode = PictureBoxSizeMode.StretchImage; - picWorkerPic.TabIndex = 0; - picWorkerPic.TabStop = false; - picWorkerPic.Click += picWorkerPic_Click; - // - // FrmMySpace - // - AutoScaleMode = AutoScaleMode.None; - ClientSize = new Size(937, 589); - Controls.Add(uiTabControlMenu2); - Icon = (Icon)resources.GetObject("$this.Icon"); - MaximizeBox = false; - MinimizeBox = false; - Name = "FrmMySpace"; - ShowTitleIcon = true; - Text = "个人中心"; - ZoomScaleRect = new Rectangle(15, 15, 873, 587); - Load += FrmMySpace_Load; - uiTabControlMenu2.ResumeLayout(false); - tabPage1.ResumeLayout(false); - tabPage1.PerformLayout(); - tabPage2.ResumeLayout(false); - tabPage3.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)picWorkerPic).EndInit(); - ResumeLayout(false); - } - - #endregion - private Sunny.UI.UIComboBox cbWorkerNation; - private System.Windows.Forms.Label label1; - private Sunny.UI.UIComboBox cboWorkerClub; - private Sunny.UI.UIComboBox cboWorkerPosition; - private Sunny.UI.UIComboBox cboSex; - private Sunny.UI.UITextBox txtWorkerNo; - private Sunny.UI.UITextBox txtWorkerName; - private Sunny.UI.UITextBox txtTel; - private Sunny.UI.UITextBox txtAddress; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label16; - private System.Windows.Forms.Label label30; - private System.Windows.Forms.Label label31; - private System.Windows.Forms.Label label32; - private Sunny.UI.UIButton btnUpdWorker; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.OpenFileDialog openPic; - private Sunny.UI.UITabControlMenu uiTabControlMenu2; - private System.Windows.Forms.TabPage tabPage1; - private System.Windows.Forms.TabPage tabPage2; - private System.Windows.Forms.TabPage tabPage3; - private System.Windows.Forms.PictureBox picWorkerPic; - private AntdUI.Label label4; - private AntdUI.Label lblEmployeeId; - private AntdUI.Avatar avatar2; - private AntdUI.Avatar avatar1; - private AntdUI.Button btnUpdatePassword; - private AntdUI.Input txtNewPassword; - private AntdUI.Avatar avatar3; - private AntdUI.Input txtOldPassword; - } -} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmMySpace.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmMySpace.cs deleted file mode 100644 index 293ea2efb6f2c77944e93e186089fea4229f06a3..0000000000000000000000000000000000000000 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmMySpace.cs +++ /dev/null @@ -1,311 +0,0 @@ -/* - * MIT License - *Copyright (c) 2021 易开元(EOM) - - *Permission is hereby granted, free of charge, to any person obtaining a copy - *of this software and associated documentation files (the "Software"), to deal - *in the Software without restriction, including without limitation the rights - *to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - *copies of the Software, and to permit persons to whom the Software is - *furnished to do so, subject to the following conditions: - - *The above copyright notice and this permission notice shall be included in all - *copies or substantial portions of the Software. - - *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - *IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - *FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - *AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - *LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - *OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - *SOFTWARE. - * - */ - -using AntdUI; -using EOM.TSHotelManagement.Common; -using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Util; -using jvncorelib.EncryptorLib; -using jvncorelib.EntityLib; -using Sunny.UI; -using System.ComponentModel; - -namespace EOM.TSHotelManagement.FormUI -{ - public partial class FrmMySpace : UIForm - { - public FrmMySpace() - { - InitializeComponent(); - } - - EncryptLib encryptLib = new EncryptLib(); - private void FrmMySpace_Load(object sender, EventArgs e) - { - //加载民族信息 - Dictionary dic = new Dictionary - { - { nameof(ReadNationInputDto.IsDelete), "0" }, - { nameof(ReadNationInputDto.IgnorePaging), "true" } - }; - var result = HttpHelper.Request(ApiConstants.Base_SelectNationAll, dic); - var nations = HttpHelper.JsonToModel>(result.message); - if (nations.Code != BusinessStatusCode.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectNationAll}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - cbWorkerNation.DataSource = nations.Data.Items; - cbWorkerNation.DisplayMember = nameof(ReadNationOutputDto.NationName); - cbWorkerNation.ValueMember = nameof(ReadNationOutputDto.NationNumber); - //加载性别信息 - dic = new Dictionary - { - { nameof(ReadGenderTypeInputDto.IsDelete) , "0" }, - { nameof(ReadGenderTypeInputDto.IgnorePaging) , "true" } - }; - result = HttpHelper.Request(ApiConstants.Base_SelectGenderTypeAll, dic); - var genderTypes = HttpHelper.JsonToModel>(result.message); - if (genderTypes.Code != BusinessStatusCode.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectGenderTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - cboSex.DataSource = genderTypes.Data.Items; - cboSex.DisplayMember = nameof(ReadGenderTypeOutputDto.Description); - cboSex.ValueMember = nameof(ReadGenderTypeOutputDto.Id); - //加载部门信息 - result = HttpHelper.Request(ApiConstants.Base_SelectDeptAllCanUse); - var depts = HttpHelper.JsonToModel>(result.message); - if (depts.Code != BusinessStatusCode.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectDeptAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - cboWorkerClub.DataSource = depts.Data.Items; - cboWorkerClub.DisplayMember = nameof(ReadDepartmentOutputDto.DepartmentName); - cboWorkerClub.ValueMember = nameof(ReadDepartmentOutputDto.DepartmentNumber); - //加载职位信息 - dic = new Dictionary - { - { nameof(ReadPositionInputDto.IsDelete), "0" }, - { nameof(ReadPositionInputDto.IgnorePaging), "true" } - }; - result = HttpHelper.Request(ApiConstants.Base_SelectPositionAll, dic); - var positions = HttpHelper.JsonToModel>(result.message); - if (positions.Code != BusinessStatusCode.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectPositionAll}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - cboWorkerPosition.DataSource = positions.Data.Items; - cboWorkerPosition.DisplayMember = nameof(ReadPositionOutputDto.PositionName); - cboWorkerPosition.ValueMember = nameof(ReadPositionOutputDto.PositionNumber); - - lblEmployeeId.Text = LoginInfo.WorkerNo; - txtOldPassword.PlaceholderText = LocalizationHelper.GetLocalizedString("Please input old password", "请输入旧密码"); - txtNewPassword.PlaceholderText = LocalizationHelper.GetLocalizedString("Please input new password", "请输入新密码"); - - LoadData(); - } - - public void LoadData() - { - var dic = new Dictionary - { - { nameof(ReadEmployeeInputDto.EmployeeId) , LoginInfo.WorkerNo } - }; - var result = HttpHelper.Request(ApiConstants.Employee_SelectEmployeeInfoByEmployeeId, dic); - var employees = HttpHelper.JsonToModel>(result.message); - if (employees.Code != BusinessStatusCode.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Employee_SelectEmployeeInfoByEmployeeId}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - ReadEmployeeOutputDto worker = employees.Data; - if (!worker.IsNullOrEmpty()) - { - txtWorkerNo.Text = worker.EmployeeId; - txtWorkerName.Text = worker.EmployeeName; - cboSex.SelectedIndex = worker.Gender; - cboWorkerPosition.Text = worker.PositionName; - cboWorkerPosition.SelectedValue = worker.Position; - cboWorkerClub.Text = worker.DepartmentName; - cboWorkerClub.SelectedValue = worker.Department; - cbWorkerNation.Text = worker.EthnicityName; - cbWorkerNation.SelectedValue = worker.Ethnicity; - txtAddress.Text = worker.Address; - txtTel.Text = worker.PhoneNumber; - } - dic = new Dictionary - { - { nameof(ReadEmployeePhotoInputDto.EmployeeId) , LoginInfo.WorkerNo } - }; - result = HttpHelper.Request(ApiConstants.EmployeePhoto_EmployeePhoto, dic); - var workerPic = HttpHelper.JsonToModel>(result.message); - if (workerPic.Code != BusinessStatusCode.Success) - { - UIMessageBox.ShowError($"{ApiConstants.EmployeePhoto_EmployeePhoto}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - var workerPicData = workerPic.Data; - if (workerPicData != null && !string.IsNullOrEmpty(workerPicData.PhotoPath)) - { - picWorkerPic.BackgroundImage = null; - if (!string.IsNullOrEmpty(workerPicData.PhotoPath)) picWorkerPic.Load(workerPicData.PhotoPath); - } - } - - public bool CheckInput(UpdateEmployeeInputDto worker) - { - if (string.IsNullOrWhiteSpace(worker.EmployeeId)) - { - return false; - } - if (string.IsNullOrWhiteSpace(worker.EmployeeName)) - { - return false; - } - if (string.IsNullOrWhiteSpace(worker.Gender + "")) - { - return false; - } - if (string.IsNullOrWhiteSpace(worker.Ethnicity)) - { - return false; - } - if (string.IsNullOrWhiteSpace(worker.PhoneNumber)) - { - return false; - } - if (string.IsNullOrWhiteSpace(worker.Address)) - { - return false; - } - return true; - } - ResponseMsg result = new ResponseMsg(); - private void btnUpdWorker_Click(object sender, EventArgs e) - { - UpdateEmployeeInputDto worker = new UpdateEmployeeInputDto() - { - EmployeeId = txtWorkerNo.Text.Trim(), - EmployeeName = txtWorkerName.Text.Trim(), - Gender = cboSex.Text == "男" ? 1 : 0, - Ethnicity = cbWorkerNation.SelectedValue.ToString(), - PhoneNumber = txtTel.Text.Trim(), - Address = txtAddress.Text.Trim(), - DataChgUsr = LoginInfo.WorkerNo, - DataChgDate = DateTime.Now - }; - - if (CheckInput(worker)) - { - result = HttpHelper.Request(ApiConstants.Employee_UpdateEmployee, HttpHelper.ModelToJson(worker)); - var response = HttpHelper.JsonToModel(result.message); - if (response.Code != BusinessStatusCode.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Employee_UpdateEmployee}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - UIMessageBox.Show("修改成功！", "系统提示", UIStyle.Green, UIMessageBoxButtons.OK); - #region 获取添加操作日志所需的信息 - RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "修改个人信息操作！", Common.Core.LogLevel.Warning); - #endregion - LoadData(); - return; - } - } - - private void cbWorkerNation_SelectedIndexChanged(object sender, EventArgs e) - { - } - - private void picWorkerPic_Click(object sender, EventArgs e) - { - openPic.ShowDialog(); - } - - private void openPic_FileOk(object sender, CancelEventArgs e) - { - var dic = new Dictionary - { - { nameof(ReadEmployeePhotoInputDto.EmployeeId) , LoginInfo.WorkerNo } - }; - result = HttpHelper.Request(ApiConstants.EmployeePhoto_EmployeePhoto, dic); - var workerPic = HttpHelper.JsonToModel>(result.message); - if (workerPic.Code != BusinessStatusCode.Success) - { - UIMessageBox.ShowError($"{ApiConstants.EmployeePhoto_EmployeePhoto}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - var workerPicData = workerPic.Data; - if (!workerPicData.IsNullOrEmpty() && !string.IsNullOrEmpty(workerPicData.PhotoPath)) - { - result = HttpHelper.Request(ApiConstants.EmployeePhoto_DeleteWorkerPhoto, HttpHelper.ModelToJson(workerPic)); - var response = HttpHelper.JsonToModel(result.message); - if (response.Code != BusinessStatusCode.Success) - { - UIMessageBox.ShowError($"{ApiConstants.EmployeePhoto_DeleteWorkerPhoto}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - PicHandler(); - } - else - { - PicHandler(); - } - - } - - public void PicHandler() - { - Dictionary additionalParams = new Dictionary - { - { nameof(CreateEmployeePhotoInputDto.EmployeeId), txtWorkerNo.Text.Trim() } - }; - - var workerPic = new CreateEmployeePhotoInputDto - { - EmployeeId = txtWorkerNo.Text.Trim(), - PhotoUrl = null, - }; - var requestResult = HttpHelper.UploadFile(ApiConstants.EmployeePhoto_InsertWorkerPhoto, openPic.FileName, additionalParams); - var response = HttpHelper.JsonToModel>(requestResult.message); - if (response.Code != BusinessStatusCode.Success) - { - UIMessageBox.ShowError($"{response.Message}:{ApiConstants.EmployeePhoto_InsertWorkerPhoto}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - UIMessageTip.ShowOk("头像上传成功！稍等将会加载头像哦.."); - picWorkerPic.Load(response.Data.PhotoPath); - } - - private void btnUpdatePassword_Click(object sender, EventArgs e) - { - if (string.IsNullOrEmpty(txtOldPassword.Text) || string.IsNullOrEmpty(txtNewPassword.Text)) - { - AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString("Please input new password or old password", "请输入旧密码或新密码"), TType.Error); - return; - } - - var request = HttpHelper.Request(ApiConstants.Employee_UpdateEmployeeAccountPassword, HttpHelper.ModelToJson(new UpdateEmployeeInputDto - { - EmployeeId = LoginInfo.WorkerNo, - OldPassword = txtOldPassword.Text.Trim(), - Password = txtNewPassword.Text.Trim(), - DataChgDate = DateTime.Now, - DataChgUsr = LoginInfo.WorkerNo - })); - var response = HttpHelper.JsonToModel(request.message); - if (response.Code != BusinessStatusCode.Success) - { - AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString($"{ApiConstants.Employee_UpdateEmployeeAccountPassword}+Interface service exception, please submit an issue or try updating the version!", $"{ApiConstants.Employee_UpdateEmployeeAccountPassword}+接口服务异常，请提交Issue或尝试更新版本！")); - return; - } - AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString("Update password success", "更新密码成功"), TType.Success); - return; - } - } -} diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.Designer.cs new file mode 100644 index 0000000000000000000000000000000000000000..6509ecaa4ba89dcafaec4b762fc431b88ec059b2 --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.Designer.cs @@ -0,0 +1,282 @@ +namespace EOM.TSHotelManagement.FormUI +{ + partial class FrmPersonnelInfo + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmPersonnelInfo)); + label7 = new Label(); + label5 = new Label(); + label32 = new Label(); + label31 = new Label(); + label30 = new Label(); + label1 = new Label(); + label2 = new Label(); + label16 = new Label(); + txtEmployeeId = new AntdUI.Input(); + txtEmployeeName = new AntdUI.Input(); + txtEmployeeAddress = new AntdUI.Input(); + txtEmployeeTel = new AntdUI.Input(); + btnUpdate = new AntdUI.Button(); + cboGender = new AntdUI.Select(); + cboEmployeeNation = new AntdUI.Select(); + cboEmployeePosition = new AntdUI.Select(); + cboEmployeeDepartment = new AntdUI.Select(); + ucWindowHeader1 = new ucWindowHeader(); + SuspendLayout(); + // + // label7 + // + label7.AutoSize = true; + label7.Font = new Font("Noto Sans SC", 14.2499981F); + label7.Location = new Point(18, 214); + label7.Name = "label7"; + label7.Size = new Size(85, 19); + label7.TabIndex = 148; + label7.Text = "联系方式"; + // + // label5 + // + label5.AutoSize = true; + label5.Font = new Font("Noto Sans SC", 14.2499981F); + label5.Location = new Point(329, 112); + label5.Name = "label5"; + label5.Size = new Size(85, 19); + label5.TabIndex = 136; + label5.Text = "现任职位"; + // + // label32 + // + label32.AutoSize = true; + label32.Font = new Font("Noto Sans SC", 14.2499981F); + label32.Location = new Point(18, 61); + label32.Name = "label32"; + label32.Size = new Size(85, 19); + label32.TabIndex = 132; + label32.Text = "员工编号"; + // + // label31 + // + label31.AutoSize = true; + label31.Font = new Font("Noto Sans SC", 14.2499981F); + label31.Location = new Point(18, 112); + label31.Name = "label31"; + label31.Size = new Size(85, 19); + label31.TabIndex = 133; + label31.Text = "员工姓名"; + // + // label30 + // + label30.AutoSize = true; + label30.Font = new Font("Noto Sans SC", 14.2499981F); + label30.Location = new Point(18, 162); + label30.Name = "label30"; + label30.Size = new Size(77, 19); + label30.TabIndex = 134; + label30.Text = "性 别"; + // + // label1 + // + label1.AutoSize = true; + label1.Font = new Font("Noto Sans SC", 14.2499981F); + label1.Location = new Point(329, 162); + label1.Name = "label1"; + label1.Size = new Size(77, 19); + label1.TabIndex = 145; + label1.Text = "民 族"; + // + // label2 + // + label2.AutoSize = true; + label2.Font = new Font("Noto Sans SC", 14.2499981F); + label2.Location = new Point(18, 264); + label2.Name = "label2"; + label2.Size = new Size(85, 19); + label2.TabIndex = 137; + label2.Text = "居住地址"; + // + // label16 + // + label16.AutoSize = true; + label16.Font = new Font("Noto Sans SC", 14.2499981F); + label16.Location = new Point(329, 61); + label16.Name = "label16"; + label16.Size = new Size(85, 19); + label16.TabIndex = 135; + label16.Text = "所在部门"; + // + // txtEmployeeId + // + txtEmployeeId.Font = new Font("Noto Sans SC", 12F); + txtEmployeeId.Location = new Point(103, 51); + txtEmployeeId.Name = "txtEmployeeId"; + txtEmployeeId.ReadOnly = true; + txtEmployeeId.Size = new Size(205, 45); + txtEmployeeId.TabIndex = 149; + // + // txtEmployeeName + // + txtEmployeeName.Font = new Font("Noto Sans SC", 12F); + txtEmployeeName.Location = new Point(103, 102); + txtEmployeeName.Name = "txtEmployeeName"; + txtEmployeeName.Size = new Size(205, 45); + txtEmployeeName.TabIndex = 150; + // + // txtEmployeeAddress + // + txtEmployeeAddress.Font = new Font("Noto Sans SC", 12F); + txtEmployeeAddress.Location = new Point(103, 251); + txtEmployeeAddress.Name = "txtEmployeeAddress"; + txtEmployeeAddress.Size = new Size(515, 45); + txtEmployeeAddress.TabIndex = 151; + // + // txtEmployeeTel + // + txtEmployeeTel.Font = new Font("Noto Sans SC", 12F); + txtEmployeeTel.Location = new Point(104, 202); + txtEmployeeTel.Name = "txtEmployeeTel"; + txtEmployeeTel.Size = new Size(515, 45); + txtEmployeeTel.TabIndex = 152; + // + // btnUpdate + // + btnUpdate.Font = new Font("Noto Sans SC", 12F); + btnUpdate.Location = new Point(530, 302); + btnUpdate.Name = "btnUpdate"; + btnUpdate.Size = new Size(87, 43); + btnUpdate.TabIndex = 157; + btnUpdate.Text = "修 改"; + btnUpdate.Type = AntdUI.TTypeMini.Info; + btnUpdate.Click += btnUpdate_Click; + // + // cboGender + // + cboGender.Font = new Font("Noto Sans SC", 12F); + cboGender.List = true; + cboGender.ListAutoWidth = true; + cboGender.Location = new Point(103, 152); + cboGender.Name = "cboGender"; + cboGender.Placement = AntdUI.TAlignFrom.Bottom; + cboGender.Size = new Size(205, 45); + cboGender.TabIndex = 175; + // + // cboEmployeeNation + // + cboEmployeeNation.Font = new Font("Noto Sans SC", 12F); + cboEmployeeNation.List = true; + cboEmployeeNation.ListAutoWidth = true; + cboEmployeeNation.Location = new Point(413, 152); + cboEmployeeNation.Name = "cboEmployeeNation"; + cboEmployeeNation.Placement = AntdUI.TAlignFrom.Bottom; + cboEmployeeNation.Size = new Size(204, 45); + cboEmployeeNation.TabIndex = 176; + // + // cboEmployeePosition + // + cboEmployeePosition.Font = new Font("Noto Sans SC", 12F); + cboEmployeePosition.List = true; + cboEmployeePosition.ListAutoWidth = true; + cboEmployeePosition.Location = new Point(413, 102); + cboEmployeePosition.Name = "cboEmployeePosition"; + cboEmployeePosition.Placement = AntdUI.TAlignFrom.Bottom; + cboEmployeePosition.Size = new Size(205, 45); + cboEmployeePosition.TabIndex = 177; + // + // cboEmployeeDepartment + // + cboEmployeeDepartment.Font = new Font("Noto Sans SC", 12F); + cboEmployeeDepartment.List = true; + cboEmployeeDepartment.ListAutoWidth = true; + cboEmployeeDepartment.Location = new Point(413, 51); + cboEmployeeDepartment.Name = "cboEmployeeDepartment"; + cboEmployeeDepartment.Placement = AntdUI.TAlignFrom.Bottom; + cboEmployeeDepartment.Size = new Size(205, 45); + cboEmployeeDepartment.TabIndex = 178; + // + // ucWindowHeader1 + // + ucWindowHeader1.Location = new Point(-1, -1); + ucWindowHeader1.Name = "ucWindowHeader1"; + ucWindowHeader1.Size = new Size(639, 35); + ucWindowHeader1.TabIndex = 179; + // + // FrmPersonnelInfo + // + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.FromArgb(235, 243, 255); + ClientSize = new Size(637, 359); + Controls.Add(ucWindowHeader1); + Controls.Add(cboEmployeeDepartment); + Controls.Add(cboEmployeePosition); + Controls.Add(cboEmployeeNation); + Controls.Add(cboGender); + Controls.Add(btnUpdate); + Controls.Add(txtEmployeeTel); + Controls.Add(txtEmployeeAddress); + Controls.Add(txtEmployeeName); + Controls.Add(txtEmployeeId); + Controls.Add(label7); + Controls.Add(label5); + Controls.Add(label32); + Controls.Add(label31); + Controls.Add(label30); + Controls.Add(label1); + Controls.Add(label2); + Controls.Add(label16); + FormBorderStyle = FormBorderStyle.FixedSingle; + Icon = (Icon)resources.GetObject("$this.Icon"); + Name = "FrmPersonnelInfo"; + StartPosition = FormStartPosition.CenterScreen; + Text = "FrmPersonnelInfo"; + Load += FrmPersonnelInfo_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label label7; + private Label label5; + private Label label32; + private Label label31; + private Label label30; + private Label label1; + private Label label2; + private Label label16; + private AntdUI.Input txtEmployeeId; + private AntdUI.Input txtEmployeeName; + private AntdUI.Input txtEmployeeAddress; + private AntdUI.Input txtEmployeeTel; + private AntdUI.Button btnUpdate; + private AntdUI.Select cboGender; + private AntdUI.Select cboEmployeeNation; + private AntdUI.Select cboEmployeePosition; + private AntdUI.Select cboEmployeeDepartment; + private ucWindowHeader ucWindowHeader1; + } +} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.cs new file mode 100644 index 0000000000000000000000000000000000000000..f30ffe8b32a84d91384640b28e7d5e81ade24bb6 --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.cs @@ -0,0 +1,170 @@ +using AntdUI; +using EOM.TSHotelManagement.Common; +using EOM.TSHotelManagement.Common.Contract; +using jvncorelib.EntityLib; +using System.Data; + +namespace EOM.TSHotelManagement.FormUI +{ + public partial class FrmPersonnelInfo : Window + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmPersonnelInfo)); + public FrmPersonnelInfo() + { + InitializeComponent(); + + ucWindowHeader1.ApplySettingsWithoutMinimize("我的信息", string.Empty, (Image)resources.GetObject("FrmPersonnelInfo.Icon")!); + } + + private void FrmPersonnelInfo_Load(object sender, EventArgs e) + { + + //加载民族信息 + Dictionary dic = new Dictionary + { + { nameof(ReadNationInputDto.IsDelete), "0" }, + { nameof(ReadNationInputDto.IgnorePaging), "true" } + }; + var result = HttpHelper.Request(ApiConstants.Base_SelectNationAll, dic); + var nations = HttpHelper.JsonToModel>(result.message); + if (nations.Success == false) + { + NotificationService.ShowError($"{ApiConstants.Base_SelectNationAll}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + cboEmployeeNation.Items.AddRange(nations.Data.Items.Select(item => new AntdUI.SelectItem(item.NationName, item.NationNumber)).ToArray()); + //加载性别信息 + dic = new Dictionary + { + { nameof(ReadGenderTypeInputDto.IsDelete) , "0" }, + { nameof(ReadGenderTypeInputDto.IgnorePaging) , "true" } + }; + result = HttpHelper.Request(ApiConstants.Base_SelectGenderTypeAll, dic); + var genderTypes = HttpHelper.JsonToModel>(result.message); + if (genderTypes.Success == false) + { + NotificationService.ShowError($"{ApiConstants.Base_SelectGenderTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + cboGender.Items.AddRange(genderTypes.Data.Items.Select(item => new AntdUI.SelectItem(item.Description, item.Id)).ToArray()); + //加载部门信息 + result = HttpHelper.Request(ApiConstants.Base_SelectDeptAllCanUse); + var depts = HttpHelper.JsonToModel>(result.message); + if (depts.Success == false) + { + NotificationService.ShowError($"{ApiConstants.Base_SelectDeptAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + cboEmployeeDepartment.Items.AddRange(depts.Data.Items.Select(item => new AntdUI.SelectItem(item.DepartmentName, item.DepartmentNumber)).ToArray()); + //加载职位信息 + dic = new Dictionary + { + { nameof(ReadPositionInputDto.IsDelete), "0" }, + { nameof(ReadPositionInputDto.IgnorePaging), "true" } + }; + result = HttpHelper.Request(ApiConstants.Base_SelectPositionAll, dic); + var positions = HttpHelper.JsonToModel>(result.message); + if (positions.Success == false) + { + NotificationService.ShowError($"{ApiConstants.Base_SelectPositionAll}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + cboEmployeePosition.Items.AddRange(positions.Data.Items.Select(item => new AntdUI.SelectItem(item.PositionName, item.PositionNumber)).ToArray()); + + LoadPersonnelInfo(); + } + + private void LoadPersonnelInfo() + { + var dic = new Dictionary + { + { nameof(ReadEmployeeInputDto.EmployeeId) , LoginInfo.WorkerNo } + }; + var result = HttpHelper.Request(ApiConstants.Employee_SelectEmployeeInfoByEmployeeId, dic); + var employees = HttpHelper.JsonToModel>(result.message); + if (employees.Success == false) + { + NotificationService.ShowError($"{ApiConstants.Employee_SelectEmployeeInfoByEmployeeId}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + ReadEmployeeOutputDto worker = employees.Data; + if (!worker.IsNullOrEmpty()) + { + txtEmployeeId.Text = worker.EmployeeId; + txtEmployeeName.Text = worker.EmployeeName; + cboGender.SelectedValue = worker.Gender; + cboEmployeePosition.Text = worker.PositionName; + cboEmployeePosition.SelectedValue = worker.Position; + cboEmployeeDepartment.Text = worker.DepartmentName; + cboEmployeeDepartment.SelectedValue = worker.Department; + cboEmployeeNation.Text = worker.EthnicityName; + cboEmployeeNation.SelectedValue = worker.Ethnicity; + txtEmployeeAddress.Text = worker.Address; + txtEmployeeTel.Text = worker.PhoneNumber; + } + Refresh(); + } + + public bool CheckInput(UpdateEmployeeInputDto worker) + { + if (string.IsNullOrWhiteSpace(worker.EmployeeId)) + { + return false; + } + if (string.IsNullOrWhiteSpace(worker.EmployeeName)) + { + return false; + } + if (string.IsNullOrWhiteSpace(worker.Gender + "")) + { + return false; + } + if (string.IsNullOrWhiteSpace(worker.Ethnicity)) + { + return false; + } + if (string.IsNullOrWhiteSpace(worker.PhoneNumber)) + { + return false; + } + if (string.IsNullOrWhiteSpace(worker.Address)) + { + return false; + } + return true; + } + + ResponseMsg result = new ResponseMsg(); + private void btnUpdate_Click(object sender, EventArgs e) + { + UpdateEmployeeInputDto worker = new UpdateEmployeeInputDto() + { + EmployeeId = txtEmployeeId.Text.Trim(), + EmployeeName = txtEmployeeName.Text.Trim(), + Gender = cboGender.Text == "男" ? 1 : 0, + Ethnicity = cboEmployeeNation.SelectedValue.ToString(), + PhoneNumber = txtEmployeeTel.Text.Trim(), + Address = txtEmployeeAddress.Text.Trim(), + DataChgUsr = LoginInfo.WorkerNo, + DataChgDate = DateTime.Now + }; + + if (CheckInput(worker)) + { + result = HttpHelper.Request(ApiConstants.Employee_UpdateEmployee, worker.ModelToJson()); + var response = HttpHelper.JsonToModel(result.message); + if (response.Success == false) + { + NotificationService.ShowError($"{ApiConstants.Employee_UpdateEmployee}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + NotificationService.ShowSuccess("修改成功！"); + #region 获取添加操作日志所需的信息 + RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "修改个人信息操作！", Common.Core.LogLevel.Warning); + #endregion + LoadPersonnelInfo(); + return; + } + } + } +} diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.resx new file mode 100644 index 0000000000000000000000000000000000000000..e072779bb13c5f4e65afc2344f9f08d4cc044486 --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmPersonnelInfo.resx @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + AAABAAEAICAAAAEAGAASBAAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAAFz + UkdCAK7OHOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA7DAAAOwwHHb6hkAAADp0lEQVRYR7WXWYhP + URzHx5pliGEkSyhJeCCJZHsgpSxZx5pkT0h2CYkHpQYJKeRBliyFEoMiWVIj2bLmwYOdeCDM+HzP/c5/ + TPP3n/u/xrc+nXN+27n/+7/3nHNz4qqkpKQrTIYNcBwOwurS0tJxkOuw/yMmGgsPmSit8N2CPg6vXlF4 + IXN88kQ3oBAKYA7swnzbvg8w1WnVIwqOhMfwFpYwTxO7Kgjfcl+E7lJ7m/9NKkTB/fAN5tmcVvjrw274 + CtttTi4mr02hKfAOTkEXu/4qYtrAK3gBBTYnEwXyYQs8gfE2ZxRxjWErvId1NicTBTqBXrVr0N/mjOKu + 1SN2JvyEQzYnEwX6QDHo9neyOaO4gJrE9qXVw3gZ2tmVvUjuBXq3z0MPmzOKeesQO9IXUASt7MpeJHeD + c3AHhtmcUcQ1ZO6VvoAzUN+u7EVya9gJeguWxinGvM2JOw16FQttTi6KaPnV6vYcRtucVkyu2z/fv/4Z + jLEruagVFiIXvQK97aokQgY57iPNepv/XRTU23DZxV/DNrr9oJ79w2GP/BL94pBYnaLoANAd+OV5NNFT + +AwlHv+AY3Rr0HaEjTDBJXSHujNeDAPoh4uPJYKbkDQD7tP/q/B/oRkMs+k/sO0BTKTbk/asba9p1tPm + eYr0IiCfQBW76cTvoGX5JKyDYTAa1uI+SqsluFCxcUSs7lAjT1dR+PXwHY5CQ/B1GAENHVJJhGnzKogy + qhaxu2kqb+0YW8IBB2lXWwVt7c4oUtorL46ouYimgVMjYdD/rROOAh7TjLOrShFbVxer3DIxfgl7QQua + 6qXE+AQ0c3qqwAo7tafPtatKEatnoli5ZWJ8laazQxSjrfpI5I3EuIhmegigkwu3MWrlWxOMMaVif4r8 + tAcSbGGDc1hKZU69atrHr0J+MMaU66RE/l2annanhF3HtjNRVLnKnBfpf6JdHAxZKCpTLmroYDrI7pSw + t4DzUVS55BiiDq02nQ6Ojy1y7oVKFuM3sMzulHCNwl7h20JjFVgAWmg2OTYrkZcHkyCsdhJ9TTTKIYrR + V5UeuiD6OkFPhTw5d8BX7JVuWzYiv8I6QE0d5x/BXdf/U1q2a4VEnDp2fQyDhFIxagwPpWOI2Ak0dUMy + g5eRObH0+uoB074QS8RuhmgvoPPC9sSiRg/oAJdskk3rgf7rbRB2SIm+zosD6dYJF0BH/51ONImgWOqr + iXEu42lwAVbYrB85FPbBLGKa2oxycn4DnUXgUUEkWqsAAAAASUVORK5CYII= + + + \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmProgress.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmProgress.Designer.cs index b8e70e1501139842b7fb07c79e8b427603cf5327..319a074e8bfe32583ce58c216578ef098144b488 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmProgress.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmProgress.Designer.cs @@ -35,6 +35,7 @@ // spin1 // spin1.BackColor = Color.Transparent; + spin1.Font = new Font("Noto Sans SC", 10F); spin1.Location = new Point(7, 13); spin1.Name = "spin1"; spin1.Size = new Size(141, 84); @@ -49,7 +50,7 @@ BackColor = Color.FromArgb(235, 243, 255); ClientSize = new Size(155, 110); Controls.Add(spin1); - FormBorderStyle = FormBorderStyle.None; + FormBorderStyle = FormBorderStyle.FixedSingle; Icon = (Icon)resources.GetObject("$this.Icon"); MaximizeBox = false; MinimizeBox = false; diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.Designer.cs index ea0c6c50c40701283f59008f249fd65d055185ca..0611e42b986340c964218979c5c080ed8cde85ae 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.Designer.cs @@ -29,15 +29,6 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmReserList)); - cbCustoType = new Sunny.UI.UIComboBox(); - cbPassportType = new Sunny.UI.UIComboBox(); - cbSex = new Sunny.UI.UIComboBox(); - txtCustoNo = new Sunny.UI.UITextBox(); - txtCustoName = new Sunny.UI.UITextBox(); - txtCardID = new Sunny.UI.UITextBox(); - txtTel = new Sunny.UI.UITextBox(); - dtpBirthday = new Sunny.UI.UIDatePicker(); - txtCustoAdress = new Sunny.UI.UITextBox(); label10 = new Label(); label9 = new Label(); label8 = new Label(); @@ -47,303 +38,125 @@ label4 = new Label(); label3 = new Label(); label2 = new Label(); - btnSelect = new Sunny.UI.UIButton(); dgvReserList = new AntdUI.Table(); btnPg = new AntdUI.Pagination(); + ucWindowHeader1 = new ucWindowHeader(); + btnOk = new AntdUI.Button(); + txtCustomerName = new AntdUI.Input(); + txtCustomerId = new AntdUI.Input(); + txtCustomerAddress = new AntdUI.Input(); + txtCustomerTel = new AntdUI.Input(); + txtCustomerCardID = new AntdUI.Input(); + dtpDateOfBirth = new AntdUI.DatePicker(); + cboCustomerType = new AntdUI.Select(); + cboPassportType = new AntdUI.Select(); + cboGender = new AntdUI.Select(); SuspendLayout(); // - // cbCustoType - // - cbCustoType.DataSource = null; - cbCustoType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - cbCustoType.FillColor = Color.White; - cbCustoType.Font = new Font("微软雅黑", 15.75F); - cbCustoType.ItemHoverColor = Color.FromArgb(155, 200, 255); - cbCustoType.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - cbCustoType.Location = new Point(499, 290); - cbCustoType.Margin = new Padding(4, 5, 4, 5); - cbCustoType.MinimumSize = new Size(63, 0); - cbCustoType.Name = "cbCustoType"; - cbCustoType.Padding = new Padding(0, 0, 30, 2); - cbCustoType.Radius = 20; - cbCustoType.ReadOnly = true; - cbCustoType.Size = new Size(250, 35); - cbCustoType.SymbolSize = 24; - cbCustoType.TabIndex = 134; - cbCustoType.TextAlignment = ContentAlignment.MiddleLeft; - cbCustoType.Watermark = ""; - // - // cbPassportType - // - cbPassportType.DataSource = null; - cbPassportType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - cbPassportType.FillColor = Color.White; - cbPassportType.Font = new Font("微软雅黑", 15.75F); - cbPassportType.ItemHoverColor = Color.FromArgb(155, 200, 255); - cbPassportType.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - cbPassportType.Location = new Point(499, 341); - cbPassportType.Margin = new Padding(4, 5, 4, 5); - cbPassportType.MinimumSize = new Size(63, 0); - cbPassportType.Name = "cbPassportType"; - cbPassportType.Padding = new Padding(0, 0, 30, 2); - cbPassportType.Radius = 20; - cbPassportType.Size = new Size(250, 35); - cbPassportType.SymbolSize = 24; - cbPassportType.TabIndex = 133; - cbPassportType.TextAlignment = ContentAlignment.MiddleLeft; - cbPassportType.Watermark = ""; - // - // cbSex - // - cbSex.DataSource = null; - cbSex.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - cbSex.FillColor = Color.White; - cbSex.Font = new Font("微软雅黑", 15.75F); - cbSex.ItemHoverColor = Color.FromArgb(155, 200, 255); - cbSex.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - cbSex.Location = new Point(123, 397); - cbSex.Margin = new Padding(4, 5, 4, 5); - cbSex.MinimumSize = new Size(63, 0); - cbSex.Name = "cbSex"; - cbSex.Padding = new Padding(0, 0, 30, 2); - cbSex.Radius = 20; - cbSex.Size = new Size(250, 35); - cbSex.SymbolSize = 24; - cbSex.TabIndex = 132; - cbSex.TextAlignment = ContentAlignment.MiddleLeft; - cbSex.Watermark = ""; - // - // txtCustoNo - // - txtCustoNo.Cursor = Cursors.IBeam; - txtCustoNo.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustoNo.Location = new Point(123, 293); - txtCustoNo.Margin = new Padding(4, 5, 4, 5); - txtCustoNo.MinimumSize = new Size(1, 1); - txtCustoNo.Name = "txtCustoNo"; - txtCustoNo.Padding = new Padding(5); - txtCustoNo.Radius = 20; - txtCustoNo.ReadOnly = true; - txtCustoNo.ShowText = false; - txtCustoNo.Size = new Size(250, 35); - txtCustoNo.Style = Sunny.UI.UIStyle.Custom; - txtCustoNo.StyleCustomMode = true; - txtCustoNo.TabIndex = 131; - txtCustoNo.TextAlignment = ContentAlignment.MiddleLeft; - txtCustoNo.Watermark = ""; - // - // txtCustoName - // - txtCustoName.Cursor = Cursors.IBeam; - txtCustoName.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustoName.Location = new Point(123, 345); - txtCustoName.Margin = new Padding(4, 5, 4, 5); - txtCustoName.MinimumSize = new Size(1, 1); - txtCustoName.Name = "txtCustoName"; - txtCustoName.Padding = new Padding(5); - txtCustoName.Radius = 20; - txtCustoName.ShowText = false; - txtCustoName.Size = new Size(250, 35); - txtCustoName.Style = Sunny.UI.UIStyle.Custom; - txtCustoName.StyleCustomMode = true; - txtCustoName.TabIndex = 130; - txtCustoName.TextAlignment = ContentAlignment.MiddleLeft; - txtCustoName.Watermark = ""; - // - // txtCardID - // - txtCardID.Cursor = Cursors.IBeam; - txtCardID.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCardID.Location = new Point(499, 392); - txtCardID.Margin = new Padding(4, 5, 4, 5); - txtCardID.MinimumSize = new Size(1, 1); - txtCardID.Name = "txtCardID"; - txtCardID.Padding = new Padding(5); - txtCardID.Radius = 20; - txtCardID.ShowText = false; - txtCardID.Size = new Size(250, 35); - txtCardID.Style = Sunny.UI.UIStyle.Custom; - txtCardID.StyleCustomMode = true; - txtCardID.TabIndex = 129; - txtCardID.TextAlignment = ContentAlignment.MiddleLeft; - txtCardID.Watermark = ""; - txtCardID.Validated += txtCardID_Validated; - // - // txtTel - // - txtTel.Cursor = Cursors.IBeam; - txtTel.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtTel.Location = new Point(499, 443); - txtTel.Margin = new Padding(4, 5, 4, 5); - txtTel.MinimumSize = new Size(1, 1); - txtTel.Name = "txtTel"; - txtTel.Padding = new Padding(5); - txtTel.Radius = 20; - txtTel.ShowText = false; - txtTel.Size = new Size(250, 35); - txtTel.Style = Sunny.UI.UIStyle.Custom; - txtTel.StyleCustomMode = true; - txtTel.TabIndex = 128; - txtTel.TextAlignment = ContentAlignment.MiddleLeft; - txtTel.Watermark = ""; - // - // dtpBirthday - // - dtpBirthday.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - dtpBirthday.FillColor = Color.White; - dtpBirthday.Font = new Font("Microsoft Sans Serif", 15.75F); - dtpBirthday.Location = new Point(123, 449); - dtpBirthday.Margin = new Padding(4, 5, 4, 5); - dtpBirthday.MaxLength = 10; - dtpBirthday.MinimumSize = new Size(63, 0); - dtpBirthday.Name = "dtpBirthday"; - dtpBirthday.Padding = new Padding(0, 0, 30, 2); - dtpBirthday.Radius = 20; - dtpBirthday.ReadOnly = true; - dtpBirthday.Size = new Size(250, 31); - dtpBirthday.SymbolDropDown = 61555; - dtpBirthday.SymbolNormal = 61555; - dtpBirthday.SymbolSize = 24; - dtpBirthday.TabIndex = 127; - dtpBirthday.Text = "2020-11-24"; - dtpBirthday.TextAlignment = ContentAlignment.MiddleLeft; - dtpBirthday.Value = new DateTime(2020, 11, 24, 22, 50, 36, 791); - dtpBirthday.Watermark = ""; - // - // txtCustoAdress - // - txtCustoAdress.Cursor = Cursors.IBeam; - txtCustoAdress.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustoAdress.Location = new Point(121, 497); - txtCustoAdress.Margin = new Padding(4, 5, 4, 5); - txtCustoAdress.MinimumSize = new Size(1, 1); - txtCustoAdress.Name = "txtCustoAdress"; - txtCustoAdress.Padding = new Padding(5); - txtCustoAdress.Radius = 20; - txtCustoAdress.ShowText = false; - txtCustoAdress.Size = new Size(628, 35); - txtCustoAdress.Style = Sunny.UI.UIStyle.Custom; - txtCustoAdress.StyleCustomMode = true; - txtCustoAdress.TabIndex = 126; - txtCustoAdress.TextAlignment = ContentAlignment.MiddleLeft; - txtCustoAdress.Watermark = ""; - // // label10 // label10.AutoSize = true; - label10.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label10.Location = new Point(14, 505); + label10.Font = new Font("Noto Sans SC", 14.2499981F); + label10.Location = new Point(30, 508); label10.Name = "label10"; - label10.Size = new Size(88, 25); + label10.Size = new Size(85, 19); label10.TabIndex = 122; label10.Text = "居住地址"; // // label9 // label9.AutoSize = true; - label9.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label9.Location = new Point(403, 450); + label9.Font = new Font("Noto Sans SC", 14.2499981F); + label9.Location = new Point(408, 457); label9.Name = "label9"; - label9.Size = new Size(88, 25); + label9.Size = new Size(85, 19); label9.TabIndex = 121; label9.Text = "联系方式"; // // label8 // label8.AutoSize = true; - label8.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label8.Location = new Point(403, 399); + label8.Font = new Font("Noto Sans SC", 14.2499981F); + label8.Location = new Point(408, 404); label8.Name = "label8"; - label8.Size = new Size(88, 25); + label8.Size = new Size(85, 19); label8.TabIndex = 120; label8.Text = "证件号码"; // // label7 // label7.AutoSize = true; - label7.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label7.Location = new Point(403, 348); + label7.Font = new Font("Noto Sans SC", 14.2499981F); + label7.Location = new Point(408, 354); label7.Name = "label7"; - label7.Size = new Size(88, 25); + label7.Size = new Size(85, 19); label7.TabIndex = 119; label7.Text = "证件类型"; // // label6 // label6.AutoSize = true; - label6.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label6.Location = new Point(403, 297); + label6.Font = new Font("Noto Sans SC", 14.2499981F); + label6.Location = new Point(408, 304); label6.Name = "label6"; - label6.Size = new Size(88, 25); + label6.Size = new Size(85, 19); label6.TabIndex = 118; label6.Text = "客户类型"; // // label5 // label5.AutoSize = true; - label5.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label5.Location = new Point(16, 453); + label5.Font = new Font("Noto Sans SC", 14.2499981F); + label5.Location = new Point(28, 457); label5.Name = "label5"; - label5.Size = new Size(88, 25); + label5.Size = new Size(85, 19); label5.TabIndex = 117; label5.Text = "出生日期"; // // label4 // label4.AutoSize = true; - label4.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label4.Location = new Point(16, 401); + label4.Font = new Font("Noto Sans SC", 14.2499981F); + label4.Location = new Point(38, 406); label4.Name = "label4"; - label4.Size = new Size(86, 25); + label4.Size = new Size(77, 19); label4.TabIndex = 116; label4.Text = "性 别"; // // label3 // label3.AutoSize = true; - label3.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label3.Location = new Point(16, 349); + label3.Font = new Font("Noto Sans SC", 14.2499981F); + label3.Location = new Point(30, 355); label3.Name = "label3"; - label3.Size = new Size(88, 25); + label3.Size = new Size(85, 19); label3.TabIndex = 115; label3.Text = "客户姓名"; // // label2 // label2.AutoSize = true; - label2.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label2.Location = new Point(16, 297); + label2.Font = new Font("Noto Sans SC", 14.2499981F); + label2.Location = new Point(30, 304); label2.Name = "label2"; - label2.Size = new Size(88, 25); + label2.Size = new Size(85, 19); label2.TabIndex = 114; label2.Text = "客户编号"; // - // btnSelect - // - btnSelect.Cursor = Cursors.Hand; - btnSelect.Font = new Font("微软雅黑", 12F); - btnSelect.Location = new Point(19, 44); - btnSelect.MinimumSize = new Size(1, 1); - btnSelect.Name = "btnSelect"; - btnSelect.Radius = 15; - btnSelect.Size = new Size(129, 29); - btnSelect.TabIndex = 135; - btnSelect.Text = "入住并注册"; - btnSelect.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - btnSelect.Click += btnSelect_Click; - // // dgvReserList // - dgvReserList.Location = new Point(14, 83); + dgvReserList.Font = new Font("Noto Sans SC", 9F); + dgvReserList.Gap = 12; + dgvReserList.Location = new Point(14, 87); dgvReserList.Name = "dgvReserList"; - dgvReserList.Size = new Size(735, 160); + dgvReserList.Size = new Size(735, 156); dgvReserList.TabIndex = 136; dgvReserList.Text = "table1"; dgvReserList.CellClick += dgvReserList_CellClick; // // btnPg // - btnPg.Current = 0; + btnPg.Font = new Font("Noto Sans SC", 9F); btnPg.Location = new Point(14, 253); btnPg.Name = "btnPg"; btnPg.PageSize = 15; @@ -354,23 +167,126 @@ btnPg.ValueChanged += btnPg_ValueChanged; btnPg.ShowTotalChanged += btnPg_ShowTotalChanged; // + // ucWindowHeader1 + // + ucWindowHeader1.Location = new Point(1, 1); + ucWindowHeader1.Name = "ucWindowHeader1"; + ucWindowHeader1.Size = new Size(761, 35); + ucWindowHeader1.TabIndex = 138; + // + // btnOk + // + btnOk.Font = new Font("Noto Sans SC", 11.9999981F, FontStyle.Regular, GraphicsUnit.Point, 0); + btnOk.Location = new Point(14, 36); + btnOk.Name = "btnOk"; + btnOk.Size = new Size(135, 45); + btnOk.TabIndex = 139; + btnOk.Text = "入住并注册"; + btnOk.Type = AntdUI.TTypeMini.Info; + btnOk.Click += btnSelect_Click; + // + // txtCustomerName + // + txtCustomerName.Font = new Font("Noto Sans SC", 12F); + txtCustomerName.Location = new Point(121, 343); + txtCustomerName.Name = "txtCustomerName"; + txtCustomerName.Size = new Size(252, 45); + txtCustomerName.TabIndex = 155; + // + // txtCustomerId + // + txtCustomerId.Font = new Font("Noto Sans SC", 12F); + txtCustomerId.Location = new Point(121, 290); + txtCustomerId.Name = "txtCustomerId"; + txtCustomerId.ReadOnly = true; + txtCustomerId.Size = new Size(252, 45); + txtCustomerId.TabIndex = 154; + // + // txtCustomerAddress + // + txtCustomerAddress.Font = new Font("Noto Sans SC", 12F); + txtCustomerAddress.Location = new Point(121, 496); + txtCustomerAddress.Name = "txtCustomerAddress"; + txtCustomerAddress.Size = new Size(628, 45); + txtCustomerAddress.TabIndex = 157; + // + // txtCustomerTel + // + txtCustomerTel.Font = new Font("Noto Sans SC", 12F); + txtCustomerTel.Location = new Point(501, 444); + txtCustomerTel.Name = "txtCustomerTel"; + txtCustomerTel.Size = new Size(250, 43); + txtCustomerTel.TabIndex = 158; + // + // txtCustomerCardID + // + txtCustomerCardID.Font = new Font("Noto Sans SC", 12F); + txtCustomerCardID.Location = new Point(501, 394); + txtCustomerCardID.Name = "txtCustomerCardID"; + txtCustomerCardID.Size = new Size(250, 45); + txtCustomerCardID.TabIndex = 159; + txtCustomerCardID.Validated += txtCardID_Validated; + // + // dtpDateOfBirth + // + dtpDateOfBirth.Font = new Font("Noto Sans SC", 10F); + dtpDateOfBirth.Location = new Point(120, 444); + dtpDateOfBirth.Name = "dtpDateOfBirth"; + dtpDateOfBirth.Size = new Size(252, 43); + dtpDateOfBirth.TabIndex = 162; + // + // cboCustomerType + // + cboCustomerType.Font = new Font("Noto Sans SC", 12F); + cboCustomerType.List = true; + cboCustomerType.ListAutoWidth = true; + cboCustomerType.Location = new Point(501, 293); + cboCustomerType.Name = "cboCustomerType"; + cboCustomerType.Placement = AntdUI.TAlignFrom.Bottom; + cboCustomerType.Size = new Size(251, 45); + cboCustomerType.TabIndex = 178; + // + // cboPassportType + // + cboPassportType.Font = new Font("Noto Sans SC", 12F); + cboPassportType.List = true; + cboPassportType.ListAutoWidth = true; + cboPassportType.Location = new Point(501, 343); + cboPassportType.Name = "cboPassportType"; + cboPassportType.Placement = AntdUI.TAlignFrom.Bottom; + cboPassportType.Size = new Size(251, 45); + cboPassportType.TabIndex = 177; + // + // cboGender + // + cboGender.Font = new Font("Noto Sans SC", 12F); + cboGender.List = true; + cboGender.ListAutoWidth = true; + cboGender.Location = new Point(122, 394); + cboGender.Name = "cboGender"; + cboGender.Placement = AntdUI.TAlignFrom.Bottom; + cboGender.Size = new Size(251, 45); + cboGender.TabIndex = 179; + // // FrmReserList // AutoScaleMode = AutoScaleMode.None; + BackColor = Color.FromArgb(235, 243, 255); BackgroundImageLayout = ImageLayout.Stretch; ClientSize = new Size(763, 556); + Controls.Add(cboGender); + Controls.Add(cboCustomerType); + Controls.Add(cboPassportType); + Controls.Add(dtpDateOfBirth); + Controls.Add(txtCustomerCardID); + Controls.Add(txtCustomerTel); + Controls.Add(txtCustomerAddress); + Controls.Add(txtCustomerName); + Controls.Add(txtCustomerId); + Controls.Add(btnOk); + Controls.Add(ucWindowHeader1); Controls.Add(btnPg); Controls.Add(dgvReserList); - Controls.Add(btnSelect); - Controls.Add(cbCustoType); - Controls.Add(cbPassportType); - Controls.Add(cbSex); - Controls.Add(txtCustoNo); - Controls.Add(txtCustoName); - Controls.Add(txtCardID); - Controls.Add(txtTel); - Controls.Add(dtpBirthday); - Controls.Add(txtCustoAdress); Controls.Add(label10); Controls.Add(label9); Controls.Add(label8); @@ -380,26 +296,18 @@ Controls.Add(label4); Controls.Add(label3); Controls.Add(label2); + FormBorderStyle = FormBorderStyle.None; Icon = (Icon)resources.GetObject("$this.Icon"); Name = "FrmReserList"; - ShowTitleIcon = true; + Resizable = false; + StartPosition = FormStartPosition.CenterScreen; Text = "预约列表"; - ZoomScaleRect = new Rectangle(15, 15, 763, 556); Load += FrmReserList_Load; ResumeLayout(false); PerformLayout(); } #endregion - private Sunny.UI.UIComboBox cbCustoType; - private Sunny.UI.UIComboBox cbPassportType; - private Sunny.UI.UIComboBox cbSex; - private Sunny.UI.UITextBox txtCustoNo; - private Sunny.UI.UITextBox txtCustoName; - private Sunny.UI.UITextBox txtCardID; - private Sunny.UI.UITextBox txtTel; - private Sunny.UI.UIDatePicker dtpBirthday; - private Sunny.UI.UITextBox txtCustoAdress; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label8; @@ -409,8 +317,18 @@ private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label2; - private Sunny.UI.UIButton btnSelect; private AntdUI.Table dgvReserList; private AntdUI.Pagination btnPg; + private ucWindowHeader ucWindowHeader1; + private AntdUI.Button btnOk; + private AntdUI.Input txtCustomerName; + private AntdUI.Input txtCustomerId; + private AntdUI.Input txtCustomerAddress; + private AntdUI.Input txtCustomerTel; + private AntdUI.Input txtCustomerCardID; + private AntdUI.DatePicker dtpDateOfBirth; + private AntdUI.Select cboCustomerType; + private AntdUI.Select cboPassportType; + private AntdUI.Select cboGender; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.cs index 1b4dc545471c9cf9a07b739f748df87434211f41..bf4ef3f29062072ba1fed8b82a654411c9a7dc8a 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserList.cs @@ -21,18 +21,22 @@ *SOFTWARE. * */ +using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using jvncorelib.CodeLib; -using Sunny.UI; +using jvncorelib.EntityLib; namespace EOM.TSHotelManagement.FormUI { - public partial class FrmReserList : UIForm + public partial class FrmReserList : Window { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmReserList)); public FrmReserList() { InitializeComponent(); + + ucWindowHeader1.ApplySettingsWithoutMinimize("预约列表", string.Empty, (Image)resources.GetObject("FrmReserList.Icon")!); } ResponseMsg result = new ResponseMsg(); @@ -71,7 +75,7 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Reser_SelectReserAll, dic); var resers = HttpHelper.JsonToModel>(result.message); - if (resers.Code != BusinessStatusCode.Success) + if (resers.Success == false) { AntdUI.Message.error(this, $"{ApiConstants.Reser_SelectReserAll}+接口服务异常，请提交Issue或尝试更新版本！"); return null!; @@ -113,32 +117,25 @@ namespace EOM.TSHotelManagement.FormUI #region 加载客户类型信息 result = HttpHelper.Request(ApiConstants.Base_SelectCustoTypeAllCanUse); var customerTypeDataSource = HttpHelper.JsonToModel>(result.message); - if (customerTypeDataSource.Code != BusinessStatusCode.Success) + if (customerTypeDataSource.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectCustoTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Base_SelectCustoTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); return; } List lstDataGrid = customerTypeDataSource.Data.Items; - this.cbCustoType.DataSource = lstDataGrid; - this.cbCustoType.DisplayMember = nameof(ReadCustoTypeOutputDto.CustomerTypeName); - this.cbCustoType.ValueMember = nameof(ReadCustoTypeOutputDto.CustomerType); - this.cbCustoType.SelectedIndex = 0; - this.cbCustoType.ReadOnly = true; + this.cboCustomerType.Items.AddRange(lstDataGrid.Select(item => new AntdUI.SelectItem(item.CustomerTypeName, item.CustomerType)).ToArray()); #endregion #region 加载证件类型信息 result = HttpHelper.Request(ApiConstants.Base_SelectPassPortTypeAllCanUse); var passportDataSource = HttpHelper.JsonToModel>(result.message); - if (passportDataSource.Code != BusinessStatusCode.Success) + if (passportDataSource.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectPassPortTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Base_SelectPassPortTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); return; } List passPorts = passportDataSource.Data.Items; - this.cbPassportType.DataSource = passPorts; - this.cbPassportType.DisplayMember = nameof(ReadPassportTypeOutputDto.PassportName); - this.cbPassportType.ValueMember = nameof(ReadPassportTypeOutputDto.PassportId); - this.cbPassportType.SelectedIndex = 0; + this.cboPassportType.Items.AddRange(passPorts.Select(item => new AntdUI.SelectItem(item.PassportName, item.PassportId)).ToArray()); #endregion #region 加载性别信息 @@ -149,15 +146,13 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Base_SelectGenderTypeAll, dic); var genderTypeDataSource = HttpHelper.JsonToModel>(result.message); - if (genderTypeDataSource.Code != BusinessStatusCode.Success) + if (genderTypeDataSource.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectGenderTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Base_SelectGenderTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } List listSexType = genderTypeDataSource.Data.Items; - this.cbSex.DataSource = listSexType; - this.cbSex.DisplayMember = nameof(EnumDto.Description); - this.cbSex.ValueMember = nameof(EnumDto.Id); + this.cboGender.Items.AddRange(listSexType.Select(item => new AntdUI.SelectItem(item.Description, item.Id)).ToArray()); #endregion } @@ -168,9 +163,9 @@ namespace EOM.TSHotelManagement.FormUI ReservationId = helper.GetValue(data, nameof(ReadReserOutputDto.ReservationId)); RoomNumber = helper.GetValue(data, nameof(ReadReserOutputDto.ReservationRoomNumber)); string custoNo = new UniqueCode().GetNewId("TS-"); - txtCustoNo.Text = custoNo; - txtCustoName.Text = helper.GetValue(data, nameof(ReadReserOutputDto.CustomerName)); - txtTel.Text = helper.GetValue(data, nameof(ReadReserOutputDto.ReservationPhoneNumber)); + txtCustomerId.Text = custoNo; + txtCustomerName.Text = helper.GetValue(data, nameof(ReadReserOutputDto.CustomerName)); + txtCustomerTel.Text = helper.GetValue(data, nameof(ReadReserOutputDto.ReservationPhoneNumber)); } } @@ -180,30 +175,30 @@ namespace EOM.TSHotelManagement.FormUI { ReservationId = ReservationId, RoomNumber = RoomNumber, - CustomerNumber = txtCustoNo.Text.Trim(), - CustomerName = txtCustoName.Text.Trim(), - CustomerType = Convert.ToInt32(cbCustoType.SelectedValue), - CustomerPhoneNumber = txtTel.Text.Trim(), - CustomerAddress = txtCustoAdress.Text.Trim(), - IdCardNumber = txtCardID.Text.Trim(), - PassportId = Convert.ToInt32(cbPassportType.SelectedValue), - CustomerGender = Convert.ToInt32(cbSex.SelectedValue), - DateOfBirth = DateOnly.FromDateTime(dtpBirthday.Value), + CustomerNumber = txtCustomerId.Text.Trim(), + CustomerName = txtCustomerName.Text.Trim(), + CustomerType = Convert.ToInt32(cboCustomerType.SelectedValue), + CustomerPhoneNumber = txtCustomerTel.Text.Trim(), + CustomerAddress = txtCustomerAddress.Text.Trim(), + IdCardNumber = txtCustomerCardID.Text.Trim(), + PassportId = Convert.ToInt32(cboPassportType.SelectedValue), + CustomerGender = Convert.ToInt32(cboGender.SelectedValue), + DateOfBirth = DateOnly.FromDateTime(Convert.ToDateTime(dtpDateOfBirth.Value)), IsDelete = 0, DataInsUsr = LoginInfo.WorkerNo, DataChgUsr = LoginInfo.WorkerNo, DataInsDate = DateTime.Now, DataChgDate = DateTime.Now }; - result = HttpHelper.Request(ApiConstants.Room_CheckinRoomByReservation, HttpHelper.ModelToJson(reser)); + result = HttpHelper.Request(ApiConstants.Room_CheckinRoomByReservation, reser.ModelToJson()); var response = HttpHelper.JsonToModel(result.message); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Room_CheckinRoomByReservation}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_CheckinRoomByReservation}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - UIMessageBox.ShowSuccess("操作成功"); + NotificationService.ShowSuccess("操作成功"); LoadReserData(); FrmRoomManager.Reload(""); FrmRoomManager._RefreshRoomCount(); @@ -213,15 +208,15 @@ namespace EOM.TSHotelManagement.FormUI private void txtCardID_Validated(object sender, EventArgs e) { //获取得到输入的身份证号码 - string identityCard = txtCardID.Text.Trim(); + string identityCard = txtCustomerCardID.Text.Trim(); if (string.IsNullOrEmpty(identityCard)) { //身份证号码不能为空，如果为空返回 - UIMessageBox.ShowError("身份证号码不能为空！"); - if (txtCardID.CanFocus) + NotificationService.ShowWarning("身份证号码不能为空！"); + if (txtCustomerCardID.CanFocus) { - txtCardID.Focus();//设置当前输入焦点为txtCardID_identityCard + txtCustomerCardID.Focus();//设置当前输入焦点为txtCardID_identityCard } return; } @@ -230,10 +225,10 @@ namespace EOM.TSHotelManagement.FormUI //身份证号码只能为15位或18位其它不合法 if (identityCard.Length != 15 && identityCard.Length != 18) { - UIMessageBox.ShowWarning("身份证号码为15位或18位，请检查！"); - if (txtCardID.CanFocus) + NotificationService.ShowWarning("身份证号码为15位或18位，请检查！"); + if (txtCustomerCardID.CanFocus) { - txtCardID.Focus(); + txtCustomerCardID.Focus(); } return; } @@ -242,23 +237,23 @@ namespace EOM.TSHotelManagement.FormUI if (identityCard.Length == 18) { var result = ApplicationUtil.SearchCode(identityCard); - if (result.message.IsNullOrEmpty()) //如果没有错误消息输出，则代表成功 + if (string.IsNullOrEmpty(result.message)) //如果没有错误消息输出，则代表成功 { try { - cbSex.Text = result.sex; - txtCustoAdress.Text = result.address; - dtpBirthday.Value = Convert.ToDateTime(result.birthday); + cboGender.SelectedValue = result.sex; + txtCustomerAddress.Text = result.address; + dtpDateOfBirth.Value = Convert.ToDateTime(result.birthday); } catch { - UIMessageBox.ShowError("请正确输入证件号码！"); + NotificationService.ShowError("请正确输入证件号码！"); return; } } else { - UIMessageBox.ShowError(result.message); + NotificationService.ShowError(result.message); return; } } diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.Designer.cs index 7cb671acb1584689951e4a3bfe7197b0f12fc273..161560671fee8f22c7a67d50a8cc806e7b146268 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.Designer.cs @@ -29,284 +29,212 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmReserManager)); - btnReserList = new Sunny.UI.UIButton(); - txtCustoName = new Sunny.UI.UITextBox(); - txtCustoTel = new Sunny.UI.UITextBox(); label1 = new Label(); label9 = new Label(); - cboReserWay = new Sunny.UI.UIComboBox(); label10 = new Label(); - cboReserRoomNo = new Sunny.UI.UIComboBox(); label11 = new Label(); - dtpBookDate = new Sunny.UI.UIDatePicker(); label12 = new Label(); - dtpEndDate = new Sunny.UI.UIDatePicker(); label13 = new Label(); - btnReser = new Sunny.UI.UIButton(); + btnReserList = new AntdUI.Button(); + btnReser = new AntdUI.Button(); + txtCustoName = new AntdUI.Input(); + txtCustoTel = new AntdUI.Input(); + dtpStartDate = new AntdUI.DatePicker(); + dtpEndDate = new AntdUI.DatePicker(); + whReserRoomManagement = new ucWindowHeader(); + cboReserChannel = new AntdUI.Select(); + cboReserRoom = new AntdUI.Select(); SuspendLayout(); // - // btnReserList - // - btnReserList.Cursor = Cursors.Hand; - btnReserList.Font = new Font("微软雅黑", 12F); - btnReserList.Location = new Point(89, 50); - btnReserList.MinimumSize = new Size(1, 1); - btnReserList.Name = "btnReserList"; - btnReserList.Radius = 15; - btnReserList.Size = new Size(136, 35); - btnReserList.Style = Sunny.UI.UIStyle.Custom; - btnReserList.TabIndex = 72; - btnReserList.Text = "查看预约列表"; - btnReserList.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - btnReserList.Click += btnReserList_Click; - // - // txtCustoName - // - txtCustoName.Cursor = Cursors.IBeam; - txtCustoName.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustoName.Location = new Point(122, 94); - txtCustoName.Margin = new Padding(4, 5, 4, 5); - txtCustoName.MinimumSize = new Size(1, 1); - txtCustoName.Name = "txtCustoName"; - txtCustoName.Padding = new Padding(5); - txtCustoName.Radius = 20; - txtCustoName.ShowText = false; - txtCustoName.Size = new Size(159, 35); - txtCustoName.Style = Sunny.UI.UIStyle.Custom; - txtCustoName.StyleCustomMode = true; - txtCustoName.TabIndex = 107; - txtCustoName.TextAlignment = ContentAlignment.MiddleLeft; - txtCustoName.Watermark = ""; - // - // txtCustoTel - // - txtCustoTel.Cursor = Cursors.IBeam; - txtCustoTel.Font = new Font("微软雅黑", 15.75F, FontStyle.Regular, GraphicsUnit.Point, 134); - txtCustoTel.Location = new Point(122, 147); - txtCustoTel.Margin = new Padding(4, 5, 4, 5); - txtCustoTel.MaxLength = 11; - txtCustoTel.MinimumSize = new Size(1, 1); - txtCustoTel.Name = "txtCustoTel"; - txtCustoTel.Padding = new Padding(5); - txtCustoTel.Radius = 20; - txtCustoTel.ShowText = false; - txtCustoTel.Size = new Size(159, 35); - txtCustoTel.Style = Sunny.UI.UIStyle.Custom; - txtCustoTel.StyleCustomMode = true; - txtCustoTel.TabIndex = 108; - txtCustoTel.TextAlignment = ContentAlignment.MiddleLeft; - txtCustoTel.Watermark = ""; - // // label1 // label1.AutoSize = true; - label1.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label1.Location = new Point(30, 151); + label1.Font = new Font("Noto Sans SC", 14.25F); + label1.Location = new Point(283, 62); label1.Name = "label1"; - label1.Size = new Size(88, 25); + label1.Size = new Size(85, 19); label1.TabIndex = 106; - label1.Text = "预约号码"; + label1.Text = "电话号码"; // // label9 // label9.AutoSize = true; - label9.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label9.Location = new Point(30, 99); + label9.Font = new Font("Noto Sans SC", 14.25F); + label9.Location = new Point(24, 62); label9.Name = "label9"; - label9.Size = new Size(88, 25); + label9.Size = new Size(85, 19); label9.TabIndex = 105; label9.Text = "客户姓名"; // - // cboReserWay - // - cboReserWay.DataSource = null; - cboReserWay.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - cboReserWay.FillColor = Color.White; - cboReserWay.Font = new Font("微软雅黑", 15.75F); - cboReserWay.ItemHoverColor = Color.FromArgb(155, 200, 255); - cboReserWay.Items.AddRange(new object[] { "前台", "小程序", "电话" }); - cboReserWay.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - cboReserWay.Location = new Point(122, 200); - cboReserWay.Margin = new Padding(4, 5, 4, 5); - cboReserWay.MinimumSize = new Size(63, 0); - cboReserWay.Name = "cboReserWay"; - cboReserWay.Padding = new Padding(0, 0, 30, 2); - cboReserWay.Radius = 20; - cboReserWay.ReadOnly = true; - cboReserWay.Size = new Size(159, 35); - cboReserWay.Style = Sunny.UI.UIStyle.Custom; - cboReserWay.SymbolSize = 24; - cboReserWay.TabIndex = 110; - cboReserWay.TextAlignment = ContentAlignment.MiddleLeft; - cboReserWay.Watermark = ""; - // // label10 // label10.AutoSize = true; - label10.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label10.Location = new Point(33, 203); + label10.Font = new Font("Noto Sans SC", 14.25F); + label10.Location = new Point(24, 110); label10.Name = "label10"; - label10.Size = new Size(88, 25); + label10.Size = new Size(85, 19); label10.TabIndex = 109; label10.Text = "预约渠道"; // - // cboReserRoomNo - // - cboReserRoomNo.DataSource = null; - cboReserRoomNo.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - cboReserRoomNo.FillColor = Color.White; - cboReserRoomNo.Font = new Font("微软雅黑", 15.75F); - cboReserRoomNo.ItemHoverColor = Color.FromArgb(155, 200, 255); - cboReserRoomNo.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - cboReserRoomNo.Location = new Point(122, 253); - cboReserRoomNo.Margin = new Padding(4, 5, 4, 5); - cboReserRoomNo.MinimumSize = new Size(63, 0); - cboReserRoomNo.Name = "cboReserRoomNo"; - cboReserRoomNo.Padding = new Padding(0, 0, 30, 2); - cboReserRoomNo.Radius = 20; - cboReserRoomNo.Size = new Size(159, 35); - cboReserRoomNo.Style = Sunny.UI.UIStyle.Custom; - cboReserRoomNo.SymbolSize = 24; - cboReserRoomNo.TabIndex = 112; - cboReserRoomNo.TextAlignment = ContentAlignment.MiddleLeft; - cboReserRoomNo.Watermark = ""; - // // label11 // label11.AutoSize = true; - label11.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label11.Location = new Point(33, 255); + label11.Font = new Font("Noto Sans SC", 14.25F); + label11.Location = new Point(284, 110); label11.Name = "label11"; - label11.Size = new Size(88, 25); + label11.Size = new Size(85, 19); label11.TabIndex = 111; label11.Text = "预约房号"; // - // dtpBookDate - // - dtpBookDate.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - dtpBookDate.FillColor = Color.White; - dtpBookDate.Font = new Font("Microsoft Sans Serif", 15.75F); - dtpBookDate.Location = new Point(122, 307); - dtpBookDate.Margin = new Padding(4, 5, 4, 5); - dtpBookDate.MaxLength = 10; - dtpBookDate.MinimumSize = new Size(63, 0); - dtpBookDate.Name = "dtpBookDate"; - dtpBookDate.Padding = new Padding(0, 0, 30, 2); - dtpBookDate.Radius = 20; - dtpBookDate.Size = new Size(159, 31); - dtpBookDate.Style = Sunny.UI.UIStyle.Custom; - dtpBookDate.SymbolDropDown = 61555; - dtpBookDate.SymbolNormal = 61555; - dtpBookDate.SymbolSize = 24; - dtpBookDate.TabIndex = 114; - dtpBookDate.Text = "2021-05-13"; - dtpBookDate.TextAlignment = ContentAlignment.MiddleLeft; - dtpBookDate.Value = new DateTime(2021, 5, 13, 0, 0, 0, 0); - dtpBookDate.Watermark = ""; - // // label12 // label12.AutoSize = true; - label12.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label12.Location = new Point(30, 307); + label12.Font = new Font("Noto Sans SC", 14.25F); + label12.Location = new Point(24, 158); label12.Name = "label12"; - label12.Size = new Size(88, 25); + label12.Size = new Size(85, 19); label12.TabIndex = 113; label12.Text = "预约起始"; // - // dtpEndDate - // - dtpEndDate.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - dtpEndDate.FillColor = Color.White; - dtpEndDate.Font = new Font("Microsoft Sans Serif", 15.75F); - dtpEndDate.Location = new Point(125, 356); - dtpEndDate.Margin = new Padding(4, 5, 4, 5); - dtpEndDate.MaxLength = 10; - dtpEndDate.MinimumSize = new Size(63, 0); - dtpEndDate.Name = "dtpEndDate"; - dtpEndDate.Padding = new Padding(0, 0, 30, 2); - dtpEndDate.Radius = 20; - dtpEndDate.Size = new Size(156, 31); - dtpEndDate.Style = Sunny.UI.UIStyle.Custom; - dtpEndDate.SymbolDropDown = 61555; - dtpEndDate.SymbolNormal = 61555; - dtpEndDate.SymbolSize = 24; - dtpEndDate.TabIndex = 116; - dtpEndDate.Text = "2021-05-13"; - dtpEndDate.TextAlignment = ContentAlignment.MiddleLeft; - dtpEndDate.Value = new DateTime(2021, 5, 13, 0, 0, 0, 0); - dtpEndDate.Watermark = ""; - // // label13 // label13.AutoSize = true; - label13.Font = new Font("微软雅黑", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134); - label13.Location = new Point(33, 359); + label13.Font = new Font("Noto Sans SC", 14.25F); + label13.Location = new Point(284, 158); label13.Name = "label13"; - label13.Size = new Size(88, 25); + label13.Size = new Size(85, 19); label13.TabIndex = 115; label13.Text = "预约止日"; // + // btnReserList + // + btnReserList.Font = new Font("Noto Sans SC", 12F); + btnReserList.Location = new Point(316, 195); + btnReserList.Name = "btnReserList"; + btnReserList.Size = new Size(139, 43); + btnReserList.TabIndex = 118; + btnReserList.Text = "查看预约列表"; + btnReserList.Click += btnReserList_Click; + // // btnReser // - btnReser.Cursor = Cursors.Hand; - btnReser.Font = new Font("微软雅黑", 12F); - btnReser.Location = new Point(109, 411); - btnReser.MinimumSize = new Size(1, 1); + btnReser.Font = new Font("Noto Sans SC", 12F); + btnReser.Location = new Point(461, 195); btnReser.Name = "btnReser"; - btnReser.Radius = 15; - btnReser.Size = new Size(97, 35); - btnReser.Style = Sunny.UI.UIStyle.Custom; - btnReser.TabIndex = 117; - btnReser.Text = "预约"; - btnReser.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + btnReser.Size = new Size(87, 43); + btnReser.TabIndex = 119; + btnReser.Text = "预 约"; + btnReser.Type = AntdUI.TTypeMini.Info; btnReser.Click += btnReser_Click; // + // txtCustoName + // + txtCustoName.Font = new Font("Noto Sans SC", 12F); + txtCustoName.Location = new Point(115, 49); + txtCustoName.Name = "txtCustoName"; + txtCustoName.Size = new Size(162, 45); + txtCustoName.TabIndex = 121; + // + // txtCustoTel + // + txtCustoTel.Font = new Font("Noto Sans SC", 12F); + txtCustoTel.Location = new Point(376, 49); + txtCustoTel.Name = "txtCustoTel"; + txtCustoTel.Size = new Size(161, 45); + txtCustoTel.TabIndex = 122; + // + // dtpStartDate + // + dtpStartDate.Font = new Font("Noto Sans SC", 10F); + dtpStartDate.Location = new Point(115, 146); + dtpStartDate.Name = "dtpStartDate"; + dtpStartDate.Size = new Size(162, 43); + dtpStartDate.TabIndex = 125; + // + // dtpEndDate + // + dtpEndDate.Font = new Font("Noto Sans SC", 10F); + dtpEndDate.Location = new Point(376, 146); + dtpEndDate.Name = "dtpEndDate"; + dtpEndDate.Size = new Size(161, 43); + dtpEndDate.TabIndex = 126; + // + // whReserRoomManagement + // + whReserRoomManagement.Location = new Point(0, 0); + whReserRoomManagement.Name = "whReserRoomManagement"; + whReserRoomManagement.Size = new Size(562, 34); + whReserRoomManagement.TabIndex = 141; + // + // cboReserChannel + // + cboReserChannel.Font = new Font("Noto Sans SC", 12F); + cboReserChannel.List = true; + cboReserChannel.ListAutoWidth = true; + cboReserChannel.Location = new Point(115, 100); + cboReserChannel.Name = "cboReserChannel"; + cboReserChannel.Placement = AntdUI.TAlignFrom.Bottom; + cboReserChannel.Size = new Size(162, 40); + cboReserChannel.TabIndex = 175; + // + // cboReserRoom + // + cboReserRoom.Font = new Font("Noto Sans SC", 12F); + cboReserRoom.List = true; + cboReserRoom.ListAutoWidth = true; + cboReserRoom.Location = new Point(376, 100); + cboReserRoom.Name = "cboReserRoom"; + cboReserRoom.Placement = AntdUI.TAlignFrom.Bottom; + cboReserRoom.Size = new Size(161, 40); + cboReserRoom.TabIndex = 176; + // // FrmReserManager // AutoScaleMode = AutoScaleMode.None; BackColor = Color.FromArgb(235, 243, 255); BackgroundImageLayout = ImageLayout.Stretch; - ClientSize = new Size(315, 461); - Controls.Add(btnReser); + ClientSize = new Size(560, 251); + Controls.Add(cboReserRoom); + Controls.Add(cboReserChannel); + Controls.Add(whReserRoomManagement); Controls.Add(dtpEndDate); + Controls.Add(dtpStartDate); + Controls.Add(txtCustoTel); + Controls.Add(txtCustoName); + Controls.Add(btnReser); + Controls.Add(btnReserList); Controls.Add(label13); - Controls.Add(dtpBookDate); Controls.Add(label12); - Controls.Add(cboReserRoomNo); Controls.Add(label11); - Controls.Add(cboReserWay); Controls.Add(label10); - Controls.Add(txtCustoName); - Controls.Add(txtCustoTel); Controls.Add(label1); Controls.Add(label9); - Controls.Add(btnReserList); + FormBorderStyle = FormBorderStyle.None; Icon = (Icon)resources.GetObject("$this.Icon"); Name = "FrmReserManager"; - ShowTitleIcon = true; - Style = Sunny.UI.UIStyle.Custom; + Resizable = false; + StartPosition = FormStartPosition.CenterScreen; Text = "预约管理"; - ZoomScaleRect = new Rectangle(15, 15, 315, 461); Load += FrmRoomManager_Load; ResumeLayout(false); PerformLayout(); } #endregion - private Sunny.UI.UIButton btnReserList; - private Sunny.UI.UITextBox txtCustoName; - private Sunny.UI.UITextBox txtCustoTel; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label9; - private Sunny.UI.UIComboBox cboReserWay; private System.Windows.Forms.Label label10; - private Sunny.UI.UIComboBox cboReserRoomNo; private System.Windows.Forms.Label label11; - private Sunny.UI.UIDatePicker dtpBookDate; private System.Windows.Forms.Label label12; - private Sunny.UI.UIDatePicker dtpEndDate; private System.Windows.Forms.Label label13; - private Sunny.UI.UIButton btnReser; + private AntdUI.Button btnReserList; + private AntdUI.Button btnReser; + private AntdUI.Input txtCustoName; + private AntdUI.Input txtCustoTel; + private AntdUI.DatePicker dtpStartDate; + private AntdUI.DatePicker dtpEndDate; + private ucWindowHeader whReserRoomManagement; + private AntdUI.Select cboReserChannel; + private AntdUI.Select cboReserRoom; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.cs index 39d2ca7aced11f71fe753ce135222b575bf5a21c..c328bf3152993c929afcab0a8ab6205036cae0a6 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmReserManagement.cs @@ -21,20 +21,23 @@ *SOFTWARE. * */ +using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Core; using jvncorelib.CodeLib; -using Sunny.UI; +using jvncorelib.EntityLib; using System.Transactions; namespace EOM.TSHotelManagement.FormUI { - public partial class FrmReserManager : UIForm + public partial class FrmReserManager : Window { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmReserManager)); public FrmReserManager() { InitializeComponent(); + whReserRoomManagement.ApplySettingsWithoutMinimize("房间预约管理", string.Empty, (Image)resources.GetObject("FrmReserManager.Icon")!); #region 防止背景闪屏方法 this.DoubleBuffered = true;//设置本窗体 SetStyle(ControlStyles.UserPaint, true); @@ -56,59 +59,67 @@ namespace EOM.TSHotelManagement.FormUI ReservationId = reserid, CustomerName = txtCustoName.Text.Trim(), ReservationPhoneNumber = txtCustoTel.Text.Trim(), - ReservationChannel = cboReserWay.Text, - ReservationRoomNumber = cboReserRoomNo.Text, - ReservationStartDate = dtpBookDate.Value, - ReservationEndDate = dtpEndDate.Value, + ReservationChannel = cboReserChannel.SelectedValue?.ToString() ?? string.Empty, + ReservationRoomNumber = cboReserRoom.Text, + ReservationStartDate = dtpStartDate.Value ?? dtpStartDate.Value.GetValueOrDefault(), + ReservationEndDate = dtpEndDate.Value ?? dtpEndDate.Value.GetValueOrDefault(), DataInsUsr = LoginInfo.WorkerNo, DataInsDate = DateTime.Now }; UpdateRoomInputDto room = new UpdateRoomInputDto() { - RoomNumber = cboReserRoomNo.Text, + RoomNumber = cboReserRoom.Text, RoomStateId = (int)RoomState.Reserved, DataInsDate = DateTime.Now, DataInsUsr = LoginInfo.WorkerNo }; - result = HttpHelper.Request(ApiConstants.Reser_InsertReserInfo, HttpHelper.ModelToJson(reser)); + result = HttpHelper.Request(ApiConstants.Reser_InsertReserInfo, reser.ModelToJson()); var response = HttpHelper.JsonToModel(result.message); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Reser_InsertReserInfo}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Reser_InsertReserInfo}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - result = HttpHelper.Request(ApiConstants.Room_UpdateRoomInfoWithReser, HttpHelper.ModelToJson(room)); + result = HttpHelper.Request(ApiConstants.Room_UpdateRoomInfoWithReser, room.ModelToJson()); response = HttpHelper.JsonToModel(result.message); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Room_UpdateRoomInfoWithReser}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_UpdateRoomInfoWithReser}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - UIMessageBox.ShowSuccess("预约成功！请在指定时间内进行登记入住"); + NotificationService.ShowSuccess("预约成功！请在指定时间内进行登记入住"); #region 获取添加操作日志所需的信息 RecordHelper.Record(LoginInfo.WorkerClub + LoginInfo.WorkerPosition + LoginInfo.WorkerName + "于" + Convert.ToDateTime(DateTime.Now) + "帮助" + txtCustoTel.Text + "进行了预订房间操作！", Common.Core.LogLevel.Normal); #endregion scope.Complete(); FrmRoomManager.Reload(""); + FrmRoomManager._RefreshRoomCount(); this.Close(); } } private void FrmRoomManager_Load(object sender, EventArgs e) { - cboReserWay.SelectedIndex = 0; result = HttpHelper.Request(ApiConstants.Room_SelectCanUseRoomAll); var response = HttpHelper.JsonToModel>(result.message); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Room_SelectCanUseRoomAll}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_SelectCanUseRoomAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - cboReserRoomNo.DataSource = response.Data.Items; - cboReserRoomNo.DisplayMember = nameof(ReadRoomOutputDto.RoomNumber); - cboReserRoomNo.ValueMember = nameof(ReadRoomOutputDto.RoomNumber); - cboReserRoomNo.Text = ucRoom.co_RoomNo; - dtpBookDate.Value = Convert.ToDateTime(DateTime.Now); + cboReserRoom.Items.AddRange(response.Data.Items.Select(item => new AntdUI.SelectItem(item.RoomNumber)).ToArray()); + + result = HttpHelper.Request(ApiConstants.Reser_SelectReserTypeAll); + var reserTypes = HttpHelper.JsonToModel>(result.message); + if (reserTypes.Success == false) + { + NotificationService.ShowError($"{ApiConstants.Reser_SelectReserTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + cboReserChannel.Items.AddRange(reserTypes.Data.Items.Select(item => new AntdUI.SelectItem(item.Description, item.Name)).ToArray()); + + cboReserRoom.Text = ucRoom.co_RoomNo; + dtpStartDate.Value = Convert.ToDateTime(DateTime.Now); } private void btnReserList_Click(object sender, EventArgs e) diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomManagement.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomManagement.Designer.cs index ce9636ae37cc0ce10bbaffad354ec8bf68da4fed..323a5ca0c8940ddfa01e098574bc7ca98a28b653 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomManagement.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomManagement.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - flpRoom = new FlowLayoutPanel(); pnlRoomInfo = new Panel(); lblRoomState = new Label(); label11 = new Label(); @@ -40,21 +39,12 @@ label3 = new Label(); label2 = new Label(); label1 = new Label(); - flpRoomTypes = new Sunny.UI.UIFlowLayoutPanel(); muRoomState = new AntdUI.Menu(); + flpRoomTypes = new AntdUI.In.FlowLayoutPanel(); + flpRoom = new AntdUI.In.FlowLayoutPanel(); pnlRoomInfo.SuspendLayout(); SuspendLayout(); // - // flpRoom - // - flpRoom.AutoScroll = true; - flpRoom.BackColor = Color.Transparent; - flpRoom.Location = new Point(265, 103); - flpRoom.Margin = new Padding(4); - flpRoom.Name = "flpRoom"; - flpRoom.Size = new Size(804, 516); - flpRoom.TabIndex = 71; - // // pnlRoomInfo // pnlRoomInfo.BackColor = Color.Transparent; @@ -77,135 +67,116 @@ // lblRoomState // lblRoomState.AutoSize = true; - lblRoomState.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - lblRoomState.Location = new Point(86, 146); + lblRoomState.Font = new Font("Noto Sans SC", 12F); + lblRoomState.Location = new Point(108, 277); lblRoomState.Margin = new Padding(4, 0, 4, 0); lblRoomState.Name = "lblRoomState"; - lblRoomState.Size = new Size(10, 15); + lblRoomState.Size = new Size(12, 17); lblRoomState.TabIndex = 16; lblRoomState.Text = " "; // // label11 // label11.AutoSize = true; - label11.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - label11.Location = new Point(11, 146); + label11.Font = new Font("Noto Sans SC", 12F); + label11.Location = new Point(11, 277); label11.Margin = new Padding(4, 0, 4, 0); label11.Name = "label11"; - label11.Size = new Size(67, 15); + label11.Size = new Size(88, 17); label11.TabIndex = 15; label11.Text = "房间状态："; // // lblRoomNo // lblRoomNo.AutoSize = true; - lblRoomNo.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - lblRoomNo.Location = new Point(86, 13); + lblRoomNo.Font = new Font("Noto Sans SC", 12F); + lblRoomNo.Location = new Point(108, 13); lblRoomNo.Margin = new Padding(4, 0, 4, 0); lblRoomNo.Name = "lblRoomNo"; - lblRoomNo.Size = new Size(10, 15); + lblRoomNo.Size = new Size(12, 17); lblRoomNo.TabIndex = 14; lblRoomNo.Text = " "; // // lblCustoName // lblCustoName.AutoSize = true; - lblCustoName.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - lblCustoName.Location = new Point(86, 46); + lblCustoName.Font = new Font("Noto Sans SC", 12F); + lblCustoName.Location = new Point(108, 79); lblCustoName.Margin = new Padding(4, 0, 4, 0); lblCustoName.Name = "lblCustoName"; - lblCustoName.Size = new Size(10, 15); + lblCustoName.Size = new Size(12, 17); lblCustoName.TabIndex = 12; lblCustoName.Text = " "; // // lblRoomPosition // lblRoomPosition.AutoSize = true; - lblRoomPosition.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - lblRoomPosition.Location = new Point(86, 113); + lblRoomPosition.Font = new Font("Noto Sans SC", 12F); + lblRoomPosition.Location = new Point(108, 211); lblRoomPosition.Margin = new Padding(4, 0, 4, 0); lblRoomPosition.Name = "lblRoomPosition"; - lblRoomPosition.Size = new Size(10, 15); + lblRoomPosition.Size = new Size(12, 17); lblRoomPosition.TabIndex = 10; lblRoomPosition.Text = " "; // // lblCheckTime // lblCheckTime.AutoSize = true; - lblCheckTime.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - lblCheckTime.Location = new Point(86, 80); + lblCheckTime.Font = new Font("Noto Sans SC", 12F); + lblCheckTime.Location = new Point(108, 145); lblCheckTime.Margin = new Padding(4, 0, 4, 0); lblCheckTime.Name = "lblCheckTime"; - lblCheckTime.Size = new Size(10, 15); + lblCheckTime.Size = new Size(12, 17); lblCheckTime.TabIndex = 9; lblCheckTime.Text = " "; // // label4 // label4.AutoSize = true; - label4.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - label4.Location = new Point(11, 113); + label4.Font = new Font("Noto Sans SC", 12F); + label4.Location = new Point(11, 211); label4.Margin = new Padding(4, 0, 4, 0); label4.Name = "label4"; - label4.Size = new Size(67, 15); + label4.Size = new Size(88, 17); label4.TabIndex = 3; label4.Text = "所在区域："; // // label3 // label3.AutoSize = true; - label3.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - label3.Location = new Point(11, 80); + label3.Font = new Font("Noto Sans SC", 12F); + label3.Location = new Point(11, 145); label3.Margin = new Padding(4, 0, 4, 0); label3.Name = "label3"; - label3.Size = new Size(67, 15); + label3.Size = new Size(88, 17); label3.TabIndex = 2; label3.Text = "入住时间："; // // label2 // label2.AutoSize = true; - label2.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - label2.Location = new Point(11, 46); + label2.Font = new Font("Noto Sans SC", 12F); + label2.Location = new Point(11, 79); label2.Margin = new Padding(4, 0, 4, 0); label2.Name = "label2"; - label2.Size = new Size(67, 15); + label2.Size = new Size(88, 17); label2.TabIndex = 1; label2.Text = "客户名字："; // // label1 // label1.AutoSize = true; - label1.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + label1.Font = new Font("Noto Sans SC", 12F); label1.Location = new Point(11, 13); label1.Margin = new Padding(4, 0, 4, 0); label1.Name = "label1"; - label1.Size = new Size(67, 15); + label1.Size = new Size(88, 17); label1.TabIndex = 0; label1.Text = "房间号码："; // - // flpRoomTypes - // - flpRoomTypes.BackColor = Color.Transparent; - flpRoomTypes.FillColor = Color.Transparent; - flpRoomTypes.FillColor2 = Color.Transparent; - flpRoomTypes.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - flpRoomTypes.Location = new Point(265, 4); - flpRoomTypes.Margin = new Padding(4, 5, 4, 5); - flpRoomTypes.MinimumSize = new Size(1, 1); - flpRoomTypes.Name = "flpRoomTypes"; - flpRoomTypes.Padding = new Padding(2); - flpRoomTypes.RadiusSides = Sunny.UI.UICornerRadiusSides.None; - flpRoomTypes.RectSides = ToolStripStatusLabelBorderSides.None; - flpRoomTypes.ShowText = false; - flpRoomTypes.Size = new Size(804, 90); - flpRoomTypes.TabIndex = 95; - flpRoomTypes.Text = "uiFlowLayoutPanel1"; - flpRoomTypes.TextAlignment = ContentAlignment.MiddleCenter; - // // muRoomState // - muRoomState.Font = new Font("Microsoft YaHei UI", 10F); + muRoomState.Font = new Font("Noto Sans SC", 10F); muRoomState.Indent = true; muRoomState.Location = new Point(2, 4); muRoomState.Mode = AntdUI.TMenuMode.Vertical; @@ -214,6 +185,20 @@ muRoomState.TabIndex = 96; muRoomState.SelectChanged += muRoomState_SelectChanged; // + // flpRoomTypes + // + flpRoomTypes.Location = new Point(265, 6); + flpRoomTypes.Name = "flpRoomTypes"; + flpRoomTypes.Size = new Size(804, 90); + flpRoomTypes.TabIndex = 97; + // + // flpRoom + // + flpRoom.Location = new Point(265, 103); + flpRoom.Name = "flpRoom"; + flpRoom.Size = new Size(804, 516); + flpRoom.TabIndex = 98; + // // FrmRoomManager // AutoScaleDimensions = new SizeF(7F, 17F); @@ -221,10 +206,10 @@ BackColor = Color.FromArgb(235, 243, 255); BackgroundImageLayout = ImageLayout.Stretch; ClientSize = new Size(1072, 623); - Controls.Add(muRoomState); + Controls.Add(flpRoom); Controls.Add(flpRoomTypes); + Controls.Add(muRoomState); Controls.Add(pnlRoomInfo); - Controls.Add(flpRoom); DoubleBuffered = true; FormBorderStyle = FormBorderStyle.None; Margin = new Padding(4); @@ -239,7 +224,6 @@ #endregion public System.Windows.Forms.FlowLayoutPanel pe; - private System.Windows.Forms.FlowLayoutPanel flpRoom; private System.Windows.Forms.Label label11; private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label3; @@ -251,7 +235,8 @@ public System.Windows.Forms.Label lblRoomPosition; public System.Windows.Forms.Label lblCheckTime; public System.Windows.Forms.Panel pnlRoomInfo; - private Sunny.UI.UIFlowLayoutPanel flpRoomTypes; private AntdUI.Menu muRoomState; + private AntdUI.In.FlowLayoutPanel flpRoomTypes; + private AntdUI.In.FlowLayoutPanel flpRoom; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomManagement.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomManagement.cs index 5858bad4092c8532c50679941ccec188d1022812..79a5e5d4023307fb3969fba6287d776ceea6d978 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomManagement.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomManagement.cs @@ -26,10 +26,9 @@ using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Core; -using EOM.TSHotelManagement.FormUI.AppUserControls; using EOM.TSHotelManagement.FormUI.Properties; using EOM.TSHotelManagement.Shared; -using Sunny.UI; +using jvncorelib.EntityLib; namespace EOM.TSHotelManagement.FormUI { @@ -114,15 +113,25 @@ namespace EOM.TSHotelManagement.FormUI var response = HttpHelper.JsonToModel>(httpResponse.message); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - throw new HttpRequestException($"{url} 请求失败，状态码：{response.Code}"); + AntdUI.Notification.open(new AntdUI.Notification.Config(this, UIMessageConstant.Error, $"{url} 请求失败，状态码：{response.Code}", AntdUI.TType.Error, AntdUI.TAlignFrom.TR, Font) + { + Radius = 10, + FontStyleTitle = FontStyle.Bold, + ShowInWindow = true + }); } var propertyInfo = typeof(ReadRoomOutputDto).GetProperty(propertyName); if (propertyInfo == null) { - throw new MissingFieldException($"ReadRoomOutputDto 中未找到 {propertyName} 属性"); + AntdUI.Notification.open(new AntdUI.Notification.Config(this, UIMessageConstant.Error, $"ReadRoomOutputDto 中未找到 {propertyName} 属性", AntdUI.TType.Error, AntdUI.TAlignFrom.TR, Font) + { + Radius = 10, + FontStyleTitle = FontStyle.Bold, + ShowInWindow = true + }); } if (propertyInfo.GetValue(response.Data) is int countValue) @@ -150,7 +159,12 @@ namespace EOM.TSHotelManagement.FormUI } catch (Exception ex) { - UIMessageBox.ShowError($"接口服务异常，请提交Issue或尝试更新版本！: {ex.Message}"); + AntdUI.Notification.open(new AntdUI.Notification.Config(this, UIMessageConstant.Error, $"接口服务异常，请提交Issue或尝试更新版本！: {ex.Message}", AntdUI.TType.Error, AntdUI.TAlignFrom.TR, Font) + { + Radius = 10, + FontStyleTitle = FontStyle.Bold, + ShowInWindow = true + }); } } @@ -226,20 +240,20 @@ namespace EOM.TSHotelManagement.FormUI }; var result = HttpHelper.Request(ApiConstants.RoomType_SelectRoomTypesAll, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - throw new Exception($"{ApiConstants.RoomType_SelectRoomTypesAll}+接口服务异常"); + NotificationService.ShowError($"{ApiConstants.RoomType_SelectRoomTypesAll}+接口服务异常"); } var listRoomTypes = response.Data.Items; if (listRoomTypes == null) { - UIMessageBox.ShowError("Room types list is null"); + NotificationService.ShowError($"房间类型列表为空"); return; } - flpRoomTypes.Clear(); + flpRoomTypes.Controls.Clear(); AddRoomTypeButton("全部房间", "btnAll", btnAll_Click); foreach (var type in listRoomTypes) @@ -249,7 +263,7 @@ namespace EOM.TSHotelManagement.FormUI } catch (Exception ex) { - UIMessageBox.ShowError($"接口服务异常，请提交Issue或尝试更新版本！: {ex.Message}"); + NotificationService.ShowError($"接口服务异常，请提交Issue或尝试更新版本！: {ex.Message}"); } } @@ -264,7 +278,7 @@ namespace EOM.TSHotelManagement.FormUI private void btnRoomType_Click(object? sender, EventArgs e) { - if (sender is UIButton button) + if (sender is AntdUI.Button button) { string buttonName = button.Text; LoadData(buttonName); @@ -298,9 +312,9 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Room_SelectRoomAll, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Room_SelectRoomAll}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_SelectRoomAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } romsty = response.Data.Items; @@ -315,18 +329,17 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Room_SelectRoomByTypeName, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Room_SelectRoomByTypeName}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_SelectRoomByTypeName}+接口服务异常，请提交Issue或尝试更新版本！"); return; } romsty = response.Data.Items; } for (int i = 0; i < romsty.Count; i++) { - room = new ucRoom(); + room = new ucRoom(this); room.btnRoom.Text = string.Format("{0}\n\n{1}\n\n{2}", romsty[i].RoomName, romsty[i].RoomNumber, romsty[i].CustomerName ?? " "); - room.lblMark = string.Empty; room.romRoomInfo = romsty[i]; room.romCustoInfo = new ReadCustomerOutputDto { CustomerNumber = romsty[i].CustomerNumber, CustomerName = romsty[i].CustomerName }; flpRoom.Controls.Add(room); @@ -350,17 +363,16 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Room_SelectRoomByRoomState, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Room_SelectRoomByRoomState}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_SelectRoomByRoomState}+接口服务异常，请提交Issue或尝试更新版本！"); return; } romsty = response.Data.Items; for (int i = 0; i < romsty.Count; i++) { - room = new ucRoom(); + room = new ucRoom(this); room.btnRoom.Text = string.Format("{0}\n\n{1}\n\n{2}", romsty[i].RoomName, romsty[i].RoomNumber, romsty[i].CustomerName); - room.lblMark = string.Empty; room.romRoomInfo = romsty[i]; room.romCustoInfo = new ReadCustomerOutputDto { CustomerNumber = romsty[i].CustomerNumber, CustomerName = romsty[i].CustomerName }; flpRoom.Controls.Add(room); diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomStateManagement.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomStateManagement.Designer.cs index e288cfd67a159808a765da8713c612da0018651c..aa7f6b3cd094c6cabb833b5fa46677f8688fdcec 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomStateManagement.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomStateManagement.Designer.cs @@ -29,116 +29,107 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmRoomStateManager)); - this.txtRoomNo = new Sunny.UI.UITextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.cboState = new Sunny.UI.UIComboBox(); - this.btnOk = new Sunny.UI.UIButton(); - this.SuspendLayout(); - // - // txtRoomNo - // - this.txtRoomNo.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtRoomNo.FillColor = System.Drawing.Color.White; - this.txtRoomNo.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtRoomNo.Location = new System.Drawing.Point(121, 48); - this.txtRoomNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtRoomNo.Maximum = 2147483647D; - this.txtRoomNo.Minimum = -2147483648D; - this.txtRoomNo.MinimumSize = new System.Drawing.Size(1, 1); - this.txtRoomNo.Name = "txtRoomNo"; - this.txtRoomNo.Padding = new System.Windows.Forms.Padding(5); - this.txtRoomNo.Radius = 20; - this.txtRoomNo.Size = new System.Drawing.Size(158, 35); - this.txtRoomNo.Style = Sunny.UI.UIStyle.Custom; - this.txtRoomNo.StyleCustomMode = true; - this.txtRoomNo.TabIndex = 133; - this.txtRoomNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + label2 = new Label(); + label1 = new Label(); + txtRoomNo = new AntdUI.Input(); + btnOk = new AntdUI.Button(); + ucWindowHeader1 = new ucWindowHeader(); + cboRoomState = new AntdUI.Select(); + SuspendLayout(); // // label2 // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(29, 54); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(88, 25); - this.label2.TabIndex = 132; - this.label2.Text = "客户编号"; + label2.AutoSize = true; + label2.Font = new Font("Noto Sans SC", 14F); + label2.Location = new Point(7, 57); + label2.Name = "label2"; + label2.Size = new Size(85, 19); + label2.TabIndex = 132; + label2.Text = "房间号码"; // // label1 // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(29, 106); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(88, 25); - this.label1.TabIndex = 134; - this.label1.Text = "房间状态"; + label1.AutoSize = true; + label1.Font = new Font("Noto Sans SC", 14F); + label1.Location = new Point(7, 109); + label1.Name = "label1"; + label1.Size = new Size(85, 19); + label1.TabIndex = 134; + label1.Text = "房间状态"; // - // cboState + // txtRoomNo // - this.cboState.DataSource = null; - this.cboState.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cboState.FillColor = System.Drawing.Color.White; - this.cboState.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cboState.Items.AddRange(new object[] { - "前台", - "小程序", - "电话"}); - this.cboState.Location = new System.Drawing.Point(121, 101); - this.cboState.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cboState.MinimumSize = new System.Drawing.Size(63, 0); - this.cboState.Name = "cboState"; - this.cboState.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cboState.Radius = 20; - this.cboState.Size = new System.Drawing.Size(158, 35); - this.cboState.TabIndex = 135; - this.cboState.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.cboState.Watermark = ""; + txtRoomNo.Font = new Font("Noto Sans SC", 12F); + txtRoomNo.Location = new Point(99, 44); + txtRoomNo.Name = "txtRoomNo"; + txtRoomNo.ReadOnly = true; + txtRoomNo.Size = new Size(203, 45); + txtRoomNo.TabIndex = 137; // // btnOk // - this.btnOk.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnOk.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnOk.Location = new System.Drawing.Point(196, 148); - this.btnOk.MinimumSize = new System.Drawing.Size(1, 1); - this.btnOk.Name = "btnOk"; - this.btnOk.Radius = 15; - this.btnOk.Size = new System.Drawing.Size(84, 35); - this.btnOk.TabIndex = 136; - this.btnOk.Text = "修改"; - this.btnOk.Click += new System.EventHandler(this.btnOk_Click); + btnOk.Font = new Font("Noto Sans SC", 12F); + btnOk.Location = new Point(215, 147); + btnOk.Name = "btnOk"; + btnOk.Size = new Size(87, 43); + btnOk.TabIndex = 140; + btnOk.Text = "修 改"; + btnOk.Type = AntdUI.TTypeMini.Info; + btnOk.Click += btnOk_Click; + // + // ucWindowHeader1 + // + ucWindowHeader1.Location = new Point(0, 0); + ucWindowHeader1.Name = "ucWindowHeader1"; + ucWindowHeader1.Size = new Size(309, 35); + ucWindowHeader1.TabIndex = 141; + // + // cboRoomState + // + cboRoomState.Font = new Font("Noto Sans SC", 12F); + cboRoomState.List = true; + cboRoomState.ListAutoWidth = true; + cboRoomState.Location = new Point(99, 96); + cboRoomState.Name = "cboRoomState"; + cboRoomState.Placement = AntdUI.TAlignFrom.Bottom; + cboRoomState.Size = new Size(203, 45); + cboRoomState.TabIndex = 180; + cboRoomState.SelectedValueChanged += cboRoomState_SelectedValueChanged; // // FrmRoomStateManager // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(308, 196); - this.Controls.Add(this.btnOk); - this.Controls.Add(this.cboState); - this.Controls.Add(this.label1); - this.Controls.Add(this.txtRoomNo); - this.Controls.Add(this.label2); - this.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "FrmRoomStateManager"; - this.ShowIcon = true; - this.ShowTitleIcon = true; - this.Text = "修改房间状态"; - this.Load += new System.EventHandler(this.FrmRoomStateManager_Load); - this.ResumeLayout(false); - this.PerformLayout(); + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.FromArgb(235, 243, 255); + ClientSize = new Size(308, 196); + Controls.Add(cboRoomState); + Controls.Add(ucWindowHeader1); + Controls.Add(btnOk); + Controls.Add(txtRoomNo); + Controls.Add(label1); + Controls.Add(label2); + Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + FormBorderStyle = FormBorderStyle.None; + Icon = (Icon)resources.GetObject("$this.Icon"); + Margin = new Padding(3, 4, 3, 4); + MaximizeBox = false; + MinimizeBox = false; + Name = "FrmRoomStateManager"; + Resizable = false; + StartPosition = FormStartPosition.CenterScreen; + Text = "修改房间状态"; + Load += FrmRoomStateManager_Load; + ResumeLayout(false); + PerformLayout(); } #endregion - private Sunny.UI.UITextBox txtRoomNo; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; - private Sunny.UI.UIComboBox cboState; - private Sunny.UI.UIButton btnOk; + private AntdUI.Input txtRoomNo; + private AntdUI.Button btnOk; + private ucWindowHeader ucWindowHeader1; + private AntdUI.Select cboRoomState; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomStateManagement.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomStateManagement.cs index 52d2fe2f762287e3def9a566644f8927d03be68a..cffc0237c053a0598cb199edbf227236e0782ef1 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomStateManagement.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomStateManagement.cs @@ -22,19 +22,22 @@ * */ +using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Core; using EOM.TSHotelManagement.Shared; -using Sunny.UI; +using jvncorelib.EntityLib; namespace EOM.TSHotelManagement.FormUI { - public partial class FrmRoomStateManager : UIForm + public partial class FrmRoomStateManager : Window { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmRoomStateManager)); public FrmRoomStateManager() { InitializeComponent(); + ucWindowHeader1.ApplySettingsWithoutMinimize("房间状态管理", string.Empty, (Image)resources.GetObject("FrmRoomStateManager.Icon")!); } Dictionary dic = null; @@ -43,53 +46,57 @@ namespace EOM.TSHotelManagement.FormUI #region 窗体加载事件 private void FrmRoomStateManager_Load(object sender, EventArgs e) { + txtRoomNo.Text = ucRoom.rm_RoomNo; result = HttpHelper.Request(ApiConstants.Base_SelectRoomStateAll); var datas = HttpHelper.JsonToModel>(result.message); - if (datas.Code != 200) + if (datas.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectRoomStateAll}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Base_SelectRoomStateAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - cboState.DataSource = datas.Data.Items; - cboState.DisplayMember = nameof(EnumDto.Description); - cboState.ValueMember = nameof(EnumDto.Id); - cboState.SelectedIndex = 0; + cboRoomState.Items.AddRange(datas.Data.Items.Select(item => new AntdUI.SelectItem(item.Description, item.Id)).ToArray()); + cboRoomState.SelectedIndex = 0; } #endregion - + int selectedValue = 1; #region 确定按钮点击事件 private void btnOk_Click(object sender, EventArgs e) { var helper = new EnumHelper(); - switch (cboState.SelectedValue) + switch (selectedValue) { case (int)RoomState.Occupied: - UIMessageBox.Show("不能设置为已住状态！", "来自小T的提示", UIStyle.Orange); + NotificationService.ShowWarning("不能设置为已住状态！"); break; case (int)RoomState.Vacant: case (int)RoomState.Maintenance: case (int)RoomState.Dirty: case (int)RoomState.Reserved: - var updateRoom = new UpdateRoomInputDto { RoomNumber = txtRoomNo.Text.Trim(), RoomStateId = Convert.ToInt32(cboState.SelectedValue) }; + var updateRoom = new UpdateRoomInputDto { RoomNumber = txtRoomNo.Text.Trim(), RoomStateId = Convert.ToInt32(selectedValue) }; result = HttpHelper.Request(ApiConstants.Room_UpdateRoomStateByRoomNo, updateRoom.ModelToJson()); var response = HttpHelper.JsonToModel(result.message); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Room_UpdateRoomStateByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_UpdateRoomStateByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - UIMessageBox.Show("房间" + txtRoomNo.Text + "成功修改为" + cboState.Text, "修改提示", UIStyle.Green); + NotificationService.ShowSuccess("房间" + txtRoomNo.Text + "成功修改为" + cboRoomState.Text); FrmRoomManager.Reload(""); FrmRoomManager._RefreshRoomCount(); this.Close(); break; default: - UIMessageBox.Show("请选择房间状态", "来自小T的提示", UIStyle.Orange); + NotificationService.ShowWarning("请选择房间状态"); break; } } #endregion + + private void cboRoomState_SelectedValueChanged(object sender, ObjectNEventArgs e) + { + selectedValue = Convert.ToInt32(e.Value); + } } } diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomStateManagement.resx b/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomStateManagement.resx index 48bd11db49aa149c181a971204b21b6823876906..ff6dc65e519b204245d97ad96b525b3271dd3556 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomStateManagement.resx +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmRoomStateManagement.resx @@ -1,17 +1,17 @@  - diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.Designer.cs index e18e5bafa9501bc7d780577fbb736a3de11d6f62..30665088bc8b60c6985d2474443505a35231da2e 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.Designer.cs @@ -61,7 +61,6 @@ // // FrmScreenLock // - AllowShowTitle = false; AutoScaleMode = AutoScaleMode.None; BackColor = Color.FromArgb(235, 243, 255); BackgroundImage = Properties.Resources.lock_screen; @@ -69,17 +68,17 @@ ClientSize = new Size(800, 450); Controls.Add(btnUnlock); Controls.Add(txtPassword); + FormBorderStyle = FormBorderStyle.None; Icon = (Icon)resources.GetObject("$this.Icon"); - IsForbidAltF4 = true; MaximizeBox = false; MinimizeBox = false; Name = "FrmScreenLock"; - Padding = new Padding(0); + Resizable = false; ShowIcon = false; ShowInTaskbar = false; - ShowTitle = false; + StartPosition = FormStartPosition.CenterScreen; Text = "系统已锁定"; - ZoomScaleRect = new Rectangle(15, 15, 800, 450); + TopMost = true; Load += FrmScreenLock_Load; ResumeLayout(false); } diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.cs index 2d37b5f6b2d95f9718e21ff04a4b4413f4e3d0f4..dbc877f15fa0270ae39e917e50c19c7e718a976f 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmScreenLock.cs @@ -1,10 +1,10 @@ -using EOM.TSHotelManagement.Common; +using AntdUI; +using EOM.TSHotelManagement.Common; using jvncorelib.EncryptorLib; -using Sunny.UI; namespace EOM.TSHotelManagement.FormUI { - public partial class FrmScreenLock : UIForm + public partial class FrmScreenLock : Window { public FrmScreenLock() { @@ -25,7 +25,7 @@ namespace EOM.TSHotelManagement.FormUI { if (txtPassword.Text.Trim() == string.Empty) { - UIMessageBox.ShowError("密码不能为空，请重新输入！"); + NotificationService.ShowError("密码不能为空，请重新输入！"); txtPassword.Focus(); return; } @@ -36,7 +36,7 @@ namespace EOM.TSHotelManagement.FormUI } else { - UIMessageBox.ShowError("密码错误，请重新输入！"); + NotificationService.ShowError("密码错误，请重新输入！"); txtPassword.Focus(); txtPassword.Clear(); } diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmSelectCustoInfo.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmSelectCustoInfo.Designer.cs deleted file mode 100644 index 937040a6e708c7a33a3a6adf40ff5287e5817d19..0000000000000000000000000000000000000000 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmSelectCustoInfo.Designer.cs +++ /dev/null @@ -1,377 +0,0 @@ -namespace EOM.TSHotelManagement.FormUI -{ - partial class FrmSelectCustoInfo - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmSelectCustoInfo)); - this.cbCustoType = new Sunny.UI.UIComboBox(); - this.cbPassportType = new Sunny.UI.UIComboBox(); - this.cbSex = new Sunny.UI.UIComboBox(); - this.txtCustoNo = new Sunny.UI.UITextBox(); - this.txtCustoName = new Sunny.UI.UITextBox(); - this.txtCardID = new Sunny.UI.UITextBox(); - this.txtCustoTel = new Sunny.UI.UITextBox(); - this.dtpBirthday = new Sunny.UI.UIDatePicker(); - this.txtCustoAdress = new Sunny.UI.UITextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); - this.label18 = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // cbCustoType - // - this.cbCustoType.DataSource = null; - this.cbCustoType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cbCustoType.FillColor = System.Drawing.Color.White; - this.cbCustoType.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cbCustoType.Location = new System.Drawing.Point(512, 49); - this.cbCustoType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cbCustoType.MinimumSize = new System.Drawing.Size(63, 0); - this.cbCustoType.Name = "cbCustoType"; - this.cbCustoType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cbCustoType.Radius = 20; - this.cbCustoType.ReadOnly = true; - this.cbCustoType.Size = new System.Drawing.Size(250, 35); - this.cbCustoType.Style = Sunny.UI.UIStyle.Custom; - this.cbCustoType.TabIndex = 128; - this.cbCustoType.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.cbCustoType.Watermark = ""; - // - // cbPassportType - // - this.cbPassportType.DataSource = null; - this.cbPassportType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cbPassportType.FillColor = System.Drawing.Color.White; - this.cbPassportType.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cbPassportType.Location = new System.Drawing.Point(512, 100); - this.cbPassportType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cbPassportType.MinimumSize = new System.Drawing.Size(63, 0); - this.cbPassportType.Name = "cbPassportType"; - this.cbPassportType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cbPassportType.Radius = 20; - this.cbPassportType.ReadOnly = true; - this.cbPassportType.Size = new System.Drawing.Size(250, 35); - this.cbPassportType.Style = Sunny.UI.UIStyle.Custom; - this.cbPassportType.TabIndex = 127; - this.cbPassportType.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // cbSex - // - this.cbSex.DataSource = null; - this.cbSex.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cbSex.FillColor = System.Drawing.Color.White; - this.cbSex.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.cbSex.Location = new System.Drawing.Point(136, 154); - this.cbSex.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cbSex.MinimumSize = new System.Drawing.Size(63, 0); - this.cbSex.Name = "cbSex"; - this.cbSex.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cbSex.Radius = 20; - this.cbSex.ReadOnly = true; - this.cbSex.Size = new System.Drawing.Size(250, 35); - this.cbSex.Style = Sunny.UI.UIStyle.Custom; - this.cbSex.TabIndex = 126; - this.cbSex.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // txtCustoNo - // - this.txtCustoNo.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoNo.FillColor = System.Drawing.Color.White; - this.txtCustoNo.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCustoNo.Location = new System.Drawing.Point(136, 50); - this.txtCustoNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCustoNo.Maximum = 2147483647D; - this.txtCustoNo.Minimum = -2147483648D; - this.txtCustoNo.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCustoNo.Name = "txtCustoNo"; - this.txtCustoNo.Padding = new System.Windows.Forms.Padding(5); - this.txtCustoNo.Radius = 20; - this.txtCustoNo.ReadOnly = true; - this.txtCustoNo.Size = new System.Drawing.Size(250, 35); - this.txtCustoNo.Style = Sunny.UI.UIStyle.Custom; - this.txtCustoNo.StyleCustomMode = true; - this.txtCustoNo.TabIndex = 125; - this.txtCustoNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // txtCustoName - // - this.txtCustoName.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoName.FillColor = System.Drawing.Color.White; - this.txtCustoName.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCustoName.Location = new System.Drawing.Point(136, 102); - this.txtCustoName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCustoName.Maximum = 2147483647D; - this.txtCustoName.Minimum = -2147483648D; - this.txtCustoName.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCustoName.Name = "txtCustoName"; - this.txtCustoName.Padding = new System.Windows.Forms.Padding(5); - this.txtCustoName.Radius = 20; - this.txtCustoName.ReadOnly = true; - this.txtCustoName.Size = new System.Drawing.Size(250, 35); - this.txtCustoName.Style = Sunny.UI.UIStyle.Custom; - this.txtCustoName.StyleCustomMode = true; - this.txtCustoName.TabIndex = 124; - this.txtCustoName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // txtCardID - // - this.txtCardID.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCardID.FillColor = System.Drawing.Color.White; - this.txtCardID.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCardID.Location = new System.Drawing.Point(512, 151); - this.txtCardID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCardID.Maximum = 2147483647D; - this.txtCardID.Minimum = -2147483648D; - this.txtCardID.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCardID.Name = "txtCardID"; - this.txtCardID.Padding = new System.Windows.Forms.Padding(5); - this.txtCardID.Radius = 20; - this.txtCardID.ReadOnly = true; - this.txtCardID.Size = new System.Drawing.Size(250, 35); - this.txtCardID.Style = Sunny.UI.UIStyle.Custom; - this.txtCardID.StyleCustomMode = true; - this.txtCardID.TabIndex = 123; - this.txtCardID.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // txtCustoTel - // - this.txtCustoTel.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoTel.FillColor = System.Drawing.Color.White; - this.txtCustoTel.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCustoTel.Location = new System.Drawing.Point(512, 202); - this.txtCustoTel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCustoTel.Maximum = 2147483647D; - this.txtCustoTel.Minimum = -2147483648D; - this.txtCustoTel.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCustoTel.Name = "txtCustoTel"; - this.txtCustoTel.Padding = new System.Windows.Forms.Padding(5); - this.txtCustoTel.Radius = 20; - this.txtCustoTel.ReadOnly = true; - this.txtCustoTel.Size = new System.Drawing.Size(250, 35); - this.txtCustoTel.Style = Sunny.UI.UIStyle.Custom; - this.txtCustoTel.StyleCustomMode = true; - this.txtCustoTel.TabIndex = 122; - this.txtCustoTel.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // dtpBirthday - // - this.dtpBirthday.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.dtpBirthday.FillColor = System.Drawing.Color.White; - this.dtpBirthday.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F); - this.dtpBirthday.Location = new System.Drawing.Point(136, 206); - this.dtpBirthday.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.dtpBirthday.MaxLength = 10; - this.dtpBirthday.MinimumSize = new System.Drawing.Size(63, 0); - this.dtpBirthday.Name = "dtpBirthday"; - this.dtpBirthday.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.dtpBirthday.Radius = 20; - this.dtpBirthday.ReadOnly = true; - this.dtpBirthday.Size = new System.Drawing.Size(250, 31); - this.dtpBirthday.Style = Sunny.UI.UIStyle.Custom; - this.dtpBirthday.SymbolDropDown = 61555; - this.dtpBirthday.SymbolNormal = 61555; - this.dtpBirthday.TabIndex = 121; - this.dtpBirthday.Text = "2020-11-24"; - this.dtpBirthday.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.dtpBirthday.Value = new System.DateTime(2020, 11, 24, 22, 50, 36, 791); - // - // txtCustoAdress - // - this.txtCustoAdress.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoAdress.FillColor = System.Drawing.Color.White; - this.txtCustoAdress.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtCustoAdress.Location = new System.Drawing.Point(134, 254); - this.txtCustoAdress.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCustoAdress.Maximum = 2147483647D; - this.txtCustoAdress.Minimum = -2147483648D; - this.txtCustoAdress.MinimumSize = new System.Drawing.Size(1, 1); - this.txtCustoAdress.Name = "txtCustoAdress"; - this.txtCustoAdress.Padding = new System.Windows.Forms.Padding(5); - this.txtCustoAdress.Radius = 20; - this.txtCustoAdress.ReadOnly = true; - this.txtCustoAdress.Size = new System.Drawing.Size(628, 35); - this.txtCustoAdress.Style = Sunny.UI.UIStyle.Custom; - this.txtCustoAdress.StyleCustomMode = true; - this.txtCustoAdress.TabIndex = 120; - this.txtCustoAdress.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(27, 264); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(88, 25); - this.label1.TabIndex = 118; - this.label1.Text = "居住地址"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(408, 209); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(88, 25); - this.label2.TabIndex = 117; - this.label2.Text = "联系方式"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(408, 158); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(88, 25); - this.label3.TabIndex = 116; - this.label3.Text = "证件号码"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(408, 107); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(88, 25); - this.label4.TabIndex = 115; - this.label4.Text = "证件类型"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(408, 56); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(88, 25); - this.label5.TabIndex = 114; - this.label5.Text = "客户类型"; - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label15.Location = new System.Drawing.Point(29, 212); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(88, 25); - this.label15.TabIndex = 113; - this.label15.Text = "出生日期"; - // - // label16 - // - this.label16.AutoSize = true; - this.label16.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label16.Location = new System.Drawing.Point(29, 160); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(74, 25); - this.label16.TabIndex = 112; - this.label16.Text = "性 别"; - // - // label17 - // - this.label17.AutoSize = true; - this.label17.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label17.Location = new System.Drawing.Point(29, 108); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(88, 25); - this.label17.TabIndex = 111; - this.label17.Text = "客户姓名"; - // - // label18 - // - this.label18.AutoSize = true; - this.label18.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label18.Location = new System.Drawing.Point(29, 56); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(88, 25); - this.label18.TabIndex = 110; - this.label18.Text = "客户编号"; - // - // FrmSelectCustoInfo - // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.ClientSize = new System.Drawing.Size(787, 316); - this.Controls.Add(this.cbCustoType); - this.Controls.Add(this.cbPassportType); - this.Controls.Add(this.cbSex); - this.Controls.Add(this.txtCustoNo); - this.Controls.Add(this.txtCustoName); - this.Controls.Add(this.txtCardID); - this.Controls.Add(this.txtCustoTel); - this.Controls.Add(this.dtpBirthday); - this.Controls.Add(this.txtCustoAdress); - this.Controls.Add(this.label1); - this.Controls.Add(this.label2); - this.Controls.Add(this.label3); - this.Controls.Add(this.label4); - this.Controls.Add(this.label5); - this.Controls.Add(this.label15); - this.Controls.Add(this.label16); - this.Controls.Add(this.label17); - this.Controls.Add(this.label18); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "FrmSelectCustoInfo"; - this.ShowIcon = true; - this.ShowTitleIcon = true; - this.Style = Sunny.UI.UIStyle.Custom; - this.Text = "客户信息"; - this.Load += new System.EventHandler(this.FrmSelectCustoInfo_Load); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - private Sunny.UI.UIComboBox cbCustoType; - private Sunny.UI.UIComboBox cbPassportType; - private Sunny.UI.UIComboBox cbSex; - private Sunny.UI.UITextBox txtCustoNo; - private Sunny.UI.UITextBox txtCustoName; - private Sunny.UI.UITextBox txtCardID; - private Sunny.UI.UITextBox txtCustoTel; - private Sunny.UI.UIDatePicker dtpBirthday; - private Sunny.UI.UITextBox txtCustoAdress; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label15; - private System.Windows.Forms.Label label16; - private System.Windows.Forms.Label label17; - private System.Windows.Forms.Label label18; - } -} \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmSelectCustoInfo.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmSelectCustoInfo.cs deleted file mode 100644 index 9f7821ddc1234243f00f16dcef51c36db7e54217..0000000000000000000000000000000000000000 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmSelectCustoInfo.cs +++ /dev/null @@ -1,126 +0,0 @@ -/* - * MIT License - *Copyright (c) 2021 易开元(EOM) - - *Permission is hereby granted, free of charge, to any person obtaining a copy - *of this software and associated documentation files (the "Software"), to deal - *in the Software without restriction, including without limitation the rights - *to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - *copies of the Software, and to permit persons to whom the Software is - *furnished to do so, subject to the following conditions: - - *The above copyright notice and this permission notice shall be included in all - *copies or substantial portions of the Software. - - *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - *IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - *FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - *AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - *LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - *OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - *SOFTWARE. - * - */ - -using EOM.TSHotelManagement.Common; -using EOM.TSHotelManagement.Common.Contract; -using Sunny.UI; - -namespace EOM.TSHotelManagement.FormUI -{ - public partial class FrmSelectCustoInfo : UIForm - { - public FrmSelectCustoInfo() - { - InitializeComponent(); - } - - Dictionary dic = null; - ResponseMsg result = null; - - #region 存放客户信息类 - public static string co_CustoNo; - public static string co_RoomNo; - public static string co_CustoName; - public static string co_CustoBirthday; - public static string co_CustoSex; - public static string co_CustoTel; - public static string co_CustoPassportType; - public static string co_CustoAddress; - public static string co_CustoType; - public static string co_CustoID; - #endregion - - private void FrmSelectCustoInfo_Load(object sender, EventArgs e) - { - #region 加载客户类型信息 - result = HttpHelper.Request(ApiConstants.Base_SelectCustoTypeAllCanUse); - var customerTypes = HttpHelper.JsonToModel>(result.message); - if (customerTypes.Code != BusinessStatusCode.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectCustoTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - this.cbCustoType.DataSource = customerTypes.Data.Items; - this.cbCustoType.DisplayMember = nameof(ReadCustoTypeOutputDto.CustomerTypeName); - this.cbCustoType.ValueMember = nameof(ReadCustoTypeOutputDto.CustomerType); - this.cbCustoType.SelectedIndex = 0; - this.cbCustoType.ReadOnly = true; - #endregion - - #region 加载证件类型信息 - result = HttpHelper.Request(ApiConstants.Base_SelectPassPortTypeAllCanUse); - var passportTypes = HttpHelper.JsonToModel>(result.message); - if (passportTypes.Code != BusinessStatusCode.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectPassPortTypeAllCanUse}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - this.cbPassportType.DataSource = passportTypes.Data.Items; - this.cbPassportType.DisplayMember = nameof(ReadPassportTypeOutputDto.PassportName); - this.cbPassportType.ValueMember = nameof(ReadPassportTypeOutputDto.PassportId); - this.cbPassportType.SelectedIndex = 0; - #endregion - - #region 加载性别信息 - dic = new Dictionary - { - { nameof(ReadGenderTypeInputDto.IsDelete) , "0" }, - { nameof(ReadGenderTypeInputDto.IgnorePaging) , "true" } - }; - result = HttpHelper.Request(ApiConstants.Base_SelectGenderTypeAll, dic); - var genderTypes = HttpHelper.JsonToModel>(result.message); - if (genderTypes.Code != BusinessStatusCode.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Base_SelectGenderTypeAll}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - this.cbSex.DataSource = genderTypes.Data.Items; - this.cbSex.DisplayMember = nameof(EnumDto.Description); - this.cbSex.ValueMember = nameof(EnumDto.Id); - this.cbSex.SelectedIndex = 0; - #endregion - - txtCustoNo.Text = ucRoom.rm_CustoNo; - dic = new Dictionary() - { - { nameof(ReadCustomerInputDto.CustomerNumber),txtCustoNo.Text.ToString() } - }; - result = HttpHelper.Request(ApiConstants.Customer_SelectCustoByInfo, dic); - var c = HttpHelper.JsonToModel>(result.message); - if (c.Code != BusinessStatusCode.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Customer_SelectCustoByInfo}+接口服务异常，请提交Issue或尝试更新版本！"); - return; - } - txtCustoAdress.Text = c.Data.CustomerAddress; - txtCustoName.Text = c.Data.CustomerName; - txtCardID.Text = c.Data.IdCardNumber; - txtCustoTel.Text = c.Data.CustomerPhoneNumber; - cbSex.Text = c.Data.CustomerGender == 1 ? "男" : "女"; - cbCustoType.SelectedValue = c.Data.CustomerType; - cbPassportType.SelectedValue = c.Data.PassportId; - dtpBirthday.Value = Convert.ToDateTime(c.Data.DateOfBirth); - } - } -} diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.Designer.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.Designer.cs index 651b8fd576ec269919237258db5bb8bf78b48410..e6ae042827d8e1d46595c6384c97b59ac42af7f6 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.Designer.cs @@ -30,14 +30,14 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmSellThing)); groupBox2 = new GroupBox(); - txtPrice = new Sunny.UI.UITextBox(); - uiLabel6 = new Sunny.UI.UILabel(); - nudNum = new Sunny.UI.UIDoubleUpDown(); - uiLabel5 = new Sunny.UI.UILabel(); - txtSellName = new Sunny.UI.UITextBox(); - uiLabel4 = new Sunny.UI.UILabel(); - txtSellNo = new Sunny.UI.UITextBox(); - uiLabel3 = new Sunny.UI.UILabel(); + label6 = new AntdUI.Label(); + label5 = new AntdUI.Label(); + label4 = new AntdUI.Label(); + label3 = new AntdUI.Label(); + nudNum = new AntdUI.InputNumber(); + txtPrice = new AntdUI.Input(); + txtSellName = new AntdUI.Input(); + txtSellNo = new AntdUI.Input(); label1 = new AntdUI.Label(); txtFind = new AntdUI.Input(); btnFind = new AntdUI.Button(); @@ -50,20 +50,21 @@ btnAdd = new AntdUI.Button(); btnCancel = new AntdUI.Button(); dgvRoomSell = new AntdUI.Table(); + ucWindowHeader1 = new ucWindowHeader(); groupBox2.SuspendLayout(); SuspendLayout(); // // groupBox2 // - groupBox2.Controls.Add(txtPrice); - groupBox2.Controls.Add(uiLabel6); + groupBox2.Controls.Add(label6); + groupBox2.Controls.Add(label5); + groupBox2.Controls.Add(label4); + groupBox2.Controls.Add(label3); groupBox2.Controls.Add(nudNum); - groupBox2.Controls.Add(uiLabel5); + groupBox2.Controls.Add(txtPrice); groupBox2.Controls.Add(txtSellName); - groupBox2.Controls.Add(uiLabel4); groupBox2.Controls.Add(txtSellNo); - groupBox2.Controls.Add(uiLabel3); - groupBox2.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + groupBox2.Font = new Font("Noto Sans SC", 9F); groupBox2.Location = new Point(617, 88); groupBox2.Name = "groupBox2"; groupBox2.Size = new Size(452, 123); @@ -71,151 +72,107 @@ groupBox2.TabStop = false; groupBox2.Text = "订购中心"; // - // txtPrice - // - txtPrice.Cursor = Cursors.IBeam; - txtPrice.Font = new Font("微软雅黑", 12F); - txtPrice.Location = new Point(310, 74); - txtPrice.Margin = new Padding(4, 5, 4, 5); - txtPrice.MinimumSize = new Size(1, 1); - txtPrice.Name = "txtPrice"; - txtPrice.Padding = new Padding(5); - txtPrice.Radius = 20; - txtPrice.ReadOnly = true; - txtPrice.ShowText = false; - txtPrice.Size = new Size(116, 29); - txtPrice.Style = Sunny.UI.UIStyle.Custom; - txtPrice.TabIndex = 30; - txtPrice.TextAlignment = ContentAlignment.MiddleLeft; - txtPrice.Watermark = ""; - // - // uiLabel6 - // - uiLabel6.Font = new Font("微软雅黑", 12F); - uiLabel6.ForeColor = Color.FromArgb(48, 48, 48); - uiLabel6.Location = new Point(258, 74); - uiLabel6.Name = "uiLabel6"; - uiLabel6.Size = new Size(61, 29); - uiLabel6.Style = Sunny.UI.UIStyle.Custom; - uiLabel6.TabIndex = 29; - uiLabel6.Text = "单价："; - uiLabel6.TextAlign = ContentAlignment.MiddleLeft; + // label6 + // + label6.BackColor = Color.Transparent; + label6.Font = new Font("Noto Sans SC", 12F); + label6.Location = new Point(258, 32); + label6.Name = "label6"; + label6.Size = new Size(61, 23); + label6.TabIndex = 38; + label6.Text = "数量："; + // + // label5 + // + label5.BackColor = Color.Transparent; + label5.Font = new Font("Noto Sans SC", 12F); + label5.Location = new Point(258, 78); + label5.Name = "label5"; + label5.Size = new Size(61, 23); + label5.TabIndex = 37; + label5.Text = "单价："; + // + // label4 + // + label4.BackColor = Color.Transparent; + label4.Font = new Font("Noto Sans SC", 12F); + label4.Location = new Point(19, 78); + label4.Name = "label4"; + label4.Size = new Size(92, 23); + label4.TabIndex = 36; + label4.Text = "商品名称："; + label4.TextAlign = ContentAlignment.MiddleCenter; + // + // label3 + // + label3.BackColor = Color.Transparent; + label3.Font = new Font("Noto Sans SC", 12F); + label3.Location = new Point(19, 32); + label3.Name = "label3"; + label3.Size = new Size(92, 23); + label3.TabIndex = 35; + label3.Text = "商品编号："; + label3.TextAlign = ContentAlignment.MiddleCenter; // // nudNum // - nudNum.AutoValidate = AutoValidate.Disable; - nudNum.Font = new Font("新宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - nudNum.Location = new Point(310, 30); - nudNum.Margin = new Padding(4, 5, 4, 5); - nudNum.Maximum = 9999D; - nudNum.Minimum = 0D; - nudNum.MinimumSize = new Size(100, 0); + nudNum.Font = new Font("Noto Sans SC", 12F); + nudNum.Location = new Point(319, 23); nudNum.Name = "nudNum"; - nudNum.Radius = 20; - nudNum.ShowText = false; - nudNum.Size = new Size(116, 29); - nudNum.Step = 1D; - nudNum.Style = Sunny.UI.UIStyle.Custom; - nudNum.StyleCustomMode = true; - nudNum.TabIndex = 25; - nudNum.Text = null; - nudNum.TextAlignment = ContentAlignment.MiddleCenter; - nudNum.ValueChanged += nudNum_ValueChanged; - // - // uiLabel5 - // - uiLabel5.Font = new Font("微软雅黑", 12F); - uiLabel5.ForeColor = Color.FromArgb(48, 48, 48); - uiLabel5.Location = new Point(258, 30); - uiLabel5.Name = "uiLabel5"; - uiLabel5.Size = new Size(61, 29); - uiLabel5.Style = Sunny.UI.UIStyle.Custom; - uiLabel5.TabIndex = 28; - uiLabel5.Text = "数量："; - uiLabel5.TextAlign = ContentAlignment.MiddleLeft; + nudNum.Size = new Size(119, 38); + nudNum.TabIndex = 34; + nudNum.Text = "0"; + nudNum.TextAlign = HorizontalAlignment.Center; + // + // txtPrice + // + txtPrice.Font = new Font("Noto Sans SC", 12F); + txtPrice.Location = new Point(319, 69); + txtPrice.Name = "txtPrice"; + txtPrice.ReadOnly = true; + txtPrice.Size = new Size(119, 38); + txtPrice.TabIndex = 33; // // txtSellName // - txtSellName.Cursor = Cursors.IBeam; - txtSellName.Font = new Font("微软雅黑", 12F); - txtSellName.Location = new Point(107, 74); - txtSellName.Margin = new Padding(4, 5, 4, 5); - txtSellName.MinimumSize = new Size(1, 1); + txtSellName.Font = new Font("Noto Sans SC", 12F); + txtSellName.Location = new Point(111, 69); txtSellName.Name = "txtSellName"; - txtSellName.Padding = new Padding(5); - txtSellName.Radius = 20; txtSellName.ReadOnly = true; - txtSellName.ShowText = false; - txtSellName.Size = new Size(145, 29); - txtSellName.Style = Sunny.UI.UIStyle.Custom; - txtSellName.TabIndex = 27; - txtSellName.TextAlignment = ContentAlignment.MiddleLeft; - txtSellName.Watermark = ""; - // - // uiLabel4 - // - uiLabel4.Font = new Font("微软雅黑", 12F); - uiLabel4.ForeColor = Color.FromArgb(48, 48, 48); - uiLabel4.Location = new Point(26, 73); - uiLabel4.Name = "uiLabel4"; - uiLabel4.Size = new Size(92, 29); - uiLabel4.Style = Sunny.UI.UIStyle.Custom; - uiLabel4.TabIndex = 26; - uiLabel4.Text = "商品名称："; - uiLabel4.TextAlign = ContentAlignment.MiddleLeft; + txtSellName.Size = new Size(145, 38); + txtSellName.TabIndex = 32; // // txtSellNo // - txtSellNo.Cursor = Cursors.IBeam; - txtSellNo.Font = new Font("微软雅黑", 12F); - txtSellNo.Location = new Point(107, 30); - txtSellNo.Margin = new Padding(4, 5, 4, 5); - txtSellNo.MinimumSize = new Size(1, 1); + txtSellNo.Font = new Font("Noto Sans SC", 12F); + txtSellNo.Location = new Point(111, 23); txtSellNo.Name = "txtSellNo"; - txtSellNo.Padding = new Padding(5); - txtSellNo.Radius = 20; txtSellNo.ReadOnly = true; - txtSellNo.ShowText = false; - txtSellNo.Size = new Size(145, 29); - txtSellNo.Style = Sunny.UI.UIStyle.Custom; - txtSellNo.TabIndex = 25; - txtSellNo.TextAlignment = ContentAlignment.MiddleLeft; - txtSellNo.Watermark = ""; - // - // uiLabel3 - // - uiLabel3.Font = new Font("微软雅黑", 12F); - uiLabel3.ForeColor = Color.FromArgb(48, 48, 48); - uiLabel3.Location = new Point(26, 29); - uiLabel3.Name = "uiLabel3"; - uiLabel3.Size = new Size(92, 29); - uiLabel3.Style = Sunny.UI.UIStyle.Custom; - uiLabel3.TabIndex = 23; - uiLabel3.Text = "商品编号："; - uiLabel3.TextAlign = ContentAlignment.MiddleLeft; + txtSellNo.Size = new Size(145, 38); + txtSellNo.TabIndex = 31; // // label1 // label1.BackColor = Color.Transparent; - label1.Font = new Font("微软雅黑", 12F); - label1.Location = new Point(65, 51); + label1.Font = new Font("Noto Sans SC", 12F); + label1.Location = new Point(45, 51); label1.Name = "label1"; - label1.Size = new Size(125, 23); + label1.Size = new Size(145, 23); label1.TabIndex = 26; - label1.Text = "要查找的商品："; + label1.Text = "要查找的商品名称："; label1.TextAlign = ContentAlignment.MiddleCenter; // // txtFind // - txtFind.Font = new Font("微软雅黑", 12F); - txtFind.Location = new Point(200, 44); + txtFind.Font = new Font("Noto Sans SC", 12F); + txtFind.Location = new Point(200, 42); txtFind.Name = "txtFind"; txtFind.Size = new Size(197, 38); txtFind.TabIndex = 27; // // btnFind // - btnFind.Font = new Font("微软雅黑", 12F); + btnFind.Font = new Font("Noto Sans SC", 12F); btnFind.Location = new Point(407, 44); btnFind.Name = "btnFind"; btnFind.Size = new Size(101, 38); @@ -227,7 +184,7 @@ // label2 // label2.BackColor = Color.Transparent; - label2.Font = new Font("微软雅黑", 12F); + label2.Font = new Font("Noto Sans SC", 12F); label2.Location = new Point(518, 51); label2.Name = "label2"; label2.Size = new Size(92, 23); @@ -237,8 +194,8 @@ // // txtRoomNo // - txtRoomNo.Font = new Font("微软雅黑", 12F); - txtRoomNo.Location = new Point(620, 44); + txtRoomNo.Font = new Font("Noto Sans SC", 12F); + txtRoomNo.Location = new Point(617, 42); txtRoomNo.Name = "txtRoomNo"; txtRoomNo.Size = new Size(134, 38); txtRoomNo.TabIndex = 30; @@ -247,7 +204,7 @@ // // btnCheck // - btnCheck.Font = new Font("微软雅黑", 12F); + btnCheck.Font = new Font("Noto Sans SC", 12F); btnCheck.Location = new Point(764, 44); btnCheck.Name = "btnCheck"; btnCheck.Size = new Size(101, 38); @@ -259,7 +216,7 @@ // lblState // lblState.BackColor = Color.Transparent; - lblState.Font = new Font("微软雅黑", 12F); + lblState.Font = new Font("Noto Sans SC", 12F); lblState.Location = new Point(875, 51); lblState.Name = "lblState"; lblState.Size = new Size(130, 23); @@ -271,7 +228,8 @@ // dgvSellthing.AutoSizeColumnsMode = AntdUI.ColumnsMode.Fill; dgvSellthing.Bordered = true; - dgvSellthing.Font = new Font("Microsoft YaHei UI", 9F); + dgvSellthing.Font = new Font("Noto Sans SC", 9F); + dgvSellthing.Gap = 12; dgvSellthing.Location = new Point(4, 88); dgvSellthing.Name = "dgvSellthing"; dgvSellthing.Size = new Size(487, 351); @@ -280,8 +238,7 @@ // // btnPg // - btnPg.Current = 0; - btnPg.Font = new Font("微软雅黑", 12F); + btnPg.Font = new Font("Noto Sans SC", 12F); btnPg.Location = new Point(4, 448); btnPg.Name = "btnPg"; btnPg.PageSize = 15; @@ -292,7 +249,7 @@ // // btnAdd // - btnAdd.Font = new Font("微软雅黑", 12F); + btnAdd.Font = new Font("Noto Sans SC", 12F); btnAdd.Location = new Point(496, 88); btnAdd.Name = "btnAdd"; btnAdd.Size = new Size(115, 38); @@ -303,7 +260,7 @@ // // btnCancel // - btnCancel.Font = new Font("微软雅黑", 12F); + btnCancel.Font = new Font("Noto Sans SC", 12F); btnCancel.Location = new Point(496, 174); btnCancel.Name = "btnCancel"; btnCancel.Size = new Size(115, 38); @@ -316,18 +273,27 @@ // dgvRoomSell.AutoSizeColumnsMode = AntdUI.ColumnsMode.Fill; dgvRoomSell.Bordered = true; - dgvRoomSell.Font = new Font("Microsoft YaHei UI", 9F); + dgvRoomSell.Font = new Font("Noto Sans SC", 9F); + dgvRoomSell.Gap = 12; dgvRoomSell.Location = new Point(497, 217); dgvRoomSell.Name = "dgvRoomSell"; dgvRoomSell.Size = new Size(572, 262); dgvRoomSell.TabIndex = 138; dgvRoomSell.CellClick += dgvRoomSell_CellClick; // + // ucWindowHeader1 + // + ucWindowHeader1.Location = new Point(1, 1); + ucWindowHeader1.Name = "ucWindowHeader1"; + ucWindowHeader1.Size = new Size(1071, 35); + ucWindowHeader1.TabIndex = 139; + // // FrmSellThing // AutoScaleMode = AutoScaleMode.None; BackColor = Color.FromArgb(235, 243, 255); ClientSize = new Size(1072, 486); + Controls.Add(ucWindowHeader1); Controls.Add(dgvRoomSell); Controls.Add(btnCancel); Controls.Add(btnAdd); @@ -341,15 +307,13 @@ Controls.Add(txtFind); Controls.Add(label1); Controls.Add(groupBox2); + FormBorderStyle = FormBorderStyle.None; Icon = (Icon)resources.GetObject("$this.Icon"); - IsForbidAltF4 = true; MaximizeBox = false; MinimizeBox = false; Name = "FrmSellThing"; - ShowTitleIcon = true; - Style = Sunny.UI.UIStyle.Custom; + Resizable = false; Text = "商品消费"; - ZoomScaleRect = new Rectangle(15, 15, 1072, 490); Load += FrmSellThing_Load; groupBox2.ResumeLayout(false); ResumeLayout(false); @@ -357,15 +321,6 @@ #endregion private System.Windows.Forms.GroupBox groupBox2; - //private Sunny.UI.UIDataGridView dgvRoomSell; - private Sunny.UI.UITextBox txtPrice; - private Sunny.UI.UILabel uiLabel6; - private Sunny.UI.UIDoubleUpDown nudNum; - private Sunny.UI.UILabel uiLabel5; - private Sunny.UI.UITextBox txtSellName; - private Sunny.UI.UILabel uiLabel4; - private Sunny.UI.UITextBox txtSellNo; - private Sunny.UI.UILabel uiLabel3; private System.Windows.Forms.DataGridViewTextBoxColumn clRoomNo; private System.Windows.Forms.DataGridViewTextBoxColumn clCustoNo; private System.Windows.Forms.DataGridViewTextBoxColumn clSpendName; @@ -402,5 +357,14 @@ private AntdUI.Button btnAdd; private AntdUI.Button btnCancel; private AntdUI.Table dgvRoomSell; + private ucWindowHeader ucWindowHeader1; + private AntdUI.InputNumber nudNum; + private AntdUI.Input txtPrice; + private AntdUI.Input txtSellName; + private AntdUI.Input txtSellNo; + private AntdUI.Label label6; + private AntdUI.Label label5; + private AntdUI.Label label4; + private AntdUI.Label label3; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.cs b/EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.cs index bc52d16828c226426f2995ce323904c011fd69f5..753da66d24caf5b78afb2202a959282d3622e0b3 100644 --- a/EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.cs +++ b/EOM.TSHotelManagement.FormUI/ClientModule/FrmSellThing.cs @@ -22,17 +22,18 @@ * */ +using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Core; +using EOM.TSHotelManagement.Common.Util; using EOM.TSHotelManagement.Shared; using jvncorelib.EntityLib; -using Sunny.UI; using System.Transactions; namespace EOM.TSHotelManagement.FormUI { - public partial class FrmSellThing : Sunny.UI.UIForm + public partial class FrmSellThing : Window { static string roomNo; @@ -41,12 +42,15 @@ namespace EOM.TSHotelManagement.FormUI ReadRoomOutputDto r = null; private static ReadSpendOutputDto spend = null; + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmSellThing)); private LoadingProgress loadingProgress; public FrmSellThing() { InitializeComponent(); loadingProgress = new LoadingProgress(); + + ucWindowHeader1.ApplySettingsWithoutMinimize("商品消费", string.Empty, (Image)resources.GetObject("FrmSellThing.Icon")!); } #region 窗体加载事件 @@ -70,15 +74,14 @@ namespace EOM.TSHotelManagement.FormUI { dic = new Dictionary() { - { nameof(ReadSellThingInputDto.ProductNumber) , sellthing.Trim() }, { nameof(ReadSellThingInputDto.ProductName) , sellthing.Trim() }, - { nameof(ReadSellThingInputDto.Specification) , sellthing.Trim() } + { nameof(ReadSellThingInputDto.IsDelete) , "0" } }; result = HttpHelper.Request(ApiConstants.Sellthing_SelectSellThingAll, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Sellthing_SelectSellThingAll}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Sellthing_SelectSellThingAll}+接口服务异常，请提交Issue或尝试更新版本！"); return; } @@ -101,19 +104,21 @@ namespace EOM.TSHotelManagement.FormUI #endregion #region 根据客户编号加载消费信息的方法 - private void LoadSpendInfoByRoomNo(string room) + private void LoadSpendInfoByRoomNo(ReadRoomOutputDto room) { dgvRoomSell.Spin("正在加载中...", config => { dic = new Dictionary() { - { nameof(ReadSpendInputDto.RoomNumber), room } + { nameof(ReadSpendInputDto.CustomerNumber), room.CustomerNumber }, + { nameof(ReadSpendInputDto.RoomNumber), room.RoomNumber }, + { nameof(ReadSpendInputDto.SettlementStatus) , ConsumptionConstant.UnSettle.Code }, }; result = HttpHelper.Request(ApiConstants.Spend_SelectSpendByRoomNo, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Spend_SelectSpendByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Spend_SelectSpendByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); return; } List lstData = response.Data.Items; @@ -154,7 +159,7 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Sellthing_SelectSellThingAll, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { AntdUI.Message.error(this, $"{ApiConstants.Sellthing_SelectSellThingAll}+接口服务异常，请提交Issue或尝试更新版本！"); return null!; @@ -176,31 +181,31 @@ namespace EOM.TSHotelManagement.FormUI { if (string.IsNullOrEmpty(txtRoomNo.Text)) { - UIMessageBox.Show("消费房间不能为空", "提示信息", UIStyle.Red, UIMessageBoxButtons.OKCancel); + NotificationService.ShowWarning("消费房间不能为空"); txtRoomNo.Focus(); return false; } if (string.IsNullOrEmpty(txtSellNo.Text)) { - UIMessageBox.Show("商品编号不能为空", "提示信息", UIStyle.Red, UIMessageBoxButtons.OKCancel); + NotificationService.ShowWarning("商品编号不能为空"); txtSellNo.Focus(); return false; } if (string.IsNullOrEmpty(txtSellName.Text)) { - UIMessageBox.Show("商品名称不能为空", "提示信息", UIStyle.Red, UIMessageBoxButtons.OKCancel); + NotificationService.ShowWarning("商品名称不能为空"); txtSellName.Focus(); return false; } if (string.IsNullOrEmpty(txtPrice.Text)) { - UIMessageBox.Show("商品单价不能为空", "提示信息", UIStyle.Red, UIMessageBoxButtons.OKCancel); + NotificationService.ShowWarning("商品单价不能为空"); txtPrice.Focus(); return false; } if (nudNum.Value <= 0) { - UIMessageBox.Show("数量不能小于或等于0", "提示信息", UIStyle.Red, UIMessageBoxButtons.OKCancel); + NotificationService.ShowWarning("数量不能小于或等于0"); txtPrice.Focus(); return false; } @@ -217,12 +222,12 @@ namespace EOM.TSHotelManagement.FormUI { if (lblState.Visible == false) { - UIMessageBox.Show("请先输入消费的房间！", "提示信息", UIStyle.Red); + NotificationService.ShowWarning("请先输入消费的房间！"); return; } if (nudNum.Value <= 0) { - UIMessageBox.Show("请输入消费数量！", "提示信息", UIStyle.Red); + NotificationService.ShowWarning("请输入消费数量！"); return; } if (lblState.Text == "该房间可消费") @@ -231,7 +236,7 @@ namespace EOM.TSHotelManagement.FormUI try { - var result = HttpHelper.Request(ApiConstants.Spend_AddCustomerSpend, HttpHelper.ModelToJson(new AddCustomerSpendInputDto + var customerSpend = new AddCustomerSpendInputDto { RoomNumber = txtRoomNo.Text.Trim(), ProductNumber = txtSellNo.Text.Trim(), @@ -240,21 +245,22 @@ namespace EOM.TSHotelManagement.FormUI Price = Convert.ToDecimal(txtPrice.Text), WorkerNo = LoginInfo.WorkerNo, SoftwareVersion = LoginInfo.SoftwareVersion - })); + }; + var result = HttpHelper.Request(ApiConstants.Spend_AddCustomerSpend, customerSpend.ModelToJson()); var response = HttpHelper.JsonToModel(result.message!); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - UIMessageBox.ShowError(response.Message ?? "添加消费记录失败"); + NotificationService.ShowError(response.Message ?? "添加消费记录失败"); return; } - UIMessageBox.Show("添加成功", "系统提示", UIStyle.Green); + NotificationService.ShowSuccess("添加成功"); - LoadSpendInfoByRoomNo(txtRoomNo.Text.Trim()); + LoadSpendInfoByRoomNo(r); LoadSellThingInfo(); } catch (Exception ex) { - UIMessageBox.ShowError($"接口调用异常: {ex.Message}"); + NotificationService.ShowError($"接口调用异常: {ex.Message}"); return; } } @@ -269,17 +275,22 @@ namespace EOM.TSHotelManagement.FormUI { if (lblState.Visible == false) { - UIMessageBox.Show("请先输入消费的房间！", "提示信息", UIStyle.Red); + NotificationService.ShowWarning("请先输入消费的房间！"); return; } if (!spend.IsNullOrEmpty()) { if (spend.ConsumptionType == SpendType.Room.Code || spend.ConsumptionType == SpendType.Other.Code) { - UIMessageBox.Show($"此条消费记录非{SpendType.Product.Description}记录，无法删除！", "提示信息", UIStyle.Red); + NotificationService.ShowError($"此条消费记录非{SpendType.Product.Description}记录，无法删除！"); return; } - if (UIMessageDialog.ShowMessageDialog("你确定要撤回该消费记录吗？", UILocalize.WarningTitle, true, Style)) + var dr = AntdUI.Modal.open(new AntdUI.Modal.Config(this, UIMessageConstant.Information, $"你确定要撤回该消费记录吗？", AntdUI.TType.Info) + { + CancelText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Wait, UIMessageConstant.Chs_Wait), + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Yes, UIMessageConstant.Chs_Yes) + }); + if (dr == DialogResult.OK) { using (TransactionScope scope = new TransactionScope()) { @@ -291,36 +302,36 @@ namespace EOM.TSHotelManagement.FormUI }; result = HttpHelper.Request(ApiConstants.Sellthing_SelectSellThingByNameAndPrice, dic); var response = HttpHelper.JsonToModel>(result.message); - if (response.Code != BusinessStatusCode.Success) + if (response.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Sellthing_SelectSellThingByNameAndPrice}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Sellthing_SelectSellThingByNameAndPrice}+接口服务异常，请提交Issue或尝试更新版本！"); return; } ReadSellThingOutputDto s = response.Data; - decimal num = Convert.ToDecimal(spend.ConsumptionQuantity); - decimal inboundStock = (s.Stock + num); - result = HttpHelper.Request(ApiConstants.Spend_UndoCustomerSpend, HttpHelper.ModelToJson(new UpdateSpendInputDto { SpendNumber = spend.SpendNumber })); + int num = spend.ConsumptionQuantity; + int inboundStock = (s.Stock + num); + var model = new UpdateSpendInputDto { SpendNumber = spend.SpendNumber }; + result = HttpHelper.Request(ApiConstants.Spend_UndoCustomerSpend, model.ModelToJson()); var undoSpendResponse = HttpHelper.JsonToModel(result.message); - if (undoSpendResponse.Code != BusinessStatusCode.Success) + if (undoSpendResponse.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Spend_UndoCustomerSpend}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Spend_UndoCustomerSpend}+接口服务异常，请提交Issue或尝试更新版本！"); return; } var sellThing = new UpdateSellThingInputDto { ProductName = s.ProductName, ProductPrice = s.ProductPrice, Stock = inboundStock, ProductNumber = s.ProductNumber, Specification = s.Specification }; - result = HttpHelper.Request(ApiConstants.Sellthing_UpdateSellthingInfo, HttpHelper.ModelToJson(sellThing)); + result = HttpHelper.Request(ApiConstants.Sellthing_UpdateSellthingInfo, sellThing.ModelToJson()); var updateResponse = HttpHelper.JsonToModel(result.message); - if (updateResponse.Code != BusinessStatusCode.Success) + if (updateResponse.Success == false) { - UIMessageTip.ShowError("撤销失败！", 1000); RecordHelper.Record($"接口异常。Message：\n{updateResponse.Message}", Common.Core.LogLevel.Critical); - UIMessageBox.ShowError($"{ApiConstants.Sellthing_UpdateSellthingInfo}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Sellthing_UpdateSellthingInfo}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - UIMessageTip.ShowOk("撤销成功！", 1000); + NotificationService.ShowSuccess("撤销成功！"); #region 获取添加操作日志所需的信息 RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "帮助" + spend.CustomerNumber + "撤销了消费商品:" + txtSellName.Text + "操作！", Common.Core.LogLevel.Warning); #endregion - LoadSpendInfoByRoomNo(txtRoomNo.Text); + LoadSpendInfoByRoomNo(r); LoadSellThingInfo(); nudNum.Value = 0; scope.Complete(); @@ -334,20 +345,12 @@ namespace EOM.TSHotelManagement.FormUI } else { - UIMessageTip.ShowError("操作取消！", 1000); + NotificationService.ShowWarning("操作取消！"); } } else { - UIMessageBox.Show("请选择要删除的消费记录！", "提示信息", UIStyle.Red); - } - } - - private void nudNum_ValueChanged(object sender, double value) - { - if (nudNum.Value < 0) - { - nudNum.Value = 0; + NotificationService.ShowWarning("请选择要删除的消费记录！"); } } @@ -366,21 +369,21 @@ namespace EOM.TSHotelManagement.FormUI string room = txtRoomNo.Text.Trim(); if (string.IsNullOrWhiteSpace(room) == true) { - UIMessageTip.ShowWarning("请输入消费房间号！", 1000); + NotificationService.ShowWarning("请输入消费房间号！"); return; } dic = new Dictionary() { - { nameof(ReadRoomInputDto.RoomNumber) , room} + { nameof(ReadSpendInputDto.RoomNumber) , room }, }; result = HttpHelper.Request(ApiConstants.Room_SelectRoomByRoomNo, dic); var checkResponse = HttpHelper.JsonToModel>(result.message); - if (checkResponse.Code != BusinessStatusCode.Success) + if (checkResponse.Success == false) { - UIMessageBox.ShowError($"{ApiConstants.Room_SelectRoomByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); + NotificationService.ShowError($"{ApiConstants.Room_SelectRoomByRoomNo}+接口服务异常，请提交Issue或尝试更新版本！"); return; } - ReadRoomOutputDto r = checkResponse.Data; + r = checkResponse.Data; if (txtRoomNo.Text == "") { lblState.Text = ""; @@ -398,7 +401,7 @@ namespace EOM.TSHotelManagement.FormUI lblState.Visible = true; lblState.Text = "该房间可消费"; lblState.ForeColor = Color.Black; - LoadSpendInfoByRoomNo(room); + LoadSpendInfoByRoomNo(r); } else { @@ -414,7 +417,7 @@ namespace EOM.TSHotelManagement.FormUI { if (lblState.Visible == false) { - UIMessageBox.Show("请先输入消费的房间！", "提示信息", UIStyle.Red); + NotificationService.ShowWarning("请先输入消费的房间！"); return; } if (e.Record is IList data) diff --git a/EOM.TSHotelManagement.FormUI/EOM.TSHotelManagement.FormUI.csproj b/EOM.TSHotelManagement.FormUI/EOM.TSHotelManagement.FormUI.csproj index f372872d1e7839574b8d1c61cc76e20fdf871ff7..4315ea43c377ba2ec3b5ce31cd9e822e561e5a98 100644 --- a/EOM.TSHotelManagement.FormUI/EOM.TSHotelManagement.FormUI.csproj +++ b/EOM.TSHotelManagement.FormUI/EOM.TSHotelManagement.FormUI.csproj @@ -11,7 +11,7 @@ true enable true - 2.8.5.3 + 2.8.6.0 EOM.TSHotelManagement.FormUI.Program x64 TS酒店管理系统 @@ -37,9 +37,6 @@ Form - - Form - Form @@ -47,9 +44,6 @@ Form - - Form - Form @@ -62,7 +56,7 @@ Form - + Form @@ -83,9 +77,6 @@ Form - - UserControl - UserControl @@ -121,11 +112,10 @@ - + - diff --git a/EOM.TSHotelManagement.FormUI/Properties/Resources.Designer.cs b/EOM.TSHotelManagement.FormUI/Properties/Resources.Designer.cs index e5f8616914f2157764ce82e41c40269ae48d075a..662e6eede2060907279327f3a5aee65949b1ea3e 100644 --- a/EOM.TSHotelManagement.FormUI/Properties/Resources.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/Properties/Resources.Designer.cs @@ -70,46 +70,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap arrow_down_b { - get { - object obj = ResourceManager.GetObject("arrow-down-b", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap blue_refresh { - get { - object obj = ResourceManager.GetObject("blue_refresh", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap close { - get { - object obj = ResourceManager.GetObject("close", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018_jpg_w1024_new_small { - get { - object obj = ResourceManager.GetObject("jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -160,26 +120,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap picExtend_Image { - get { - object obj = ResourceManager.GetObject("picExtend.Image", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap picExtend_ImageHover { - get { - object obj = ResourceManager.GetObject("picExtend.ImageHover", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -220,96 +160,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 上传照片 { - get { - object obj = ResourceManager.GetObject("上传照片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 个人中心 { - get { - object obj = ResourceManager.GetObject("个人中心", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 人力资源部卡片 { - get { - object obj = ResourceManager.GetObject("人力资源部卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 修改 { - get { - object obj = ResourceManager.GetObject("修改", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 关于我们 { - get { - object obj = ResourceManager.GetObject("关于我们", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 内控部卡片 { - get { - object obj = ResourceManager.GetObject("内控部卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 切换账号 { - get { - object obj = ResourceManager.GetObject("切换账号", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 可住房_hover_icon { - get { - object obj = ResourceManager.GetObject("可住房(hover)icon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 可住房icon { - get { - object obj = ResourceManager.GetObject("可住房icon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -320,36 +170,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 后勤部卡片 { - get { - object obj = ResourceManager.GetObject("后勤部卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 咖啡 { - get { - object obj = ResourceManager.GetObject("咖啡", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 商品部卡片 { - get { - object obj = ResourceManager.GetObject("商品部卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -370,26 +190,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 已住房_hover_icon { - get { - object obj = ResourceManager.GetObject("已住房(hover)icon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 已住房icon { - get { - object obj = ResourceManager.GetObject("已住房icon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -400,26 +200,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 常规部门卡片 { - get { - object obj = ResourceManager.GetObject("常规部门卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 总经办卡片 { - get { - object obj = ResourceManager.GetObject("总经办卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -430,56 +210,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 早上 { - get { - object obj = ResourceManager.GetObject("早上", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 普通会员 { - get { - object obj = ResourceManager.GetObject("普通会员", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 月亮 { - get { - object obj = ResourceManager.GetObject("月亮", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 检查更新__1_ { - get { - object obj = ResourceManager.GetObject("检查更新 (1)", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 注销 { - get { - object obj = ResourceManager.GetObject("注销", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -490,66 +220,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 白金会员 { - get { - object obj = ResourceManager.GetObject("白金会员", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 监管小组卡片 { - get { - object obj = ResourceManager.GetObject("监管小组卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 系统管理员 { - get { - object obj = ResourceManager.GetObject("系统管理员", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 经理部卡片 { - get { - object obj = ResourceManager.GetObject("经理部卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 维修房_hover_icon { - get { - object obj = ResourceManager.GetObject("维修房(hover)icon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 维修房icon { - get { - object obj = ResourceManager.GetObject("维修房icon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -560,36 +230,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 维修部卡片 { - get { - object obj = ResourceManager.GetObject("维修部卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 脏房_hover_icon { - get { - object obj = ResourceManager.GetObject("脏房(hover)icon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 脏房icon1 { - get { - object obj = ResourceManager.GetObject("脏房icon1", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -600,16 +240,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 财务部卡片 { - get { - object obj = ResourceManager.GetObject("财务部卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -630,56 +260,6 @@ namespace EOM.TSHotelManagement.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 酒店部卡片 { - get { - object obj = ResourceManager.GetObject("酒店部卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 钻石会员 { - get { - object obj = ResourceManager.GetObject("钻石会员", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 锁屏 { - get { - object obj = ResourceManager.GetObject("锁屏", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 预约房_hover_icon { - get { - object obj = ResourceManager.GetObject("预约房(hover)icon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 预约房icon { - get { - object obj = ResourceManager.GetObject("预约房icon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -689,25 +269,5 @@ namespace EOM.TSHotelManagement.FormUI.Properties { return ((System.Drawing.Bitmap)(obj)); } } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 餐饮部卡片 { - get { - object obj = ResourceManager.GetObject("餐饮部卡片", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 黄金会员 { - get { - object obj = ResourceManager.GetObject("黄金会员", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } } } diff --git a/EOM.TSHotelManagement.FormUI/Properties/Resources.resx b/EOM.TSHotelManagement.FormUI/Properties/Resources.resx index 87e2814912fd96984d9b629f3c5286acd2c82e36..77d69cfe101b255b21748a33a7391b3d84b5da4d 100644 --- a/EOM.TSHotelManagement.FormUI/Properties/Resources.resx +++ b/EOM.TSHotelManagement.FormUI/Properties/Resources.resx @@ -118,30 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\后勤部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\picExtend.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\修改.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\普通会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\注销.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\锁屏.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\picRoom.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\月亮.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\打卡.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -151,138 +130,42 @@ ..\Resources\picRoom.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\餐饮部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\总经办卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\可住房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\用户登录.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\商品部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\上传照片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\白金会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\关于我们.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\脏房icon1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\picCustomer.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\密码.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\blue_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\picCommodity.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\picCommodity.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\财务部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\lockicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\维修部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\人力资源部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\切换账号.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\settings2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\脏房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\已住房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\咖啡.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\脏房状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\经理部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\黄金会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\内控部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\检查更新 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\个人中心.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\常规部门卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\酒店部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\预约状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\picCustomer.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\预约房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\维修房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\转换.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\系统管理员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\picLogo.BackgroundImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\可住房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\早上.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\arrow-down-b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\钻石会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\已住状态.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -292,21 +175,6 @@ ..\Resources\复制.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\已住房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\预约房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\监管小组卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\维修房icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\picExtend.ImageHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\账号.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/EOM.TSHotelManagement.FormUI/Resources/arrow-down-b.png b/EOM.TSHotelManagement.FormUI/Resources/arrow-down-b.png deleted file mode 100644 index 7eabdc7ca4b00a854b670f4e02bdfd7b849ffd4f..0000000000000000000000000000000000000000 Binary files a/EOM.TSHotelManagement.FormUI/Resources/arrow-down-b.png and /dev/null differ diff --git a/EOM.TSHotelManagement.FormUI/Resources/blue_refresh.png b/EOM.TSHotelManagement.FormUI/Resources/blue_refresh.png deleted file mode 100644 index f12826d742262b64f217d8cc273420a4e5300ebe..0000000000000000000000000000000000000000 Binary files a/EOM.TSHotelManagement.FormUI/Resources/blue_refresh.png and /dev/null differ diff --git a/EOM.TSHotelManagement.FormUI/Resources/close.png b/EOM.TSHotelManagement.FormUI/Resources/close.png deleted file mode 100644 index 5fa944123722d8c0f82e5999c347238621bcfe76..0000000000000000000000000000000000000000 Binary files a/EOM.TSHotelManagement.FormUI/Resources/close.png and /dev/null differ diff --git a/EOM.TSHotelManagement.FormUI/Resources/jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png b/EOM.TSHotelManagement.FormUI/Resources/jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png deleted file mode 100644 index 67b24a2981fbf6e992d3965d23914f6da9735830..0000000000000000000000000000000000000000 Binary files a/EOM.TSHotelManagement.FormUI/Resources/jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png and /dev/null differ diff --git a/EOM.TSHotelManagement.FormUI/Resources/picExtend.Image.png b/EOM.TSHotelManagement.FormUI/Resources/picExtend.Image.png deleted file mode 100644 index 149be74c24104ea6cbc596a7341f147ae17036b0..0000000000000000000000000000000000000000 Binary files a/EOM.TSHotelManagement.FormUI/Resources/picExtend.Image.png and /dev/null differ diff --git a/EOM.TSHotelManagement.FormUI/Resources/picExtend.ImageHover.png b/EOM.TSHotelManagement.FormUI/Resources/picExtend.ImageHover.png deleted file mode 100644 index 21d9df7b4bb8f5d91d8ff55f87a7f4c8f3e8c8ab..0000000000000000000000000000000000000000 Binary files a/EOM.TSHotelManagement.FormUI/Resources/picExtend.ImageHover.png and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\344\270\212\344\274\240\347\205\247\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\344\270\212\344\274\240\347\205\247\347\211\207.png" deleted file mode 100644 index 3a70a3404154b633b81799d175b9780f473e9b44..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\344\270\212\344\274\240\347\205\247\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\344\270\252\344\272\272\344\270\255\345\277\203.png" "b/EOM.TSHotelManagement.FormUI/Resources/\344\270\252\344\272\272\344\270\255\345\277\203.png" deleted file mode 100644 index 8e75c850427cdd9483165d9e8f8420b3a47c9ff3..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\344\270\252\344\272\272\344\270\255\345\277\203.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\344\272\272\345\212\233\350\265\204\346\272\220\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\344\272\272\345\212\233\350\265\204\346\272\220\351\203\250\345\215\241\347\211\207.png" deleted file mode 100644 index a70a961d8a73985576291caa3336826a2c1c33a5..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\344\272\272\345\212\233\350\265\204\346\272\220\351\203\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\344\277\256\346\224\271.png" "b/EOM.TSHotelManagement.FormUI/Resources/\344\277\256\346\224\271.png" deleted file mode 100644 index 40df4c0e1029b6f7e396dceb4beb00d582803df1..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\344\277\256\346\224\271.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\205\263\344\272\216\346\210\221\344\273\254.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\205\263\344\272\216\346\210\221\344\273\254.png" deleted file mode 100644 index 195624fd05c5a0067c266b9ae9548102e2ed69c8..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\205\263\344\272\216\346\210\221\344\273\254.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\206\205\346\216\247\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\206\205\346\216\247\351\203\250\345\215\241\347\211\207.png" deleted file mode 100644 index 34c901a338d45a8b68ac233594b5dfa0c47fe262..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\206\205\346\216\247\351\203\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\210\207\346\215\242\350\264\246\345\217\267.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\210\207\346\215\242\350\264\246\345\217\267.png" deleted file mode 100644 index 51e1b2e9fecd6d799a3659f2dc4976173c68dba2..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\210\207\346\215\242\350\264\246\345\217\267.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\217\257\344\275\217\346\210\277(hover)icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\217\257\344\275\217\346\210\277(hover)icon.png" deleted file mode 100644 index c1dca5d426bce5ebdf7b75f37ea47b2019713c45..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\217\257\344\275\217\346\210\277(hover)icon.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\217\257\344\275\217\346\210\277icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\217\257\344\275\217\346\210\277icon.png" deleted file mode 100644 index ca1dae65d35036c66f7f4572dc8b4eaaff6f2b64..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\217\257\344\275\217\346\210\277icon.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\220\216\345\213\244\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\220\216\345\213\244\351\203\250\345\215\241\347\211\207.png" deleted file mode 100644 index 9049fef1385af581fbbaf05bcf223ad316486ca2..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\220\216\345\213\244\351\203\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\222\226\345\225\241.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\222\226\345\225\241.png" deleted file mode 100644 index ae3efb12e7d9f6d6c9427baf6a9d84d5ba8cb13d..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\222\226\345\225\241.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\225\206\345\223\201\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\225\206\345\223\201\351\203\250\345\215\241\347\211\207.png" deleted file mode 100644 index 7e6f811291b4b5920409c14c5359674cae2e9ffb..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\225\206\345\223\201\351\203\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\267\262\344\275\217\346\210\277(hover)icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\267\262\344\275\217\346\210\277(hover)icon.png" deleted file mode 100644 index 0c3a3049e17afd385282dd7af3175f5f8f62b322..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\267\262\344\275\217\346\210\277(hover)icon.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\267\262\344\275\217\346\210\277icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\267\262\344\275\217\346\210\277icon.png" deleted file mode 100644 index d444ebb8f5c3c63ebc852bded823fdf7fb82ce72..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\267\262\344\275\217\346\210\277icon.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\345\270\270\350\247\204\351\203\250\351\227\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\270\270\350\247\204\351\203\250\351\227\250\345\215\241\347\211\207.png" deleted file mode 100644 index fd2bdd6115eab21f9c65906de9717dc96d9a03ba..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\345\270\270\350\247\204\351\203\250\351\227\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\346\200\273\347\273\217\345\212\236\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\346\200\273\347\273\217\345\212\236\345\215\241\347\211\207.png" deleted file mode 100644 index 28bfeee18ae3cbb9280c9a26f211932c05b25ef8..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\346\200\273\347\273\217\345\212\236\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\346\227\251\344\270\212.png" "b/EOM.TSHotelManagement.FormUI/Resources/\346\227\251\344\270\212.png" deleted file mode 100644 index 31509299647b539898ced35b971c5e67e0fdc02a..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\346\227\251\344\270\212.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\346\231\256\351\200\232\344\274\232\345\221\230.png" "b/EOM.TSHotelManagement.FormUI/Resources/\346\231\256\351\200\232\344\274\232\345\221\230.png" deleted file mode 100644 index 4f89f6582c7cca0b463b577cdc4be568c5c23bb6..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\346\231\256\351\200\232\344\274\232\345\221\230.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\346\234\210\344\272\256.png" "b/EOM.TSHotelManagement.FormUI/Resources/\346\234\210\344\272\256.png" deleted file mode 100644 index 1caddfd6e9741eca79fc829250ea508d6596d0f6..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\346\234\210\344\272\256.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\346\243\200\346\237\245\346\233\264\346\226\260 (1).png" "b/EOM.TSHotelManagement.FormUI/Resources/\346\243\200\346\237\245\346\233\264\346\226\260 (1).png" deleted file mode 100644 index 84b0766bda0cb7da6ad7980e5ebb7a0662027b06..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\346\243\200\346\237\245\346\233\264\346\226\260 (1).png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\346\263\250\351\224\200.png" "b/EOM.TSHotelManagement.FormUI/Resources/\346\263\250\351\224\200.png" deleted file mode 100644 index 24c205237c0ad17e09af926318cfc0b9bba82203..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\346\263\250\351\224\200.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\347\231\275\351\207\221\344\274\232\345\221\230.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\231\275\351\207\221\344\274\232\345\221\230.png" deleted file mode 100644 index 17ca731aa33ae297afa79dce3af3f19ae558e5ae..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\347\231\275\351\207\221\344\274\232\345\221\230.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\347\233\221\347\256\241\345\260\217\347\273\204\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\233\221\347\256\241\345\260\217\347\273\204\345\215\241\347\211\207.png" deleted file mode 100644 index 04ab28ee7ebc8e3e244ce6ec6482381e9d8ba72f..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\347\233\221\347\256\241\345\260\217\347\273\204\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\347\263\273\347\273\237\347\256\241\347\220\206\345\221\230.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\263\273\347\273\237\347\256\241\347\220\206\345\221\230.png" deleted file mode 100644 index fa5fa0c4c59f855dc24537f60594e224879f8a0f..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\347\263\273\347\273\237\347\256\241\347\220\206\345\221\230.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\347\273\217\347\220\206\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\273\217\347\220\206\351\203\250\345\215\241\347\211\207.png" deleted file mode 100644 index 01b97aaa68a9e4d3f01fa6041c4a8185c5089c95..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\347\273\217\347\220\206\351\203\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\346\210\277(hover)icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\346\210\277(hover)icon.png" deleted file mode 100644 index 2b12319437d589743210f84777e7de6557b71612..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\346\210\277(hover)icon.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\346\210\277icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\346\210\277icon.png" deleted file mode 100644 index e4af31f0223a6486962981b322a1e46278df8590..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\346\210\277icon.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\351\203\250\345\215\241\347\211\207.png" deleted file mode 100644 index 3d5c1f1f5a0fe165f8202a8880045944e216801e..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\351\203\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\350\204\217\346\210\277(hover)icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\350\204\217\346\210\277(hover)icon.png" deleted file mode 100644 index 3a73a1abcbaab7bd834d5261c7f8059a1b8a8052..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\350\204\217\346\210\277(hover)icon.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\350\204\217\346\210\277icon1.png" "b/EOM.TSHotelManagement.FormUI/Resources/\350\204\217\346\210\277icon1.png" deleted file mode 100644 index b2435f604db4ca8321d41552d7dbd1a6d508fe7e..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\350\204\217\346\210\277icon1.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\350\264\242\345\212\241\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\350\264\242\345\212\241\351\203\250\345\215\241\347\211\207.png" deleted file mode 100644 index 531524e0b946d4a5c2f0dc4a12226b9c12e6850b..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\350\264\242\345\212\241\351\203\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\351\205\222\345\272\227\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\205\222\345\272\227\351\203\250\345\215\241\347\211\207.png" deleted file mode 100644 index 4b16ce1072261f11fc6fe938a7687574384671fb..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\351\205\222\345\272\227\351\203\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\351\222\273\347\237\263\344\274\232\345\221\230.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\222\273\347\237\263\344\274\232\345\221\230.png" deleted file mode 100644 index ea26dd214b05492bf0259effc237a6eb4c2bc496..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\351\222\273\347\237\263\344\274\232\345\221\230.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\351\224\201\345\261\217.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\224\201\345\261\217.png" deleted file mode 100644 index 1e06a51a35eee37351b69f786f035fdf9552f251..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\351\224\201\345\261\217.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\351\242\204\347\272\246\346\210\277(hover)icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\242\204\347\272\246\346\210\277(hover)icon.png" deleted file mode 100644 index 7d6ba1e80bb4aa9899257ca905fe367776da0897..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\351\242\204\347\272\246\346\210\277(hover)icon.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\351\242\204\347\272\246\346\210\277icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\242\204\347\272\246\346\210\277icon.png" deleted file mode 100644 index 214d13988e717e5f243dd0f08b359bc70c9c2ed8..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\351\242\204\347\272\246\346\210\277icon.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\351\244\220\351\245\256\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\244\220\351\245\256\351\203\250\345\215\241\347\211\207.png" deleted file mode 100644 index 4e055088420883d015431424808c2c17f98f41db..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\351\244\220\351\245\256\351\203\250\345\215\241\347\211\207.png" and /dev/null differ diff --git "a/EOM.TSHotelManagement.FormUI/Resources/\351\273\204\351\207\221\344\274\232\345\221\230.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\273\204\351\207\221\344\274\232\345\221\230.png" deleted file mode 100644 index 4e49841e243c067d0f4ebe7d4ec65590824b2082..0000000000000000000000000000000000000000 Binary files "a/EOM.TSHotelManagement.FormUI/Resources/\351\273\204\351\207\221\344\274\232\345\221\230.png" and /dev/null differ diff --git a/EOM.TSHotelManagement.FormUI/Services/NotificationService.cs b/EOM.TSHotelManagement.FormUI/Services/NotificationService.cs new file mode 100644 index 0000000000000000000000000000000000000000..3ec170cf7bcc76fc1dcbf340bc8737a9b338d26a --- /dev/null +++ b/EOM.TSHotelManagement.FormUI/Services/NotificationService.cs @@ -0,0 +1,49 @@ +using AntdUI; +using EOM.TSHotelManagement.Common; +using EOM.TSHotelManagement.Common.Util; + +namespace EOM.TSHotelManagement.FormUI +{ + public static class NotificationService + { + public static void ShowSuccess(string message) + { + Modal.open(new Modal.Config(null, UIMessageConstant.Success, message, TType.Success) + { + Draggable = true, + CancelText = null, + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Ok, UIMessageConstant.Chs_Ok) + }); + } + + public static void ShowError(string message) + { + Modal.open(new Modal.Config(null, UIMessageConstant.Error, message, TType.Error) + { + Draggable = true, + CancelText = null, + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Ok, UIMessageConstant.Chs_Ok) + }); + } + + public static void ShowInfo(string message) + { + Modal.open(new Modal.Config(null, UIMessageConstant.Information, message, TType.Info) + { + Draggable = true, + CancelText = null, + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Ok, UIMessageConstant.Chs_Ok) + }); + } + + public static void ShowWarning(string message) + { + Modal.open(new Modal.Config(null, UIMessageConstant.Warning, message, TType.Warn) + { + Draggable = true, + CancelText = null, + OkText = LocalizationHelper.GetLocalizedString(UIMessageConstant.Eng_Ok, UIMessageConstant.Chs_Ok) + }); + } + } +} diff --git a/EOM.TSHotelManagement.FormUI/icon/update.ico b/EOM.TSHotelManagement.FormUI/icon/update.ico new file mode 100644 index 0000000000000000000000000000000000000000..6320dd6632ce4c62e78027c34e6dedfeb1de0c19 Binary files /dev/null and b/EOM.TSHotelManagement.FormUI/icon/update.ico differ diff --git a/EOM.TSHotelManagement.FormUI/images/blue_refresh.png b/EOM.TSHotelManagement.FormUI/images/blue_refresh.png deleted file mode 100644 index f12826d742262b64f217d8cc273420a4e5300ebe..0000000000000000000000000000000000000000 Binary files a/EOM.TSHotelManagement.FormUI/images/blue_refresh.png and /dev/null differ diff --git a/README.en.md b/README.en.md index 6b839b6b92d685cd71efb16cccc1927b83d2745e..fbce1af1a9b3e45925db1cc3504ea5395a0c8278 100644 --- a/README.en.md +++ b/README.en.md @@ -24,8 +24,6 @@ 2. ##### SQLSugar, the most popular ORM framework in China. [SQLSugar, Apache-2.0 License](https://gitee.com/dotnetchina/SqlSugar) -3. ##### SunnyUI—SunnyUI.Net, based on C# .Net WinForm open-source control library, tool library, extension library, and multi-page development framework. [SunnyUI.Net, GPL3.0 License](https://gitee.com/yhuse/SunnyUI) - 4. ##### **RestSharp——Simple REST and HTTP API Client for .NET。[RestSharp,Apache-2.0 License](https://github.com/restsharp/RestSharp)** 5. ##### AntdUI——基于 Ant Design 设计语言的 Winform 界面库. AntdUI。[AntdUI,Apache-2.0 License](https://gitee.com/antdui/AntdUI) @@ -36,7 +34,7 @@ 2. Bugs and comments are welcome! -3. This system’s 95% of the pages are created based on the SunnyUI.Net control library, hereby specially declared! +3. This system’s 95% of the pages are created based on the AntdUI.Net control library, hereby specially declared! 4. Regarding the database script issue, please first go to the database script folder, choose either the MySQL version or PostgreSQL version folder to download the Data and Table files. In the database, execute the Table.sql first, then the Data.sql! @@ -133,8 +131,18 @@ EOM.Client.TopSkyHotelManagerSystem **Download and install .NET SDK version 8 or above.** **Download and install Microsoft Visual Studio Professional 2022 or above, unzip the downloaded Zip package, and run the .sln file.** -# :inbox_tray: Database Setup and Deployment (Local): +# :inbox_tray: Open Source Linsense： + +[MIT Linsense](https://gitee.com/java-and-net/TopskyHotelManagementSystem/blob/master/LICENSE) + +# :pray: Rely on the project's open source license： + +Fody [MIT Linsense](https://github.com/Fody/Fody/blob/master/License.txt) + +SQLSugar [Apache-2.0 Linsense](https://gitee.com/dotnetchina/SqlSugar/blob/master/LICENSE) + +RestSharp [Apache-2.0 Linsense](https://github.com/restsharp/RestSharp/blob/dev/LICENSE.txt) -**Omitted. This project does not include backend business logic. For details, please refer to: [Business Logic Project](https://gitee.com/java-and-net/topsky-hotel-management-system-web-api/blob/master/README.en.md)** +AntdUI [Apache-2.0 Linsense](https://gitee.com/AntdUI/AntdUI/blob/main/LICENSE) [![java-and-net/TopskyHotelManagementSystem](https://gitee.com/java-and-net/TopskyHotelManagementSystem/widgets/widget_card.svg?colors=4183c4,ffffff,ffffff,e3e9ed,666666,9b9b9b)](https://gitee.com/java-and-net/TopskyHotelManagerSystem) diff --git a/README.md b/README.md index 319cb6c910d8a182f296db7775322915f28d11cc..4c387e747c08de0d04beddaafde3b9729d89d4cd 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,6 @@ 2. ##### SQLSugar，国内最受欢迎ORM框架[SQLSugar。 [Apache-2.0开源协议](https://gitee.com/dotnetchina/SqlSugar) -3. ##### SunnyUI——SunnyUI.Net, 基于 C# .Net WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。[SunnyUI.Net,GPL3.0开源协议](https://gitee.com/yhuse/SunnyUI) - 4. ##### **RestSharp——Simple REST and HTTP API Client for .NET。[RestSharp,Apache-2.0开源协议](https://github.com/restsharp/RestSharp)** 5. ##### AntdUI——👚 基于 Ant Design 设计语言的 Winform 界面库。[AntdUI,Apache-2.0开源协议](https://gitee.com/antdui/AntdUI) @@ -38,7 +36,7 @@ 2、有bug欢迎提出issue！或进行评论 -3、本系统UI框架主要基于Sunny.UI和AntdUI进行创建，在此特别声明！ +3、本系统UI框架主要基于AntdUI进行创建，在此特别声明！ 4、关于数据库脚本问题，请先移步至数据库脚本文件夹下，选择Mysql版本或PostgreSQL版本任意文件夹下载Data和Table两个文件，再数据库中先执行Table.sql，再执行Data.sql! @@ -134,8 +132,18 @@ EOM.Client.TopskyHotelManagementSystem **下载并安装.NET 8及以上SDK版本。** **下载并安装Microsoft Visual Studio Professional 2022及以上版本，并通过下载Zip包解压，打开.sln后缀格式文件运行。** -# :inbox_tray: 数据库运行部署(本地)： +# :inbox_tray: 开源协议： + +[MIT Linsense](https://gitee.com/java-and-net/TopskyHotelManagementSystem/blob/master/LICENSE) + +# :inbox_tray: 依赖项目开源协议： + +Fody [MIT Linsense](https://github.com/Fody/Fody/blob/master/License.txt) + +SQLSugar [Apache-2.0 Linsense](https://gitee.com/dotnetchina/SqlSugar/blob/master/LICENSE) + +RestSharp [Apache-2.0 Linsense](https://github.com/restsharp/RestSharp/blob/dev/LICENSE.txt) -**略，本项目不包含后台业务逻辑。详情请查看：[业务逻辑项目](https://gitee.com/java-and-net/topsky-hotel-management-system-web-api/blob/master/README.md#%E6%95%B0%E6%8D%AE%E5%BA%93%E8%BF%90%E8%A1%8C%E9%83%A8%E7%BD%B2%E6%9C%AC%E5%9C%B0)** +AntdUI [Apache-2.0 Linsense](https://gitee.com/AntdUI/AntdUI/blob/main/LICENSE) [![java-and-net/TopskyHotelManagementSystem](https://gitee.com/java-and-net/TopskyHotelManagementSystem/widgets/widget_card.svg?colors=4183c4,ffffff,ffffff,e3e9ed,666666,9b9b9b)](https://gitee.com/java-and-net/TopskyHotelManagerSystem) \ No newline at end of file diff --git a/topsky-hotel-management-system-web-api b/topsky-hotel-management-system-web-api index 16cd5be9df042e2453d302e13e4374923d2e6993..ccf133f885049974dd3cc5078406ba4d13eb42db 160000 --- a/topsky-hotel-management-system-web-api +++ b/topsky-hotel-management-system-web-api @@ -1 +1 @@ -Subproject commit 16cd5be9df042e2453d302e13e4374923d2e6993 +Subproject commit ccf133f885049974dd3cc5078406ba4d13eb42db