diff --git a/SYS.Common/HttpHelper/HttpHelper.cs b/SYS.Common/HttpHelper/HttpHelper.cs index 4fc7ffba3fd1dcd256f94dd0405dcbb59dccae22..f93f74b8ca69e17d7402b650753c11d097972e63 100644 --- a/SYS.Common/HttpHelper/HttpHelper.cs +++ b/SYS.Common/HttpHelper/HttpHelper.cs @@ -1,4 +1,6 @@ -using Newtonsoft.Json; +using jvncorelib_fr.EncryptorLib; +using jvncorelib_fr.EntityLib; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; @@ -6,15 +8,11 @@ using System.IO; using System.Linq; using System.Net; using System.Net.Security; -using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; using System.Text; using System.Text.RegularExpressions; -using System.Threading.Tasks; using System.Web; using System.Web.Script.Serialization; -using jvncorelib_fr.EncryptorLib; -using jvncorelib_fr.EntityLib; namespace SYS.Common { @@ -23,7 +21,7 @@ namespace SYS.Common /// public static class HttpHelper { - static EncryptLib encrypt = new EncryptLib(); + static EncryptLib encrypt = new EncryptLib(); #region 受限于打包插件的限制才放在这，个人开发时建议统一在App.Config进行配置 @@ -31,6 +29,7 @@ namespace SYS.Common /// 数据库配置连接 /// public const string mysqlString = "server = localhost; user id = softuser; password = .; database = tshoteldb;"; + public const string pgsqlString = ""; /// @@ -49,8 +48,7 @@ namespace SYS.Common public const string apiUrl = ""; // Debug - //public const string apiUrl = "TpwjOXp/ehhJirV+vFi0C9PWjqeJwdTAn4s4GUFlXhM=·$$>a*d;?b?fb;>$;a<$^a*0c%?d?de public static ResponseMsg Request(string url, string json = null, Dictionary dic = null) { - ResponseMsg msg= new ResponseMsg(); + ResponseMsg msg = new ResponseMsg(); //处理url var sourceStr = url.Replace("​", string.Empty); @@ -211,6 +209,10 @@ namespace SYS.Common } } + var token = LoginInfo.UserToken.IsNullOrEmpty() ? AdminInfo.UserToken : LoginInfo.UserToken; + + req.Headers.Add("Authorization", string.Format("Bearer {0}", token)); + rsp = (HttpWebResponse)req.GetResponse(); Encoding encoding = null; @@ -306,6 +308,11 @@ namespace SYS.Common request.Headers.Add(key, dicHeaders[key]); } } + + var token = LoginInfo.UserToken.IsNullOrEmpty() ? AdminInfo.UserToken : LoginInfo.UserToken; + + request.Headers.Add("Authorization", string.Format("Bearer {0}", token)); + Stream writer = null; if (jsonParam != null) @@ -442,7 +449,7 @@ namespace SYS.Common { return JsonConvert.DeserializeObject(input); } - catch (Exception ex) + catch (Exception) { return default(T); } diff --git a/SYS.Common/HttpHelper/ResponseMsg.cs b/SYS.Common/HttpHelper/ResponseMsg.cs index c0827f89f552a1abe51679281ced75b692da5acc..30a4dc11988353491c4871a766b8952c5448059c 100644 --- a/SYS.Common/HttpHelper/ResponseMsg.cs +++ b/SYS.Common/HttpHelper/ResponseMsg.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Common +namespace SYS.Common { public class ResponseMsg { diff --git a/SYS.Common/LocalInfo/AdminInfo.cs b/SYS.Common/LocalInfo/AdminInfo.cs index 811d9518e46053512715180cdba488656014be40..e6020cd4438140fe86fe4fff9c26a82879f5f82f 100644 --- a/SYS.Common/LocalInfo/AdminInfo.cs +++ b/SYS.Common/LocalInfo/AdminInfo.cs @@ -22,9 +22,6 @@ * *模块说明：管理员信息静态类 */ -using System.Linq; -using System.Net; - namespace SYS.Common { /// @@ -62,5 +59,10 @@ namespace SYS.Common /// public static string SoftwareVersion = ""; + /// + /// 存储当前用户Token + /// + public static string UserToken = ""; + } } diff --git a/SYS.Common/LocalInfo/LoginInfo.cs b/SYS.Common/LocalInfo/LoginInfo.cs index 3ef0e8c3ce758636945cd600f2f7765820b2ee60..334f0b1108da938359a80561fc9c23113a0beb06 100644 --- a/SYS.Common/LocalInfo/LoginInfo.cs +++ b/SYS.Common/LocalInfo/LoginInfo.cs @@ -22,9 +22,6 @@ * *模块说明：登录信息静态类(前台工作人员登入后的本地信息存储) */ -using System.Linq; -using System.Net; - namespace SYS.Common { /// @@ -56,5 +53,10 @@ namespace SYS.Common /// 存储当前软件版本 /// public static string SoftwareVersion = ""; + + /// + /// 存储当前用户Token + /// + public static string UserToken = ""; } } diff --git a/SYS.Common/Properties/AssemblyInfo.cs b/SYS.Common/Properties/AssemblyInfo.cs index 1654fc7a5947357e0b49fbb9d67cd56f56c866a7..ba0f5c6c1c88014919992ac93b35286f42984ded 100644 --- a/SYS.Common/Properties/AssemblyInfo.cs +++ b/SYS.Common/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 diff --git a/SYS.Common/Util/ExportHelper.cs b/SYS.Common/Util/ExportHelper.cs index a6fe138b4161c3611dba64c808517186ae88f546..5992f13419f03a438a1dada2568fb189b37ae55f 100644 --- a/SYS.Common/Util/ExportHelper.cs +++ b/SYS.Common/Util/ExportHelper.cs @@ -5,8 +5,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace SYS.Common @@ -22,7 +20,7 @@ namespace SYS.Common /// /// /// - public void ExportDataGridViewToExcel(DataGridView dataGridView, string filePath,List ignoreColumns = null) + public void ExportDataGridViewToExcel(DataGridView dataGridView, string filePath, List ignoreColumns = null) { var workbook = new XSSFWorkbook(); // 创建XSSFWorkbook实例 ISheet sheet = workbook.CreateSheet("Customer List"); // 创建工作表 diff --git a/SYS.Common/Util/RecordHelper.cs b/SYS.Common/Util/RecordHelper.cs index d8355ec4c2dc26087fd74d72d03645044487cfdd..eecb5b41454cd4a563306f6693b3fd1fd5e20251 100644 --- a/SYS.Common/Util/RecordHelper.cs +++ b/SYS.Common/Util/RecordHelper.cs @@ -1,9 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Net; namespace SYS.Common { diff --git a/SYS.Common/Util/Temp_OperationLog.cs b/SYS.Common/Util/Temp_OperationLog.cs index 2c9c7b629fb8d3915a28053af198851edfe8bfc4..9cece957018e2cb247be6041402d671a3442f118 100644 --- a/SYS.Common/Util/Temp_OperationLog.cs +++ b/SYS.Common/Util/Temp_OperationLog.cs @@ -23,8 +23,6 @@ *模块说明：操作日志类 */ using System; -using System.Linq; -using System.Net; namespace SYS.Common { diff --git a/SYS.Common/Util/Util.cs b/SYS.Common/Util/Util.cs index 7a43003f3f6ba05f0c7e928fcd0cff4b34890ddf..388e4d0aff38eb9472f658e604b8c8c29042f2a7 100644 --- a/SYS.Common/Util/Util.cs +++ b/SYS.Common/Util/Util.cs @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using System.Threading; -using System.Threading.Tasks; namespace SYS.Common { @@ -24,8 +22,8 @@ namespace SYS.Common /// public static card searchCode(string code) { - Dictionary dic = new Dictionary(); - dic.Add("identityCard", code.Substring(0,6)); + Dictionary dic = new Dictionary(); + dic.Add("identityCard", code.Substring(0, 6)); ResponseMsg result = HttpHelper.Request("App/SelectCardCode", null, dic); if (result.statusCode != 200) { @@ -115,7 +113,7 @@ namespace SYS.Common /// /// 身份证实体类 /// - public class card + public class card { /// /// 消息 diff --git a/SYS.FormUI/AppFunction/FrmAboutUs.cs b/SYS.FormUI/AppFunction/FrmAboutUs.cs index 19c5c49998dfa4ec4b6349e57036b84e783a4e66..2587d9c3f3731b08ebd2316fa1430faf67523e65 100644 --- a/SYS.FormUI/AppFunction/FrmAboutUs.cs +++ b/SYS.FormUI/AppFunction/FrmAboutUs.cs @@ -21,13 +21,9 @@ *SOFTWARE. * */ -using Newtonsoft.Json; using Sunny.UI; using System; using System.Drawing; -using System.IO; -using System.Net; -using System.Text; using System.Windows.Forms; namespace SYS.FormUI diff --git a/SYS.FormUI/AppFunction/FrmAddAdmin.Designer.cs b/SYS.FormUI/AppFunction/FrmAddAdmin.Designer.cs index 8cbbf5b0560e15753e953d7a22be423ff8cb99ce..fad1dbfda0631eb112363f1b416fb094c0e6e636 100644 --- a/SYS.FormUI/AppFunction/FrmAddAdmin.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmAddAdmin.Designer.cs @@ -225,13 +225,13 @@ namespace SYS.FormUI dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvAdminList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvAdminList.RowHeadersVisible = false; - this.dgvAdminList.RowHeight = 29; + //this.dgvAdminList.RowHeight = 29; dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; this.dgvAdminList.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvAdminList.RowTemplate.Height = 29; this.dgvAdminList.SelectedIndex = -1; this.dgvAdminList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvAdminList.ShowGridLine = true; + //this.dgvAdminList.ShowGridLine = true; this.dgvAdminList.Size = new System.Drawing.Size(979, 386); this.dgvAdminList.TabIndex = 118; // diff --git a/SYS.FormUI/AppFunction/FrmAddAdmin.cs b/SYS.FormUI/AppFunction/FrmAddAdmin.cs index 54cd53dab72a7232b6cb571141b8249bce681fdf..71f96dbcd86072b1de3867c719b1066084177ffb 100644 --- a/SYS.FormUI/AppFunction/FrmAddAdmin.cs +++ b/SYS.FormUI/AppFunction/FrmAddAdmin.cs @@ -1,16 +1,8 @@ -using Sunny.UI; - +using EOM.TSHotelManager.Common.Core; +using Sunny.UI; using SYS.Common; -using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace SYS.FormUI { @@ -86,7 +78,7 @@ namespace SYS.FormUI cbAccountType.DisplayMember = "type_name"; } - public bool CheckInputs(Admin admin) + public bool CheckInputs(Admin admin) { bool result = true; if (string.IsNullOrWhiteSpace(admin.AdminAccount)) diff --git a/SYS.FormUI/AppFunction/FrmAddRoom.cs b/SYS.FormUI/AppFunction/FrmAddRoom.cs index 9a4da4f322544ee8240ac4e3febd2efef98fdbdc..1d005e304021d86a72d2ab7633a41d676a6afed2 100644 --- a/SYS.FormUI/AppFunction/FrmAddRoom.cs +++ b/SYS.FormUI/AppFunction/FrmAddRoom.cs @@ -21,16 +21,11 @@ *SOFTWARE. * */ -using System; -using System.Data; - -using System.Windows.Forms; using EOM.TSHotelManager.Common.Core; - -using System.Collections.Generic; using Sunny.UI; using SYS.Common; -using static System.Windows.Forms.VisualStyles.VisualStyleElement; +using System; +using System.Collections.Generic; namespace SYS.FormUI { @@ -63,7 +58,7 @@ namespace SYS.FormUI txtMoney.Text = Convert.ToDecimal(txtMoney.Text) <= 0 ? roomType.RoomRent.ToString() : txtMoney.Text; txtDeposit.Text = Convert.ToDecimal(txtDeposit.Text) <= 0 ? roomType.RoomDeposit.ToString() : txtDeposit.Text; - if (!string.IsNullOrWhiteSpace(txtRoomNo.Text)&& !txtMoney.Text.IsNullOrWhiteSpace() && !txtDeposit.Text.IsNullOrWhiteSpace()) + if (!string.IsNullOrWhiteSpace(txtRoomNo.Text) && !txtMoney.Text.IsNullOrWhiteSpace() && !txtDeposit.Text.IsNullOrWhiteSpace()) { rn = new Room() { @@ -144,7 +139,7 @@ namespace SYS.FormUI private void cboRoomType_TextChanged(object sender, EventArgs e) { - + } @@ -155,7 +150,7 @@ namespace SYS.FormUI { { "no", RoomNo } }; - result = HttpHelper.Request("Room/SelectRoomByRoomNo",null, dic); + result = HttpHelper.Request("Room/SelectRoomByRoomNo", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); diff --git a/SYS.FormUI/AppFunction/FrmAddWorker.cs b/SYS.FormUI/AppFunction/FrmAddWorker.cs index 721932897c50ebff1c06ee6bc3917e1ae279845a..8a67601621a8edc660300db4f9b7c1f3e98ae892 100644 --- a/SYS.FormUI/AppFunction/FrmAddWorker.cs +++ b/SYS.FormUI/AppFunction/FrmAddWorker.cs @@ -21,20 +21,14 @@ *SOFTWARE. * */ -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Windows.Forms; using EOM.TSHotelManager.Common.Core; +using jvncorelib_fr.EncryptorLib; using Sunny.UI; - -using System.Net; -using System.Configuration; -using System.IO; -using System.Text; using SYS.Common; +using System; +using System.Collections.Generic; using System.Linq; -using jvncorelib_fr.EncryptorLib; +using System.Windows.Forms; namespace SYS.FormUI { @@ -68,9 +62,9 @@ namespace SYS.FormUI cboClub.DisplayMember = "dept_name"; cboClub.ValueMember = "dept_no"; //加载民族信息 - Dictionary dic = new Dictionary(); - dic.Add("delete_mk","0"); - result = HttpHelper.Request("Base/SelectNationAll",null, dic); + Dictionary dic = new Dictionary(); + dic.Add("delete_mk", "0"); + result = HttpHelper.Request("Base/SelectNationAll", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("SelectNationAll+接口服务异常，请提交Issue或尝试更新版本！"); @@ -135,7 +129,7 @@ namespace SYS.FormUI (control as Sunny.UI.UIDatePicker).ReadOnly = true; break; } - + } btnOK.Visible = false; btnCancel.Visible = false; @@ -212,7 +206,7 @@ namespace SYS.FormUI } else { - bool dr = UIMessageBox.Show("修改操作仅能修改姓名、性别、电话号码、联系地址、民族、面貌以及最高学历，以上是否知晓？点击确定继续进行修改！", "修改提醒",UIStyle.Orange, UIMessageBoxButtons.OKCancel); + bool dr = UIMessageBox.Show("修改操作仅能修改姓名、性别、电话号码、联系地址、民族、面貌以及最高学历，以上是否知晓？点击确定继续进行修改！", "修改提醒", UIStyle.Orange, UIMessageBoxButtons.OKCancel); if (dr) { WorkerNo.Text = FrmChangeWorker.wk_WorkerNo; @@ -238,7 +232,7 @@ namespace SYS.FormUI return; } var workerPicSource = HttpHelper.JsonToModel(result.message); - if (workerPicSource!=null &&!string.IsNullOrEmpty(workerPicSource.Pic)) + if (workerPicSource != null && !string.IsNullOrEmpty(workerPicSource.Pic)) { picWorkerPic.BackgroundImage = null; picWorkerPic.LoadAsync(workerPicSource.Pic); @@ -278,7 +272,7 @@ namespace SYS.FormUI private void btnUpd_Click(object sender, EventArgs e) { - bool dr = UIMessageBox.Show("是否确认修改员工信息？", "修改提醒", UIStyle.Green,UIMessageBoxButtons.OKCancel); + bool dr = UIMessageBox.Show("是否确认修改员工信息？", "修改提醒", UIStyle.Green, UIMessageBoxButtons.OKCancel); if (dr) { #region 员工信息代码块 @@ -301,7 +295,7 @@ namespace SYS.FormUI UIMessageBox.ShowError("UpdateWorker+接口服务异常，请提交Issue或尝试更新版本！"); return; } - bool i = result.message.ToString().Equals("true") ? true:false; /*new WorkerService().UpdateWorker(worker);*/ + bool i = result.message.ToString().Equals("true") ? true : false; /*new WorkerService().UpdateWorker(worker);*/ if (i) { UIMessageBox.ShowSuccess("信息修改成功！"); @@ -438,7 +432,7 @@ namespace SYS.FormUI UIMessageBox.ShowError("AddWorker+接口服务异常，请提交Issue或尝试更新版本！"); return; } - bool n = response.message.ToString().Equals("true")?true:false; + bool n = response.message.ToString().Equals("true") ? true : false; #endregion if (ucHistory.txtCompany != null && ucHistory.txtPosition != null && ucHistory.dtpStartDate.Value != null && ucHistory.dtpEndDate.Value != null) @@ -479,7 +473,7 @@ namespace SYS.FormUI #endregion } } - catch (Exception ex) + catch (Exception) { UIMessageBox.Show("服务器繁忙或数据格式为空！"); } diff --git a/SYS.FormUI/AppFunction/FrmAdminManager.Designer.cs b/SYS.FormUI/AppFunction/FrmAdminManager.Designer.cs index 020e0b35f0aa4d7da1abc26c36ae89994b02947e..eee23d89baf2b06ace606afef2b7e9317bff4e42 100644 --- a/SYS.FormUI/AppFunction/FrmAdminManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmAdminManager.Designer.cs @@ -126,13 +126,11 @@ namespace SYS.FormUI dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvAdminList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvAdminList.RowHeadersVisible = false; - this.dgvAdminList.RowHeight = 29; dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; this.dgvAdminList.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvAdminList.RowTemplate.Height = 29; this.dgvAdminList.SelectedIndex = -1; this.dgvAdminList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvAdminList.ShowGridLine = true; this.dgvAdminList.Size = new System.Drawing.Size(991, 535); this.dgvAdminList.TabIndex = 130; // diff --git a/SYS.FormUI/AppFunction/FrmAdminManager.cs b/SYS.FormUI/AppFunction/FrmAdminManager.cs index c60ed8dfb7b555f68822bfeb2aa9f65b4863a682..bde874c2bb20b097f7149f8b5131eef19983e43b 100644 --- a/SYS.FormUI/AppFunction/FrmAdminManager.cs +++ b/SYS.FormUI/AppFunction/FrmAdminManager.cs @@ -1,17 +1,9 @@  +using EOM.TSHotelManager.Common.Core; using Sunny.UI; - using SYS.Common; -using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace SYS.FormUI { @@ -39,7 +31,7 @@ namespace SYS.FormUI return; } dgvAdminList.AutoGenerateColumns = false; - dgvAdminList.DataSource =HttpHelper.JsonToList(result.message); + dgvAdminList.DataSource = HttpHelper.JsonToList(result.message); } private void btnAuthority_Click(object sender, EventArgs e) @@ -52,7 +44,7 @@ namespace SYS.FormUI DeleteMk = Convert.ToInt32(dgvAdminList.SelectedRows[0].Cells["Column1"].Value), datachg_usr = AdminInfo.Account }; - result = HttpHelper.Request("Admin/UpdAccount",HttpHelper.ModelToJson(admin)); + result = HttpHelper.Request("Admin/UpdAccount", HttpHelper.ModelToJson(admin)); if (result.statusCode != 200) { UIMessageBox.ShowError("UpdAccount+接口服务异常，请提交Issue或尝试更新版本！"); diff --git a/SYS.FormUI/AppFunction/FrmAuthority.cs b/SYS.FormUI/AppFunction/FrmAuthority.cs index c1f313ce435769df79f2120bd97265b78d8a4704..f990ab19458277005b8bb399d7acee91b1701814 100644 --- a/SYS.FormUI/AppFunction/FrmAuthority.cs +++ b/SYS.FormUI/AppFunction/FrmAuthority.cs @@ -1,17 +1,10 @@ -using jvncorelib_fr.EntityLib; +using EOM.TSHotelManager.Common.Core; +using jvncorelib_fr.EntityLib; using Sunny.UI; - using SYS.Common; -using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace SYS.FormUI { @@ -27,16 +20,16 @@ namespace SYS.FormUI private void FrmAuthority_Load(object sender, EventArgs e) { - + } public void LoadAdminInfo() { - dic = new Dictionary() + dic = new Dictionary() { { "AdminAccount",txtAccount.Text.Trim() } - }; - result = HttpHelper.Request("Admin/GetAdminInfoByAdminAccount", null,dic); + }; + result = HttpHelper.Request("Admin/GetAdminInfoByAdminAccount", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("GetAdminInfoByAdminAccount+接口服务异常，请提交Issue或尝试更新版本！"); @@ -63,7 +56,7 @@ namespace SYS.FormUI { AdminAccount = txtAccount.Text.Trim(), }; - + result = HttpHelper.Request("Module/GetAllModuleByAdmin", HttpHelper.ModelToJson(admin)); if (result.statusCode != 200) { diff --git a/SYS.FormUI/AppFunction/FrmBaseManager.cs b/SYS.FormUI/AppFunction/FrmBaseManager.cs index 418001a2f0a15474323e18c77b0da2b16cdc5ed2..998988bc45fd704cd2fcab6fe24ee6ba7be6b9cc 100644 --- a/SYS.FormUI/AppFunction/FrmBaseManager.cs +++ b/SYS.FormUI/AppFunction/FrmBaseManager.cs @@ -1,13 +1,5 @@ using Sunny.UI; using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace SYS.FormUI { diff --git a/SYS.FormUI/AppFunction/FrmCash.Designer.cs b/SYS.FormUI/AppFunction/FrmCash.Designer.cs index 76df0887ea2a6fdbae2d374066c413ecf4d94b03..90f9a2f3bfb04be7f7113edd4f232d5bc131c8fa 100644 --- a/SYS.FormUI/AppFunction/FrmCash.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCash.Designer.cs @@ -111,13 +111,11 @@ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvCashList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvCashList.RowHeadersVisible = false; - this.dgvCashList.RowHeight = 29; dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; this.dgvCashList.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvCashList.RowTemplate.Height = 29; this.dgvCashList.SelectedIndex = -1; this.dgvCashList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvCashList.ShowGridLine = true; this.dgvCashList.Size = new System.Drawing.Size(809, 582); this.dgvCashList.TabIndex = 2; // diff --git a/SYS.FormUI/AppFunction/FrmCash.cs b/SYS.FormUI/AppFunction/FrmCash.cs index 4db1cd6391b22986f920dc34b3149cae6b950e85..33f99cea9aff63940806c7036e97b9df15e7aec0 100644 --- a/SYS.FormUI/AppFunction/FrmCash.cs +++ b/SYS.FormUI/AppFunction/FrmCash.cs @@ -21,13 +21,11 @@ *SOFTWARE. * */ -using System; -using System.Linq; -using System.Windows.Forms; +using EOM.TSHotelManager.Common.Core; using Sunny.UI; - using SYS.Common; -using EOM.TSHotelManager.Common.Core; +using System; +using System.Linq; namespace SYS.FormUI { @@ -39,7 +37,7 @@ namespace SYS.FormUI } ResponseMsg result = new ResponseMsg(); - + private void FrmCash_Load(object sender, EventArgs e) { @@ -65,7 +63,7 @@ namespace SYS.FormUI cboCashPerson.ValueMember = "WorkerId"; LoadCashInfo(); - txtCashNo.Text = Util.GetListNewId("CN",3,1,"-").FirstOrDefault(); + txtCashNo.Text = Util.GetListNewId("CN", 3, 1, "-").FirstOrDefault(); if (AdminInfo.Type != "GeneralManager" && AdminInfo.Type != "FinanceManager" && AdminInfo.isAdmin == false) { btnOK.Enabled = false; @@ -130,19 +128,19 @@ namespace SYS.FormUI }; if (CheckInput(cash)) { - bool dr = UIMessageBox.Show("请确认信息没有错误，一旦录入则无法修改！", "警告提醒",UIStyle.Orange, UIMessageBoxButtons.OKCancel); + bool dr = UIMessageBox.Show("请确认信息没有错误，一旦录入则无法修改！", "警告提醒", UIStyle.Orange, UIMessageBoxButtons.OKCancel); if (dr == true) { - result = HttpHelper.Request("Cash/AddCashInfo",HttpHelper.ModelToJson(cash)); + result = HttpHelper.Request("Cash/AddCashInfo", HttpHelper.ModelToJson(cash)); if (result.statusCode != 200) { UIMessageBox.ShowError("AddCashInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } - bool n = result.message.ToString().Equals("true")?true:false; + bool n = result.message.ToString().Equals("true") ? true : false; if (n) { - UIMessageBox.Show("录入成功！","系统提示",UIStyle.Green,UIMessageBoxButtons.OK); + UIMessageBox.Show("录入成功！", "系统提示", UIStyle.Green, UIMessageBoxButtons.OK); LoadCashInfo(); #region 获取添加操作日志所需的信息 RecordHelper.Record(AdminInfo.Account + AdminInfo.Name + "于" + DateTime.Now + "进行资产录入，资产编号为：" + txtCashNo.Text.Trim(), 3); diff --git a/SYS.FormUI/AppFunction/FrmChangeAdminPwd.cs b/SYS.FormUI/AppFunction/FrmChangeAdminPwd.cs index da81724958f4801b6022e757dc23cd5955c94fc4..5452a2657ad6a14b9011a830d6750412f6e91d30 100644 --- a/SYS.FormUI/AppFunction/FrmChangeAdminPwd.cs +++ b/SYS.FormUI/AppFunction/FrmChangeAdminPwd.cs @@ -21,21 +21,14 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common.Core; using jvncorelib_fr.EntityLib; using Sunny.UI; - using SYS.Common; -using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; using System.Drawing; -using System.Linq; -using System.Text; using System.Text.RegularExpressions; -using System.Threading.Tasks; -using System.Windows.Forms; namespace SYS.FormUI { @@ -56,7 +49,7 @@ namespace SYS.FormUI private void btnUpdPwd_Click(object sender, EventArgs e) { - Admin admin = new Admin() { AdminAccount = AdminInfo.Account, AdminPassword = txtNewPwd.Text.Trim(),datachg_usr = AdminInfo.Account }; + Admin admin = new Admin() { AdminAccount = AdminInfo.Account, AdminPassword = txtNewPwd.Text.Trim(), datachg_usr = AdminInfo.Account }; result = HttpHelper.Request("Admin​/UpdateNewPwdByOldPwd", HttpHelper.ModelToJson(admin)); if (result.statusCode != 200) { diff --git a/SYS.FormUI/AppFunction/FrmChangePosition.cs b/SYS.FormUI/AppFunction/FrmChangePosition.cs index 536938660ed8b583b925516d50d1573b5ceee505..3ff102ecd5da2c979b3a600ba7f7cb8bcd28b862 100644 --- a/SYS.FormUI/AppFunction/FrmChangePosition.cs +++ b/SYS.FormUI/AppFunction/FrmChangePosition.cs @@ -21,13 +21,10 @@ *SOFTWARE. * */ -using System; - -using System.Windows.Forms; using EOM.TSHotelManager.Common.Core; using Sunny.UI; - using SYS.Common; +using System; using System.Collections.Generic; namespace SYS.FormUI @@ -53,11 +50,11 @@ namespace SYS.FormUI txtClub.Text = FrmChangeWorker.wk_WorkerClub; txtPosition.Text = FrmChangeWorker.wk_WorkerPosition; //获取所有职位信息 - dic= new Dictionary() + dic = new Dictionary() { { "delete_mk","0"} }; - result = HttpHelper.Request("Base/SelectPositionAll",null,dic); + result = HttpHelper.Request("Base/SelectPositionAll", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("SelectPositionAll+接口服务异常，请提交Issue或尝试更新版本！"); diff --git a/SYS.FormUI/AppFunction/FrmChangeRoom.cs b/SYS.FormUI/AppFunction/FrmChangeRoom.cs index d77ce291d2f98ca79b71fba05a13fc0def888ad4..8a43eb914b526da641412e61120e0362929a142e 100644 --- a/SYS.FormUI/AppFunction/FrmChangeRoom.cs +++ b/SYS.FormUI/AppFunction/FrmChangeRoom.cs @@ -21,14 +21,12 @@ *SOFTWARE. * */ -using System; -using System.Windows.Forms; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using System.Transactions; -using System.Collections.Generic; - using SYS.Common; +using System; +using System.Collections.Generic; +using System.Transactions; namespace SYS.FormUI { @@ -76,7 +74,7 @@ namespace SYS.FormUI { { "roomno",rno} }; - result = HttpHelper.Request("Room/DayByRoomNo",null, dic); + result = HttpHelper.Request("Room/DayByRoomNo", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("DayByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); @@ -118,14 +116,14 @@ namespace SYS.FormUI MoneyState = SpendConsts.UnSettle, }; - result = HttpHelper.Request("Room​/UpdateRoomInfo",HttpHelper.ModelToJson(checkInRoom), null); + result = HttpHelper.Request("Room​/UpdateRoomInfo", HttpHelper.ModelToJson(checkInRoom), null); if (result.statusCode != 200) { UIMessageBox.ShowError("UpdateRoomInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool result1 = result.message.ToString().Equals("true"); - dic = new Dictionary() + dic = new Dictionary() { { "room",rno} }; @@ -158,7 +156,7 @@ namespace SYS.FormUI } bool result4 = result.message.ToString().Equals("true"); } - if (result1&& result2) + if (result1 && result2) { UIMessageBox.ShowSuccess("转房成功"); result = HttpHelper.Request("Spend​/InsertSpendInfo", HttpHelper.ModelToJson(s)); @@ -170,7 +168,7 @@ namespace SYS.FormUI bool m = result.message.ToString().Equals("true"); FrmRoomManager.Reload(""); #region 获取添加操作日志所需的信息 - RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + DateTime.Now + "位于" + LoginInfo.SoftwareVersion + "执行：" +ucRoomList.CustoNo + "于" + DateTime.Now + "进行了换房！", 2); + RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + DateTime.Now + "位于" + LoginInfo.SoftwareVersion + "执行：" + ucRoomList.CustoNo + "于" + DateTime.Now + "进行了换房！", 2); #endregion scope.Complete(); this.Close(); @@ -180,7 +178,7 @@ namespace SYS.FormUI UIMessageBox.ShowError("转房失败"); } } - + } diff --git a/SYS.FormUI/AppFunction/FrmChangeWorker.cs b/SYS.FormUI/AppFunction/FrmChangeWorker.cs index 9060c04ca52519d5a24d0ca3ccab7393b80b1153..1659819672a5605a4461fdef38dc6e08ef281fe7 100644 --- a/SYS.FormUI/AppFunction/FrmChangeWorker.cs +++ b/SYS.FormUI/AppFunction/FrmChangeWorker.cs @@ -21,15 +21,14 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common.Core; +using Sunny.UI; +using SYS.Common; +using SYS.FormUI.Properties; using System; using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; -using Sunny.UI; - -using SYS.Common; -using EOM.TSHotelManager.Common.Core; -using SYS.FormUI.Properties; namespace SYS.FormUI { @@ -90,7 +89,7 @@ namespace SYS.FormUI wk_WorkerEducation = FrmWorkerManager.wk_WorkerEducation; wk_WorkerStatus = FrmWorkerManager.wk_WorkerStatus; lblWorker.Text = FrmWorkerManager.wk_WorkerClub + FrmWorkerManager.wk_WorkerPosition + "：" + FrmWorkerManager.wk_WorkerName + "的操作界面"; - + switch (wk_WorkerClub) { case "经理部": @@ -112,7 +111,7 @@ namespace SYS.FormUI this.btnCheck.FillColor = Color.FromArgb(67, 123, 232); break; case "人力资源部": - this.BackgroundImage = Resources.人力资源部卡片; + this.BackgroundImage = Resources.人力资源部卡片; this.btnWatchInfo.FillColor = Color.FromArgb(101, 165, 72); this.btnUpdate.FillColor = Color.FromArgb(101, 165, 72); this.btnUpWorker.FillColor = Color.FromArgb(101, 165, 72); @@ -139,7 +138,7 @@ namespace SYS.FormUI this.btnCheck.FillColor = Color.FromArgb(255, 185, 38); break; case "内控部": - this.BackgroundImage = Resources.内控部卡片; + this.BackgroundImage = Resources.内控部卡片; var btnColor = Color.FromArgb(251, 157, 63); this.btnWatchInfo.FillColor = btnColor; this.btnUpdate.FillColor = btnColor; @@ -176,7 +175,7 @@ namespace SYS.FormUI this.btnCheck.FillColor = Color.FromArgb(106, 229, 162); break; case "维修部": - this.BackgroundImage = Resources.维修部卡片; + this.BackgroundImage = Resources.维修部卡片; this.btnWatchInfo.FillColor = Color.FromArgb(16, 90, 152); this.btnUpdate.FillColor = Color.FromArgb(16, 90, 152); this.btnUpWorker.FillColor = Color.FromArgb(16, 90, 152); diff --git a/SYS.FormUI/AppFunction/FrmChart.cs b/SYS.FormUI/AppFunction/FrmChart.cs index 794767c0b0310cb27abb122cb1f66eeb2e43dce4..90af9883512f4ef2421acb5c8002186887b4c65d 100644 --- a/SYS.FormUI/AppFunction/FrmChart.cs +++ b/SYS.FormUI/AppFunction/FrmChart.cs @@ -21,14 +21,10 @@ *SOFTWARE. * */ -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Windows.Forms; +using EOM.TSHotelManager.Common.Core; using Sunny.UI; - using SYS.Common; -using EOM.TSHotelManager.Common.Core; +using System; namespace SYS.FormUI { @@ -64,7 +60,7 @@ namespace SYS.FormUI private void timer1_Tick(object sender, EventArgs e) { - + } } diff --git a/SYS.FormUI/AppFunction/FrmCheckIn.cs b/SYS.FormUI/AppFunction/FrmCheckIn.cs index 187343d459a1dc3a4818959d37bb4c5d62dfc61a..029ec968c17742dd995b2bec9349fd57323309bb 100644 --- a/SYS.FormUI/AppFunction/FrmCheckIn.cs +++ b/SYS.FormUI/AppFunction/FrmCheckIn.cs @@ -21,15 +21,13 @@ *SOFTWARE. * */ -using System; -using System.Collections.Generic; -using System.Windows.Forms; using EOM.TSHotelManager.Common.Core; using Sunny.UI; - -using System.Transactions; -using System.Linq; using SYS.Common; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Transactions; namespace SYS.FormUI { @@ -54,7 +52,7 @@ namespace SYS.FormUI private void FrmCheckIn_Load(object sender, EventArgs e) { txtRoomNo.Text = ucRoomList.rm_RoomNo; - Dictionary pairs = new Dictionary(); + Dictionary pairs = new Dictionary(); pairs.Add("no", txtRoomNo.Text.Trim()); result = HttpHelper.Request("Room/SelectRoomByRoomNo", null, pairs); if (result.statusCode != 200) @@ -83,7 +81,7 @@ namespace SYS.FormUI } var ctos = HttpHelper.JsonToList(result.message).Select(a => a.CustoNo).ToArray(); //List roms = new RoomService().SelectCanUseRoomAll(); - + txtCustoNo.AutoCompleteCustomSource.AddRange(ctos); try { @@ -107,7 +105,7 @@ namespace SYS.FormUI #region 入住按钮点击事件方法 private void btnCheckIn_Click(object sender, EventArgs e) { - + } #endregion @@ -138,7 +136,7 @@ namespace SYS.FormUI UIMessageTip.ShowError("SeletHistorySpendInfoAll+接口服务异常，请提交issue"); return; } - var listCustoSpend = HttpHelper.JsonToList(result.message); + var listCustoSpend = HttpHelper.JsonToList(result.message); if (!listCustoSpend.IsNullOrEmpty()) { var spendAmount = listCustoSpend.Sum(a => a.SpendMoney); diff --git a/SYS.FormUI/AppFunction/FrmCheckList.Designer.cs b/SYS.FormUI/AppFunction/FrmCheckList.Designer.cs index 286e81b9ec4c8a8ef5a6d1682db9f8420fb4e146..23052f4491e584e91e16293d86f3f4ceba5804ee 100644 --- a/SYS.FormUI/AppFunction/FrmCheckList.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCheckList.Designer.cs @@ -106,13 +106,11 @@ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvCheckInfo.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvCheckInfo.RowHeadersVisible = false; - this.dgvCheckInfo.RowHeight = 29; dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; this.dgvCheckInfo.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvCheckInfo.RowTemplate.Height = 29; this.dgvCheckInfo.SelectedIndex = -1; this.dgvCheckInfo.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvCheckInfo.ShowGridLine = true; this.dgvCheckInfo.Size = new System.Drawing.Size(999, 582); this.dgvCheckInfo.TabIndex = 2; // diff --git a/SYS.FormUI/AppFunction/FrmCheckList.cs b/SYS.FormUI/AppFunction/FrmCheckList.cs index 596169a3be812320e1ff8e42da9862be032ed099..62f55c8c9b2cdf9c7cee54eed3318544dd7a9544 100644 --- a/SYS.FormUI/AppFunction/FrmCheckList.cs +++ b/SYS.FormUI/AppFunction/FrmCheckList.cs @@ -22,12 +22,10 @@ * */ +using EOM.TSHotelManager.Common.Core; using Sunny.UI; - using SYS.Common; -using EOM.TSHotelManager.Common.Core; using System; -using System.Windows.Forms; namespace SYS.FormUI { @@ -41,7 +39,7 @@ namespace SYS.FormUI private void FrmCashList_Load(object sender, EventArgs e) { - var result = HttpHelper.Request("CheckInfo/SelectCheckInfoAll"); + var result = HttpHelper.Request("CheckInfo/SelectCheckInfoAll"); if (result.statusCode != 200) { UIMessageBox.ShowError("SelectCheckInfoAll+接口服务异常，请提交Issue或尝试更新版本！"); diff --git a/SYS.FormUI/AppFunction/FrmCheckOutForm.Designer.cs b/SYS.FormUI/AppFunction/FrmCheckOutForm.Designer.cs index 90524977ecb140022ecc4bab9b545d1b190e62a2..58ad595cc98b7d0a66738cd1df62b6a665e66fc0 100644 --- a/SYS.FormUI/AppFunction/FrmCheckOutForm.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCheckOutForm.Designer.cs @@ -346,13 +346,11 @@ dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvSpendList.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; this.dgvSpendList.RowHeadersVisible = false; - this.dgvSpendList.RowHeight = 29; dataGridViewCellStyle4.BackColor = System.Drawing.Color.White; this.dgvSpendList.RowsDefaultCellStyle = dataGridViewCellStyle4; this.dgvSpendList.RowTemplate.Height = 29; this.dgvSpendList.SelectedIndex = -1; this.dgvSpendList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvSpendList.ShowGridLine = true; this.dgvSpendList.ShowRowErrors = false; this.dgvSpendList.Size = new System.Drawing.Size(648, 202); this.dgvSpendList.Style = Sunny.UI.UIStyle.Custom; @@ -963,13 +961,11 @@ dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvWti.RowHeadersDefaultCellStyle = dataGridViewCellStyle7; this.dgvWti.RowHeadersVisible = false; - this.dgvWti.RowHeight = 29; dataGridViewCellStyle8.BackColor = System.Drawing.Color.White; this.dgvWti.RowsDefaultCellStyle = dataGridViewCellStyle8; this.dgvWti.RowTemplate.Height = 29; this.dgvWti.SelectedIndex = -1; this.dgvWti.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvWti.ShowGridLine = true; this.dgvWti.Size = new System.Drawing.Size(656, 291); this.dgvWti.Style = Sunny.UI.UIStyle.Custom; this.dgvWti.TabIndex = 0; diff --git a/SYS.FormUI/AppFunction/FrmCheckOutForm.cs b/SYS.FormUI/AppFunction/FrmCheckOutForm.cs index 4df867e74e6f86fcae89f056044ae4c844981ba2..0a1176f737ff0095ee6ba45e9bb17006eaaa2964 100644 --- a/SYS.FormUI/AppFunction/FrmCheckOutForm.cs +++ b/SYS.FormUI/AppFunction/FrmCheckOutForm.cs @@ -21,16 +21,14 @@ *SOFTWARE. * */ -using System; -using System.Drawing; -using System.Windows.Forms; using EOM.TSHotelManager.Common.Core; -using SYS.FormUI.Properties; -using System.Collections.Generic; using Sunny.UI; - using SYS.Common; +using System; +using System.Collections.Generic; +using System.Drawing; using System.Transactions; +using System.Windows.Forms; namespace SYS.FormUI { @@ -132,13 +130,13 @@ namespace SYS.FormUI txtCustoNo.Text = ucRoomList.rm_CustoNo; CustoNo.Text = ucRoomList.rm_CustoNo; txtRoomNo.Text = ucRoomList.rm_RoomNo; - - dic = new Dictionary() + + dic = new Dictionary() { { "no",txtRoomNo.Text.ToString()} }; - result = HttpHelper.Request("Room/SelectRoomByRoomNo",null, dic); + result = HttpHelper.Request("Room/SelectRoomByRoomNo", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("SelectSexTypeAll+接口服务异常，请提交Issue或尝试更新版本！"); @@ -323,11 +321,11 @@ namespace SYS.FormUI double n = Convert.ToDouble(Convert.ToDecimal(txtReceipts.Text)); double m = Convert.ToDouble(Convert.ToDecimal(lblGetReceipts.Text)); double h = Convert.ToDouble(Convert.ToDecimal(lblVIPPrice.Text)); - lblChange.Text = Decimal.Parse((n- h).ToString()).ToString("#,##0.00"); + lblChange.Text = Decimal.Parse((n - h).ToString()).ToString("#,##0.00"); } catch { - UIMessageBox.Show("非法输入，请重新输入！", "系统提示",UIStyle.Orange); + UIMessageBox.Show("非法输入，请重新输入！", "系统提示", UIStyle.Orange); txtReceipts.Clear(); txtReceipts.Focus(); return; diff --git a/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs b/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs index 6d39610e7befc7aa047117da76a1deb4c82c5d5f..6d4d7c53525371a69423fbe0887895701bca4fcf 100644 --- a/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs @@ -48,7 +48,6 @@ this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.cmsCustoManager = new Sunny.UI.UIContextMenuStrip(); - this.tsmiCustoNo = new System.Windows.Forms.ToolStripMenuItem(); this.btnSerach = new Sunny.UI.UIButton(); this.btnAddCusto = new Sunny.UI.UIButton(); this.btnExport = new Sunny.UI.UIButton(); @@ -61,6 +60,8 @@ this.btnPg = new Sunny.UI.UIPagination(); this.uiLine1 = new Sunny.UI.UILine(); this.cbExportAll = new Sunny.UI.UICheckBox(); + this.tsmiCustoNo = new System.Windows.Forms.ToolStripMenuItem(); + this.cbOnlyVip = new Sunny.UI.UICheckBox(); ((System.ComponentModel.ISupportInitialize)(this.dgvCustomerList)).BeginInit(); this.cmsCustoManager.SuspendLayout(); this.uiGroupBox1.SuspendLayout(); @@ -126,14 +127,13 @@ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvCustomerList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvCustomerList.RowHeadersVisible = false; - this.dgvCustomerList.RowHeight = 29; dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; this.dgvCustomerList.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvCustomerList.RowTemplate.Height = 29; this.dgvCustomerList.SelectedIndex = -1; this.dgvCustomerList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvCustomerList.ShowRect = false; this.dgvCustomerList.Size = new System.Drawing.Size(999, 482); + this.dgvCustomerList.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.dgvCustomerList.Style = Sunny.UI.UIStyle.Custom; this.dgvCustomerList.TabIndex = 111; // @@ -234,14 +234,6 @@ this.cmsCustoManager.Name = "cmsCustoManager"; this.cmsCustoManager.Size = new System.Drawing.Size(177, 30); // - // tsmiCustoNo - // - this.tsmiCustoNo.Image = global::SYS.FormUI.Properties.Resources.复制; - this.tsmiCustoNo.Name = "tsmiCustoNo"; - this.tsmiCustoNo.Size = new System.Drawing.Size(176, 26); - this.tsmiCustoNo.Text = "复制用户编号"; - this.tsmiCustoNo.Click += new System.EventHandler(this.tsmiCustoNo_Click); - // // btnSerach // this.btnSerach.Cursor = System.Windows.Forms.Cursors.Hand; @@ -323,16 +315,14 @@ // txtCustoName // this.txtCustoName.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoName.FillColor = System.Drawing.Color.White; this.txtCustoName.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtCustoName.Location = new System.Drawing.Point(385, 23); this.txtCustoName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCustoName.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.ShowText = false; this.txtCustoName.Size = new System.Drawing.Size(173, 33); this.txtCustoName.Style = Sunny.UI.UIStyle.Custom; this.txtCustoName.TabIndex = 98; @@ -352,16 +342,14 @@ // txtCustoNo // this.txtCustoNo.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoNo.FillColor = System.Drawing.Color.White; this.txtCustoNo.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtCustoNo.Location = new System.Drawing.Point(110, 23); this.txtCustoNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtCustoNo.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.ShowText = false; this.txtCustoNo.Size = new System.Drawing.Size(173, 33); this.txtCustoNo.Style = Sunny.UI.UIStyle.Custom; this.txtCustoNo.TabIndex = 96; @@ -388,7 +376,8 @@ this.btnPg.Name = "btnPg"; this.btnPg.PageSize = 15; this.btnPg.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; - this.btnPg.Size = new System.Drawing.Size(677, 34); + this.btnPg.ShowText = false; + this.btnPg.Size = new System.Drawing.Size(543, 34); this.btnPg.Style = Sunny.UI.UIStyle.Custom; this.btnPg.TabIndex = 121; this.btnPg.Text = null; @@ -397,11 +386,13 @@ // // uiLine1 // + this.uiLine1.BackColor = System.Drawing.Color.Transparent; this.uiLine1.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiLine1.Location = new System.Drawing.Point(792, 533); + this.uiLine1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + this.uiLine1.Location = new System.Drawing.Point(791, 533); this.uiLine1.MinimumSize = new System.Drawing.Size(2, 2); this.uiLine1.Name = "uiLine1"; - this.uiLine1.Size = new System.Drawing.Size(203, 29); + this.uiLine1.Size = new System.Drawing.Size(204, 29); this.uiLine1.Style = Sunny.UI.UIStyle.Custom; this.uiLine1.TabIndex = 123; this.uiLine1.Text = "右键可复制客户编号"; @@ -410,6 +401,7 @@ // this.cbExportAll.Cursor = System.Windows.Forms.Cursors.Hand; this.cbExportAll.Font = new System.Drawing.Font("微软雅黑", 12F); + this.cbExportAll.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); this.cbExportAll.Location = new System.Drawing.Point(687, 533); this.cbExportAll.MinimumSize = new System.Drawing.Size(1, 1); this.cbExportAll.Name = "cbExportAll"; @@ -419,12 +411,36 @@ this.cbExportAll.TabIndex = 124; this.cbExportAll.Text = "导出全部"; // + // tsmiCustoNo + // + this.tsmiCustoNo.Image = global::SYS.FormUI.Properties.Resources.复制; + this.tsmiCustoNo.Name = "tsmiCustoNo"; + this.tsmiCustoNo.Size = new System.Drawing.Size(176, 26); + this.tsmiCustoNo.Text = "复制用户编号"; + this.tsmiCustoNo.Click += new System.EventHandler(this.tsmiCustoNo_Click); + // + // cbOnlyVip + // + this.cbOnlyVip.Cursor = System.Windows.Forms.Cursors.Hand; + this.cbOnlyVip.Font = new System.Drawing.Font("微软雅黑", 12F); + this.cbOnlyVip.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + this.cbOnlyVip.Location = new System.Drawing.Point(567, 533); + this.cbOnlyVip.MinimumSize = new System.Drawing.Size(1, 1); + this.cbOnlyVip.Name = "cbOnlyVip"; + this.cbOnlyVip.Padding = new System.Windows.Forms.Padding(22, 0, 0, 0); + this.cbOnlyVip.Size = new System.Drawing.Size(113, 29); + this.cbOnlyVip.Style = Sunny.UI.UIStyle.Custom; + this.cbOnlyVip.TabIndex = 125; + this.cbOnlyVip.Text = "仅查看会员"; + this.cbOnlyVip.CheckedChanged += new System.EventHandler(this.cbOnlyVip_CheckedChanged); + // // FrmCustoManager // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.ClientSize = new System.Drawing.Size(1005, 623); this.ControlBox = false; + this.Controls.Add(this.cbOnlyVip); this.Controls.Add(this.cbExportAll); this.Controls.Add(this.uiLine1); this.Controls.Add(this.btnPg); @@ -441,6 +457,7 @@ this.ShowTitleIcon = true; this.Style = Sunny.UI.UIStyle.Custom; this.Text = "客户信息管理"; + this.ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 1005, 623); this.Load += new System.EventHandler(this.FrmCustoManager_Load); ((System.ComponentModel.ISupportInitialize)(this.dgvCustomerList)).EndInit(); this.cmsCustoManager.ResumeLayout(false); @@ -478,5 +495,6 @@ private System.Windows.Forms.ToolStripMenuItem tsmiCustoNo; private Sunny.UI.UILine uiLine1; private Sunny.UI.UICheckBox cbExportAll; + private Sunny.UI.UICheckBox cbOnlyVip; } } \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmCustoManager.cs b/SYS.FormUI/AppFunction/FrmCustoManager.cs index f2e7e994cd4539409b73bc316a803e8cde4b7eef..5a700df6894f5116d858501a91f4907c5e6af9a5 100644 --- a/SYS.FormUI/AppFunction/FrmCustoManager.cs +++ b/SYS.FormUI/AppFunction/FrmCustoManager.cs @@ -21,18 +21,12 @@ *SOFTWARE. * */ -using System; - -using System.Windows.Forms; using EOM.TSHotelManager.Common.Core; -using SYS.FormUI.Properties; -using System.Collections.Generic; - using Sunny.UI; using SYS.Common; -using System.Linq; -using System.Runtime.InteropServices; -using System.Text; +using System; +using System.Collections.Generic; +using System.Windows.Forms; namespace SYS.FormUI { @@ -48,7 +42,7 @@ namespace SYS.FormUI public static DateTime cm_CustoBirth; public static int cm_CustoType; - public delegate void ReloadCustomerList(); + public delegate void ReloadCustomerList(bool onlyVip); //定义委托类型的变量 @@ -84,14 +78,18 @@ namespace SYS.FormUI int count = 0; #region 加载用户信息列表 - private void LoadCustomer() + private void LoadCustomer(bool onlyVip = false) { dic = new Dictionary() { { "pageIndex","1"}, { "pageSize","15"} }; - result = HttpHelper.Request("Custo/SelectCustoAll",null,dic); + if (onlyVip) + { + dic.Add("onlyVip", onlyVip.ToString()); + } + result = HttpHelper.Request("Custo/SelectCustoAll", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); @@ -267,8 +265,13 @@ namespace SYS.FormUI private void tsmiCustoNo_Click(object sender, EventArgs e) { - Clipboard.SetText(dgvCustomerList.Rows[0].Cells["CustoNo"].Value as string); + Clipboard.SetText(dgvCustomerList.SelectedRows[0].Cells["CustoNo"].Value as string); UIMessageTip.ShowOk("复制完成！", 1500); } + + private void cbOnlyVip_CheckedChanged(object sender, EventArgs e) + { + LoadCustomer(cbOnlyVip.Checked); + } } } diff --git a/SYS.FormUI/AppFunction/FrmCustoSpend.Designer.cs b/SYS.FormUI/AppFunction/FrmCustoSpend.Designer.cs index 97fd9b848802021ce50d8877ea9c8e8d24e5fe68..319fdf70de17795f1d3ccb7feff6254129d6d5f1 100644 --- a/SYS.FormUI/AppFunction/FrmCustoSpend.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCustoSpend.Designer.cs @@ -111,13 +111,11 @@ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvSpendList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvSpendList.RowHeadersVisible = false; - this.dgvSpendList.RowHeight = 29; dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; this.dgvSpendList.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvSpendList.RowTemplate.Height = 29; this.dgvSpendList.SelectedIndex = -1; this.dgvSpendList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvSpendList.ShowGridLine = true; this.dgvSpendList.ShowRowErrors = false; this.dgvSpendList.Size = new System.Drawing.Size(999, 582); this.dgvSpendList.Style = Sunny.UI.UIStyle.Custom; diff --git a/SYS.FormUI/AppFunction/FrmCustoSpend.cs b/SYS.FormUI/AppFunction/FrmCustoSpend.cs index baf8e586444883e9e3c85cbb43a34da470184ae6..1736b4f30980a1417ae1a2e1b815ea4ee1012862 100644 --- a/SYS.FormUI/AppFunction/FrmCustoSpend.cs +++ b/SYS.FormUI/AppFunction/FrmCustoSpend.cs @@ -22,12 +22,10 @@ * */ +using EOM.TSHotelManager.Common.Core; using Sunny.UI; - using SYS.Common; -using EOM.TSHotelManager.Common.Core; using System; -using System.Windows.Forms; namespace SYS.FormUI { diff --git a/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs b/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs index bcc5274a1db924926aae313d2eb791cf9ce3d11d..8f53bd1fae0bb693b01685591ff4cb46a183fb16 100644 --- a/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs @@ -29,10 +29,10 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.dgvCustomerList = new Sunny.UI.UIDataGridView(); this.CustoNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -64,6 +64,7 @@ this.label3 = new System.Windows.Forms.Label(); this.btnPg = new Sunny.UI.UIPagination(); this.uiLine1 = new Sunny.UI.UILine(); + this.cbOnlyVip = new Sunny.UI.UICheckBox(); ((System.ComponentModel.ISupportInitialize)(this.dgvCustomerList)).BeginInit(); this.cmsCustoManager.SuspendLayout(); this.uiGroupBox1.SuspendLayout(); @@ -80,21 +81,21 @@ this.dgvCustomerList.AllowUserToDeleteRows = false; this.dgvCustomerList.AllowUserToResizeColumns = false; this.dgvCustomerList.AllowUserToResizeRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.dgvCustomerList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.dgvCustomerList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvCustomerList.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvCustomerList.BackgroundColor = System.Drawing.Color.White; this.dgvCustomerList.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dgvCustomerList.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; this.dgvCustomerList.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F); - dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvCustomerList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); + dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 12F); + dataGridViewCellStyle6.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvCustomerList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; this.dgvCustomerList.ColumnHeadersHeight = 25; this.dgvCustomerList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.dgvCustomerList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -122,23 +123,22 @@ this.dgvCustomerList.Location = new System.Drawing.Point(12, 12); this.dgvCustomerList.Name = "dgvCustomerList"; this.dgvCustomerList.ReadOnly = true; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvCustomerList.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 12F); + dataGridViewCellStyle7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvCustomerList.RowHeadersDefaultCellStyle = dataGridViewCellStyle7; this.dgvCustomerList.RowHeadersVisible = false; - this.dgvCustomerList.RowHeight = 29; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.White; - this.dgvCustomerList.RowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.White; + this.dgvCustomerList.RowsDefaultCellStyle = dataGridViewCellStyle8; this.dgvCustomerList.RowTemplate.Height = 29; this.dgvCustomerList.SelectedIndex = -1; this.dgvCustomerList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvCustomerList.ShowRect = false; this.dgvCustomerList.Size = new System.Drawing.Size(1048, 381); + this.dgvCustomerList.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.dgvCustomerList.Style = Sunny.UI.UIStyle.Custom; this.dgvCustomerList.TabIndex = 83; this.toolTip1.SetToolTip(this.dgvCustomerList, "选中客户右键可进行更多操作"); @@ -274,6 +274,7 @@ // // cmsCustoManager // + this.cmsCustoManager.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255))))); this.cmsCustoManager.Font = new System.Drawing.Font("微软雅黑", 12F); this.cmsCustoManager.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tsmiCustoNo}); @@ -299,6 +300,7 @@ this.btnSerach.Size = new System.Drawing.Size(97, 41); this.btnSerach.TabIndex = 84; this.btnSerach.Text = "搜 索"; + this.btnSerach.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSerach.Click += new System.EventHandler(this.btnSerach_BtnClick); // // btnAddCusto @@ -312,6 +314,7 @@ this.btnAddCusto.Size = new System.Drawing.Size(97, 41); this.btnAddCusto.TabIndex = 85; this.btnAddCusto.Text = "添加客户"; + this.btnAddCusto.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnAddCusto.Click += new System.EventHandler(this.btnAddCusto_BtnClick); // // btnUpdCustomer @@ -328,6 +331,7 @@ this.btnUpdCustomer.Style = Sunny.UI.UIStyle.Custom; this.btnUpdCustomer.TabIndex = 87; this.btnUpdCustomer.Text = "修改客户"; + this.btnUpdCustomer.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdCustomer.Click += new System.EventHandler(this.btnUpdCustomer_Click); // // uiGroupBox1 @@ -350,19 +354,18 @@ // txtCustoName // this.txtCustoName.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoName.FillColor = System.Drawing.Color.White; this.txtCustoName.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtCustoName.Location = new System.Drawing.Point(387, 23); 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.ShowText = false; this.txtCustoName.Size = new System.Drawing.Size(173, 33); this.txtCustoName.TabIndex = 94; this.txtCustoName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtCustoName.Watermark = ""; // // label1 // @@ -377,19 +380,18 @@ // txtCustoNo // this.txtCustoNo.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCustoNo.FillColor = System.Drawing.Color.White; this.txtCustoNo.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtCustoNo.Location = new System.Drawing.Point(112, 23); 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.ShowText = false; this.txtCustoNo.Size = new System.Drawing.Size(173, 33); this.txtCustoNo.TabIndex = 92; this.txtCustoNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtCustoNo.Watermark = ""; // // label3 // @@ -411,7 +413,8 @@ this.btnPg.Name = "btnPg"; this.btnPg.PageSize = 15; this.btnPg.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; - this.btnPg.Size = new System.Drawing.Size(755, 34); + this.btnPg.ShowText = false; + this.btnPg.Size = new System.Drawing.Size(636, 34); this.btnPg.TabIndex = 120; this.btnPg.Text = null; this.btnPg.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; @@ -419,20 +422,38 @@ // // uiLine1 // + this.uiLine1.BackColor = System.Drawing.Color.Transparent; this.uiLine1.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiLine1.Location = new System.Drawing.Point(774, 404); + this.uiLine1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + this.uiLine1.Location = new System.Drawing.Point(774, 406); this.uiLine1.MinimumSize = new System.Drawing.Size(2, 2); this.uiLine1.Name = "uiLine1"; this.uiLine1.Size = new System.Drawing.Size(286, 29); this.uiLine1.TabIndex = 124; this.uiLine1.Text = "右键可复制快速客户编号"; // + // cbOnlyVip + // + this.cbOnlyVip.Cursor = System.Windows.Forms.Cursors.Hand; + this.cbOnlyVip.Font = new System.Drawing.Font("微软雅黑", 12F); + this.cbOnlyVip.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + this.cbOnlyVip.Location = new System.Drawing.Point(655, 406); + this.cbOnlyVip.MinimumSize = new System.Drawing.Size(1, 1); + this.cbOnlyVip.Name = "cbOnlyVip"; + this.cbOnlyVip.Padding = new System.Windows.Forms.Padding(22, 0, 0, 0); + this.cbOnlyVip.Size = new System.Drawing.Size(113, 29); + this.cbOnlyVip.Style = Sunny.UI.UIStyle.Custom; + this.cbOnlyVip.TabIndex = 126; + this.cbOnlyVip.Text = "仅查看会员"; + this.cbOnlyVip.CheckedChanged += new System.EventHandler(this.cbOnlyVip_CheckedChanged); + // // FrmCustomerManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.ClientSize = new System.Drawing.Size(1072, 490); + this.Controls.Add(this.cbOnlyVip); this.Controls.Add(this.uiLine1); this.Controls.Add(this.btnPg); this.Controls.Add(this.uiGroupBox1); @@ -485,5 +506,6 @@ private Sunny.UI.UIContextMenuStrip cmsCustoManager; private System.Windows.Forms.ToolStripMenuItem tsmiCustoNo; private Sunny.UI.UILine uiLine1; + private Sunny.UI.UICheckBox cbOnlyVip; } } \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmCustomerManager.cs b/SYS.FormUI/AppFunction/FrmCustomerManager.cs index 20414806c60c082ef529ec976fd60bbaf4f91c55..594400ef9d8bf6c784f2ce7b5be893d0e1b4c02c 100644 --- a/SYS.FormUI/AppFunction/FrmCustomerManager.cs +++ b/SYS.FormUI/AppFunction/FrmCustomerManager.cs @@ -21,24 +21,19 @@ *SOFTWARE. * */ -using System; - -using System.Text.RegularExpressions; -using System.Windows.Forms; using EOM.TSHotelManager.Common.Core; -using SYS.FormUI.Properties; -using System.Collections.Generic; -using System.Linq; - using Sunny.UI; using SYS.Common; +using System; +using System.Collections.Generic; +using System.Windows.Forms; namespace SYS.FormUI { public partial class FrmCustomerManager : Form { - public delegate void ReloadCustomerList(); + public delegate void ReloadCustomerList(bool onlyVip = false); //定义委托类型的变量 @@ -62,13 +57,17 @@ namespace SYS.FormUI #endregion #region 加载用户信息列表 - private void LoadCustomer() + private void LoadCustomer(bool onlyVip = false) { dic = new Dictionary() { { "pageIndex","1"}, { "pageSize","15"} }; + if (onlyVip) + { + dic.Add("onlyVip", onlyVip.ToString()); + } result = HttpHelper.Request("Custo/SelectCustoAll", null, dic); if (result.statusCode != 200) { @@ -82,81 +81,6 @@ namespace SYS.FormUI } #endregion - #region 计算点击次数 - private int n = 0; - #endregion - - #region 隐藏显示信息 - private void picShow_Click(object sender, EventArgs e) - { - - } - #endregion - - //#region 导出事件方法 - //private void picLoadOut_Click(object sender, EventArgs e) - //{ - // #region 导出信息保存为Excel表 - // bool ret = UIMessageBox.Show("导出信息为敏感操作，确定要继续导出吗？(此步操作将写入操作日志)", "信息提醒",UIStyle.Orange, UIMessageBoxButtons.OKCancel); - // if (!ret) - // { - // //Response.ContentEncoding = System.Text.Encoding.UTF8; - // string fileName = ""; - // string saveFileName = ""; - // //fileName.Charset = "GB2312"; - // SaveFileDialog saveDialog = new SaveFileDialog(); - // //saveDialog.DefaultExt = "xls"; - // saveDialog.FileName = fileName; - // saveDialog.Filter = "2003~2007工作表*.xls|*.xls|2010及以上版本工作表*.xlsx|*.xlsx"; - // saveDialog.ShowDialog(); - // saveFileName = saveDialog.FileName; - // if (saveFileName.IndexOf(":") < 0) return; - // Microsoft.Office.Interop.Excel.Application xlApp = new Microsoft.Office.Interop.Excel.Application(); - // if (xlApp == null) - // { - // UIMessageBox.Show("无法创建Excel对象,您的电脑可能未安装Excel！", "来自T仔的提醒",UIStyle.Red); - // return; - // } - // Microsoft.Office.Interop.Excel.Workbooks workbooks = xlApp.Workbooks; - // Microsoft.Office.Interop.Excel.Workbook workbook = workbooks.Add(Microsoft.Office.Interop.Excel.XlWBATemplate.xlWBATWorksheet); - // Microsoft.Office.Interop.Excel.Worksheet worksheet = (Microsoft.Office.Interop.Excel.Worksheet)workbook.Worksheets[1]; - // for (int i = 0; i < this.dgvCustomerList.Columns.Count; i++) - // { - // xlApp.Cells[1, i + 1] = dgvCustomerList.Columns[i].HeaderText; - // } - // for (int i = 0; i < dgvCustomerList.Rows.Count; i++)//添加每一项 - // { - // for (int j = 0; j < dgvCustomerList.Columns.Count; j++) - // { - // xlApp.Cells[i + 2, j + 1] = dgvCustomerList.Rows[i].Cells[j].ToString(); - // } - // } - // System.Windows.Forms.Application.DoEvents(); - // worksheet.Columns.EntireColumn.AutoFit();//列宽自适应 - // UIMessageBox.Show(fileName + "信息导出成功", "来自T仔提示",UIStyle.Green, UIMessageBoxButtons.OKCancel); - // #region 获取添加操作日志所需的信息 - // RecordHelper.Record(LoginInfo.WorkerClub + LoginInfo.WorkerName + LoginInfo.WorkerPosition + LoginInfo.WorkerName + "于" + DateTime.Now + "导出了" + "用户信息!", 3); - // #endregion - // System.Diagnostics.Process.Start("Explorer.exe", saveFileName); - // if (saveFileName != "") - // { - // try - // { - // workbook.Saved = true; - // workbook.SaveCopyAs(saveFileName); //fileSaved = true; - // } - // catch (Exception ex) - // {//fileSaved = false; - // UIMessageBox.Show("导出文件时出错,文件可能正被打开！\n" + ex.Message,"系统提示",UIStyle.Red); - // } - // } - // xlApp.Quit(); - // GC.Collect(); - // #endregion - // } - //} - //#endregion - int count = 0; private void btnSerach_BtnClick(object sender, EventArgs e) { @@ -175,10 +99,7 @@ namespace SYS.FormUI UIMessageBox.ShowError("SelectCustoByInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } - //custos = HttpHelper.JsonToList(result.message); custos = HttpHelper.JsonToList(result.message); - //var listSource = HttpHelper.JsonToModel(result.message); - //custos = listSource.listSource; } else if (!txtCustoName.Text.IsNullOrEmpty()) { @@ -192,23 +113,11 @@ namespace SYS.FormUI UIMessageBox.ShowError("SelectCustoByInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } - //if (result.statusCode != 200) - //{ - // UIMessageBox.ShowError("SelectCustoByInfo+接口服务异常，请提交Issue或尝试更新版本！"); - // return; - //} - //var listSource = HttpHelper.JsonToModel(result.message); - //custos = listSource.listSource; custos = HttpHelper.JsonToList(result.message); } else { result = HttpHelper.Request("Custo/SelectCustoAll?pageIndex=1&pageSize=15"); - //if (result.statusCode != 200) - //{ - // UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); - // return; - //} var listSource = HttpHelper.JsonToModel(result.message); custos = listSource.listSource; } @@ -253,7 +162,7 @@ namespace SYS.FormUI private void btnPg_Click(object sender, EventArgs e) { - + } private void btnPg_PageChanged(object sender, object pagingSource, int pageIndex, int count) @@ -277,9 +186,14 @@ namespace SYS.FormUI private void tsmiCustoNo_Click(object sender, EventArgs e) { - Clipboard.SetText(dgvCustomerList.Rows[0].Cells["CustoNo"].Value as string); + Clipboard.SetText(dgvCustomerList.SelectedRows[0].Cells["CustoNo"].Value as string); UIMessageTip.ShowOk("复制完成！", 1500); } + + private void cbOnlyVip_CheckedChanged(object sender, EventArgs e) + { + LoadCustomer(cbOnlyVip.Checked); + } } } diff --git a/SYS.FormUI/AppFunction/FrmDepartment.Designer.cs b/SYS.FormUI/AppFunction/FrmDepartment.Designer.cs index 7601419abc9e9b50e1f83c590ad98987ce803fa7..518bae885fb6c1b3f0a2e157da159b14c0fafaab 100644 --- a/SYS.FormUI/AppFunction/FrmDepartment.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmDepartment.Designer.cs @@ -47,13 +47,11 @@ namespace SYS.FormUI this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.cboDeptParent = new Sunny.UI.UIComboBox(); + this.clDeptLeaderNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clDeptParentNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.label1 = new System.Windows.Forms.Label(); this.btnAddDept = new Sunny.UI.UIButton(); this.label9 = new System.Windows.Forms.Label(); - this.cboDeptLeader = new Sunny.UI.UIComboBox(); this.label8 = new System.Windows.Forms.Label(); this.txtDeptDesc = new Sunny.UI.UITextBox(); this.label7 = new System.Windows.Forms.Label(); @@ -62,6 +60,8 @@ namespace SYS.FormUI this.txtDeptNo = new Sunny.UI.UITextBox(); this.btnUpdateDept = new Sunny.UI.UIButton(); this.btnDeleteDept = new Sunny.UI.UIButton(); + this.cboDeptParent = new Sunny.UI.UIComboBox(); + this.cboDeptLeader = new Sunny.UI.UIComboBox(); ((System.ComponentModel.ISupportInitialize)(this.dgvDeptList)).BeginInit(); this.SuspendLayout(); // @@ -98,8 +98,8 @@ namespace SYS.FormUI this.Column3, this.Column4, this.Column5, - this.Column6, - this.Column7}); + this.clDeptLeaderNo, + this.clDeptParentNo}); dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F); @@ -124,14 +124,13 @@ namespace SYS.FormUI dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvDeptList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvDeptList.RowHeadersVisible = false; - this.dgvDeptList.RowHeight = 29; dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; this.dgvDeptList.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvDeptList.RowTemplate.Height = 29; this.dgvDeptList.SelectedIndex = -1; this.dgvDeptList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvDeptList.ShowGridLine = true; this.dgvDeptList.Size = new System.Drawing.Size(788, 582); + this.dgvDeptList.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.dgvDeptList.TabIndex = 0; this.dgvDeptList.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvDeptList_CellMouseClick); // @@ -217,39 +216,21 @@ namespace SYS.FormUI this.Column5.ReadOnly = true; this.Column5.Visible = false; // - // Column6 - // - this.Column6.DataPropertyName = "dept_leader"; - this.Column6.HeaderText = "Column6"; - this.Column6.Name = "Column6"; - this.Column6.ReadOnly = true; - this.Column6.Visible = false; + // clDeptLeaderNo // - // Column7 + this.clDeptLeaderNo.DataPropertyName = "dept_leader"; + this.clDeptLeaderNo.HeaderText = "Column6"; + this.clDeptLeaderNo.Name = "clDeptLeaderNo"; + this.clDeptLeaderNo.ReadOnly = true; + this.clDeptLeaderNo.Visible = false; // - this.Column7.DataPropertyName = "dept_parent"; - this.Column7.HeaderText = "Column7"; - this.Column7.Name = "Column7"; - this.Column7.ReadOnly = true; - this.Column7.Visible = false; + // clDeptParentNo // - // cboDeptParent - // - this.cboDeptParent.DataSource = null; - this.cboDeptParent.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cboDeptParent.FillColor = System.Drawing.Color.White; - this.cboDeptParent.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.cboDeptParent.Location = new System.Drawing.Point(820, 443); - this.cboDeptParent.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cboDeptParent.MinimumSize = new System.Drawing.Size(63, 0); - this.cboDeptParent.Name = "cboDeptParent"; - this.cboDeptParent.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cboDeptParent.Radius = 20; - this.cboDeptParent.Size = new System.Drawing.Size(165, 29); - this.cboDeptParent.Sorted = true; - this.cboDeptParent.TabIndex = 182; - this.cboDeptParent.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.cboDeptParent.Watermark = ""; + this.clDeptParentNo.DataPropertyName = "dept_parent"; + this.clDeptParentNo.HeaderText = "Column7"; + this.clDeptParentNo.Name = "clDeptParentNo"; + this.clDeptParentNo.ReadOnly = true; + this.clDeptParentNo.Visible = false; // // label1 // @@ -272,6 +253,7 @@ namespace SYS.FormUI this.btnAddDept.Size = new System.Drawing.Size(165, 33); this.btnAddDept.TabIndex = 180; this.btnAddDept.Text = "新增部门"; + this.btnAddDept.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnAddDept.Click += new System.EventHandler(this.btnAddDept_Click); // // label9 @@ -284,24 +266,6 @@ namespace SYS.FormUI this.label9.TabIndex = 175; this.label9.Text = "部门主管"; // - // cboDeptLeader - // - this.cboDeptLeader.DataSource = null; - this.cboDeptLeader.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; - this.cboDeptLeader.FillColor = System.Drawing.Color.White; - this.cboDeptLeader.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.cboDeptLeader.Location = new System.Drawing.Point(820, 371); - this.cboDeptLeader.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cboDeptLeader.MinimumSize = new System.Drawing.Size(63, 0); - this.cboDeptLeader.Name = "cboDeptLeader"; - this.cboDeptLeader.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); - this.cboDeptLeader.Radius = 20; - this.cboDeptLeader.Size = new System.Drawing.Size(165, 29); - this.cboDeptLeader.Sorted = true; - this.cboDeptLeader.TabIndex = 174; - this.cboDeptLeader.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.cboDeptLeader.Watermark = ""; - // // label8 // this.label8.AutoSize = true; @@ -315,22 +279,21 @@ namespace SYS.FormUI // txtDeptDesc // this.txtDeptDesc.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtDeptDesc.FillColor = System.Drawing.Color.White; this.txtDeptDesc.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtDeptDesc.Location = new System.Drawing.Point(820, 225); this.txtDeptDesc.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtDeptDesc.Maximum = 2147483647D; - this.txtDeptDesc.Minimum = -2147483648D; this.txtDeptDesc.MinimumSize = new System.Drawing.Size(1, 1); this.txtDeptDesc.Multiline = true; this.txtDeptDesc.Name = "txtDeptDesc"; this.txtDeptDesc.Padding = new System.Windows.Forms.Padding(5); this.txtDeptDesc.Radius = 10; + this.txtDeptDesc.ShowText = false; this.txtDeptDesc.Size = new System.Drawing.Size(165, 103); this.txtDeptDesc.Style = Sunny.UI.UIStyle.Custom; this.txtDeptDesc.StyleCustomMode = true; this.txtDeptDesc.TabIndex = 172; this.txtDeptDesc.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtDeptDesc.Watermark = ""; // // label7 // @@ -345,21 +308,20 @@ namespace SYS.FormUI // txtDeptName // this.txtDeptName.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtDeptName.FillColor = System.Drawing.Color.White; this.txtDeptName.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtDeptName.Location = new System.Drawing.Point(820, 153); this.txtDeptName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtDeptName.Maximum = 2147483647D; - this.txtDeptName.Minimum = -2147483648D; this.txtDeptName.MinimumSize = new System.Drawing.Size(1, 1); this.txtDeptName.Name = "txtDeptName"; this.txtDeptName.Padding = new System.Windows.Forms.Padding(5); this.txtDeptName.Radius = 20; + this.txtDeptName.ShowText = false; this.txtDeptName.Size = new System.Drawing.Size(165, 29); this.txtDeptName.Style = Sunny.UI.UIStyle.Custom; this.txtDeptName.StyleCustomMode = true; this.txtDeptName.TabIndex = 170; this.txtDeptName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtDeptName.Watermark = ""; // // label20 // @@ -374,22 +336,21 @@ namespace SYS.FormUI // txtDeptNo // this.txtDeptNo.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtDeptNo.FillColor = System.Drawing.Color.White; this.txtDeptNo.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtDeptNo.Location = new System.Drawing.Point(820, 81); this.txtDeptNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txtDeptNo.Maximum = 2147483647D; - this.txtDeptNo.Minimum = -2147483648D; this.txtDeptNo.MinimumSize = new System.Drawing.Size(1, 1); this.txtDeptNo.Name = "txtDeptNo"; this.txtDeptNo.Padding = new System.Windows.Forms.Padding(5); this.txtDeptNo.Radius = 20; this.txtDeptNo.ReadOnly = true; + this.txtDeptNo.ShowText = false; this.txtDeptNo.Size = new System.Drawing.Size(165, 29); this.txtDeptNo.Style = Sunny.UI.UIStyle.Custom; this.txtDeptNo.StyleCustomMode = true; this.txtDeptNo.TabIndex = 168; this.txtDeptNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtDeptNo.Watermark = ""; // // btnUpdateDept // @@ -402,6 +363,7 @@ namespace SYS.FormUI this.btnUpdateDept.Size = new System.Drawing.Size(165, 33); this.btnUpdateDept.TabIndex = 183; this.btnUpdateDept.Text = "更新部门"; + this.btnUpdateDept.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdateDept.Click += new System.EventHandler(this.btnUpdateDept_Click); // // btnDeleteDept @@ -415,21 +377,60 @@ namespace SYS.FormUI this.btnDeleteDept.Size = new System.Drawing.Size(165, 33); this.btnDeleteDept.TabIndex = 184; this.btnDeleteDept.Text = "删除部门"; + this.btnDeleteDept.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnDeleteDept.Click += new System.EventHandler(this.btnDeleteDept_Click); // + // cboDeptParent + // + this.cboDeptParent.DataSource = null; + this.cboDeptParent.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; + this.cboDeptParent.FillColor = System.Drawing.Color.White; + this.cboDeptParent.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.cboDeptParent.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); + this.cboDeptParent.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.cboDeptParent.Location = new System.Drawing.Point(820, 443); + this.cboDeptParent.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.cboDeptParent.MinimumSize = new System.Drawing.Size(63, 0); + this.cboDeptParent.Name = "cboDeptParent"; + this.cboDeptParent.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); + this.cboDeptParent.Radius = 10; + this.cboDeptParent.Size = new System.Drawing.Size(165, 29); + this.cboDeptParent.SymbolSize = 24; + this.cboDeptParent.TabIndex = 185; + this.cboDeptParent.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.cboDeptParent.Watermark = ""; + // + // cboDeptLeader + // + this.cboDeptLeader.DataSource = null; + this.cboDeptLeader.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; + this.cboDeptLeader.FillColor = System.Drawing.Color.White; + this.cboDeptLeader.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.cboDeptLeader.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); + this.cboDeptLeader.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.cboDeptLeader.Location = new System.Drawing.Point(820, 371); + this.cboDeptLeader.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.cboDeptLeader.MinimumSize = new System.Drawing.Size(63, 0); + this.cboDeptLeader.Name = "cboDeptLeader"; + this.cboDeptLeader.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); + this.cboDeptLeader.Size = new System.Drawing.Size(165, 29); + this.cboDeptLeader.SymbolSize = 24; + this.cboDeptLeader.TabIndex = 186; + this.cboDeptLeader.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.cboDeptLeader.Watermark = ""; + // // FrmDepartment // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(1005, 623); this.ControlBox = false; + this.Controls.Add(this.cboDeptLeader); + this.Controls.Add(this.cboDeptParent); this.Controls.Add(this.btnDeleteDept); this.Controls.Add(this.btnUpdateDept); - this.Controls.Add(this.cboDeptParent); this.Controls.Add(this.label1); this.Controls.Add(this.btnAddDept); this.Controls.Add(this.label9); - this.Controls.Add(this.cboDeptLeader); this.Controls.Add(this.label8); this.Controls.Add(this.txtDeptDesc); this.Controls.Add(this.label7); @@ -441,9 +442,9 @@ namespace SYS.FormUI this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmDepartment"; - this.ShowIcon = true; this.ShowTitleIcon = true; this.Text = "部门信息"; + this.ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 1005, 623); this.Load += new System.EventHandler(this.FrmDepartment_Load); ((System.ComponentModel.ISupportInitialize)(this.dgvDeptList)).EndInit(); this.ResumeLayout(false); @@ -454,11 +455,9 @@ namespace SYS.FormUI #endregion private Sunny.UI.UIDataGridView dgvDeptList; - private Sunny.UI.UIComboBox cboDeptParent; private System.Windows.Forms.Label label1; private Sunny.UI.UIButton btnAddDept; private System.Windows.Forms.Label label9; - private Sunny.UI.UIComboBox cboDeptLeader; private System.Windows.Forms.Label label8; private Sunny.UI.UITextBox txtDeptDesc; private System.Windows.Forms.Label label7; @@ -478,7 +477,9 @@ namespace SYS.FormUI private System.Windows.Forms.DataGridViewTextBoxColumn Column3; private System.Windows.Forms.DataGridViewTextBoxColumn Column4; private System.Windows.Forms.DataGridViewTextBoxColumn Column5; - private System.Windows.Forms.DataGridViewTextBoxColumn Column6; - private System.Windows.Forms.DataGridViewTextBoxColumn Column7; + private System.Windows.Forms.DataGridViewTextBoxColumn clDeptLeaderNo; + private System.Windows.Forms.DataGridViewTextBoxColumn clDeptParentNo; + private Sunny.UI.UIComboBox cboDeptParent; + private Sunny.UI.UIComboBox cboDeptLeader; } } \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmDepartment.cs b/SYS.FormUI/AppFunction/FrmDepartment.cs index fa04f579a758ad3fbef887cf94ba6bc0c878044d..fb922b6c6f1f92ac52dd874f9b9ade4a911efa64 100644 --- a/SYS.FormUI/AppFunction/FrmDepartment.cs +++ b/SYS.FormUI/AppFunction/FrmDepartment.cs @@ -21,21 +21,14 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common.Core; +using jvncorelib_fr.EntityLib; using Sunny.UI; - using SYS.Common; -using EOM.TSHotelManager.Common.Core; -using SYS.FormUI.Properties; using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; -using jvncorelib_fr.EntityLib; namespace SYS.FormUI { @@ -49,6 +42,8 @@ namespace SYS.FormUI private void FrmDepartment_Load(object sender, EventArgs e) { ReloadDeptList(); + LoadDept(); + LoadLeader(); } ResponseMsg result = null; @@ -56,17 +51,15 @@ namespace SYS.FormUI public void ReloadDeptList() { - LoadDept(); - LoadLeader(); txtDeptNo.Text = Util.GetListNewId("D", 3, 1, "-").FirstOrDefault(); - dgvDeptList.AutoGenerateColumns = false; result = HttpHelper.Request("Base/SelectDeptAllCanUse"); if (result.statusCode != 200) { UIMessageBox.ShowError("SelectDeptAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); return; } - dgvDeptList.DataSource =HttpHelper.JsonToList(result.message); + dgvDeptList.AutoGenerateColumns = false; + dgvDeptList.DataSource = HttpHelper.JsonToList(result.message); } public void LoadDept() @@ -95,7 +88,7 @@ namespace SYS.FormUI cboDeptLeader.ValueMember = "WorkerId"; } - public bool CheckInput(Dept dept) + public bool CheckInput(Dept dept) { if (string.IsNullOrWhiteSpace(dept.dept_no)) { @@ -126,7 +119,7 @@ namespace SYS.FormUI }; if (CheckInput(dept)) { - result = HttpHelper.Request("Base/AddDept",HttpHelper.ModelToJson(dept)); + result = HttpHelper.Request("Base/AddDept", HttpHelper.ModelToJson(dept)); if (result.statusCode != 200) { UIMessageBox.ShowError("AddDept+接口服务异常，请提交Issue或尝试更新版本！"); @@ -152,12 +145,12 @@ namespace SYS.FormUI UIMessageBox.Show("信息不完整，请检查！", "系统提示", UIStyle.Orange, UIMessageBoxButtons.OK); return; } - + } private void dgvDeptList_CellClick(object sender, DataGridViewCellEventArgs e) { - + } private void btnUpdateDept_Click(object sender, EventArgs e) @@ -167,7 +160,7 @@ namespace SYS.FormUI dept_no = txtDeptNo.Text.Trim(), dept_name = txtDeptName.Text.Trim(), dept_desc = txtDeptDesc.Text.Trim(), - dept_parent = cboDeptParent.SelectedValue == null ? "" : cboDeptParent.SelectedValue.ToString(), + dept_parent = cboDeptParent.SelectedValue == null ? "" : cboDeptParent.ToString(), dept_leader = cboDeptLeader.SelectedValue == null ? "" : cboDeptLeader.SelectedValue.ToString(), datachg_usr = AdminInfo.Account, }; @@ -210,7 +203,7 @@ namespace SYS.FormUI { { "deptNo",txtDeptNo.Text.Trim()} }; - result = HttpHelper.Request("Worker/CheckWorkerBydepartment",null, dic); + result = HttpHelper.Request("Worker/CheckWorkerBydepartment", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("CheckWorkerBydepartment+接口服务异常，请提交Issue或尝试更新版本！"); @@ -250,7 +243,7 @@ namespace SYS.FormUI ReloadDeptList(); return; } - + } private void dgvDeptList_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e) @@ -260,10 +253,17 @@ namespace SYS.FormUI txtDeptNo.Text = dgvDeptList.SelectedRows[0].Cells["clDeptNo"].Value.IsNullOrEmpty() ? "" : dgvDeptList.SelectedRows[0].Cells["clDeptNo"].Value.ToString(); txtDeptName.Text = dgvDeptList.SelectedRows[0].Cells["clDeptName"].Value.IsNullOrEmpty() ? "" : dgvDeptList.SelectedRows[0].Cells["clDeptName"].Value.ToString(); txtDeptDesc.Text = dgvDeptList.SelectedRows[0].Cells["clDeptDesc"].Value.IsNullOrEmpty() ? "" : dgvDeptList.SelectedRows[0].Cells["clDeptDesc"].Value.ToString(); + cboDeptLeader.SelectedValue = dgvDeptList.SelectedRows[0].Cells["clDeptLeaderNo"].Value.IsNullOrEmpty() ? "" : dgvDeptList.SelectedRows[0].Cells["clDeptLeaderNo"].Value.ToString(); + cboDeptParent.SelectedValue = dgvDeptList.SelectedRows[0].Cells["clDeptParentNo"].Value.IsNullOrEmpty() ? "" : dgvDeptList.SelectedRows[0].Cells["clDeptParentNo"].Value.ToString(); } } + + private void cboDeptLeader_SelectedValueChanged(object sender, EventArgs e) + { + //UIMessageBox.Show(cboDeptLeader.SelectedValue.ToString()); + } } - + } diff --git a/SYS.FormUI/AppFunction/FrmDepartment.resx b/SYS.FormUI/AppFunction/FrmDepartment.resx index ac993bf9025f8b87f162e2a0593c84b7911f9832..6a110fc0c3dabf6a7dd2e6046648d5f91b1f2c59 100644 --- a/SYS.FormUI/AppFunction/FrmDepartment.resx +++ b/SYS.FormUI/AppFunction/FrmDepartment.resx @@ -150,10 +150,10 @@ True - + True - + True diff --git a/SYS.FormUI/AppFunction/FrmEditInputs.cs b/SYS.FormUI/AppFunction/FrmEditInputs.cs index 48851bd647645f7cbff43eb3275878e64973b434..f05d48df5f7af95b909333b17743c413f44af167 100644 --- a/SYS.FormUI/AppFunction/FrmEditInputs.cs +++ b/SYS.FormUI/AppFunction/FrmEditInputs.cs @@ -1,17 +1,10 @@  +using EOM.TSHotelManager.Common.Core; using Sunny.UI; - using SYS.Common; -using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Transactions; using System.Windows.Forms; namespace SYS.FormUI @@ -110,7 +103,7 @@ namespace SYS.FormUI dtpBirthday.ReadOnly = false; return; } - + } } @@ -276,7 +269,7 @@ namespace SYS.FormUI UIMessageBox.ShowError("请正确输入证件号码！"); return; } - finally + finally { cbPassportType.SelectedIndex = 0; } diff --git a/SYS.FormUI/AppFunction/FrmEducation.Designer.cs b/SYS.FormUI/AppFunction/FrmEducation.Designer.cs index cee511b1505a0e53fe7767c6e3af09c6b110fa7e..bb3e51f8917393cf6bec8426b545ce3c6864499a 100644 --- a/SYS.FormUI/AppFunction/FrmEducation.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmEducation.Designer.cs @@ -204,13 +204,11 @@ namespace SYS.FormUI dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvEducationList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvEducationList.RowHeadersVisible = false; - this.dgvEducationList.RowHeight = 29; dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; this.dgvEducationList.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvEducationList.RowTemplate.Height = 29; this.dgvEducationList.SelectedIndex = -1; this.dgvEducationList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvEducationList.ShowGridLine = true; this.dgvEducationList.Size = new System.Drawing.Size(788, 582); this.dgvEducationList.TabIndex = 185; this.dgvEducationList.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvEducationList_CellMouseClick); diff --git a/SYS.FormUI/AppFunction/FrmEducation.cs b/SYS.FormUI/AppFunction/FrmEducation.cs index 56fd1fbc535b84677bf6eb21a92aacf057742608..74f244d644de205bbb24476062bec283052d7027 100644 --- a/SYS.FormUI/AppFunction/FrmEducation.cs +++ b/SYS.FormUI/AppFunction/FrmEducation.cs @@ -22,19 +22,13 @@ * */ +using EOM.TSHotelManager.Common.Core; using Sunny.UI; - using SYS.Common; -using EOM.TSHotelManager.Common.Core; -using SYS.FormUI.Properties; using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; using System.Drawing; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace SYS.FormUI @@ -83,7 +77,7 @@ namespace SYS.FormUI { if (txtEducationName.Text.Trim().IsNullOrEmpty()) { - UIMessageTip.ShowWarning("学历名称为空，请检查",1500); + UIMessageTip.ShowWarning("学历名称为空，请检查", 1500); txtEducationName.Focus(); return; } @@ -94,7 +88,7 @@ namespace SYS.FormUI delete_mk = 0, datains_usr = AdminInfo.Account }; - result = HttpHelper.Request("Base​/AddEducation",HttpHelper.ModelToJson(edu)); + result = HttpHelper.Request("Base​/AddEducation", HttpHelper.ModelToJson(edu)); if (result.statusCode != 200 || result.message.ToString().Equals("false")) { UIMessageTip.ShowError("AddEducation+接口服务异常，请提交Issue或尝试更新版本！", 1500); @@ -113,7 +107,7 @@ namespace SYS.FormUI { if (dgvEducationList.SelectedRows.Count <= 0) { - UIMessageTip.ShowWarning("未选择需修改的学历数据，请检查",1500); + UIMessageTip.ShowWarning("未选择需修改的学历数据，请检查", 1500); return; } var edu = new Education() diff --git a/SYS.FormUI/AppFunction/FrmGoodOrBad.Designer.cs b/SYS.FormUI/AppFunction/FrmGoodOrBad.Designer.cs index 2b6a633dcd396a02393c8de61afc4954cc06b4e4..aa09ada306efeb6a43ccf25da624cf30da4b3aaa 100644 --- a/SYS.FormUI/AppFunction/FrmGoodOrBad.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmGoodOrBad.Designer.cs @@ -278,13 +278,11 @@ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.DgvGoodBadList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.DgvGoodBadList.RowHeadersVisible = false; - this.DgvGoodBadList.RowHeight = 29; dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; this.DgvGoodBadList.RowsDefaultCellStyle = dataGridViewCellStyle5; this.DgvGoodBadList.RowTemplate.Height = 29; this.DgvGoodBadList.SelectedIndex = -1; this.DgvGoodBadList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.DgvGoodBadList.ShowGridLine = true; this.DgvGoodBadList.Size = new System.Drawing.Size(593, 199); this.DgvGoodBadList.Style = Sunny.UI.UIStyle.Custom; this.DgvGoodBadList.TabIndex = 3; diff --git a/SYS.FormUI/AppFunction/FrmGoodOrBad.cs b/SYS.FormUI/AppFunction/FrmGoodOrBad.cs index 473b137140c0fab2618884e25b4ab00a3d5363e8..42b90d0b346fdb89cbf76340acd5e05d64aabf2a 100644 --- a/SYS.FormUI/AppFunction/FrmGoodOrBad.cs +++ b/SYS.FormUI/AppFunction/FrmGoodOrBad.cs @@ -21,19 +21,11 @@ *SOFTWARE. * */ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; using EOM.TSHotelManager.Common.Core; using Sunny.UI; - using SYS.Common; +using System; +using System.Collections.Generic; namespace SYS.FormUI { @@ -119,10 +111,10 @@ namespace SYS.FormUI }; if (CheckInput(goodBad)) { - bool dr = UIMessageBox.Show("确定录入？一旦录入后将无法修改及删除，或会影响员工的晋升！", "录入警告",UIStyle.Orange, UIMessageBoxButtons.OKCancel); + bool dr = UIMessageBox.Show("确定录入？一旦录入后将无法修改及删除，或会影响员工的晋升！", "录入警告", UIStyle.Orange, UIMessageBoxButtons.OKCancel); if (dr) { - result = HttpHelper.Request("WorkerGoodBad​/AddGoodBad",HttpHelper.ModelToJson(goodBad)); + result = HttpHelper.Request("WorkerGoodBad​/AddGoodBad", HttpHelper.ModelToJson(goodBad)); if (result.statusCode != 200) { UIMessageBox.ShowError("AddGoodBad+接口服务异常，请提交Issue或尝试更新版本！"); @@ -131,7 +123,7 @@ namespace SYS.FormUI bool n = result.message.ToString().Equals("true"); if (n) { - UIMessageBox.Show("新增成功！","系统提示",UIStyle.Green,UIMessageBoxButtons.OK); + UIMessageBox.Show("新增成功！", "系统提示", UIStyle.Green, UIMessageBoxButtons.OK); #region 获取添加操作日志所需的信息 RecordHelper.Record(AdminInfo.Account + "-" + AdminInfo.Name + "在" + DateTime.Now + "位于" + AdminInfo.SoftwareVersion + "执行：" + "录入员工奖惩操作！新增值为：" + goodBad.GBInfo, 2); #endregion diff --git a/SYS.FormUI/AppFunction/FrmMySpace.cs b/SYS.FormUI/AppFunction/FrmMySpace.cs index 0bfe9aa06d13f76f5381c17cfaf2ab61b6ddf02e..dd5bc5f2babad432a4a680add796f2504bcbecd7 100644 --- a/SYS.FormUI/AppFunction/FrmMySpace.cs +++ b/SYS.FormUI/AppFunction/FrmMySpace.cs @@ -21,23 +21,16 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common.Core; using jvncorelib_fr.EncryptorLib; using jvncorelib_fr.EntityLib; using Sunny.UI; - using SYS.Common; -using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; using System.ComponentModel; -using System.Configuration; -using System.Data; using System.Drawing; -using System.Linq; -using System.Text; using System.Text.RegularExpressions; -using System.Threading.Tasks; -using System.Windows.Forms; namespace SYS.FormUI { @@ -286,7 +279,7 @@ namespace SYS.FormUI UIMessageBox.ShowError("UpdateWorker+接口服务异常，请提交Issue或尝试更新版本！"); return; } - bool tf = result.message.ToString().Equals("true") ? true:false; + bool tf = result.message.ToString().Equals("true") ? true : false; if (!tf) { UIMessageBox.Show("修改失败！服务器处于繁忙，请稍后再试！", "系统提示", UIStyle.Red, UIMessageBoxButtons.OK); @@ -318,7 +311,7 @@ namespace SYS.FormUI { WorkerId = txtWorkerNo.Text.Trim(), }; - Dictionary dic = new Dictionary(); + Dictionary dic = new Dictionary(); dic.Add("WorkerId", txtWorkerNo.Text.Trim()); result = HttpHelper.Request("WorkerPicture/WorkerPic", null, dic); if (result.statusCode != 200) diff --git a/SYS.FormUI/AppFunction/FrmNation.Designer.cs b/SYS.FormUI/AppFunction/FrmNation.Designer.cs index b28ca19f5421cbba7592bd619427927cff812cb6..79e4712b855f70ada53e40190346bf4c4ca8b5ff 100644 --- a/SYS.FormUI/AppFunction/FrmNation.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmNation.Designer.cs @@ -42,14 +42,14 @@ namespace SYS.FormUI this.txtNationName = new Sunny.UI.UITextBox(); this.label20 = new System.Windows.Forms.Label(); this.txtNationNo = new Sunny.UI.UITextBox(); - this.dgvNationList = new Sunny.UI.UIDataGridView(); - this.clNationNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clNationName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clDeleteMk = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clDeleteMk = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clNationName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clNationNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvNationList = new Sunny.UI.UIDataGridView(); ((System.ComponentModel.ISupportInitialize)(this.dgvNationList)).BeginInit(); this.SuspendLayout(); // @@ -116,7 +116,6 @@ namespace SYS.FormUI this.txtNationName.Padding = new System.Windows.Forms.Padding(5); this.txtNationName.Radius = 20; this.txtNationName.Size = new System.Drawing.Size(165, 29); - this.txtNationName.Style = Sunny.UI.UIStyle.Custom; this.txtNationName.StyleCustomMode = true; this.txtNationName.TabIndex = 202; this.txtNationName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; @@ -146,18 +145,71 @@ namespace SYS.FormUI this.txtNationNo.Radius = 20; this.txtNationNo.ReadOnly = true; this.txtNationNo.Size = new System.Drawing.Size(165, 29); - this.txtNationNo.Style = Sunny.UI.UIStyle.Custom; this.txtNationNo.StyleCustomMode = true; this.txtNationNo.TabIndex = 200; this.txtNationNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // + // Column5 + // + this.Column5.DataPropertyName = "datachg_date"; + this.Column5.HeaderText = "datachg_date"; + this.Column5.Name = "Column5"; + this.Column5.ReadOnly = true; + this.Column5.Visible = false; + // + // Column4 + // + this.Column4.DataPropertyName = "datachg_usr"; + this.Column4.HeaderText = "Column4"; + this.Column4.Name = "Column4"; + this.Column4.ReadOnly = true; + this.Column4.Visible = false; + // + // Column3 + // + this.Column3.DataPropertyName = "datains_date"; + this.Column3.HeaderText = "Column3"; + this.Column3.Name = "Column3"; + this.Column3.ReadOnly = true; + this.Column3.Visible = false; + // + // Column2 + // + this.Column2.DataPropertyName = "datains_usr"; + this.Column2.HeaderText = "Column2"; + this.Column2.Name = "Column2"; + this.Column2.ReadOnly = true; + this.Column2.Visible = false; + // + // clDeleteMk + // + this.clDeleteMk.DataPropertyName = "delete_mk"; + this.clDeleteMk.HeaderText = "Column1"; + this.clDeleteMk.Name = "clDeleteMk"; + this.clDeleteMk.ReadOnly = true; + this.clDeleteMk.Visible = false; + // + // clNationName + // + this.clNationName.DataPropertyName = "nation_name"; + this.clNationName.HeaderText = "民族名称"; + this.clNationName.Name = "clNationName"; + this.clNationName.ReadOnly = true; + // + // clNationNo + // + this.clNationNo.DataPropertyName = "nation_no"; + this.clNationNo.HeaderText = "民族编号"; + this.clNationNo.Name = "clNationNo"; + this.clNationNo.ReadOnly = true; + // // dgvNationList // this.dgvNationList.AllowUserToAddRows = false; this.dgvNationList.AllowUserToDeleteRows = false; this.dgvNationList.AllowUserToResizeColumns = false; this.dgvNationList.AllowUserToResizeRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255))))); this.dgvNationList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvNationList.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvNationList.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); @@ -204,71 +256,15 @@ namespace SYS.FormUI dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvNationList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvNationList.RowHeadersVisible = false; - this.dgvNationList.RowHeight = 29; dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; this.dgvNationList.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvNationList.RowTemplate.Height = 29; this.dgvNationList.SelectedIndex = -1; this.dgvNationList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvNationList.ShowGridLine = true; this.dgvNationList.Size = new System.Drawing.Size(788, 582); this.dgvNationList.TabIndex = 199; this.dgvNationList.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvNationList_CellMouseClick); // - // clNationNo - // - this.clNationNo.DataPropertyName = "nation_no"; - this.clNationNo.HeaderText = "民族编号"; - this.clNationNo.Name = "clNationNo"; - this.clNationNo.ReadOnly = true; - // - // clNationName - // - this.clNationName.DataPropertyName = "nation_name"; - this.clNationName.HeaderText = "民族名称"; - this.clNationName.Name = "clNationName"; - this.clNationName.ReadOnly = true; - // - // clDeleteMk - // - this.clDeleteMk.DataPropertyName = "delete_mk"; - this.clDeleteMk.HeaderText = "Column1"; - this.clDeleteMk.Name = "clDeleteMk"; - this.clDeleteMk.ReadOnly = true; - this.clDeleteMk.Visible = false; - // - // Column2 - // - this.Column2.DataPropertyName = "datains_usr"; - this.Column2.HeaderText = "Column2"; - this.Column2.Name = "Column2"; - this.Column2.ReadOnly = true; - this.Column2.Visible = false; - // - // Column3 - // - this.Column3.DataPropertyName = "datains_date"; - this.Column3.HeaderText = "Column3"; - this.Column3.Name = "Column3"; - this.Column3.ReadOnly = true; - this.Column3.Visible = false; - // - // Column4 - // - this.Column4.DataPropertyName = "datachg_usr"; - this.Column4.HeaderText = "Column4"; - this.Column4.Name = "Column4"; - this.Column4.ReadOnly = true; - this.Column4.Visible = false; - // - // Column5 - // - this.Column5.DataPropertyName = "datachg_date"; - this.Column5.HeaderText = "datachg_date"; - this.Column5.Name = "Column5"; - this.Column5.ReadOnly = true; - this.Column5.Visible = false; - // // FrmNation // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); @@ -306,13 +302,13 @@ namespace SYS.FormUI private Sunny.UI.UITextBox txtNationName; private System.Windows.Forms.Label label20; private Sunny.UI.UITextBox txtNationNo; - private Sunny.UI.UIDataGridView dgvNationList; - private System.Windows.Forms.DataGridViewTextBoxColumn clNationNo; - private System.Windows.Forms.DataGridViewTextBoxColumn clNationName; - private System.Windows.Forms.DataGridViewTextBoxColumn clDeleteMk; - private System.Windows.Forms.DataGridViewTextBoxColumn Column2; - private System.Windows.Forms.DataGridViewTextBoxColumn Column3; - private System.Windows.Forms.DataGridViewTextBoxColumn Column4; private System.Windows.Forms.DataGridViewTextBoxColumn Column5; + private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn clDeleteMk; + private System.Windows.Forms.DataGridViewTextBoxColumn clNationName; + private System.Windows.Forms.DataGridViewTextBoxColumn clNationNo; + private Sunny.UI.UIDataGridView dgvNationList; } } \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmNation.cs b/SYS.FormUI/AppFunction/FrmNation.cs index 239507754287a2d2a3ecd129112d203fe6f068d9..747263ec382ad475813de42ac6518963754a7e3a 100644 --- a/SYS.FormUI/AppFunction/FrmNation.cs +++ b/SYS.FormUI/AppFunction/FrmNation.cs @@ -21,20 +21,14 @@ *SOFTWARE. * */ -using Sunny.UI; - -using SYS.Common; //using SYS.Common; using EOM.TSHotelManager.Common.Core; -using SYS.FormUI.Properties; +using Sunny.UI; +using SYS.Common; using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; using System.Drawing; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace SYS.FormUI @@ -65,7 +59,7 @@ namespace SYS.FormUI public void ReloadNationList() { txtNationNo.Text = Util.GetListNewId("N", 3, 1, "-").FirstOrDefault(); - + result = HttpHelper.Request("Base/SelectNationAll"); if (result.statusCode != 200) { diff --git a/SYS.FormUI/AppFunction/FrmNation.resx b/SYS.FormUI/AppFunction/FrmNation.resx index ba89dc915e85a415187230bc42c9dd2f066d77dc..e119f49abb986660097abe4596e6c64549773011 100644 --- a/SYS.FormUI/AppFunction/FrmNation.resx +++ b/SYS.FormUI/AppFunction/FrmNation.resx @@ -117,25 +117,25 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + True - + True True - + True - + True - + True diff --git a/SYS.FormUI/AppFunction/FrmNotice.Designer.cs b/SYS.FormUI/AppFunction/FrmNotice.Designer.cs index 3955240c810c8b330b4ad3217d1632e7a26bca73..75bb83265c176d9e017e3dfad5fb37173ce54892 100644 --- a/SYS.FormUI/AppFunction/FrmNotice.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmNotice.Designer.cs @@ -69,7 +69,7 @@ namespace SYS.FormUI this.dgvNoticeList.Size = new System.Drawing.Size(195, 534); this.dgvNoticeList.TabIndex = 113; this.dgvNoticeList.Text = "uiListBox1"; - this.dgvNoticeList.ItemClick += new System.EventHandler(this.dgvNoticeList_ItemClick); + //this.dgvNoticeList.ItemClick += new System.EventHandler(this.dgvNoticeList_ItemClick); // // FrmNotice // diff --git a/SYS.FormUI/AppFunction/FrmNotice.cs b/SYS.FormUI/AppFunction/FrmNotice.cs index f10b01839c7b8557c2b3213f246799a7b128ed56..ed5cb3ab1c86781bbc7fb938349032becb719787 100644 --- a/SYS.FormUI/AppFunction/FrmNotice.cs +++ b/SYS.FormUI/AppFunction/FrmNotice.cs @@ -21,19 +21,12 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common.Core; using Sunny.UI; - using SYS.Common; -using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace SYS.FormUI { @@ -66,11 +59,11 @@ namespace SYS.FormUI { //根据:来分割字符串并返回第一项数据即为公告编号 var str = dgvNoticeList.SelectedItem.ToString().Split(":").First(); - dic= new Dictionary() + dic = new Dictionary() { { "noticeId",str} }; - result = HttpHelper.Request("Notice/SelectNoticeByNoticeNo",null,dic); + result = HttpHelper.Request("Notice/SelectNoticeByNoticeNo", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("SelectNoticeAll+接口服务异常，请提交Issue或尝试更新版本！"); diff --git a/SYS.FormUI/AppFunction/FrmOperation.Designer.cs b/SYS.FormUI/AppFunction/FrmOperation.Designer.cs index 9f8f0b8eedf88ef9baad0b62442227f12cc1c312..d8cc029aee24235b8548838704a02c5b69544963 100644 --- a/SYS.FormUI/AppFunction/FrmOperation.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmOperation.Designer.cs @@ -107,13 +107,11 @@ this.dgvOperationlog.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvOperationlog.RowHeadersVisible = false; this.dgvOperationlog.RowHeadersWidth = 72; - this.dgvOperationlog.RowHeight = 29; dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; this.dgvOperationlog.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvOperationlog.RowTemplate.Height = 29; this.dgvOperationlog.SelectedIndex = -1; this.dgvOperationlog.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvOperationlog.ShowGridLine = true; this.dgvOperationlog.Size = new System.Drawing.Size(998, 522); this.dgvOperationlog.TabIndex = 1; // diff --git a/SYS.FormUI/AppFunction/FrmOperation.cs b/SYS.FormUI/AppFunction/FrmOperation.cs index 628fffda68250761aaea4e4fa5b7f726d5b42bea..42eb91a153155cbed45e7057a50daa0a6f357c83 100644 --- a/SYS.FormUI/AppFunction/FrmOperation.cs +++ b/SYS.FormUI/AppFunction/FrmOperation.cs @@ -26,7 +26,6 @@ using Sunny.UI; using SYS.Common; using System; using System.Collections.Generic; -using System.Windows.Forms; namespace SYS.FormUI { diff --git a/SYS.FormUI/AppFunction/FrmPleaseWait.cs b/SYS.FormUI/AppFunction/FrmPleaseWait.cs index 2ca144ef7a1800c4ba1e91cd08b1ed0c18d76fa0..66517144de2c74f9bf3374e535d6d1eab3b952c4 100644 --- a/SYS.FormUI/AppFunction/FrmPleaseWait.cs +++ b/SYS.FormUI/AppFunction/FrmPleaseWait.cs @@ -1,13 +1,5 @@ using Sunny.UI; using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace SYS.FormUI { diff --git a/SYS.FormUI/AppFunction/FrmPosition.Designer.cs b/SYS.FormUI/AppFunction/FrmPosition.Designer.cs index 48360419b3c1aac26836a0126d8c3741da462535..4626598ddd97c01c0fec33025e0d77a4aea1fbfe 100644 --- a/SYS.FormUI/AppFunction/FrmPosition.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmPosition.Designer.cs @@ -204,13 +204,11 @@ namespace SYS.FormUI dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvPositionList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvPositionList.RowHeadersVisible = false; - this.dgvPositionList.RowHeight = 29; dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; this.dgvPositionList.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvPositionList.RowTemplate.Height = 29; this.dgvPositionList.SelectedIndex = -1; this.dgvPositionList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvPositionList.ShowGridLine = true; this.dgvPositionList.Size = new System.Drawing.Size(788, 582); this.dgvPositionList.TabIndex = 207; this.dgvPositionList.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvPositionList_CellMouseClick); diff --git a/SYS.FormUI/AppFunction/FrmPosition.cs b/SYS.FormUI/AppFunction/FrmPosition.cs index 6c7f9ffdf6ae0bcca8f7a2cc3ad5b18a24bee494..577998a7bd87ea4c283d9a00c2c4afa80358a4f0 100644 --- a/SYS.FormUI/AppFunction/FrmPosition.cs +++ b/SYS.FormUI/AppFunction/FrmPosition.cs @@ -21,19 +21,13 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common.Core; using Sunny.UI; - using SYS.Common; -using EOM.TSHotelManager.Common.Core; -using SYS.FormUI.Properties; using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; using System.Drawing; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace SYS.FormUI @@ -163,6 +157,13 @@ namespace SYS.FormUI btnDeletePosition.RectColor = Color.Green; btnDeletePosition.Click += btnRecoveryPosition_Click; } + else + { + btnDeletePosition.Text = "删除职位"; + btnDeletePosition.FillColor = Color.FromArgb(80, 160, 255); + btnDeletePosition.RectColor = Color.FromArgb(80, 160, 255); + btnDeletePosition.Click += btnDeletePosition_Click; + } } private void btnRecoveryPosition_Click(object sender, EventArgs e) diff --git a/SYS.FormUI/AppFunction/FrmReserList.Designer.cs b/SYS.FormUI/AppFunction/FrmReserList.Designer.cs index c5b9e916a27aaac4436dcb70161494e412500dcf..fc45db75bb7f2a9e0081f2e07b285b69787c413f 100644 --- a/SYS.FormUI/AppFunction/FrmReserList.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmReserList.Designer.cs @@ -118,13 +118,11 @@ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvReserList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvReserList.RowHeadersVisible = false; - this.dgvReserList.RowHeight = 29; dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; this.dgvReserList.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvReserList.RowTemplate.Height = 29; this.dgvReserList.SelectedIndex = -1; this.dgvReserList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvReserList.ShowGridLine = true; this.dgvReserList.Size = new System.Drawing.Size(726, 169); this.dgvReserList.TabIndex = 113; this.dgvReserList.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvReserList_CellClick); diff --git a/SYS.FormUI/AppFunction/FrmReserList.cs b/SYS.FormUI/AppFunction/FrmReserList.cs index c744afe08c5b12719505e3b58b0299dbab7dc63c..559b460694e01afbd3fef5ab12c03b80aa0eeb9a 100644 --- a/SYS.FormUI/AppFunction/FrmReserList.cs +++ b/SYS.FormUI/AppFunction/FrmReserList.cs @@ -1,16 +1,11 @@ -using System; - -using System.Windows.Forms; -using EOM.TSHotelManager.Common.Core; +using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using System.Transactions; -using System.Collections.Generic; - -using System.Web.Script.Services; using SYS.Common; +using System; +using System.Collections.Generic; using System.Linq; -using static System.Windows.Forms.VisualStyles.VisualStyleElement.ToolTip; -using System.Security.Cryptography; +using System.Transactions; +using System.Windows.Forms; namespace SYS.FormUI { @@ -107,7 +102,7 @@ namespace SYS.FormUI return; } - Room r = new Room() + Room r = new Room() { CheckTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")), CustoNo = custo.CustoNo, diff --git a/SYS.FormUI/AppFunction/FrmReserManager.cs b/SYS.FormUI/AppFunction/FrmReserManager.cs index 0d1cf3b7cddcdb4159cea8e9781ea4b393d1cf77..929381866af0d2baba2e48686e31195832f2f059 100644 --- a/SYS.FormUI/AppFunction/FrmReserManager.cs +++ b/SYS.FormUI/AppFunction/FrmReserManager.cs @@ -1,11 +1,10 @@ -using System; -using System.Windows.Forms; -using EOM.TSHotelManager.Common.Core; +using EOM.TSHotelManager.Common.Core; using Sunny.UI; - using SYS.Common; -using System.Linq; +using System; using System.Collections.Generic; +using System.Linq; +using System.Windows.Forms; namespace SYS.FormUI { @@ -40,12 +39,12 @@ namespace SYS.FormUI ReserEndDay = dtpEndDate.Value, datains_usr = LoginInfo.WorkerNo }; - Room room = new Room() + Room room = new Room() { RoomNo = cboReserRoomNo.Text, RoomStateId = 4 }; - result = HttpHelper.Request("Reser​/InserReserInfo",HttpHelper.ModelToJson(reser)); + result = HttpHelper.Request("Reser​/InserReserInfo", HttpHelper.ModelToJson(reser)); if (result.statusCode != 200) { UIMessageBox.ShowError("InserReserInfo+接口服务异常，请提交Issue或尝试更新版本！"); diff --git a/SYS.FormUI/AppFunction/FrmRoomManager.cs b/SYS.FormUI/AppFunction/FrmRoomManager.cs index 0a3a9a50b64327fc9a858cc4a5e11e69944de7a6..a91db7e419052340d6b98084eee664be496f923e 100644 --- a/SYS.FormUI/AppFunction/FrmRoomManager.cs +++ b/SYS.FormUI/AppFunction/FrmRoomManager.cs @@ -21,16 +21,13 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common.Core; +using Sunny.UI; +using SYS.Common; +using SYS.FormUI.Properties; using System; using System.Collections.Generic; using System.Windows.Forms; -using EOM.TSHotelManager.Common.Core; -using SYS.FormUI.Properties; - -using System.Drawing; -using SYS.Common; -using Sunny.UI; -using static SYS.FormUI.FrmRoomManager; namespace SYS.FormUI { @@ -66,7 +63,7 @@ namespace SYS.FormUI private void FrmRoomManager_Load(object sender, EventArgs e) { LoadRoomInfo(); - + //foreach (Control item in this.pnlRoomInfo.Controls) //{ // if (item.GetType().ToString() == "System.Windows.Forms.Label") @@ -90,7 +87,7 @@ namespace SYS.FormUI LoadData(btnBD.Text); } - public void LoadRoomInfo() + public void LoadRoomInfo() { result = HttpHelper.Request("Room/SelectCanUseRoomAllByRoomState"); if (result.statusCode != 200) @@ -149,11 +146,11 @@ namespace SYS.FormUI } else { - dic =new Dictionary() + dic = new Dictionary() { { "TypeName",typeName} }; - result = HttpHelper.Request("Room/SelectRoomByTypeName",null,dic); + result = HttpHelper.Request("Room/SelectRoomByTypeName", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("SelectRoomByTypeName+接口服务异常，请提交Issue或尝试更新版本！"); diff --git a/SYS.FormUI/AppFunction/FrmRoomMap.cs b/SYS.FormUI/AppFunction/FrmRoomMap.cs index 2f932f554ac0b366a0b59d81e0e10b2f37c2a1b6..bed9f1d594a79cd7740863ec51b05fd6624dc358 100644 --- a/SYS.FormUI/AppFunction/FrmRoomMap.cs +++ b/SYS.FormUI/AppFunction/FrmRoomMap.cs @@ -22,19 +22,11 @@ * */ +using EOM.TSHotelManager.Common.Core; using Sunny.UI; - using SYS.Common; -using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace SYS.FormUI.AppFunction { diff --git a/SYS.FormUI/AppFunction/FrmRoomStateManager.cs b/SYS.FormUI/AppFunction/FrmRoomStateManager.cs index 93f425d3a0482e8a80f664d6fa4fb628240b60a7..9bc7ab5aae165dc9ca44c640add79d7871a0e707 100644 --- a/SYS.FormUI/AppFunction/FrmRoomStateManager.cs +++ b/SYS.FormUI/AppFunction/FrmRoomStateManager.cs @@ -21,13 +21,11 @@ *SOFTWARE. * */ -using System; -using System.Windows.Forms; using EOM.TSHotelManager.Common.Core; using Sunny.UI; - -using System.Collections.Generic; using SYS.Common; +using System; +using System.Collections.Generic; namespace SYS.FormUI { @@ -75,7 +73,7 @@ namespace SYS.FormUI { "roomno",txtRoomNo.Text}, { "stateid",cboState.SelectedIndex.ToString()} }; - result = HttpHelper.Request("Room/UpdateRoomStateByRoomNo",null,dic); + result = HttpHelper.Request("Room/UpdateRoomStateByRoomNo", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("UpdateRoomStateByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); @@ -96,7 +94,7 @@ namespace SYS.FormUI UIMessageBox.Show("请选择房间状态", "来自小T的提示", UIStyle.Orange); break; } - + } #endregion } diff --git a/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs b/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs index 0e9b5b1448dc44160ccecaf379166967ed52e83e..9716aa706e35520e7db5c3b57056761ff3f58895 100644 --- a/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs +++ b/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs @@ -21,13 +21,11 @@ *SOFTWARE. * */ -using System; -using System.Windows.Forms; using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using System.Collections.Generic; - using SYS.Common; +using System; +using System.Collections.Generic; namespace SYS.FormUI { @@ -98,13 +96,13 @@ namespace SYS.FormUI this.cbSex.ValueMember = "sexId"; this.cbSex.SelectedIndex = 0; #endregion - + txtCustoNo.Text = ucRoomList.rm_CustoNo; dic = new Dictionary() { { "CustoNo",txtCustoNo.Text.Trim() } }; - result = HttpHelper.Request("Custo/SelectCardInfoByCustoNo",null,dic); + result = HttpHelper.Request("Custo/SelectCardInfoByCustoNo", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("SelectCardInfoByCustoNo+接口服务异常，请提交Issue或尝试更新版本！"); diff --git a/SYS.FormUI/AppFunction/FrmSellThing.Designer.cs b/SYS.FormUI/AppFunction/FrmSellThing.Designer.cs index 97a44463c577f78b71627453817f0b5e2798a1cc..7e4ace3cb297a94271d57d1f66bba37716b0137d 100644 --- a/SYS.FormUI/AppFunction/FrmSellThing.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmSellThing.Designer.cs @@ -139,7 +139,6 @@ // nudNum // this.nudNum.AutoValidate = System.Windows.Forms.AutoValidate.Disable; - this.nudNum.Decimal = 0; this.nudNum.Font = new System.Drawing.Font("新宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.nudNum.Location = new System.Drawing.Point(310, 30); this.nudNum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); @@ -288,13 +287,11 @@ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvRoomSell.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvRoomSell.RowHeadersVisible = false; - this.dgvRoomSell.RowHeight = 29; dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; this.dgvRoomSell.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvRoomSell.RowTemplate.Height = 29; this.dgvRoomSell.SelectedIndex = -1; this.dgvRoomSell.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvRoomSell.ShowGridLine = true; this.dgvRoomSell.ShowRowErrors = false; this.dgvRoomSell.Size = new System.Drawing.Size(573, 269); this.dgvRoomSell.Style = Sunny.UI.UIStyle.Custom; @@ -467,13 +464,11 @@ dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvSellthing.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; this.dgvSellthing.RowHeadersVisible = false; - this.dgvSellthing.RowHeight = 29; dataGridViewCellStyle10.BackColor = System.Drawing.Color.White; this.dgvSellthing.RowsDefaultCellStyle = dataGridViewCellStyle10; this.dgvSellthing.RowTemplate.Height = 29; this.dgvSellthing.SelectedIndex = -1; this.dgvSellthing.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvSellthing.ShowGridLine = true; this.dgvSellthing.Size = new System.Drawing.Size(488, 399); this.dgvSellthing.Style = Sunny.UI.UIStyle.Custom; this.dgvSellthing.TabIndex = 16; diff --git a/SYS.FormUI/AppFunction/FrmSellThing.cs b/SYS.FormUI/AppFunction/FrmSellThing.cs index b248ad38dd887a9290e27023a443adc1e3281352..b68466c8e441414832a928bece8a592e4bce0799 100644 --- a/SYS.FormUI/AppFunction/FrmSellThing.cs +++ b/SYS.FormUI/AppFunction/FrmSellThing.cs @@ -21,18 +21,15 @@ *SOFTWARE. * */ -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Windows.Forms; using EOM.TSHotelManager.Common.Core; +using jvncorelib_fr.EntityLib; using Sunny.UI; - using SYS.Common; -using jvncorelib_fr.EntityLib; +using System; +using System.Collections.Generic; +using System.Drawing; using System.Linq; -using System.Collections; -using Microsoft.Office.Interop.Excel; +using System.Windows.Forms; namespace SYS.FormUI { @@ -77,7 +74,7 @@ namespace SYS.FormUI #endregion #region 查询文本框更改事件 - + private void LoadThingByName() { dic = new Dictionary() @@ -85,7 +82,7 @@ namespace SYS.FormUI { "SellNo",txtFind.Text.Trim()}, {"SellName", txtFind.Text.Trim()} }; - result = HttpHelper.Request("Sellthing/SelectSellThingAll",null,dic); + result = HttpHelper.Request("Sellthing/SelectSellThingAll", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("SelectSellThingAll+接口服务异常，请提交Issue或尝试更新版本！"); @@ -137,7 +134,7 @@ namespace SYS.FormUI { if (txtRoomNo.Text == "") { - UIMessageBox.Show("消费房间不能为空", "提示信息",UIStyle.Red, UIMessageBoxButtons.OKCancel); + UIMessageBox.Show("消费房间不能为空", "提示信息", UIStyle.Red, UIMessageBoxButtons.OKCancel); txtRoomNo.Focus(); return false; } @@ -186,11 +183,11 @@ namespace SYS.FormUI { if (CheckInput()) { - dic = new Dictionary() + dic = new Dictionary() { { "SellNo",txtSellNo.Text.Trim()} }; - result = HttpHelper.Request("Sellthing/SelectSellThingAll",null,dic); + result = HttpHelper.Request("Sellthing/SelectSellThingAll", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("SelectSellThingAll+接口服务异常，请提交Issue或尝试更新版本！"); @@ -245,7 +242,7 @@ namespace SYS.FormUI } if (result.message.ToString().Equals("true")) { - var stock = ((decimal)st.First().Stock - (decimal)nudNum.Value); + var stock = (st.First().Stock - (decimal)nudNum.Value); var sellThing = new SellThing { SellName = st.First().SellName, SellPrice = st.First().SellPrice, Stock = stock, SellNo = st.First().SellNo, format = st.First().format }; result = HttpHelper.Request("Sellthing/UpdateSellthingInfo", HttpHelper.ModelToJson(sellThing)); if (result.statusCode != 200) @@ -284,7 +281,7 @@ namespace SYS.FormUI bool m = result.message.ToString().Equals("true"); if (m) { - var stock = ((decimal)st.First().Stock - (decimal)nudNum.Value); + var stock = (st.First().Stock - (decimal)nudNum.Value); var sellThing = new SellThing { SellName = st.First().SellName, SellPrice = st.First().SellPrice, Stock = stock, SellNo = st.First().SellNo, format = st.First().format }; result = HttpHelper.Request("Sellthing/UpdateSellthingInfo", HttpHelper.ModelToJson(sellThing)); if (result.statusCode != 200) @@ -330,7 +327,7 @@ namespace SYS.FormUI bool m = result.message.ToString().Equals("true"); if (m) { - var stock = ((decimal)st.First().Stock - (decimal)nudNum.Value); + var stock = (st.First().Stock - (decimal)nudNum.Value); var sellThing = new SellThing { SellName = st.First().SellName, SellPrice = st.First().SellPrice, Stock = stock, SellNo = st.First().SellNo, format = st.First().format }; result = HttpHelper.Request("Sellthing/UpdateSellthingInfo", HttpHelper.ModelToJson(sellThing)); if (result.statusCode != 200) @@ -373,7 +370,7 @@ namespace SYS.FormUI UIMessageBox.Show("此条消费记录为住房记录，无法删除！", "提示信息", UIStyle.Red); return; } - if(UIMessageDialog.ShowMessageDialog("你确定要删除该消费记录吗？", UILocalize.WarningTitle, true,Style)) + if (UIMessageDialog.ShowMessageDialog("你确定要删除该消费记录吗？", UILocalize.WarningTitle, true, Style)) { var spendTime = Convert.ToDateTime(dgvRoomSell.SelectedRows[0].Cells["clSpendTime"].Value.ToString()); string custoNo = dgvRoomSell.SelectedRows[0].Cells["clCustoNo"].Value.ToString(); @@ -429,12 +426,12 @@ namespace SYS.FormUI } else { - UIMessageTip.ShowError("操作取消！",1000); + UIMessageTip.ShowError("操作取消！", 1000); } } else { - UIMessageBox.Show("请选择要删除的消费记录！", "提示信息",UIStyle.Red); + UIMessageBox.Show("请选择要删除的消费记录！", "提示信息", UIStyle.Red); } } #endregion @@ -463,12 +460,12 @@ namespace SYS.FormUI private void txtRoomNo_Validated(object sender, EventArgs e) { - + } private void txtRoomNo_TextChanged(object sender, EventArgs e) { - + } private void btnCheck_Click(object sender, EventArgs e) @@ -476,7 +473,7 @@ namespace SYS.FormUI string room = txtRoomNo.Text.Trim(); if (string.IsNullOrWhiteSpace(room) == true) { - UIMessageTip.ShowWarning("请输入消费房间号！",1000); + UIMessageTip.ShowWarning("请输入消费房间号！", 1000); return; } dic = new Dictionary() @@ -532,7 +529,7 @@ namespace SYS.FormUI private void FrmSellThing_Activated(object sender, EventArgs e) { - + } } } diff --git a/SYS.FormUI/AppFunction/FrmSellThingManager.Designer.cs b/SYS.FormUI/AppFunction/FrmSellThingManager.Designer.cs index 9614d3075a7a4754271527bb80e39d36304a8328..28670e44c326e317694d6abf4400cdd01021484d 100644 --- a/SYS.FormUI/AppFunction/FrmSellThingManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmSellThingManager.Designer.cs @@ -198,13 +198,11 @@ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvSellthing.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvSellthing.RowHeadersVisible = false; - this.dgvSellthing.RowHeight = 29; dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; this.dgvSellthing.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvSellthing.RowTemplate.Height = 29; this.dgvSellthing.SelectedIndex = -1; this.dgvSellthing.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvSellthing.ShowGridLine = true; this.dgvSellthing.Size = new System.Drawing.Size(803, 538); this.dgvSellthing.TabIndex = 118; this.dgvSellthing.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSellthing_CellClick); @@ -287,7 +285,6 @@ // // txtStock // - this.txtStock.Decimal = 0; this.txtStock.Font = new System.Drawing.Font("微软雅黑", 15.75F); this.txtStock.Location = new System.Drawing.Point(825, 422); this.txtStock.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); diff --git a/SYS.FormUI/AppFunction/FrmSellThingManager.cs b/SYS.FormUI/AppFunction/FrmSellThingManager.cs index b0042daf109804f5cf8b15f0fabe806a3496cebc..17eb5fe9f4b48d9951b5ea11375f9344bad9205d 100644 --- a/SYS.FormUI/AppFunction/FrmSellThingManager.cs +++ b/SYS.FormUI/AppFunction/FrmSellThingManager.cs @@ -21,16 +21,13 @@ *SOFTWARE. * */ -using System; - -using System.Windows.Forms; using EOM.TSHotelManager.Common.Core; -using SYS.FormUI.Properties; - using Sunny.UI; using SYS.Common; +using System; using System.Collections.Generic; using System.Linq; +using System.Windows.Forms; namespace SYS.FormUI { @@ -60,19 +57,19 @@ namespace SYS.FormUI private void FrmSellThingManager_Load(object sender, EventArgs e) { - string SellId = Util.GetListNewId("ST",3,1,"-").FirstOrDefault(); + string SellId = Util.GetListNewId("ST", 3, 1, "-").FirstOrDefault(); txtSellNo.Text = SellId; LoadData(); } private void btnFind_Click(object sender, EventArgs e) { - dic= new Dictionary() + dic = new Dictionary() { {"SellNo",txtFind.Text.Trim() }, { "SellName",txtFind.Text.Trim()} }; - result = HttpHelper.Request("Sellthing/SelectSellThingAll",null,dic); + result = HttpHelper.Request("Sellthing/SelectSellThingAll", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("SelectSellThingAll+接口服务异常，请提交Issue或尝试更新版本！"); @@ -83,11 +80,11 @@ namespace SYS.FormUI private void btnDeleteSellThing_Click(object sender, EventArgs e) { - dic = new Dictionary() + dic = new Dictionary() { { "sellNo",txtSellNo.Text.Trim()} }; - result = HttpHelper.Request("Sellthing/DeleteSellThingBySellNo", null,dic); + result = HttpHelper.Request("Sellthing/DeleteSellThingBySellNo", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("DeleteSellThingBySellNo+接口服务异常，请提交Issue或尝试更新版本！"); @@ -101,9 +98,9 @@ namespace SYS.FormUI return; } - public bool CheckInput(SellThing sellThing) + public bool CheckInput(SellThing sellThing) { - if(string.IsNullOrWhiteSpace(sellThing.SellNo)) + if (string.IsNullOrWhiteSpace(sellThing.SellNo)) { return false; } @@ -139,7 +136,7 @@ namespace SYS.FormUI { { "SellNo",st.SellNo} }; - result = HttpHelper.Request("Sellthing/SelectSellInfoBySellNo",null,dic); + result = HttpHelper.Request("Sellthing/SelectSellInfoBySellNo", null, dic); if (result.statusCode != 200) { UIMessageBox.ShowError("SelectSellInfoBySellNo+接口服务异常，请提交Issue或尝试更新版本！"); @@ -167,7 +164,7 @@ namespace SYS.FormUI RecordHelper.Record(AdminInfo.Account + "-" + AdminInfo.Name + "在" + DateTime.Now + "位于" + AdminInfo.SoftwareVersion + "执行：" + "新增商品操作！新增值为：" + st.SellNo, 2); #endregion LoadData(); - string SellId = Util.GetListNewId("ST",3,1,"-").FirstOrDefault(); + string SellId = Util.GetListNewId("ST", 3, 1, "-").FirstOrDefault(); txtSellNo.Text = SellId; } else @@ -221,7 +218,7 @@ namespace SYS.FormUI UIMessageBox.Show("修改商品失败", "系统提示", UIStyle.Red, UIMessageBoxButtons.OK); return; } - UIMessageBox.Show("修改商品成功","系统提示",UIStyle.Green,UIMessageBoxButtons.OK); + UIMessageBox.Show("修改商品成功", "系统提示", UIStyle.Green, UIMessageBoxButtons.OK); #region 获取添加操作日志所需的信息 RecordHelper.Record(AdminInfo.Account + "-" + AdminInfo.Name + "在" + DateTime.Now + "位于" + AdminInfo.SoftwareVersion + "执行：" + "修改商品操作！修改值为：" + st.SellNo, 2); #endregion diff --git a/SYS.FormUI/AppFunction/FrmSexType.cs b/SYS.FormUI/AppFunction/FrmSexType.cs index 7a3e81c7c5e7fab89b51ffcc002b55024006eafc..99b0dd4873b662ab713920f6f69449d3909cd8c8 100644 --- a/SYS.FormUI/AppFunction/FrmSexType.cs +++ b/SYS.FormUI/AppFunction/FrmSexType.cs @@ -23,14 +23,6 @@ */ using Sunny.UI; using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace SYS.FormUI { diff --git a/SYS.FormUI/AppFunction/FrmUnLockSystem.cs b/SYS.FormUI/AppFunction/FrmUnLockSystem.cs index 369cdb0f320e4dcc245540583cf7378f50038b9b..29241edb976521073e7129a0e9c61cb4257e66c1 100644 --- a/SYS.FormUI/AppFunction/FrmUnLockSystem.cs +++ b/SYS.FormUI/AppFunction/FrmUnLockSystem.cs @@ -21,17 +21,15 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common.Core; +using Sunny.UI; +using SYS.Common; using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; -using System.Reflection; using System.Runtime.InteropServices; using System.Windows.Forms; -using Sunny.UI; - -using SYS.Common; -using EOM.TSHotelManager.Common.Core; namespace SYS.FormUI { @@ -76,7 +74,7 @@ namespace SYS.FormUI private void btnUnLock_Click(object sender, EventArgs e) { - dic= new Dictionary() + dic = new Dictionary() { { "account",AdminInfo.Account.Trim()} }; @@ -170,9 +168,9 @@ namespace SYS.FormUI private void FrmUnLockSystem_KeyDown(object sender, KeyEventArgs e) { - if (e.KeyCode == Keys.F4 && e.Modifiers == Keys.Alt) + if (e.KeyCode == Keys.F4 && e.Modifiers == Keys.Alt) { - UIMessageBox.Show("请输入解锁密码！", "错误",UIStyle.Red, UIMessageBoxButtons.OK); + UIMessageBox.Show("请输入解锁密码！", "错误", UIStyle.Red, UIMessageBoxButtons.OK); e.Handled = true; } } @@ -184,7 +182,7 @@ namespace SYS.FormUI private void btnUnLock_Click_1(object sender, EventArgs e) { - + } } } diff --git a/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs b/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs index 6ff8afdeeea365424c077eb13df7d5649c0a5aae..704f172008d8aaf24ff587f9955582b3eea638e3 100644 --- a/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs +++ b/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs @@ -21,16 +21,13 @@ *SOFTWARE. * */ -using System; - -using System.Windows.Forms; using EOM.TSHotelManager.Common.Core; - using Sunny.UI; using SYS.Common; -using System.Linq; - +using System; using System.Collections.Generic; +using System.Linq; +using System.Windows.Forms; namespace SYS.FormUI { @@ -44,7 +41,7 @@ namespace SYS.FormUI Dictionary dic = null; ResponseMsg result = null; - public bool CheckInput(string Content) + public bool CheckInput(string Content) { if (string.IsNullOrWhiteSpace(Content)) { @@ -64,7 +61,7 @@ namespace SYS.FormUI { Notice notice = new Notice() { - NoticeNo = Util.GetListNewId("UP",3,1,"-").FirstOrDefault(), + NoticeNo = Util.GetListNewId("UP", 3, 1, "-").FirstOrDefault(), Noticetheme = txtNoticeTheme.Text.Trim(), NoticeContent = rtbNoticeContent.Html, NoticeTime = dtpUpLoadDate.Value, @@ -115,7 +112,7 @@ namespace SYS.FormUI } } - + private void FrmUpLoad_Load(object sender, EventArgs e) { @@ -129,7 +126,7 @@ namespace SYS.FormUI cboSelectClub.DataSource = HttpHelper.JsonToList(result.message); cboSelectClub.DisplayMember = "dept_name"; cboSelectClub.ValueMember = "dept_no"; - + } } } diff --git a/SYS.FormUI/AppFunction/FrmVipRule.Designer.cs b/SYS.FormUI/AppFunction/FrmVipRule.Designer.cs index 2eec2a254d009066c079227b5de1123420db31d1..1732171bed61dbbefd0d73a1a60138c7730a44b9 100644 --- a/SYS.FormUI/AppFunction/FrmVipRule.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmVipRule.Designer.cs @@ -167,16 +167,11 @@ namespace SYS.FormUI // dudSpendAmount // this.dudSpendAmount.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.dudSpendAmount.Decimal = 2; this.dudSpendAmount.Font = new System.Drawing.Font("微软雅黑", 15.75F); - this.dudSpendAmount.HasMaximum = true; - this.dudSpendAmount.HasMinimum = true; this.dudSpendAmount.Location = new System.Drawing.Point(671, 157); this.dudSpendAmount.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dudSpendAmount.Maximum = 999999999999999D; - this.dudSpendAmount.MaximumEnabled = true; this.dudSpendAmount.Minimum = 0D; - this.dudSpendAmount.MinimumEnabled = true; this.dudSpendAmount.MinimumSize = new System.Drawing.Size(100, 0); this.dudSpendAmount.Name = "dudSpendAmount"; this.dudSpendAmount.Radius = 20; diff --git a/SYS.FormUI/AppFunction/FrmVipRule.cs b/SYS.FormUI/AppFunction/FrmVipRule.cs index 1dc014d2c42ef2df3ea7528d73129d7bfe090bd9..ccd45ab7df0619ab8b9433a363cc136f76c05fdc 100644 --- a/SYS.FormUI/AppFunction/FrmVipRule.cs +++ b/SYS.FormUI/AppFunction/FrmVipRule.cs @@ -1,19 +1,11 @@  +using EOM.TSHotelManager.Common.Core; using Sunny.UI; - using SYS.Common; -using EOM.TSHotelManager.Common.Core; using SYS.FormUI.Properties; using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using System.Windows.Forms; namespace SYS.FormUI { @@ -65,7 +57,7 @@ namespace SYS.FormUI ucVipType.picVip.BackgroundImage = vipType.type_id == 0 ? Resources.普通会员 : vipType.type_id == 1 ? Resources.钻石会员 : vipType.type_id == 2 ? Resources.白金会员 : Resources.黄金会员; ucVipType.lblValue.Text = vipType.type_name; - flpVipType.AddControl(ucVipType); + flpVipType.Add(ucVipType); }); } @@ -86,7 +78,7 @@ namespace SYS.FormUI delete_mk = 0, datains_usr = AdminInfo.Account }; - result = HttpHelper.Request("VipRule/AddVipRule",HttpHelper.ModelToJson(vipRule1)); + result = HttpHelper.Request("VipRule/AddVipRule", HttpHelper.ModelToJson(vipRule1)); if (result.statusCode != 200) { UIMessageTip.ShowError("AddVipRule+接口服务异常，请提交issue"); diff --git a/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs b/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs index afd335052978076f40d9e35b1a04d015f645b653..82da22b3f4021e7acaee201b7938cc513afbe996 100644 --- a/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs @@ -110,13 +110,11 @@ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.DgvCheckInfoList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.DgvCheckInfoList.RowHeadersVisible = false; - this.DgvCheckInfoList.RowHeight = 29; dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; this.DgvCheckInfoList.RowsDefaultCellStyle = dataGridViewCellStyle5; this.DgvCheckInfoList.RowTemplate.Height = 29; this.DgvCheckInfoList.SelectedIndex = -1; this.DgvCheckInfoList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.DgvCheckInfoList.ShowGridLine = true; this.DgvCheckInfoList.Size = new System.Drawing.Size(550, 154); this.DgvCheckInfoList.TabIndex = 2; // diff --git a/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.cs b/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.cs index a424ad75f3635642ce306f21a0b375421fbb571b..ac29b2ea5952d9ee72df106c3c1756e35567c5ae 100644 --- a/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.cs +++ b/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.cs @@ -21,13 +21,11 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common.Core; using Sunny.UI; - using SYS.Common; -using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; -using System.Windows.Forms; namespace SYS.FormUI { @@ -45,7 +43,7 @@ namespace SYS.FormUI private void FrmWorkerCheckInfo_Load(object sender, EventArgs e) { lblWorkerInfo.Text = "以下为员工：" + FrmChangeWorker.wk_WorkerNo + "-员工姓名：" + FrmChangeWorker.wk_WorkerName + "的所有打卡考勤记录:"; - dic= new Dictionary() + dic = new Dictionary() { { "wid",FrmChangeWorker.wk_WorkerNo} }; diff --git a/SYS.FormUI/AppFunction/FrmWorkerManager.Designer.cs b/SYS.FormUI/AppFunction/FrmWorkerManager.Designer.cs index ef26ca0130a3772e8e521af95e758d3a4407805d..a27de4458bd814e6eb302bd7d33352439f339b7d 100644 --- a/SYS.FormUI/AppFunction/FrmWorkerManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmWorkerManager.Designer.cs @@ -133,13 +133,11 @@ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvWorkerList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvWorkerList.RowHeadersVisible = false; - this.dgvWorkerList.RowHeight = 29; dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; this.dgvWorkerList.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvWorkerList.RowTemplate.Height = 29; this.dgvWorkerList.SelectedIndex = -1; this.dgvWorkerList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvWorkerList.ShowGridLine = true; this.dgvWorkerList.Size = new System.Drawing.Size(999, 540); this.dgvWorkerList.Style = Sunny.UI.UIStyle.Custom; this.dgvWorkerList.TabIndex = 3; diff --git a/SYS.FormUI/AppFunction/FrmWorkerManager.cs b/SYS.FormUI/AppFunction/FrmWorkerManager.cs index df209cdb8c5804e7d202be6212b5124054cc0d1f..140e27562fbbfa6fef494d6b4b1f0d39b83638a7 100644 --- a/SYS.FormUI/AppFunction/FrmWorkerManager.cs +++ b/SYS.FormUI/AppFunction/FrmWorkerManager.cs @@ -21,14 +21,12 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common.Core; +using Sunny.UI; +using SYS.Common; using System; using System.Collections.Generic; -using System.ComponentModel; using System.Windows.Forms; -using Sunny.UI; - -using SYS.Common; -using EOM.TSHotelManager.Common.Core; namespace SYS.FormUI { @@ -112,7 +110,7 @@ namespace SYS.FormUI } } - + private void btnAddWorker_Click(object sender, EventArgs e) { diff --git a/SYS.FormUI/AppFunction/FrmWtiInfo.Designer.cs b/SYS.FormUI/AppFunction/FrmWtiInfo.Designer.cs index 4abb599010d7df9247d82b88b8bfb2220ba9dbf2..bcc79a21bab877e42dc9442182db9ae8715c2c4c 100644 --- a/SYS.FormUI/AppFunction/FrmWtiInfo.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmWtiInfo.Designer.cs @@ -131,7 +131,6 @@ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvWti.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvWti.RowHeadersVisible = false; - this.dgvWti.RowHeight = 29; dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; this.dgvWti.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvWti.RowTemplate.Height = 29; diff --git a/SYS.FormUI/AppFunction/FrmWtiInfo.cs b/SYS.FormUI/AppFunction/FrmWtiInfo.cs index d43d3cfa9e089fc08c4d72ce2d73f7d393bf9de0..ea0df7fefab73a2923b21c072254fdd9c05f692b 100644 --- a/SYS.FormUI/AppFunction/FrmWtiInfo.cs +++ b/SYS.FormUI/AppFunction/FrmWtiInfo.cs @@ -21,13 +21,12 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common.Core; +using Sunny.UI; +using SYS.Common; using System; using System.Collections.Generic; using System.Windows.Forms; -using Sunny.UI; - -using SYS.Common; -using EOM.TSHotelManager.Common.Core; namespace SYS.FormUI { @@ -87,7 +86,7 @@ namespace SYS.FormUI Record = AdminInfo.Account, datachg_usr = AdminInfo.Account, }; - result = HttpHelper.Request("Wti/UpdateWtiInfo",HttpHelper.ModelToJson(wti)); + result = HttpHelper.Request("Wti/UpdateWtiInfo", HttpHelper.ModelToJson(wti)); if (result.statusCode != 200) { UIMessageTip.ShowError("UpdateWtiInfo+接口服务异常，请提交issue"); diff --git a/SYS.FormUI/AppInterface/FrmAdminEnter.cs b/SYS.FormUI/AppInterface/FrmAdminEnter.cs index 1c30a96cfa86b96d6d1c1c2cb670cc27bd17bd32..32cc1647eca0888030ac662dfb9626a890c1dd58 100644 --- a/SYS.FormUI/AppInterface/FrmAdminEnter.cs +++ b/SYS.FormUI/AppInterface/FrmAdminEnter.cs @@ -21,17 +21,13 @@ *SOFTWARE. * */ -using System; -using System.Windows.Forms; using EOM.TSHotelManager.Common.Core; +using jvncorelib_fr.EncryptorLib; using Sunny.UI; -using System.Text.RegularExpressions; - using SYS.Common; -using System.Net; -using System.Diagnostics; - +using System; using System.Collections.Generic; +using System.Text.RegularExpressions; namespace SYS.FormUI { @@ -55,7 +51,7 @@ namespace SYS.FormUI return; } - Admin admin = new Admin() { AdminAccount = account, AdminPassword = pass }; + Admin admin = new Admin() { AdminAccount = account, AdminPassword = new EncryptLib().Encryption(pass, EncryptionLevel.Enhanced) }; result = HttpHelper.Request("Admin/SelectMangerByPass", HttpHelper.ModelToJson(admin)); if (result.statusCode != 200) { @@ -76,6 +72,7 @@ namespace SYS.FormUI AdminInfo.Account = a.AdminAccount; AdminInfo.isAdmin = a.IsAdmin == 0 ? false : true; AdminInfo.SoftwareVersion = System.Windows.Forms.Application.ProductVersion.ToString(); + AdminInfo.UserToken = a.user_token; #region 获取添加操作日志所需的信息 RecordHelper.Record(AdminInfo.Account + "-" + AdminInfo.Name + "在" + DateTime.Now + "位于" + AdminInfo.SoftwareVersion + "版本登入了后台管理系统！", 3); #endregion @@ -110,7 +107,7 @@ namespace SYS.FormUI /// /// /// - public bool CheckInputString(string adminaccount,string adminpassword) + public bool CheckInputString(string adminaccount, string adminpassword) { if (string.IsNullOrWhiteSpace(adminaccount)) { diff --git a/SYS.FormUI/AppInterface/FrmLoading.cs b/SYS.FormUI/AppInterface/FrmLoading.cs index 2fc246c87669506af13b51425bfcfc953d2297ee..28fee238a13900bb2663e121a869a639fb5afc9f 100644 --- a/SYS.FormUI/AppInterface/FrmLoading.cs +++ b/SYS.FormUI/AppInterface/FrmLoading.cs @@ -1,15 +1,8 @@ -using Sunny.UI; +using EOM.TSHotelManager.Common.Core; +using Sunny.UI; using SYS.Common; -using EOM.TSHotelManager.Common.Core; using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; using System.Threading; -using System.Threading.Tasks; using System.Windows.Forms; namespace SYS.FormUI @@ -20,7 +13,7 @@ namespace SYS.FormUI { InitializeComponent(); } - + private void FrmLoading_Load(object sender, EventArgs e) { lblSoftwareVersion.Text = System.Windows.Forms.Application.ProductVersion.ToString(); diff --git a/SYS.FormUI/AppInterface/FrmLogin.Designer.cs b/SYS.FormUI/AppInterface/FrmLogin.Designer.cs index 9d29c6e9582fb039684e072bed77346eea928e2f..d60f858982bb7b754a40e58ec446d2386a3ab6d6 100644 --- a/SYS.FormUI/AppInterface/FrmLogin.Designer.cs +++ b/SYS.FormUI/AppInterface/FrmLogin.Designer.cs @@ -63,7 +63,7 @@ this.picLogin.Radius = 30; this.picLogin.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.picLogin.Size = new System.Drawing.Size(184, 60); - this.picLogin.Style = Sunny.UI.UIStyle.LightBlue; + this.picLogin.Style = Sunny.UI.UIStyle.Blue; this.picLogin.TabIndex = 15; this.picLogin.Text = "登 录"; this.picLogin.Click += new System.EventHandler(this.picLogin_Click); @@ -126,7 +126,7 @@ this.btnLoginBackSystem.Radius = 30; this.btnLoginBackSystem.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.btnLoginBackSystem.Size = new System.Drawing.Size(184, 60); - this.btnLoginBackSystem.Style = Sunny.UI.UIStyle.LightBlue; + this.btnLoginBackSystem.Style = Sunny.UI.UIStyle.Blue; this.btnLoginBackSystem.TabIndex = 18; this.btnLoginBackSystem.Text = "进入后台管理系统"; this.btnLoginBackSystem.Click += new System.EventHandler(this.btnLoginBackSystem_Click); diff --git a/SYS.FormUI/AppInterface/FrmLogin.cs b/SYS.FormUI/AppInterface/FrmLogin.cs index 5df4b70c52787fcb9b5064bca2380f09e1290c1e..5670ee469fa2b63765729b32d730d2cdf1c54dcd 100644 --- a/SYS.FormUI/AppInterface/FrmLogin.cs +++ b/SYS.FormUI/AppInterface/FrmLogin.cs @@ -21,17 +21,13 @@ *SOFTWARE. * */ -using System; -using System.Drawing; -using System.Threading; -using System.Windows.Forms; using EOM.TSHotelManager.Common.Core; -using SYS.FormUI.Properties; -using System.Collections.Generic; using Sunny.UI; - using SYS.Common; -using System.Net; +using SYS.FormUI.Properties; +using System; +using System.Drawing; +using System.Windows.Forms; namespace SYS.FormUI { @@ -142,7 +138,7 @@ namespace SYS.FormUI { if (txtWorkerId.Text == "") { - UIMessageBox.Show("请输入员工编号！", "输入提示",UIStyle.Red); + UIMessageBox.Show("请输入员工编号！", "输入提示", UIStyle.Red); txtWorkerId.Focus(); return false; } @@ -189,6 +185,7 @@ namespace SYS.FormUI LoginInfo.WorkerClub = w.ClubName; LoginInfo.WorkerPosition = w.PositionName; LoginInfo.SoftwareVersion = System.Windows.Forms.Application.ProductVersion.ToString(); + LoginInfo.UserToken = w.user_token; FrmMain frm = new FrmMain(this); this.Hide();//隐藏登录窗体 frm.ShowDialog();//打开主窗体 @@ -201,7 +198,7 @@ namespace SYS.FormUI } } } - catch (Exception ex) + catch (Exception) { //Console.WriteLine(ex); UIMessageBox.Show("服务器维护中，请稍后再试！", "温馨提示", UIStyle.Red); diff --git a/SYS.FormUI/AppMain/FrmBackgroundSystem.Designer.cs b/SYS.FormUI/AppMain/FrmBackgroundSystem.Designer.cs index e73be96f6831e74b818a1e7be2f25f8f26d8958c..87f10c81f3c71b368b789e6bb8a54440d37b7a63 100644 --- a/SYS.FormUI/AppMain/FrmBackgroundSystem.Designer.cs +++ b/SYS.FormUI/AppMain/FrmBackgroundSystem.Designer.cs @@ -58,36 +58,34 @@ namespace SYS.FormUI treeNode14, treeNode15}); System.Windows.Forms.TreeNode treeNode17 = new System.Windows.Forms.TreeNode("会员等级规则"); - System.Windows.Forms.TreeNode treeNode18 = new System.Windows.Forms.TreeNode("会员信息管理"); - System.Windows.Forms.TreeNode treeNode19 = new System.Windows.Forms.TreeNode("客户信息管理"); - System.Windows.Forms.TreeNode treeNode20 = new System.Windows.Forms.TreeNode("顾客消费账单"); - System.Windows.Forms.TreeNode treeNode21 = new System.Windows.Forms.TreeNode("客户管理", new System.Windows.Forms.TreeNode[] { + System.Windows.Forms.TreeNode treeNode18 = new System.Windows.Forms.TreeNode("客户信息管理"); + System.Windows.Forms.TreeNode treeNode19 = new System.Windows.Forms.TreeNode("顾客消费账单"); + System.Windows.Forms.TreeNode treeNode20 = new System.Windows.Forms.TreeNode("客户管理", new System.Windows.Forms.TreeNode[] { treeNode17, treeNode18, - treeNode19, - treeNode20}); - System.Windows.Forms.TreeNode treeNode22 = new System.Windows.Forms.TreeNode("员工管理"); - System.Windows.Forms.TreeNode treeNode23 = new System.Windows.Forms.TreeNode("公告日志"); - System.Windows.Forms.TreeNode treeNode24 = new System.Windows.Forms.TreeNode("上传公告日志"); - System.Windows.Forms.TreeNode treeNode25 = new System.Windows.Forms.TreeNode("人事管理", new System.Windows.Forms.TreeNode[] { + treeNode19}); + System.Windows.Forms.TreeNode treeNode21 = new System.Windows.Forms.TreeNode("员工管理"); + System.Windows.Forms.TreeNode treeNode22 = new System.Windows.Forms.TreeNode("公告日志"); + System.Windows.Forms.TreeNode treeNode23 = new System.Windows.Forms.TreeNode("上传公告日志"); + System.Windows.Forms.TreeNode treeNode24 = new System.Windows.Forms.TreeNode("人事管理", new System.Windows.Forms.TreeNode[] { + treeNode21, treeNode22, - treeNode23, - treeNode24}); - System.Windows.Forms.TreeNode treeNode26 = new System.Windows.Forms.TreeNode("商品管理"); - System.Windows.Forms.TreeNode treeNode27 = new System.Windows.Forms.TreeNode("仓库物资"); - System.Windows.Forms.TreeNode treeNode28 = new System.Windows.Forms.TreeNode("物资管理", new System.Windows.Forms.TreeNode[] { - treeNode26, - treeNode27}); - System.Windows.Forms.TreeNode treeNode29 = new System.Windows.Forms.TreeNode("员工操作日志"); - System.Windows.Forms.TreeNode treeNode30 = new System.Windows.Forms.TreeNode("添加管理员"); - System.Windows.Forms.TreeNode treeNode31 = new System.Windows.Forms.TreeNode("权限分配"); - System.Windows.Forms.TreeNode treeNode32 = new System.Windows.Forms.TreeNode("启/禁用管理员"); - System.Windows.Forms.TreeNode treeNode33 = new System.Windows.Forms.TreeNode("系统模块管理"); - System.Windows.Forms.TreeNode treeNode34 = new System.Windows.Forms.TreeNode("系统管理", new System.Windows.Forms.TreeNode[] { + treeNode23}); + System.Windows.Forms.TreeNode treeNode25 = new System.Windows.Forms.TreeNode("商品管理"); + System.Windows.Forms.TreeNode treeNode26 = new System.Windows.Forms.TreeNode("仓库物资"); + System.Windows.Forms.TreeNode treeNode27 = new System.Windows.Forms.TreeNode("物资管理", new System.Windows.Forms.TreeNode[] { + treeNode25, + treeNode26}); + System.Windows.Forms.TreeNode treeNode28 = new System.Windows.Forms.TreeNode("员工操作日志"); + System.Windows.Forms.TreeNode treeNode29 = new System.Windows.Forms.TreeNode("添加管理员"); + System.Windows.Forms.TreeNode treeNode30 = new System.Windows.Forms.TreeNode("权限分配"); + System.Windows.Forms.TreeNode treeNode31 = new System.Windows.Forms.TreeNode("启/禁用管理员"); + System.Windows.Forms.TreeNode treeNode32 = new System.Windows.Forms.TreeNode("系统模块管理"); + System.Windows.Forms.TreeNode treeNode33 = new System.Windows.Forms.TreeNode("系统管理", new System.Windows.Forms.TreeNode[] { + treeNode29, treeNode30, treeNode31, - treeNode32, - treeNode33}); + treeNode32}); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmBackgroundSystem)); this.Aside = new Sunny.UI.UINavMenu(); this.imageList1 = new System.Windows.Forms.ImageList(this.components); @@ -109,7 +107,6 @@ namespace SYS.FormUI // this.Aside.BorderStyle = System.Windows.Forms.BorderStyle.None; this.Aside.DrawMode = System.Windows.Forms.TreeViewDrawMode.OwnerDrawText; - this.Aside.ExpandSelectFirst = true; this.Aside.Font = new System.Drawing.Font("微软雅黑", 12F); this.Aside.FullRowSelect = true; this.Aside.ItemHeight = 50; @@ -150,55 +147,54 @@ namespace SYS.FormUI treeNode16.Text = "客房管理"; treeNode17.Name = "节点0"; treeNode17.Text = "会员等级规则"; - treeNode18.Name = "节点1"; - treeNode18.Text = "会员信息管理"; - treeNode19.Name = "节点8"; - treeNode19.Text = "客户信息管理"; - treeNode20.Name = "节点9"; - treeNode20.Text = "顾客消费账单"; - treeNode21.Name = "CustomerManager"; - treeNode21.Text = "客户管理"; - treeNode22.Name = "节点6"; - treeNode22.Text = "员工管理"; - treeNode23.Name = "节点15"; - treeNode23.Text = "公告日志"; - treeNode24.Name = "节点16"; - treeNode24.Text = "上传公告日志"; - treeNode25.Name = "HumanResourcesManager"; - treeNode25.Text = "人事管理"; - treeNode26.Name = "节点11"; - treeNode26.Text = "商品管理"; - treeNode27.Name = "节点12"; - treeNode27.Text = "仓库物资"; - treeNode28.Name = "MaterialManager"; - treeNode28.Text = "物资管理"; - treeNode29.Name = "OperationLogManager"; - treeNode29.Text = "员工操作日志"; - treeNode30.Name = "节点2"; - treeNode30.Text = "添加管理员"; - treeNode31.Name = "节点1"; - treeNode31.Text = "权限分配"; - treeNode32.Name = "节点3"; - treeNode32.Text = "启/禁用管理员"; - treeNode33.Name = "节点2"; - treeNode33.Text = "系统模块管理"; - treeNode34.Name = "AdminManager"; - treeNode34.Text = "系统管理"; + treeNode18.Name = "节点8"; + treeNode18.Text = "客户信息管理"; + treeNode19.Name = "节点9"; + treeNode19.Text = "顾客消费账单"; + treeNode20.Name = "CustomerManager"; + treeNode20.Text = "客户管理"; + treeNode21.Name = "节点6"; + treeNode21.Text = "员工管理"; + treeNode22.Name = "节点15"; + treeNode22.Text = "公告日志"; + treeNode23.Name = "节点16"; + treeNode23.Text = "上传公告日志"; + treeNode24.Name = "HumanResourcesManager"; + treeNode24.Text = "人事管理"; + treeNode25.Name = "节点11"; + treeNode25.Text = "商品管理"; + treeNode26.Name = "节点12"; + treeNode26.Text = "仓库物资"; + treeNode27.Name = "MaterialManager"; + treeNode27.Text = "物资管理"; + treeNode28.Name = "OperationLogManager"; + treeNode28.Text = "员工操作日志"; + treeNode29.Name = "节点2"; + treeNode29.Text = "添加管理员"; + treeNode30.Name = "节点1"; + treeNode30.Text = "权限分配"; + treeNode31.Name = "节点3"; + treeNode31.Text = "启/禁用管理员"; + treeNode32.Name = "节点2"; + treeNode32.Text = "系统模块管理"; + treeNode33.Name = "AdminManager"; + treeNode33.Text = "系统管理"; this.Aside.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { treeNode5, treeNode9, treeNode11, treeNode13, treeNode16, - treeNode21, - treeNode25, + treeNode20, + treeNode24, + treeNode27, treeNode28, - treeNode29, - treeNode34}); + treeNode33}); this.Aside.ShowLines = false; this.Aside.Size = new System.Drawing.Size(234, 624); this.Aside.Style = Sunny.UI.UIStyle.Custom; this.Aside.TabIndex = 0; + this.Aside.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Aside.MenuItemClick += new Sunny.UI.UINavMenu.OnMenuItemClick(this.Aside_MenuItemClick); this.Aside.Enter += new System.EventHandler(this.Aside_Enter); // @@ -224,6 +220,7 @@ namespace SYS.FormUI // uiLabel1 // this.uiLabel1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); this.uiLabel1.Location = new System.Drawing.Point(250, 44); this.uiLabel1.Name = "uiLabel1"; this.uiLabel1.Size = new System.Drawing.Size(217, 35); @@ -237,7 +234,6 @@ namespace SYS.FormUI this.lblScroll.Active = true; this.lblScroll.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.lblScroll.Font = new System.Drawing.Font("微软雅黑", 12F); - this.lblScroll.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.lblScroll.Interval = 800; this.lblScroll.Location = new System.Drawing.Point(473, 41); this.lblScroll.MinimumSize = new System.Drawing.Size(1, 1); @@ -251,6 +247,7 @@ namespace SYS.FormUI // lbTime // this.lbTime.Font = new System.Drawing.Font("微软雅黑", 12F); + this.lbTime.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); this.lbTime.Location = new System.Drawing.Point(11, 44); this.lbTime.Name = "lbTime"; this.lbTime.Size = new System.Drawing.Size(229, 35); @@ -267,6 +264,7 @@ namespace SYS.FormUI // // cmsMenu // + this.cmsMenu.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255))))); this.cmsMenu.Font = new System.Drawing.Font("微软雅黑", 12F); this.cmsMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tsmiMySpace, @@ -317,6 +315,7 @@ namespace SYS.FormUI this.btnSetting.Style = Sunny.UI.UIStyle.Custom; this.btnSetting.StyleCustomMode = true; this.btnSetting.TabIndex = 31; + this.btnSetting.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); this.btnSetting.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnSetting_MouseDown); this.btnSetting.MouseLeave += new System.EventHandler(this.btnSetting_MouseLeave); @@ -341,14 +340,14 @@ namespace SYS.FormUI this.btnLocked.Style = Sunny.UI.UIStyle.Custom; this.btnLocked.StyleCustomMode = true; this.btnLocked.TabIndex = 30; + this.btnLocked.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnLocked.Click += new System.EventHandler(this.btnLocked_Click); this.btnLocked.MouseLeave += new System.EventHandler(this.btnLocked_MouseLeave); this.btnLocked.MouseHover += new System.EventHandler(this.btnLocked_MouseHover); // // FrmBackgroundSystem // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(1255, 718); this.Controls.Add(this.lbTime); this.Controls.Add(this.lblScroll); @@ -361,12 +360,10 @@ namespace SYS.FormUI this.IsForbidAltF4 = true; this.MaximizeBox = false; this.Name = "FrmBackgroundSystem"; - this.ShowIcon = true; - this.ShowRadius = false; - this.ShowShadow = true; this.Style = Sunny.UI.UIStyle.Custom; this.Text = "TS酒店管理后台安全系统"; this.TextAlignment = System.Drawing.StringAlignment.Center; + this.ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 1255, 718); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmBackgroundSystem_FormClosing); this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmBackgroundSystem_FormClosed); this.Load += new System.EventHandler(this.FrmBackgroundSystem_Load); diff --git a/SYS.FormUI/AppMain/FrmBackgroundSystem.cs b/SYS.FormUI/AppMain/FrmBackgroundSystem.cs index 397b43e8b0f3e7f59d7145dd73f04fa93c187d21..68466335c9de329b333a1195fcd471174b6f2367 100644 --- a/SYS.FormUI/AppMain/FrmBackgroundSystem.cs +++ b/SYS.FormUI/AppMain/FrmBackgroundSystem.cs @@ -22,19 +22,14 @@ * */ +using EOM.TSHotelManager.Common.Core; using Sunny.UI; - using SYS.Common; -using EOM.TSHotelManager.Common.Core; using SYS.FormUI.AppFunction; using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; using System.Drawing; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace SYS.FormUI @@ -50,7 +45,7 @@ namespace SYS.FormUI public FrmBackgroundSystem() { InitializeComponent(); - + closeform = Closeform; hideform = HideWinform; } @@ -66,7 +61,9 @@ namespace SYS.FormUI private void FrmBackgroundSystem_Load(object sender, EventArgs e) { this.Owner.Close(); - + //清除前台Token使其无效 + LoginInfo.UserToken = null; + LoadModule(); DateTime tmCur = DateTime.Now; @@ -83,13 +80,13 @@ namespace SYS.FormUI {//下午 uiLabel1.Text = "下午好," + AdminInfo.Name; } - + } /// /// 关闭当前窗体 /// - public void Closeform() + public void Closeform() { this.Close(); } @@ -198,8 +195,6 @@ namespace SYS.FormUI pnlForm.Controls.Add(frmVipRule); frmVipRule.Show(); break; - case "会员信息管理": - break; case "客户信息管理": pnlForm.Controls.Clear(); FrmCustoManager frmCustoManager = new FrmCustoManager(); @@ -288,7 +283,7 @@ namespace SYS.FormUI this.btnSetting.RectHoverColor = Color.Black; this.btnSetting.Radius = 20; this.btnSetting.RadiusSides = UICornerRadiusSides.All; - + } /// @@ -341,7 +336,7 @@ namespace SYS.FormUI private void btnLocked_Click(object sender, EventArgs e) { bool tf = UIMessageBox.Show("确定要锁定屏幕吗？锁定后不能做任何操作!", "锁屏", UIStyle.Orange, UIMessageBoxButtons.OKCancel); - if(tf) + if (tf) new FrmUnLockSystem().ShowDialog(); //this.Hide(); } @@ -393,7 +388,7 @@ namespace SYS.FormUI private void FrmBackgroundSystem_FormClosing(object sender, FormClosingEventArgs e) { - + } } } diff --git a/SYS.FormUI/AppMain/FrmBackgroundSystem.resx b/SYS.FormUI/AppMain/FrmBackgroundSystem.resx index 2228174900b4129fa80abcf89c6cb0708cdfdf46..57c37df3ebd74f130ce4b6f20a00d7abbcb5cee8 100644 --- a/SYS.FormUI/AppMain/FrmBackgroundSystem.resx +++ b/SYS.FormUI/AppMain/FrmBackgroundSystem.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC6 - BwAAAk1TRnQBSQFMAwEBAAG4AQABuAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA + BwAAAk1TRnQBSQFMAwEBAAHAAQABwAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm diff --git a/SYS.FormUI/AppMain/FrmMain.cs b/SYS.FormUI/AppMain/FrmMain.cs index 6deebbb5d833cb8fa8593136ec0aeee2415ec373..e5c36bf03dfb34b9b5ffca80cafed2e0c45a2b63 100644 --- a/SYS.FormUI/AppMain/FrmMain.cs +++ b/SYS.FormUI/AppMain/FrmMain.cs @@ -21,20 +21,17 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common.Core; +using Sunny.UI; +using SYS.Common; +using SYS.FormUI.AppUserControls; +using SYS.FormUI.Properties; using System; using System.Collections.Generic; -using System.ComponentModel; using System.Drawing; using System.Net; using System.Runtime.InteropServices; using System.Windows.Forms; -using EOM.TSHotelManager.Common.Core; -using SYS.FormUI.Properties; -using Sunny.UI; -using System.Management; - -using SYS.Common; -using SYS.FormUI.AppUserControls; namespace SYS.FormUI { @@ -86,7 +83,7 @@ namespace SYS.FormUI notifyIcon1.Visible = true; tsmiExitSystem.Enabled = true; } - + public static string wk_WorkerName; public static string wk_WorkerNames; @@ -386,7 +383,7 @@ namespace SYS.FormUI linkLabel1.ForeColor = Color.Green; linkLabel1.LinkColor = Color.Green; } - notifyIcon1.Text = "TS酒店管理系统-"+ LoginInfo.WorkerName +"-版本号：" + System.Windows.Forms.Application.ProductVersion.ToString(); + notifyIcon1.Text = "TS酒店管理系统-" + LoginInfo.WorkerName + "-版本号：" + System.Windows.Forms.Application.ProductVersion.ToString(); wk_WorkerName = LoginInfo.WorkerName; pnlMID.Controls.Clear(); FrmRoomManager frm1 = new FrmRoomManager(); @@ -584,7 +581,7 @@ namespace SYS.FormUI frmMySpace.ShowDialog(); } - public void CloseMine() + public void CloseMine() { this.Close(); } @@ -597,7 +594,7 @@ namespace SYS.FormUI private void tsmiLoginBackSystem_Click(object sender, EventArgs e) { - + } diff --git a/SYS.FormUI/AppUserControls/ucNavBar.cs b/SYS.FormUI/AppUserControls/ucNavBar.cs index 2baaea9b26d42d01e0edc29d419cd920ed85777b..725aa7bf02f083afe3e4bce8dd336ba6ab124b1c 100644 --- a/SYS.FormUI/AppUserControls/ucNavBar.cs +++ b/SYS.FormUI/AppUserControls/ucNavBar.cs @@ -1,12 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; +using System.Windows.Forms; namespace SYS.FormUI.AppUserControls { diff --git a/SYS.FormUI/AppUserControls/ucRoom.cs b/SYS.FormUI/AppUserControls/ucRoom.cs index a730ed5f8baf3f8a4f993303d6557cb448b8eebb..2113a53d8dc8d003030dafc45ffdbe79a8bcec2a 100644 --- a/SYS.FormUI/AppUserControls/ucRoom.cs +++ b/SYS.FormUI/AppUserControls/ucRoom.cs @@ -1,16 +1,10 @@ -using Sunny.UI; - +using EOM.TSHotelManager.Common.Core; +using Sunny.UI; using SYS.Common; -using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; using System.Runtime.InteropServices; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace SYS.FormUI @@ -154,7 +148,7 @@ namespace SYS.FormUI Room r = null; private void cmsControlPanel_Opening(object sender, CancelEventArgs e) { - dic = new Dictionary() + dic = new Dictionary() { { "no",leRoomNo.Text.Trim()} }; diff --git a/SYS.FormUI/AppUserControls/ucRoomList.cs b/SYS.FormUI/AppUserControls/ucRoomList.cs index e114794f4c592825fd015ffbcc8b1709ab37d65a..a732989ff9d6093359f9e775a90e6f5e05406436 100644 --- a/SYS.FormUI/AppUserControls/ucRoomList.cs +++ b/SYS.FormUI/AppUserControls/ucRoomList.cs @@ -1,16 +1,15 @@ -using System; +using EOM.TSHotelManager.Common.Core; +using SqlSugar; +using Sunny.UI; +using SYS.Common; +using SYS.FormUI.Properties; +using System; +using System.Collections.Generic; using System.ComponentModel; using System.Drawing; using System.Drawing.Drawing2D; using System.Runtime.InteropServices; using System.Windows.Forms; -using EOM.TSHotelManager.Common.Core; -using SYS.FormUI.Properties; - -using Sunny.UI; -using SYS.Common; -using System.Collections.Generic; -using SqlSugar; namespace SYS.FormUI { @@ -162,7 +161,7 @@ namespace SYS.FormUI us_CustoSex = romRoomInfo.CustoSex == 1 ? "男" : "女"; us_CustoTel = romRoomInfo.CustoTel; us_CustoID = romRoomInfo.CustoID; - us_CustoBirthday = romRoomInfo.CustoBirth == null? "":Convert.ToDateTime(romRoomInfo.CustoBirth).ToString(); + us_CustoBirthday = romRoomInfo.CustoBirth == null ? "" : Convert.ToDateTime(romRoomInfo.CustoBirth).ToString(); us_CustoPassportType = romRoomInfo.PassportType; us_CustoType = romRoomInfo.CustoType; us_CustoAddress = romRoomInfo.CustoAdress; @@ -184,7 +183,7 @@ namespace SYS.FormUI BackgroundImage = Resources.预约状态; break; } - + } #endregion @@ -193,7 +192,7 @@ namespace SYS.FormUI { Dictionary room = new Dictionary(); room.Add("no", lblRoomNo.Text); - var result = HttpHelper.Request("Room/SelectRoomByRoomNo", null,room); + var result = HttpHelper.Request("Room/SelectRoomByRoomNo", null, room); if (result.statusCode != 200) { diff --git a/SYS.FormUI/AppUserControls/ucVipType.cs b/SYS.FormUI/AppUserControls/ucVipType.cs index 147d15cd3507f6859f2ef17bc4fa473629be9911..b94fac08967b3cbff138a1f9902be243219f9afe 100644 --- a/SYS.FormUI/AppUserControls/ucVipType.cs +++ b/SYS.FormUI/AppUserControls/ucVipType.cs @@ -1,11 +1,4 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace SYS.FormUI diff --git a/SYS.FormUI/Program.cs b/SYS.FormUI/Program.cs index 99fab58e246e217fdc671a41c9027d668e557176..968acc6b834f42a7b4cc5a9add271a89011de89b 100644 --- a/SYS.FormUI/Program.cs +++ b/SYS.FormUI/Program.cs @@ -22,8 +22,6 @@ * */ using System; -using System.ComponentModel; -using System.Windows.Forms; namespace SYS.FormUI { diff --git a/SYS.FormUI/SYS.FormUI.csproj b/SYS.FormUI/SYS.FormUI.csproj index 20bb4678387bdcc7cba8eea28eb183212b6a8e4d..f5aed1ebc1c37f30ec11b3078aac6ba8f00a75d9 100644 --- a/SYS.FormUI/SYS.FormUI.csproj +++ b/SYS.FormUI/SYS.FormUI.csproj @@ -95,11 +95,11 @@ ..\packages\SqlSugar.5.0.3.5\lib\SqlSugar.dll - - ..\packages\SunnyUI.3.0.6\lib\net462\SunnyUI.dll + + ..\packages\SunnyUI.3.6.5\lib\net40\SunnyUI.dll - - ..\packages\SunnyUI.Common.3.0.6\lib\net462\SunnyUI.Common.dll + + ..\packages\SunnyUI.Common.3.6.5\lib\net40\SunnyUI.Common.dll @@ -724,17 +724,6 @@ - - - {00020813-0000-0000-C000-000000000046} - 1 - 8 - 0 - primary - False - True - - diff --git a/SYS.FormUI/packages.config b/SYS.FormUI/packages.config index fe1e609ff050aa9969cad97e23a32f9365f25caf..7ffd5d04a0dd6c6a04397f86e1d37d8651cfbcdf 100644 --- a/SYS.FormUI/packages.config +++ b/SYS.FormUI/packages.config @@ -4,8 +4,8 @@ - - + + diff --git a/topsky-hotel-manager-system-web-api b/topsky-hotel-manager-system-web-api index ee21dcd688014213aba436d745136b3ae1449855..8d0f62c3e7e197cf2831c1e64eaf7658f9c7ae39 160000 --- a/topsky-hotel-manager-system-web-api +++ b/topsky-hotel-manager-system-web-api @@ -1 +1 @@ -Subproject commit ee21dcd688014213aba436d745136b3ae1449855 +Subproject commit 8d0f62c3e7e197cf2831c1e64eaf7658f9c7ae39