From ad92b901b491d5921dbca2e91b0aafe8e2a0a017 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 27 九月 2024 13:30:53 +0800
Subject: [PATCH] 客户来源选择“政府采购”的才必选“机构代理”，除“政府采购”以外的客户来源，机构代码不用必填 “自联系”改为“上门送样”；“在线”改为“线上校对” 1）所有订单类型中的“印件名称”再增加几个字的长度，现在的格子有段短 （2）所有新增订单均把“客户单位”和“客户级别”这两行改到最前面，原来的“订单类型”这一行自动成为第3行 （3）“交货时间”现在默认的是第2天，全部改为默认第3天 在订单管理的列表中增加“封签”，列表中没打印显示“打印”，打印了就打“√” “订单管理”中，现在的“开票申请”栏目删除 生产安排中，生产“合版施工单”的前提必须是“订单类型”要相同，修改为不必相同。
---
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 84 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 83 insertions(+), 1 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 6eac3c9..8f89351 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1,5 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -21,6 +22,8 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode>true</IISExpressUseClassicPipelineMode>
<UseGlobalApplicationHostFile />
+ <NuGetPackageImportStamp>
+ </NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -56,6 +59,12 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>DLL\CKEditor.NET.dll</HintPath>
</Reference>
+ <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+ <HintPath>..\packages\EntityFramework.6.4.4\lib\net40\EntityFramework.dll</HintPath>
+ </Reference>
+ <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+ <HintPath>..\packages\EntityFramework.6.4.4\lib\net40\EntityFramework.SqlServer.dll</HintPath>
+ </Reference>
<Reference Include="LIMS.MessageBox, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\CY.Dlls\LIMS.MessageBox.dll</HintPath>
@@ -78,6 +87,7 @@
<HintPath>..\CY.Dlls\Microsoft.Practices.ServiceLocation.dll</HintPath>
</Reference>
<Reference Include="System" />
+ <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Data" />
<Reference Include="System.Core" />
<Reference Include="System.Data.DataSetExtensions" />
@@ -107,6 +117,10 @@
<Content Include="css\base.css" />
<Content Include="css\Calculator.css" />
<Content Include="css\Common.css" />
+ <Content Include="css\crumbs.css">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>crumbs.Designer.cs</LastGenOutput>
+ </Content>
<Content Include="css\Dialog.css" />
<Content Include="App_Themes\Public\fla\camera.swf" />
<Content Include="App_Themes\Public\fla\locale.xml" />
@@ -718,6 +732,7 @@
<Content Include="js\Inquiry\Calculator.js" />
<Content Include="js\Inquiry\Inquiry.js" />
<Content Include="js\jquery.form.js" />
+ <Content Include="js\PictureShow\spotlight.bundle.js" />
<Content Include="js\procurement\GoodsName.js" />
<Content Include="js\procurement\PaperWeight.js" />
<Content Include="js\utils\calendar.js" />
@@ -1858,13 +1873,16 @@
<Content Include="Pages\business\ComplaintsManage.aspx" />
<Content Include="Pages\business\ComplaintsView.aspx" />
<Content Include="Pages\business\CompledWork.aspx" />
+ <Content Include="Pages\business\CorporateClientsContractShow.aspx" />
<Content Include="Pages\business\CorporateClientsDetail.aspx" />
<Content Include="Pages\business\CorporateClientsEdit.aspx" />
<Content Include="Pages\business\CorporateClientsList.aspx" />
<Content Include="Pages\business\CorporateClientsMerger.aspx" />
<Content Include="Pages\business\CorporateClientsPrint.aspx" />
<Content Include="Pages\business\CorporateClientsPrint2.aspx" />
+ <Content Include="Pages\business\CorporateClientsUpLoadContract.aspx" />
<Content Include="Pages\business\CorporateClientsVisit.aspx" />
+ <Content Include="Pages\business\CorporateClientsWiFuTiXingList.aspx" />
<Content Include="Pages\business\CuikuanjiluList.aspx" />
<Content Include="Pages\business\CustomerAccessRecordDetailList.aspx" />
<Content Include="Pages\business\CustomerAccessRecordList.aspx" />
@@ -1886,6 +1904,7 @@
<Content Include="Pages\business\DemandDescribeDeatil.aspx" />
<Content Include="Pages\business\DemandOrderCreate.aspx" />
<Content Include="Pages\business\EvaluationBuyer.aspx" />
+ <Content Include="Pages\business\kaipiaoConfirm.aspx" />
<Content Include="Pages\business\EvaluationSeller.aspx" />
<Content Include="Pages\business\FileUpload.aspx" />
<Content Include="Pages\business\FollowRecord.aspx" />
@@ -1973,6 +1992,9 @@
<Content Include="Pages\business\xiaoshouyejiKehu.aspx" />
<Content Include="Pages\business\xiaoshouyejiList.aspx" />
<Content Include="Pages\business\xiaoshouyejiPrint.aspx" />
+ <Content Include="Pages\business\xiaoshouyejiReportList.aspx" />
+ <Content Include="Pages\business\xiaoshouyejiReportPrint.aspx" />
+ <Content Include="Pages\business\xiaoshouyejiReprotKehu.aspx" />
<Content Include="Pages\business\xiaoshouyejiVisit.aspx" />
<Content Include="Pages\business\YujihuikuanTimeEdit.aspx" />
<Content Include="Pages\common\CMSMergerOrder.ascx" />
@@ -2829,6 +2851,7 @@
<Compile Include="Close.aspx.designer.cs">
<DependentUpon>Close.aspx</DependentUpon>
</Compile>
+ <Compile Include="cs\EFDate.cs" />
<Compile Include="cs\FixedInfo.cs" />
<Compile Include="cs\clsWinrar.cs" />
<Compile Include="cs\UploadCS.cs" />
@@ -2858,6 +2881,8 @@
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
+ <Compile Include="Helper\TimeTaskHelper.cs" />
+ <Compile Include="Helper\upLoadContractFile.cs" />
<Compile Include="Index.aspx.cs">
<DependentUpon>Index.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -3263,6 +3288,13 @@
<Compile Include="Pages\business\CompledWork.aspx.designer.cs">
<DependentUpon>CompledWork.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\CorporateClientsContractShow.aspx.cs">
+ <DependentUpon>CorporateClientsContractShow.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\CorporateClientsContractShow.aspx.designer.cs">
+ <DependentUpon>CorporateClientsContractShow.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\CorporateClientsDetail.aspx.cs">
<DependentUpon>CorporateClientsDetail.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -3305,12 +3337,26 @@
<Compile Include="Pages\business\CorporateClientsPrint2.aspx.designer.cs">
<DependentUpon>CorporateClientsPrint2.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\CorporateClientsUpLoadContract.aspx.cs">
+ <DependentUpon>CorporateClientsUpLoadContract.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\CorporateClientsUpLoadContract.aspx.designer.cs">
+ <DependentUpon>CorporateClientsUpLoadContract.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\CorporateClientsVisit.aspx.cs">
<DependentUpon>CorporateClientsVisit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Pages\business\CorporateClientsVisit.aspx.designer.cs">
<DependentUpon>CorporateClientsVisit.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\CorporateClientsWiFuTiXingList.aspx.cs">
+ <DependentUpon>CorporateClientsWiFuTiXingList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\CorporateClientsWiFuTiXingList.aspx.designer.cs">
+ <DependentUpon>CorporateClientsWiFuTiXingList.aspx</DependentUpon>
</Compile>
<Compile Include="Pages\business\CuikuanjiluList.aspx.cs">
<DependentUpon>CuikuanjiluList.aspx</DependentUpon>
@@ -3458,6 +3504,13 @@
</Compile>
<Compile Include="Pages\business\EvaluationBuyer.aspx.designer.cs">
<DependentUpon>EvaluationBuyer.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\kaipiaoConfirm.aspx.cs">
+ <DependentUpon>kaipiaoConfirm.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\kaipiaoConfirm.aspx.designer.cs">
+ <DependentUpon>kaipiaoConfirm.aspx</DependentUpon>
</Compile>
<Compile Include="Pages\business\EvaluationSeller.aspx.cs">
<DependentUpon>EvaluationSeller.aspx</DependentUpon>
@@ -4081,6 +4134,27 @@
</Compile>
<Compile Include="Pages\business\xiaoshouyejiPrint.aspx.designer.cs">
<DependentUpon>xiaoshouyejiPrint.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\xiaoshouyejiReportList.aspx.cs">
+ <DependentUpon>xiaoshouyejiReportList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\xiaoshouyejiReportList.aspx.designer.cs">
+ <DependentUpon>xiaoshouyejiReportList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\xiaoshouyejiReportPrint.aspx.cs">
+ <DependentUpon>xiaoshouyejiReportPrint.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\xiaoshouyejiReportPrint.aspx.designer.cs">
+ <DependentUpon>xiaoshouyejiReportPrint.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\xiaoshouyejiReprotKehu.aspx.cs">
+ <DependentUpon>xiaoshouyejiReprotKehu.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\xiaoshouyejiReprotKehu.aspx.designer.cs">
+ <DependentUpon>xiaoshouyejiReprotKehu.aspx</DependentUpon>
</Compile>
<Compile Include="Pages\business\xiaoshouyejiVisit.aspx.cs">
<DependentUpon>xiaoshouyejiVisit.aspx</DependentUpon>
@@ -8642,7 +8716,6 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
- <Folder Include="bin\" />
<Folder Include="CacheFiles\" />
<Folder Include="images\HtmlEditor\ProcessRequest\" />
<Folder Include="images\HtmlEditor\UploadImage\" />
@@ -8764,6 +8837,7 @@
<None Include="myPagination\js\table\Thumbs.db" />
<Content Include="Pages\business\SendAllCorEmail.aspx" />
<Content Include="OnlineAdviserLOGO.ashx" />
+ <None Include="packages.config" />
<None Include="Pages\common\skin\Thumbs.db" />
<Content Include="Pages\sysInquiry\CalculatePaperPriceHandler.ashx" />
<Content Include="Pages\Templet\Default\Shared\Company.Master" />
@@ -8797,6 +8871,14 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>杩欏彴璁＄畻鏈轰笂缂哄皯姝ら」鐩紩鐢ㄧ殑 NuGet 绋嬪簭鍖呫�備娇鐢ㄢ�淣uGet 绋嬪簭鍖呰繕鍘熲�濆彲涓嬭浇杩欎簺绋嬪簭鍖呫�傛湁鍏虫洿澶氫俊鎭紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkID=322105銆傜己灏戠殑鏂囦欢鏄� {0}銆�</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+ <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+ </Target>
+ <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
--
Gitblit v1.9.1