From 76430b83e28b43122886c1cd8a9fb1cd61040d22 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 28 六月 2021 12:50:50 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa

---
 zhengcaioa/Services/SimService.cs                             |  131 +++-
 zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Edit.cshtml        |   24 
 zhengcaioa/.vs/zhengcaioa/DesignTimeBuild/.dtbcache.v2        |    0 
 用户表更新.sql                                                     |    2 
 zhengcaioa/zhengcaioa/Views/SimCost/Index.cshtml              |  152 ++--
 zhengcaioa/Services/HrSalaryService.cs                        |   23 
 zhengcaioa/.vs/zhengcaioa/v16/.suo                            |    0 
 zhengcaioa/zhengcaioa/zhengcaioa.csproj.user                  |    2 
 zhengcaioa/Model/Sim.cs                                       |   88 ++
 zhengcaioa/DTO/HrSalaryDTO.cs                                 |    4 
 zhengcaioa/Model/zhengcaioaContext.cs                         |    2 
 zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs |    5 
 /dev/null                                                     |  987 -------------------------------
 zhengcaioa/zhengcaioa/Views/SimCost/SimYear.cshtml            |  142 ++++
 zhengcaioa/IServices/ISimService.cs                           |    4 
 zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml           |   38 
 zhengcaioa/IServices/IHrSalaryService.cs                      |    2 
 zhengcaioa/zhengcaioa/Controllers/admin/SimCostController.cs  |  101 ++
 zhengcaioa/zhengcaioa/Views/SimCost/Edit.cshtml               |   95 --
 19 files changed, 568 insertions(+), 1,234 deletions(-)

diff --git a/zhengcaioa/.vs/zhengcaioa/DesignTimeBuild/.dtbcache.v2 b/zhengcaioa/.vs/zhengcaioa/DesignTimeBuild/.dtbcache.v2
index fc85613..6672a88 100644
--- a/zhengcaioa/.vs/zhengcaioa/DesignTimeBuild/.dtbcache.v2
+++ b/zhengcaioa/.vs/zhengcaioa/DesignTimeBuild/.dtbcache.v2
Binary files differ
diff --git a/zhengcaioa/.vs/zhengcaioa/config/applicationhost.config b/zhengcaioa/.vs/zhengcaioa/config/applicationhost.config
deleted file mode 100644
index 86901e2..0000000
--- a/zhengcaioa/.vs/zhengcaioa/config/applicationhost.config
+++ /dev/null
@@ -1,987 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    IIS configuration sections.
-
-    For schema documentation, see
-    %IIS_BIN%\config\schema\IIS_schema.xml.
-    
-    Please make a backup of this file before making any changes to it.
-
-    NOTE: The following environment variables are available to be used
-          within this file and are understood by the IIS Express.
-
-          %IIS_USER_HOME% - The IIS Express home directory for the user
-          %IIS_SITES_HOME% - The default home directory for sites
-          %IIS_BIN% - The location of the IIS Express binaries
-          %SYSTEMDRIVE% - The drive letter of %IIS_BIN%
-
--->
-<configuration>
-  <!--
-
-        The <configSections> section controls the registration of sections.
-        Section is the basic unit of deployment, locking, searching and
-        containment for configuration settings.
-        
-        Every section belongs to one section group.
-        A section group is a container of logically-related sections.
-        
-        Sections cannot be nested.
-        Section groups may be nested.
-        
-        <section
-            name=""  [Required, Collection Key] [XML name of the section]
-            allowDefinition="Everywhere" [MachineOnly|MachineToApplication|AppHostOnly|Everywhere] [Level where it can be set]
-            overrideModeDefault="Allow"  [Allow|Deny] [Default delegation mode]
-            allowLocation="true"  [true|false] [Allowed in location tags]
-        />
-        
-        The recommended way to unlock sections is by using a location tag:
-        <location path="Default Web Site" overrideMode="Allow">
-            <system.webServer>
-                <asp />
-            </system.webServer>
-        </location>
-
-    -->
-  <configSections>
-    <sectionGroup name="system.applicationHost">
-      <section name="applicationPools" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-      <section name="configHistory" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-      <section name="customMetadata" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-      <section name="listenerAdapters" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-      <section name="log" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-      <section name="serviceAutoStartProviders" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-      <section name="sites" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-      <section name="webLimits" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-    </sectionGroup>
-    <sectionGroup name="system.webServer">
-      <section name="asp" overrideModeDefault="Deny" />
-      <section name="caching" overrideModeDefault="Allow" />
-      <section name="cgi" overrideModeDefault="Deny" />
-      <section name="defaultDocument" overrideModeDefault="Allow" />
-      <section name="directoryBrowse" overrideModeDefault="Allow" />
-      <section name="fastCgi" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-      <section name="globalModules" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-      <section name="handlers" overrideModeDefault="Deny" />
-      <section name="httpCompression" overrideModeDefault="Allow" allowDefinition="Everywhere" />
-      <section name="httpErrors" overrideModeDefault="Allow" />
-      <section name="httpLogging" overrideModeDefault="Deny" />
-      <section name="httpProtocol" overrideModeDefault="Allow" />
-      <section name="httpRedirect" overrideModeDefault="Allow" />
-      <section name="httpTracing" overrideModeDefault="Deny" />
-      <section name="isapiFilters" allowDefinition="MachineToApplication" overrideModeDefault="Deny" />
-      <section name="modules" allowDefinition="MachineToApplication" overrideModeDefault="Deny" />
-      <section name="applicationInitialization" allowDefinition="MachineToApplication" overrideModeDefault="Allow" />
-      <section name="odbcLogging" overrideModeDefault="Deny" />
-      <sectionGroup name="security">
-        <section name="access" overrideModeDefault="Deny" />
-        <section name="applicationDependencies" overrideModeDefault="Deny" />
-        <sectionGroup name="authentication">
-          <section name="anonymousAuthentication" overrideModeDefault="Deny" />
-          <section name="basicAuthentication" overrideModeDefault="Deny" />
-          <section name="clientCertificateMappingAuthentication" overrideModeDefault="Deny" />
-          <section name="digestAuthentication" overrideModeDefault="Deny" />
-          <section name="iisClientCertificateMappingAuthentication" overrideModeDefault="Deny" />
-          <section name="windowsAuthentication" overrideModeDefault="Deny" />
-        </sectionGroup>
-        <section name="authorization" overrideModeDefault="Allow" />
-        <section name="ipSecurity" overrideModeDefault="Deny" />
-        <section name="dynamicIpSecurity" overrideModeDefault="Deny" />
-        <section name="isapiCgiRestriction" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-        <section name="requestFiltering" overrideModeDefault="Allow" />
-      </sectionGroup>
-      <section name="serverRuntime" overrideModeDefault="Deny" />
-      <section name="serverSideInclude" overrideModeDefault="Deny" />
-      <section name="staticContent" overrideModeDefault="Allow" />
-      <sectionGroup name="tracing">
-        <section name="traceFailedRequests" overrideModeDefault="Allow" />
-        <section name="traceProviderDefinitions" overrideModeDefault="Deny" />
-      </sectionGroup>
-      <section name="urlCompression" overrideModeDefault="Allow" />
-      <section name="validation" overrideModeDefault="Allow" />
-      <sectionGroup name="webdav">
-        <section name="globalSettings" overrideModeDefault="Deny" />
-        <section name="authoring" overrideModeDefault="Deny" />
-        <section name="authoringRules" overrideModeDefault="Deny" />
-      </sectionGroup>
-      <sectionGroup name="rewrite">
-        <section name="allowedServerVariables" overrideModeDefault="Deny" />
-        <section name="rules" overrideModeDefault="Allow" />
-        <section name="outboundRules" overrideModeDefault="Allow" />
-        <section name="globalRules" overrideModeDefault="Deny" allowDefinition="AppHostOnly" />
-        <section name="providers" overrideModeDefault="Allow" />
-        <section name="rewriteMaps" overrideModeDefault="Allow" />
-      </sectionGroup>
-      <section name="webSocket" overrideModeDefault="Deny" />
-      <section name="aspNetCore" overrideModeDefault="Allow" />
-    </sectionGroup>
-  </configSections>
-  <configProtectedData>
-    <providers>
-      <add name="IISWASOnlyRsaProvider" type="" description="Uses RsaCryptoServiceProvider to encrypt and decrypt" keyContainerName="iisWasKey" cspProviderName="" useMachineContainer="true" useOAEP="false" />
-      <add name="AesProvider" type="Microsoft.ApplicationHost.AesProtectedConfigurationProvider" description="Uses an AES session key to encrypt and decrypt" keyContainerName="iisConfigurationKey" cspProviderName="" useOAEP="false" useMachineContainer="true" sessionKey="AQIAAA5mAAAApAAA/HKxkz6alrlAPez0IUgujj/6k3WxCDriHp6jvpv3yEZmo7h6SMzGLxo4mTrIQVHSkB7tmElHKfUFTzE2BWF7nFWHY6Z6qmGBauFzwJMwESjril7Gjz69RBFH259HQ6aRDq9Xfx7U7H4HtdmnKNqGjgl/hwPQBGeIlWiDh+sYv3vKB0QU971tjX6H2B+9armlnC8UOuA6JYMDMI/VLLL16sng0fWAy5JYe0YVABVjiAWDW264RZW9Tr1Oax4qHZKg+SdjULxeOc2YmpX+d0yeITo1HkPF1hN1gHpIPIUDo05ilHUNfR3OkjVCIQK4cFKCq1s8NH+y+13MxUC4Fn1AlQ==" />
-      <add name="IISWASOnlyAesProvider" type="Microsoft.ApplicationHost.AesProtectedConfigurationProvider" description="Uses an AES session key to encrypt and decrypt" keyContainerName="iisWasKey" cspProviderName="" useOAEP="false" useMachineContainer="true" sessionKey="AQIAAA5mAAAApAAALmU8lTC+v2qtfQiiiquvvLpUQqKLEXs+jSKoWCM/uPhyB++k4dwug19mGidNK5FYiWK2KYE1yhjVJcbp12E98Q0R2nT7eBiCMY2JairxQ591rqABK7keGaIjwH7PwGzSpILl3RJ4YFvJ/7ZXEJxeDZIjW8ZxWVXx+/VyHs9U3WguLEkgMUX3jrxJi8LouxaIVPJAv/YQ1ZCWs8zImitxX/C/7o7yaIxznfsN5nGQzQfpUDPeby99aw2zPVTtZI2LaWIBON8guABvZ6JtJVDWmfdK6sodbnwdZkr6/Z2rfvamT1dC1SpQrGG7ulR/f9/GXvCaW10ZVKxekBF/CYlNMg==" />
-    </providers>
-  </configProtectedData>
-  <system.applicationHost>
-    <applicationPools>
-      <add name="Clr4IntegratedAppPool" managedRuntimeVersion="v4.0" managedPipelineMode="Integrated" CLRConfigFile="%IIS_USER_HOME%\config\aspnet.config" autoStart="true" />
-      <add name="Clr4ClassicAppPool" managedRuntimeVersion="v4.0" managedPipelineMode="Classic" CLRConfigFile="%IIS_USER_HOME%\config\aspnet.config" autoStart="true" />
-      <add name="Clr2IntegratedAppPool" managedRuntimeVersion="v2.0" managedPipelineMode="Integrated" CLRConfigFile="%IIS_USER_HOME%\config\aspnet.config" autoStart="true" />
-      <add name="Clr2ClassicAppPool" managedRuntimeVersion="v2.0" managedPipelineMode="Classic" CLRConfigFile="%IIS_USER_HOME%\config\aspnet.config" autoStart="true" />
-      <add name="UnmanagedClassicAppPool" managedRuntimeVersion="" managedPipelineMode="Classic" autoStart="true" />
-      <add name="zhengcaioa AppPool" managedRuntimeVersion="" />
-      <applicationPoolDefaults managedRuntimeVersion="v4.0">
-        <processModel loadUserProfile="true" setProfileEnvironment="false" />
-      </applicationPoolDefaults>
-    </applicationPools>
-    <!--
-
-          The <listenerAdapters> section defines the protocols with which the
-          Windows Process Activation Service (WAS) binds.
-
-        -->
-    <listenerAdapters>
-      <add name="http" />
-    </listenerAdapters>
-    <sites>
-      <site name="WebSite1" id="1" serverAutoStart="true">
-        <application path="/">
-          <virtualDirectory path="/" physicalPath="%IIS_SITES_HOME%\WebSite1" />
-        </application>
-        <bindings>
-          <binding protocol="http" bindingInformation=":8080:localhost" />
-        </bindings>
-      </site>
-      <site name="zhengcaioa" id="2">
-        <application path="/" applicationPool="zhengcaioa AppPool">
-          <virtualDirectory path="/" physicalPath="F:\zhengcaioa\zhengcaioa\zhengcaioa" />
-        </application>
-        <bindings>
-          <binding protocol="http" bindingInformation="*:58167:localhost" />
-        </bindings>
-      </site>
-      <siteDefaults>
-        <!-- To enable logging, please change the below attribute "enabled" to "true" -->
-        <logFile logFormat="W3C" directory="%AppData%\Microsoft\IISExpressLogs" enabled="false" />
-        <traceFailedRequestsLogging directory="%AppData%\Microsoft" enabled="false" maxLogFileSizeKB="1024" />
-      </siteDefaults>
-      <applicationDefaults applicationPool="Clr4IntegratedAppPool" />
-      <virtualDirectoryDefaults allowSubDirConfig="true" />
-    </sites>
-    <webLimits />
-  </system.applicationHost>
-  <system.webServer>
-    <serverRuntime />
-    <asp scriptErrorSentToBrowser="true">
-      <cache diskTemplateCacheDirectory="%TEMP%\iisexpress\ASP Compiled Templates" />
-      <limits />
-    </asp>
-    <caching enabled="true" enableKernelCache="true"></caching>
-    <cgi />
-    <defaultDocument enabled="true">
-      <files>
-        <add value="Default.htm" />
-        <add value="Default.asp" />
-        <add value="index.htm" />
-        <add value="index.html" />
-        <add value="iisstart.htm" />
-        <add value="default.aspx" />
-      </files>
-    </defaultDocument>
-    <directoryBrowse enabled="false" />
-    <fastCgi />
-    <!--
-
-          The <globalModules> section defines all native-code modules.
-          To enable a module, specify it in the <modules> section.
-
-        -->
-    <globalModules>
-      <add name="HttpLoggingModule" image="%IIS_BIN%\loghttp.dll" />
-      <add name="UriCacheModule" image="%IIS_BIN%\cachuri.dll" />
-      <add name="TokenCacheModule" image="%IIS_BIN%\cachtokn.dll" />
-      <add name="DynamicCompressionModule" image="%IIS_BIN%\compdyn.dll" />
-      <add name="StaticCompressionModule" image="%IIS_BIN%\compstat.dll" />
-      <add name="DefaultDocumentModule" image="%IIS_BIN%\defdoc.dll" />
-      <add name="DirectoryListingModule" image="%IIS_BIN%\dirlist.dll" />
-      <add name="ProtocolSupportModule" image="%IIS_BIN%\protsup.dll" />
-      <add name="HttpRedirectionModule" image="%IIS_BIN%\redirect.dll" />
-      <add name="ServerSideIncludeModule" image="%IIS_BIN%\iis_ssi.dll" />
-      <add name="StaticFileModule" image="%IIS_BIN%\static.dll" />
-      <add name="AnonymousAuthenticationModule" image="%IIS_BIN%\authanon.dll" />
-      <add name="CertificateMappingAuthenticationModule" image="%IIS_BIN%\authcert.dll" />
-      <add name="UrlAuthorizationModule" image="%IIS_BIN%\urlauthz.dll" />
-      <add name="BasicAuthenticationModule" image="%IIS_BIN%\authbas.dll" />
-      <add name="WindowsAuthenticationModule" image="%IIS_BIN%\authsspi.dll" />
-      <add name="IISCertificateMappingAuthenticationModule" image="%IIS_BIN%\authmap.dll" />
-      <add name="IpRestrictionModule" image="%IIS_BIN%\iprestr.dll" />
-      <add name="DynamicIpRestrictionModule" image="%IIS_BIN%\diprestr.dll" />
-      <add name="RequestFilteringModule" image="%IIS_BIN%\modrqflt.dll" />
-      <add name="CustomLoggingModule" image="%IIS_BIN%\logcust.dll" />
-      <add name="CustomErrorModule" image="%IIS_BIN%\custerr.dll" />
-      <add name="FailedRequestsTracingModule" image="%IIS_BIN%\iisfreb.dll" />
-      <add name="RequestMonitorModule" image="%IIS_BIN%\iisreqs.dll" />
-      <add name="IsapiModule" image="%IIS_BIN%\isapi.dll" />
-      <add name="IsapiFilterModule" image="%IIS_BIN%\filter.dll" />
-      <add name="CgiModule" image="%IIS_BIN%\cgi.dll" />
-      <add name="FastCgiModule" image="%IIS_BIN%\iisfcgi.dll" />
-      <!--            <add name="WebDAVModule" image="%IIS_BIN%\webdav.dll" /> -->
-      <add name="RewriteModule" image="%IIS_BIN%\rewrite.dll" />
-      <add name="ConfigurationValidationModule" image="%IIS_BIN%\validcfg.dll" />
-      <add name="WebSocketModule" image="%IIS_BIN%\iiswsock.dll" />
-      <add name="WebMatrixSupportModule" image="%IIS_BIN%\webmatrixsup.dll" />
-      <add name="ManagedEngine" image="%windir%\Microsoft.NET\Framework\v2.0.50727\webengine.dll" preCondition="integratedMode,runtimeVersionv2.0,bitness32" />
-      <add name="ManagedEngine64" image="%windir%\Microsoft.NET\Framework64\v2.0.50727\webengine.dll" preCondition="integratedMode,runtimeVersionv2.0,bitness64" />
-      <add name="ManagedEngineV4.0_32bit" image="%windir%\Microsoft.NET\Framework\v4.0.30319\webengine4.dll" preCondition="integratedMode,runtimeVersionv4.0,bitness32" />
-      <add name="ManagedEngineV4.0_64bit" image="%windir%\Microsoft.NET\Framework64\v4.0.30319\webengine4.dll" preCondition="integratedMode,runtimeVersionv4.0,bitness64" />
-      <add name="ApplicationInitializationModule" image="%IIS_BIN%\warmup.dll" />
-      <add name="AspNetCoreModule" image="%IIS_BIN%\aspnetcore.dll" />
-      <add name="AspNetCoreModuleV2" image="%IIS_BIN%\Asp.Net Core Module\V2\aspnetcorev2.dll" />
-    </globalModules>
-    <httpCompression directory="%TEMP%">
-      <scheme name="gzip" dll="%IIS_BIN%\gzip.dll" />
-      <dynamicTypes>
-        <add mimeType="text/*" enabled="true" />
-        <add mimeType="message/*" enabled="true" />
-        <add mimeType="application/x-javascript" enabled="true" />
-        <add mimeType="application/javascript" enabled="true" />
-        <add mimeType="*/*" enabled="false" />
-      </dynamicTypes>
-      <staticTypes>
-        <add mimeType="text/*" enabled="true" />
-        <add mimeType="message/*" enabled="true" />
-        <add mimeType="application/javascript" enabled="true" />
-        <add mimeType="application/atom+xml" enabled="true" />
-        <add mimeType="application/xaml+xml" enabled="true" />
-        <add mimeType="image/svg+xml" enabled="true" />
-        <add mimeType="*/*" enabled="false" />
-      </staticTypes>
-    </httpCompression>
-    <httpErrors lockAttributes="allowAbsolutePathsWhenDelegated,defaultPath">
-      <error statusCode="401" prefixLanguageFilePath="%IIS_BIN%\custerr" path="401.htm" />
-      <error statusCode="403" prefixLanguageFilePath="%IIS_BIN%\custerr" path="403.htm" />
-      <error statusCode="404" prefixLanguageFilePath="%IIS_BIN%\custerr" path="404.htm" />
-      <error statusCode="405" prefixLanguageFilePath="%IIS_BIN%\custerr" path="405.htm" />
-      <error statusCode="406" prefixLanguageFilePath="%IIS_BIN%\custerr" path="406.htm" />
-      <error statusCode="412" prefixLanguageFilePath="%IIS_BIN%\custerr" path="412.htm" />
-      <error statusCode="500" prefixLanguageFilePath="%IIS_BIN%\custerr" path="500.htm" />
-      <error statusCode="501" prefixLanguageFilePath="%IIS_BIN%\custerr" path="501.htm" />
-      <error statusCode="502" prefixLanguageFilePath="%IIS_BIN%\custerr" path="502.htm" />
-    </httpErrors>
-    <httpLogging dontLog="false" />
-    <httpProtocol>
-      <customHeaders>
-        <clear />
-        <add name="X-Powered-By" value="ASP.NET" />
-      </customHeaders>
-      <redirectHeaders>
-        <clear />
-      </redirectHeaders>
-    </httpProtocol>
-    <httpRedirect enabled="false" />
-    <httpTracing />
-    <isapiFilters>
-      <filter name="ASP.Net_2.0.50727-64" path="%windir%\Microsoft.NET\Framework64\v2.0.50727\aspnet_filter.dll" enableCache="true" preCondition="bitness64,runtimeVersionv2.0" />
-      <filter name="ASP.Net_2.0.50727.0" path="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_filter.dll" enableCache="true" preCondition="bitness32,runtimeVersionv2.0" />
-      <filter name="ASP.Net_2.0_for_v1.1" path="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_filter.dll" enableCache="true" preCondition="runtimeVersionv1.1" />
-      <filter name="ASP.Net_4.0_32bit" path="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_filter.dll" enableCache="true" preCondition="bitness32,runtimeVersionv4.0" />
-      <filter name="ASP.Net_4.0_64bit" path="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_filter.dll" enableCache="true" preCondition="bitness64,runtimeVersionv4.0" />
-    </isapiFilters>
-    <odbcLogging />
-    <security>
-      <access sslFlags="None" />
-      <applicationDependencies>
-        <application name="Active Server Pages" groupId="ASP" />
-      </applicationDependencies>
-      <authentication>
-        <anonymousAuthentication enabled="true" userName="" />
-        <basicAuthentication enabled="false" />
-        <clientCertificateMappingAuthentication enabled="false" />
-        <digestAuthentication enabled="false" />
-        <iisClientCertificateMappingAuthentication enabled="false"></iisClientCertificateMappingAuthentication>
-        <windowsAuthentication enabled="false">
-          <providers>
-            <add value="Negotiate" />
-            <add value="NTLM" />
-          </providers>
-        </windowsAuthentication>
-      </authentication>
-      <authorization>
-        <add accessType="Allow" users="*" />
-      </authorization>
-      <ipSecurity allowUnlisted="true" />
-      <isapiCgiRestriction notListedIsapisAllowed="true" notListedCgisAllowed="true">
-        <add path="%windir%\Microsoft.NET\Framework64\v4.0.30319\webengine4.dll" allowed="true" groupId="ASP.NET_v4.0" description="ASP.NET_v4.0" />
-        <add path="%windir%\Microsoft.NET\Framework\v4.0.30319\webengine4.dll" allowed="true" groupId="ASP.NET_v4.0" description="ASP.NET_v4.0" />
-        <add path="%windir%\Microsoft.NET\Framework64\v2.0.50727\aspnet_isapi.dll" allowed="true" groupId="ASP.NET v2.0.50727" description="ASP.NET v2.0.50727" />
-        <add path="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" allowed="true" groupId="ASP.NET v2.0.50727" description="ASP.NET v2.0.50727" />
-      </isapiCgiRestriction>
-      <requestFiltering>
-        <fileExtensions allowUnlisted="true" applyToWebDAV="true">
-          <add fileExtension=".asa" allowed="false" />
-          <add fileExtension=".asax" allowed="false" />
-          <add fileExtension=".ascx" allowed="false" />
-          <add fileExtension=".master" allowed="false" />
-          <add fileExtension=".skin" allowed="false" />
-          <add fileExtension=".browser" allowed="false" />
-          <add fileExtension=".sitemap" allowed="false" />
-          <add fileExtension=".config" allowed="false" />
-          <add fileExtension=".cs" allowed="false" />
-          <add fileExtension=".csproj" allowed="false" />
-          <add fileExtension=".vb" allowed="false" />
-          <add fileExtension=".vbproj" allowed="false" />
-          <add fileExtension=".webinfo" allowed="false" />
-          <add fileExtension=".licx" allowed="false" />
-          <add fileExtension=".resx" allowed="false" />
-          <add fileExtension=".resources" allowed="false" />
-          <add fileExtension=".mdb" allowed="false" />
-          <add fileExtension=".vjsproj" allowed="false" />
-          <add fileExtension=".java" allowed="false" />
-          <add fileExtension=".jsl" allowed="false" />
-          <add fileExtension=".ldb" allowed="false" />
-          <add fileExtension=".dsdgm" allowed="false" />
-          <add fileExtension=".ssdgm" allowed="false" />
-          <add fileExtension=".lsad" allowed="false" />
-          <add fileExtension=".ssmap" allowed="false" />
-          <add fileExtension=".cd" allowed="false" />
-          <add fileExtension=".dsprototype" allowed="false" />
-          <add fileExtension=".lsaprototype" allowed="false" />
-          <add fileExtension=".sdm" allowed="false" />
-          <add fileExtension=".sdmDocument" allowed="false" />
-          <add fileExtension=".mdf" allowed="false" />
-          <add fileExtension=".ldf" allowed="false" />
-          <add fileExtension=".ad" allowed="false" />
-          <add fileExtension=".dd" allowed="false" />
-          <add fileExtension=".ldd" allowed="false" />
-          <add fileExtension=".sd" allowed="false" />
-          <add fileExtension=".adprototype" allowed="false" />
-          <add fileExtension=".lddprototype" allowed="false" />
-          <add fileExtension=".exclude" allowed="false" />
-          <add fileExtension=".refresh" allowed="false" />
-          <add fileExtension=".compiled" allowed="false" />
-          <add fileExtension=".msgx" allowed="false" />
-          <add fileExtension=".vsdisco" allowed="false" />
-          <add fileExtension=".rules" allowed="false" />
-        </fileExtensions>
-        <verbs allowUnlisted="true" applyToWebDAV="true" />
-        <hiddenSegments applyToWebDAV="true">
-          <add segment="web.config" />
-          <add segment="bin" />
-          <add segment="App_code" />
-          <add segment="App_GlobalResources" />
-          <add segment="App_LocalResources" />
-          <add segment="App_WebReferences" />
-          <add segment="App_Data" />
-          <add segment="App_Browsers" />
-        </hiddenSegments>
-      </requestFiltering>
-    </security>
-    <serverSideInclude ssiExecDisable="false" />
-    <staticContent lockAttributes="isDocFooterFileName">
-      <mimeMap fileExtension=".323" mimeType="text/h323" />
-      <mimeMap fileExtension=".3g2" mimeType="video/3gpp2" />
-      <mimeMap fileExtension=".3gp2" mimeType="video/3gpp2" />
-      <mimeMap fileExtension=".3gp" mimeType="video/3gpp" />
-      <mimeMap fileExtension=".3gpp" mimeType="video/3gpp" />
-      <mimeMap fileExtension=".aac" mimeType="audio/aac" />
-      <mimeMap fileExtension=".aaf" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".aca" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".accdb" mimeType="application/msaccess" />
-      <mimeMap fileExtension=".accde" mimeType="application/msaccess" />
-      <mimeMap fileExtension=".accdt" mimeType="application/msaccess" />
-      <mimeMap fileExtension=".acx" mimeType="application/internet-property-stream" />
-      <mimeMap fileExtension=".adt" mimeType="audio/vnd.dlna.adts" />
-      <mimeMap fileExtension=".adts" mimeType="audio/vnd.dlna.adts" />
-      <mimeMap fileExtension=".afm" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".ai" mimeType="application/postscript" />
-      <mimeMap fileExtension=".aif" mimeType="audio/x-aiff" />
-      <mimeMap fileExtension=".aifc" mimeType="audio/aiff" />
-      <mimeMap fileExtension=".aiff" mimeType="audio/aiff" />
-      <mimeMap fileExtension=".appcache" mimeType="text/cache-manifest" />
-      <mimeMap fileExtension=".application" mimeType="application/x-ms-application" />
-      <mimeMap fileExtension=".art" mimeType="image/x-jg" />
-      <mimeMap fileExtension=".asd" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".asf" mimeType="video/x-ms-asf" />
-      <mimeMap fileExtension=".asi" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".asm" mimeType="text/plain" />
-      <mimeMap fileExtension=".asr" mimeType="video/x-ms-asf" />
-      <mimeMap fileExtension=".asx" mimeType="video/x-ms-asf" />
-      <mimeMap fileExtension=".atom" mimeType="application/atom+xml" />
-      <mimeMap fileExtension=".au" mimeType="audio/basic" />
-      <mimeMap fileExtension=".avi" mimeType="video/avi" />
-      <mimeMap fileExtension=".axs" mimeType="application/olescript" />
-      <mimeMap fileExtension=".bas" mimeType="text/plain" />
-      <mimeMap fileExtension=".bcpio" mimeType="application/x-bcpio" />
-      <mimeMap fileExtension=".bin" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".bmp" mimeType="image/bmp" />
-      <mimeMap fileExtension=".c" mimeType="text/plain" />
-      <mimeMap fileExtension=".cab" mimeType="application/vnd.ms-cab-compressed" />
-      <mimeMap fileExtension=".calx" mimeType="application/vnd.ms-office.calx" />
-      <mimeMap fileExtension=".cat" mimeType="application/vnd.ms-pki.seccat" />
-      <mimeMap fileExtension=".cdf" mimeType="application/x-cdf" />
-      <mimeMap fileExtension=".chm" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".class" mimeType="application/x-java-applet" />
-      <mimeMap fileExtension=".clp" mimeType="application/x-msclip" />
-      <mimeMap fileExtension=".cmx" mimeType="image/x-cmx" />
-      <mimeMap fileExtension=".cnf" mimeType="text/plain" />
-      <mimeMap fileExtension=".cod" mimeType="image/cis-cod" />
-      <mimeMap fileExtension=".cpio" mimeType="application/x-cpio" />
-      <mimeMap fileExtension=".cpp" mimeType="text/plain" />
-      <mimeMap fileExtension=".crd" mimeType="application/x-mscardfile" />
-      <mimeMap fileExtension=".crl" mimeType="application/pkix-crl" />
-      <mimeMap fileExtension=".crt" mimeType="application/x-x509-ca-cert" />
-      <mimeMap fileExtension=".csh" mimeType="application/x-csh" />
-      <mimeMap fileExtension=".css" mimeType="text/css" />
-      <mimeMap fileExtension=".csv" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".cur" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".dcr" mimeType="application/x-director" />
-      <mimeMap fileExtension=".deploy" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".der" mimeType="application/x-x509-ca-cert" />
-      <mimeMap fileExtension=".dib" mimeType="image/bmp" />
-      <mimeMap fileExtension=".dir" mimeType="application/x-director" />
-      <mimeMap fileExtension=".disco" mimeType="text/xml" />
-      <mimeMap fileExtension=".dll" mimeType="application/x-msdownload" />
-      <mimeMap fileExtension=".dll.config" mimeType="text/xml" />
-      <mimeMap fileExtension=".dlm" mimeType="text/dlm" />
-      <mimeMap fileExtension=".doc" mimeType="application/msword" />
-      <mimeMap fileExtension=".docm" mimeType="application/vnd.ms-word.document.macroEnabled.12" />
-      <mimeMap fileExtension=".docx" mimeType="application/vnd.openxmlformats-officedocument.wordprocessingml.document" />
-      <mimeMap fileExtension=".dot" mimeType="application/msword" />
-      <mimeMap fileExtension=".dotm" mimeType="application/vnd.ms-word.template.macroEnabled.12" />
-      <mimeMap fileExtension=".dotx" mimeType="application/vnd.openxmlformats-officedocument.wordprocessingml.template" />
-      <mimeMap fileExtension=".dsp" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".dtd" mimeType="text/xml" />
-      <mimeMap fileExtension=".dvi" mimeType="application/x-dvi" />
-      <mimeMap fileExtension=".dvr-ms" mimeType="video/x-ms-dvr" />
-      <mimeMap fileExtension=".dwf" mimeType="drawing/x-dwf" />
-      <mimeMap fileExtension=".dwp" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".dxr" mimeType="application/x-director" />
-      <mimeMap fileExtension=".eml" mimeType="message/rfc822" />
-      <mimeMap fileExtension=".emz" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".eot" mimeType="application/vnd.ms-fontobject" />
-      <mimeMap fileExtension=".eps" mimeType="application/postscript" />
-      <mimeMap fileExtension=".esd" mimeType="application/vnd.ms-cab-compressed" />
-      <mimeMap fileExtension=".etx" mimeType="text/x-setext" />
-      <mimeMap fileExtension=".evy" mimeType="application/envoy" />
-      <mimeMap fileExtension=".exe" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".exe.config" mimeType="text/xml" />
-      <mimeMap fileExtension=".fdf" mimeType="application/vnd.fdf" />
-      <mimeMap fileExtension=".fif" mimeType="application/fractals" />
-      <mimeMap fileExtension=".fla" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".flr" mimeType="x-world/x-vrml" />
-      <mimeMap fileExtension=".flv" mimeType="video/x-flv" />
-      <mimeMap fileExtension=".gif" mimeType="image/gif" />
-      <mimeMap fileExtension=".glb" mimeType="model/gltf-binary" />
-      <mimeMap fileExtension=".gtar" mimeType="application/x-gtar" />
-      <mimeMap fileExtension=".gz" mimeType="application/x-gzip" />
-      <mimeMap fileExtension=".h" mimeType="text/plain" />
-      <mimeMap fileExtension=".hdf" mimeType="application/x-hdf" />
-      <mimeMap fileExtension=".hdml" mimeType="text/x-hdml" />
-      <mimeMap fileExtension=".hhc" mimeType="application/x-oleobject" />
-      <mimeMap fileExtension=".hhk" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".hhp" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".hlp" mimeType="application/winhlp" />
-      <mimeMap fileExtension=".hqx" mimeType="application/mac-binhex40" />
-      <mimeMap fileExtension=".hta" mimeType="application/hta" />
-      <mimeMap fileExtension=".htc" mimeType="text/x-component" />
-      <mimeMap fileExtension=".htm" mimeType="text/html" />
-      <mimeMap fileExtension=".html" mimeType="text/html" />
-      <mimeMap fileExtension=".htt" mimeType="text/webviewhtml" />
-      <mimeMap fileExtension=".hxt" mimeType="text/html" />
-      <mimeMap fileExtension=".ico" mimeType="image/x-icon" />
-      <mimeMap fileExtension=".ics" mimeType="text/calendar" />
-      <mimeMap fileExtension=".ief" mimeType="image/ief" />
-      <mimeMap fileExtension=".iii" mimeType="application/x-iphone" />
-      <mimeMap fileExtension=".inf" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".ins" mimeType="application/x-internet-signup" />
-      <mimeMap fileExtension=".isp" mimeType="application/x-internet-signup" />
-      <mimeMap fileExtension=".IVF" mimeType="video/x-ivf" />
-      <mimeMap fileExtension=".jar" mimeType="application/java-archive" />
-      <mimeMap fileExtension=".java" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".jck" mimeType="application/liquidmotion" />
-      <mimeMap fileExtension=".jcz" mimeType="application/liquidmotion" />
-      <mimeMap fileExtension=".jfif" mimeType="image/pjpeg" />
-      <mimeMap fileExtension=".jpb" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".jpe" mimeType="image/jpeg" />
-      <mimeMap fileExtension=".jpeg" mimeType="image/jpeg" />
-      <mimeMap fileExtension=".jpg" mimeType="image/jpeg" />
-      <mimeMap fileExtension=".js" mimeType="application/javascript" />
-      <mimeMap fileExtension=".json" mimeType="application/json" />
-      <mimeMap fileExtension=".jsonld" mimeType="application/ld+json" />
-      <mimeMap fileExtension=".jsx" mimeType="text/jscript" />
-      <mimeMap fileExtension=".latex" mimeType="application/x-latex" />
-      <mimeMap fileExtension=".less" mimeType="text/css" />
-      <mimeMap fileExtension=".lit" mimeType="application/x-ms-reader" />
-      <mimeMap fileExtension=".lpk" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".lsf" mimeType="video/x-la-asf" />
-      <mimeMap fileExtension=".lsx" mimeType="video/x-la-asf" />
-      <mimeMap fileExtension=".lzh" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".m13" mimeType="application/x-msmediaview" />
-      <mimeMap fileExtension=".m14" mimeType="application/x-msmediaview" />
-      <mimeMap fileExtension=".m1v" mimeType="video/mpeg" />
-      <mimeMap fileExtension=".m2ts" mimeType="video/vnd.dlna.mpeg-tts" />
-      <mimeMap fileExtension=".m3u" mimeType="audio/x-mpegurl" />
-      <mimeMap fileExtension=".m4a" mimeType="audio/mp4" />
-      <mimeMap fileExtension=".m4v" mimeType="video/mp4" />
-      <mimeMap fileExtension=".man" mimeType="application/x-troff-man" />
-      <mimeMap fileExtension=".manifest" mimeType="application/x-ms-manifest" />
-      <mimeMap fileExtension=".map" mimeType="text/plain" />
-      <mimeMap fileExtension=".mdb" mimeType="application/x-msaccess" />
-      <mimeMap fileExtension=".mdp" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".me" mimeType="application/x-troff-me" />
-      <mimeMap fileExtension=".mht" mimeType="message/rfc822" />
-      <mimeMap fileExtension=".mhtml" mimeType="message/rfc822" />
-      <mimeMap fileExtension=".mid" mimeType="audio/mid" />
-      <mimeMap fileExtension=".midi" mimeType="audio/mid" />
-      <mimeMap fileExtension=".mix" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".mmf" mimeType="application/x-smaf" />
-      <mimeMap fileExtension=".mno" mimeType="text/xml" />
-      <mimeMap fileExtension=".mny" mimeType="application/x-msmoney" />
-      <mimeMap fileExtension=".mov" mimeType="video/quicktime" />
-      <mimeMap fileExtension=".movie" mimeType="video/x-sgi-movie" />
-      <mimeMap fileExtension=".mp2" mimeType="video/mpeg" />
-      <mimeMap fileExtension=".mp3" mimeType="audio/mpeg" />
-      <mimeMap fileExtension=".mp4" mimeType="video/mp4" />
-      <mimeMap fileExtension=".mp4v" mimeType="video/mp4" />
-      <mimeMap fileExtension=".mpa" mimeType="video/mpeg" />
-      <mimeMap fileExtension=".mpe" mimeType="video/mpeg" />
-      <mimeMap fileExtension=".mpeg" mimeType="video/mpeg" />
-      <mimeMap fileExtension=".mpg" mimeType="video/mpeg" />
-      <mimeMap fileExtension=".mpp" mimeType="application/vnd.ms-project" />
-      <mimeMap fileExtension=".mpv2" mimeType="video/mpeg" />
-      <mimeMap fileExtension=".ms" mimeType="application/x-troff-ms" />
-      <mimeMap fileExtension=".msi" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".mso" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".mvb" mimeType="application/x-msmediaview" />
-      <mimeMap fileExtension=".mvc" mimeType="application/x-miva-compiled" />
-      <mimeMap fileExtension=".nc" mimeType="application/x-netcdf" />
-      <mimeMap fileExtension=".nsc" mimeType="video/x-ms-asf" />
-      <mimeMap fileExtension=".nws" mimeType="message/rfc822" />
-      <mimeMap fileExtension=".ocx" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".oda" mimeType="application/oda" />
-      <mimeMap fileExtension=".odc" mimeType="text/x-ms-odc" />
-      <mimeMap fileExtension=".ods" mimeType="application/oleobject" />
-      <mimeMap fileExtension=".oga" mimeType="audio/ogg" />
-      <mimeMap fileExtension=".ogg" mimeType="video/ogg" />
-      <mimeMap fileExtension=".ogv" mimeType="video/ogg" />
-      <mimeMap fileExtension=".one" mimeType="application/onenote" />
-      <mimeMap fileExtension=".onea" mimeType="application/onenote" />
-      <mimeMap fileExtension=".onetoc" mimeType="application/onenote" />
-      <mimeMap fileExtension=".onetoc2" mimeType="application/onenote" />
-      <mimeMap fileExtension=".onetmp" mimeType="application/onenote" />
-      <mimeMap fileExtension=".onepkg" mimeType="application/onenote" />
-      <mimeMap fileExtension=".osdx" mimeType="application/opensearchdescription+xml" />
-      <mimeMap fileExtension=".otf" mimeType="font/otf" />
-      <mimeMap fileExtension=".p10" mimeType="application/pkcs10" />
-      <mimeMap fileExtension=".p12" mimeType="application/x-pkcs12" />
-      <mimeMap fileExtension=".p7b" mimeType="application/x-pkcs7-certificates" />
-      <mimeMap fileExtension=".p7c" mimeType="application/pkcs7-mime" />
-      <mimeMap fileExtension=".p7m" mimeType="application/pkcs7-mime" />
-      <mimeMap fileExtension=".p7r" mimeType="application/x-pkcs7-certreqresp" />
-      <mimeMap fileExtension=".p7s" mimeType="application/pkcs7-signature" />
-      <mimeMap fileExtension=".pbm" mimeType="image/x-portable-bitmap" />
-      <mimeMap fileExtension=".pcx" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".pcz" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".pdf" mimeType="application/pdf" />
-      <mimeMap fileExtension=".pfb" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".pfm" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".pfx" mimeType="application/x-pkcs12" />
-      <mimeMap fileExtension=".pgm" mimeType="image/x-portable-graymap" />
-      <mimeMap fileExtension=".pko" mimeType="application/vnd.ms-pki.pko" />
-      <mimeMap fileExtension=".pma" mimeType="application/x-perfmon" />
-      <mimeMap fileExtension=".pmc" mimeType="application/x-perfmon" />
-      <mimeMap fileExtension=".pml" mimeType="application/x-perfmon" />
-      <mimeMap fileExtension=".pmr" mimeType="application/x-perfmon" />
-      <mimeMap fileExtension=".pmw" mimeType="application/x-perfmon" />
-      <mimeMap fileExtension=".png" mimeType="image/png" />
-      <mimeMap fileExtension=".pnm" mimeType="image/x-portable-anymap" />
-      <mimeMap fileExtension=".pnz" mimeType="image/png" />
-      <mimeMap fileExtension=".pot" mimeType="application/vnd.ms-powerpoint" />
-      <mimeMap fileExtension=".potm" mimeType="application/vnd.ms-powerpoint.template.macroEnabled.12" />
-      <mimeMap fileExtension=".potx" mimeType="application/vnd.openxmlformats-officedocument.presentationml.template" />
-      <mimeMap fileExtension=".ppam" mimeType="application/vnd.ms-powerpoint.addin.macroEnabled.12" />
-      <mimeMap fileExtension=".ppm" mimeType="image/x-portable-pixmap" />
-      <mimeMap fileExtension=".pps" mimeType="application/vnd.ms-powerpoint" />
-      <mimeMap fileExtension=".ppsm" mimeType="application/vnd.ms-powerpoint.slideshow.macroEnabled.12" />
-      <mimeMap fileExtension=".ppsx" mimeType="application/vnd.openxmlformats-officedocument.presentationml.slideshow" />
-      <mimeMap fileExtension=".ppt" mimeType="application/vnd.ms-powerpoint" />
-      <mimeMap fileExtension=".pptm" mimeType="application/vnd.ms-powerpoint.presentation.macroEnabled.12" />
-      <mimeMap fileExtension=".pptx" mimeType="application/vnd.openxmlformats-officedocument.presentationml.presentation" />
-      <mimeMap fileExtension=".prf" mimeType="application/pics-rules" />
-      <mimeMap fileExtension=".prm" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".prx" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".ps" mimeType="application/postscript" />
-      <mimeMap fileExtension=".psd" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".psm" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".psp" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".pub" mimeType="application/x-mspublisher" />
-      <mimeMap fileExtension=".qt" mimeType="video/quicktime" />
-      <mimeMap fileExtension=".qtl" mimeType="application/x-quicktimeplayer" />
-      <mimeMap fileExtension=".qxd" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".ra" mimeType="audio/x-pn-realaudio" />
-      <mimeMap fileExtension=".ram" mimeType="audio/x-pn-realaudio" />
-      <mimeMap fileExtension=".rar" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".ras" mimeType="image/x-cmu-raster" />
-      <mimeMap fileExtension=".rf" mimeType="image/vnd.rn-realflash" />
-      <mimeMap fileExtension=".rgb" mimeType="image/x-rgb" />
-      <mimeMap fileExtension=".rm" mimeType="application/vnd.rn-realmedia" />
-      <mimeMap fileExtension=".rmi" mimeType="audio/mid" />
-      <mimeMap fileExtension=".roff" mimeType="application/x-troff" />
-      <mimeMap fileExtension=".rpm" mimeType="audio/x-pn-realaudio-plugin" />
-      <mimeMap fileExtension=".rtf" mimeType="application/rtf" />
-      <mimeMap fileExtension=".rtx" mimeType="text/richtext" />
-      <mimeMap fileExtension=".scd" mimeType="application/x-msschedule" />
-      <mimeMap fileExtension=".sct" mimeType="text/scriptlet" />
-      <mimeMap fileExtension=".sea" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".setpay" mimeType="application/set-payment-initiation" />
-      <mimeMap fileExtension=".setreg" mimeType="application/set-registration-initiation" />
-      <mimeMap fileExtension=".sgml" mimeType="text/sgml" />
-      <mimeMap fileExtension=".sh" mimeType="application/x-sh" />
-      <mimeMap fileExtension=".shar" mimeType="application/x-shar" />
-      <mimeMap fileExtension=".sit" mimeType="application/x-stuffit" />
-      <mimeMap fileExtension=".sldm" mimeType="application/vnd.ms-powerpoint.slide.macroEnabled.12" />
-      <mimeMap fileExtension=".sldx" mimeType="application/vnd.openxmlformats-officedocument.presentationml.slide" />
-      <mimeMap fileExtension=".smd" mimeType="audio/x-smd" />
-      <mimeMap fileExtension=".smi" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".smx" mimeType="audio/x-smd" />
-      <mimeMap fileExtension=".smz" mimeType="audio/x-smd" />
-      <mimeMap fileExtension=".snd" mimeType="audio/basic" />
-      <mimeMap fileExtension=".snp" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".spc" mimeType="application/x-pkcs7-certificates" />
-      <mimeMap fileExtension=".spl" mimeType="application/futuresplash" />
-      <mimeMap fileExtension=".spx" mimeType="audio/ogg" />
-      <mimeMap fileExtension=".src" mimeType="application/x-wais-source" />
-      <mimeMap fileExtension=".ssm" mimeType="application/streamingmedia" />
-      <mimeMap fileExtension=".sst" mimeType="application/vnd.ms-pki.certstore" />
-      <mimeMap fileExtension=".stl" mimeType="application/vnd.ms-pki.stl" />
-      <mimeMap fileExtension=".sv4cpio" mimeType="application/x-sv4cpio" />
-      <mimeMap fileExtension=".sv4crc" mimeType="application/x-sv4crc" />
-      <mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
-      <mimeMap fileExtension=".svgz" mimeType="image/svg+xml" />
-      <mimeMap fileExtension=".swf" mimeType="application/x-shockwave-flash" />
-      <mimeMap fileExtension=".t" mimeType="application/x-troff" />
-      <mimeMap fileExtension=".tar" mimeType="application/x-tar" />
-      <mimeMap fileExtension=".tcl" mimeType="application/x-tcl" />
-      <mimeMap fileExtension=".tex" mimeType="application/x-tex" />
-      <mimeMap fileExtension=".texi" mimeType="application/x-texinfo" />
-      <mimeMap fileExtension=".texinfo" mimeType="application/x-texinfo" />
-      <mimeMap fileExtension=".tgz" mimeType="application/x-compressed" />
-      <mimeMap fileExtension=".thmx" mimeType="application/vnd.ms-officetheme" />
-      <mimeMap fileExtension=".thn" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".tif" mimeType="image/tiff" />
-      <mimeMap fileExtension=".tiff" mimeType="image/tiff" />
-      <mimeMap fileExtension=".toc" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".tr" mimeType="application/x-troff" />
-      <mimeMap fileExtension=".trm" mimeType="application/x-msterminal" />
-      <mimeMap fileExtension=".ts" mimeType="video/vnd.dlna.mpeg-tts" />
-      <mimeMap fileExtension=".tsv" mimeType="text/tab-separated-values" />
-      <mimeMap fileExtension=".ttf" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".tts" mimeType="video/vnd.dlna.mpeg-tts" />
-      <mimeMap fileExtension=".txt" mimeType="text/plain" />
-      <mimeMap fileExtension=".u32" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".uls" mimeType="text/iuls" />
-      <mimeMap fileExtension=".ustar" mimeType="application/x-ustar" />
-      <mimeMap fileExtension=".vbs" mimeType="text/vbscript" />
-      <mimeMap fileExtension=".vcf" mimeType="text/x-vcard" />
-      <mimeMap fileExtension=".vcs" mimeType="text/plain" />
-      <mimeMap fileExtension=".vdx" mimeType="application/vnd.ms-visio.viewer" />
-      <mimeMap fileExtension=".vml" mimeType="text/xml" />
-      <mimeMap fileExtension=".vsd" mimeType="application/vnd.visio" />
-      <mimeMap fileExtension=".vss" mimeType="application/vnd.visio" />
-      <mimeMap fileExtension=".vst" mimeType="application/vnd.visio" />
-      <mimeMap fileExtension=".vsto" mimeType="application/x-ms-vsto" />
-      <mimeMap fileExtension=".vsw" mimeType="application/vnd.visio" />
-      <mimeMap fileExtension=".vsx" mimeType="application/vnd.visio" />
-      <mimeMap fileExtension=".vtx" mimeType="application/vnd.visio" />
-      <mimeMap fileExtension=".wasm" mimeType="application/wasm" />
-      <mimeMap fileExtension=".wav" mimeType="audio/wav" />
-      <mimeMap fileExtension=".wax" mimeType="audio/x-ms-wax" />
-      <mimeMap fileExtension=".wbmp" mimeType="image/vnd.wap.wbmp" />
-      <mimeMap fileExtension=".wcm" mimeType="application/vnd.ms-works" />
-      <mimeMap fileExtension=".wdb" mimeType="application/vnd.ms-works" />
-      <mimeMap fileExtension=".webm" mimeType="video/webm" />
-      <mimeMap fileExtension=".wks" mimeType="application/vnd.ms-works" />
-      <mimeMap fileExtension=".wm" mimeType="video/x-ms-wm" />
-      <mimeMap fileExtension=".wma" mimeType="audio/x-ms-wma" />
-      <mimeMap fileExtension=".wmd" mimeType="application/x-ms-wmd" />
-      <mimeMap fileExtension=".wmf" mimeType="application/x-msmetafile" />
-      <mimeMap fileExtension=".wml" mimeType="text/vnd.wap.wml" />
-      <mimeMap fileExtension=".wmlc" mimeType="application/vnd.wap.wmlc" />
-      <mimeMap fileExtension=".wmls" mimeType="text/vnd.wap.wmlscript" />
-      <mimeMap fileExtension=".wmlsc" mimeType="application/vnd.wap.wmlscriptc" />
-      <mimeMap fileExtension=".wmp" mimeType="video/x-ms-wmp" />
-      <mimeMap fileExtension=".wmv" mimeType="video/x-ms-wmv" />
-      <mimeMap fileExtension=".wmx" mimeType="video/x-ms-wmx" />
-      <mimeMap fileExtension=".wmz" mimeType="application/x-ms-wmz" />
-      <mimeMap fileExtension=".woff" mimeType="font/x-woff" />
-      <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
-      <mimeMap fileExtension=".wps" mimeType="application/vnd.ms-works" />
-      <mimeMap fileExtension=".wri" mimeType="application/x-mswrite" />
-      <mimeMap fileExtension=".wrl" mimeType="x-world/x-vrml" />
-      <mimeMap fileExtension=".wrz" mimeType="x-world/x-vrml" />
-      <mimeMap fileExtension=".wsdl" mimeType="text/xml" />
-      <mimeMap fileExtension=".wtv" mimeType="video/x-ms-wtv" />
-      <mimeMap fileExtension=".wvx" mimeType="video/x-ms-wvx" />
-      <mimeMap fileExtension=".x" mimeType="application/directx" />
-      <mimeMap fileExtension=".xaf" mimeType="x-world/x-vrml" />
-      <mimeMap fileExtension=".xaml" mimeType="application/xaml+xml" />
-      <mimeMap fileExtension=".xap" mimeType="application/x-silverlight-app" />
-      <mimeMap fileExtension=".xbap" mimeType="application/x-ms-xbap" />
-      <mimeMap fileExtension=".xbm" mimeType="image/x-xbitmap" />
-      <mimeMap fileExtension=".xdr" mimeType="text/plain" />
-      <mimeMap fileExtension=".xht" mimeType="application/xhtml+xml" />
-      <mimeMap fileExtension=".xhtml" mimeType="application/xhtml+xml" />
-      <mimeMap fileExtension=".xla" mimeType="application/vnd.ms-excel" />
-      <mimeMap fileExtension=".xlam" mimeType="application/vnd.ms-excel.addin.macroEnabled.12" />
-      <mimeMap fileExtension=".xlc" mimeType="application/vnd.ms-excel" />
-      <mimeMap fileExtension=".xlm" mimeType="application/vnd.ms-excel" />
-      <mimeMap fileExtension=".xls" mimeType="application/vnd.ms-excel" />
-      <mimeMap fileExtension=".xlsb" mimeType="application/vnd.ms-excel.sheet.binary.macroEnabled.12" />
-      <mimeMap fileExtension=".xlsm" mimeType="application/vnd.ms-excel.sheet.macroEnabled.12" />
-      <mimeMap fileExtension=".xlsx" mimeType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" />
-      <mimeMap fileExtension=".xlt" mimeType="application/vnd.ms-excel" />
-      <mimeMap fileExtension=".xltm" mimeType="application/vnd.ms-excel.template.macroEnabled.12" />
-      <mimeMap fileExtension=".xltx" mimeType="application/vnd.openxmlformats-officedocument.spreadsheetml.template" />
-      <mimeMap fileExtension=".xlw" mimeType="application/vnd.ms-excel" />
-      <mimeMap fileExtension=".xml" mimeType="text/xml" />
-      <mimeMap fileExtension=".xof" mimeType="x-world/x-vrml" />
-      <mimeMap fileExtension=".xpm" mimeType="image/x-xpixmap" />
-      <mimeMap fileExtension=".xps" mimeType="application/vnd.ms-xpsdocument" />
-      <mimeMap fileExtension=".xsd" mimeType="text/xml" />
-      <mimeMap fileExtension=".xsf" mimeType="text/xml" />
-      <mimeMap fileExtension=".xsl" mimeType="text/xml" />
-      <mimeMap fileExtension=".xslt" mimeType="text/xml" />
-      <mimeMap fileExtension=".xsn" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".xtp" mimeType="application/octet-stream" />
-      <mimeMap fileExtension=".xwd" mimeType="image/x-xwindowdump" />
-      <mimeMap fileExtension=".z" mimeType="application/x-compress" />
-      <mimeMap fileExtension=".zip" mimeType="application/x-zip-compressed" />
-    </staticContent>
-    <tracing>
-      <traceFailedRequests>
-        <add path="*">
-          <traceAreas>
-            <add provider="ASP" verbosity="Verbose" />
-            <add provider="ASPNET" areas="Infrastructure,Module,Page,AppServices" verbosity="Verbose" />
-            <add provider="ISAPI Extension" verbosity="Verbose" />
-            <add provider="WWW Server" areas="Authentication,Security,Filter,StaticFile,CGI,Compression,Cache,RequestNotifications,Module,Rewrite,WebSocket" verbosity="Verbose" />
-          </traceAreas>
-          <failureDefinitions statusCodes="200-999" />
-        </add>
-      </traceFailedRequests>
-      <traceProviderDefinitions>
-        <add name="WWW Server" guid="{3a2a4e84-4c21-4981-ae10-3fda0d9b0f83}">
-          <areas>
-            <clear />
-            <add name="Authentication" value="2" />
-            <add name="Security" value="4" />
-            <add name="Filter" value="8" />
-            <add name="StaticFile" value="16" />
-            <add name="CGI" value="32" />
-            <add name="Compression" value="64" />
-            <add name="Cache" value="128" />
-            <add name="RequestNotifications" value="256" />
-            <add name="Module" value="512" />
-            <add name="Rewrite" value="1024" />
-            <add name="FastCGI" value="4096" />
-            <add name="WebSocket" value="16384" />
-            <add name="ANCM" value="65536" />
-          </areas>
-        </add>
-        <add name="ASP" guid="{06b94d9a-b15e-456e-a4ef-37c984a2cb4b}">
-          <areas>
-            <clear />
-          </areas>
-        </add>
-        <add name="ISAPI Extension" guid="{a1c2040e-8840-4c31-ba11-9871031a19ea}">
-          <areas>
-            <clear />
-          </areas>
-        </add>
-        <add name="ASPNET" guid="{AFF081FE-0247-4275-9C4E-021F3DC1DA35}">
-          <areas>
-            <add name="Infrastructure" value="1" />
-            <add name="Module" value="2" />
-            <add name="Page" value="4" />
-            <add name="AppServices" value="8" />
-          </areas>
-        </add>
-      </traceProviderDefinitions>
-    </tracing>
-    <urlCompression />
-    <validation />
-    <webdav>
-      <globalSettings>
-        <propertyStores>
-          <add name="webdav_simple_prop" image="%IIS_BIN%\webdav_simple_prop.dll" image32="%IIS_BIN%\webdav_simple_prop.dll" />
-        </propertyStores>
-        <lockStores>
-          <add name="webdav_simple_lock" image="%IIS_BIN%\webdav_simple_lock.dll" image32="%IIS_BIN%\webdav_simple_lock.dll" />
-        </lockStores>
-      </globalSettings>
-      <authoring>
-        <locks enabled="true" lockStore="webdav_simple_lock" />
-      </authoring>
-      <authoringRules />
-    </webdav>
-    <webSocket />
-    <applicationInitialization />
-  </system.webServer>
-  <location path="" overrideMode="Allow">
-    <system.webServer>
-      <modules>
-        <add name="IsapiFilterModule" lockItem="true" />
-        <add name="BasicAuthenticationModule" lockItem="true" />
-        <add name="IsapiModule" lockItem="true" />
-        <add name="HttpLoggingModule" lockItem="true" />
-        <add name="DynamicCompressionModule" lockItem="true" />
-        <add name="StaticCompressionModule" lockItem="true" />
-        <add name="DefaultDocumentModule" lockItem="true" />
-        <add name="DirectoryListingModule" lockItem="true" />
-        <add name="ProtocolSupportModule" lockItem="true" />
-        <add name="HttpRedirectionModule" lockItem="true" />
-        <add name="ServerSideIncludeModule" lockItem="true" />
-        <add name="StaticFileModule" lockItem="true" />
-        <add name="AnonymousAuthenticationModule" lockItem="true" />
-        <add name="CertificateMappingAuthenticationModule" lockItem="true" />
-        <add name="UrlAuthorizationModule" lockItem="true" />
-        <add name="WindowsAuthenticationModule" lockItem="true" />
-        <add name="IISCertificateMappingAuthenticationModule" lockItem="true" />
-        <add name="WebMatrixSupportModule" lockItem="true" />
-        <add name="IpRestrictionModule" lockItem="true" />
-        <add name="DynamicIpRestrictionModule" lockItem="true" />
-        <add name="RequestFilteringModule" lockItem="true" />
-        <add name="CustomLoggingModule" lockItem="true" />
-        <add name="CustomErrorModule" lockItem="true" />
-        <add name="FailedRequestsTracingModule" lockItem="true" />
-        <add name="CgiModule" lockItem="true" />
-        <add name="FastCgiModule" lockItem="true" />
-        <!--                <add name="WebDAVModule" /> -->
-        <add name="RewriteModule" />
-        <add name="OutputCache" type="System.Web.Caching.OutputCacheModule" preCondition="managedHandler" />
-        <add name="Session" type="System.Web.SessionState.SessionStateModule" preCondition="managedHandler" />
-        <add name="WindowsAuthentication" type="System.Web.Security.WindowsAuthenticationModule" preCondition="managedHandler" />
-        <add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" preCondition="managedHandler" />
-        <add name="DefaultAuthentication" type="System.Web.Security.DefaultAuthenticationModule" preCondition="managedHandler" />
-        <add name="RoleManager" type="System.Web.Security.RoleManagerModule" preCondition="managedHandler" />
-        <add name="UrlAuthorization" type="System.Web.Security.UrlAuthorizationModule" preCondition="managedHandler" />
-        <add name="FileAuthorization" type="System.Web.Security.FileAuthorizationModule" preCondition="managedHandler" />
-        <add name="AnonymousIdentification" type="System.Web.Security.AnonymousIdentificationModule" preCondition="managedHandler" />
-        <add name="Profile" type="System.Web.Profile.ProfileModule" preCondition="managedHandler" />
-        <add name="UrlMappingsModule" type="System.Web.UrlMappingsModule" preCondition="managedHandler" />
-        <add name="ApplicationInitializationModule" lockItem="true" />
-        <add name="WebSocketModule" lockItem="true" />
-        <add name="ServiceModel-4.0" type="System.ServiceModel.Activation.ServiceHttpModule,System.ServiceModel.Activation,Version=4.0.0.0,Culture=neutral,PublicKeyToken=31bf3856ad364e35" preCondition="managedHandler,runtimeVersionv4.0" />
-        <add name="ConfigurationValidationModule" lockItem="true" />
-        <add name="UrlRoutingModule-4.0" type="System.Web.Routing.UrlRoutingModule" preCondition="managedHandler,runtimeVersionv4.0" />
-        <add name="ScriptModule-4.0" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" preCondition="managedHandler,runtimeVersionv4.0" />
-        <add name="AspNetCoreModule" lockItem="true" />
-        <add name="AspNetCoreModuleV2" lockItem="true" />
-      </modules>
-      <handlers accessPolicy="Read, Script">
-        <!--                <add name="WebDAV" path="*" verb="PROPFIND,PROPPATCH,MKCOL,PUT,COPY,DELETE,MOVE,LOCK,UNLOCK" modules="WebDAVModule" resourceType="Unspecified" requireAccess="None" /> -->
-        <add name="AXD-ISAPI-4.0_64bit" path="*.axd" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
-        <add name="PageHandlerFactory-ISAPI-4.0_64bit" path="*.aspx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
-        <add name="SimpleHandlerFactory-ISAPI-4.0_64bit" path="*.ashx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
-        <add name="WebServiceHandlerFactory-ISAPI-4.0_64bit" path="*.asmx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
-        <add name="HttpRemotingHandlerFactory-rem-ISAPI-4.0_64bit" path="*.rem" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
-        <add name="HttpRemotingHandlerFactory-soap-ISAPI-4.0_64bit" path="*.soap" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
-        <add name="svc-ISAPI-4.0_64bit" path="*.svc" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" />
-        <add name="rules-ISAPI-4.0_64bit" path="*.rules" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" />
-        <add name="xoml-ISAPI-4.0_64bit" path="*.xoml" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" />
-        <add name="xamlx-ISAPI-4.0_64bit" path="*.xamlx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" />
-        <add name="aspq-ISAPI-4.0_64bit" path="*.aspq" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
-        <add name="cshtm-ISAPI-4.0_64bit" path="*.cshtm" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
-        <add name="cshtml-ISAPI-4.0_64bit" path="*.cshtml" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
-        <add name="vbhtm-ISAPI-4.0_64bit" path="*.vbhtm" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
-        <add name="vbhtml-ISAPI-4.0_64bit" path="*.vbhtml" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
-        <add name="AXD-ISAPI-4.0_32bit" path="*.axd" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="PageHandlerFactory-ISAPI-4.0_32bit" path="*.aspx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="SimpleHandlerFactory-ISAPI-4.0_32bit" path="*.ashx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="WebServiceHandlerFactory-ISAPI-4.0_32bit" path="*.asmx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="HttpRemotingHandlerFactory-rem-ISAPI-4.0_32bit" path="*.rem" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="HttpRemotingHandlerFactory-soap-ISAPI-4.0_32bit" path="*.soap" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="svc-ISAPI-4.0_32bit" path="*.svc" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" />
-        <add name="rules-ISAPI-4.0_32bit" path="*.rules" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" />
-        <add name="xoml-ISAPI-4.0_32bit" path="*.xoml" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" />
-        <add name="xamlx-ISAPI-4.0_32bit" path="*.xamlx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" />
-        <add name="aspq-ISAPI-4.0_32bit" path="*.aspq" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="cshtm-ISAPI-4.0_32bit" path="*.cshtm" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="cshtml-ISAPI-4.0_32bit" path="*.cshtml" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="vbhtm-ISAPI-4.0_32bit" path="*.vbhtm" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="vbhtml-ISAPI-4.0_32bit" path="*.vbhtml" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="TraceHandler-Integrated-4.0" path="trace.axd" verb="GET,HEAD,POST,DEBUG" type="System.Web.Handlers.TraceHandler" preCondition="integratedMode,runtimeVersionv4.0" />
-        <add name="WebAdminHandler-Integrated-4.0" path="WebAdmin.axd" verb="GET,DEBUG" type="System.Web.Handlers.WebAdminHandler" preCondition="integratedMode,runtimeVersionv4.0" />
-        <add name="AssemblyResourceLoader-Integrated-4.0" path="WebResource.axd" verb="GET,DEBUG" type="System.Web.Handlers.AssemblyResourceLoader" preCondition="integratedMode,runtimeVersionv4.0" />
-        <add name="PageHandlerFactory-Integrated-4.0" path="*.aspx" verb="GET,HEAD,POST,DEBUG" type="System.Web.UI.PageHandlerFactory" preCondition="integratedMode,runtimeVersionv4.0" />
-        <add name="SimpleHandlerFactory-Integrated-4.0" path="*.ashx" verb="GET,HEAD,POST,DEBUG" type="System.Web.UI.SimpleHandlerFactory" preCondition="integratedMode,runtimeVersionv4.0" />
-        <add name="WebServiceHandlerFactory-Integrated-4.0" path="*.asmx" verb="GET,HEAD,POST,DEBUG" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" preCondition="integratedMode,runtimeVersionv4.0" />
-        <add name="HttpRemotingHandlerFactory-rem-Integrated-4.0" path="*.rem" verb="GET,HEAD,POST,DEBUG" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv4.0" />
-        <add name="HttpRemotingHandlerFactory-soap-Integrated-4.0" path="*.soap" verb="GET,HEAD,POST,DEBUG" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv4.0" />
-        <add name="svc-Integrated-4.0" path="*.svc" verb="*" type="System.ServiceModel.Activation.ServiceHttpHandlerFactory, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" preCondition="integratedMode,runtimeVersionv4.0" />
-        <add name="rules-Integrated-4.0" path="*.rules" verb="*" type="System.ServiceModel.Activation.ServiceHttpHandlerFactory, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" preCondition="integratedMode,runtimeVersionv4.0" />
-        <add name="xoml-Integrated-4.0" path="*.xoml" verb="*" type="System.ServiceModel.Activation.ServiceHttpHandlerFactory, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" preCondition="integratedMode,runtimeVersionv4.0" />
-        <add name="xamlx-Integrated-4.0" path="*.xamlx" verb="GET,HEAD,POST,DEBUG" type="System.Xaml.Hosting.XamlHttpHandlerFactory, System.Xaml.Hosting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" preCondition="integratedMode,runtimeVersionv4.0" />
-        <add name="aspq-Integrated-4.0" path="*.aspq" verb="GET,HEAD,POST,DEBUG" type="System.Web.HttpForbiddenHandler" preCondition="integratedMode,runtimeVersionv4.0" />
-        <add name="cshtm-Integrated-4.0" path="*.cshtm" verb="GET,HEAD,POST,DEBUG" type="System.Web.HttpForbiddenHandler" preCondition="integratedMode,runtimeVersionv4.0" />
-        <add name="cshtml-Integrated-4.0" path="*.cshtml" verb="GET,HEAD,POST,DEBUG" type="System.Web.HttpForbiddenHandler" preCondition="integratedMode,runtimeVersionv4.0" />
-        <add name="vbhtm-Integrated-4.0" path="*.vbhtm" verb="GET,HEAD,POST,DEBUG" type="System.Web.HttpForbiddenHandler" preCondition="integratedMode,runtimeVersionv4.0" />
-        <add name="vbhtml-Integrated-4.0" path="*.vbhtml" verb="GET,HEAD,POST,DEBUG" type="System.Web.HttpForbiddenHandler" preCondition="integratedMode,runtimeVersionv4.0" />
-        <add name="ScriptHandlerFactoryAppServices-Integrated-4.0" path="*_AppService.axd" verb="*" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" preCondition="integratedMode,runtimeVersionv4.0" />
-        <add name="ScriptResourceIntegrated-4.0" path="*ScriptResource.axd" verb="GET,HEAD" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" preCondition="integratedMode,runtimeVersionv4.0" />
-        <add name="ASPClassic" path="*.asp" verb="GET,HEAD,POST" modules="IsapiModule" scriptProcessor="%IIS_BIN%\asp.dll" resourceType="File" />
-        <add name="SecurityCertificate" path="*.cer" verb="GET,HEAD,POST" modules="IsapiModule" scriptProcessor="%IIS_BIN%\asp.dll" resourceType="File" />
-        <add name="ISAPI-dll" path="*.dll" verb="*" modules="IsapiModule" resourceType="File" requireAccess="Execute" allowPathInfo="true" />
-        <add name="TraceHandler-Integrated" path="trace.axd" verb="GET,HEAD,POST,DEBUG" type="System.Web.Handlers.TraceHandler" preCondition="integratedMode,runtimeVersionv2.0" />
-        <add name="WebAdminHandler-Integrated" path="WebAdmin.axd" verb="GET,DEBUG" type="System.Web.Handlers.WebAdminHandler" preCondition="integratedMode,runtimeVersionv2.0" />
-        <add name="AssemblyResourceLoader-Integrated" path="WebResource.axd" verb="GET,DEBUG" type="System.Web.Handlers.AssemblyResourceLoader" preCondition="integratedMode,runtimeVersionv2.0" />
-        <add name="PageHandlerFactory-Integrated" path="*.aspx" verb="GET,HEAD,POST,DEBUG" type="System.Web.UI.PageHandlerFactory" preCondition="integratedMode,runtimeVersionv2.0" />
-        <add name="SimpleHandlerFactory-Integrated" path="*.ashx" verb="GET,HEAD,POST,DEBUG" type="System.Web.UI.SimpleHandlerFactory" preCondition="integratedMode,runtimeVersionv2.0" />
-        <add name="WebServiceHandlerFactory-Integrated" path="*.asmx" verb="GET,HEAD,POST,DEBUG" type="System.Web.Services.Protocols.WebServiceHandlerFactory,System.Web.Services,Version=2.0.0.0,Culture=neutral,PublicKeyToken=b03f5f7f11d50a3a" preCondition="integratedMode,runtimeVersionv2.0" />
-        <add name="HttpRemotingHandlerFactory-rem-Integrated" path="*.rem" verb="GET,HEAD,POST,DEBUG" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory,System.Runtime.Remoting,Version=2.0.0.0,Culture=neutral,PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" />
-        <add name="HttpRemotingHandlerFactory-soap-Integrated" path="*.soap" verb="GET,HEAD,POST,DEBUG" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory,System.Runtime.Remoting,Version=2.0.0.0,Culture=neutral,PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" />
-        <add name="AXD-ISAPI-2.0" path="*.axd" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
-        <add name="PageHandlerFactory-ISAPI-2.0" path="*.aspx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
-        <add name="SimpleHandlerFactory-ISAPI-2.0" path="*.ashx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
-        <add name="WebServiceHandlerFactory-ISAPI-2.0" path="*.asmx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
-        <add name="HttpRemotingHandlerFactory-rem-ISAPI-2.0" path="*.rem" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
-        <add name="HttpRemotingHandlerFactory-soap-ISAPI-2.0" path="*.soap" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
-        <add name="AXD-ISAPI-2.0-64" path="*.axd" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness64" responseBufferLimit="0" />
-        <add name="PageHandlerFactory-ISAPI-2.0-64" path="*.aspx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness64" responseBufferLimit="0" />
-        <add name="SimpleHandlerFactory-ISAPI-2.0-64" path="*.ashx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness64" responseBufferLimit="0" />
-        <add name="WebServiceHandlerFactory-ISAPI-2.0-64" path="*.asmx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness64" responseBufferLimit="0" />
-        <add name="HttpRemotingHandlerFactory-rem-ISAPI-2.0-64" path="*.rem" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness64" responseBufferLimit="0" />
-        <add name="HttpRemotingHandlerFactory-soap-ISAPI-2.0-64" path="*.soap" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness64" responseBufferLimit="0" />
-        <add name="CGI-exe" path="*.exe" verb="*" modules="CgiModule" resourceType="File" requireAccess="Execute" allowPathInfo="true" />
-        <add name="SSINC-stm" path="*.stm" verb="GET,HEAD,POST" modules="ServerSideIncludeModule" resourceType="File" />
-        <add name="SSINC-shtm" path="*.shtm" verb="GET,HEAD,POST" modules="ServerSideIncludeModule" resourceType="File" />
-        <add name="SSINC-shtml" path="*.shtml" verb="GET,HEAD,POST" modules="ServerSideIncludeModule" resourceType="File" />
-        <add name="TRACEVerbHandler" path="*" verb="TRACE" modules="ProtocolSupportModule" requireAccess="None" />
-        <add name="OPTIONSVerbHandler" path="*" verb="OPTIONS" modules="ProtocolSupportModule" requireAccess="None" />
-        <add name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" path="*." verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
-        <add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" path="*." verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
-        <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" responseBufferLimit="0" />
-        <add name="StaticFile" path="*" verb="*" modules="StaticFileModule,DefaultDocumentModule,DirectoryListingModule" resourceType="Either" requireAccess="Read" />
-      </handlers>
-    </system.webServer>
-  </location>
-  <location path="zhengcaioa" inheritInChildApplications="false">
-    <system.webServer>
-      <modules>
-        <remove name="WebMatrixSupportModule" />
-      </modules>
-      <handlers>
-        <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
-      </handlers>
-      <aspNetCore processPath="%LAUNCHER_PATH%" stdoutLogEnabled="false" hostingModel="InProcess" startupTimeLimit="3600" requestTimeout="23:00:00" />
-      <httpCompression>
-        <dynamicTypes>
-          <add mimeType="text/event-stream" enabled="false" />
-        </dynamicTypes>
-      </httpCompression>
-    </system.webServer>
-  </location>
-</configuration>
\ No newline at end of file
diff --git a/zhengcaioa/.vs/zhengcaioa/v16/.suo b/zhengcaioa/.vs/zhengcaioa/v16/.suo
index 4d049ee..c1aa1f1 100644
--- a/zhengcaioa/.vs/zhengcaioa/v16/.suo
+++ b/zhengcaioa/.vs/zhengcaioa/v16/.suo
Binary files differ
diff --git a/zhengcaioa/DTO/HrSalaryDTO.cs b/zhengcaioa/DTO/HrSalaryDTO.cs
index e06e3cb..7677933 100644
--- a/zhengcaioa/DTO/HrSalaryDTO.cs
+++ b/zhengcaioa/DTO/HrSalaryDTO.cs
@@ -92,6 +92,10 @@
                         str = "鏈‘璁�";
                         break;
 
+                    case "H":
+                        str = "宸叉牳鍑�";
+                        break;
+
                     case "S":
                         str = "鐢宠瘔";
                         break;
diff --git a/zhengcaioa/IServices/IHrSalaryService.cs b/zhengcaioa/IServices/IHrSalaryService.cs
index 30c33ef..38ff3a9 100644
--- a/zhengcaioa/IServices/IHrSalaryService.cs
+++ b/zhengcaioa/IServices/IHrSalaryService.cs
@@ -34,5 +34,7 @@
         ResultDataEntity<HrSalaryDTO> SearchSalaryByPaging(HrSalaryDTOSearch searchEntity);
 
         ResultEntity SaveCheckSalary(HrSalaryDTO dto);
+
+        void AutoCheck();
     }
 }
diff --git a/zhengcaioa/IServices/ISimService.cs b/zhengcaioa/IServices/ISimService.cs
index 6496f5e..6d1a716 100644
--- a/zhengcaioa/IServices/ISimService.cs
+++ b/zhengcaioa/IServices/ISimService.cs
@@ -22,8 +22,10 @@
 
         SimCost GetSimCost(int id);
 
-        ResultDataEntity<SimCostView> SearchSimCostByPage(SimCostDTOSearch searchEntity);
+        List<SimCostView> SearchSimCostByPage(string sim, int year);
 
         SimCostView GetSimCost(string userid , int  bill_year, int bill_month);
+
+        ResultDataEntity<SimCostYearView> SearchSimCostYearByPage(SimCostDTOSearch searchEntity);
     }
 }
diff --git a/zhengcaioa/Model/Sim.cs b/zhengcaioa/Model/Sim.cs
index 7b98670..1528968 100644
--- a/zhengcaioa/Model/Sim.cs
+++ b/zhengcaioa/Model/Sim.cs
@@ -147,8 +147,94 @@
         {
             get
             {
-                return status=="0"?"姝e父":"鍏宠处";
+                return status=="0"?"鏈牳鍑�":"宸叉牳鍑�";
             }
         }
     }
+
+    [Table("v_sim_costyear")]
+    public class SimCostYearView
+    {
+        /// <summary>
+        /// 鍗″彿
+        /// </summary>
+        [Key]
+        public string sim_id { get; set; }
+
+        /// <summary>
+        /// 骞�
+        /// </summary>
+        public int bill_year { get; set; }
+
+        /// <summary>
+        /// 1鏈�
+        /// </summary>
+        public decimal Jan { get; set; }
+
+        /// <summary>
+        /// 2鏈�
+        /// </summary>
+        public decimal Feb { get; set; }
+
+        /// <summary>
+        /// 3鏈�
+        /// </summary>
+        public decimal Mar { get; set; }
+
+        /// <summary>
+        /// 4鏈�
+        /// </summary>
+        public decimal Apr { get; set; }
+
+        /// <summary>
+        /// 5鏈�
+        /// </summary>
+        public decimal May { get; set; }
+
+        /// <summary>
+        /// 6鏈�
+        /// </summary>
+        public decimal Jun { get; set; }
+
+        /// <summary>
+        /// 7鏈�
+        /// </summary>
+        public decimal Jul { get; set; }
+
+        /// <summary>
+        /// 8鏈�
+        /// </summary>
+        public decimal Aug { get; set; }
+
+        /// <summary>
+        /// 9鏈�
+        /// </summary>
+        public decimal Sept { get; set; }
+
+        /// <summary>
+        /// 10鏈�
+        /// </summary>
+        public decimal Oct { get; set; }
+
+        /// <summary>
+        /// 11鏈�
+        /// </summary>
+        public decimal Nov { get; set; }
+
+        /// <summary>
+        /// 12鏈�
+        /// </summary>
+        public decimal Dece { get; set; }
+
+        /// <summary>
+        /// 鍗″彿
+        /// </summary>
+        public string sim { get; set; }
+
+        /// <summary>
+        /// 妫�鏌ョ紪杈戞湀
+        /// </summary>
+        [NotMapped]
+        public int month { get; set; }
+    }
 }
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index 61265c2..1dab811 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -22,6 +22,8 @@
         public virtual DbSet<SimCost> SimCost { get; set; }
         public virtual DbSet<SimCostView> SimCostView { get; set; }
         public virtual DbSet<HrSalaryAppeal> HrSalaryAppeal { get; set; }
+        public virtual DbSet<SimCostYearView> SimCostYearView { get; set; }
+
 
         public virtual DbSet<AdmAskLeave> AdmAskLeaves { get; set; }
         public virtual DbSet<AdmAskLeaveOff> AdmAskLeaveOffs { get; set; }
diff --git a/zhengcaioa/Services/HrSalaryService.cs b/zhengcaioa/Services/HrSalaryService.cs
index 684d074..b2a8ea3 100644
--- a/zhengcaioa/Services/HrSalaryService.cs
+++ b/zhengcaioa/Services/HrSalaryService.cs
@@ -101,6 +101,13 @@
                 var updatepltRole = _context.HrSalaries.Where(c=>c.Id==dto.Id).SingleOrDefault();
                 if(updatepltRole!=null)
                 {
+                    //鏇存柊鐢佃瘽璐圭敤鐘舵��
+                    var sim = _context.SimCost.Where(c => c.bill_year == dto.Year && c.bill_month <= dto.Month && c.user_id == dto.Userid && c.status == "0").ToList();
+                    foreach(var item in sim)
+                    {
+                        item.status = "1";
+                    }
+
                     var user = _context.PltUsers.Where(c => c.Id == updatepltRole.Userid).SingleOrDefault();
 
                     updatepltRole.Jiangjin = dto.Jiangjin;
@@ -178,7 +185,7 @@
                         }
                     }
 
-                    updatepltRole.Islock = "Q";
+                    updatepltRole.Islock = "H";
                     updatepltRole.Modifier = dto.Modifier;
                     updatepltRole.Modifytime =DateTime.Now;
                     var count= _context.SaveChanges();
@@ -578,7 +585,7 @@
             var entity = (from a in _context.HrSalaries
                           join b in _context.PltUsers on a.Userid equals b.Id
                           join c in _context.HrDepts on b.DeptId equals c.Id
-                          where a.RecStatus=="A" && a.Userid == userid && a.Year == year && a.Month==month
+                          where a.RecStatus=="A" && a.Islock!="D" && a.Userid == userid && a.Year == year && a.Month==month
                           select new HrSalaryDTO()
                           {
                               Id = a.Id,
@@ -819,5 +826,17 @@
             data.LoadData(searchEntity, rolelist);
             return data;
         }
+
+        public void AutoCheck()
+        {
+            try
+            {
+                var salary = _context.Database.ExecuteSqlRaw("update [hr_salary] set islock='Q',[modifier]='e4c93811-b9b1-4998-89f5-c416ebab0c07',modifytime=getdate() where islock = 'H' and DATEDIFF(hh,[modifytime], getdate()) > 72");
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+        }
     }
 }
diff --git a/zhengcaioa/Services/SimService.cs b/zhengcaioa/Services/SimService.cs
index 07fdc0e..674535e 100644
--- a/zhengcaioa/Services/SimService.cs
+++ b/zhengcaioa/Services/SimService.cs
@@ -209,13 +209,13 @@
             ResultEntity resultEntity = new ResultEntity();
             try
             {
-                var temp = _context.SimCost.Where(e => e.id == md.id).SingleOrDefault();
+                var temp = _context.SimCost.Where(e => e.sim_id == md.sim_id && e.bill_year==md.bill_year && e.bill_month==md.bill_month).SingleOrDefault();
                 var tempBind = _context.SimBindView.Where(e => e.Id == md.sim_id).SingleOrDefault();                
                 if (temp != null && temp.status=="0")
                 {                    
                     temp.bill_amount = md.bill_amount;
-                    temp.bill_month = md.accounted_time.Month;
-                    temp.bill_year = md.accounted_time.Year;
+                    //temp.bill_month =md.m;
+                    //temp.bill_year = md.accounted_time.Year;
                     temp.sub_userid = md.sub_userid;                    
                     temp.up_time = DateTime.Now;
                     if(tempBind!=null)
@@ -227,22 +227,22 @@
                 }
                 else
                 {
-                    md.bill_month = md.accounted_time.Month;
-                    md.bill_year = md.accounted_time.Year;
+                    //md.bill_month = md.accounted_time.Month;
+                    //md.bill_year = md.accounted_time.Year;
 
                     //褰撴湀閲嶅鍒ゆ柇
-                    var monthck = _context.SimCost.Where(c => c.sim_id == md.sim_id && c.bill_year == md.bill_year && c.bill_month == md.bill_month).Count();
-                    if(monthck>0)
-                    {
-                        resultEntity.Result = false;
-                        resultEntity.Message = string.Format("姝ょ數璇濆崱鍦╗{0}-{1}]鏈堝凡瀛樺湪璁板綍锛屼笉鑳介噸澶嶆坊鍔狅紱",md.bill_year,md.bill_month);
-                        return resultEntity;
-                    }
-                    else
+                    //var monthck = _context.SimCost.Where(c => c.sim_id == md.sim_id && c.bill_year == md.bill_year && c.bill_month == md.bill_month).Count();
+                    //if(monthck>0)
+                    //{
+                    //    resultEntity.Result = false;
+                    //    resultEntity.Message = string.Format("姝ょ數璇濆崱鍦╗{0}-{1}]鏈堝凡瀛樺湪璁板綍锛屼笉鑳介噸澶嶆坊鍔狅紱",md.bill_year,md.bill_month);
+                    //    return resultEntity;
+                    //}
+                    //else
                     {
                         md.up_time = DateTime.Now;
                         md.status = "0";
-
+                        md.accounted_time = DateTime.Now;
                         if (tempBind != null)
                         {
                             md.allow_amount = decimal.Parse(tempBind.cardpro);
@@ -284,9 +284,9 @@
         /// </summary>
         /// <param name="searchEntity"></param>
         /// <returns></returns>
-        public ResultDataEntity<SimCostView> SearchSimCostByPage(SimCostDTOSearch searchEntity)
+        public List<SimCostView> SearchSimCostByPage(string sim ,int year)
         {
-            ResultDataEntity<SimCostView> data = new ResultDataEntity<SimCostView>();
+            List<SimCostView> data = new List<SimCostView>();
             try
             {
                 //var codedata = (from e in _context.SysCodes
@@ -298,26 +298,29 @@
                 //                && e.CodeField == "cardpro"
                 //                select c).OrderBy(x => x.Sort).ToList();
 
-                var dt = _context.SimCostView.OrderByDescending(c => c.accounted_time).ToList();
-                if (!string.IsNullOrEmpty(searchEntity.searchtime))
-                {
-                    var times = searchEntity.searchtime.Split('|');
-                    if(times.Length==2)
-                    {
-                        DateTime d1 = DateTime.Parse(times[0]);
-                        DateTime d2 = DateTime.Parse(times[1]);
-                        dt = dt.Where(c => c.accounted_time > d1 && c.accounted_time < d2).ToList();
-                    }                    
-                }
-                if (!string.IsNullOrEmpty(searchEntity.searchsim))
-                {
-                    dt = dt.Where(c => !string.IsNullOrEmpty(c.simcard) && c.simcard.Contains(searchEntity.searchsim)).ToList();
-                }
+                data = _context.SimCostView.Where(c => c.bill_year==year && c.sim_id==sim).OrderBy(c=>c.bill_month).ToList();
+                //if (!string.IsNullOrEmpty(searchEntity.searchtime))
+                //{
+                //    var times = searchEntity.searchtime.Split('|');
+                //    if(times.Length==2)
+                //    {
+                //        DateTime d1 = DateTime.Parse(times[0]);
+                //        DateTime d2 = DateTime.Parse(times[1]);
+                //        dt = dt.Where(c => c.accounted_time > d1 && c.accounted_time < d2).ToList();
+                //    }                    
+                //}
+                //if (!string.IsNullOrEmpty(searchEntity.searchsim))
+                //{
+                //    dt = dt.Where(c => !string.IsNullOrEmpty(c.simcard) && c.simcard.Contains(searchEntity.searchsim)).ToList();
+                //}
+                //SimCostDTOSearch searchEntity = new SimCostDTOSearch();
+                //searchEntity.rows = 20;
+                //searchEntity.page = 1;
 
-                if (searchEntity.totalrows == 0)
-                    searchEntity.totalrows = dt.Count();
+                //if (searchEntity.totalrows == 0)
+                //    searchEntity.totalrows = dt.Count();
 
-                var signinList = dt.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+                //var signinList = dt.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
 
                 //signinList = signinList.Select(a => new SimBindView()
                 //{
@@ -329,7 +332,7 @@
                 //    username = a.username
                 //}).ToList();
 
-                data.LoadData(searchEntity, signinList);
+                //data.LoadData(searchEntity, signinList);
             }
             catch (Exception ex)
             {
@@ -338,7 +341,13 @@
             return data;
         }
 
-
+        /// <summary>
+        /// 鏌ヨ璐圭敤璁板綍
+        /// </summary>
+        /// <param name="userid"></param>
+        /// <param name="bill_year"></param>
+        /// <param name="bill_month"></param>
+        /// <returns></returns>
         public SimCostView GetSimCost(string userid, int bill_year, int bill_month)
         {
 
@@ -349,6 +358,56 @@
             return entity;
         }
 
+        /// <summary>
+        /// 鏌ヨ鍐呭
+        /// </summary>
+        /// <param name="searchEntity"></param>
+        /// <returns></returns>
+        public ResultDataEntity<SimCostYearView> SearchSimCostYearByPage(SimCostDTOSearch searchEntity)
+        {
+            ResultDataEntity<SimCostYearView> data = new ResultDataEntity<SimCostYearView>();
+            try
+            {
+                int year=DateTime.Now.Year;
+                if (!string.IsNullOrEmpty(searchEntity.searchtime))
+                {
+                    year = int.Parse(searchEntity.searchtime);
+                }
+                
+                var dt = (from c in _context.SimCostYearView where c.bill_year==year orderby c.sim select c).ToList();
+
+                if (!string.IsNullOrEmpty(searchEntity.searchsim))
+                {
+                    dt = dt.Where(c => c.sim==searchEntity.searchsim).ToList();
+                }
+
+                if (searchEntity.totalrows == 0)
+                    searchEntity.totalrows = dt.Count();
+
+                var signinList = dt.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+                if(signinList.Count>0)
+                {
+                    var month = DateTime.Now.Month-1;
+                    var ck = (from c in _context.SimCost where c.status == "1" && c.bill_year == year orderby c.bill_month descending select c).FirstOrDefault();
+                    if(ck!=null)
+                    {
+                        month= ck.bill_month;                        
+                    }
+                    foreach (var item in signinList)
+                    {
+                        item.month = month;
+                    }
+                }
+
+                data.LoadData(searchEntity, signinList);
+            }
+            catch (Exception ex)
+            {
+                throw;
+            }
+            return data;
+        }
+
         #endregion
     }
 }
diff --git a/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs b/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
index 14d8836..ebd980b 100644
--- a/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
@@ -62,6 +62,8 @@
         /// <returns></returns>
         public IActionResult GetList(HrSalaryDTOSearch search)
         {
+            _hrSalaryService.AutoCheck();
+
             return new JsonResult(_hrSalaryService.SearchSalaryByPaging(search));
         }
 
@@ -212,6 +214,9 @@
         /// <returns></returns>
         public IActionResult GetSearchList(HrSalaryDTOSearch search)
         {
+            //鑷姩纭
+            _hrSalaryService.AutoCheck();
+
             return new JsonResult(_hrSalaryService.SearchByPagingFinish(search));
         }
         
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/SimCostController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/SimCostController.cs
index 507c37a..fad240b 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/SimCostController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/SimCostController.cs
@@ -34,24 +34,24 @@
         /// 鍒楄〃椤�
         /// </summary>
         /// <returns></returns>
-        public IActionResult Index()
+        public IActionResult Index(int year,string sim)
         {
-            List<ActionEntity> actionlist = new List<ActionEntity>();
-            ActionEntity actionEntity = new ActionEntity();
-            actionEntity.OpenType = 0;
-            actionEntity.ActionUrl = "";
-            actionEntity.ActionFun = "Search";
-            actionEntity.PageIco = "fa fa-search";
-            actionEntity.ActionName = "鏌ヨ";
-            actionlist.Add(actionEntity);
+            //List<ActionEntity> actionlist = new List<ActionEntity>();
+            //ActionEntity actionEntity = new ActionEntity();
+            //actionEntity.OpenType = 0;
+            //actionEntity.ActionUrl = "";
+            //actionEntity.ActionFun = "Search";
+            //actionEntity.PageIco = "fa fa-search";
+            //actionEntity.ActionName = "鏌ヨ";
+            //actionlist.Add(actionEntity);
 
-            ActionEntity actionEntity1 = new ActionEntity();
-            actionEntity1.OpenType = 0;
-            actionEntity1.ActionUrl = "";
-            actionEntity1.ActionFun = "Add";
-            actionEntity1.PageIco = "fa fa-plus";
-            actionEntity1.ActionName = "鏂板";
-            actionlist.Add(actionEntity1);
+            //ActionEntity actionEntity1 = new ActionEntity();
+            //actionEntity1.OpenType = 0;
+            //actionEntity1.ActionUrl = "";
+            //actionEntity1.ActionFun = "Add";
+            //actionEntity1.PageIco = "fa fa-plus";
+            //actionEntity1.ActionName = "鏂板";
+            //actionlist.Add(actionEntity1);
 
 
             //ActionEntity actionEntity4 = new ActionEntity();
@@ -62,7 +62,10 @@
             //actionEntity4.ActionName = "鎵归噺鍒犻櫎";
             //actionlist.Add(actionEntity4);
 
-            ViewData["ActionInfo"] = actionlist;
+            //ViewData["ActionInfo"] = actionlist;
+            ViewBag.Year = year;
+            ViewBag.Sim = sim;
+            //var js= _simService.SearchSimCostByPage(sim, year)
             return View();
         }
 
@@ -71,9 +74,17 @@
         /// </summary>
         /// <param name="search"></param>
         /// <returns></returns>
-        public IActionResult GetList(SimCostDTOSearch search)
+        public IActionResult GetList(int year, string sim)
         {
-            return new JsonResult(_simService.SearchSimCostByPage(search));
+            var list = _simService.SearchSimCostByPage(sim, year);
+            //var result = new
+            //{
+            //    total:"1",
+            //    page: 1, 
+            //    records: list.Count,  
+            //    rows: list
+            //};
+            return Json(list);
         }
 
         /// <summary>
@@ -81,15 +92,18 @@
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        public IActionResult Edit(string id=null)
-        {
-            ViewBag.SimCard = _simService.GetBindSim();            
+        public IActionResult Edit(string id,decimal money,int year, int month,string sim)
+        {           
             SimCost dto = new SimCost();
-            dto.accounted_time = DateTime.Now;
-            if (!string.IsNullOrEmpty(id))
-            {
-                dto = _simService.GetSimCost(int.Parse(id));
-            }
+            dto.bill_month = month;
+            dto.bill_amount = money;
+            dto.sim_id = id;
+            dto.sub_userid = sim;
+            dto.bill_year = year;
+            //if (!string.IsNullOrEmpty(id))
+            //{
+            //    dto = _simService.GetSimCost(int.Parse(id));
+            //}
             ViewData.Model = dto;
             return View();
         }
@@ -113,6 +127,39 @@
             return new JsonResult(resultEntity);
         }
 
+        /// <summary>
+        /// 鍒楄〃椤�
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult SimYear()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 鍒楄〃鍐呭
+        /// </summary>
+        /// <param name="search"></param>
+        /// <returns></returns>
+        public IActionResult GetSimYearList(SimCostDTOSearch search)
+        {
+            return new JsonResult(_simService.SearchSimCostYearByPage(search));
+        }
+
+        [HttpPost]
+        public IActionResult SaveSimYearCost(object data)
+        {
+            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+            ResultEntity resultEntity = new ResultEntity();
+            //using (TransactionScope scope = new TransactionScope())
+            //{
+            //    data.sub_userid = curentuser.Id;
+            //    resultEntity = _simService.SaveCost(data);
+            //    scope.Complete();
+            //}
+            return new JsonResult(resultEntity);
+        }
+
         ///// <summary>
         ///// 瑙g粦
         ///// </summary>
diff --git a/zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Edit.cshtml
index 8349980..5c5350c 100644
--- a/zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Edit.cshtml
@@ -270,14 +270,18 @@
             "hideMethod": "fadeOut"
         };
 
-
-        
-
         var id = '@Model.Id';
 
-        if (id == null || id == '') {
-            $("#GoodsStatus").val("A"); 
-        }
+         $(function () {
+
+             if (id.length > 0) {
+
+             }
+             else {
+                 $("#GoodsStatus").val("A");
+             }
+
+            });
 
         var delPosition = function () {
             if (id == null || id == '') {
@@ -319,7 +323,7 @@
         // 淇濆瓨宀椾綅淇℃伅
         var savePosition = function () {
 
-          
+
 
             if ($("#ClassifyId").val() == '') {
                 toastr.warning("鐗╁搧绫诲埆涓嶈兘涓虹┖");
@@ -333,7 +337,7 @@
                 toastr.warning("鐗╁搧鏁伴噺涓嶈兘涓虹┖");
                 return;
             }
-            
+
             if ($("#GoodsStatus").val() == '') {
                 toastr.warning("鐗╁搧鐘舵�佷笉鑳戒负绌�");
                 return;
@@ -343,7 +347,7 @@
                 toastr.warning("鐗╁搧鍚嶇О涓嶈兘涓虹┖");
                 return;
             }
-            
+
 
 
 
@@ -358,7 +362,7 @@
                 global: false,
                 data: $('form').serializeArray(),
                 success: function (data) {
-                  
+
 
 
                         if (data.Result) {
diff --git a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml
index 0a08cf8..b8f850e 100644
--- a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml
@@ -72,25 +72,25 @@
                             <div class="clearfix layer-area" style="padding-bottom:15px;">
                                 <label class="text-right col-sm-3 col-md-3 control-label">濂栭噾</label>
                                 <div class="col-sm-9 col-md-9">
-                                    <input class="form-control" name="Jiangjin" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Jiangjin" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+                                    <input class="form-control" id="Jiangjin" name="Jiangjin" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Jiangjin" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                 </div>
                             </div>
                             <div class="clearfix layer-area" style="padding-bottom:15px;">
                                 <label class="text-right col-sm-3 col-md-3 control-label">琛ュ彂宸ヨ祫</label>
                                 <div class="col-sm-9 col-md-9">
-                                    <input class="form-control" name="Bufagongzi" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Bufagongzi" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+                                    <input class="form-control" id="Bufagongzi" name="Bufagongzi" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Bufagongzi" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                 </div>
                             </div>
                             <div class="clearfix layer-area" style="padding-bottom:15px;">
                                 <label class="text-right col-sm-3 col-md-3 control-label">璧斿伩</label>
                                 <div class="col-sm-9 col-md-9">
-                                    <input class="form-control" name="Peichang" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Peichang" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+                                    <input class="form-control" id="Peichang" name="Peichang" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Peichang" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                 </div>
                             </div>
                             <div class="clearfix layer-area" style="padding-bottom:15px;">
                                 <label class="text-right col-sm-3 col-md-3 control-label">绾犻敊</label>
                                 <div class="col-sm-9 col-md-9">
-                                    <input class="form-control" label="钖祫寰呴亣" name="Jiucuo" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Jiucuo" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+                                    <input class="form-control" id="Jiucuo" name="Jiucuo" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Jiucuo" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                 </div>
                             </div>
 
@@ -133,7 +133,7 @@
                 <a class="btn btn-success" href="javascript:void(0)" onclick="_pageAutoClose();" style="margin-left:4px; border-radius:4px;">
                     <i class="glyphicon glyphicon-remove"></i>&nbsp;&nbsp;<span class="bold">鍙栨秷</span>
                 </a>
-                <a class="btn btn-success" href="javascript:void(0)" onclick="saveSimCost();" style="margin-left:4px; border-radius:4px;">
+                <a class="btn btn-success" href="javascript:void(0)" onclick="saveCheck();" style="margin-left:4px; border-radius:4px;">
                     <i class="glyphicon glyphicon-ok"></i>&nbsp;&nbsp;<span class="bold">鎻愪氦</span>
                 </a>
             </div>
@@ -173,24 +173,29 @@
         };
 
         // 淇濆瓨
-        function saveSimCost() {
+        function saveCheck() {
 
-            if ($("#cbbCard").val() == '') {
-                toastr.warning("鐢佃瘽鍗″彿涓嶈兘涓虹┖");
+            if ($("#Jiangjin").val() == '') {
+                toastr.warning("濂栭噾涓嶈兘涓虹┖");
                 return;
             }
-            if ($("#billamount").val() == '') {
-                toastr.warning("瀹為檯鐢佃瘽璐圭敤涓嶈兘涓虹┖");
+            if ($("#Bufagongzi").val() == '') {
+                toastr.warning("琛ュ彂宸ヨ祫涓嶈兘涓虹┖");
                 return;
             }
-            if ($("#acTime").val() == '') {
-                toastr.warning("璐圭敤璁拌处鏃ユ湡涓嶈兘涓虹┖");
+            if ($("#Peichang").val() == '') {
+                toastr.warning("璧斿伩涓嶈兘涓虹┖");
                 return;
             }
+            if ($("#Jiucuo").val() == '') {
+                toastr.warning("绾犻敊涓嶈兘涓虹┖");
+                return;
+            }
+
            
             $.ajax({
                 type: "POST",
-                url: "/SimCost/SaveSimCost2",
+                url: "/SalaryCheck/SaveCheck",
                 dataType: "json",
                 global: false,
                 data: $('#fm').serialize(),
@@ -198,12 +203,7 @@
 
                         if (data.Result) {
                             parent.layer.msg('璁剧疆鎴愬姛', { icon: 6 });
-                            try {
-                                _pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶
-                            }
-                            catch (err) {
-                                parent._CloseTab1("/SimCost/Edit/");
-                            }
+                            _pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶                            
                         }
                         else {
                             // toastr.error("澶辫触");
diff --git a/zhengcaioa/zhengcaioa/Views/SimCost/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/SimCost/Edit.cshtml
index d419797..d9487c1 100644
--- a/zhengcaioa/zhengcaioa/Views/SimCost/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SimCost/Edit.cshtml
@@ -3,7 +3,6 @@
 @using zhengcaioa.Models;
 @{
     Layout = null;
-    List<SimBindView> Card = ViewData["SimCard"] as List<SimBindView>; 
 }
 
 <!DOCTYPE html>
@@ -58,40 +57,23 @@
                         <div id="div_content" class="ibox-content" style="background-color:white;">
                             <div class="row">
                                 <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                    <label class="text-right col-sm-1 col-md-1 control-label">鐢佃瘽鍗″彿<i class="red">*</i></label>
+                                    <label class="text-right col-sm-1 col-md-1 control-label">鐢佃瘽鍙风爜<i class="red">*</i></label>
                                     <div class="col-sm-2 col-md-2">
-                                        <select id="cbbCard" class="data form-control" name="sim_id" data-placeholder="閫夋嫨 搴忓垪 ...">
-                                            <option value="" hassubinfo="true">璇烽�夋嫨</option>
-                                            @foreach (var item in Card)
-                                            {
-                                                @if (!item.Id.Equals(Model.sim_id))
-                                                {
-                                                    <option value="@item.Id" hassubinfo="true">
-                                                        @item.simcard
-                                                    </option>
-                                                }
-                                                else
-                                                {
-                                                    <option value="@item.Id" hassubinfo="true" selected="selected">
-                                                        @item.simcard
-                                                    </option>
-                                                }
-                                            }
-                                        </select>
-                                        <input type="hidden" name="id" value="@Model.id" />
+                                        <input type="text" value="@Model.sub_userid" class="form-control" readonly="readonly" />
+                                        <input type="hidden" name="sim_id" value="@Model.sim_id" />
+                                    </div>
+                                </div>
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                    <label class="text-right col-sm-1 col-md-1 control-label">璐圭敤鏈堜唤<i class="red">*</i></label>
+                                    <div class="col-sm-2 col-md-2">
+                                        <input type="text" name="bill_month" class="form-control" value="@Model.bill_month" readonly="readonly" />
+                                        <input type="hidden" name="bill_year" value="@Model.bill_year" />
                                     </div>
                                 </div>
                                 <div class="clearfix layer-area" style="padding-bottom:15px;">
                                     <label class="text-right col-sm-1 col-md-1 control-label">瀹為檯鐢佃瘽璐圭敤<i class="red">*</i></label>
                                     <div class="col-sm-2 col-md-2">
-                                        <input id="billamount" class="form-control" label="钖祫寰呴亣" name="bill_amount" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.bill_amount" oninput="if(value.length>4)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
-                                    </div>
-                                </div>
-                                <div class="clearfix layer-area" style="padding-bottom:15px;">
-
-                                    <label class="text-right col-sm-1 col-md-1 control-label">璐圭敤璁拌处鏃ユ湡<i class="red">*</i></label>
-                                    <div class="col-sm-2 col-md-2">
-                                        <input id="acTime" class="form-control" name="accounted_time" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.accounted_time.ToString("yyyy/MM/dd")" >
+                                        <input id="billamount" class="form-control" name="bill_amount" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.bill_amount" oninput="if(value.length>4)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                     </div>
                                 </div>
                             </div>
@@ -114,49 +96,32 @@
     </form>
 
     <script type="text/javascript">
-         $(function () {
-            
-             $("#cbbCard").chosen();           
-
-             laydate({ elem: "#acTime", format: 'YYYY/MM/DD', istime: false, event: "focus" });
-
-            });
-
-        var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2 - 95;
-        $("#div_content").height(hh);
-
-        toastr.options = {
-            "closeButton": true,
-            "debug": false,
-            "progressBar": true,
-            "positionClass": "toast-bottom-right",
-            "onclick": null,
-            "showDuration": "300",
-            "hideDuration": "600",
-            "timeOut": "4500",
-            "extendedTimeOut": "600",
-            "showEasing": "swing",
-            "hideEasing": "linear",
-            "showMethod": "fadeIn",
-            "hideMethod": "fadeOut"
-        };
-
+       
+            toastr.options = {
+                "closeButton": true,
+                "debug": false,
+                "progressBar": true,
+                "positionClass": "toast-bottom-right",
+                "onclick": null,
+                "showDuration": "300",
+                "hideDuration": "600",
+                "timeOut": "4500",
+                "extendedTimeOut": "600",
+                "showEasing": "swing",
+                "hideEasing": "linear",
+                "showMethod": "fadeIn",
+                "hideMethod": "fadeOut"
+            };
+        
         // 淇濆瓨
         function saveSimCost() {
 
-            if ($("#cbbCard").val() == '') {
-                toastr.warning("鐢佃瘽鍗″彿涓嶈兘涓虹┖");
-                return;
-            }
+            
             if ($("#billamount").val() == '') {
                 toastr.warning("瀹為檯鐢佃瘽璐圭敤涓嶈兘涓虹┖");
                 return;
             }
-            if ($("#acTime").val() == '') {
-                toastr.warning("璐圭敤璁拌处鏃ユ湡涓嶈兘涓虹┖");
-                return;
-            }
-           
+                       
             $.ajax({
                 type: "POST",
                 url: "/SimCost/SaveSimCost",
diff --git a/zhengcaioa/zhengcaioa/Views/SimCost/Index.cshtml b/zhengcaioa/zhengcaioa/Views/SimCost/Index.cshtml
index 72d4b9a..2e65b55 100644
--- a/zhengcaioa/zhengcaioa/Views/SimCost/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SimCost/Index.cshtml
@@ -1,24 +1,77 @@
 锘緻{
-    ViewBag.Title = "鐢佃瘽璐瑰綍鍏�";
-    Layout = "~/Views/Shared/_Layout_Search.cshtml";
+    ViewBag.Title = "鐢佃瘽璐�";
+    Layout = null;// "~/Views/Shared/_Layout_Search.cshtml";
 }
 
-<link href="~/css/jquery-confirm.css" rel="stylesheet">
-<script src="~/js/jquery-confirm.js" type="text/javascript"></script>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="ThemeBucket">
+    <title></title>
+    <link href="~/css/bootstrap.min.css" rel="stylesheet">
+    <link href="~/css/plugins/jqgrid/ui.jqgrid.css?v=111111111" rel="stylesheet">
+    <link href="~/css/animate.min.css" rel="stylesheet">
+    <link href="~/css/style.min.css" rel="stylesheet">
+    <script src="~/js/jquery.min.js"></script>
+    <script src="~/js/plugins/jqgrid/i18n/grid.locale-cn.js"></script>
+    <script src="~/js/plugins/jqgrid/jquery.jqGrid.min.js"></script>
+</head>
+<body style="width:100%;padding:10px">
+    <table id="list2"></table>
+    @*<div id="pager2"></div>*@
 
-@section headerStyle{
+<script type="text/javascript">
 
-    <script type="text/javascript">
+    $(function () {
+        var year =@ViewBag.Year;
+        var sim ='@ViewBag.Sim';
+        var urlstr = "/SimCost/GetList?year=" + year + "&sim=" + sim;
 
-        gridConfig = { multiselect: false, selectcol: "id" };
+            jQuery("#list2").jqGrid(
+                {
+                    url: urlstr,
+                datatype: "json",
+                colModel: [                    
+                    {
+                        label: '鏃ユ湡', name : 'bill_year', labtype: 'txt', hidden: false, width: 100,
+                        formatter: function (cellvalue, options, rowObject) {
+                            return rowObject.bill_year + "-" + rowObject.bill_month;
+                        }
+                    },
+                    {
+                        label: '鐢佃瘽鍗″彿', name : 'simcard', labtype: 'txt', hidden: false, width: 150,
+                    },
+                    { label: '浣跨敤浜哄憳', name : 'username', labtype: 'txt', hidden: false, width: 150 },
+                    { label: '鐢佃瘽鍗曢噾棰�', name : 'bill_amount', labtype: 'txt', hidden: false, width: 150 },
+                    { label: '鐢佃瘽琛ヨ创閲戦', name : 'allow_amount', labtype: 'txt', hidden: false, width: 150 },
+                    { label: '宸紓閲戦', name : 'amount', labtype: 'txt', hidden: false, width: 100 },
+                    { label: '鐘舵��', name : 'statusChs', labtype: 'txt', hidden: false, width: 100 },
+                    { label: '鏇存柊鏃ユ湡', name: 'up_time', labtype: 'txt', hidden: false, width: 200},
+                    ],
+                    shrinkToFit: true,
+                //rowNum: 10,
+                //rowList: [10, 20, 30],
+                //pager: '#pager2',
+                //sortname: 'id',
+                mtype: "post",
+                viewrecords: true,
+            });
+        });
+
+
+
+        @*gridConfig = { multiselect: false, selectcol: "id" };
         dataCol = [
             { label: '搴忓彿', name: 'id', labtype: 'txt', hidden: false, width: 50 },
-            { label: '璐﹀崟鏃ユ湡', name: 'accountMonth', labtype: 'txt', hidden: false, width: 150 },
+            {
+                label: '鏃ユ湡', name: 'bill_year', labtype: 'txt', hidden: false, width: 150,
+                formatter: function (cellvalue, options, rowObject) {
+                    return rowObject.bill_year + "-" + rowObject.bill_month;
+                }},
             {
                 label: '鐢佃瘽鍗″彿', name: 'simcard', labtype: 'txt', hidden: false, width: 150,
-                formatter: function (cellvalue, options, rowObject) {
-                    return "<a onclick=\"OpenWindow('缂栬緫鐢佃瘽璐圭敤','98%','90%', '/SimCost/Edit?id=" + rowObject.id + "')\"  >" + cellvalue + "</a>";
-                }
             },
             { label: '浣跨敤浜哄憳', name: 'username', labtype: 'txt', hidden: false, width: 150 },
             { label: '鐢佃瘽鍗曢噾棰�', name: 'bill_amount', labtype: 'txt', hidden: false, width: 100 },
@@ -27,80 +80,11 @@
             { label: '鐘舵��', name: 'statusChs', labtype: 'txt', hidden: false, width: 100 },
             { label: '鏇存柊鏃ユ湡', name: 'up_time', labtype: 'txt', hidden: false },
         ];
-        dataUrl = "/SimCost/GetList";
-        searchCol = [
-            { label: '鏃堕棿', name: 'searchtime', labtype: 'datearea', hidden: false },
-            { label: '鐢佃瘽鍗″彿', name: 'searchsim', labtype: 'txt', hidden: false, cwidth: '5%', cccwidth: '8%' }
-        ];
+        dataUrl = "/SimCost/GetList?year=" +@ViewBag.Year+"&sim="+@ViewBag.Sim;*@
 
-        var _pageAdd = function () {
-            OpenWindow("鏂板鐢佃瘽璐圭敤", "98%", "90%", "/SimCost/Edit/");
-        }
+</script>
 
-        var _pageUnBind = function () {
-            var db = jQuery('#jqGrid').jqGrid('getGridParam', 'selarrrow');
-            if (db.length > 0) {
-                $.confirm({
-                    title: '瑙i櫎缁戝畾鎿嶄綔纭',
-                    content: '姝ゆ搷浣滃皢瑙i櫎鎵�閫夊畾鐢佃瘽鍗″拰浜哄憳缁戝畾鍏崇郴锛岀‘璁よ缁х画鍚�?',
-                    type: 'green',
-                    icon: 'glyphicon glyphicon-question-sign',
-                    buttons: {
-                        ok: {
-                            text: '纭',
-                            btnClass: 'btn-primary',
-                            action: function () {
-                                $.ajax({
-                                    type: "POST",
-                                    url: "/Sim/UnBindSim?id="+db,
-                                    dataType: "json",
-                                    global: false,
-                                    success: function (data) {
+</body>
+</html>
 
-                                        if (data.Result) {
-                                            jQuery('#jqGrid').jqGrid().trigger('reloadGrid');
-                                            
-                                            parent.layer.msg('璁剧疆鎴愬姛', { icon: 6 });                                           
-                                        }
-                                        else {
-                                            parent.layer.msg(data.Message, { icon: 5 });
-                                        }
-                                    },
-                                    error: function () {
-                                        parent.layer.msg('澶辫触', { icon: 5 });
-                                    }
-                                });
-                            }
-                        },
-                        cancel: {
-                            text: '鍙栨秷',
-                            btnClass: 'btn-primary'
-                        }
-                    }
-                });
-            }
-            else {
-                $.alert("璇峰厛閫夋嫨闇�瑕佽В缁戠殑鐢佃瘽鍗★紒");
-            }
 
-        }
-
-        var _afterSave = function (result) {
-            if (result) {
-                toastr.success("淇濆瓨鎴愬姛");
-            } else {
-                toastr.error("淇濆瓨澶辫触");
-            }
-        }
-
-        var _afterDel = function (result) {
-            if (result) {
-                toastr.success("鍒犻櫎鎴愬姛");
-            } else {
-                /**/
-                toastr.error("鍒犻櫎鎴愬姛");
-                /**/
-            }
-        }
-    </script>
-}
diff --git a/zhengcaioa/zhengcaioa/Views/SimCost/SimYear.cshtml b/zhengcaioa/zhengcaioa/Views/SimCost/SimYear.cshtml
new file mode 100644
index 0000000..6e52dcf
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/SimCost/SimYear.cshtml
@@ -0,0 +1,142 @@
+锘緻{
+    ViewBag.Title = "鐢佃瘽璐圭粺璁″綍鍏�";
+    Layout = "~/Views/Shared/_Layout_Search.cshtml";
+}
+
+<link href="~/css/jquery-confirm.css" rel="stylesheet">
+<link href="~/js/plugins/layer/laydate/theme/default/laydate.css" rel="stylesheet">
+<script src="~/js/jquery-confirm.js" type="text/javascript"></script>
+<script src="~/js/plugins/layer/laydate/laydate5.js" type="text/javascript"></script>
+
+<style>
+    /* .laydate_table {
+        display: none;
+    }*/
+
+    .col-base {
+        line-height: 35px;
+    }
+    /*
+    #laydate_hms {
+        display: none !important;
+    }*/
+</style>
+
+@section headerStyle{
+
+    <table style="line-height:35px;margin-top:15px">
+        <tr>
+            <td width="100"></td>
+            <td>鏌ヨ骞翠唤锛�</td>
+            <td width="180">
+                <input id="acTime" style="width:150px" class="layui-input" placeholder="yyyy" type="text" />
+            </td>
+            <td>鐢佃瘽鍗″彿锛�</td>
+            <td width="180">
+                <input id="acSim" class="form-control" labtype="txt" addvisible="true" type="text">
+            </td>
+            <td>
+                <a class="btn btn-default btn-outline" href="#" onclick="doSearch()" style="margin-left:20px">
+                    <i class="fa fa-search"></i>&nbsp;&nbsp;<span class="bold">鏌ヨ</span>
+                </a>
+            </td>
+            <td></td>
+        </tr>
+    </table>
+
+    <script type="text/javascript">
+
+        gridConfig = { multiselect: false, selectcol: "sim_id" };
+        shrinkToFit = true;
+        footerrow = true;
+
+        dataCol = [
+            { label: '搴忓彿', name: 'sim_id', labtype: 'txt', hidden: true },
+            { label: '骞翠唤', name: 'bill_year', labtype: 'txt', hidden: false, width: 100 },
+            {
+                label: '鐢佃瘽鍗″彿', name: 'sim', labtype: 'txt', hidden: false, width: 100,
+                formatter: function (cellvalue, options, rowObject) {
+                    var simcode = rowObject.sim_id;
+                    var url = "/SimCost/Index?year=" + rowObject.bill_year + "&sim=" + simcode;
+                    return "<a onclick=\"OpenWindow('鐢佃瘽璐�','70%','50%','"+url+"' )\"  >" + cellvalue + "</a>";
+                }
+            },
+
+            {
+                label: '1鏈�', name: 'Jan', labtype: 'txt', hidden: false, align: 'right', width: 100, formatter: currencyFmatter
+            },
+            { label: '2鏈�', name: 'Feb', labtype: 'txt', hidden: false, align: 'right', width: 100, formatter: currencyFmatter },
+            { label: '3鏈�', name: 'Mar', labtype: 'txt', hidden: false, align: 'right', width: 100, formatter: currencyFmatter},
+            { label: '4鏈�', name: 'Apr', labtype: 'txt', hidden: false, align: 'right', width: 100, formatter: currencyFmatter},
+            { label: '5鏈�', name: 'May', labtype: 'txt', hidden: false, align: 'right', width: 100, formatter: currencyFmatter},
+            { label: '6鏈�', name: 'Jun', labtype: 'txt', hidden: false, align: 'right', width: 100, formatter: currencyFmatter},
+            { label: '7鏈�', name: 'Jul', labtype: 'txt', hidden: false, align: 'right', width: 100, formatter: currencyFmatter},
+            { label: '8鏈�', name: 'Aug', labtype: 'txt', hidden: false, align: 'right', width: 100, formatter: currencyFmatter},
+            { label: '9鏈�', name: 'Sept', labtype: 'txt', hidden: false, align: 'right', width: 100, formatter: currencyFmatter},
+            { label: '10鏈�', name: 'Oct', labtype: 'txt', hidden: false, align: 'right', width: 100, formatter: currencyFmatter},
+            { label: '11鏈�', name: 'Nov', labtype: 'txt', hidden: false, align: 'right', width: 100, formatter: currencyFmatter },
+            { label: '12鏈�', name: 'Dece', labtype: 'txt', hidden: false, align: 'right', width: 100, formatter: currencyFmatter }
+        ];
+        dataUrl = "/SimCost/GetSimYearList";
+        searchCol = [];
+
+        var lastsel;
+
+        $(function () {
+
+            laydate.render({
+                elem: '#acTime'
+                , type: 'year'
+                , value: getNowFormatDate()
+            });
+
+            //$("#jqGridPager").hide();//闅愯棌div
+
+            //$("#jqGrid").closest(".ui-jqgrid-bdiv").css({ 'overflow-x': 'scroll' });
+
+            //jQuery("#jqGrid").jqGrid('setGridHeight', 150);
+
+        });
+
+
+        function getNowFormatDate() {
+            var date = new Date();
+            var year = date.getFullYear();
+            return year;
+            }
+
+            function currencyFmatter(cellvalue, options, rowObject) {
+                var id = rowObject.sim_id;
+                var sim = rowObject.sim;
+                var m = options.pos - 3;
+
+                if (m > rowObject.month) {
+                    var y = rowObject.bill_year;
+                    var url = "/SimCost/Edit?id=" + id + "&money=" + cellvalue + "&year=" + y + "&month=" + m + "&sim=" + sim;
+
+                    return "<a onclick=\"OpenWindow('鐢佃瘽璐圭敤褰曞叆','30%','50%','" + url + "')\">" + cellvalue + "</a>";
+                }
+                else {
+                    return cellvalue;
+                }
+        }
+
+        function doSearch() {
+                       
+
+            // $("#jqGrid").trigger('reloadGrid');
+            $("#jqGrid").jqGrid('setGridParam', {
+                url: "/SimCost/GetSimYearList",
+                postData: {
+                    searchtime: $('#acTime').val(),
+                    searchsim: $('#acSim').val(),
+                }
+
+            }).trigger("reloadGrid");
+
+            }
+                    
+
+    </script>
+
+}
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/zhengcaioa.csproj.user b/zhengcaioa/zhengcaioa/zhengcaioa.csproj.user
index 67fd912..4f8b184 100644
--- a/zhengcaioa/zhengcaioa/zhengcaioa.csproj.user
+++ b/zhengcaioa/zhengcaioa/zhengcaioa.csproj.user
@@ -15,6 +15,6 @@
     <WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>
     <WebStackScaffolding_IsReferencingScriptLibrariesSelected>False</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
     <WebStackScaffolding_LayoutPageFile />
-    <ShowAllFiles>true</ShowAllFiles>
+    <ShowAllFiles>false</ShowAllFiles>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git "a/\347\224\250\346\210\267\350\241\250\346\233\264\346\226\260.sql" "b/\347\224\250\346\210\267\350\241\250\346\233\264\346\226\260.sql"
index c194601..02c585d 100644
--- "a/\347\224\250\346\210\267\350\241\250\346\233\264\346\226\260.sql"
+++ "b/\347\224\250\346\210\267\350\241\250\346\233\264\346\226\260.sql"
@@ -103,7 +103,7 @@
 --电话卡分配菜单
 insert into [plt_page] values('a3479c03-d554-4e02-b201-487e8e1dfb55','1','电话卡分配','',3,'/Sim/Index/','01','M','967b0bdd-cd5d-4660-8c72-7f744c07751b','',0,'A','e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate(),'e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate())
 --电话费记录明细
-insert into [plt_page] values('5E973843-7EB4-41A6-B49B-192208647B2C','1','电话费用记录','',4,'/SimCost/Index/','01','M','967b0bdd-cd5d-4660-8c72-7f744c07751b','',0,'A','e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate(),'e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate())
+insert into [plt_page] values('5E973843-7EB4-41A6-B49B-192208647B2C','1','电话费用记录','',4,'/SimCost/SimYear/','01','M','967b0bdd-cd5d-4660-8c72-7f744c07751b','',0,'A','e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate(),'e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate())
 
 USE [zhengcaioa]
 GO

--
Gitblit v1.9.1