diff --git a/.gitignore b/.gitignore index 6d5679c87e25eb547ff425a90a1da36fffca93ea..0bc48dbb515e5acbb9923c7c6d843ae9b438d0db 100644 --- a/.gitignore +++ b/.gitignore @@ -362,4 +362,6 @@ MigrationBackup/ .ionide/ # Fody - auto-generated XML schema -FodyWeavers.xsd \ No newline at end of file +FodyWeavers.xsd +/SYS.FormUI/images +/pdmanspace diff --git a/JVNUI/js/parseUtil.js b/JVNUI/js/parseUtil.js deleted file mode 100644 index a3bb59034b9f3c13895443b8a1544345659fa5e5..0000000000000000000000000000000000000000 --- a/JVNUI/js/parseUtil.js +++ /dev/null @@ -1,53 +0,0 @@ -//时间格式化 -export function parseTime(time, pattern) { - if (arguments.length === 0 || !time) { - return null - } - const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}' - let date - if (typeof time === 'object') { - date = time - } else { - if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { - time = parseInt(time) - } else if (typeof time === 'string') { - time = time.replace(new RegExp(/-/gm), '/'); - } - if ((typeof time === 'number') && (time.toString().length === 10)) { - time = time * 1000 - } - date = new Date(time) - } - const formatObj = { - y: date.getFullYear(), - m: date.getMonth() + 1, - d: date.getDate(), - h: date.getHours(), - i: date.getMinutes(), - s: date.getSeconds(), - a: date.getDay() - } - const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { - let value = formatObj[key] - // Note: getDay() returns 0 on Sunday - if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] } - if (result.length > 0 && value < 10) { - value = '0' + value - } - return value || 0 - }) - return time_str -} -//保留小数点后两位(有浏览器差异) -export function compToFixed(number, precision) { - var str = number + '' - var len = str.length - var last = str.substr(len-1, len) - if (last == '5') { - last = '6' - str = str.substr(0, len-1) + last - return (str - 0).toFixed(precision) - } else { - return number.toFixed(precision) - } -} \ No newline at end of file diff --git a/SYS.Application/Business/CashService.cs b/SYS.Application/Business/Cash/CashService.cs similarity index 100% rename from SYS.Application/Business/CashService.cs rename to SYS.Application/Business/Cash/CashService.cs diff --git a/SYS.Application/Business/ICashService.cs b/SYS.Application/Business/Cash/ICashService.cs similarity index 100% rename from SYS.Application/Business/ICashService.cs rename to SYS.Application/Business/Cash/ICashService.cs diff --git a/SYS.Application/Customer/CustoService.cs b/SYS.Application/Business/Customer/CustoService.cs similarity index 85% rename from SYS.Application/Customer/CustoService.cs rename to SYS.Application/Business/Customer/CustoService.cs index e2820cf8d586c343a4ab0970b21f32a92756f390..98543153ec20d27d6827326c0f76c05380619872 100644 --- a/SYS.Application/Customer/CustoService.cs +++ b/SYS.Application/Business/Customer/CustoService.cs @@ -24,7 +24,8 @@ using System; using System.Collections.Generic; using System.Linq; -using EncryptTools; +using System.Linq.Expressions; +using jvncorelib_fr.Encryptor; using jvncorelib_fr.Entitylib; using MySql.Data.MySqlClient; using Npgsql; @@ -38,7 +39,8 @@ namespace SYS.Application /// public class CustoService:Repository, ICustoService { - Encrypt encrypt = new Encrypt(); + EncryptLib encryptLib = new EncryptLib(); + #region 添加客户信息 /// /// 添加客户信息 @@ -47,9 +49,8 @@ namespace SYS.Application /// public bool InsertCustomerInfo(Custo custo) { - Encrypt encrypt = new Encrypt(); - string NewID = encrypt.Encryption(custo.CustoID); - string NewTel = encrypt.Encryption(custo.CustoTel); + string NewID = encryptLib.Encryption(custo.CustoID); + string NewTel = encryptLib.Encryption(custo.CustoTel); custo.CustoID = NewID; custo.CustoTel = NewTel; return base.Insert(custo); @@ -63,9 +64,8 @@ namespace SYS.Application /// public bool UpdCustomerInfoByCustoNo(Custo custo) { - Encrypt encrypt = new Encrypt(); - string NewID = encrypt.Encryption(custo.CustoID); - string NewTel = encrypt.Encryption(custo.CustoTel); + string NewID = encryptLib.Encryption(custo.CustoID); + string NewTel = encryptLib.Encryption(custo.CustoTel); custo.CustoID = NewID; custo.CustoTel = NewTel; return base.Update(a => new Custo() @@ -129,7 +129,7 @@ namespace SYS.Application /// 查询所有客户信息 /// /// - public List SelectCustoAll() + public List SelectCustoAll(ref int count,int? pageIndex,int? pageSize) { //查询出所有性别类型 @@ -143,14 +143,23 @@ namespace SYS.Application custoTypes = base.Change().GetList(); //查询出所有客户信息 List custos = new List(); - custos = base.GetList().OrderBy(a => a.CustoNo).ToList(); + + if (!pageIndex.IsNullOrEmpty() && !pageSize.IsNullOrEmpty()) + { + custos = base.AsQueryable().ToPageList((int)pageIndex, (int)pageSize, ref count).OrderBy(a => a.CustoNo).ToList(); + } + else + { + custos = base.AsQueryable().OrderBy(a => a.CustoNo).ToList(); + } + custos.ForEach(source => { //解密身份证号码 - var sourceStr = source.CustoID.Contains("·") ? encrypt.Decryption(source.CustoID) : source.CustoID; + var sourceStr = source.CustoID.Contains("·") ? encryptLib.Decryption(source.CustoID) : source.CustoID; source.CustoID = sourceStr; //解密联系方式 - var sourceTelStr = source.CustoTel.Contains("·") ? encrypt.Decryption(source.CustoTel) : source.CustoTel; + var sourceTelStr = source.CustoTel.Contains("·") ? encryptLib.Decryption(source.CustoTel) : source.CustoTel; source.CustoTel = sourceTelStr; //性别类型 var sexType = sexTypes.FirstOrDefault(a => a.sexId == source.CustoSex); @@ -182,14 +191,21 @@ namespace SYS.Application custoTypes = base.Change().GetList(); //查询出所有客户信息 List custos = new List(); - custos = base.GetList(a => a.CustoNo.Contains(custo.CustoNo)).OrderBy(a => a.CustoNo).ToList(); + if (!custo.CustoNo.IsNullOrEmpty()) + { + custos = base.GetList(a => a.CustoNo.Contains(custo.CustoNo)).OrderBy(a => a.CustoNo).ToList(); + } + if (!custo.CustoName.IsNullOrEmpty()) + { + custos = base.GetList(a => a.CustoName.Contains(custo.CustoName)).OrderBy(a => a.CustoNo).ToList(); + } custos.ForEach(source => { //解密身份证号码 - var sourceStr = source.CustoID.Contains("·") ? encrypt.Decryption(source.CustoID) : source.CustoID; + var sourceStr = source.CustoID.Contains("·") ? encryptLib.Decryption(source.CustoID) : source.CustoID; source.CustoID = sourceStr; //解密联系方式 - var sourceTelStr = source.CustoTel.Contains("·") ? encrypt.Decryption(source.CustoTel) : source.CustoTel; + var sourceTelStr = source.CustoTel.Contains("·") ? encryptLib.Decryption(source.CustoTel) : source.CustoTel; source.CustoTel = sourceTelStr; //性别类型 var sexType = sexTypes.FirstOrDefault(a => a.sexId == source.CustoSex); @@ -226,10 +242,10 @@ namespace SYS.Application var custoType = base.Change().GetSingle(a => a.UserType == c.CustoType); c.typeName = string.IsNullOrEmpty(custoType.TypeName) ? "" : custoType.TypeName; //解密身份证号码 - var sourceStr = c.CustoID.Contains("·") ? encrypt.Decryption(c.CustoID) : c.CustoID; + var sourceStr = c.CustoID.Contains("·") ? encryptLib.Decryption(c.CustoID) : c.CustoID; c.CustoID = sourceStr; //解密联系方式 - var sourceTelStr = c.CustoTel.Contains("·") ? encrypt.Decryption(c.CustoTel) : c.CustoTel; + var sourceTelStr = c.CustoTel.Contains("·") ? encryptLib.Decryption(c.CustoTel) : c.CustoTel; c.CustoTel = sourceTelStr; return c; } diff --git a/SYS.Application/Customer/ICustoService.cs b/SYS.Application/Business/Customer/ICustoService.cs similarity index 97% rename from SYS.Application/Customer/ICustoService.cs rename to SYS.Application/Business/Customer/ICustoService.cs index dc37aa29e4daf1091378b34e1308c54fb3df5e21..6affffabab2da9ca8a8d2222875cb8011dfde182 100644 --- a/SYS.Application/Customer/ICustoService.cs +++ b/SYS.Application/Business/Customer/ICustoService.cs @@ -65,7 +65,7 @@ namespace SYS.Application /// 查询所有客户信息 /// /// - List SelectCustoAll(); + List SelectCustoAll(ref int count, int? pageIndex, int? pageSize); /// /// 查询指定客户信息 diff --git a/SYS.Application/Business/FontsService.cs b/SYS.Application/Business/Fonts/FontsService.cs similarity index 100% rename from SYS.Application/Business/FontsService.cs rename to SYS.Application/Business/Fonts/FontsService.cs diff --git a/SYS.Application/Business/IFontsService.cs b/SYS.Application/Business/Fonts/IFontsService.cs similarity index 100% rename from SYS.Application/Business/IFontsService.cs rename to SYS.Application/Business/Fonts/IFontsService.cs diff --git a/SYS.Application/Business/IReserService.cs b/SYS.Application/Business/Reser/IReserService.cs similarity index 100% rename from SYS.Application/Business/IReserService.cs rename to SYS.Application/Business/Reser/IReserService.cs diff --git a/SYS.Application/Business/ReserService.cs b/SYS.Application/Business/Reser/ReserService.cs similarity index 92% rename from SYS.Application/Business/ReserService.cs rename to SYS.Application/Business/Reser/ReserService.cs index 713fccc5784c329fa75d1c7ba63daf130615ccf9..a463fe6fbf5f04a08d0fbb722b7c0bd6192c1c72 100644 --- a/SYS.Application/Business/ReserService.cs +++ b/SYS.Application/Business/Reser/ReserService.cs @@ -23,7 +23,7 @@ */ using System; using System.Collections.Generic; -using EncryptTools; +using jvncorelib_fr.Encryptor; using MySql.Data.MySqlClient; using SYS.Common; using SYS.Core; @@ -35,7 +35,7 @@ namespace SYS.Application /// public class ReserService:Repository,IReserService { - Encrypt encrypt = new Encrypt(); + EncryptLib encryptLib = new EncryptLib(); /// /// 获取所有预约信息 /// @@ -47,7 +47,7 @@ namespace SYS.Application rss.ForEach(source => { //解密联系方式 - var sourceTelStr = source.CustoTel.Contains("·") ? encrypt.Decryption(source.CustoTel) : source.CustoTel; + var sourceTelStr = source.CustoTel.Contains("·") ? encryptLib.Decryption(source.CustoTel) : source.CustoTel; source.CustoTel = sourceTelStr; }); return rss; @@ -63,7 +63,7 @@ namespace SYS.Application Reser res = null; res = base.GetSingle(a => a.ReserRoom == no && a.delete_mk != 1); //解密联系方式 - var sourceTelStr = res.CustoTel.Contains("·") ? encrypt.Decryption(res.CustoTel) : res.CustoTel; + var sourceTelStr = res.CustoTel.Contains("·") ? encryptLib.Decryption(res.CustoTel) : res.CustoTel; res.CustoTel = sourceTelStr; return res; } @@ -91,7 +91,7 @@ namespace SYS.Application /// public bool InserReserInfo(Reser r) { - var cryStr = encrypt.Encryption(r.CustoTel); + var cryStr = encryptLib.Encryption(r.CustoTel); r.CustoTel = cryStr; return base.Insert(r); } diff --git a/SYS.Application/Room/IRoomService.cs b/SYS.Application/Business/Room/IRoomService.cs similarity index 100% rename from SYS.Application/Room/IRoomService.cs rename to SYS.Application/Business/Room/IRoomService.cs diff --git a/SYS.Application/Room/IRoomTypeService.cs b/SYS.Application/Business/Room/IRoomTypeService.cs similarity index 100% rename from SYS.Application/Room/IRoomTypeService.cs rename to SYS.Application/Business/Room/IRoomTypeService.cs diff --git a/SYS.Application/Room/RoomService.cs b/SYS.Application/Business/Room/RoomService.cs similarity index 100% rename from SYS.Application/Room/RoomService.cs rename to SYS.Application/Business/Room/RoomService.cs diff --git a/SYS.Application/Room/RoomTypeService.cs b/SYS.Application/Business/Room/RoomTypeService.cs similarity index 100% rename from SYS.Application/Room/RoomTypeService.cs rename to SYS.Application/Business/Room/RoomTypeService.cs diff --git a/SYS.Application/Business/ISellService.cs b/SYS.Application/Business/Sellthing/ISellService.cs similarity index 100% rename from SYS.Application/Business/ISellService.cs rename to SYS.Application/Business/Sellthing/ISellService.cs diff --git a/SYS.Application/Business/SellService.cs b/SYS.Application/Business/Sellthing/SellService.cs similarity index 100% rename from SYS.Application/Business/SellService.cs rename to SYS.Application/Business/Sellthing/SellService.cs diff --git a/SYS.Application/Business/ISpendService.cs b/SYS.Application/Business/Spend/ISpendService.cs similarity index 100% rename from SYS.Application/Business/ISpendService.cs rename to SYS.Application/Business/Spend/ISpendService.cs diff --git a/SYS.Application/Business/SpendService.cs b/SYS.Application/Business/Spend/SpendService.cs similarity index 100% rename from SYS.Application/Business/SpendService.cs rename to SYS.Application/Business/Spend/SpendService.cs diff --git a/SYS.Application/Business/IWtiService.cs b/SYS.Application/Business/Wti/IWtiService.cs similarity index 100% rename from SYS.Application/Business/IWtiService.cs rename to SYS.Application/Business/Wti/IWtiService.cs diff --git a/SYS.Application/Business/WtiService.cs b/SYS.Application/Business/Wti/WtiService.cs similarity index 100% rename from SYS.Application/Business/WtiService.cs rename to SYS.Application/Business/Wti/WtiService.cs diff --git a/SYS.Application/Customer/CheckInfoService.cs b/SYS.Application/Customer/CheckInfoService.cs deleted file mode 100644 index 34e406fcd8558391bcaf94ba20286c73b57ed52c..0000000000000000000000000000000000000000 --- a/SYS.Application/Customer/CheckInfoService.cs +++ /dev/null @@ -1,49 +0,0 @@ -/* - * MIT License - *Copyright (c) 2021 咖啡与网络(java-and-net) - - *Permission is hereby granted, free of charge, to any person obtaining a copy - *of this software and associated documentation files (the "Software"), to deal - *in the Software without restriction, including without limitation the rights - *to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - *copies of the Software, and to permit persons to whom the Software is - *furnished to do so, subject to the following conditions: - - *The above copyright notice and this permission notice shall be included in all - *copies or substantial portions of the Software. - - *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - *IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - *FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - *AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - *LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - *OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - *SOFTWARE. - * - */ -using System; -using System.Collections.Generic; -using System.Data.SqlClient; -using MySql.Data.MySqlClient; -using SYS.Common; -using SYS.Core; - -namespace SYS.Application -{ - /// - /// 监管统计接口实现类 - /// - public class CheckInfoService:Repository, ICheckInfoService - { - /// - /// 查询所有监管统计信息 - /// - /// - public List SelectCheckInfoAll() - { - List cif = new List(); - cif = base.GetList(a => a.delete_mk != 1); - return cif; - } - } -} diff --git a/SYS.Application/Room/ReserService.cs b/SYS.Application/Room/ReserService.cs deleted file mode 100644 index e64d84d47315f4c5ee2b19d75b10d0941b43db5f..0000000000000000000000000000000000000000 --- a/SYS.Application/Room/ReserService.cs +++ /dev/null @@ -1,139 +0,0 @@ -using System; -using System.Collections.Generic; -using MySql.Data.MySqlClient; -using SYS.Common; -using SYS.Core; - -namespace SYS.Application -{ - /// - /// 预约信息接口实现类 - /// - public class ReserService:Repository,IReserService - { - /// - /// 获取所有预约信息 - /// - /// - public List SelectReserAll() - { - List rss = new List(); -<<<<<<< HEAD:SYS.Application/Room/ReserService.cs -<<<<<<< HEAD:SYS.Application/Room/ReserService.cs - string sql = "select * from RESER"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - while (dr.Read()) - { - Reser rs = new Reser(); - rs.ReserId = (string)dr["ReserId"]; - rs.CustoName = dr["CustoName"].ToString(); - rs.CustoTel = (string)dr["CustoTel"]; - rs.ReserWay = (string)dr["ReserWay"]; - if (!DBNull.Value.Equals(dr["ReserRoom"])) - { - rs.ReserRoom = (string)dr["ReserRoom"]; - } - rs.ReserDate = (DateTime)dr["ReserDate"]; - if (!DBNull.Value.Equals(dr["ReserEndDate"])) - { - rs.ReserEndDay = (DateTime)dr["ReserEndDate"]; - } - if (!DBNull.Value.Equals(dr["ReserRemark"])) - { - rs.ReserRemark = dr["ReserRemark"].ToString(); - } - rss.Add(rs); - } - dr.Close(); - DBHelper.Closecon(); -======= - rss = base.GetList(a => a.delete_mk == 0); ->>>>>>> InitProject_v1.4.8_happy_new_year:SYS.Application/Business/ReserService.cs -======= - rss = base.GetList(a => a.delete_mk == 0); ->>>>>>> master:SYS.Application/Business/ReserService.cs - return rss; - } - - /// - /// 根据房间编号获取预约信息 - /// - /// - /// - public Reser SelectReserInfoByRoomNo(string no) - { - Reser res = null; -<<<<<<< HEAD:SYS.Application/Room/ReserService.cs -<<<<<<< HEAD:SYS.Application/Room/ReserService.cs - string sql = "select * from RESER r,ROOM rm where r.ReserRoom = rm.RoomNo and r.ReserRoom = '" + no + "'"; - MySqlDataReader dr = DBHelper.ExecuteReader(sql); - if (dr.Read()) - { - res = new Reser(); - res.ReserId = (string)dr["ReserId"]; - res.CustoName = dr["CustoNo"].ToString(); - res.CustoTel = (string)dr["CustoTel"]; - res.ReserWay = Convert.ToString(dr["ReserWay"]); - if (!DBNull.Value.Equals(dr["ReserDate"])) - { - res.ReserDate = DateTime.Parse(dr["ReserDate"].ToString()); - } - if (!DBNull.Value.Equals(dr["ReserEndDate"])) - { - res.ReserEndDay = DateTime.Parse(dr["ReserEndDate"].ToString()); - } - res.ReserRemark = (string)dr["ReserRemark"]; - } - dr.Close(); - DBHelper.Closecon(); -======= - res = base.GetSingle(a => a.ReserRoom == no && a.delete_mk != 1); ->>>>>>> InitProject_v1.4.8_happy_new_year:SYS.Application/Business/ReserService.cs -======= - res = base.GetSingle(a => a.ReserRoom == no && a.delete_mk != 1); ->>>>>>> master:SYS.Application/Business/ReserService.cs - return res; - } - - /// - /// 删除预约信息 - /// - /// - /// - public bool DeleteReserInfo(string rid) - { - return base.Update(a => new Reser() - { - delete_mk = 1, - datachg_usr = LoginInfo.WorkerNo, - datachg_date = DateTime.Now - },a => a.ReserId == rid); - - } - - /// - /// 添加预约信息 - /// - /// - /// - public bool InserReserInfo(Reser r) - { -<<<<<<< HEAD:SYS.Application/Room/ReserService.cs -<<<<<<< HEAD:SYS.Application/Room/ReserService.cs - string sql = "insert WTINFO (CustoName,CustoTel,ReserWay,"; - sql += "ReserRoomNo,ReserDate,ReserEndDay,Remark) values "; - sql += "('{0}','{1}','{2}','{3}','{4}','{5}','{6}')"; - sql = string.Format(sql, r.CustoName, r.CustoTel, r.ReserWay, - r.ReserRoom, r.ReserDate, r.ReserEndDay, r.ReserRemark); - return DBHelper.ExecuteNonQuery(sql); -======= - return base.Insert(r); ->>>>>>> InitProject_v1.4.8_happy_new_year:SYS.Application/Business/ReserService.cs -======= - return base.Insert(r); ->>>>>>> master:SYS.Application/Business/ReserService.cs - } - - - } -} diff --git a/SYS.Application/SYS.Application.csproj b/SYS.Application/SYS.Application.csproj index c93a1a68a048c592fd56abf599248517fe9c3aab..ee968383ca6fad0876f6e8c26aa7d64fe5e12017 100644 --- a/SYS.Application/SYS.Application.csproj +++ b/SYS.Application/SYS.Application.csproj @@ -41,9 +41,6 @@ bitbug_favicon %281%29.ico - - ..\packages\EncryptTools.2.0.0.1\lib\.net461\EncryptTools.dll - ..\packages\jvncorelib.1.0.1.4\lib\net461\jvncorelib-fr.dll @@ -95,28 +92,28 @@ - - - - - - - + + + + + + + - - - + + + - + - + @@ -124,16 +121,16 @@ - - - - - + + + + + - + diff --git a/SYS.Application/Worker/WorkerService.cs b/SYS.Application/Worker/WorkerService.cs index 7602676b854d0944a6f989e8955ebcab0de49567..ecd485b2e8fef9f42781a2aa72397b5b3b7e2679 100644 --- a/SYS.Application/Worker/WorkerService.cs +++ b/SYS.Application/Worker/WorkerService.cs @@ -24,10 +24,10 @@ using System; using System.Collections.Generic; using System.Linq; -using EncryptTools; using MySql.Data.MySqlClient; using SYS.Common; using SYS.Core; +using jvncorelib_fr.Encryptor; namespace SYS.Application { @@ -36,7 +36,11 @@ namespace SYS.Application /// public class WorkerService:Repository,IWorkerService { - Encrypt encrypt = new Encrypt(); + /// + /// 实例化信息加密插件 + /// + EncryptLib encryptLib = new EncryptLib(); + #region 修改员工信息 /// /// 修改员工信息 @@ -49,13 +53,13 @@ namespace SYS.Application var sourceTelStr = string.Empty; if (!string.IsNullOrEmpty(worker.WorkerTel)) { - sourceTelStr = encrypt.Encryption(worker.WorkerTel); + sourceTelStr = encryptLib.Encryption(worker.WorkerTel); } //加密身份证 var sourceIdStr = string.Empty; if (!string.IsNullOrEmpty(worker.CardId)) { - sourceIdStr = encrypt.Encryption(worker.CardId); + sourceIdStr = encryptLib.Encryption(worker.CardId); } worker.WorkerTel = sourceTelStr; worker.CardId = sourceIdStr; @@ -112,8 +116,8 @@ namespace SYS.Application /// public bool AddWorker(Worker worker) { - string NewID = encrypt.Encryption(worker.CardId); - string NewTel = encrypt.Encryption(worker.WorkerTel); + string NewID = encryptLib.Encryption(worker.CardId); + string NewTel = encryptLib.Encryption(worker.WorkerTel); worker.CardId = NewID; worker.WorkerTel = NewTel; return base.Insert(worker); @@ -148,10 +152,10 @@ namespace SYS.Application workers.ForEach(source => { //解密身份证号码 - var sourceStr = source.CardId.Contains("·") ? encrypt.Decryption(source.CardId) : source.CardId; + var sourceStr = source.CardId.Contains("·") ? encryptLib.Decryption(source.CardId) : source.CardId; source.CardId = sourceStr; //解密联系方式 - var sourceTelStr = source.WorkerTel.Contains("·") ? encrypt.Decryption(source.WorkerTel) : source.WorkerTel; + var sourceTelStr = source.WorkerTel.Contains("·") ? encryptLib.Decryption(source.WorkerTel) : source.WorkerTel; source.WorkerTel = sourceTelStr; //性别类型 var sexType = sexTypes.FirstOrDefault(a => a.sexId == source.WorkerSex); @@ -185,10 +189,10 @@ namespace SYS.Application Worker w = new Worker(); w = base.Change().GetSingle(a => a.WorkerId == workerId); //解密身份证号码 - var sourceStr = w.CardId.Contains("·") ? encrypt.Decryption(w.CardId) : w.CardId; + var sourceStr = w.CardId.Contains("·") ? encryptLib.Decryption(w.CardId) : w.CardId; w.CardId = sourceStr; //解密联系方式 - var sourceTelStr = w.WorkerTel.Contains("·") ? encrypt.Decryption(w.WorkerTel) : w.WorkerTel; + var sourceTelStr = w.WorkerTel.Contains("·") ? encryptLib.Decryption(w.WorkerTel) : w.WorkerTel; w.WorkerTel = sourceTelStr; //性别类型 var sexType = base.Change().GetSingle(a => a.sexId == w.WorkerSex); @@ -225,7 +229,7 @@ namespace SYS.Application return w; } - var sourceStr = w.WorkerPwd.Contains("·") ? encrypt.Decryption(w.WorkerPwd) : w.WorkerPwd; + var sourceStr = w.WorkerPwd.Contains("·") ? encryptLib.Decryption(w.WorkerPwd) : w.WorkerPwd; if (sourceStr != worker.WorkerPwd) { w = null; @@ -259,7 +263,7 @@ namespace SYS.Application /// public bool UpdWorkerPwdByWorkNo(string workId,string workPwd) { - string NewPwd = encrypt.Decryption(workPwd); + string NewPwd = encryptLib.Decryption(workPwd); return base.Update(a => new Worker() { WorkerPwd = NewPwd, diff --git a/SYS.Application/Zero/AdminService.cs b/SYS.Application/Zero/AdminService.cs index e9ddd3055b7a42efe91be7decc3d2d3a58f65a3d..4aec9fa74b4a7c8507b6cc8df2838472afb715ae 100644 --- a/SYS.Application/Zero/AdminService.cs +++ b/SYS.Application/Zero/AdminService.cs @@ -21,8 +21,7 @@ *SOFTWARE. * */ -using EncryptTools; -using MySql.Data.MySqlClient; +using jvncorelib_fr.Encryptor; using SYS.Common; using SYS.Core; using System; @@ -36,7 +35,7 @@ namespace SYS.Application /// public class AdminService:Repository, IAdminService { - Encrypt encrypt = new Encrypt(); + EncryptLib encryptLib = new EncryptLib(); #region 根据超管密码查询员工类型和权限 /// diff --git a/SYS.Application/packages.config b/SYS.Application/packages.config index 73b57d5a087979e414250f35de8211871401f911..c95673bc60ffb57d474f0acb1b459d0b8b2dbeb8 100644 --- a/SYS.Application/packages.config +++ b/SYS.Application/packages.config @@ -1,6 +1,5 @@  - diff --git a/SYS.Core/Business/Cash.cs b/SYS.Core/Business/Cash/Cash.cs similarity index 100% rename from SYS.Core/Business/Cash.cs rename to SYS.Core/Business/Cash/Cash.cs diff --git a/SYS.Core/Customer/Custo.cs b/SYS.Core/Business/Customer/Custo.cs similarity index 100% rename from SYS.Core/Customer/Custo.cs rename to SYS.Core/Business/Customer/Custo.cs diff --git a/SYS.Core/Customer/CustoSpend.cs b/SYS.Core/Business/Customer/CustoSpend.cs similarity index 100% rename from SYS.Core/Customer/CustoSpend.cs rename to SYS.Core/Business/Customer/CustoSpend.cs diff --git a/SYS.Core/Customer/CustoType.cs b/SYS.Core/Business/Customer/CustoType.cs similarity index 100% rename from SYS.Core/Customer/CustoType.cs rename to SYS.Core/Business/Customer/CustoType.cs diff --git a/SYS.Core/Customer/PassPortType.cs b/SYS.Core/Business/Customer/PassPortType.cs similarity index 100% rename from SYS.Core/Customer/PassPortType.cs rename to SYS.Core/Business/Customer/PassPortType.cs diff --git a/SYS.Core/Customer/SexType.cs b/SYS.Core/Business/Customer/SexType.cs similarity index 100% rename from SYS.Core/Customer/SexType.cs rename to SYS.Core/Business/Customer/SexType.cs diff --git a/SYS.Core/Business/Fonts.cs b/SYS.Core/Business/Fonts/Fonts.cs similarity index 100% rename from SYS.Core/Business/Fonts.cs rename to SYS.Core/Business/Fonts/Fonts.cs diff --git a/SYS.Core/Business/Reser.cs b/SYS.Core/Business/Reser/Reser.cs similarity index 100% rename from SYS.Core/Business/Reser.cs rename to SYS.Core/Business/Reser/Reser.cs diff --git a/SYS.Core/Room/Room.cs b/SYS.Core/Business/Room/Room.cs similarity index 100% rename from SYS.Core/Room/Room.cs rename to SYS.Core/Business/Room/Room.cs diff --git a/SYS.Core/Room/RoomState.cs b/SYS.Core/Business/Room/RoomState.cs similarity index 100% rename from SYS.Core/Room/RoomState.cs rename to SYS.Core/Business/Room/RoomState.cs diff --git a/SYS.Core/Room/RoomType.cs b/SYS.Core/Business/Room/RoomType.cs similarity index 100% rename from SYS.Core/Room/RoomType.cs rename to SYS.Core/Business/Room/RoomType.cs diff --git a/SYS.Core/Business/SellThing.cs b/SYS.Core/Business/Sellthing/SellThing.cs similarity index 100% rename from SYS.Core/Business/SellThing.cs rename to SYS.Core/Business/Sellthing/SellThing.cs diff --git a/SYS.Core/Business/Spend.cs b/SYS.Core/Business/Spend/Spend.cs similarity index 100% rename from SYS.Core/Business/Spend.cs rename to SYS.Core/Business/Spend/Spend.cs diff --git a/SYS.Core/Business/SpendConsts.cs b/SYS.Core/Business/Spend/SpendConsts.cs similarity index 100% rename from SYS.Core/Business/SpendConsts.cs rename to SYS.Core/Business/Spend/SpendConsts.cs diff --git a/SYS.Core/Business/Wti.cs b/SYS.Core/Business/Wti/Wti.cs similarity index 100% rename from SYS.Core/Business/Wti.cs rename to SYS.Core/Business/Wti/Wti.cs diff --git a/SYS.Core/SYS.Core.csproj b/SYS.Core/SYS.Core.csproj index 4556a8131a57cb1c2908212c36d5f21dc97660a5..115376dd7e63018c57bf26726dc0bfd5c7725680 100644 --- a/SYS.Core/SYS.Core.csproj +++ b/SYS.Core/SYS.Core.csproj @@ -90,9 +90,9 @@ - - - + + + @@ -102,12 +102,12 @@ - - - - - - + + + + + + @@ -118,26 +118,24 @@ - - - - - - + + + + + + - + - - - + {65501af6-c629-448a-847e-1bcd60665865} diff --git a/SYS.Core/Util/CounterHelper.cs b/SYS.Core/Util/CounterHelper.cs index a5c76e512dbb30a89a40f06296c284f07e088b15..988efa2bfaf68d068d4ca7f02654d4525b4ff693 100644 --- a/SYS.Core/Util/CounterHelper.cs +++ b/SYS.Core/Util/CounterHelper.cs @@ -22,7 +22,6 @@ * *模块说明：流水号规则 */ -using MySql.Data.MySqlClient; using SYS.Common; using System; using System.Collections.Generic; diff --git a/SYS.Core/Util/IDCardUtil.cs b/SYS.Core/Util/IDCardUtil.cs index 25f705ff2fd99c7bdbf93b68ebc36564fec1a6f3..80007cf5783bb86586cc739eabec499bf90b6632 100644 --- a/SYS.Core/Util/IDCardUtil.cs +++ b/SYS.Core/Util/IDCardUtil.cs @@ -22,7 +22,6 @@ * *模块说明：身份证号码工具类 */ -using MySql.Data.MySqlClient; using SYS.Common; using System; using System.Collections.Generic; diff --git a/SYS.Core/Room/CheckInfo.cs b/SYS.Core/Zero/CheckInfo.cs similarity index 100% rename from SYS.Core/Room/CheckInfo.cs rename to SYS.Core/Zero/CheckInfo.cs diff --git a/SYS.FormUI/AppFunction/FrmCheckIn.cs b/SYS.FormUI/AppFunction/FrmCheckIn.cs index 1d3be7ae3c7ba5a6e5394b863e0d660e77817cd1..51fc237d5663c2fb4b5a0f2655c3eacfcbe02225 100644 --- a/SYS.FormUI/AppFunction/FrmCheckIn.cs +++ b/SYS.FormUI/AppFunction/FrmCheckIn.cs @@ -47,7 +47,7 @@ namespace SYS.FormUI && CheckEmpty(txtCustoNo, "请输入客户编号") && CheckEmpty(txtCustoTel, "输入11位手机号码"); } - + int count = 0; #region 窗体加载事件方法 private void FrmCheckIn_Load(object sender, EventArgs e) { @@ -63,16 +63,10 @@ namespace SYS.FormUI txtRoomPosition.Text = r.RoomPosition; txtState.Text = r.RoomState; txtDeposit.Text = r.RoomDeposit.ToString(); - List ctos = new CustoService().SelectCustoAll(); - List roms = new RoomService().SelectCanUseRoomAll(); - for (int i = 0; i < roms.Count; i++) - { - txtRoomNo.AutoCompleteCustomSource.Add(roms[i].RoomNo); - } - for (int j = 0; j < ctos.Count; j++) - { - txtCustoNo.AutoCompleteCustomSource.Add(ctos[j].CustoNo); - } + List ctos = new CustoService().SelectCustoAll(ref count, null,null); + //List roms = new RoomService().SelectCanUseRoomAll(); + + txtCustoNo.AutoCompleteCustomSource.AddRange(ctos.Select(a => a.CustoNo).ToArray()); try { txtCustoNo.Text = ""; diff --git a/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs b/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs index 156820a2e50e81cdd00cc98f0d66fa558df8bf8a..5230632b3c723a07c8ceb6da0951c1d82ec0b199 100644 --- a/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs @@ -52,8 +52,11 @@ this.btnExport = new Sunny.UI.UIButton(); this.btnUpdate = new Sunny.UI.UIButton(); this.uiGroupBox1 = new Sunny.UI.UIGroupBox(); + this.txtCustoName = new Sunny.UI.UITextBox(); + this.label1 = new System.Windows.Forms.Label(); this.txtCustoNo = new Sunny.UI.UITextBox(); this.label3 = new System.Windows.Forms.Label(); + this.btnPg = new Sunny.UI.UIPagination(); ((System.ComponentModel.ISupportInitialize)(this.dgvCustomerList)).BeginInit(); this.uiGroupBox1.SuspendLayout(); this.SuspendLayout(); @@ -124,7 +127,7 @@ this.dgvCustomerList.SelectedIndex = -1; this.dgvCustomerList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dgvCustomerList.ShowRect = false; - this.dgvCustomerList.Size = new System.Drawing.Size(999, 517); + this.dgvCustomerList.Size = new System.Drawing.Size(999, 482); this.dgvCustomerList.TabIndex = 111; // // CustoNo @@ -269,6 +272,8 @@ // // uiGroupBox1 // + this.uiGroupBox1.Controls.Add(this.txtCustoName); + this.uiGroupBox1.Controls.Add(this.label1); this.uiGroupBox1.Controls.Add(this.txtCustoNo); this.uiGroupBox1.Controls.Add(this.label3); this.uiGroupBox1.Font = new System.Drawing.Font("微软雅黑", 12F); @@ -282,12 +287,39 @@ this.uiGroupBox1.Text = "条件搜索"; this.uiGroupBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // + // 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.Size = new System.Drawing.Size(173, 33); + this.txtCustoName.TabIndex = 98; + this.txtCustoName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(290, 26); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(88, 25); + this.label1.TabIndex = 97; + this.label1.Text = "客户姓名"; + // // 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.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; @@ -295,20 +327,34 @@ this.txtCustoNo.Name = "txtCustoNo"; this.txtCustoNo.Padding = new System.Windows.Forms.Padding(5); this.txtCustoNo.Radius = 20; - this.txtCustoNo.Size = new System.Drawing.Size(443, 33); - this.txtCustoNo.TabIndex = 92; + this.txtCustoNo.Size = new System.Drawing.Size(173, 33); + this.txtCustoNo.TabIndex = 96; this.txtCustoNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // // label3 // this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(17, 26); + this.label3.Location = new System.Drawing.Point(15, 26); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(88, 25); - this.label3.TabIndex = 91; + this.label3.TabIndex = 95; this.label3.Text = "客户编号"; // + // btnPg + // + this.btnPg.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnPg.Location = new System.Drawing.Point(3, 528); + this.btnPg.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnPg.MinimumSize = new System.Drawing.Size(1, 1); + this.btnPg.Name = "btnPg"; + this.btnPg.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; + this.btnPg.Size = new System.Drawing.Size(999, 34); + this.btnPg.TabIndex = 121; + this.btnPg.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; + this.btnPg.PageChanged += new Sunny.UI.UIPagination.OnPageChangeEventHandler(this.btnPg_PageChanged); + this.btnPg.Paint += new System.Windows.Forms.PaintEventHandler(this.btnPg_Paint); + // // FrmCustoManager // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); @@ -316,6 +362,7 @@ this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.ClientSize = new System.Drawing.Size(1005, 623); this.ControlBox = false; + this.Controls.Add(this.btnPg); this.Controls.Add(this.uiGroupBox1); this.Controls.Add(this.btnUpdate); this.Controls.Add(this.btnExport); @@ -355,7 +402,10 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column3; private System.Windows.Forms.DataGridViewTextBoxColumn Column4; private Sunny.UI.UIGroupBox uiGroupBox1; + private Sunny.UI.UITextBox txtCustoName; + private System.Windows.Forms.Label label1; private Sunny.UI.UITextBox txtCustoNo; private System.Windows.Forms.Label label3; + private Sunny.UI.UIPagination btnPg; } } \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmCustoManager.cs b/SYS.FormUI/AppFunction/FrmCustoManager.cs index 0535cc59804752d3daa3893df564b580a28bc246..8121e4f3bdca005c915275e1d8a85445773b1277 100644 --- a/SYS.FormUI/AppFunction/FrmCustoManager.cs +++ b/SYS.FormUI/AppFunction/FrmCustoManager.cs @@ -78,11 +78,14 @@ namespace SYS.FormUI } #endregion + int count = 0; #region 加载用户信息列表 private void LoadCustomer() { - List lstSource = new CustoService().SelectCustoAll(); - dgvCustomerList.AutoGenerateColumns = false; + var count = 0; + List lstSource = new CustoService().SelectCustoAll(ref count, 1, 20); + btnPg.TotalCount = count; + this.dgvCustomerList.AutoGenerateColumns = false; this.dgvCustomerList.DataSource = lstSource; } #endregion @@ -123,20 +126,23 @@ namespace SYS.FormUI #region 搜索会员信息事件方法 private void picSearch_Click_1(object sender, EventArgs e) { - if (txtCustoNo.Text != "") + dgvCustomerList.ClearRows(); + dgvCustomerList.AutoGenerateColumns = false; + List custos = null; + if (!txtCustoNo.Text.IsNullOrEmpty()) + { + custos = new CustoService().SelectCustoByInfo(new Custo { CustoNo = txtCustoNo.Text.Trim() }); + } + else if (!txtCustoName.Text.IsNullOrEmpty()) { - dgvCustomerList.ClearRows(); - dgvCustomerList.AutoGenerateColumns = false; - List custos = new CustoService().SelectCustoByInfo(new Custo { CustoNo = txtCustoNo.Text.Trim() }); - dgvCustomerList.DataSource = custos; + custos = new CustoService().SelectCustoByInfo(new Custo { CustoName = txtCustoName.Text.Trim() }); } else { - dgvCustomerList.ClearRows(); - dgvCustomerList.AutoGenerateColumns = false; - List custos = new CustoService().SelectCustoAll(); - dgvCustomerList.DataSource = custos; + custos = new CustoService().SelectCustoAll(ref count,1,20); + } + dgvCustomerList.DataSource = custos; } #endregion @@ -205,8 +211,20 @@ namespace SYS.FormUI //} //#endregion } + #endregion + private void btnPg_PageChanged(object sender, object pagingSource, int pageIndex, int count) + { + var totalCount = 0; + List lstSource = new CustoService().SelectCustoAll(ref totalCount, pageIndex, count); + this.dgvCustomerList.AutoGenerateColumns = false; + this.dgvCustomerList.DataSource = lstSource; + } + private void btnPg_Paint(object sender, PaintEventArgs e) + { + + } } } diff --git a/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs b/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs index ad3e1db3564c4e469f3b9592bc17cc8f25ddd674..a1d25770e894a8484d99e2728eeca7fea05edb41 100644 --- a/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs @@ -56,8 +56,11 @@ this.btnAddCusto = new Sunny.UI.UIButton(); this.btnUpdCustomer = new Sunny.UI.UIButton(); this.uiGroupBox1 = new Sunny.UI.UIGroupBox(); + this.txtCustoName = new Sunny.UI.UITextBox(); + this.label1 = new System.Windows.Forms.Label(); this.txtCustoNo = new Sunny.UI.UITextBox(); this.label3 = new System.Windows.Forms.Label(); + this.btnPg = new Sunny.UI.UIPagination(); ((System.ComponentModel.ISupportInitialize)(this.dgvCustomerList)).BeginInit(); this.uiGroupBox1.SuspendLayout(); this.SuspendLayout(); @@ -130,7 +133,7 @@ this.dgvCustomerList.SelectedIndex = -1; this.dgvCustomerList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dgvCustomerList.ShowRect = false; - this.dgvCustomerList.Size = new System.Drawing.Size(1048, 402); + this.dgvCustomerList.Size = new System.Drawing.Size(1048, 381); this.dgvCustomerList.Style = Sunny.UI.UIStyle.Custom; this.dgvCustomerList.TabIndex = 83; this.toolTip1.SetToolTip(this.dgvCustomerList, "选中客户右键可进行更多操作"); @@ -308,6 +311,8 @@ // // uiGroupBox1 // + this.uiGroupBox1.Controls.Add(this.txtCustoName); + this.uiGroupBox1.Controls.Add(this.label1); this.uiGroupBox1.Controls.Add(this.txtCustoNo); this.uiGroupBox1.Controls.Add(this.label3); this.uiGroupBox1.Font = new System.Drawing.Font("微软雅黑", 12F); @@ -321,6 +326,33 @@ this.uiGroupBox1.Text = "条件搜索"; this.uiGroupBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // + // 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.Size = new System.Drawing.Size(173, 33); + this.txtCustoName.TabIndex = 94; + this.txtCustoName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(292, 26); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(88, 25); + this.label1.TabIndex = 93; + this.label1.Text = "客户姓名"; + // // txtCustoNo // this.txtCustoNo.Cursor = System.Windows.Forms.Cursors.IBeam; @@ -334,7 +366,7 @@ this.txtCustoNo.Name = "txtCustoNo"; this.txtCustoNo.Padding = new System.Windows.Forms.Padding(5); this.txtCustoNo.Radius = 20; - this.txtCustoNo.Size = new System.Drawing.Size(443, 33); + this.txtCustoNo.Size = new System.Drawing.Size(173, 33); this.txtCustoNo.TabIndex = 92; this.txtCustoNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // @@ -348,12 +380,27 @@ this.label3.TabIndex = 91; this.label3.Text = "客户编号"; // + // btnPg + // + this.btnPg.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnPg.Location = new System.Drawing.Point(12, 401); + this.btnPg.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnPg.MinimumSize = new System.Drawing.Size(1, 1); + this.btnPg.Name = "btnPg"; + this.btnPg.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; + this.btnPg.Size = new System.Drawing.Size(1048, 34); + this.btnPg.TabIndex = 120; + this.btnPg.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; + this.btnPg.PageChanged += new Sunny.UI.UIPagination.OnPageChangeEventHandler(this.btnPg_PageChanged); + this.btnPg.Click += new System.EventHandler(this.btnPg_Click); + // // 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.btnPg); this.Controls.Add(this.uiGroupBox1); this.Controls.Add(this.btnUpdCustomer); this.Controls.Add(this.btnAddCusto); @@ -397,5 +444,8 @@ private Sunny.UI.UIGroupBox uiGroupBox1; private Sunny.UI.UITextBox txtCustoNo; private System.Windows.Forms.Label label3; + private Sunny.UI.UITextBox txtCustoName; + private System.Windows.Forms.Label label1; + private Sunny.UI.UIPagination btnPg; } } \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmCustomerManager.cs b/SYS.FormUI/AppFunction/FrmCustomerManager.cs index b38ac83a16d80b8af2fa7b10b8ac924fe197bdbf..7532a0a659b3332753179b702b3ec48905c65470 100644 --- a/SYS.FormUI/AppFunction/FrmCustomerManager.cs +++ b/SYS.FormUI/AppFunction/FrmCustomerManager.cs @@ -64,10 +64,11 @@ namespace SYS.FormUI #region 加载用户信息列表 private void LoadCustomer() { - - List lstSource = new CustoService().SelectCustoAll(); - this.dgvCustomerList.DataSource = lstSource; + var count = 0; + List lstSource = new CustoService().SelectCustoAll(ref count, 1, 20); + btnPg.TotalCount = count; this.dgvCustomerList.AutoGenerateColumns = false; + this.dgvCustomerList.DataSource = lstSource; } #endregion @@ -146,23 +147,26 @@ namespace SYS.FormUI //} //#endregion - + int count = 0; private void btnSerach_BtnClick(object sender, EventArgs e) { - if (txtCustoNo.Text != "") + dgvCustomerList.ClearRows(); + dgvCustomerList.AutoGenerateColumns = false; + List custos = null; + if (!txtCustoNo.Text.IsNullOrEmpty()) { - dgvCustomerList.ClearRows(); - dgvCustomerList.AutoGenerateColumns = false; - List custos = new CustoService().SelectCustoByInfo(new Custo { CustoNo = txtCustoNo.Text.Trim() }); - dgvCustomerList.DataSource = custos; + custos = new CustoService().SelectCustoByInfo(new Custo { CustoNo = txtCustoNo.Text.Trim() }); + } + else if (!txtCustoName.Text.IsNullOrEmpty()) + { + custos = new CustoService().SelectCustoByInfo(new Custo { CustoName = txtCustoName.Text.Trim() }); } else { - dgvCustomerList.ClearRows(); - dgvCustomerList.AutoGenerateColumns = false; - List custos = new CustoService().SelectCustoAll(); - dgvCustomerList.DataSource = custos; + custos = new CustoService().SelectCustoAll(ref count, null,null); + } + dgvCustomerList.DataSource = custos; } private void btnAddCusto_BtnClick(object sender, EventArgs e) @@ -200,6 +204,19 @@ namespace SYS.FormUI frmInputs.ShowDialog(); } } + + private void btnPg_Click(object sender, EventArgs e) + { + + } + + private void btnPg_PageChanged(object sender, object pagingSource, int pageIndex, int count) + { + var totalCount = 0; + List lstSource = new CustoService().SelectCustoAll(ref totalCount,pageIndex, count); + this.dgvCustomerList.AutoGenerateColumns = false; + this.dgvCustomerList.DataSource = lstSource; + } } } diff --git a/SYS.FormUI/AppFunction/FrmRoomManager.Designer.cs b/SYS.FormUI/AppFunction/FrmRoomManager.Designer.cs index a3609e9cf9db225fadc014b241a2dd87a2a7661d..28f7765ea23ed18920007286ed79af2713ccbb25 100644 --- a/SYS.FormUI/AppFunction/FrmRoomManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmRoomManager.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmRoomManager)); this.flpRoom = new System.Windows.Forms.FlowLayoutPanel(); this.pnlRoomState = new System.Windows.Forms.Panel(); this.lblReser = new System.Windows.Forms.Label(); @@ -361,7 +362,7 @@ // picRefrech // this.picRefrech.BackColor = System.Drawing.Color.Transparent; - this.picRefrech.BackgroundImage = global::SYS.FormUI.Properties.Resources.获取用户编号; + this.picRefrech.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("picRefrech.BackgroundImage"))); this.picRefrech.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.picRefrech.Location = new System.Drawing.Point(1024, 14); this.picRefrech.Name = "picRefrech"; @@ -373,7 +374,7 @@ // pictureBox5 // this.pictureBox5.BackColor = System.Drawing.Color.White; - this.pictureBox5.BackgroundImage = global::SYS.FormUI.Properties.Resources.预约房icon; + this.pictureBox5.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox5.BackgroundImage"))); this.pictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.pictureBox5.Location = new System.Drawing.Point(4, 212); this.pictureBox5.Name = "pictureBox5"; @@ -387,7 +388,7 @@ // pictureBox4 // this.pictureBox4.BackColor = System.Drawing.Color.White; - this.pictureBox4.BackgroundImage = global::SYS.FormUI.Properties.Resources.维修房icon; + this.pictureBox4.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox4.BackgroundImage"))); this.pictureBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.pictureBox4.Location = new System.Drawing.Point(5, 160); this.pictureBox4.Name = "pictureBox4"; @@ -401,7 +402,7 @@ // pictureBox3 // this.pictureBox3.BackColor = System.Drawing.Color.White; - this.pictureBox3.BackgroundImage = global::SYS.FormUI.Properties.Resources.脏房icon1; + this.pictureBox3.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox3.BackgroundImage"))); this.pictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.pictureBox3.Location = new System.Drawing.Point(4, 108); this.pictureBox3.Name = "pictureBox3"; @@ -415,7 +416,7 @@ // pictureBox2 // this.pictureBox2.BackColor = System.Drawing.Color.WhiteSmoke; - this.pictureBox2.BackgroundImage = global::SYS.FormUI.Properties.Resources.已住房icon; + this.pictureBox2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox2.BackgroundImage"))); this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.pictureBox2.Location = new System.Drawing.Point(4, 56); this.pictureBox2.Name = "pictureBox2"; @@ -429,7 +430,7 @@ // pictureBox1 // this.pictureBox1.BackColor = System.Drawing.Color.White; - this.pictureBox1.BackgroundImage = global::SYS.FormUI.Properties.Resources.可住房icon; + this.pictureBox1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.BackgroundImage"))); this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.pictureBox1.Location = new System.Drawing.Point(4, 3); this.pictureBox1.Name = "pictureBox1"; diff --git a/SYS.FormUI/AppFunction/FrmRoomManager.cs b/SYS.FormUI/AppFunction/FrmRoomManager.cs index 35c14a377a9b935ca2ce496a65541c4a079ef1b7..90ea328710c7deb8f37f48955b49974c57f47cd7 100644 --- a/SYS.FormUI/AppFunction/FrmRoomManager.cs +++ b/SYS.FormUI/AppFunction/FrmRoomManager.cs @@ -27,6 +27,7 @@ using System.Windows.Forms; using SYS.Core; using SYS.FormUI.Properties; using SYS.Application; +using System.Drawing; namespace SYS.FormUI { @@ -143,12 +144,12 @@ namespace SYS.FormUI for (int i = 0; i < romsty.Count; i++) { romt = new ucRoomList(); + romt.lblMark.Text = String.Empty; romt.lblRoomNo.Text = romsty[i].RoomNo; romt.lblCustoNo.Text = romsty[i].CustoNo; romt.lblRoomType.Text = romsty[i].RoomName; romt.romCustoInfo = romsty[i]; flpRoom.Controls.Add(romt); - } lblRoomNo.Text = ""; lblRoomPosition.Text = ""; diff --git a/SYS.FormUI/AppFunction/FrmRoomManager.resx b/SYS.FormUI/AppFunction/FrmRoomManager.resx index 1af7de150c99c12dd67a509fe57c10d63e4eeb04..780b8843580d4c99121804d3b02216d56c242280 100644 --- a/SYS.FormUI/AppFunction/FrmRoomManager.resx +++ b/SYS.FormUI/AppFunction/FrmRoomManager.resx @@ -117,4 +117,228 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + 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 + xRir/gM6mB11FGAAQwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAANQAAAAqCAYAAADLRnVxAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAbFSURBVHhe7Zz7bxVFFMf9T8UQn5EYE40x+IPRGI2/qJFo + /AGNiVFAUIkiwUfqCxUKtVQrr/IUkPIWsIIBhn6291tOp2f37m3H5K6cST65u3POnNmbnG/PzNyFe+79 + YDQFQVCGEFQQFCQEFQQFCUEFQUFCUEFQkBBUEBQkBBUEBQlBBUFBQlBBUJCignrx633pvd3H0/rxP9Iz + WyfT/Rt2u35B8H+lmKDe+ulwytu5v6+7vl1nw87DaWTyRFr96cQiG30nzlyq7C9tm6zufz7wp+vbxDvb + D7r9gI05Phs/NnDcJiaOnKnirhnZ59qD/hQR1ObJU5WAtu2fTg9uHEsr1o2mNT9MVX3TV665Y7rMwZPn + 061r16rkW7VpbIGNZMd2/uKVykaScs+n9WuChFYMRJPbEWjd/MtB34v4nj3oz7IF9f7Y8Uo43x46u8j2 + 6ncHK9vYiYuLbF1m5upMlXheFVGySwhUKe6h7V9+xuIvUeZ2+rEjACqhR13lahqDQInL9/PswHgvbjDH + sgS1dseRvoJ5e+fRyufzvadde9dguUfS1VUckpKEtEIgERln/ZpQYntjJLYmmqqh5z8oXtxgjiUL6vXe + km7q3FXXbtk0cbLyfXfX4uVL11CyU3m41ydouYegqCJNeEs50HKvbjnHWNltPxWJeXMx5zAWPFs/ljP2 + bmFJgnp5ZH8lkEH2RyNTZ6oxr8wuAz17F1CyqwJoOUeSk9ASWxuoWnl80J5Ly0OuiY9IGMM9PgjH7nU0 + d51QBT7g2fqxnLF3CwML6rkv91bCuH7jpmtvYs+pS9XYF77q5ilSXp20XyLR7VLMjlFFsX112P2W+rgm + Rn7YYZee+b6tCfwUZ1A01osbzDGQoFZvnawEQfPs/Vixblc6+dc/1fhnv/jd9RlWVDlILAQEWtohBK69 + hFMi2r46bIVTH9fEQEB82oMQVSxgbNNST8ifWEvFixvM0VpQT84uadQ4Fvd82rByw+504+atKg4//no+ + w4iqQA5VQWITJL2QSGwf5PGtOED9XCuJJRiWl5pTotY4TuF4JubwBCa/vF8wVjE8e9BMK0E99smeSgC0 + +2arjOczCA9tHOtFS+mpLb+6PsMGSUyVYG9DoiqRsSE2hGMTu4n8rzzJr34JUDb1M7+SXXEQlUSjiimb + 7Ipj40HeLyRs5mxT8YKF9BXUI5t+6aV+SivXl3uVyIr0idlk8XyGFSWdPdZm2SdB2UrkVSjv9yj8sCmG + +pXctkIiFHyxMy9j+UQAVnTePPQjPPyIyXex5PPkdhEVzKdRUI9+NN5L+ZQe+LD8X6unt/zWi57S45v3 + uD7Dho6nSeLclouhrs9D1aBOUFyTyMwvf+6xy8dWFK+6IEL52rFLgfF5/KCPoEhy2qqPx6sDhTe2H6qu + Pd9BIAaxiPl879QQcXm+w4atOLnNE4/X10TuzzV9ulcVkp+qEzYqpickYQWFMHNfbHbuOhgnYQcLaX0o + 8XBv6ccb5Z4dECB2aFrGYacR07MPIySRxESFYjlEYoKWP0py9YP2NbaPZVUeX2C3Sa2xXPMMsvNpl5yq + OFZgOTwnPt7eSr+xaa5gaRQTlF6GtW3tjqOubxcFBUrmHFUrm+yipKCAuez+hUohoeNnRZYj0XnLNcYp + BvY6Yu/UTDFB8aY5DT/50jzfrgqKZCKpSGrIl0y5GOr6msj9leTWB5ibSoMdEKmeh2fMnw10WOGJwh5G + NOE9S3CHYoLi1SJ+X9K9mvURXRVUHSQv/NeCYg6EjJBU+ahOqpDYJTL6c1Eptnf6J5ti1dkRq2cP5igm + qJ3HL6QLM//O36tZH9FlQZGMJB2JpX2UElHX1t/ra6KfvyqJFRJQdazIuLeCYl+FzYuNL/3MnduEnsur + bsEdiglq8vTldOzizPy9mvURXRSU9ikeSkQlXVvyOWwMzwaIxB6dk+Aag6DqKohEw7LP9iM0CbFOLMyH + HeoqWDBHMUEhpr3Tl+fv1ayP6KKglJBAApO4+TG1EpvPNtj4eQzPBiQ3z2KXfXzaPZSH4lrRcK0Y+UEJ + 3w3xgN2rxXF5M8UExXJvdHbZp3s16yO6KCglcpuk9WxtUeLm/VbQwlvaedixEoQ9hMjFBAhJdsF8uV+w + kNaC4oVY/tOVA2evVCd6ORxIfGP+Gbya5wvEWs5LtsNIU+VpS10MhEBCUy0QyCCVAsFpz2f7EZInJqHq + xfMwvp9wgwEEBfxw64lDvPb91LyvZxdv/ni4U9UpCNoykKCCIGgmBBUEBQlBBUFBQlBBUJAQVBAUJAQV + BAUJQQVBQUJQQVCQEFQQFGM03QZIGwHGouQHbQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAANQAAAAqCAYAAADLRnVxAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAVgSURBVHhe7ZyPTxRHFMf791Mp/qQqyCnl19UqPyMqIC0S + tdZatVEhKlGCRA1GkTQhsTj2O+Vd3g3v7nZvh2VXvpN8wu17b2bnwvvOzM7N3XdHejocISQOFBQhEaGg + CIkIBUVIRCgoQiJCQRESEQqKkIhQUIREhIIiJCJRBVWdGnFzt2bdb7//6i5cqrijlR/MuMPCqf4Tbn5x + xk3PTZp+8u0RTVBX5qdcWDa3Ns3Yw8K7N6/dl+1t/9fyF4UXz5d8H0enfzH9JDlRBHX7r1teQH/+fc8d + P3/UHentcBOz49728dMHs04Zuf/gbkOseMxOEBQo8iy1trri+/j4yUPTT5KTWVDzd2544Txa2vvPGL1+ + 2fuev3y2x1dGNt9v1ASigR1+SzRIUggrtOctMIjGGgiAzKTbW59MP0B9q11STyZBXV2YbimYawtXfcwf + j+xRvEyIoLRNC0oElhTdzn5j3T8tVruknrYFNT4z5oWy/nbd9GsW7930sbOL101/WWglKPHjbyswG+h2 + 9pssoshS97DRlqAuXql6gaR5Pnr49IGvM3rtsukvAxBCmFi4hr2RvyhkEUWWuoeN1IIaHB/wwvj872fT + 34yV1Re+7vDkkOkvOu0ICs9KsIOD3JgQUUhf0iB1rXZJPakEdf5SxQsCxfK3orP3e7fxYcPXHxjrN2OK + jE4uDezar+v0VXtqcXitfXmi+9ouVruknsSC6q2e9UJAwba4FZOErr5Ot7Oz49vBh79WTFFBUiEp9e6X + JKn2h/UkmUN7nrTqw+27C34nD38tP0lGIkGdHuz2AkDBLGPFpOHEhWO7rTnX93OvGVNELMHg2hKUno2s + ZM57trL6oNGDA054WDGkNS0FdbL/+G7qO9d1rtOMaQct0p6RM2ZM0UgjKEnQRsCv29lvcE/sLGIGwmdj + MsMKsEnfcHIi9AucwZrTVFDdP53cTXnnjlW6zJgsVC6e223duTNDP5oxRSKtoHAtNokT8kxMbIbI/dEv + 6U87oL51D/I/TQWFJEfpHjjll3qTcxP+tRWbBrSBttDm0MSgvwfEZcUWCS0ODezaH9aTuNCeF1pQWGqG + S7qk/UO9g9xYKQOJNyXkuQcnyi0/gADhBz0jZ80YAD8K2rT8RUWO6MjyR0b7ogsKsyHuj6Vc6MOBWP0e + SDaiCUoOw+qCY0dWbFkFZSWetkFw1gkIxIDQnhcifGu5Jgd48R70QBHCZ6dkRBMUTpqjIE5iUazYMgoK + Sx0tHkHbLL/YQWjPCzlNbolCb0Y0w3pfZC/RBIWjRfh8Sa6l6BihjIKS55DwKw462fDaOpUtSRna8wL9 + w/2t7zuJr9EpDvFjlrL8pJ5oglpeWXJb/2zVrqXoGKGMgkJCIbHCUR42JJ0Izko82EFoz4PhsYGG95dn + KxkQLERQXPIlI5qgXr1+5d69f1u7lqJjhOrUsPeVSVCyIaFHeUlWJJ0kJ4QVzgSwA21DTB4foEq/wpkT + fcfzHnyNxCLLXNBoBiP1RBMUxLS6vlq7lqJjhLIJSnbCZMNBrgUISm9IyKjeijyS1Jph8FrEFC5h5Tcw + AHYFpa/cLk9GNEFhube8sly7lqJjhLIJCjMJBKO3neVBH3YkofbDh0RuBuL3W1AyO2lB6E2IUEwAfRK/ + gL6GccQmsaBwIBY/urL2Zs3v6IVgQ0J/DV6KFQv8D7hkOGSbN0hILYBwxMasZX3V/SDBQIBnuvDzJwjJ + EpMgsxeEj/p5LE2/FZIL6j/wwa0lDmFsZrQWa/mFqRuTpXp+IiQpqQRFCGkOBUVIRCgoQiJCQRESEQqK + kIhQUIREhIIiJCIUFCERoaAIiUaH+wptfhU7ieoeFgAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAANQAAAAqCAYAAADLRnVxAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAWzSURBVHhe7ZyLb1RFFMb9U8EY362gKQHEiMrD+IhFjAFJ + azQCIYYEjYkSTdD0BbQWWtMWCqWpKdJYrJWoFIOMfrM9ZTqcnXvu3Um62/0m+WUf5ztn74b5OufOvctj + z/dtcYSQPNBQhGSEhiIkIzQUIRmhoQjJCA1FSEZoKEIyQkMRkhEaipCMZDXUofE33eczn7kzs6fcwdFX + 3PaBJ1UdKebY+Ptu11CnGgOIpeJkY8hmqE+uHnXxWFq5rWpblf3Du92JyR7/qMVTwCDItZrgxuKUu/vX + sn+Mc0bmB3xsYmF03fuNgnq/LM36Y9XipJgshvrm5y+9gc7dPOteGnzadfRtdT1TH/j3Fu/+qua0In1z + 37oHKysNYTUjDAM9PjOOwVBSr/vSgUfiVYF5URP1tTgppmFDnb5x0htncOGHR2JHJw/52Phvef+SbhQ5 + DKXVjTkzfdJrYSptRYOJJA5tHE8B0+B7aGB1krpaHCBfq0tqNGSo49M9hYY5ca3Xa76b/1qNtxLS8pVt + iZBTxlBovaDFBIahkB9r6hlJ9PVaSzmORtDqkhqVDXVs6rA3yuyd62o85Ku501576vqnanyzU8ZQMIK0 + e2JgyS2DZkIgcS1WRCO57UIlQx3+6S1vkDLnR/23zvmcIxPdanwzU8ZQWJVCreQu3VlYh2ji96Vto6E2 + htKGeufyG94Y//x7T42nmFga87nvje1X460AJqpg3WAQUxRNRjk3smgtGg3Ji41ooepnthOlDHVgdI83 + BIYWL6Kjf6u79fdNn//25ddUTbNzduaLtYllPZeyGAqtnqwuRVpg0WhInmYYK1pdUsNsqL0jO7wRMLAt + rmksbBt4wt1/cN/XwcVfTdPMWFebkKIcmEm2wjFhLfUtGo2iPPzBwE4eHrU4SWMy1MsXtnkDYHT2P65q + ytA19MxqNedeH9mpapqV0BxV0Gqi1cNGBEAbmdIKFo1GUZ6cw8HY9XYKSX0KDbXj/HOrU9+5F/5fXTRN + FUKTvjrcpWqakdBQYRuUImzltJoAK4K0kLFWqyma8D18Dh4lTwM5MC4+D6uiXF8SwovG2L6P4wJXMJ2k + oXae71id8s69OPiUqmmEfT/uXq3u3J6L21VNs9Foy2e5syGuHxqoiJSh5DiggSni3DIgX/uMdidpKExy + jF0XOv2GQu+VD/1zTVsG1EAt1Hx3bJ//DJhL0zYbVQyF1gl5wNJGxfWxcsUbINoxaLqQ0FBoLeNj0Wpq + IM+6w9lumDcluoae9RMfd5RrcQADIg72Jto4xDFQU4s3M1UMVRZL/SrHgDYNOdpNtTAiYkUtI0mTzVBy + M2w4jl/rVbU0VBpL/SrHIG2e1q7J/YPSDtaD505pshkKd5pjQCdaDE3bzoayTEhL/SrHIHeTa8cQbkak + 4AqWJpuhcGsRri/JaxmhRmhXQ8mWOHbjUpsTlvpVjgFmQI52niUxfL84FsaxSmlxUiOboUYXL7rle7+v + vZYRaoR2NZScw4DUzy4s9S2akPC2pjgmx5VafcRQbPnSZDPU1eVJN//n3NprGaFG6B4/6GOtbihMLsuu + HVYmaOUu8tTEBVIfz5GrrRqhJgb6eBUS08S/Z5KLyojVM4usrKDeCkZqZDMUzDS9/PAfS0aoEVrZUOHk + qkrRjwJFh+doscJcK7FptRUmNHn8K10cI8wD5PdZAN8/1JH1ZDMU2r1Lt4fXXssINUIrGwpgkuEvvUxS + C5i4yCkyE5AcPBdD4bOsiF7qyeoExBDhJkRsJoDvKHEB536xjqzHbCjcEIv/dGXmj2m/oxeDDYmBhe/X + 9DI0LUCtRm6y3azI9SCgxauAthTGjK8/wUiamYSwRUW+pb1td8yGArhwq5lD+GjyYd+uxYWPrxxp2dWJ + kBSlDEUISUNDEZIRGoqQjNBQhGSEhiIkIzQUIRmhoQjJCA1FSEZoKEKyscX9B7JRTTynGGpOAAAAAElF + TkSuQmCC + + + + + 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 + + \ No newline at end of file diff --git a/SYS.FormUI/AppUserControls/ucRoomList.cs b/SYS.FormUI/AppUserControls/ucRoomList.cs index 3989b126ac98d470e809d39abf0c47ea0fa6f6d9..f5523b6648619d82bbd3744dfe683018e91a00e7 100644 --- a/SYS.FormUI/AppUserControls/ucRoomList.cs +++ b/SYS.FormUI/AppUserControls/ucRoomList.cs @@ -373,6 +373,7 @@ namespace SYS.FormUI { if (lblMark.Text.Trim().IsNullOrEmpty()) { + LoadRoomInfo(); FrmRoomManager.ReadInfo(); } else @@ -404,6 +405,7 @@ namespace SYS.FormUI { if (lblMark.Text.Trim().IsNullOrEmpty()) { + LoadRoomInfo(); FrmRoomManager.ReadInfo(); } else @@ -424,6 +426,7 @@ namespace SYS.FormUI { if (lblMark.Text.Trim().IsNullOrEmpty()) { + LoadRoomInfo(); FrmRoomManager.ReadInfo(); } else @@ -444,6 +447,7 @@ namespace SYS.FormUI { if (lblMark.Text.Trim().IsNullOrEmpty()) { + LoadRoomInfo(); FrmRoomManager.ReadInfo(); } else @@ -464,6 +468,7 @@ namespace SYS.FormUI { if (lblMark.Text.Trim().IsNullOrEmpty()) { + LoadRoomInfo(); FrmRoomManager.ReadInfo(); } else @@ -484,6 +489,7 @@ namespace SYS.FormUI { if (lblMark.Text.Trim().IsNullOrEmpty()) { + LoadRoomInfo(); FrmRoomManager.ReadInfo(); } else @@ -504,6 +510,7 @@ namespace SYS.FormUI { if (lblMark.Text.Trim().IsNullOrEmpty()) { + LoadRoomInfo(); FrmRoomManager.ReadInfo(); } else @@ -524,6 +531,7 @@ namespace SYS.FormUI { if (lblMark.Text.Trim().IsNullOrEmpty()) { + LoadRoomInfo(); FrmRoomManager.ReadInfo(); } else @@ -544,6 +552,7 @@ namespace SYS.FormUI { if (lblMark.Text.Trim().IsNullOrEmpty()) { + LoadRoomInfo(); FrmRoomManager.ReadInfo(); } else diff --git a/SYS.FormUI/SYS.FormUI.csproj b/SYS.FormUI/SYS.FormUI.csproj index 0acec967953e830148980be0965c741a05250f4f..96f46370c2f0ef3aa7fd6f82ad9d59d86073f620 100644 --- a/SYS.FormUI/SYS.FormUI.csproj +++ b/SYS.FormUI/SYS.FormUI.csproj @@ -643,6 +643,9 @@ ucVipType.cs + + Always + PublicResXFileCodeGenerator Designer @@ -661,6 +664,18 @@ Designer Always + + Always + + + Always + + + Always + + + Always + SettingsSingleFileGenerator @@ -741,6 +756,219 @@ + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always +