diff --git a/EOM.Client.TopSkyHotelManagerSystem.sln b/EOM.Client.TopSkyHotelManagerSystem.sln index 15c3dd423c219ae1df2f982370a6001d180f5877..813fc0fb4d2220c2c690fd99f9b6390b6813a23e 100644 --- a/EOM.Client.TopSkyHotelManagerSystem.sln +++ b/EOM.Client.TopSkyHotelManagerSystem.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 17.4.33213.308 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SYS.FormUI", "SYS.FormUI\SYS.FormUI.csproj", "{8854DCB7-F2D7-4276-8D10-C7A124436145}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SYS.Library", "SYS.Library\SYS.Library.csproj", "{BCEA3E3C-E6D2-4210-95DD-42B461D5F22A}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SYS.Common", "SYS.Common\SYS.Common.csproj", "{65501AF6-C629-448A-847E-1BCD60665865}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Api", "Api", "{6A3E4936-8B95-49E0-842B-E002C0E024CE}" @@ -33,10 +31,6 @@ Global {8854DCB7-F2D7-4276-8D10-C7A124436145}.Debug|Any CPU.Build.0 = Debug|Any CPU {8854DCB7-F2D7-4276-8D10-C7A124436145}.Release|Any CPU.ActiveCfg = Release|Any CPU {8854DCB7-F2D7-4276-8D10-C7A124436145}.Release|Any CPU.Build.0 = Release|Any CPU - {BCEA3E3C-E6D2-4210-95DD-42B461D5F22A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BCEA3E3C-E6D2-4210-95DD-42B461D5F22A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BCEA3E3C-E6D2-4210-95DD-42B461D5F22A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCEA3E3C-E6D2-4210-95DD-42B461D5F22A}.Release|Any CPU.Build.0 = Release|Any CPU {65501AF6-C629-448A-847E-1BCD60665865}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {65501AF6-C629-448A-847E-1BCD60665865}.Debug|Any CPU.Build.0 = Debug|Any CPU {65501AF6-C629-448A-847E-1BCD60665865}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -67,7 +61,6 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {8854DCB7-F2D7-4276-8D10-C7A124436145} = {3B8902EC-CAB9-406A-AAF7-24DABD885AC0} - {BCEA3E3C-E6D2-4210-95DD-42B461D5F22A} = {3B8902EC-CAB9-406A-AAF7-24DABD885AC0} {65501AF6-C629-448A-847E-1BCD60665865} = {3B8902EC-CAB9-406A-AAF7-24DABD885AC0} {B55975AB-2C89-4C01-B107-D87FCA21A5E3} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} {8F5CF88A-1111-44CC-AFFA-4637EA10E191} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} diff --git a/SYS.Common/HttpHelper.cs b/SYS.Common/HttpHelper/HttpHelper.cs similarity index 95% rename from SYS.Common/HttpHelper.cs rename to SYS.Common/HttpHelper/HttpHelper.cs index efdc84cbc26c21e4098f90a5b538cc2d42bdda3d..88bffe292764f66812eef1d81da204d94614bd71 100644 --- a/SYS.Common/HttpHelper.cs +++ b/SYS.Common/HttpHelper/HttpHelper.cs @@ -31,24 +31,25 @@ namespace SYS.Common /// 数据库配置连接 /// public const string mysqlString = "server = localhost; user id = softuser; password = .; database = tshoteldb;"; - public const string pgsqlString = ""; + public const string pgsqlString = "qpyxeqMNN342V18jm3VN+iCeovxqQKgUHzzuYeGmV90jqMTPS5/bJLdDi3XQw4T820gCZ8prLDZICtlvqHJ9Uhn0uys9KYEP0iMuvoE5vsw3JtsetpU7O58CXkujZzMi·%*c>fd;d*d#b%ad;0 /// 照片文件配置URL /// - public const string baseUrl = ""; + public const string baseUrl = "RricsELofi55yQ4YD7ndbNP0T7c6nnhD8ASRT6/B35hjaWAdRSS0is7uQearyz60·e$>^b$?%^ff*;c?<$$ca?$#a%ddc;a0c"; + /// /// 上传照片URL /// - public const string postUrl = ""; + public const string postUrl = "qDxYOlHl/qx0D2DqQZ1fe6SR1JUnAdqex4VBmlwGoKZ2OJdf7qx9sxjnZbHlo/GM·%%*;#<%? /// WebApi URL(release) /// - //public const string apiUrl = ""; - - + public const string apiUrl = "ulHRxE/NeTZxXjKM/6TPCkFYEW5tmFtjsBTOOB9/9+dPY73NQWgTkgljnazdnnDE·c>b*^fe>%;*e;c;?a%fe$cfe - /// 管理员信息静态类 + /// 管理员信息静态类(后台管理员登入后的本地信息存储) /// public class AdminInfo { diff --git a/SYS.Common/LoginInfo.cs b/SYS.Common/LocalInfo/LoginInfo.cs similarity index 90% rename from SYS.Common/LoginInfo.cs rename to SYS.Common/LocalInfo/LoginInfo.cs index 44877553e253d082781624ddfddb1fec94be866f..3ef0e8c3ce758636945cd600f2f7765820b2ee60 100644 --- a/SYS.Common/LoginInfo.cs +++ b/SYS.Common/LocalInfo/LoginInfo.cs @@ -20,13 +20,16 @@ *OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE *SOFTWARE. * - *模块说明：登录信息静态类 + *模块说明：登录信息静态类(前台工作人员登入后的本地信息存储) */ using System.Linq; using System.Net; namespace SYS.Common { + /// + /// 登录信息静态类(前台工作人员登入后的本地信息存储) + /// public static class LoginInfo { /// diff --git a/SYS.Common/SYS.Common.csproj b/SYS.Common/SYS.Common.csproj index b9e64592bfa0ddfd9f87bc6006fa2bf07dc4137d..fc3ece3ced6e26873bc3aa275e3e76230373edda 100644 --- a/SYS.Common/SYS.Common.csproj +++ b/SYS.Common/SYS.Common.csproj @@ -84,13 +84,13 @@ - - - - + + + + - - + + diff --git a/SYS.Common/RecordHelper.cs b/SYS.Common/Util/RecordHelper.cs similarity index 100% rename from SYS.Common/RecordHelper.cs rename to SYS.Common/Util/RecordHelper.cs diff --git a/SYS.Common/Temp_OperationLog.cs b/SYS.Common/Util/Temp_OperationLog.cs similarity index 100% rename from SYS.Common/Temp_OperationLog.cs rename to SYS.Common/Util/Temp_OperationLog.cs diff --git a/SYS.Common/Util/Util.cs b/SYS.Common/Util/Util.cs index 2196802f94a6311d06d37dfbce30c718b4f4810a..7a43003f3f6ba05f0c7e928fcd0cff4b34890ddf 100644 --- a/SYS.Common/Util/Util.cs +++ b/SYS.Common/Util/Util.cs @@ -17,6 +17,11 @@ namespace SYS.Common private static Dictionary dic = new Dictionary(); + /// + /// 证件号码归属地查询 + /// + /// + /// public static card searchCode(string code) { Dictionary dic = new Dictionary(); diff --git a/SYS.Core/.gitignore b/SYS.Core/.gitignore deleted file mode 100644 index 6d5679c87e25eb547ff425a90a1da36fffca93ea..0000000000000000000000000000000000000000 --- a/SYS.Core/.gitignore +++ /dev/null @@ -1,365 +0,0 @@ -.vs -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates -*.cache - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -packages/ -x64/ -x86/ -[Ww][Ii][Nn]32/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# ASP.NET Scaffolding -ScaffoldingReadMe.txt - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Coverlet is a free, cross platform Code Coverage Tool -coverage*.json -coverage*.xml -coverage*.info - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ - -# Fody - auto-generated XML schema -FodyWeavers.xsd \ No newline at end of file diff --git a/SYS.Core/App.config b/SYS.Core/App.config deleted file mode 100644 index e00ad3947df312f356834e3a15044ab530ecbf3c..0000000000000000000000000000000000000000 --- a/SYS.Core/App.config +++ /dev/null @@ -1,41 +0,0 @@ - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/SYS.Core/Business/Cash/Cash.cs b/SYS.Core/Business/Cash/Cash.cs deleted file mode 100644 index f7a206a0d577a87b757060c6d1b8c2b1eb11af98..0000000000000000000000000000000000000000 --- a/SYS.Core/Business/Cash/Cash.cs +++ /dev/null @@ -1,91 +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; -namespace SYS.Core -{ - /// - /// 资产管理 - /// - [SqlSugar.SugarTable("cashinfo")] - public class Cash - { - /// - /// 资产编号 - /// - public string CashNo { get; set; } - /// - /// 资产名称 - /// - public string CashName { get; set; } - /// - /// 资产总值 - /// - public decimal CashPrice { get; set; } - /// - /// 资产总值描述 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string CashPriceStr { get; set; } - /// - /// 所属部门 - /// - public string CashClub { get; set; } - /// - /// 所属部门描述 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string DeptName { get; set; } - /// - /// 入库时间 - /// - public DateTime? CashTime { get; set; } - /// - /// 资产来源 - /// - public string CashSource { get; set; } - /// - /// 资产经办人 - /// - public string CashPerson { get; set; } - /// - /// 资产经办人 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string PersonName { get; set; } - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - - } -} diff --git a/SYS.Core/Business/Customer/Custo.cs b/SYS.Core/Business/Customer/Custo.cs deleted file mode 100644 index 9bb6ce1b14255197e3dbfd990d8ae5d985e6f152..0000000000000000000000000000000000000000 --- a/SYS.Core/Business/Customer/Custo.cs +++ /dev/null @@ -1,109 +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; - -namespace SYS.Core -{ - /// - /// 客户信息 - /// - [SqlSugar.SugarTable("customer")] - public class Custo - { - /// - /// 客户编号 - /// - [SqlSugar.SugarColumn(ColumnName = "custo_no", IsPrimaryKey = true)] - public string CustoNo { get; set; } - /// - /// 客户名称 - /// - [SqlSugar.SugarColumn(ColumnName = "custo_name", IsNullable = false)] - public string CustoName { get; set; } - /// - /// 客户性别 - /// - [SqlSugar.SugarColumn(ColumnName = "custo_sex", IsNullable = true)] - public int CustoSex { get; set; } - /// - /// 客户电话 - /// - [SqlSugar.SugarColumn(ColumnName = "custo_tel", IsNullable = false)] - public string CustoTel { get; set; } - /// - /// 证件类型 - /// - [SqlSugar.SugarColumn(ColumnName = "passport_type", IsNullable = false)] - public int PassportType { get; set; } - /// - /// 证件号码 - /// - [SqlSugar.SugarColumn(ColumnName = "passport_id", IsNullable = false)] - public string CustoID { get; set; } - /// - /// 居住地址 - /// - [SqlSugar.SugarColumn(ColumnName = "custo_address", IsNullable = true)] - public string CustoAdress { get; set; } - /// - /// 出生日期 - /// - [SqlSugar.SugarColumn(ColumnName = "custo_birth", IsNullable = true)] - public DateTime? CustoBirth { get; set; } - /// - /// 客户类型 - /// - [SqlSugar.SugarColumn(ColumnName = "custo_type", IsNullable = false)] - public int CustoType { get; set; } - /// - /// 客户类型 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string typeName { get; set; } - /// - /// 证件类型 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string PassportName { get; set; } - /// - /// 性别 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string SexName { get; set; } - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - - } -} diff --git a/SYS.Core/Business/Customer/CustoSpend.cs b/SYS.Core/Business/Customer/CustoSpend.cs deleted file mode 100644 index f8e05e8902e406f2b078696d6db6399735ae5759..0000000000000000000000000000000000000000 --- a/SYS.Core/Business/Customer/CustoSpend.cs +++ /dev/null @@ -1,42 +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. - * - *模块说明：酒店盈利情况类 - */ -namespace SYS.Core -{ - /// - /// 酒店盈利情况 - /// - public class CustoSpend - { - /// - /// 年 - /// - public string Years { get; set; } - /// - /// 总金额 - /// - public decimal Money { get; set; } - - } -} diff --git a/SYS.Core/Business/Customer/CustoType.cs b/SYS.Core/Business/Customer/CustoType.cs deleted file mode 100644 index 31aa232a6424dba3a4590fcf53f57920dac1822e..0000000000000000000000000000000000000000 --- a/SYS.Core/Business/Customer/CustoType.cs +++ /dev/null @@ -1,56 +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; - -namespace SYS.Core -{ - /// - /// 客户类型 - /// - [SqlSugar.SugarTable("usertype")] - public class CustoType - { - /// - /// 客户类型 - /// - public int UserType { get; set; } - /// - /// 类型名字 - /// - public string TypeName { get; set; } - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - } -} diff --git a/SYS.Core/Business/Customer/PassPortType.cs b/SYS.Core/Business/Customer/PassPortType.cs deleted file mode 100644 index 464ddaee8f4861a7a403b933d3129e04d17e8d5f..0000000000000000000000000000000000000000 --- a/SYS.Core/Business/Customer/PassPortType.cs +++ /dev/null @@ -1,61 +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.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Core -{ - /// - /// 证件类型 - /// - [SqlSugar.SugarTable("passporttype")] - public class PassPortType - { - /// - /// 证件类型 - /// - public int PassportId { get; set; } - - /// - /// 证件名称 - /// - public string PassportName { get; set; } - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - } -} diff --git a/SYS.Core/Business/Customer/SexType.cs b/SYS.Core/Business/Customer/SexType.cs deleted file mode 100644 index 2c99ccd2b89f4b9524afe846dc6279d57a914743..0000000000000000000000000000000000000000 --- a/SYS.Core/Business/Customer/SexType.cs +++ /dev/null @@ -1,62 +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.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Core -{ - /// - /// 性别 - /// - [SqlSugar.SugarTable("sextype")] - public class SexType - { - /// - /// 性别ID - /// - public int sexId { get; set; } - - /// - /// 性别名称 - /// - public string sexName { get; set; } - - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - } -} diff --git a/SYS.Core/Business/Fonts/Fonts.cs b/SYS.Core/Business/Fonts/Fonts.cs deleted file mode 100644 index c346c907a82ebbbd9b0b37cb379136de21ce574f..0000000000000000000000000000000000000000 --- a/SYS.Core/Business/Fonts/Fonts.cs +++ /dev/null @@ -1,43 +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. - * - *模块说明：宣传联动类 - */ -namespace SYS.Core -{ - /// - /// 酒店宣传联动内容 - /// - [SqlSugar.SugarTable("fonts")] - public class Fonts - { - /// - /// 宣传内容编号 - /// - public int FontsId { get; set; } - - /// - /// 宣传内容 - /// - public string FontsMess { get; set; } - } -} diff --git a/SYS.Core/Business/Reser/Reser.cs b/SYS.Core/Business/Reser/Reser.cs deleted file mode 100644 index 91471114d27ce98d5e379a53a315e3b5433435c1..0000000000000000000000000000000000000000 --- a/SYS.Core/Business/Reser/Reser.cs +++ /dev/null @@ -1,77 +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; - -namespace SYS.Core -{ - /// - /// 预约列表 - /// - [SqlSugar.SugarTable("reser")] - public class Reser - { - /// - /// 预约编号 - /// - public string ReserId { get; set; } - /// - /// 客户名称 - /// - public string CustoName { get; set; } - /// - /// 预约电话 - /// - public string CustoTel { get; set; } - /// - /// 预约渠道 - /// - public string ReserWay { get; set; } - /// - /// 预约房号 - /// - public string ReserRoom { get; set; } - /// - /// 预约起始 - /// - public DateTime? ReserDate { get; set; } - /// - /// 预约止日 - /// - public DateTime? ReserEndDay { get; set; } - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - - } -} diff --git a/SYS.Core/Business/Room/Room.cs b/SYS.Core/Business/Room/Room.cs deleted file mode 100644 index cedd2d5ead919ac7c4896ec2814821fc3be35429..0000000000000000000000000000000000000000 --- a/SYS.Core/Business/Room/Room.cs +++ /dev/null @@ -1,120 +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.ComponentModel.DataAnnotations.Schema; - -namespace SYS.Core -{ - /// - /// 房间实体类 - /// - [SqlSugar.SugarTable("room")] - public class Room - { - /// - /// 房间编号 - /// - [SqlSugar.SugarColumn(ColumnName = "room_no", IsPrimaryKey = true)] - public string RoomNo { get; set; } - /// - /// 房间类型 - /// - [SqlSugar.SugarColumn(ColumnName = "room_type")] - public int RoomType { get; set; } - /// - /// 客户编号 - /// - [SqlSugar.SugarColumn(ColumnName = "custo_no")] - public string CustoNo { get; set; } - /// - /// 客户姓名 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string CustoName { get; set; } - /// - /// 最后一次入住时间 - /// - [SqlSugar.SugarColumn(ColumnName = "check_in_time",IsNullable = true)] - public DateTime? CheckTime { get; set; } - /// - /// 最后一次退房时间 - /// - [SqlSugar.SugarColumn(ColumnName = "check_out_time", IsNullable = true)] - public DateTime? CheckOutTime { get; set; } - /// - /// 房间状态ID - /// - [SqlSugar.SugarColumn(ColumnName = "room_state_id")] - public int RoomStateId { get; set; } - /// - /// 房间状态 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string RoomState { get; set; } - /// - /// 房间单价 - /// - [SqlSugar.SugarColumn(ColumnName = "room_rent")] - public decimal RoomMoney { get; set; } - /// - /// 房间押金 - /// - [SqlSugar.SugarColumn(ColumnName = "room_deposit")] - public decimal RoomDeposit { get; set; } - /// - /// 房间位置 - /// - [SqlSugar.SugarColumn(ColumnName = "room_position")] - public string RoomPosition { get; set; } - /// - /// 客户类型名称 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string typeName { get; set; } - /// - /// 房间名称 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string RoomName { get; set; } - /// - /// 最后一次入住时间 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string CheckTimeFormat { get; set; } - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - - } -} diff --git a/SYS.Core/Business/Room/RoomState.cs b/SYS.Core/Business/Room/RoomState.cs deleted file mode 100644 index 5e8da763e3c1172b1400b8a12170ef931e4badaf..0000000000000000000000000000000000000000 --- a/SYS.Core/Business/Room/RoomState.cs +++ /dev/null @@ -1,57 +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; - -namespace SYS.Core -{ - /// - /// 房间状态 - /// - [SqlSugar.SugarTable("roomstate")] - public class RoomState - { - /// - /// 房间状态编号 - /// - public int RoomStateId { get; set; } - /// - /// 房间状态 - /// - [SqlSugar.SugarColumn(ColumnName = "RoomState")] - public string RoomStateName { get; set; } - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - } -} diff --git a/SYS.Core/Business/Room/RoomType.cs b/SYS.Core/Business/Room/RoomType.cs deleted file mode 100644 index 52608b8524ee77004e63c5ac0539de1767d930a3..0000000000000000000000000000000000000000 --- a/SYS.Core/Business/Room/RoomType.cs +++ /dev/null @@ -1,81 +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; - -namespace SYS.Core -{ - /// - /// 房间类型 - /// - [SqlSugar.SugarTable("roomtype")] - public class RoomType - { - /// - /// 类型编号 - /// - [SqlSugar.SugarColumn(ColumnName = "RoomType")] - public int Roomtype { get; set; } - /// - /// 房间类型 - /// - public string RoomName { get; set; } - - /// - /// 房间租金 - /// - [SqlSugar.SugarColumn(ColumnName = "room_rent", ColumnDataType = "decimal")] - public decimal RoomRent { get; set; } - - /// - /// 房间押金 - /// - [SqlSugar.SugarColumn(ColumnName = "room_deposit")] - public decimal RoomDeposit { get; set; } - - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - } - - - public enum RT - { - 标准单人间 = 0, - 标准双人间 = 1, - 豪华单人间 = 2, - 豪华双人间 = 3, - 情侣套房 = 4, - 总统套房 = 5, - } -} diff --git a/SYS.Core/Business/Sellthing/SellThing.cs b/SYS.Core/Business/Sellthing/SellThing.cs deleted file mode 100644 index 52ab2e487b7b61fb5143c76e4f8bf0ca2ea1b32e..0000000000000000000000000000000000000000 --- a/SYS.Core/Business/Sellthing/SellThing.cs +++ /dev/null @@ -1,74 +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.ComponentModel.DataAnnotations.Schema; - -namespace SYS.Core -{ - /// - /// 商品信息 - /// - [SqlSugar.SugarTable("sellthing")] - public class SellThing - { - /// - /// 商品编号 - /// - public string SellNo { get; set; } - /// - /// 商品名称 - /// - public string SellName { get; set; } - /// - /// 商品价格 - /// - public decimal SellPrice { get; set; } - /// - /// 商品价格描述 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string SellPriceStr { get; set; } - /// - /// 规格型号 - /// - public string format { get; set; } - /// - /// 库存 - /// - public decimal Stock { get; set; } - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - } -} diff --git a/SYS.Core/Business/Spend/Spend.cs b/SYS.Core/Business/Spend/Spend.cs deleted file mode 100644 index 1c4cb6125375c5ff4f0cafad791902bbbe67170a..0000000000000000000000000000000000000000 --- a/SYS.Core/Business/Spend/Spend.cs +++ /dev/null @@ -1,96 +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; - -namespace SYS.Core -{ - /// - /// 消费信息 - /// - [SqlSugar.SugarTable("custospend")] - public class Spend - { - /// - /// 房间编号 - /// - public string RoomNo { get; set; } - /// - /// 客户编号 - /// - public string CustoNo { get; set; } - /// - /// 商品名称 - /// - public string SpendName { get; set; } - /// - /// 消费数量 - /// - public int SpendAmount { get; set; } - /// - /// 商品单价 - /// - public decimal SpendPrice { get; set; } - /// - /// 商品单价描述 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string SpendPriceStr { get; set; } - /// - /// 消费金额 - /// - public decimal SpendMoney { get; set; } - /// - /// 消费金额描述 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string SpendMoneyStr { get; set; } - /// - /// 消费时间 - /// - public DateTime? SpendTime { get; set; } - /// - /// 结算状态 - /// - public string MoneyState { get; set; } - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - - /// - /// 结算状态描述 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string SpendStateNm { get; set; } - } -} diff --git a/SYS.Core/Business/Spend/SpendConsts.cs b/SYS.Core/Business/Spend/SpendConsts.cs deleted file mode 100644 index 603e7215e4a349e4e8d5d67a845b9bc2b9d8d8d9..0000000000000000000000000000000000000000 --- a/SYS.Core/Business/Spend/SpendConsts.cs +++ /dev/null @@ -1,48 +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.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Core -{ - /// - /// 结算状态常量 - /// - public class SpendConsts - { - /// - /// 已结算状态常量 - /// - public const string Settled = "Settled"; - - /// - /// 未结算状态常量 - /// - public const string UnSettle = "UnSettle"; - } -} diff --git a/SYS.Core/Business/Wti/Wti.cs b/SYS.Core/Business/Wti/Wti.cs deleted file mode 100644 index 7ff12f2dca8e6420e7f3180e24a5fbdb06515b34..0000000000000000000000000000000000000000 --- a/SYS.Core/Business/Wti/Wti.cs +++ /dev/null @@ -1,91 +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; - -namespace SYS.Core -{ - /// - /// 水电信息 - /// - [SqlSugar.SugarTable("wtinfo")] - public class Wti - { - /// - /// 信息编号 - /// - [SqlSugar.SugarColumn(ColumnName = "WtiNo",IsIdentity =true,IsPrimaryKey =true)] - public int WtiNo { get; set; } - /// - /// 房间编号 - /// - [SqlSugar.SugarColumn(ColumnName = "RoomNo")] - public string RoomNo { get; set; } - /// - /// 开始使用时间 - /// - [SqlSugar.SugarColumn(ColumnName = "UseDate")] - public DateTime? UseDate { get; set; } - /// - /// 结束使用时间 - /// - [SqlSugar.SugarColumn(ColumnName = "EndDate")] - public DateTime? EndDate { get; set; } - /// - /// 水费 - /// - [SqlSugar.SugarColumn(ColumnName = "WaterUse")] - public decimal WaterUse { get; set; } - /// - /// 电费 - /// - [SqlSugar.SugarColumn(ColumnName = "PowerUse")] - public decimal PowerUse { get; set; } - /// - /// 记录员 - /// - [SqlSugar.SugarColumn(ColumnName = "Record")] - public string Record { get; set; } - /// - /// 客户编号 - /// - [SqlSugar.SugarColumn(ColumnName = "CustoNo")] - public string CustoNo { get; set; } - /// - /// 删除标记 - /// - [SqlSugar.SugarColumn(ColumnName = "delete_mk")] - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - - - } -} diff --git a/SYS.Core/IRepository.cs b/SYS.Core/IRepository.cs deleted file mode 100644 index b7fbd285d3e47c48634b5def2e1140e3482b7a31..0000000000000000000000000000000000000000 --- a/SYS.Core/IRepository.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data.Common; -using System.Linq; -using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Common -{ - public interface IRepository where T : class - { - int ExecuteSql(string sql, params DbParameter[] pars); - - List ExecuteQuery(string sql, params DbParameter[] pars); - - int Add(T entity, bool isLog = true); - - int Add(IEnumerable entities, bool isLog = true); - - int Delete(T entity, bool isLog = true); - - int Delete(IEnumerable entities, bool isLog = true); - - int Delete(Expression> where, bool isLog = true); - - int Update(T entity, bool isLog = true); - - int Update(T entity, List>> ignoreProperties, bool isLog = true); - - int Update(T entity, Expression> where, List proNames, bool isLog = true); - - int Update(T entity, Expression> where, List>> proNames, bool isLog = true); - - int Update(Expression> where, Action action, bool isLog = true); - - T GetOne(Expression> where); - - List GetList(Expression> where = null); - - int GetCount(Expression> where = null); - - //List GetList(Expression> where, OrderBy orderBy); - - //List GetPageList(Expression> where, OrderBy orderBy, int pageIndex = 0, int pageSize = 0); - - //List GetPageList(ref int rowCount, Expression> where, OrderBy orderBy, int pageIndex = 0, int pageSize = 0); - - //List GetPageList(Expression> where, OrderBy orderBy, T2 pageDto) where T2 : IBaseDto; - - //List GetPageList(ref int rowCount, Expression> where, OrderBy orderBy, T2 pageDto) where T2 : IBaseDto; - } -} diff --git a/SYS.Core/Properties/AssemblyInfo.cs b/SYS.Core/Properties/AssemblyInfo.cs deleted file mode 100644 index 0fa55118378b1c6ba954b82f42529e953001ab91..0000000000000000000000000000000000000000 --- a/SYS.Core/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 有关程序集的一般信息由以下 -// 控制。更改这些特性值可修改 -// 与程序集关联的信息。 -[assembly: AssemblyTitle("SYS.Core")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("java-and-net")] -[assembly: AssemblyProduct("SYS.Core")] -[assembly: AssemblyCopyright("Copyright © 2020 java-and-net")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// 将 ComVisible 设置为 false 会使此程序集中的类型 -//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 -//请将此类型的 ComVisible 特性设置为 true。 -[assembly: ComVisible(false)] - -// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID -[assembly: Guid("cd039d0f-bd50-4fbf-b9cd-cdfab25c7dfa")] - -// 程序集的版本信息由下列四个值组成: -// -// 主版本 -// 次版本 -// 生成号 -// 修订号 -// -//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 -//通过使用 "*"，如下所示: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.4.0.0")] -[assembly: AssemblyFileVersion("1.4.0.0")] diff --git a/SYS.Core/Resources/GFont.otf b/SYS.Core/Resources/GFont.otf deleted file mode 100644 index 741201b053b3af12909569d24998691a7b961874..0000000000000000000000000000000000000000 Binary files a/SYS.Core/Resources/GFont.otf and /dev/null differ diff --git a/SYS.Core/SYS.Core.csproj b/SYS.Core/SYS.Core.csproj deleted file mode 100644 index 3b68a15dacc49b2212dd83effe8803201a952d9a..0000000000000000000000000000000000000000 --- a/SYS.Core/SYS.Core.csproj +++ /dev/null @@ -1,144 +0,0 @@ - - - - - Debug - AnyCPU - {CD039D0F-BD50-4FBF-B9CD-CDFAB25C7DFA} - Library - Properties - SYS.Core - SYS.Core - v4.7.1 - 512 - true - SAK - SAK - SAK - SAK - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - x64 - bin\Debug\SYS.Core.xml - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - - - - - - - bitbug_favicon %281%29.ico - - - - False - ..\..\..\..\JVN.TopSkyHotelManagerSystem\SYS.Library\MySql.Data.dll - - - False - ..\packages\SqlSugar.5.0.2\lib\SqlSugar.dll - - - - ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll - - - - - - - ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll - - - - ..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll - - - ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {65501af6-c629-448a-847e-1bcd60665865} - SYS.Common - - - - - - - - \ No newline at end of file diff --git a/SYS.Core/Sys/NavBar/NavBar.cs b/SYS.Core/Sys/NavBar/NavBar.cs deleted file mode 100644 index c17053cbee1a68fb69a876a253706238b82224e4..0000000000000000000000000000000000000000 --- a/SYS.Core/Sys/NavBar/NavBar.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Core -{ - /// - /// 导航控件实体类 - /// - [SqlSugar.SugarTable("nav_bar")] - public class NavBar - { - /// - /// 导航控件ID - /// - [SqlSugar.SugarColumn(IsIdentity =true)] - public int nav_id { get; set; } - /// - /// 导航控件名称 - /// - public string nav_name { get; set; } - /// - /// 导航控件排序 - /// - public int nav_or { get; set; } - /// - /// 导航控件图片 - /// - public string nav_pic { get; set; } - /// - /// 导航控件事件 - /// - public string nav_event { get; set; } - /// - /// 导航控件事件 - /// - public int margin_left { get; set; } - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - } -} diff --git a/SYS.Core/Util/ApplicationVersion.cs b/SYS.Core/Util/ApplicationVersion.cs deleted file mode 100644 index 28146d3a6f8993ab144fe1c2fe38631d7f9b1683..0000000000000000000000000000000000000000 --- a/SYS.Core/Util/ApplicationVersion.cs +++ /dev/null @@ -1,28 +0,0 @@ -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Core -{ - /// - /// 应用版本 - /// - [SqlSugar.SugarTable("applicationversion")] - public class Applicationversion - { - /// - /// 流水号 - /// - [SugarColumn(ColumnName = "base_versionId")]//数据库是自增才配自增 - public int base_versionId { get; set; } - - /// - /// 版本号 - /// - [SugarColumn(ColumnName = "base_version")]//数据库是自增才配自增 - public string base_version { get; set; } - } -} diff --git a/SYS.Core/Util/Cardcodes.cs b/SYS.Core/Util/Cardcodes.cs deleted file mode 100644 index 580713873247fdcbe26db835973be55d64b2574f..0000000000000000000000000000000000000000 --- a/SYS.Core/Util/Cardcodes.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Core -{ - /// - /// 卡片代码 - /// - [SqlSugar.SugarTable("cardcodes")] - public class Cardcodes - { - /// - /// 卡片代码 - /// - public Cardcodes() - { - } - - private System.Int64 _id; - /// - /// 编号 - /// - public System.Int64 id { get { return this._id; } set { this._id = value; } } - - private System.String _Province; - /// - /// 省份 - /// - public System.String Province { get { return this._Province; } set { this._Province = value; } } - - private System.String _City; - /// - /// 城市 - /// - public System.String City { get { return this._City; } set { this._City = value; } } - - private System.String _District; - /// - /// 地区 - /// - public System.String District { get { return this._District; } set { this._District = value; } } - - private System.String _bm; - /// - /// 地区识别码 - /// - public System.String bm { get { return this._bm; } set { this._bm = value; } } - } -} diff --git a/SYS.Core/Worker/GBType.cs b/SYS.Core/Worker/GBType.cs deleted file mode 100644 index 786fa9739f77623166630d6c1997580f372a4c3f..0000000000000000000000000000000000000000 --- a/SYS.Core/Worker/GBType.cs +++ /dev/null @@ -1,58 +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; - -namespace SYS.Application -{ - /// - /// 奖惩类型实体类 - /// - [SqlSugar.SugarTable("gbtype")] - public class GBType - { - /// - /// 奖惩编号 - /// - public int GBTypeId { get; set; } - - /// - /// 奖惩名称 - /// - public string GBName { get; set; } - - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - } -} \ No newline at end of file diff --git a/SYS.Core/Worker/Worker.cs b/SYS.Core/Worker/Worker.cs deleted file mode 100644 index 379d402b9dba50047e1dc1c4da8f63be54db3154..0000000000000000000000000000000000000000 --- a/SYS.Core/Worker/Worker.cs +++ /dev/null @@ -1,146 +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; - -namespace SYS.Core -{ - /// - /// 员工信息 - /// - [SqlSugar.SugarTable("worker")] - public class Worker - { - /// - /// 员工账号/工号 - /// - [SqlSugar.SugarColumn(ColumnName = "WorkerId")] - public string WorkerId { get; set; } - /// - /// 员工姓名 - /// - [SqlSugar.SugarColumn(ColumnName = "WorkerName")] - public string WorkerName { get; set; } - /// - /// 出生日期 - /// - [SqlSugar.SugarColumn(ColumnName = "WorkerBirthday")] - public DateTime? WorkerBirthday { get; set; } - /// - /// 员工性别 - /// - [SqlSugar.SugarColumn(ColumnName = "WorkerSex")] - public int WorkerSex { get; set; } - /// - /// 员工性别(名称描述) - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string WorkerSexName { get; set; } - /// - /// 民族类型 - /// - [SqlSugar.SugarColumn(ColumnName = "WorkerNation")] - public string WorkerNation { get; set; } - /// - /// 民族名称 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string NationName { get; set; } - /// - /// 员工电话 - /// - [SqlSugar.SugarColumn(ColumnName = "WorkerTel")] - public string WorkerTel { get; set; } - /// - /// 所属部门 - /// - [SqlSugar.SugarColumn(ColumnName = "WorkerClub")] - public string WorkerClub { get; set; } - /// - /// 部门名称 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string ClubName { get; set; } - /// - /// 居住地址 - /// - [SqlSugar.SugarColumn(ColumnName = "WorkerAddress")] - public string WorkerAddress { get; set; } - /// - /// 员工职位 - /// - [SqlSugar.SugarColumn(ColumnName = "WorkerPosition")] - public string WorkerPosition { get; set; } - /// - /// 职位名称 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string PositionName { get; set; } - /// - /// 证件号码 - /// - [SqlSugar.SugarColumn(ColumnName = "CardID")] - public string CardId { get; set; } - /// - /// 员工密码 - /// - [SqlSugar.SugarColumn(IsOnlyIgnoreInsert = true)] - public string WorkerPwd { get; set; } - /// - /// 员工入职时间 - /// - public DateTime? WorkerTime { get; set; } - /// - /// 员工面貌 - /// - public string WorkerFace { get; set; } - /// - /// 群众面貌描述 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string FaceName { get; set; } - /// - /// 教育程度 - /// - public string WorkerEducation { get; set; } - /// - /// 教育程度名称 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string EducationName { get; set; } - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - [SqlSugar.SugarColumn(IsOnlyIgnoreUpdate = true)] - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - } -} diff --git a/SYS.Core/Worker/WorkerCheck.cs b/SYS.Core/Worker/WorkerCheck.cs deleted file mode 100644 index a644a7a9dc762cacd189607b407a39d6cdc39fb0..0000000000000000000000000000000000000000 --- a/SYS.Core/Worker/WorkerCheck.cs +++ /dev/null @@ -1,76 +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; - -namespace SYS.Core -{ - /// - /// 员工打卡考勤 - /// - [SqlSugar.SugarTable("workercheck")] - public class WorkerCheck - { - /// - /// 编号 - /// - [SqlSugar.SugarColumn(IsOnlyIgnoreInsert = true, IsOnlyIgnoreUpdate = true)] - public int Id { get; set; } - /// - /// 工号 - /// - public string WorkerNo { get; set; } - /// - /// 打卡时间 - /// - public DateTime? CheckTime { get; set; } - /// - /// 打卡方式 - /// - public string CheckWay { get; set; } - /// - /// 打卡状态 - /// - public int CheckState { get; set; } - - /// - /// 打卡状态 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string CheckStateNm { get; set; } - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - - } -} diff --git a/SYS.Core/Worker/WorkerGoodBad.cs b/SYS.Core/Worker/WorkerGoodBad.cs deleted file mode 100644 index d5c5747dee63d8c640a06c323f5e12079bc3adf5..0000000000000000000000000000000000000000 --- a/SYS.Core/Worker/WorkerGoodBad.cs +++ /dev/null @@ -1,87 +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.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Core -{ - /// - /// 员工奖罚 - /// - [SqlSugar.SugarTable("workergoodbad")] - public class WorkerGoodBad - { - /// - /// 编号 - /// - [SqlSugar.SugarColumn(IsOnlyIgnoreInsert = true, IsOnlyIgnoreUpdate = true)] - public int Id { get; set; } - /// - /// 工号 - /// - public string WorkNo { get; set; } - /// - /// 奖惩信息 - /// - public string GBInfo { get; set; } - /// - /// 奖惩类型 - /// - public int GBType { get; set; } - /// - /// 奖惩操作人 - /// - public string GBOperation { get; set; } - /// - /// 奖惩操作人 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string OperationName { get; set; } - /// - /// 奖惩时间 - /// - public DateTime? GBTime { get; set; } - /// - /// 类型名称 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string TypeName { get; set; } - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - } -} diff --git a/SYS.Core/Worker/WorkerHistory.cs b/SYS.Core/Worker/WorkerHistory.cs deleted file mode 100644 index e896e2bcad1bf078768c4aed0620c7da1469e90b..0000000000000000000000000000000000000000 --- a/SYS.Core/Worker/WorkerHistory.cs +++ /dev/null @@ -1,73 +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; - -namespace SYS.Core -{ - /// - /// 员工履历 - /// - [SqlSugar.SugarTable("workerhistory")] - public class WorkerHistory - { - /// - /// 编号 - /// - [SqlSugar.SugarColumn(IsOnlyIgnoreInsert = true,IsOnlyIgnoreUpdate = true)] - public int Id { get; set; } - /// - /// 工号 - /// - public string WorkerId { get; set; } - /// - /// 开始时间 - /// - public DateTime? StartDate { get; set; } - /// - /// 结束时间 - /// - public DateTime? EndDate { get; set; } - /// - /// 职位 - /// - public string Position { get; set; } - /// - /// 公司 - /// - public string Company { get; set; } - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - } -} diff --git a/SYS.Core/Worker/WorkerPic.cs b/SYS.Core/Worker/WorkerPic.cs deleted file mode 100644 index 9b7c9a92ac39d00f500bc3a65d975c43042565c3..0000000000000000000000000000000000000000 --- a/SYS.Core/Worker/WorkerPic.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Core -{ - /// - /// 员工照片 - /// - [SqlSugar.SugarTable("workerpic")] - public class WorkerPic - { - /// - /// 自增长流水号 - /// - [SqlSugar.SugarColumn(IsIdentity = true,ColumnName = "Id",IsPrimaryKey = true)] - public int Id { get; set; } - /// - /// 工号 - /// - [SqlSugar.SugarColumn(ColumnName = "WorkerId")] - public string WorkerId { get; set; } - - /// - /// 照片路径 - /// - [SqlSugar.SugarColumn(ColumnName = "Pic")] - public string Pic { get; set; } - } -} diff --git a/SYS.Core/Zero/Admin.cs b/SYS.Core/Zero/Admin.cs deleted file mode 100644 index 80752155e85197b185e6af1c031b3b6cdbf27eb1..0000000000000000000000000000000000000000 --- a/SYS.Core/Zero/Admin.cs +++ /dev/null @@ -1,109 +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. - * - *模块说明：管理员实体类 - */ -namespace SYS.Core -{ - /// - /// 管理员实体类 - /// - [SqlSugar.SugarTable("admininfo")] - public class Admin - { - /// - /// 构造函数 - /// - public Admin() - { - } - - /// - /// 编号 - /// - public int Id { get; set; } - - private string _AdminAccount; - /// - /// 管理员账号 - /// - [SqlSugar.SugarColumn(IsPrimaryKey = true)] - public string AdminAccount { get { return this._AdminAccount; } set { this._AdminAccount = value; } } - - private string _AdminPassword; - /// - /// 管理员密码 - /// - public string AdminPassword { get { return this._AdminPassword; } set { this._AdminPassword = value; } } - - private string _AdminType; - /// - /// 管理员类型 - /// - public string AdminType { get { return this._AdminType; } set { this._AdminType = value; } } - - private string _AdminName; - /// - /// 管理员名称 - /// - public string AdminName { get { return this._AdminName; } set { this._AdminName = value; } } - - private System.Int32 _IsAdmin; - /// - /// 是否为超级管理员 - /// - public System.Int32 IsAdmin { get { return this._IsAdmin; } set { this._IsAdmin = value; } } - - private System.Int32 _DeleteMk; - /// - /// 删除标记 - /// - public System.Int32 DeleteMk { get { return this._DeleteMk; } set { this._DeleteMk = value; } } - - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - /// - /// 管理员类型描述 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string IsAdminNm { get; set; } - - /// - /// 管理员类型 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string TypeName { get; set; } - - /// - /// 删除标记描述 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string DeleteNm { get; set; } - - } -} diff --git a/SYS.Core/Zero/AdminType.cs b/SYS.Core/Zero/AdminType.cs deleted file mode 100644 index 927446636b30c6e7160f848b0bc19a1c0408e0bd..0000000000000000000000000000000000000000 --- a/SYS.Core/Zero/AdminType.cs +++ /dev/null @@ -1,68 +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.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Core -{ - /// - /// 管理员类型 - /// - [SqlSugar.SugarTable("admintype")] - public class AdminType - { - /// - /// 编号 - /// - public int Id { get; set; } - - /// - /// 管理员类型 - /// - public string type_id { get; set; } - - /// - /// 类型名称 - /// - public string type_name { get; set; } - - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - } -} diff --git a/SYS.Core/Zero/Base.cs b/SYS.Core/Zero/Base.cs deleted file mode 100644 index bc79d0e07a98a7a49afcc573219466d8822ebb8c..0000000000000000000000000000000000000000 --- a/SYS.Core/Zero/Base.cs +++ /dev/null @@ -1,46 +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.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Core -{ - [SqlSugar.SugarTable("base")] - public class Base - { - /// - /// 地址编号 - /// - public int url_no { get; set; } - - /// - /// 地址 - /// - public string url_addr { get; set; } - } -} diff --git a/SYS.Core/Zero/CheckInfo.cs b/SYS.Core/Zero/CheckInfo.cs deleted file mode 100644 index ef98c69b92fa40ed707134fe7732b8e822db618b..0000000000000000000000000000000000000000 --- a/SYS.Core/Zero/CheckInfo.cs +++ /dev/null @@ -1,77 +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; - -namespace SYS.Core -{ - /// - /// 监管统计 - /// - [SqlSugar.SugarTable("checkinfo")] - public class CheckInfo - { - /// - /// 监管统计编号 - /// - public string CheckNo { get; set; } - /// - /// 监管部门 - /// - public string CheckClub { get; set; } - /// - /// 监管进度 - /// - public string CheckProgres { get; set; } - /// - /// - /// - public string CheckCash { get; set; } - /// - /// - /// - public int CheckScore { get; set; } - /// - /// - /// - public string CheckPerson { get; set; } - /// - /// - /// - public string CheckAdvice { get; set; } - - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - } -} diff --git a/SYS.Core/Zero/Dept.cs b/SYS.Core/Zero/Dept.cs deleted file mode 100644 index 4cf47ee372d92a8f88d00a30d739fc186409bf1f..0000000000000000000000000000000000000000 --- a/SYS.Core/Zero/Dept.cs +++ /dev/null @@ -1,87 +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.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Core -{ - /// - /// 部门表 - /// - [SqlSugar.SugarTable("dept")] - public class Dept - { - /// - /// 部门编号 - /// - public string dept_no { get; set; } - /// - /// 部门名称 - /// - public string dept_name { get; set; } - /// - /// 部门描述 - /// - public string dept_desc { get; set; } - /// - /// 创建时间(部门) - /// - public DateTime? dept_date { get; set; } - /// - /// 部门主管 - /// - public string dept_leader { get; set; } - /// - /// 部门主管 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string leader_name { get; set; } - /// - /// 上级部门 - /// - public string dept_parent { get; set; } - /// - /// 上级部门 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string parent_name { get; set; } - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - - } -} diff --git a/SYS.Core/Zero/Education.cs b/SYS.Core/Zero/Education.cs deleted file mode 100644 index 9a4bf0f3d5eb75bf55f63a2b81fa98cf0fb8922c..0000000000000000000000000000000000000000 --- a/SYS.Core/Zero/Education.cs +++ /dev/null @@ -1,61 +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.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Core -{ - /// - /// 学历 - /// - [SqlSugar.SugarTable("education")] - public class Education - { - /// - /// 学历编号 - /// - public string education_no { get; set; } - /// - /// 学历名称 - /// - public string education_name { get; set; } - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - - } -} diff --git a/SYS.Core/Zero/Module.cs b/SYS.Core/Zero/Module.cs deleted file mode 100644 index bad32cacb2eea20645050b518ef0e3a1846e8729..0000000000000000000000000000000000000000 --- a/SYS.Core/Zero/Module.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Core -{ - /// - /// 模块实体 - /// - [SqlSugar.SugarTable("module")] - public class Module - { - /// - /// 模块ID - /// - public int module_id { get; set; } - - /// - /// 模块名称 - /// - public string module_name { get; set; } - - /// - /// 模块描述 - /// - public string module_desc { get; set; } - - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - } -} diff --git a/SYS.Core/Zero/ModuleConsts.cs b/SYS.Core/Zero/ModuleConsts.cs deleted file mode 100644 index 1681a4cee0ee1e068a124cf383f6420c8eed72b6..0000000000000000000000000000000000000000 --- a/SYS.Core/Zero/ModuleConsts.cs +++ /dev/null @@ -1,79 +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.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Core -{ - /// - /// 系统模块常量类 - /// - public class ModuleConsts - { - /// - /// 基础信息 - /// - public const string BaseInfo = "BaseInfo"; - /// - /// 财务信息 - /// - public const string CashInfo = "CashInfo"; - /// - /// 水电管理 - /// - public const string WtiInfo = "WtiInfo"; - /// - /// 监管统计 - /// - public const string CheckInfo = "CheckInfo"; - /// - /// 客房管理 - /// - public const string RoomManager = "RoomManager"; - /// - /// 客户管理 - /// - public const string CustomerManager = "CustomerManager"; - /// - /// 人事管理 - /// - public const string HumanResourcesManager = "HumanResourcesManager"; - /// - /// 物资管理 - /// - public const string MaterialManager = "MaterialManager"; - /// - /// 员工操作日志 - /// - public const string OperationLogManager = "OperationLogManager"; - /// - /// 系统管理 - /// - public const string AdminManager = "AdminManager"; - } -} diff --git a/SYS.Core/Zero/ModuleZero.cs b/SYS.Core/Zero/ModuleZero.cs deleted file mode 100644 index 3b18031f707e2bbc4b60945e6c3753ebf1e10eb8..0000000000000000000000000000000000000000 --- a/SYS.Core/Zero/ModuleZero.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Core -{ - - /// - /// 模块权限表 - /// - [SqlSugar.SugarTable("module_zero")] - public class ModuleZero - { - /// - /// 模块ID - /// - [SqlSugar.SugarColumn(IsIdentity = true,ColumnName = "module_id")] - public int module_id { get; set; } - /// - /// 管理员账号 - /// - [SqlSugar.SugarColumn(ColumnName = "admin_account")] - public string admin_account { get; set; } - /// - /// 模块名称 - /// - [SqlSugar.SugarColumn(ColumnName = "module_name")] - public string module_name { get; set; } - /// - /// 是否开启 - /// - [SqlSugar.SugarColumn(ColumnName = "module_enable")] - public int module_enable { get; set; } - } -} diff --git a/SYS.Core/Zero/Nation.cs b/SYS.Core/Zero/Nation.cs deleted file mode 100644 index b1c69383c7f0b2f45d71dfc4cf4fe4c89430cf63..0000000000000000000000000000000000000000 --- a/SYS.Core/Zero/Nation.cs +++ /dev/null @@ -1,61 +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.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Core -{ - /// - /// 民族 - /// - [SqlSugar.SugarTable("nation")] - public class Nation - { - /// - /// 民族编号 - /// - public string nation_no { get; set; } - /// - /// 民族名称 - /// - public string nation_name { get; set; } - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - - } -} diff --git a/SYS.Core/Zero/Notice.cs b/SYS.Core/Zero/Notice.cs deleted file mode 100644 index 3a83b00d9cc58f2c6ee014938cd3344cd07c8fdc..0000000000000000000000000000000000000000 --- a/SYS.Core/Zero/Notice.cs +++ /dev/null @@ -1,85 +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; - -namespace SYS.Core -{ - /// - /// 任命公告 - /// - [SqlSugar.SugarTable("uploadinfo")] - public class Notice - { - /// - /// 公告编号 - /// - [SqlSugar.SugarColumn(ColumnName = "NoticeNo")] - public string NoticeNo { get; set; } - /// - /// 公告主题 - /// - [SqlSugar.SugarColumn(ColumnName = "Noticetheme")] - public string Noticetheme { get; set; } - /// - /// 公告类型 - /// - [SqlSugar.SugarColumn(ColumnName = "NoticeType")] - public string NoticeType { get; set; } - /// - /// 公告类型(描述) - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string NoticeTypeName { get; set; } - /// - /// 公告时间 - /// - [SqlSugar.SugarColumn(ColumnName = "NoticeTime")] - public DateTime? NoticeTime { get; set; } - /// - /// 公告正文 - /// - [SqlSugar.SugarColumn(ColumnName = "NoticeContent")] - public string NoticeContent { get; set; } - /// - /// 发文部门 - /// - [SqlSugar.SugarColumn(ColumnName = "NoticeClub")] - public string NoticeClub { get; set; } - /// - /// 删除标记 - /// - [SqlSugar.SugarColumn(ColumnName = "delete_mk")] - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - - } -} diff --git a/SYS.Core/Zero/VipRule.cs b/SYS.Core/Zero/VipRule.cs deleted file mode 100644 index bb5e2f734414b4a61fb9d6c936da9e77cdb5fa70..0000000000000000000000000000000000000000 --- a/SYS.Core/Zero/VipRule.cs +++ /dev/null @@ -1,83 +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.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Core -{ - /// - /// 会员等级规则类 - /// - [SqlSugar.SugarTable("vip_rule")] - public class VipRule - { - /// - /// 索引ID - /// - public int id { get; set; } - - /// - /// 会员规则流水号 - /// - public string rule_id { get; set; } - - /// - /// 会员规则名称 - /// - public string rule_name { get; set; } - - /// - /// 预设数值(历史消费总额) - /// - public decimal rule_value { get; set; } - - /// - /// 会员等级 - /// - public int type_id { get; set; } - - /// - /// 删除标识 - /// - public int delete_mk { get; set; } - - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - /// - /// 会员等级描述 - /// - [SqlSugar.SugarColumn(IsIgnore = true)] - public string type_name { get; set; } - } -} diff --git a/SYS.Core/Zero/position.cs b/SYS.Core/Zero/position.cs deleted file mode 100644 index 72d2dfe7c5c63d15d3f3aa893fc1a13482207e77..0000000000000000000000000000000000000000 --- a/SYS.Core/Zero/position.cs +++ /dev/null @@ -1,61 +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.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SYS.Core -{ - /// - /// 职位 - /// - [SqlSugar.SugarTable("position")] - public class Position - { - /// - /// 职位编号 - /// - public string position_no { get; set; } - /// - /// 职位名称 - /// - public string position_name { get; set; } - /// - /// 删除标记 - /// - public int delete_mk { get; set; } - /// - /// 资料创建人 - /// - public string datains_usr { get; set; } - /// - /// 资料更新人 - /// - public string datachg_usr { get; set; } - - } -} diff --git a/SYS.Core/bitbug_favicon (1).ico b/SYS.Core/bitbug_favicon (1).ico deleted file mode 100644 index deaead31de45df54f39388e2b4727a00a4f99eca..0000000000000000000000000000000000000000 Binary files a/SYS.Core/bitbug_favicon (1).ico and /dev/null differ diff --git a/SYS.Core/packages.config b/SYS.Core/packages.config deleted file mode 100644 index 1da35bd79c9075bd01f7de1b23d3c2fcbe33ab14..0000000000000000000000000000000000000000 --- a/SYS.Core/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmAddAdmin.Designer.cs b/SYS.FormUI/AppFunction/FrmAddAdmin.Designer.cs index 20c3e490b8573b23df53c122d459285478dc7c71..8cbbf5b0560e15753e953d7a22be423ff8cb99ce 100644 --- a/SYS.FormUI/AppFunction/FrmAddAdmin.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmAddAdmin.Designer.cs @@ -350,6 +350,7 @@ namespace SYS.FormUI this.MinimizeBox = false; this.Name = "FrmAddAdmin"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "添加管理员"; this.Load += new System.EventHandler(this.FrmAddAdmin_Load); ((System.ComponentModel.ISupportInitialize)(this.dgvAdminList)).EndInit(); diff --git a/SYS.FormUI/AppFunction/FrmAddRoom.Designer.cs b/SYS.FormUI/AppFunction/FrmAddRoom.Designer.cs index 0b7c84cfb8c0c3f726d380de981a2c8de941199d..26c206d07d709dad791ac0b73c3dd76179b084b9 100644 --- a/SYS.FormUI/AppFunction/FrmAddRoom.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmAddRoom.Designer.cs @@ -239,6 +239,7 @@ this.MinimizeBox = false; this.Name = "FrmAddRoom"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "新增客房"; this.Load += new System.EventHandler(this.FrmAddRoom_Load); this.ResumeLayout(false); diff --git a/SYS.FormUI/AppFunction/FrmAddWorker.Designer.cs b/SYS.FormUI/AppFunction/FrmAddWorker.Designer.cs index 9f1b6c8e2908e7ab7664c36e31b52c748bca476f..25312ed2050b6c88f96022a8d7987e1829a0d043 100644 --- a/SYS.FormUI/AppFunction/FrmAddWorker.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmAddWorker.Designer.cs @@ -517,6 +517,7 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "FrmAddWorker"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "添加员工"; this.ButtonOkClick += new System.EventHandler(this.FrmAddWorker_ButtonOkClick); this.ButtonCancelClick += new System.EventHandler(this.FrmAddWorker_ButtonCancelClick); diff --git a/SYS.FormUI/AppFunction/FrmAdminManager.Designer.cs b/SYS.FormUI/AppFunction/FrmAdminManager.Designer.cs index fcb82a4101a4f5d785a5b9c4b6a7f5682408f74d..020e0b35f0aa4d7da1abc26c36ae89994b02947e 100644 --- a/SYS.FormUI/AppFunction/FrmAdminManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmAdminManager.Designer.cs @@ -255,6 +255,7 @@ namespace SYS.FormUI this.MinimizeBox = false; this.Name = "FrmAdminManager"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "启/禁用管理员"; this.Load += new System.EventHandler(this.FrmAdminManager_Load); ((System.ComponentModel.ISupportInitialize)(this.dgvAdminList)).EndInit(); diff --git a/SYS.FormUI/AppFunction/FrmAuthority.Designer.cs b/SYS.FormUI/AppFunction/FrmAuthority.Designer.cs index 1cb30aa8de6fea6fe280467e88f7bc9c43536c6a..280b727495c8c036c58bd54c5aec4ba0f88da2a6 100644 --- a/SYS.FormUI/AppFunction/FrmAuthority.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmAuthority.Designer.cs @@ -56,9 +56,11 @@ namespace SYS.FormUI this.tfModuleZero.Size = new System.Drawing.Size(987, 341); this.tfModuleZero.TabIndex = 0; this.tfModuleZero.Text = "uiTransfer1"; + this.tfModuleZero.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // // cbAccountType // + this.cbAccountType.DataSource = null; this.cbAccountType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cbAccountType.Enabled = false; this.cbAccountType.FillColor = System.Drawing.Color.White; @@ -70,7 +72,7 @@ namespace SYS.FormUI this.cbAccountType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cbAccountType.MinimumSize = new System.Drawing.Size(63, 0); this.cbAccountType.Name = "cbAccountType"; - this.cbAccountType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.cbAccountType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cbAccountType.Radius = 20; this.cbAccountType.Size = new System.Drawing.Size(250, 35); this.cbAccountType.TabIndex = 123; @@ -94,6 +96,7 @@ namespace SYS.FormUI this.txtAccount.Style = Sunny.UI.UIStyle.Custom; this.txtAccount.StyleCustomMode = true; this.txtAccount.TabIndex = 121; + this.txtAccount.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // // txtName // @@ -113,6 +116,7 @@ namespace SYS.FormUI this.txtName.Style = Sunny.UI.UIStyle.Custom; this.txtName.StyleCustomMode = true; this.txtName.TabIndex = 122; + this.txtName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // // label6 // @@ -160,21 +164,12 @@ namespace SYS.FormUI // btnAuthority // this.btnAuthority.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnAuthority.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(190)))), ((int)(((byte)(40))))); - this.btnAuthority.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(202)))), ((int)(((byte)(81))))); - this.btnAuthority.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); - this.btnAuthority.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); this.btnAuthority.Font = new System.Drawing.Font("微软雅黑", 12F); this.btnAuthority.Location = new System.Drawing.Point(888, 577); this.btnAuthority.MinimumSize = new System.Drawing.Size(1, 1); this.btnAuthority.Name = "btnAuthority"; this.btnAuthority.Radius = 20; - this.btnAuthority.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(190)))), ((int)(((byte)(40))))); - this.btnAuthority.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(202)))), ((int)(((byte)(81))))); - this.btnAuthority.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); - this.btnAuthority.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); this.btnAuthority.Size = new System.Drawing.Size(106, 35); - this.btnAuthority.Style = Sunny.UI.UIStyle.Green; this.btnAuthority.TabIndex = 125; this.btnAuthority.Text = "分配权限"; this.btnAuthority.Click += new System.EventHandler(this.btnAuthority_Click); @@ -186,11 +181,10 @@ namespace SYS.FormUI this.uiPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiPanel1.MinimumSize = new System.Drawing.Size(1, 1); this.uiPanel1.Name = "uiPanel1"; - this.uiPanel1.RectColor = System.Drawing.Color.Transparent; this.uiPanel1.Size = new System.Drawing.Size(454, 35); - this.uiPanel1.Style = Sunny.UI.UIStyle.Custom; this.uiPanel1.TabIndex = 126; this.uiPanel1.Text = "我未拥有的系统模块"; + this.uiPanel1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // // uiPanel2 // @@ -199,11 +193,10 @@ namespace SYS.FormUI this.uiPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiPanel2.MinimumSize = new System.Drawing.Size(1, 1); this.uiPanel2.Name = "uiPanel2"; - this.uiPanel2.RectColor = System.Drawing.Color.Transparent; this.uiPanel2.Size = new System.Drawing.Size(453, 38); - this.uiPanel2.Style = Sunny.UI.UIStyle.Custom; this.uiPanel2.TabIndex = 127; this.uiPanel2.Text = "我拥有的系统模块"; + this.uiPanel2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // // FrmAuthority // @@ -227,6 +220,7 @@ namespace SYS.FormUI this.MinimizeBox = false; this.Name = "FrmAuthority"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "权限分配"; this.Load += new System.EventHandler(this.FrmAuthority_Load); this.ResumeLayout(false); diff --git a/SYS.FormUI/AppFunction/FrmCash.Designer.cs b/SYS.FormUI/AppFunction/FrmCash.Designer.cs index 986b7d50a84dc5659a5c07a26703f77cb88398f0..76df0887ea2a6fdbae2d374066c413ecf4d94b03 100644 --- a/SYS.FormUI/AppFunction/FrmCash.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCash.Designer.cs @@ -35,6 +35,13 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmCash)); this.dgvCashList = new Sunny.UI.UIDataGridView(); + this.clAssetsNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clAssetsName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clAssetsValue = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clDepartment = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clStorageTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clAssetsSource = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clAssetsManager = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.cboCashPerson = new Sunny.UI.UIComboBox(); this.label1 = new System.Windows.Forms.Label(); this.btnOK = new Sunny.UI.UIButton(); @@ -50,13 +57,6 @@ this.label20 = new System.Windows.Forms.Label(); this.txtCashNo = new Sunny.UI.UITextBox(); this.dtpDate = new Sunny.UI.UIDatePicker(); - this.clAssetsNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clAssetsName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clAssetsValue = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clDepartment = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clStorageTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clAssetsSource = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clAssetsManager = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.dgvCashList)).BeginInit(); this.SuspendLayout(); // @@ -121,6 +121,48 @@ this.dgvCashList.Size = new System.Drawing.Size(809, 582); this.dgvCashList.TabIndex = 2; // + // clAssetsNo + // + this.clAssetsNo.DataPropertyName = "CashNo"; + this.clAssetsNo.HeaderText = "资产编号"; + this.clAssetsNo.Name = "clAssetsNo"; + // + // clAssetsName + // + this.clAssetsName.DataPropertyName = "CashName"; + this.clAssetsName.HeaderText = "资产名称"; + this.clAssetsName.Name = "clAssetsName"; + // + // clAssetsValue + // + this.clAssetsValue.DataPropertyName = "CashPriceStr"; + this.clAssetsValue.HeaderText = "资产总值"; + this.clAssetsValue.Name = "clAssetsValue"; + // + // clDepartment + // + this.clDepartment.DataPropertyName = "DeptName"; + this.clDepartment.HeaderText = "所属部门"; + this.clDepartment.Name = "clDepartment"; + // + // clStorageTime + // + this.clStorageTime.DataPropertyName = "CashTime"; + this.clStorageTime.HeaderText = "入库时间"; + this.clStorageTime.Name = "clStorageTime"; + // + // clAssetsSource + // + this.clAssetsSource.DataPropertyName = "CashSource"; + this.clAssetsSource.HeaderText = "资产来源"; + this.clAssetsSource.Name = "clAssetsSource"; + // + // clAssetsManager + // + this.clAssetsManager.DataPropertyName = "PersonName"; + this.clAssetsManager.HeaderText = "资产经办人"; + this.clAssetsManager.Name = "clAssetsManager"; + // // cboCashPerson // this.cboCashPerson.DataSource = null; @@ -335,48 +377,6 @@ this.dtpDate.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; this.dtpDate.Value = new System.DateTime(2021, 1, 31, 14, 30, 7, 297); // - // clAssetsNo - // - this.clAssetsNo.DataPropertyName = "CashNo"; - this.clAssetsNo.HeaderText = "资产编号"; - this.clAssetsNo.Name = "clAssetsNo"; - // - // clAssetsName - // - this.clAssetsName.DataPropertyName = "CashName"; - this.clAssetsName.HeaderText = "资产名称"; - this.clAssetsName.Name = "clAssetsName"; - // - // clAssetsValue - // - this.clAssetsValue.DataPropertyName = "CashPriceStr"; - this.clAssetsValue.HeaderText = "资产总值"; - this.clAssetsValue.Name = "clAssetsValue"; - // - // clDepartment - // - this.clDepartment.DataPropertyName = "DeptName"; - this.clDepartment.HeaderText = "所属部门"; - this.clDepartment.Name = "clDepartment"; - // - // clStorageTime - // - this.clStorageTime.DataPropertyName = "CashTime"; - this.clStorageTime.HeaderText = "入库时间"; - this.clStorageTime.Name = "clStorageTime"; - // - // clAssetsSource - // - this.clAssetsSource.DataPropertyName = "CashSource"; - this.clAssetsSource.HeaderText = "资产来源"; - this.clAssetsSource.Name = "clAssetsSource"; - // - // clAssetsManager - // - this.clAssetsManager.DataPropertyName = "PersonName"; - this.clAssetsManager.HeaderText = "资产经办人"; - this.clAssetsManager.Name = "clAssetsManager"; - // // FrmCash // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); @@ -406,6 +406,7 @@ this.MinimizeBox = false; this.Name = "FrmCash"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "内部财务账单"; this.Load += new System.EventHandler(this.FrmCash_Load); ((System.ComponentModel.ISupportInitialize)(this.dgvCashList)).EndInit(); diff --git a/SYS.FormUI/AppFunction/FrmChangeAdminPwd.Designer.cs b/SYS.FormUI/AppFunction/FrmChangeAdminPwd.Designer.cs index de48c9a57315dd660e86a9524b0c881837aec634..fe2c0227015496eebf784cd34bb9db10a8739f77 100644 --- a/SYS.FormUI/AppFunction/FrmChangeAdminPwd.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmChangeAdminPwd.Designer.cs @@ -179,6 +179,7 @@ namespace SYS.FormUI this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "FrmChangeAdminPwd"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "修改密码"; this.Load += new System.EventHandler(this.FrmChangeAdminPwd_Load); this.ResumeLayout(false); diff --git a/SYS.FormUI/AppFunction/FrmChangePosition.Designer.cs b/SYS.FormUI/AppFunction/FrmChangePosition.Designer.cs index 3adfc7a4cb3977da483b0f492d36bd8f1cf1feb9..f968b4adf3059e3b7506980536ab923577c46987 100644 --- a/SYS.FormUI/AppFunction/FrmChangePosition.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmChangePosition.Designer.cs @@ -103,6 +103,7 @@ this.txtworkerId.Style = Sunny.UI.UIStyle.Custom; this.txtworkerId.StyleCustomMode = true; this.txtworkerId.TabIndex = 106; + this.txtworkerId.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // // label7 // @@ -132,6 +133,7 @@ this.txtworkerName.Style = Sunny.UI.UIStyle.Custom; this.txtworkerName.StyleCustomMode = true; this.txtworkerName.TabIndex = 108; + this.txtworkerName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // // label8 // @@ -161,6 +163,7 @@ this.txtPosition.Style = Sunny.UI.UIStyle.Custom; this.txtPosition.StyleCustomMode = true; this.txtPosition.TabIndex = 110; + this.txtPosition.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // // txtClub // @@ -181,9 +184,11 @@ this.txtClub.Style = Sunny.UI.UIStyle.Custom; this.txtClub.StyleCustomMode = true; this.txtClub.TabIndex = 109; + this.txtClub.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // // cboNewClub // + this.cboNewClub.DataSource = null; this.cboNewClub.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboNewClub.FillColor = System.Drawing.Color.White; this.cboNewClub.Font = new System.Drawing.Font("微软雅黑", 12F); @@ -191,7 +196,7 @@ this.cboNewClub.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboNewClub.MinimumSize = new System.Drawing.Size(63, 0); this.cboNewClub.Name = "cboNewClub"; - this.cboNewClub.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.cboNewClub.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cboNewClub.Radius = 20; this.cboNewClub.Size = new System.Drawing.Size(125, 29); this.cboNewClub.TabIndex = 111; @@ -200,6 +205,7 @@ // // cboNewPosition // + this.cboNewPosition.DataSource = null; this.cboNewPosition.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboNewPosition.FillColor = System.Drawing.Color.White; this.cboNewPosition.Font = new System.Drawing.Font("微软雅黑", 12F); @@ -207,7 +213,7 @@ this.cboNewPosition.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboNewPosition.MinimumSize = new System.Drawing.Size(63, 0); this.cboNewPosition.Name = "cboNewPosition"; - this.cboNewPosition.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.cboNewPosition.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cboNewPosition.Radius = 20; this.cboNewPosition.Size = new System.Drawing.Size(125, 29); this.cboNewPosition.TabIndex = 112; @@ -252,6 +258,7 @@ this.MinimizeBox = false; this.Name = "FrmChangePosition"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "将XXX任命为XXX"; this.Load += new System.EventHandler(this.FrmChangePosition_Load); this.ResumeLayout(false); diff --git a/SYS.FormUI/AppFunction/FrmChangeRoom.Designer.cs b/SYS.FormUI/AppFunction/FrmChangeRoom.Designer.cs index 093596d6ff991424ea3da51c74041bacad352ae7..7c56a0106a330e73ffae06ba7bd4cc355ee48121 100644 --- a/SYS.FormUI/AppFunction/FrmChangeRoom.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmChangeRoom.Designer.cs @@ -49,13 +49,14 @@ // // cboRoomList // + this.cboRoomList.DataSource = null; this.cboRoomList.FillColor = System.Drawing.Color.White; this.cboRoomList.Font = new System.Drawing.Font("微软雅黑", 12F); this.cboRoomList.Location = new System.Drawing.Point(208, 55); this.cboRoomList.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboRoomList.MinimumSize = new System.Drawing.Size(63, 0); this.cboRoomList.Name = "cboRoomList"; - this.cboRoomList.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.cboRoomList.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cboRoomList.Radius = 15; this.cboRoomList.Size = new System.Drawing.Size(150, 29); this.cboRoomList.Style = Sunny.UI.UIStyle.Custom; @@ -115,6 +116,7 @@ this.MinimizeBox = false; this.Name = "FrmChangeRoom"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Style = Sunny.UI.UIStyle.Custom; this.Text = "转换房间"; this.Load += new System.EventHandler(this.FrmChangeRoom_Load); diff --git a/SYS.FormUI/AppFunction/FrmChart.Designer.cs b/SYS.FormUI/AppFunction/FrmChart.Designer.cs index 8067001c38a1d90291a6183ea8cc386805edc7dc..d36ff341f0396d4f531a72e6f8c9f4ffd4b6d6c5 100644 --- a/SYS.FormUI/AppFunction/FrmChart.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmChart.Designer.cs @@ -95,6 +95,7 @@ this.MinimizeBox = false; this.Name = "FrmChart"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "酒店盈利情况(仅含已结算)"; this.Load += new System.EventHandler(this.FrmChart_Load); ((System.ComponentModel.ISupportInitialize)(this.chart1)).EndInit(); diff --git a/SYS.FormUI/AppFunction/FrmCheckIn.Designer.cs b/SYS.FormUI/AppFunction/FrmCheckIn.Designer.cs index 089b468b03d44a6e10124045ab35c161c243350c..858764df2a8596c649d540aeedfc75f02070a48e 100644 --- a/SYS.FormUI/AppFunction/FrmCheckIn.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCheckIn.Designer.cs @@ -411,8 +411,9 @@ this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Name = "FrmCheckIn"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Style = Sunny.UI.UIStyle.Custom; - this.Text = "房间入住CheckIn Room"; + this.Text = "房间入住"; this.ButtonOkClick += new System.EventHandler(this.FrmCheckIn_ButtonOkClick); this.ButtonCancelClick += new System.EventHandler(this.FrmCheckIn_ButtonCancelClick); this.Load += new System.EventHandler(this.FrmCheckIn_Load); diff --git a/SYS.FormUI/AppFunction/FrmCheckList.Designer.cs b/SYS.FormUI/AppFunction/FrmCheckList.Designer.cs index b440c15c90828c78c5588993637f43ac8969f579..286e81b9ec4c8a8ef5a6d1682db9f8420fb4e146 100644 --- a/SYS.FormUI/AppFunction/FrmCheckList.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCheckList.Designer.cs @@ -32,6 +32,7 @@ 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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmCheckList)); this.dgvCheckInfo = new Sunny.UI.UIDataGridView(); this.clCheckNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -64,7 +65,7 @@ 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.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvCheckInfo.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; @@ -96,9 +97,18 @@ this.dgvCheckInfo.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.dgvCheckInfo.Location = new System.Drawing.Point(3, 38); this.dgvCheckInfo.Name = "dgvCheckInfo"; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F); + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvCheckInfo.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvCheckInfo.RowHeadersVisible = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.White; - this.dgvCheckInfo.RowsDefaultCellStyle = dataGridViewCellStyle4; + 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; @@ -196,6 +206,7 @@ this.MinimizeBox = false; this.Name = "FrmCheckList"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "监管统计信息"; this.Load += new System.EventHandler(this.FrmCashList_Load); ((System.ComponentModel.ISupportInitialize)(this.dgvCheckInfo)).EndInit(); diff --git a/SYS.FormUI/AppFunction/FrmCheckOutForm.Designer.cs b/SYS.FormUI/AppFunction/FrmCheckOutForm.Designer.cs index 3ef44190b4d69d103db2bf8c6b22951ab303b58e..90524977ecb140022ecc4bab9b545d1b190e62a2 100644 --- a/SYS.FormUI/AppFunction/FrmCheckOutForm.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCheckOutForm.Designer.cs @@ -1070,7 +1070,8 @@ this.MinimizeBox = false; this.Name = "FrmCheckOutForm"; this.ShowIcon = true; - this.Text = "退房结算Check Out"; + this.ShowTitleIcon = true; + this.Text = "退房结算"; this.Load += new System.EventHandler(this.FrmCheckOutForm_Load); this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.FrmCheckOutForm_MouseDown); this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.FrmCheckOutForm_MouseMove); diff --git a/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs b/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs index fc7b67cb944c6d4c8ecc595c42e03b9ffc76e548..071cb197be67fef7af683193d28be42b35f751e0 100644 --- a/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs @@ -423,6 +423,7 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmCustoManager"; + this.ShowTitleIcon = true; this.Style = Sunny.UI.UIStyle.Custom; this.Text = "客户信息管理"; this.Load += new System.EventHandler(this.FrmCustoManager_Load); diff --git a/SYS.FormUI/AppFunction/FrmCustoSpend.Designer.cs b/SYS.FormUI/AppFunction/FrmCustoSpend.Designer.cs index 54e2a8863f450993540a578459ba2f3912bbda08..97fd9b848802021ce50d8877ea9c8e8d24e5fe68 100644 --- a/SYS.FormUI/AppFunction/FrmCustoSpend.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCustoSpend.Designer.cs @@ -247,6 +247,7 @@ this.MinimizeBox = false; this.Name = "FrmCustoSpend"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Style = Sunny.UI.UIStyle.Custom; this.Text = "顾客消费账单"; this.Load += new System.EventHandler(this.FrmCustoSpend_Load); diff --git a/SYS.FormUI/AppFunction/FrmDepartment.Designer.cs b/SYS.FormUI/AppFunction/FrmDepartment.Designer.cs index d202186acbce782f18c1bfeebcd8768a6ba07c93..7601419abc9e9b50e1f83c590ad98987ce803fa7 100644 --- a/SYS.FormUI/AppFunction/FrmDepartment.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmDepartment.Designer.cs @@ -442,7 +442,8 @@ namespace SYS.FormUI this.MinimizeBox = false; this.Name = "FrmDepartment"; this.ShowIcon = true; - this.Text = "部门信息维护"; + this.ShowTitleIcon = true; + this.Text = "部门信息"; this.Load += new System.EventHandler(this.FrmDepartment_Load); ((System.ComponentModel.ISupportInitialize)(this.dgvDeptList)).EndInit(); this.ResumeLayout(false); diff --git a/SYS.FormUI/AppFunction/FrmEditInputs.Designer.cs b/SYS.FormUI/AppFunction/FrmEditInputs.Designer.cs index 8f259de2f8c9c73b06dc147e389a43e6239e447c..d5c69b9b2fd311ab7496cc15df8f3638a2629a35 100644 --- a/SYS.FormUI/AppFunction/FrmEditInputs.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmEditInputs.Designer.cs @@ -351,7 +351,7 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "FrmEditInputs"; this.ShowTitleIcon = true; - this.Text = "添加会员信息Add Member Information"; + this.Text = "添加会员信息"; this.ButtonOkClick += new System.EventHandler(this.FrmEditInputs_ButtonOkClick); this.ButtonCancelClick += new System.EventHandler(this.FrmEditInputs_ButtonCancelClick); this.Load += new System.EventHandler(this.FrmEditInputs_Load); diff --git a/SYS.FormUI/AppFunction/FrmGoodOrBad.Designer.cs b/SYS.FormUI/AppFunction/FrmGoodOrBad.Designer.cs index 246e13d3ef14cd867b9f0a70af5aa8a6de6c6c16..2b6a633dcd396a02393c8de61afc4954cc06b4e4 100644 --- a/SYS.FormUI/AppFunction/FrmGoodOrBad.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmGoodOrBad.Designer.cs @@ -31,6 +31,8 @@ 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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmGoodOrBad)); this.label2 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); @@ -45,9 +47,6 @@ this.DtpDate = new Sunny.UI.UIDatePicker(); this.RtbGBInfo = new Sunny.UI.UIRichTextBox(); this.DgvGoodBadList = new Sunny.UI.UIDataGridView(); - this.label1 = new System.Windows.Forms.Label(); - this.btnAdd = new Sunny.UI.UIButton(); - this.btnClose = new Sunny.UI.UIButton(); this.clWorkNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.clGBType = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.clGBInfo = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -60,6 +59,9 @@ this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.label1 = new System.Windows.Forms.Label(); + this.btnAdd = new Sunny.UI.UIButton(); + this.btnClose = new Sunny.UI.UIButton(); ((System.ComponentModel.ISupportInitialize)(this.DgvGoodBadList)).BeginInit(); this.SuspendLayout(); // @@ -164,6 +166,7 @@ // // CboType // + this.CboType.DataSource = null; this.CboType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.CboType.FillColor = System.Drawing.Color.White; this.CboType.Font = new System.Drawing.Font("微软雅黑", 15.75F); @@ -171,7 +174,7 @@ this.CboType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.CboType.MinimumSize = new System.Drawing.Size(63, 0); this.CboType.Name = "CboType"; - this.CboType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.CboType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.CboType.Radius = 20; this.CboType.Size = new System.Drawing.Size(158, 35); this.CboType.Style = Sunny.UI.UIStyle.Custom; @@ -188,7 +191,7 @@ this.DtpDate.MaxLength = 10; this.DtpDate.MinimumSize = new System.Drawing.Size(63, 0); this.DtpDate.Name = "DtpDate"; - this.DtpDate.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.DtpDate.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.DtpDate.Radius = 20; this.DtpDate.ReadOnly = true; this.DtpDate.Size = new System.Drawing.Size(158, 31); @@ -214,6 +217,8 @@ this.RtbGBInfo.Size = new System.Drawing.Size(486, 148); this.RtbGBInfo.Style = Sunny.UI.UIStyle.Custom; this.RtbGBInfo.TabIndex = 109; + this.RtbGBInfo.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; + this.RtbGBInfo.WordWrap = true; // // DgvGoodBadList // @@ -230,7 +235,7 @@ 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.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.DgvGoodBadList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; @@ -249,6 +254,14 @@ this.Column5, this.Column6, this.Column7}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + 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)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.DgvGoodBadList.DefaultCellStyle = dataGridViewCellStyle3; this.DgvGoodBadList.EnableHeadersVisualStyles = false; this.DgvGoodBadList.Font = new System.Drawing.Font("微软雅黑", 12F); this.DgvGoodBadList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); @@ -256,9 +269,18 @@ this.DgvGoodBadList.MultiSelect = false; this.DgvGoodBadList.Name = "DgvGoodBadList"; this.DgvGoodBadList.ReadOnly = true; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F); + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.DgvGoodBadList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.DgvGoodBadList.RowHeadersVisible = false; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.White; - this.DgvGoodBadList.RowsDefaultCellStyle = dataGridViewCellStyle3; + 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; @@ -267,45 +289,6 @@ this.DgvGoodBadList.Style = Sunny.UI.UIStyle.Custom; this.DgvGoodBadList.TabIndex = 3; // - // label1 - // - this.label1.AutoSize = true; - this.label1.BackColor = System.Drawing.Color.Transparent; - this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(37, 355); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(143, 24); - this.label1.TabIndex = 110; - this.label1.Text = "历史奖罚情况："; - // - // btnAdd - // - this.btnAdd.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnAdd.Location = new System.Drawing.Point(421, 599); - this.btnAdd.MinimumSize = new System.Drawing.Size(1, 1); - this.btnAdd.Name = "btnAdd"; - this.btnAdd.Radius = 20; - this.btnAdd.Size = new System.Drawing.Size(100, 35); - this.btnAdd.Style = Sunny.UI.UIStyle.Custom; - this.btnAdd.TabIndex = 111; - this.btnAdd.Text = "新 增"; - this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); - // - // btnClose - // - this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnClose.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnClose.Location = new System.Drawing.Point(527, 599); - this.btnClose.MinimumSize = new System.Drawing.Size(1, 1); - this.btnClose.Name = "btnClose"; - this.btnClose.Radius = 20; - this.btnClose.Size = new System.Drawing.Size(100, 35); - this.btnClose.Style = Sunny.UI.UIStyle.Custom; - this.btnClose.TabIndex = 112; - this.btnClose.Text = "关 闭"; - this.btnClose.Click += new System.EventHandler(this.btnClose_Click); - // // clWorkNo // this.clWorkNo.DataPropertyName = "WorkNo"; @@ -397,6 +380,45 @@ this.Column7.ReadOnly = true; this.Column7.Visible = false; // + // label1 + // + this.label1.AutoSize = true; + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(37, 355); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(143, 24); + this.label1.TabIndex = 110; + this.label1.Text = "历史奖罚情况："; + // + // btnAdd + // + this.btnAdd.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnAdd.Location = new System.Drawing.Point(421, 599); + this.btnAdd.MinimumSize = new System.Drawing.Size(1, 1); + this.btnAdd.Name = "btnAdd"; + this.btnAdd.Radius = 20; + this.btnAdd.Size = new System.Drawing.Size(100, 35); + this.btnAdd.Style = Sunny.UI.UIStyle.Custom; + this.btnAdd.TabIndex = 111; + this.btnAdd.Text = "新 增"; + this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); + // + // btnClose + // + this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnClose.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnClose.Location = new System.Drawing.Point(527, 599); + this.btnClose.MinimumSize = new System.Drawing.Size(1, 1); + this.btnClose.Name = "btnClose"; + this.btnClose.Radius = 20; + this.btnClose.Size = new System.Drawing.Size(100, 35); + this.btnClose.Style = Sunny.UI.UIStyle.Custom; + this.btnClose.TabIndex = 112; + this.btnClose.Text = "关 闭"; + this.btnClose.Click += new System.EventHandler(this.btnClose_Click); + // // FrmGoodOrBad // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); @@ -427,6 +449,7 @@ this.ShowIcon = true; this.ShowRadius = false; this.ShowShadow = true; + this.ShowTitleIcon = true; this.Style = Sunny.UI.UIStyle.Custom; this.Text = "员工奖罚情况页"; this.Load += new System.EventHandler(this.FrmGoodOrBad_Load); diff --git a/SYS.FormUI/AppFunction/FrmGoodOrBad.resx b/SYS.FormUI/AppFunction/FrmGoodOrBad.resx index 36418d5156b333c126c3a578110f184010b1912c..d63b7cec39f2567e803727e3b43f8ca57289ca7f 100644 --- a/SYS.FormUI/AppFunction/FrmGoodOrBad.resx +++ b/SYS.FormUI/AppFunction/FrmGoodOrBad.resx @@ -156,289 +156,78 @@ - AAABAAEAQEAAAAEAIAAoQgAAFgAAACgAAABAAAAAgAAAAAEAIAAAAAAAAEAAACMuAAAjLgAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4+u0A9/rrAPz8+QP9/f0E/Pz7CPz8+hv8/fom/P36J/39 - +if9/foh/f37DP79/QT+/PkD/Pv2Afv79gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPz8+AD8//0A/Pz5Dfz9+x/9/ftJ/f79Yv39/YD9/f2w/f79t/7+ - /b39/f3V/f794/3+/eX+/v3k/v793f7+/sL+/v63/v79sv3+/X39/f1d/f78Mf39+xD6+ukA/f35AAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8/fsA/P36Bf39+xv9/fxI/f38g/39/b/9/f3h/f799f39 - /f/9/f7//v7+//7+/f/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+/v7+ - /uv+/v3G/v79gP3+/DX9/fsJ////APv99wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD5+vcA//79APz8+Qf9/fsq/f38X/39/aL9/v3Z/f79+P39 - /f/9/v3//f3+//7+/v/+/v7//f39//7+/v/+/v3//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7s/v79sf7+/VT9/fsN/v7/APv79AAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMvYzwD///8A/fz7E/39/FP9/fyq/f396P39 - /fv9/f3//f79//3+/v/9/f7//f39//39/f/+/f7//v39//7+/f/9/v7//v3+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v73/v79tP7+ - /Df8/PcC/f36AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+/z5APr8+AL9/fsl/f38bP39 - /cj9/f33/f39//39/f/9/f3//f39//39/f/9/f7//f39//39/f/+/v7//v39//79/f/+/v3//f3+//7+ - /f/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7l/v79af7++wj+/v0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8/PgA+/vvAf39 - +yT9/fyF/f393f39/f79/f3//f39//79/f/9/f3//f39//79/f/9/f3//f39//39/f/9/v3//f39//3+ - /f/+/v3//v39//79/f/+/v7//v7+//7+/v/+/f7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/vX+/v2Z/f37FP39/AAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPn5 - 8gD///8A/P38FP39/HD9/f3Z/f39/v39/f/9/f3//f39//39/f/9/f3//f39//39/fb9/f3b/f39y/39 - /Zz9/f2H/f38hP39+3z9/ft7/f38ev39/H79/f2H/v79iP79/a7+/v3U/v797P7+/v7+/f7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+/f7+ - /ZX9/fsM/f38AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAPz8+gD8/PoI/f38WP39/cj9/f36/f39//39/f/9/f3//f39//39/f39/f3n/f38u/39 - /Hz9/fxG/f38G/z9+w/7/PcE+/z3AAAAAAAAAAAAAAAAAAAAAAAAAAAA+/v2AP///wD9/foI/v78Ev39 - /DX9/fxu/f39s/7+/en+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v75/v7+dP7++gL+/vwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAA+Pn2AP7+/QD8/fwf/f38j/39/fX9/f3//f39//39/f/9/f3+/f396v39 - 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 - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/+vIA//ryAP39 - +gL8+/oC/vz5Avv9+QL9/fkC/f35Av3+/wD9/fxr/f39//39/f/9/f3//f39//39/cv9/fsR/f36Af39 - +wL+/fsC/fz4Avz9+gL9/fkC/vv5Avz59QD8+fUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAPr89wD+/f8A/f79N/7+/tX+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+3/7+ - /UT+//8A/vz7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA/fz7AP38+xH9/fyY/f38sf39/K/9/fyv/f38sP39/LD9/fyu/f39xv39/f79/f3//f39//39 - /f/9/f3y/f39tf39/a/9/f2v/f39r/39/a/9/f2v/f39sf39/Z39/Psa/fz8AAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP38+ADz7LUA/f39Of7+/tT+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v791v79/UL8//wA/v39AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPz8+wD8/PoV/fz80f39/f/9/f3//f39//39/f/9/f3//f39//39 - /f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39/f/9/f38/f39Vv39 - /QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP38+wD9/PoE/f38XP3+/d/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v79vf39/DT///8A/fz6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8+/gA9/HhAP38/Jv9/f3//f39//39 - /f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39 - 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 - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPv5 - 8QD9//8A/Pv4Bf39/Az8/Psc/Pz7O/39/UT9/f1E/f39RP39/UT9/f1E/fz7Pfz8+x/9/v0N/f36C/v6 - 9gH7+vYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA//////////////////////////////////////////////////////////////////////// - ///////////////////gAP///////gAAD//////gAAAD/////wAAAAD////8AAAAAD///+AAAAAAH/// - gAAAAAAP//8AAAAAAAf//AAD/AAAA//4AH//wAAD/+AB/wPwAAH/wA/8APwAAf+AP/AAfwAA/wD/8AA/ - gAD+A//wAB/AAPwH//gQH+AA+A//+PwP4AD4P////A/wAPB////gD/AA4PwH/4Af8ADh/Af/AB/wAMH8 - B/4AP/gAw/4D/gD/8ACH/gP8A//wAIf+A/wPH/AAj/4D/gAP8AGP/wH+AAfgAZ//Af8AB+ADH/8B/4AP - wAMf/wD/wB/AB///gP/4/4AH//+A////AA///4D///8AH///gP///gA//8BAAH/8AH//wAAAf/AA///A - AAB/4AH//8AAAH/AA///4AAAPwAH///gAAA+AA////////gAP///////4AB///4///8AAf///gP/8AAH - ////AAAAAB////+AAAAAf////+AAAAP/////+AAAH///////gAH///////////////////////////// - //////////////////////////////////////////////////8= + AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////QP///6MAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///7////9+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///9M//////// + /0wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///9c/////////zAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// + /wz/////////swAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///8H/////AAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////Ov/////////7////TAAAAAAAAAAAAAAAAAAAAAD///9k////+/////8AAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///7H///+nAAAAAAAA + AAAAAAAAAAAAAAAAAAD///+Z////o////5X////BAAAAAAAAAAAAAAAAAAAAAP///7////+V////pf// + /4sAAAAAAAAAAAAAAAAAAAAAAAAAAP///6v///9+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Mv// + //////+T////HAAAAAD///8i////gf////X///9I////Lv////P///9MAAAAAAAAAAD///9c////8/// + /y7///9I////9f///4H///8cAAAAAP///yL///+v/////////xgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////mf///9X////////////////////H////OAAAAAAAAAAA////jf///9EAAAAAAAAAAP// + /8X///+NAAAAAAAAAAD///84////x////////////////////9v///+ZAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAD///8q/////////yr///9A////FAAAAAAAAAAAAAAAAAAAAAD///8G////6/// + /1z///9i////6////yYAAAAAAAAAAAAAAAAAAAAA////FP///0D///9O/////////xgAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///+Z////xQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAD///9o////y////9f///+FAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///8P///+BAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///xz/////////LgAAAAAAAAAAAAAAAP// + /4H///+p////0/////3///////////////3////T////qf///4EAAAAAAAAAAAAAAAD///9g////+/// + /xgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///4////+3AAAAAP// + /yj///+x/////////+H///+3////jf///1j///9a////k////73////p/////////6f///8W////Av// + /9X///+BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Dv// + //////+V//////////////9gAAAAAAAAAAAAAAAA////JP///yQAAAAAAAAAAAAAAAD///94//////// + //////+d////5f///xgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////0f/////////d////IAAAAAD///9c////q////+P//////////////+P///+r////XAAA + AAD///8s////6/////////+tAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAP///1L/////////4QAAAAD///8I////l/////////+v////gf///1T///9U////gf// + /6//////////l////wgAAAAA////4f////////8KAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAD///8E////4/////////8Y////Iv/////////x////YAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAP///27//////////////yL///8Y/////////7EAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///5P/////////aAAAAAD////X////1wAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////1wAAAAD///9o/////////2IAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////1////68AAAAA////ev////////8mAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///1j/////////egAAAAD///+v////pQAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///xD/////////gQAAAAD////T////gQAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///7v////TAAAAAP// + /4H////ZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////NP////////9Q////HP// + //////9YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////k/// + //////8c////UP////////8eAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///9e//////// + /yL///9Q/////////yYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAD///9m/////////1D///8i/////////1IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// + /3T/////////Dv///3D/////////DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAP///0z/////////cP///w7/////////cgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////TP////////9E////NP////////9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////gf////////80////RP////////88AAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAD///8k/////////3j///8E////7////2wAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///+n////7////wT///94////+f///wYAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////v////pQAAAAD///+z////vQAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Kv////f///+zAAAAAP///6X////DAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///8X////v////KP///zz/////////kQAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////V/////////zz///8o////7/// + /40AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////QP////////+tAAAAAP// + /43/////////w////xIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8m////3/////////+NAAAAAP// + /63////T////FAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////aP// + //////9oAAAAAP///4f/////////6////3T///9G////Fv///xb///9G////dP////X/////////hwAA + AAD///9o/////////zoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////yf////////9mAAAAAP///zL///+7////////////////////////////////////u/// + /zIAAAAA////bP////////96AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////2f////////+tAAAAAAAAAAD///82////bP///6X///+l////bP// + /zYAAAAA////JP///7//////////qQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////if/////////L////aP///zr///8MAAAAAAAA + AAD///8Q////Qv///3L////r////9f///2oAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Ov///7H////t//////// + ///////X////1///////////////7f///7H///8uAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// + /wL///80////ZP///6H///+h////ZP///zT///8CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA/+/3///v9///5+f//+fn/+fDw+/zm9nP8DmcD/v9v9/5/j+f/eAHv/zB + gz/+H/h//jgcf/5hhn/8z/M/+Z/5v/m//Z/5P/yf+3/83/t//t/7f/7f+3/83/t//N/5P/yf+Z/5n/yP + 8T/+x+N//nAO//8eeP//j/P//+AH///+f/8= \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmMySpace.Designer.cs b/SYS.FormUI/AppFunction/FrmMySpace.Designer.cs index b4201d5ffc28022c87b01fef0879b6c1723b3ba8..a9cd2620f08a6378d6b5c027e6a2013345f32ac0 100644 --- a/SYS.FormUI/AppFunction/FrmMySpace.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmMySpace.Designer.cs @@ -60,8 +60,8 @@ namespace SYS.FormUI this.label4 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); this.tpPhoto = new System.Windows.Forms.TabPage(); - this.picWorkerPic = new System.Windows.Forms.PictureBox(); this.uiLabel1 = new Sunny.UI.UILabel(); + this.picWorkerPic = new System.Windows.Forms.PictureBox(); this.openPic = new System.Windows.Forms.OpenFileDialog(); this.uiTabControlMenu1.SuspendLayout(); this.tpWorkerInfo.SuspendLayout(); @@ -513,6 +513,18 @@ namespace SYS.FormUI this.tpPhoto.Text = "我的头像"; this.tpPhoto.UseVisualStyleBackColor = true; // + // uiLabel1 + // + this.uiLabel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiLabel1.ForeColor = System.Drawing.Color.Red; + this.uiLabel1.Location = new System.Drawing.Point(128, 400); + this.uiLabel1.Name = "uiLabel1"; + this.uiLabel1.Size = new System.Drawing.Size(410, 23); + this.uiLabel1.Style = Sunny.UI.UIStyle.Custom; + this.uiLabel1.TabIndex = 57; + this.uiLabel1.Text = "点击上方头像框即可更换头像，记得不要超过2MB哦~"; + this.uiLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // picWorkerPic // this.picWorkerPic.BackColor = System.Drawing.Color.Transparent; @@ -526,17 +538,6 @@ namespace SYS.FormUI this.picWorkerPic.TabStop = false; this.picWorkerPic.Click += new System.EventHandler(this.picWorkerPic_Click); // - // uiLabel1 - // - this.uiLabel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.uiLabel1.ForeColor = System.Drawing.Color.Red; - this.uiLabel1.Location = new System.Drawing.Point(128, 400); - this.uiLabel1.Name = "uiLabel1"; - this.uiLabel1.Size = new System.Drawing.Size(410, 23); - this.uiLabel1.TabIndex = 57; - this.uiLabel1.Text = "点击上方头像框即可更换头像，记得不要超过2MB哦~"; - this.uiLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // // openPic // this.openPic.FileName = "openFileDialog1"; @@ -554,6 +555,7 @@ namespace SYS.FormUI this.MinimizeBox = false; this.Name = "FrmMySpace"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "个人中心"; this.Load += new System.EventHandler(this.FrmMySpace_Load); this.uiTabControlMenu1.ResumeLayout(false); diff --git a/SYS.FormUI/AppFunction/FrmNotice.Designer.cs b/SYS.FormUI/AppFunction/FrmNotice.Designer.cs index 4b14d5a2e0b127f444e087b23b01d47b0d9152a6..3955240c810c8b330b4ad3217d1632e7a26bca73 100644 --- a/SYS.FormUI/AppFunction/FrmNotice.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmNotice.Designer.cs @@ -59,6 +59,7 @@ namespace SYS.FormUI // this.dgvNoticeList.FillColor = System.Drawing.Color.White; this.dgvNoticeList.Font = new System.Drawing.Font("微软雅黑", 12F); + this.dgvNoticeList.FormatString = ""; this.dgvNoticeList.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.dgvNoticeList.Location = new System.Drawing.Point(4, 84); this.dgvNoticeList.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); @@ -84,6 +85,7 @@ namespace SYS.FormUI this.MinimizeBox = false; this.Name = "FrmNotice"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "历史公告"; this.Load += new System.EventHandler(this.FrmNotice_Load); this.ResumeLayout(false); diff --git a/SYS.FormUI/AppFunction/FrmOperation.Designer.cs b/SYS.FormUI/AppFunction/FrmOperation.Designer.cs index a5815a7624ec8a5a8dffa29aa1f6b9a71d2ef7d9..9f8f0b8eedf88ef9baad0b62442227f12cc1c312 100644 --- a/SYS.FormUI/AppFunction/FrmOperation.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmOperation.Designer.cs @@ -213,7 +213,7 @@ // // FrmOperation // - this.AutoScaleDimensions = new System.Drawing.SizeF(17F, 36F); + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.ClientSize = new System.Drawing.Size(1005, 623); @@ -224,6 +224,7 @@ this.MinimizeBox = false; this.Name = "FrmOperation"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "员工操作日志"; this.Load += new System.EventHandler(this.FrmOperation_Load); ((System.ComponentModel.ISupportInitialize)(this.dgvOperationlog)).EndInit(); diff --git a/SYS.FormUI/AppFunction/FrmReserList.Designer.cs b/SYS.FormUI/AppFunction/FrmReserList.Designer.cs index aca28eabad6998a92baaa766a9aca1febae4855e..c5b9e916a27aaac4436dcb70161494e412500dcf 100644 --- a/SYS.FormUI/AppFunction/FrmReserList.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmReserList.Designer.cs @@ -32,6 +32,7 @@ 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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmReserList)); this.dgvReserList = new Sunny.UI.UIDataGridView(); this.clReserNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -79,7 +80,7 @@ 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.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvReserList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; @@ -108,13 +109,22 @@ this.dgvReserList.Location = new System.Drawing.Point(18, 104); this.dgvReserList.Name = "dgvReserList"; this.dgvReserList.ReadOnly = true; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F); + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvReserList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvReserList.RowHeadersVisible = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.White; - this.dgvReserList.RowsDefaultCellStyle = dataGridViewCellStyle4; + 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.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); @@ -177,6 +187,7 @@ // // cbCustoType // + this.cbCustoType.DataSource = null; this.cbCustoType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cbCustoType.FillColor = System.Drawing.Color.White; this.cbCustoType.Font = new System.Drawing.Font("微软雅黑", 15.75F); @@ -184,7 +195,7 @@ this.cbCustoType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cbCustoType.MinimumSize = new System.Drawing.Size(63, 0); this.cbCustoType.Name = "cbCustoType"; - this.cbCustoType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.cbCustoType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cbCustoType.Radius = 20; this.cbCustoType.ReadOnly = true; this.cbCustoType.Size = new System.Drawing.Size(250, 35); @@ -194,6 +205,7 @@ // // cbPassportType // + this.cbPassportType.DataSource = null; this.cbPassportType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cbPassportType.FillColor = System.Drawing.Color.White; this.cbPassportType.Font = new System.Drawing.Font("微软雅黑", 15.75F); @@ -201,7 +213,7 @@ this.cbPassportType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cbPassportType.MinimumSize = new System.Drawing.Size(63, 0); this.cbPassportType.Name = "cbPassportType"; - this.cbPassportType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.cbPassportType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cbPassportType.Radius = 20; this.cbPassportType.Size = new System.Drawing.Size(250, 35); this.cbPassportType.TabIndex = 133; @@ -209,6 +221,7 @@ // // cbSex // + this.cbSex.DataSource = null; this.cbSex.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cbSex.FillColor = System.Drawing.Color.White; this.cbSex.Font = new System.Drawing.Font("微软雅黑", 15.75F); @@ -216,7 +229,7 @@ this.cbSex.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cbSex.MinimumSize = new System.Drawing.Size(63, 0); this.cbSex.Name = "cbSex"; - this.cbSex.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.cbSex.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cbSex.Radius = 20; this.cbSex.Size = new System.Drawing.Size(250, 35); this.cbSex.TabIndex = 132; @@ -240,6 +253,7 @@ this.txtCustoNo.Style = Sunny.UI.UIStyle.Custom; this.txtCustoNo.StyleCustomMode = true; this.txtCustoNo.TabIndex = 131; + this.txtCustoNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // // txtCustoName // @@ -258,6 +272,7 @@ this.txtCustoName.Style = Sunny.UI.UIStyle.Custom; this.txtCustoName.StyleCustomMode = true; this.txtCustoName.TabIndex = 130; + this.txtCustoName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // // txtCardID // @@ -276,6 +291,7 @@ this.txtCardID.Style = Sunny.UI.UIStyle.Custom; this.txtCardID.StyleCustomMode = true; this.txtCardID.TabIndex = 129; + this.txtCardID.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; this.txtCardID.Validated += new System.EventHandler(this.txtCardID_Validated); // // txtTel @@ -295,6 +311,7 @@ this.txtTel.Style = Sunny.UI.UIStyle.Custom; this.txtTel.StyleCustomMode = true; this.txtTel.TabIndex = 128; + this.txtTel.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // // dtpBirthday // @@ -306,7 +323,7 @@ this.dtpBirthday.MaxLength = 10; this.dtpBirthday.MinimumSize = new System.Drawing.Size(63, 0); this.dtpBirthday.Name = "dtpBirthday"; - this.dtpBirthday.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.dtpBirthday.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.dtpBirthday.Radius = 20; this.dtpBirthday.ReadOnly = true; this.dtpBirthday.Size = new System.Drawing.Size(250, 31); @@ -334,6 +351,7 @@ this.txtCustoAdress.Style = Sunny.UI.UIStyle.Custom; this.txtCustoAdress.StyleCustomMode = true; this.txtCustoAdress.TabIndex = 126; + this.txtCustoAdress.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // // label10 // @@ -467,6 +485,7 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "FrmReserList"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "预约列表"; this.Load += new System.EventHandler(this.FrmReserList_Load); ((System.ComponentModel.ISupportInitialize)(this.dgvReserList)).EndInit(); diff --git a/SYS.FormUI/AppFunction/FrmReserList.resx b/SYS.FormUI/AppFunction/FrmReserList.resx index 44781380a0eae9231c6c47532cdd09fc60b59161..f9f02ab01f93079261109fd833bb14422ebb4bb4 100644 --- a/SYS.FormUI/AppFunction/FrmReserList.resx +++ b/SYS.FormUI/AppFunction/FrmReserList.resx @@ -144,21 +144,18 @@ - AAABAAEAICAAAAEAGAAzAwAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAAFz - UkdCAK7OHOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA7DAAAOwwHHb6hkAAACyElEQVRYR+2WPWgU - URSFFyy08AcsIukCGlhEhLgEiUEIiIGIjUUKUSFWCiIWsdDKVLEUYqOSTrEIIQZBURACQSxEEhALwwZk - C0FQCBrTyY7ffXP2sW9ndnZ2Nd1+cHhvzj33zmSYzUyhS6dUq9UD6AQ6GEXRbtnbBycaRTfRY7TOSQPw - yugeOqmW/wdDH+g8mZD7bHm2U+xX0QZaRMNuULvQeBxV4vGeObxJ1hHWi6y3WF+6ShSV0Hi8DbFZGpsP - Gu6o18HxQ5aSyk0h9ynuCMGfVaQ1hO3B8nB8Q6WWkN1QWwD+M0VaQ3hFfZGs3NC7qNZGphTJhgH1t35c - dm7oH1ZvgMrZ0DyqvN2y57ITUNuJ+tEg6pHtwbOHdxa9YJT7y9lfZ7/PBZpB6LY7O7A/KzsA/yr6qlgN - +2UMKRKAfwi5XwnrJdnpEJhXcF1WAP4pq2dQVNRDzx7VbO687HQIfFFwQZYHexf+mtUN9kssE7UeI63P - wC+r/lFWEoq9bkpM4onFK8YlN8g/Hxz2xa7zK7ID8O1irf5DVhKKx9yUmMQFUB9UzZiQ7aC2aibrb1kB - +LUL+CUrCfUdBP5YENIuoEc1G2S3vc981hFnAv57F26A0gfV38hKh8A7BV/JCqA0Z/Ua5PwzYXB8V1EP - 3l6VrT4tOx0C9xX8ifbL9uANuUlNUCyAnjMq29zzstMhcEVZC1+QHUCpSG0BVdAWWkHXVE5A7VE80c08 - IjsdAgNoU+EnsjuGGYfRd81blp0NQf/fEPK9QJrALP9qZj8muzV2teqzxtOy24I+99Mz2M/Izo96HQyY - Rr0qZUK81HDyskrtQaM9D1uaY4PsBWTfekcVCcC3L2T7avJw/FblzmFI8Glm4H1DS3VyD249eNlvvnZg - 2DmU+BRPg9xrlHqX/gmG2mvVvoQn0VO0hjbRMppBl9GA4l265KRQ+As8ytgqx877sQAAAABJRU5ErkJg - gg== + AAABAAEAICAAAAEAGACeAgAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAAFz + UkdCAK7OHOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA7DAAAOwwHHb6hkAAACM0lEQVRYR+1WPUsD + QRRMFVAsJBjEzlqISNJZpbBQlBDtRBCxEBREa5ukFUEkICIiKbSx8esPiFYKafxA7AQbS1tBSJwNe8dk + 3a+QS0BI4JHbvdmZ2bdvHxeLdX//NQPVajWJGO2Y/1qtNgbBNcQR4hXj4FeUZkr4322LIRBvIr5INHzE + /CkGWXqXxdwIYiESMyC6UIUx94G4wnwR0SeEMC4g1hFDhM+3ZELdNcb7iJSLlAxkXFjjewiVAyI8/yCW + VTDmXkToSDA/KDNjxNjEp0lcpDutES9wIerI5BGFxeqVDXGGiHcysNEKuczSk5e4TNk2id+aFjazO2An + 5E2adRoB8JIM5CIyUCHOHqsJGHgjcMIEFtfOVQPBWmBvAqxVHKA4kVZsYNWAPBLRF8IgAwngV/Gu37X7 + FO3+sAkDaq+qj0WXFBx47MXzgTDtykDG1wBwIVarTgaUbJmbk9JGrUcgdyb6vmjB9VCPQVcDQsOVhXBD + ABuL0HmdJABkw5RVbdds4ILoOaU07ytkua5LZKDk5IOBRVrw7FzgAIDvgfimvPiwgBuH9TY4bsoZid95 + icviWuHK9l5IQOw8xxwY++2eKndPIZjzNSJvAxez/f5bCqjhiovGghhH/OnnAA6IXSPuFeNlX+NaHBcR + nee3qBO8Ex+ox4hHXTPC/ElL4nQcWyDjL2FT8wta8DXwM5GIByRgjoN0HlE27PYT73YQk5EKm8hk287g + P41IdkS0K9KODPwCkMNEwXdpotAAAAAASUVORK5CYII= \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmReserManager.Designer.cs b/SYS.FormUI/AppFunction/FrmReserManager.Designer.cs index f8d902d55c84b530163c196477f3b03668352499..bbc9029e49c2b943f216f7485536734b0a960c0d 100644 --- a/SYS.FormUI/AppFunction/FrmReserManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmReserManager.Designer.cs @@ -283,6 +283,7 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "FrmReserManager"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Style = Sunny.UI.UIStyle.Custom; this.Text = "预约管理"; this.Load += new System.EventHandler(this.FrmRoomManager_Load); diff --git a/SYS.FormUI/AppFunction/FrmRoomManager.Designer.cs b/SYS.FormUI/AppFunction/FrmRoomManager.Designer.cs index 0bfc60dc9ba2b69ced8bdc42faab3d859381d75e..b8f49ebee370e54401244f9032b7934cdfcb6a6b 100644 --- a/SYS.FormUI/AppFunction/FrmRoomManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmRoomManager.Designer.cs @@ -124,7 +124,7 @@ // pictureBox5 // this.pictureBox5.BackColor = System.Drawing.Color.White; - this.pictureBox5.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox5.BackgroundImage"))); + this.pictureBox5.BackgroundImage = global::SYS.FormUI.Properties.Resources.预约房icon; this.pictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.pictureBox5.Location = new System.Drawing.Point(4, 212); this.pictureBox5.Name = "pictureBox5"; @@ -138,7 +138,7 @@ // pictureBox4 // this.pictureBox4.BackColor = System.Drawing.Color.White; - this.pictureBox4.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox4.BackgroundImage"))); + this.pictureBox4.BackgroundImage = global::SYS.FormUI.Properties.Resources.维修房icon; this.pictureBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.pictureBox4.Location = new System.Drawing.Point(5, 160); this.pictureBox4.Name = "pictureBox4"; @@ -188,7 +188,7 @@ // pictureBox3 // this.pictureBox3.BackColor = System.Drawing.Color.White; - this.pictureBox3.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox3.BackgroundImage"))); + this.pictureBox3.BackgroundImage = global::SYS.FormUI.Properties.Resources.脏房icon1; this.pictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.pictureBox3.Location = new System.Drawing.Point(4, 108); this.pictureBox3.Name = "pictureBox3"; @@ -202,7 +202,7 @@ // pictureBox2 // this.pictureBox2.BackColor = System.Drawing.Color.WhiteSmoke; - this.pictureBox2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox2.BackgroundImage"))); + this.pictureBox2.BackgroundImage = global::SYS.FormUI.Properties.Resources.已住房icon; this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.pictureBox2.Location = new System.Drawing.Point(4, 56); this.pictureBox2.Name = "pictureBox2"; @@ -216,7 +216,7 @@ // pictureBox1 // this.pictureBox1.BackColor = System.Drawing.Color.White; - this.pictureBox1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.BackgroundImage"))); + this.pictureBox1.BackgroundImage = global::SYS.FormUI.Properties.Resources.可住房icon; 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.resx b/SYS.FormUI/AppFunction/FrmRoomManager.resx index c4b77a4958caadfdb0db34e0d329889723d23cac..f38c530c7d7f61dcf0912a8eea99a92dfaa13306 100644 --- a/SYS.FormUI/AppFunction/FrmRoomManager.resx +++ b/SYS.FormUI/AppFunction/FrmRoomManager.resx @@ -118,163 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 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 - AAAAAElFTkSuQmCC - - - - - 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 - VBAUYzTdBkgbAcai5AdtAAAAAElFTkSuQmCC - - - - - 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 @@ -322,7 +165,7 @@ RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK - j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAAOwQAADsEBuJFr7QAAA2NJREFUSEudlE1IVFEY + j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAAOwAAADsABataJCQAAA2NJREFUSEudlE1IVFEY hq/260KTyrJWQasgEGpTCTp37syobcpatUkJahG5CInaBWYQEbiooEWuZu4d2wSB9AM1RFS0iCiYc0Hp h5DAaBFECFpaz3dmznjmekfBxcu593zv+d7v7xzH85WTDoqOm1NO0oC9TBBqYG90fXUskVN3QKEzqz6D b3yHYBxcBQfhaB+pQPyFsagpJkbEdrtZ9Rbn/5ZDIqt+I3gfH/tXIaYzErSwPxEnUAM/CPRUnJAgTmwr diff --git a/SYS.FormUI/AppFunction/FrmRoomMap.Designer.cs b/SYS.FormUI/AppFunction/FrmRoomMap.Designer.cs index 633f4e974421406262c565ca5a636340ea291da4..dc97edba6bb7e7a93d71972a1da0c49ba7b77107 100644 --- a/SYS.FormUI/AppFunction/FrmRoomMap.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmRoomMap.Designer.cs @@ -55,6 +55,7 @@ namespace SYS.FormUI.AppFunction this.MinimizeBox = false; this.Name = "FrmRoomMap"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "房态图一览"; this.Load += new System.EventHandler(this.FrmRoomMap_Load); this.ResumeLayout(false); diff --git a/SYS.FormUI/AppFunction/FrmRoomStateManager.Designer.cs b/SYS.FormUI/AppFunction/FrmRoomStateManager.Designer.cs index 94e2f13560c3135e49d1d5b20eb0bdf51de83fca..172a71cda4b836021bae68d6a08dbd46ed8c3a84 100644 --- a/SYS.FormUI/AppFunction/FrmRoomStateManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmRoomStateManager.Designer.cs @@ -53,6 +53,7 @@ this.txtRoomNo.Style = Sunny.UI.UIStyle.Custom; this.txtRoomNo.StyleCustomMode = true; this.txtRoomNo.TabIndex = 133; + this.txtRoomNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // // label2 // @@ -76,6 +77,7 @@ // // cboState // + this.cboState.DataSource = null; this.cboState.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboState.FillColor = System.Drawing.Color.White; this.cboState.Font = new System.Drawing.Font("微软雅黑", 15.75F); @@ -87,7 +89,7 @@ this.cboState.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboState.MinimumSize = new System.Drawing.Size(63, 0); this.cboState.Name = "cboState"; - this.cboState.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.cboState.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cboState.Radius = 20; this.cboState.Size = new System.Drawing.Size(158, 35); this.cboState.TabIndex = 135; @@ -124,6 +126,7 @@ this.MinimizeBox = false; this.Name = "FrmRoomStateManager"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "修改房间状态"; this.Load += new System.EventHandler(this.FrmRoomStateManager_Load); this.ResumeLayout(false); diff --git a/SYS.FormUI/AppFunction/FrmRoomStateManager.resx b/SYS.FormUI/AppFunction/FrmRoomStateManager.resx index 2905aa69ba94518122d5acdb3415dece1c790849..48bd11db49aa149c181a971204b21b6823876906 100644 --- a/SYS.FormUI/AppFunction/FrmRoomStateManager.resx +++ b/SYS.FormUI/AppFunction/FrmRoomStateManager.resx @@ -120,289 +120,78 @@ - AAABAAEAQEAAAAEAIAAoQgAAFgAAACgAAABAAAAAgAAAAAEAIAAAAAAAAEAAACMuAAAjLgAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4+u0A9/rrAPz8+QP9/f0E/Pz7CPz8+hv8/fom/P36J/39 - +if9/foh/f37DP79/QT+/PkD/Pv2Afv79gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPz8+AD8//0A/Pz5Dfz9+x/9/ftJ/f79Yv39/YD9/f2w/f79t/7+ - /b39/f3V/f794/3+/eX+/v3k/v793f7+/sL+/v63/v79sv3+/X39/f1d/f78Mf39+xD6+ukA/f35AAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8/fsA/P36Bf39+xv9/fxI/f38g/39/b/9/f3h/f799f39 - /f/9/f7//v7+//7+/f/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+/v7+ - /uv+/v3G/v79gP3+/DX9/fsJ////APv99wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD5+vcA//79APz8+Qf9/fsq/f38X/39/aL9/v3Z/f79+P39 - /f/9/v3//f3+//7+/v/+/v7//f39//7+/v/+/v3//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7s/v79sf7+/VT9/fsN/v7/APv79AAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMvYzwD///8A/fz7E/39/FP9/fyq/f396P39 - /fv9/f3//f79//3+/v/9/f7//f39//39/f/+/f7//v39//7+/f/9/v7//v3+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v73/v79tP7+ - /Df8/PcC/f36AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+/z5APr8+AL9/fsl/f38bP39 - /cj9/f33/f39//39/f/9/f3//f39//39/f/9/f7//f39//39/f/+/v7//v39//79/f/+/v3//f3+//7+ - /f/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7l/v79af7++wj+/v0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8/PgA+/vvAf39 - +yT9/fyF/f393f39/f79/f3//f39//79/f/9/f3//f39//79/f/9/f3//f39//39/f/9/v3//f39//3+ - /f/+/v3//v39//79/f/+/v7//v7+//7+/v/+/f7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/vX+/v2Z/f37FP39/AAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPn5 - 8gD///8A/P38FP39/HD9/f3Z/f39/v39/f/9/f3//f39//39/f/9/f3//f39//39/fb9/f3b/f39y/39 - /Zz9/f2H/f38hP39+3z9/ft7/f38ev39/H79/f2H/v79iP79/a7+/v3U/v797P7+/v7+/f7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+/f7+ - /ZX9/fsM/f38AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAPz8+gD8/PoI/f38WP39/cj9/f36/f39//39/f/9/f3//f39//39/f39/f3n/f38u/39 - /Hz9/fxG/f38G/z9+w/7/PcE+/z3AAAAAAAAAAAAAAAAAAAAAAAAAAAA+/v2AP///wD9/foI/v78Ev39 - /DX9/fxu/f39s/7+/en+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v75/v7+dP7++gL+/vwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAA+Pn2AP7+/QD8/fwf/f38j/39/fX9/f3//f39//39/f/9/f3+/f396v39 - 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 - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/+vIA//ryAP39 - +gL8+/oC/vz5Avv9+QL9/fkC/f35Av3+/wD9/fxr/f39//39/f/9/f3//f39//39/cv9/fsR/f36Af39 - +wL+/fsC/fz4Avz9+gL9/fkC/vv5Avz59QD8+fUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAPr89wD+/f8A/f79N/7+/tX+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7+3/7+ - /UT+//8A/vz7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA/fz7AP38+xH9/fyY/f38sf39/K/9/fyv/f38sP39/LD9/fyu/f39xv39/f79/f3//f39//39 - /f/9/f3y/f39tf39/a/9/f2v/f39r/39/a/9/f2v/f39sf39/Z39/Psa/fz8AAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP38+ADz7LUA/f39Of7+/tT+/v7//v7+//7+/v/+/v7//v7+//7+ - /v/+/v7//v791v79/UL8//wA/v39AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPz8+wD8/PoV/fz80f39/f/9/f3//f39//39/f/9/f3//f39//39 - /f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39/f/9/f38/f39Vv39 - /QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP38+wD9/PoE/f38XP3+/d/+/v7//v7+//7+ - /v/+/v7//v7+//7+/v/+/v7//v79vf39/DT///8A/fz6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8+/gA9/HhAP38/Jv9/f3//f39//39 - /f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39 - 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 - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPv5 - 8QD9//8A/Pv4Bf39/Az8/Psc/Pz7O/39/UT9/f1E/f39RP39/UT9/f1E/fz7Pfz8+x/9/v0N/f36C/v6 - 9gH7+vYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA//////////////////////////////////////////////////////////////////////// - ///////////////////gAP///////gAAD//////gAAAD/////wAAAAD////8AAAAAD///+AAAAAAH/// - gAAAAAAP//8AAAAAAAf//AAD/AAAA//4AH//wAAD/+AB/wPwAAH/wA/8APwAAf+AP/AAfwAA/wD/8AA/ - gAD+A//wAB/AAPwH//gQH+AA+A//+PwP4AD4P////A/wAPB////gD/AA4PwH/4Af8ADh/Af/AB/wAMH8 - B/4AP/gAw/4D/gD/8ACH/gP8A//wAIf+A/wPH/AAj/4D/gAP8AGP/wH+AAfgAZ//Af8AB+ADH/8B/4AP - wAMf/wD/wB/AB///gP/4/4AH//+A////AA///4D///8AH///gP///gA//8BAAH/8AH//wAAAf/AA///A - AAB/4AH//8AAAH/AA///4AAAPwAH///gAAA+AA////////gAP///////4AB///4///8AAf///gP/8AAH - ////AAAAAB////+AAAAAf////+AAAAP/////+AAAH///////gAH///////////////////////////// - //////////////////////////////////////////////////8= + AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////VP///6v///////////////////////////////////////////// + /////////////////////////////////////////////////////////////////4n///9OAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///+t//////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + /78AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Iv//////////////v////7////+/////v/// + /7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v/// + /7///////////////ywAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///9A//////////////+BAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////gf//////////////QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///0D///////////// + /4EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAD///+B//////////////9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////QP// + ////////////gQAAAAD///9A////QP///0D///9A////QP///0D///9A////QP///0D///9A////QP// + /0D///9A////QP///0AAAAAAAAAAAP///4H//////////////0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAD///9A//////////////+BAAAAAP////////////////////////////////////////////////// + /////////////////////////////////4EAAAAA////gf//////////////QAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAP///0D//////////////4EAAAAA//////////////////////////////////////// + ////////////////////////////////////////////gQAAAAD///+B//////////////9AAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////QP//////////////gQAAAAD///+B////fv///4H///+B////gf// + /4H///+B////gf///4H///+B////gf///4H///+B////gf///4H///8qAAAAAP///4H///////////// + /0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///9A//////////////+BAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////gf// + ////////////QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///0D//////////////4EAAAAAAAAAAP// + /yD////V////9////+X////R////v////1QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAD///+B//////////////9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////QP//////////////gQAA + AAAAAAAA////Nv///////////////////////////////////1QAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAP///4H//////////////0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///9A//////// + //////+BAAAAAAAAAAD///8m//////////////9U////eP////3//////////////1QAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////gf//////////////QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// + /0D//////////////4EAAAAAAAAAAP///xT//////////////zYAAAAA////Tv////f///////////// + /1QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///+B//////////////9AAAAAAAAAAAAAAAAAAAAAAAAA + AAD///8u////QP//////////////gQAAAAAAAAAA////BP///9//////////qwAAAAAAAAAA////SP// + /+///////////////1QAAAAAAAAAAAAAAAAAAAAAAAAAAP///4H//////////////0D///8oAAAAAAAA + AAD///8Y////y/////////////////////////+BAAAAAAAAAAAAAAAA////VP//////////////qwAA + AAAAAAAA////QP///+n//////////////1QAAAAAAAAAAAAAAAAAAAAA////gf////////////////// + ///////H////Fv///6///////////////////////////////4EAAAAAAAAAAAAAAAAAAAAA////VP// + ////////////qwAAAAAAAAAA////OP///+P//////////////1QAAAAAAAAAAAAAAAD///+B//////// + //////////////////////+t////7f/////////n////QP///0D///9A////QAAAAAAAAAAAAAAAAAAA + AAAAAAAA////VP//////////////qwAAAAAAAAAA////Mv///93//////////////1QAAAAAAAAAAP// + /0D///9A////QP///0D////r//////////H///+n////////////////////RgAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////VP//////////////qwAAAAAAAAAA////LP///9f/////////3wAA + AAAAAAAAAAAAAAAAAAD///9O////////////////////gQAAAAD///+v////////////////////ZAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////VP//////////////qwAAAAD///9i//////// + ///////JAAAAAAAAAAAAAAAA////dv///////////////////7UAAAAAAAAAAAAAAAD///+F//////// + ////////////gwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////VP//////////////q/// + ////////////yf///yIAAAAAAAAAAP///53///////////////////+VAAAAAAAAAAAAAAAAAAAAAAAA + AAD///9a////////////////////owAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////VP// + /////////////////7v///8WAAAAAAAAAAD///+3////////////////////dAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAD///84////////////////////wf///xwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////VP///9////+r////CgAAAAD///8m////z////////////////////1YAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8k////7///////////////3////zgAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Tv///+f///////////////X///82AAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8O////xf///////////////f// + /1QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///2r////////////////////Z////FgAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////m/// + /////////////////3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///+D////////////////////vwAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////g////////////////////48AAAAAAAAAAAAAAAAAAAAA////m/////////////////// + /6MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////bv///////////////////6v///8c////Hv///7H///////////// + //////+HAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Wv///////////////////8f////J//////// + ////////////agAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Rv///+P///////////// + ////////////5////04AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////MP// + /5/////f////2////5n///80AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA+AAAH/AAAA/wAAAP8f//j/H//4/x//+P8QAAj/EAAI/xQAGP8f//j/HB + /4/xwP+P8cx/j/HOP4/xxx+PgeOPgQHxx4Af+OP4D/xx8If+MeHB/wOD8P+HD/h/zh/8P/w//h/4f/8P + 4P//g8H//+GD///wD///+B////w///////8= \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmSelectCustoInfo.Designer.cs b/SYS.FormUI/AppFunction/FrmSelectCustoInfo.Designer.cs index b14a09e5b4ebca0f50e0d2997a8eee517917ad80..9c35c272e9dee1bd2a4ede6fd82e9cc7ff234ae2 100644 --- a/SYS.FormUI/AppFunction/FrmSelectCustoInfo.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmSelectCustoInfo.Designer.cs @@ -345,6 +345,7 @@ this.MinimizeBox = false; this.Name = "FrmSelectCustoInfo"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Style = Sunny.UI.UIStyle.Custom; this.Text = "客户信息"; this.Load += new System.EventHandler(this.FrmSelectCustoInfo_Load); diff --git a/SYS.FormUI/AppFunction/FrmSellThing.Designer.cs b/SYS.FormUI/AppFunction/FrmSellThing.Designer.cs index 09c9e9b8a0f25fed21829e8c2d56a748ca4f7986..97a44463c577f78b71627453817f0b5e2798a1cc 100644 --- a/SYS.FormUI/AppFunction/FrmSellThing.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmSellThing.Designer.cs @@ -49,16 +49,6 @@ this.txtSellNo = new Sunny.UI.UITextBox(); this.uiLabel3 = new Sunny.UI.UILabel(); this.dgvRoomSell = new Sunny.UI.UIDataGridView(); - this.dgvSellthing = new Sunny.UI.UIDataGridView(); - this.btnAdd = new Sunny.UI.UIButton(); - this.btnCancel = new Sunny.UI.UIButton(); - this.btnFind = new Sunny.UI.UIButton(); - this.txtFind = new Sunny.UI.UITextBox(); - this.uiLabel1 = new Sunny.UI.UILabel(); - this.uiLabel2 = new Sunny.UI.UILabel(); - this.txtRoomNo = new Sunny.UI.UITextBox(); - this.lblState = new Sunny.UI.UILabel(); - this.btnCheck = new Sunny.UI.UIButton(); this.clRoomNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.clCustoNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.clSpendName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -73,6 +63,7 @@ this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgvSellthing = new Sunny.UI.UIDataGridView(); this.clSellNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -83,6 +74,15 @@ this.clSellPrice = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.clFormat = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.clStock = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btnAdd = new Sunny.UI.UIButton(); + this.btnCancel = new Sunny.UI.UIButton(); + this.btnFind = new Sunny.UI.UIButton(); + this.txtFind = new Sunny.UI.UITextBox(); + this.uiLabel1 = new Sunny.UI.UILabel(); + this.uiLabel2 = new Sunny.UI.UILabel(); + this.txtRoomNo = new Sunny.UI.UITextBox(); + this.lblState = new Sunny.UI.UILabel(); + this.btnCheck = new Sunny.UI.UIButton(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvRoomSell)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvSellthing)).BeginInit(); @@ -300,6 +300,118 @@ this.dgvRoomSell.Style = Sunny.UI.UIStyle.Custom; this.dgvRoomSell.TabIndex = 15; // + // clRoomNo + // + this.clRoomNo.DataPropertyName = "RoomNo"; + this.clRoomNo.FillWeight = 102.6831F; + this.clRoomNo.HeaderText = "房号"; + this.clRoomNo.Name = "clRoomNo"; + this.clRoomNo.ReadOnly = true; + // + // clCustoNo + // + this.clCustoNo.DataPropertyName = "CustoNo"; + this.clCustoNo.FillWeight = 102.6831F; + this.clCustoNo.HeaderText = "客户编号"; + this.clCustoNo.Name = "clCustoNo"; + this.clCustoNo.ReadOnly = true; + // + // clSpendName + // + this.clSpendName.DataPropertyName = "SpendName"; + this.clSpendName.FillWeight = 102.6831F; + this.clSpendName.HeaderText = "商品"; + this.clSpendName.Name = "clSpendName"; + this.clSpendName.ReadOnly = true; + // + // clSpendAmount + // + this.clSpendAmount.DataPropertyName = "SpendAmount"; + this.clSpendAmount.FillWeight = 60F; + this.clSpendAmount.HeaderText = "数量"; + this.clSpendAmount.Name = "clSpendAmount"; + this.clSpendAmount.ReadOnly = true; + // + // clSpendPrice + // + this.clSpendPrice.DataPropertyName = "SpendPriceStr"; + this.clSpendPrice.FillWeight = 102.6831F; + this.clSpendPrice.HeaderText = "单价"; + this.clSpendPrice.Name = "clSpendPrice"; + this.clSpendPrice.ReadOnly = true; + // + // clSpendMoney + // + this.clSpendMoney.DataPropertyName = "SpendMoneyStr"; + this.clSpendMoney.FillWeight = 102.6831F; + this.clSpendMoney.HeaderText = "总额"; + this.clSpendMoney.Name = "clSpendMoney"; + this.clSpendMoney.ReadOnly = true; + // + // clSpendTime + // + this.clSpendTime.DataPropertyName = "SpendTime"; + this.clSpendTime.FillWeight = 102.6831F; + this.clSpendTime.HeaderText = "消费时间"; + this.clSpendTime.Name = "clSpendTime"; + this.clSpendTime.ReadOnly = true; + // + // clSpendNo + // + this.clSpendNo.DataPropertyName = "delete_mk"; + this.clSpendNo.HeaderText = "Column1"; + this.clSpendNo.Name = "clSpendNo"; + this.clSpendNo.ReadOnly = true; + this.clSpendNo.Visible = false; + // + // Column8 + // + this.Column8.DataPropertyName = "MoneyState"; + this.Column8.HeaderText = "Column8"; + this.Column8.Name = "Column8"; + this.Column8.ReadOnly = true; + this.Column8.Visible = false; + // + // Column6 + // + this.Column6.DataPropertyName = "datains_usr"; + this.Column6.HeaderText = "Column6"; + this.Column6.Name = "Column6"; + this.Column6.ReadOnly = true; + this.Column6.Visible = false; + // + // Column7 + // + this.Column7.DataPropertyName = "datains_date"; + this.Column7.HeaderText = "Column7"; + this.Column7.Name = "Column7"; + this.Column7.ReadOnly = true; + this.Column7.Visible = false; + // + // Column9 + // + this.Column9.DataPropertyName = "datachg_usr"; + this.Column9.HeaderText = "Column9"; + this.Column9.Name = "Column9"; + this.Column9.ReadOnly = true; + this.Column9.Visible = false; + // + // Column10 + // + this.Column10.DataPropertyName = "datachg_date"; + this.Column10.HeaderText = "Column10"; + this.Column10.Name = "Column10"; + this.Column10.ReadOnly = true; + this.Column10.Visible = false; + // + // Column11 + // + this.Column11.DataPropertyName = "SpendStateNm"; + this.Column11.HeaderText = "Column11"; + this.Column11.Name = "Column11"; + this.Column11.ReadOnly = true; + this.Column11.Visible = false; + // // dgvSellthing // this.dgvSellthing.AllowUserToAddRows = false; @@ -367,6 +479,82 @@ this.dgvSellthing.TabIndex = 16; this.dgvSellthing.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSellthing_CellClick); // + // clSellNo + // + this.clSellNo.DataPropertyName = "SellNo"; + this.clSellNo.HeaderText = "商品编号"; + this.clSellNo.Name = "clSellNo"; + this.clSellNo.ReadOnly = true; + // + // Column1 + // + this.Column1.DataPropertyName = "delete_mk"; + this.Column1.HeaderText = "Column1"; + this.Column1.Name = "Column1"; + this.Column1.ReadOnly = true; + this.Column1.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 = "Column5"; + this.Column5.Name = "Column5"; + this.Column5.ReadOnly = true; + this.Column5.Visible = false; + // + // clSellName + // + this.clSellName.DataPropertyName = "SellName"; + this.clSellName.HeaderText = "商品名称"; + this.clSellName.Name = "clSellName"; + this.clSellName.ReadOnly = true; + // + // clSellPrice + // + this.clSellPrice.DataPropertyName = "SellPriceStr"; + this.clSellPrice.HeaderText = "价格(元)"; + this.clSellPrice.Name = "clSellPrice"; + this.clSellPrice.ReadOnly = true; + // + // clFormat + // + this.clFormat.DataPropertyName = "format"; + this.clFormat.HeaderText = "规格"; + this.clFormat.Name = "clFormat"; + this.clFormat.ReadOnly = true; + // + // clStock + // + this.clStock.DataPropertyName = "Stock"; + this.clStock.FillWeight = 60F; + this.clStock.HeaderText = "库存"; + this.clStock.Name = "clStock"; + this.clStock.ReadOnly = true; + // // btnAdd // this.btnAdd.Cursor = System.Windows.Forms.Cursors.Hand; @@ -496,194 +684,6 @@ this.btnCheck.Text = "可否消费"; this.btnCheck.Click += new System.EventHandler(this.btnCheck_Click); // - // clRoomNo - // - this.clRoomNo.DataPropertyName = "RoomNo"; - this.clRoomNo.FillWeight = 102.6831F; - this.clRoomNo.HeaderText = "房号"; - this.clRoomNo.Name = "clRoomNo"; - this.clRoomNo.ReadOnly = true; - // - // clCustoNo - // - this.clCustoNo.DataPropertyName = "CustoNo"; - this.clCustoNo.FillWeight = 102.6831F; - this.clCustoNo.HeaderText = "客户编号"; - this.clCustoNo.Name = "clCustoNo"; - this.clCustoNo.ReadOnly = true; - // - // clSpendName - // - this.clSpendName.DataPropertyName = "SpendName"; - this.clSpendName.FillWeight = 102.6831F; - this.clSpendName.HeaderText = "商品"; - this.clSpendName.Name = "clSpendName"; - this.clSpendName.ReadOnly = true; - // - // clSpendAmount - // - this.clSpendAmount.DataPropertyName = "SpendAmount"; - this.clSpendAmount.FillWeight = 60F; - this.clSpendAmount.HeaderText = "数量"; - this.clSpendAmount.Name = "clSpendAmount"; - this.clSpendAmount.ReadOnly = true; - // - // clSpendPrice - // - this.clSpendPrice.DataPropertyName = "SpendPriceStr"; - this.clSpendPrice.FillWeight = 102.6831F; - this.clSpendPrice.HeaderText = "单价"; - this.clSpendPrice.Name = "clSpendPrice"; - this.clSpendPrice.ReadOnly = true; - // - // clSpendMoney - // - this.clSpendMoney.DataPropertyName = "SpendMoneyStr"; - this.clSpendMoney.FillWeight = 102.6831F; - this.clSpendMoney.HeaderText = "总额"; - this.clSpendMoney.Name = "clSpendMoney"; - this.clSpendMoney.ReadOnly = true; - // - // clSpendTime - // - this.clSpendTime.DataPropertyName = "SpendTime"; - this.clSpendTime.FillWeight = 102.6831F; - this.clSpendTime.HeaderText = "消费时间"; - this.clSpendTime.Name = "clSpendTime"; - this.clSpendTime.ReadOnly = true; - // - // clSpendNo - // - this.clSpendNo.DataPropertyName = "delete_mk"; - this.clSpendNo.HeaderText = "Column1"; - this.clSpendNo.Name = "clSpendNo"; - this.clSpendNo.ReadOnly = true; - this.clSpendNo.Visible = false; - // - // Column8 - // - this.Column8.DataPropertyName = "MoneyState"; - this.Column8.HeaderText = "Column8"; - this.Column8.Name = "Column8"; - this.Column8.ReadOnly = true; - this.Column8.Visible = false; - // - // Column6 - // - this.Column6.DataPropertyName = "datains_usr"; - this.Column6.HeaderText = "Column6"; - this.Column6.Name = "Column6"; - this.Column6.ReadOnly = true; - this.Column6.Visible = false; - // - // Column7 - // - this.Column7.DataPropertyName = "datains_date"; - this.Column7.HeaderText = "Column7"; - this.Column7.Name = "Column7"; - this.Column7.ReadOnly = true; - this.Column7.Visible = false; - // - // Column9 - // - this.Column9.DataPropertyName = "datachg_usr"; - this.Column9.HeaderText = "Column9"; - this.Column9.Name = "Column9"; - this.Column9.ReadOnly = true; - this.Column9.Visible = false; - // - // Column10 - // - this.Column10.DataPropertyName = "datachg_date"; - this.Column10.HeaderText = "Column10"; - this.Column10.Name = "Column10"; - this.Column10.ReadOnly = true; - this.Column10.Visible = false; - // - // Column11 - // - this.Column11.DataPropertyName = "SpendStateNm"; - this.Column11.HeaderText = "Column11"; - this.Column11.Name = "Column11"; - this.Column11.ReadOnly = true; - this.Column11.Visible = false; - // - // clSellNo - // - this.clSellNo.DataPropertyName = "SellNo"; - this.clSellNo.HeaderText = "商品编号"; - this.clSellNo.Name = "clSellNo"; - this.clSellNo.ReadOnly = true; - // - // Column1 - // - this.Column1.DataPropertyName = "delete_mk"; - this.Column1.HeaderText = "Column1"; - this.Column1.Name = "Column1"; - this.Column1.ReadOnly = true; - this.Column1.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 = "Column5"; - this.Column5.Name = "Column5"; - this.Column5.ReadOnly = true; - this.Column5.Visible = false; - // - // clSellName - // - this.clSellName.DataPropertyName = "SellName"; - this.clSellName.HeaderText = "商品名称"; - this.clSellName.Name = "clSellName"; - this.clSellName.ReadOnly = true; - // - // clSellPrice - // - this.clSellPrice.DataPropertyName = "SellPriceStr"; - this.clSellPrice.HeaderText = "价格(元)"; - this.clSellPrice.Name = "clSellPrice"; - this.clSellPrice.ReadOnly = true; - // - // clFormat - // - this.clFormat.DataPropertyName = "format"; - this.clFormat.HeaderText = "规格"; - this.clFormat.Name = "clFormat"; - this.clFormat.ReadOnly = true; - // - // clStock - // - this.clStock.DataPropertyName = "Stock"; - this.clStock.FillWeight = 60F; - this.clStock.HeaderText = "库存"; - this.clStock.Name = "clStock"; - this.clStock.ReadOnly = true; - // // FrmSellThing // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); @@ -708,6 +708,7 @@ this.MinimizeBox = false; this.Name = "FrmSellThing"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Style = Sunny.UI.UIStyle.Custom; this.Text = "商品消费"; this.Activated += new System.EventHandler(this.FrmSellThing_Activated); diff --git a/SYS.FormUI/AppFunction/FrmSellThingManager.Designer.cs b/SYS.FormUI/AppFunction/FrmSellThingManager.Designer.cs index 36409adff5418b3133a8f4e96d94b5ceff0933cd..9614d3075a7a4754271527bb80e39d36304a8328 100644 --- a/SYS.FormUI/AppFunction/FrmSellThingManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmSellThingManager.Designer.cs @@ -41,16 +41,6 @@ this.btnUpdateSellthing = new Sunny.UI.UIButton(); this.btnDeleteSellThing = new Sunny.UI.UIButton(); this.dgvSellthing = new Sunny.UI.UIDataGridView(); - this.txtStock = new Sunny.UI.UIDoubleUpDown(); - this.label4 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.txtformat = new Sunny.UI.UITextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.txtSellPrice = new Sunny.UI.UITextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.txtSellName = new Sunny.UI.UITextBox(); - this.label20 = new System.Windows.Forms.Label(); - this.txtSellNo = new Sunny.UI.UITextBox(); this.clSellNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -61,6 +51,16 @@ this.clSellPrice = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.clFormat = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.clStock = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.txtStock = new Sunny.UI.UIDoubleUpDown(); + this.label4 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.txtformat = new Sunny.UI.UITextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.txtSellPrice = new Sunny.UI.UITextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.txtSellName = new Sunny.UI.UITextBox(); + this.label20 = new System.Windows.Forms.Label(); + this.txtSellNo = new Sunny.UI.UITextBox(); ((System.ComponentModel.ISupportInitialize)(this.dgvSellthing)).BeginInit(); this.SuspendLayout(); // @@ -209,6 +209,82 @@ this.dgvSellthing.TabIndex = 118; this.dgvSellthing.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSellthing_CellClick); // + // clSellNo + // + this.clSellNo.DataPropertyName = "SellNo"; + this.clSellNo.HeaderText = "商品编号"; + this.clSellNo.Name = "clSellNo"; + this.clSellNo.ReadOnly = true; + // + // Column1 + // + this.Column1.DataPropertyName = "delete_mk"; + this.Column1.HeaderText = "Column1"; + this.Column1.Name = "Column1"; + this.Column1.ReadOnly = true; + this.Column1.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 = "Column5"; + this.Column5.Name = "Column5"; + this.Column5.ReadOnly = true; + this.Column5.Visible = false; + // + // clSellName + // + this.clSellName.DataPropertyName = "SellName"; + this.clSellName.HeaderText = "商品名称"; + this.clSellName.Name = "clSellName"; + this.clSellName.ReadOnly = true; + // + // clSellPrice + // + this.clSellPrice.DataPropertyName = "SellPriceStr"; + this.clSellPrice.HeaderText = "价格(元)"; + this.clSellPrice.Name = "clSellPrice"; + this.clSellPrice.ReadOnly = true; + // + // clFormat + // + this.clFormat.DataPropertyName = "format"; + this.clFormat.HeaderText = "规格"; + this.clFormat.Name = "clFormat"; + this.clFormat.ReadOnly = true; + // + // clStock + // + this.clStock.DataPropertyName = "Stock"; + this.clStock.FillWeight = 60F; + this.clStock.HeaderText = "库存"; + this.clStock.Name = "clStock"; + this.clStock.ReadOnly = true; + // // txtStock // this.txtStock.Decimal = 0; @@ -356,82 +432,6 @@ this.txtSellNo.TabIndex = 149; this.txtSellNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // - // clSellNo - // - this.clSellNo.DataPropertyName = "SellNo"; - this.clSellNo.HeaderText = "商品编号"; - this.clSellNo.Name = "clSellNo"; - this.clSellNo.ReadOnly = true; - // - // Column1 - // - this.Column1.DataPropertyName = "delete_mk"; - this.Column1.HeaderText = "Column1"; - this.Column1.Name = "Column1"; - this.Column1.ReadOnly = true; - this.Column1.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 = "Column5"; - this.Column5.Name = "Column5"; - this.Column5.ReadOnly = true; - this.Column5.Visible = false; - // - // clSellName - // - this.clSellName.DataPropertyName = "SellName"; - this.clSellName.HeaderText = "商品名称"; - this.clSellName.Name = "clSellName"; - this.clSellName.ReadOnly = true; - // - // clSellPrice - // - this.clSellPrice.DataPropertyName = "SellPriceStr"; - this.clSellPrice.HeaderText = "价格(元)"; - this.clSellPrice.Name = "clSellPrice"; - this.clSellPrice.ReadOnly = true; - // - // clFormat - // - this.clFormat.DataPropertyName = "format"; - this.clFormat.HeaderText = "规格"; - this.clFormat.Name = "clFormat"; - this.clFormat.ReadOnly = true; - // - // clStock - // - this.clStock.DataPropertyName = "Stock"; - this.clStock.FillWeight = 60F; - this.clStock.HeaderText = "库存"; - this.clStock.Name = "clStock"; - this.clStock.ReadOnly = true; - // // FrmSellThingManager // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); @@ -461,6 +461,7 @@ this.MinimizeBox = false; this.Name = "FrmSellThingManager"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "商品管理"; this.Load += new System.EventHandler(this.FrmSellThingManager_Load); ((System.ComponentModel.ISupportInitialize)(this.dgvSellthing)).EndInit(); diff --git a/SYS.FormUI/AppFunction/FrmSexType.Designer.cs b/SYS.FormUI/AppFunction/FrmSexType.Designer.cs index cf6280736b11acb70d33225fa08af2cd9c17a0a8..5da1ce954c3cfc7ecb1d8ea783fee0559d4ccb5e 100644 --- a/SYS.FormUI/AppFunction/FrmSexType.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmSexType.Designer.cs @@ -42,6 +42,7 @@ namespace SYS.FormUI this.MinimizeBox = false; this.Name = "FrmSexType"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "性别类型维护"; this.Load += new System.EventHandler(this.FrmSexType_Load); this.ResumeLayout(false); diff --git a/SYS.FormUI/AppFunction/FrmUpLoadNotice.Designer.cs b/SYS.FormUI/AppFunction/FrmUpLoadNotice.Designer.cs index c4b85e4100a1c4f3140d0a72e6c959de0fee83c6..af353c5aaa6884608edae180db5cff979fb0ad6e 100644 --- a/SYS.FormUI/AppFunction/FrmUpLoadNotice.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmUpLoadNotice.Designer.cs @@ -67,6 +67,7 @@ this.txtNoticeTheme.Style = Sunny.UI.UIStyle.Custom; this.txtNoticeTheme.StyleCustomMode = true; this.txtNoticeTheme.TabIndex = 112; + this.txtNoticeTheme.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // // label5 // @@ -97,7 +98,7 @@ this.dtpUpLoadDate.MaxLength = 10; this.dtpUpLoadDate.MinimumSize = new System.Drawing.Size(63, 0); this.dtpUpLoadDate.Name = "dtpUpLoadDate"; - this.dtpUpLoadDate.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.dtpUpLoadDate.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.dtpUpLoadDate.Radius = 20; this.dtpUpLoadDate.Size = new System.Drawing.Size(188, 35); this.dtpUpLoadDate.SymbolDropDown = 61555; @@ -119,6 +120,7 @@ // // cboSelectClub // + this.cboSelectClub.DataSource = null; this.cboSelectClub.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboSelectClub.FillColor = System.Drawing.Color.White; this.cboSelectClub.Font = new System.Drawing.Font("微软雅黑", 15.75F); @@ -126,7 +128,7 @@ this.cboSelectClub.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboSelectClub.MinimumSize = new System.Drawing.Size(63, 0); this.cboSelectClub.Name = "cboSelectClub"; - this.cboSelectClub.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.cboSelectClub.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cboSelectClub.Radius = 20; this.cboSelectClub.Size = new System.Drawing.Size(165, 35); this.cboSelectClub.TabIndex = 118; @@ -157,6 +159,7 @@ // // cbNoticeType // + this.cbNoticeType.DataSource = null; this.cbNoticeType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cbNoticeType.FillColor = System.Drawing.Color.White; this.cbNoticeType.Font = new System.Drawing.Font("微软雅黑", 15.75F); @@ -167,7 +170,7 @@ this.cbNoticeType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cbNoticeType.MinimumSize = new System.Drawing.Size(63, 0); this.cbNoticeType.Name = "cbNoticeType"; - this.cbNoticeType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.cbNoticeType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cbNoticeType.Radius = 20; this.cbNoticeType.Size = new System.Drawing.Size(165, 35); this.cbNoticeType.TabIndex = 121; @@ -195,6 +198,7 @@ this.MinimizeBox = false; this.Name = "FrmUpLoadNotice"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "上传任命公告"; this.Load += new System.EventHandler(this.FrmUpLoad_Load); this.ResumeLayout(false); diff --git a/SYS.FormUI/AppFunction/FrmVipRule.Designer.cs b/SYS.FormUI/AppFunction/FrmVipRule.Designer.cs index 1d0312649135b1013c0930d754869b81191e86fc..2eec2a254d009066c079227b5de1123420db31d1 100644 --- a/SYS.FormUI/AppFunction/FrmVipRule.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmVipRule.Designer.cs @@ -54,6 +54,7 @@ namespace SYS.FormUI this.flpVipType.Size = new System.Drawing.Size(489, 578); this.flpVipType.TabIndex = 0; this.flpVipType.Text = "uiFlowLayoutPanel1"; + this.flpVipType.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // // btnOK // @@ -86,6 +87,7 @@ namespace SYS.FormUI this.txtRuleId.Style = Sunny.UI.UIStyle.Custom; this.txtRuleId.StyleCustomMode = true; this.txtRuleId.TabIndex = 184; + this.txtRuleId.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // // txtRuleName // @@ -104,6 +106,7 @@ namespace SYS.FormUI this.txtRuleName.Style = Sunny.UI.UIStyle.Custom; this.txtRuleName.StyleCustomMode = true; this.txtRuleName.TabIndex = 185; + this.txtRuleName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; // // label4 // @@ -137,6 +140,7 @@ namespace SYS.FormUI // // cboCustoType // + this.cboCustoType.DataSource = null; this.cboCustoType.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList; this.cboCustoType.FillColor = System.Drawing.Color.White; this.cboCustoType.Font = new System.Drawing.Font("微软雅黑", 15.75F); @@ -144,7 +148,7 @@ namespace SYS.FormUI this.cboCustoType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cboCustoType.MinimumSize = new System.Drawing.Size(63, 0); this.cboCustoType.Name = "cboCustoType"; - this.cboCustoType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); + this.cboCustoType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.cboCustoType.Radius = 20; this.cboCustoType.Size = new System.Drawing.Size(250, 35); this.cboCustoType.TabIndex = 188; @@ -170,7 +174,9 @@ namespace SYS.FormUI 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; @@ -178,6 +184,7 @@ namespace SYS.FormUI this.dudSpendAmount.Step = 5000D; this.dudSpendAmount.TabIndex = 189; this.dudSpendAmount.Text = null; + this.dudSpendAmount.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; this.dudSpendAmount.Value = 0D; // // btnReset @@ -214,6 +221,7 @@ namespace SYS.FormUI this.MinimizeBox = false; this.Name = "FrmVipRule"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "会员等级规则"; this.Load += new System.EventHandler(this.FrmVipRule_Load); this.ResumeLayout(false); diff --git a/SYS.FormUI/AppFunction/FrmVipRule.resx b/SYS.FormUI/AppFunction/FrmVipRule.resx index aab3de4b918fdb6fc782c7f95a5f067ff1ca0184..5b66478bd9abc9130f46e492920d0b959fea2b23 100644 --- a/SYS.FormUI/AppFunction/FrmVipRule.resx +++ b/SYS.FormUI/AppFunction/FrmVipRule.resx @@ -120,15 +120,78 @@ - AAABAAEAICAAAAEAGAD8AQAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAAFz - UkdCAK7OHOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA7DAAAOwwHHb6hkAAABkUlEQVRYR+2XoU4D - QRBA+wEkGD4AgSJB1qCwJFgSEjyOqnqwfEAFqoYgkAhsFQ4Bkg8gaaisv+NNM9eUZfe6O7sHacIlk8tt - d2bezszubHs9z1NV1QFyg0xSpa7rIzGJ3hUy5nvX5yM4htIJ8oGi9VkCiAFsvfLaiYZg8ovVs+p9A1CI - eRQAtGeZzkV9AcD7etUWtmdrIZh03xVAk45WCCm4XABsDLQIz322+P2xrQCzAXD60DiQnaCpkHQspWsA - Wfjp2nwH9n+JCCwiz+qHyLEUpSu/EYFgKUmd/QNsVgTI2ROyZ6lq9zTU4oyvARxPLY5XddzDLakIpZ0W - ABg7PSE+AhqyvhWCBewj71kACvGWejEJ9ZWkFOQ2pkAzSktBaYjNjADUd762KmN6+ZQLqCui8+NJjoB1 - BzR6LkESAJNvcwHEhnkbFjoJp2YAPQNMvUD6h/SRrBSU3oLJzegvAC67cOrUwChY2EzcIm85/wtj+Ntv - zAAcxlixzIlu7xjfZvII+bQ4ckI+x84zYxe+0H8BcrBENIj4pCgAAAAASUVORK5CYII= + AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////nf///7////+/////v////7////+/////CgAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wj///////////////////////////////////94AAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////fP////////////////////////////////// + /+cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////z//////////////////////// + /////////////////zQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Wv////////////////// + ////////////////////////////owAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////T//////// + ////////////////////////////////////////////BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Pv// + ///////////////////////////////////////b//////////////9cAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAD///+x////////////////////////////////////3////3T//////////////8sAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////Kv////////////////////////////////////////94////Dv////////////////// + /ywAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAD///+R////////////////////////////////////8f///xIAAAAA////rf// + ////////////hwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////GP////////////////////////////////////////+RAAAAAAAA + AAD///9G///////////////1AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///92//////////////////////////////////////// + /yoAAAAAAAAAAAAAAAD////X//////////////9UAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////BP///+f///////////////////////////// + //////+lAAAAAAAAAAAAAAAAAAAAAP///37//////////////7EAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///9i//////////////////////// + /////////////////0IAAAAAAAAAAAAAAAAAAAAA////GP///////////////////ygAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///8X///////////// + //////////////////////+5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////qf//////////////fAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///9O//////// + /////////////////////////////////1oAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///9Q//////// + ///////ZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// + /63////////////////////////////////////LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAD////P//////////////9OAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAD///86/////////////////////////////////////////2wAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAP///3j//////////////6MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAP///5n////////////////////////////////////f////DAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////Iv////f//////////////yIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAD///8m////+////////////////////////////////////4EAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////of//////////////dgAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///4X////////////////////////////////////z////IgAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///9K///////////////LAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8g////6/////////////////////////////////// + /5cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////b//////// + //////9OAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///5X///////////////////////////// + ////////////SAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// + /5///////////////8EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8g//////////////////////// + //////////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////j////////////////////2AAAAAAAAAAAAAAAAAAAAAA////cP///7f///////////// + /////////////////////////////////2b///8u////Hv///wwAAAAAAAAAAAAAAAAAAAAAAAAAAP// + /xb///82////VP///3b/////////////////////////3////3T///8w////EP///4H///+/////v/// + /7////+/////v////7////+/////v////7////+/////v////6P///8y////vwAAAAAAAAAAAAAAAAAA + AAAAAAAA////v////8P////D////wf///8H///+/////v////7////+/////v////7////9+AAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA//////////////////gf///4H///+A////AP///wB///4Af//+AH///A + I///wGP//4Bh//+Acf//gPH//wD4//8B+P/+Afj//gP8f/wD/H/8B/4/+Af+P/gH/j/wD/8f8A//H+Af + /w/gH/8PwB//BwAF8AH///////////////8= \ No newline at end of file diff --git a/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs b/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs index 7076fedc6e1faf6b8e6ee8be3260ff1baa188c6f..afd335052978076f40d9e35b1a04d015f645b653 100644 --- a/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs @@ -32,6 +32,7 @@ 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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmWorkerCheckInfo)); this.lblWorkerInfo = new System.Windows.Forms.Label(); this.DgvCheckInfoList = new Sunny.UI.UIDataGridView(); @@ -69,7 +70,7 @@ 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.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.DgvCheckInfoList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; @@ -100,9 +101,18 @@ this.DgvCheckInfoList.Location = new System.Drawing.Point(3, 88); this.DgvCheckInfoList.Name = "DgvCheckInfoList"; this.DgvCheckInfoList.ReadOnly = true; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F); + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.DgvCheckInfoList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.DgvCheckInfoList.RowHeadersVisible = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.White; - this.DgvCheckInfoList.RowsDefaultCellStyle = dataGridViewCellStyle4; + 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; @@ -200,6 +210,7 @@ this.MinimizeBox = false; this.Name = "FrmWorkerCheckInfo"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Text = "员工打卡考勤记录查看页"; this.Load += new System.EventHandler(this.FrmWorkerCheckInfo_Load); ((System.ComponentModel.ISupportInitialize)(this.DgvCheckInfoList)).EndInit(); diff --git a/SYS.FormUI/AppFunction/FrmWorkerManager.Designer.cs b/SYS.FormUI/AppFunction/FrmWorkerManager.Designer.cs index 7b37ce5e279b8aaddd071c844cf4f3be7fb83e49..ef26ca0130a3772e8e521af95e758d3a4407805d 100644 --- a/SYS.FormUI/AppFunction/FrmWorkerManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmWorkerManager.Designer.cs @@ -32,6 +32,7 @@ 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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmWorkerManager)); this.dgvWorkerList = new Sunny.UI.UIDataGridView(); this.clWorkerNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -78,7 +79,7 @@ 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.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvWorkerList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; @@ -123,9 +124,18 @@ this.dgvWorkerList.Location = new System.Drawing.Point(3, 38); this.dgvWorkerList.Name = "dgvWorkerList"; this.dgvWorkerList.ReadOnly = true; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F); + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvWorkerList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvWorkerList.RowHeadersVisible = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.White; - this.dgvWorkerList.RowsDefaultCellStyle = dataGridViewCellStyle4; + 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; @@ -360,6 +370,7 @@ this.MinimizeBox = false; this.Name = "FrmWorkerManager"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Style = Sunny.UI.UIStyle.Custom; this.Text = "员工管理"; this.Load += new System.EventHandler(this.FrmTopChange_Load); diff --git a/SYS.FormUI/AppFunction/FrmWtiInfo.Designer.cs b/SYS.FormUI/AppFunction/FrmWtiInfo.Designer.cs index dc3b840eae85153581de0aa6ddca0fd1bc4d6773..4abb599010d7df9247d82b88b8bfb2220ba9dbf2 100644 --- a/SYS.FormUI/AppFunction/FrmWtiInfo.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmWtiInfo.Designer.cs @@ -51,6 +51,7 @@ this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.btnUpdWti = new Sunny.UI.UIButton(); this.pnlWtiInfo = new Sunny.UI.UIPanel(); + this.btnClose = new Sunny.UI.UIButton(); this.txtCustoNo = new Sunny.UI.UITextBox(); this.dtpEndDate = new Sunny.UI.UIDatePicker(); this.label1 = new System.Windows.Forms.Label(); @@ -66,7 +67,6 @@ this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.uiToolTip1 = new Sunny.UI.UIToolTip(this.components); - this.btnClose = new Sunny.UI.UIButton(); ((System.ComponentModel.ISupportInitialize)(this.dgvWti)).BeginInit(); this.pnlWtiInfo.SuspendLayout(); this.SuspendLayout(); @@ -284,6 +284,21 @@ this.pnlWtiInfo.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; this.pnlWtiInfo.Visible = false; // + // btnClose + // + this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnClose.Enabled = false; + this.btnClose.Font = new System.Drawing.Font("微软雅黑", 12F); + this.btnClose.Location = new System.Drawing.Point(640, 416); + this.btnClose.MinimumSize = new System.Drawing.Size(1, 1); + this.btnClose.Name = "btnClose"; + this.btnClose.Radius = 20; + this.btnClose.Size = new System.Drawing.Size(109, 28); + this.btnClose.Style = Sunny.UI.UIStyle.Custom; + this.btnClose.TabIndex = 136; + this.btnClose.Text = "关 闭"; + this.btnClose.Click += new System.EventHandler(this.btnClose_Click); + // // txtCustoNo // this.txtCustoNo.Cursor = System.Windows.Forms.Cursors.IBeam; @@ -502,21 +517,6 @@ this.uiToolTip1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(239)))), ((int)(((byte)(239))))); this.uiToolTip1.OwnerDraw = true; // - // btnClose - // - this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnClose.Enabled = false; - this.btnClose.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnClose.Location = new System.Drawing.Point(640, 416); - this.btnClose.MinimumSize = new System.Drawing.Size(1, 1); - this.btnClose.Name = "btnClose"; - this.btnClose.Radius = 20; - this.btnClose.Size = new System.Drawing.Size(109, 28); - this.btnClose.Style = Sunny.UI.UIStyle.Custom; - this.btnClose.TabIndex = 136; - this.btnClose.Text = "关 闭"; - this.btnClose.Click += new System.EventHandler(this.btnClose_Click); - // // FrmWtiInfo // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); @@ -533,6 +533,7 @@ this.Name = "FrmWtiInfo"; this.ShowIcon = true; this.ShowInTaskbar = false; + this.ShowTitleIcon = true; this.Style = Sunny.UI.UIStyle.Custom; this.Text = "水电信息"; this.Load += new System.EventHandler(this.WtiInfo_Load); diff --git a/SYS.FormUI/AppInterface/FrmAdminEnter.Designer.cs b/SYS.FormUI/AppInterface/FrmAdminEnter.Designer.cs index 3fd9890e3f43a4c262ba22b2f419451ea79b7081..d9072a622e0a2975c727c7ff806f617b8ad2ec1d 100644 --- a/SYS.FormUI/AppInterface/FrmAdminEnter.Designer.cs +++ b/SYS.FormUI/AppInterface/FrmAdminEnter.Designer.cs @@ -46,7 +46,7 @@ this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.pictureBox1.Location = new System.Drawing.Point(3, 38); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(694, 354); + this.pictureBox1.Size = new System.Drawing.Size(579, 320); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox1.TabIndex = 12; this.pictureBox1.TabStop = false; @@ -56,7 +56,7 @@ this.txtAccount.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtAccount.FillColor = System.Drawing.Color.White; this.txtAccount.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtAccount.Location = new System.Drawing.Point(309, 409); + this.txtAccount.Location = new System.Drawing.Point(243, 409); this.txtAccount.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtAccount.Maximum = 100D; this.txtAccount.MaxLength = 20; @@ -75,7 +75,7 @@ // 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(202, 414); + this.label1.Location = new System.Drawing.Point(136, 414); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(107, 25); this.label1.TabIndex = 105; @@ -86,7 +86,7 @@ this.txtPassword.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtPassword.FillColor = System.Drawing.Color.White; this.txtPassword.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtPassword.Location = new System.Drawing.Point(309, 463); + this.txtPassword.Location = new System.Drawing.Point(243, 463); this.txtPassword.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtPassword.Maximum = 2147483647D; this.txtPassword.MaxLength = 20; @@ -106,7 +106,7 @@ // 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(202, 468); + this.label3.Location = new System.Drawing.Point(136, 468); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(107, 25); this.label3.TabIndex = 107; @@ -124,11 +124,11 @@ // this.btnCheckIn.Cursor = System.Windows.Forms.Cursors.Hand; this.btnCheckIn.Font = new System.Drawing.Font("微软雅黑", 12F); - this.btnCheckIn.Location = new System.Drawing.Point(240, 525); + this.btnCheckIn.Location = new System.Drawing.Point(203, 525); this.btnCheckIn.MinimumSize = new System.Drawing.Size(1, 1); this.btnCheckIn.Name = "btnCheckIn"; this.btnCheckIn.Radius = 20; - this.btnCheckIn.Size = new System.Drawing.Size(220, 54); + this.btnCheckIn.Size = new System.Drawing.Size(180, 35); this.btnCheckIn.Style = Sunny.UI.UIStyle.Custom; this.btnCheckIn.TabIndex = 112; this.btnCheckIn.Text = "登 录"; @@ -140,7 +140,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.ClientSize = new System.Drawing.Size(700, 607); + this.ClientSize = new System.Drawing.Size(586, 603); this.Controls.Add(this.btnCheckIn); this.Controls.Add(this.txtPassword); this.Controls.Add(this.label3); @@ -153,6 +153,7 @@ this.MinimizeBox = false; this.Name = "FrmAdminEnter"; this.ShowIcon = true; + this.ShowTitleIcon = true; this.Style = Sunny.UI.UIStyle.Custom; this.Text = "超级管理员安全系统"; this.Load += new System.EventHandler(this.FrmAdminEnter_Load); diff --git a/SYS.FormUI/AppInterface/FrmAdminEnter.resx b/SYS.FormUI/AppInterface/FrmAdminEnter.resx index b99c37efaae194924fbdc46f9d6fcb4452a17fe5..50dd6f6d0c0d45f4f4062fcc891dc478bcf4c1fe 100644 --- a/SYS.FormUI/AppInterface/FrmAdminEnter.resx +++ b/SYS.FormUI/AppInterface/FrmAdminEnter.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAABLgAAAKmCAYAAABOqSeHAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL - EQAACxEBf2RfkQAA/7JJREFUeF7s3Qd8E9ee93/ZphNI74ViSO+9995Dc8fdpqUnN733gA2kkApJIIHQ + DwAACw8BkvkDpQAA/7JJREFUeF7s3Qd8E9ee93/ZphNI74ViSO+9995Dc8fdpqUnN733gA2kkApJIIHQ Qye5uVueZ/9399ndu7t3+40bxbZkW12WIY3v//zOSERRBhgXaWTzfd3Xe2UmuGhmZEafPeeMo2jVDupl SlZHfLXTUbxqp34sWr3TUaj+W6H68+SV6lGJ/n3955iPY4xR3lJ/t1WBtiLyuMp4LFB/zloext1L2nHr Z+248ZMgrl0QxJUfB3Dxh35c9IHyvh9nv+vDaXO9OO0tL043ccbbSuTjU+Z6cMqcCPk41hzPzpPneLed diff --git a/SYS.FormUI/Properties/AssemblyInfo.cs b/SYS.FormUI/Properties/AssemblyInfo.cs index 52390fe196243edfe82e3e77e4a2e6d4ee541f74..7fc1ecd1deed17e4a9be79caf14d7b09c42f0aca 100644 --- a/SYS.FormUI/Properties/AssemblyInfo.cs +++ b/SYS.FormUI/Properties/AssemblyInfo.cs @@ -8,9 +8,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("TS酒店管理系统")] [assembly: AssemblyDescription("一款为中小型酒店打造的管理系统！")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("NF-TopSky小组&java-and-net")] +[assembly: AssemblyCompany("易开元(EOM)")] [assembly: AssemblyProduct("TS酒店管理系统")] -[assembly: AssemblyCopyright("Copyright © 2018-2021 TopSky小组&java-and-net")] +[assembly: AssemblyCopyright("Copyright © 2018-2024 易开元(EOM)")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/SYS.FormUI/Properties/Resources.Designer.cs b/SYS.FormUI/Properties/Resources.Designer.cs index c9c46094764bb608812b50fef2d8df9ae00b4012..e8d226cdc7a8b26d6f6f336e6429d5b8117165af 100644 --- a/SYS.FormUI/Properties/Resources.Designer.cs +++ b/SYS.FormUI/Properties/Resources.Designer.cs @@ -110,26 +110,6 @@ namespace SYS.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - public static System.Drawing.Bitmap minus { - get { - object obj = ResourceManager.GetObject("minus", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - public static System.Drawing.Bitmap minus__1_ { - get { - object obj = ResourceManager.GetObject("minus (1)", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -310,16 +290,6 @@ namespace SYS.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - public static System.Drawing.Bitmap 主页__1_ { - get { - object obj = ResourceManager.GetObject("主页 (1)", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -340,16 +310,6 @@ namespace SYS.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - public static System.Drawing.Bitmap 修改a { - get { - object obj = ResourceManager.GetObject("修改a", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -440,16 +400,6 @@ namespace SYS.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - public static System.Drawing.Bitmap 增加_添加_加减__1_ { - get { - object obj = ResourceManager.GetObject("增加 添加 加减 (1)", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -460,16 +410,6 @@ namespace SYS.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - public static System.Drawing.Bitmap 导出__4_ { - get { - object obj = ResourceManager.GetObject("导出 (4)", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -580,16 +520,6 @@ namespace SYS.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - public static System.Drawing.Bitmap 添加__增加___加 { - get { - object obj = ResourceManager.GetObject("添加 增加 加", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -700,26 +630,6 @@ namespace SYS.FormUI.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - public static System.Drawing.Bitmap 获取用户编号 { - get { - object obj = ResourceManager.GetObject("获取用户编号", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - public static System.Drawing.Bitmap 获取用户编号_ia { - get { - object obj = ResourceManager.GetObject("获取用户编号-ia", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/SYS.FormUI/Properties/Resources.resx b/SYS.FormUI/Properties/Resources.resx index ecc25ee8149ea74d6302a720e6e52269f4bda2c7..e4980fb127fd4fffb1e58988a8ad24bb17358d50 100644 --- a/SYS.FormUI/Properties/Resources.resx +++ b/SYS.FormUI/Properties/Resources.resx @@ -178,12 +178,6 @@ ..\Resources\人力资源部卡片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\添加 增加 加.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\主页 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\picCommodity.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -235,9 +229,6 @@ ..\Resources\锁屏.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\切换账号.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -265,9 +256,6 @@ ..\Resources\picExtend.ImagePress.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\获取用户编号.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\icon\转换.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -277,15 +265,9 @@ ..\Resources\咖啡.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\获取用户编号-ia.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\uiButton1.BackgroundImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\minus (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\上传照片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -322,28 +304,19 @@ ..\Resources\脏房icon1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\增加 添加 加减 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\导出 (4)1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\可住房(hover)icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\images\复制.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\修改.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\修改a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\检查更新 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\系统管理员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\修改.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/SYS.FormUI/SYS.FormUI.csproj b/SYS.FormUI/SYS.FormUI.csproj index fa354ede05bf7b7f38d57dba4440d96759dbdb0d..686cfc7306eea1ab5379d3a51b8160af87d8f4b9 100644 --- a/SYS.FormUI/SYS.FormUI.csproj +++ b/SYS.FormUI/SYS.FormUI.csproj @@ -87,7 +87,7 @@ ..\packages\jvncorelib.1.0.1.7\lib\net461\jvncorelib-fr.dll - ..\SYS.Library\kse.dll + ..\topsky-hotel-manager-system-web-api\Library\kse.dll ..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll @@ -641,18 +641,6 @@ Designer Always - - Always - - - Always - - - Always - - - Always - SettingsSingleFileGenerator @@ -733,36 +721,12 @@ - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - Always Always - - Always - - - Always - Always @@ -772,18 +736,9 @@ Always - - Always - Always - - Always - - - Always - Always @@ -811,16 +766,7 @@ Always - - Always - - - Always - - - Always - Always @@ -837,18 +783,9 @@ Always - - Always - - - Always - Always - - Always - Always @@ -861,18 +798,6 @@ Always - - Always - - - Always - - - Always - - - Always - Always @@ -906,18 +831,9 @@ Always - - Always - - - Always - Always - - Always - Always @@ -927,9 +843,6 @@ Always - - Always - Always @@ -1019,7 +932,6 @@ - diff --git a/SYS.FormUI/icon/atom.ico b/SYS.FormUI/icon/atom.ico deleted file mode 100644 index 136416ba7fe4c83a376c205b91a0b3b1cd817934..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/icon/atom.ico and /dev/null differ diff --git "a/SYS.FormUI/icon/\345\245\226\346\203\251.ico" "b/SYS.FormUI/icon/\345\245\226\346\203\251.ico" new file mode 100644 index 0000000000000000000000000000000000000000..f5858ae1cc4b70c3e875ddb112e183c5528882ac Binary files /dev/null and "b/SYS.FormUI/icon/\345\245\226\346\203\251.ico" differ diff --git "a/SYS.FormUI/icon/\346\210\277\351\227\264\344\277\256\346\224\271.ico" "b/SYS.FormUI/icon/\346\210\277\351\227\264\344\277\256\346\224\271.ico" new file mode 100644 index 0000000000000000000000000000000000000000..caf61d0262ddc950b34fbff73e13d1d3fcb88a88 Binary files /dev/null and "b/SYS.FormUI/icon/\346\210\277\351\227\264\344\277\256\346\224\271.ico" differ diff --git "a/SYS.FormUI/icon/\347\255\211\347\272\247.ico" "b/SYS.FormUI/icon/\347\255\211\347\272\247.ico" new file mode 100644 index 0000000000000000000000000000000000000000..d8ebacc183abdf166d0d3d66f489f884acf4b4c0 Binary files /dev/null and "b/SYS.FormUI/icon/\347\255\211\347\272\247.ico" differ diff --git a/SYS.FormUI/images/770e7b52ecafc807247aad51bb6c6b43.jpg b/SYS.FormUI/images/770e7b52ecafc807247aad51bb6c6b43.jpg deleted file mode 100644 index c44405ef6ca21158e68f5979441e309a969cfae3..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/images/770e7b52ecafc807247aad51bb6c6b43.jpg and /dev/null differ diff --git a/SYS.FormUI/images/77377282_p0_master1200.jpg b/SYS.FormUI/images/77377282_p0_master1200.jpg deleted file mode 100644 index a27866ea71c679f9b402ddfdae1db8ef0570bcad..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/images/77377282_p0_master1200.jpg and /dev/null differ diff --git a/SYS.FormUI/images/Alibaba-PuHuiTi-Regular.ttf b/SYS.FormUI/images/Alibaba-PuHuiTi-Regular.ttf deleted file mode 100644 index 9f8ab8d8f14f47c7e6a85e9aef2b619a41bf3075..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/images/Alibaba-PuHuiTi-Regular.ttf and /dev/null differ diff --git a/SYS.FormUI/images/GFont.otf b/SYS.FormUI/images/GFont.otf deleted file mode 100644 index 741201b053b3af12909569d24998691a7b961874..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/images/GFont.otf and /dev/null differ diff --git a/SYS.FormUI/images/JetBrainsMono-Regular.ttf b/SYS.FormUI/images/JetBrainsMono-Regular.ttf deleted file mode 100644 index 4781cc7f57b55e3e5defaeecafcd6bd7c096fa21..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/images/JetBrainsMono-Regular.ttf and /dev/null differ diff --git a/SYS.FormUI/images/Mono.ttf b/SYS.FormUI/images/Mono.ttf deleted file mode 100644 index e03ff7e6990da914a9e855906422f3d64f119dec..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/images/Mono.ttf and /dev/null differ diff --git a/SYS.FormUI/images/arrow-down-b.png b/SYS.FormUI/images/arrow-down-b.png deleted file mode 100644 index ac29f75d1e43542f6a03199f89af00db99a88b0a..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/images/arrow-down-b.png and /dev/null differ diff --git a/SYS.FormUI/images/close.png b/SYS.FormUI/images/close.png deleted file mode 100644 index 1f32edfbe55c3756d5aeb647883e2da63d7c82a7..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/images/close.png and /dev/null differ diff --git a/SYS.FormUI/images/delete2-a.png b/SYS.FormUI/images/delete2-a.png deleted file mode 100644 index ccb078fdaf0a303bc5b1258617c97272547c2cc9..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/images/delete2-a.png and /dev/null differ diff --git a/SYS.FormUI/images/delete2a.png b/SYS.FormUI/images/delete2a.png deleted file mode 100644 index 1aa0ef461ce5e97d19b520683d3588e83ec402c3..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/images/delete2a.png and /dev/null differ diff --git a/SYS.FormUI/images/minus (1).png b/SYS.FormUI/images/minus (1).png deleted file mode 100644 index fe329f1c6a44c254f6f1f5ea364d0673fe41e17c..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/images/minus (1).png and /dev/null differ diff --git a/SYS.FormUI/images/minus.png b/SYS.FormUI/images/minus.png deleted file mode 100644 index 52df7bf0d38413019fc9a85dfc4f57ea65d783dd..0000000000000000000000000000000000000000 Binary files a/SYS.FormUI/images/minus.png and /dev/null differ diff --git "a/SYS.FormUI/images/\344\270\273\351\241\265 (1).png" "b/SYS.FormUI/images/\344\270\273\351\241\265 (1).png" deleted file mode 100644 index ce108ca91de662cad9381c47cbaa6aaa7b0f46cc..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/images/\344\270\273\351\241\265 (1).png" and /dev/null differ diff --git "a/SYS.FormUI/images/\344\277\256\346\224\271a.png" "b/SYS.FormUI/images/\344\277\256\346\224\271a.png" deleted file mode 100644 index 23b1e8ccf35e33d75adbf56e9ba75b01f174cd77..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/images/\344\277\256\346\224\271a.png" and /dev/null differ diff --git "a/SYS.FormUI/images/\345\242\236\345\212\240 \346\267\273\345\212\240 \345\212\240\345\207\217 (1).png" "b/SYS.FormUI/images/\345\242\236\345\212\240 \346\267\273\345\212\240 \345\212\240\345\207\217 (1).png" deleted file mode 100644 index 8b1d03ac8f361a787ee47f995aeb66735f955c40..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/images/\345\242\236\345\212\240 \346\267\273\345\212\240 \345\212\240\345\207\217 (1).png" and /dev/null differ diff --git "a/SYS.FormUI/images/\345\257\274\345\207\272 (4).png" "b/SYS.FormUI/images/\345\257\274\345\207\272 (4).png" deleted file mode 100644 index a00adbad89f360e8da0d6040ea044b9a70b1f6c6..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/images/\345\257\274\345\207\272 (4).png" and /dev/null differ diff --git "a/SYS.FormUI/images/\345\257\274\345\207\272 (4)1.png" "b/SYS.FormUI/images/\345\257\274\345\207\272 (4)1.png" deleted file mode 100644 index a00adbad89f360e8da0d6040ea044b9a70b1f6c6..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/images/\345\257\274\345\207\272 (4)1.png" and /dev/null differ diff --git "a/SYS.FormUI/images/\346\220\234\347\264\242--1.png" "b/SYS.FormUI/images/\346\220\234\347\264\242--1.png" deleted file mode 100644 index dd4447d54534c04899d59895c810ca65835b1818..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/images/\346\220\234\347\264\242--1.png" and /dev/null differ diff --git "a/SYS.FormUI/images/\346\220\234\347\264\242--1a.png" "b/SYS.FormUI/images/\346\220\234\347\264\242--1a.png" deleted file mode 100644 index 8982ac99894114752c7cf7a9c5897b4263e2737c..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/images/\346\220\234\347\264\242--1a.png" and /dev/null differ diff --git "a/SYS.FormUI/images/\346\230\276\347\244\272.png" "b/SYS.FormUI/images/\346\230\276\347\244\272.png" deleted file mode 100644 index 6d6d2ee06294147634dbf63d24e7de5a628f5127..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/images/\346\230\276\347\244\272.png" and /dev/null differ diff --git "a/SYS.FormUI/images/\346\267\273 \345\212\240-a.png" "b/SYS.FormUI/images/\346\267\273 \345\212\240-a.png" deleted file mode 100644 index 7448305d71f3c04bf7a2bc1ed1e1d2e17e4cbc7f..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/images/\346\267\273 \345\212\240-a.png" and /dev/null differ diff --git "a/SYS.FormUI/images/\346\267\273 \345\212\240a.png" "b/SYS.FormUI/images/\346\267\273 \345\212\240a.png" deleted file mode 100644 index ab485b22771b5bc24d911283e05882c288cfacb0..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/images/\346\267\273 \345\212\240a.png" and /dev/null differ diff --git "a/SYS.FormUI/images/\346\267\273\345\212\240 \345\242\236\345\212\240 \345\212\240.png" "b/SYS.FormUI/images/\346\267\273\345\212\240 \345\242\236\345\212\240 \345\212\240.png" deleted file mode 100644 index 1a0809a4478ec9fae2534cf3fdc8400617b860a8..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/images/\346\267\273\345\212\240 \345\242\236\345\212\240 \345\212\240.png" and /dev/null differ diff --git "a/SYS.FormUI/images/\346\267\273\345\212\240\347\256\241\347\220\206\345\221\230.png" "b/SYS.FormUI/images/\346\267\273\345\212\240\347\256\241\347\220\206\345\221\230.png" deleted file mode 100644 index 6fa27c48ccf258a34bc4f3c7ad88ad68d2e18863..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/images/\346\267\273\345\212\240\347\256\241\347\220\206\345\221\230.png" and /dev/null differ diff --git "a/SYS.FormUI/images/\350\216\267\345\217\226\347\224\250\346\210\267\347\274\226\345\217\267-ia.png" "b/SYS.FormUI/images/\350\216\267\345\217\226\347\224\250\346\210\267\347\274\226\345\217\267-ia.png" deleted file mode 100644 index 7e53d4160408a78e26f589b5168bb591757f0b05..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/images/\350\216\267\345\217\226\347\224\250\346\210\267\347\274\226\345\217\267-ia.png" and /dev/null differ diff --git "a/SYS.FormUI/images/\350\216\267\345\217\226\347\224\250\346\210\267\347\274\226\345\217\267.png" "b/SYS.FormUI/images/\350\216\267\345\217\226\347\224\250\346\210\267\347\274\226\345\217\267.png" deleted file mode 100644 index 22a3919589f9180c2f7b9acfa3845f86577526ff..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/images/\350\216\267\345\217\226\347\224\250\346\210\267\347\274\226\345\217\267.png" and /dev/null differ diff --git "a/SYS.FormUI/images/\350\277\224\345\233\236 (1).png" "b/SYS.FormUI/images/\350\277\224\345\233\236 (1).png" deleted file mode 100644 index f8483843748fcf40dcaf7fa2d8e459158e2fd60a..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/images/\350\277\224\345\233\236 (1).png" and /dev/null differ diff --git "a/SYS.FormUI/images/\351\232\220\350\227\217.png" "b/SYS.FormUI/images/\351\232\220\350\227\217.png" deleted file mode 100644 index 1bacf95c3a24e5323e2f3f7c44bac3b4f59880b5..0000000000000000000000000000000000000000 Binary files "a/SYS.FormUI/images/\351\232\220\350\227\217.png" and /dev/null differ diff --git a/SYS.Library/EOM.TSHotelManager.Common.Core.dll b/SYS.Library/EOM.TSHotelManager.Common.Core.dll deleted file mode 100644 index d86d4edb47c2991823e00f6704f55f98fda59875..0000000000000000000000000000000000000000 Binary files a/SYS.Library/EOM.TSHotelManager.Common.Core.dll and /dev/null differ diff --git a/SYS.Library/SYS.Library.csproj b/SYS.Library/SYS.Library.csproj index 071224a201d0e80498af0566c7920a8be7d82dbb..8b9f5b588af1706310d10d7658ae0c99c414d582 100644 --- a/SYS.Library/SYS.Library.csproj +++ b/SYS.Library/SYS.Library.csproj @@ -54,8 +54,6 @@ - - diff --git a/SYS.Library/kse.dll b/SYS.Library/kse.dll deleted file mode 100644 index 276a3e12bf12f30c71b905dfd3cd43a7348eeb98..0000000000000000000000000000000000000000 Binary files a/SYS.Library/kse.dll and /dev/null differ diff --git a/topsky-hotel-manager-system-web-api b/topsky-hotel-manager-system-web-api index 362105ec9f3044a9038dd66d6addec6dd0e09384..edca4ff510e2351cdee1a3e35a5e37c7f9d7f27f 160000 --- a/topsky-hotel-manager-system-web-api +++ b/topsky-hotel-manager-system-web-api @@ -1 +1 @@ -Subproject commit 362105ec9f3044a9038dd66d6addec6dd0e09384 +Subproject commit edca4ff510e2351cdee1a3e35a5e37c7f9d7f27f