From a7e05ebe00fdcb649c012e5afc4a42a8d631e824 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 02 四月 2025 08:38:24 +0800
Subject: [PATCH] 删除客户管理查询条件中的“客户编号” 完成 新增订单---黑白印件 的后道工序最右边增加一个“口 竖式”，同前面套号、压痕一样，默认不勾选，是竖式的业务经理自己下单时勾选 完成提交外协付款申请时，增加上传审批证明的上传图片功能，可以添加多张图片；查询列表中增加“付款状态：全部、已付款、未付款”查询条件，默认全部；“完工状态”改为默认未完工 完成请示批复----付款申请 中也要向上面的需求一样，增加上传审批证明的上传图片功能，可以添加多张图片 完成在“请示批复”中进行“批复”操作的时候要能查看上传的审批图片 完成包装要求”要显示在打印的订单中 完成包装要求”要显示在打印的订单中 完成收据联单的新增订单中，纸张选无碳纸时，不显示“品牌”、“克重”，在联数的后面增加颜色选择：“颜色：上白下红”（匹配联数）订单管理中的“订单状态”删除，删除后新增两个状态：“完工状态：全部、未完工、已完工”和“送货状态：全部、已送货、未送货” 完成请示批复中默认“未批复” 完成请示批复中默认“未批复” 完成
---
CY_ECommercePlatform/CY.WebForm/Web.config | 47 +++++++++++++++++++++++++++++------------------
1 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Web.config b/CY_ECommercePlatform/CY.WebForm/Web.config
index e68af8c..a04f9bc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Web.config
+++ b/CY_ECommercePlatform/CY.WebForm/Web.config
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+锘�<?xml version="1.0" encoding="utf-8"?>
<!--
鏈夊叧濡備綍閰嶇疆 ASP.NET 搴旂敤绋嬪簭鐨勮缁嗕俊鎭紝璇疯闂�
http://go.microsoft.com/fwlink/?LinkId=169433
-->
-
<configuration>
<configSections>
<section name="exceptionHandling" type="Microsoft.Practices.EnterpriseLibrary.ExceptionHandling.Configuration.ExceptionHandlingSettings, Microsoft.Practices.EnterpriseLibrary.ExceptionHandling, Version=5.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="true" />
@@ -12,6 +10,8 @@
<sectionGroup name="system.web">
<section name="neatUpload" type="Brettle.Web.NeatUpload.ConfigSectionHandler,Brettle.Web.NeatUpload" allowLocation="true" />
</sectionGroup>
+ <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+ <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections>
<RewriterConfig>
<Rules>
@@ -147,7 +147,6 @@
<LookFor>~/register/firm.html</LookFor>
<SendTo>~/Pages/front/RegisterFirm.aspx</SendTo>
</RewriterRule>
-
<RewriterRule>
<LookFor>~/infom/level.html</LookFor>
<SendTo>~/Pages/front/InfoMemberLevel.aspx</SendTo>
@@ -268,11 +267,8 @@
</exceptionPolicies>
</exceptionHandling>
<connectionStrings>
- <add name="SqlConnection" connectionString="Data Source=localhost;Initial Catalog=ECTEST;User ID=sa;Password=123456" providerName="System.Data.SqlClient" />
- <!-- <add name="SqlConnection"
- connectionString="Data Source=DESKTOP-8E2C3RS;Initial Catalog=ECTEST;User ID=sa;Password=123456"
- providerName="System.Data.SqlClient" />-->
-
+ <!--<add name="SqlConnection" connectionString="Server=CB2-20200827ONU;Database=ECTEST;Trusted_Connection=True;" providerName="System.Data.SqlClient" />-->
+ <add name="SqlConnection" connectionString="Data Source=.;Initial Catalog=ECTEST;User ID=sa;Password=123456;Max Pool Size=32767; Min Pool Size=0;" providerName="System.Data.SqlClient" />
<!--<add name="SqlConnection"
connectionString="Data Source=118.123.213.60\SQLSERVER2008;Initial Catalog=ECTEST;User ID=sa;Password=123qwe!@#;"
providerName="System.Data.SqlClient" />-->
@@ -287,13 +283,13 @@
<appSettings>
<add key="LoggerName" value="AdoNetAppender" />
<add key="NumberOfResultsPerPage" value="" />
- <add key="QueryTimeOut" value="10000" />
+ <add key="QueryTimeOut" value="100000" />
<add key="DALPath" value="CY.SQLDAL" />
<add key="RootConfigPath" value="" />
<add key="LoginURL" value="" />
<add key="UploadFileURL" value="http://localhost:2641/FileUpload.aspx" />
+ <add key="TuPianLuJing" value="http://localhost:8888/" />
</appSettings>
-
<system.web>
<httpModules>
<add type="URLRewriter.ModuleRewriter, URLRewriter" name="ModuleRewriter" />
@@ -301,24 +297,20 @@
<add name="ValidaterHttpModule" type="CY_ValidaterHttpModule.ValidaterHttpModule,CY_ValidaterHttpModule" />
</httpModules>
<compilation debug="true" targetFramework="4.0" />
-
<authentication mode="Windows">
</authentication>
-
<membership>
<providers>
<clear />
<add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="ApplicationServices" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/" />
</providers>
</membership>
-
<profile>
<providers>
<clear />
<add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider" connectionStringName="ApplicationServices" applicationName="/" />
</providers>
</profile>
-
<roleManager enabled="false">
<providers>
<clear />
@@ -352,8 +344,6 @@
<add tagName="U_Info" tagPrefix="uc" src="~/Pages/common/U_Info.ascx" />
<add tagName="U_Link" tagPrefix="uc" src="~/Pages/common/U_Link.ascx" />
<add tagName="U_Login" tagPrefix="uc" src="~/Pages/common/U_Login.ascx" />
-
-
<add tagName="px_CompanyInfo" tagPrefix="uc" src="~/Pages/Templet/pingxuan/Shared/CompanyInfo.ascx" />
<add tagName="px_CompanyContact" tagPrefix="uc" src="~/Pages/Templet/pingxuan/Shared/CompanyContact.ascx" />
<add tagName="px_CompanyHead" tagPrefix="uc" src="~/Pages/Templet/pingxuan/Shared/CompanyHead.ascx" />
@@ -377,4 +367,25 @@
<add name="rewrite-aspx4-html" path="*.html" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" resourceType="Unspecified" preCondition="classicMode,runtimeVersionv4.0,bitness32" />
</handlers>
</system.webServer>
-</configuration>
+ <entityFramework>
+ <providers>
+ <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+ </providers>
+ </entityFramework>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="Microsoft.Practices.Unity" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-2.1.505.0" newVersion="2.1.505.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="Microsoft.Practices.Unity.Interception" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-2.1.505.0" newVersion="2.1.505.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-0.86.0.518" newVersion="0.86.0.518" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
--
Gitblit v1.9.1