From 641ddf669ad57fb544e13a6433aa5905551b3bba Mon Sep 17 00:00:00 2001
From: CB2-20200827ONU\Administrator <liaoxujun@qq.com>
Date: 星期三, 22 九月 2021 09:04:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project
---
CY_ECommercePlatform/CY.WebForm/js/business/Order.js | 16
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx | 1
CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.designer.cs | 23
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProductionprogress.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx | 44
CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.cs | 10
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.designer.cs | 23
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx.designer.cs | 35
CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.designer.cs | 80 +
CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.designer.cs | 23
CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.cs | 8
CY_ECommercePlatform/CY.Config/CY.Config.csproj.user | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.designer.cs | 23
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 17
CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx | 39
CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx | 28
CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx.designer.cs | 16
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs | 30
CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.designer.cs | 23
CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/js/business/Custom.js | 2
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.designer.cs | 23
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 6
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.designer.cs | 23
CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.cs | 12
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx | 29
CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx | 32
CY_ECommercePlatform/CyinOrderWebService/app.config | 3
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx.cs | 134 +++
CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx | 1
CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.designer.cs | 23
CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.designer.cs | 23
CY_ECommercePlatform/AbstractFactory/AbstractFactory.csproj.user | 2
CY_ECommercePlatform/AbstractFactory/AbstractFactory.csproj | 37
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx | 110 ++
CY_ECommercePlatform/CY.WebForm/js/common/Printter.js | 2
CY_ECommercePlatform/CY.IBaseDAL/CY.IBaseDAL.csproj.user | 2
CY_ECommercePlatform/CY.BLL/CY.BLL.csproj | 15
CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs | 7
CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx | 45
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx | 1
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx | 130 +++
CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx.designer.cs | 23
CY_ECommercePlatform/ServiceTest/ServiceTest.csproj.user | 2
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.designer.cs | 62
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDelayTimeEdit.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs | 9
CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs | 6
CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx | 40
CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx | 40
CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.designer.cs | 23
CY_ECommercePlatform/CY.Model/EC/EC_OrderExtend.cs | 6
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs | 30
CY_ECommercePlatform/CY.Application/CY.Application.csproj | 14
CY_ECommercePlatform/CY.BLL/CY.BLL.csproj.user | 2
CY_ECommercePlatform/CY.WebForm/Pages/adminclient/CorporateClientsEdit.aspx | 8
CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.cs | 11
CY_ECommercePlatform/CY_ValidaterHttpModule/CY_ValidaterHttpModule.csproj.user | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx | 1
CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx | 32
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs | 8
CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs | 14
CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaoshenqing.cs | 10
CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.cs | 10
CY_ECommercePlatform/CY.WebForm/js/anonymous/RegisterVerify.js | 11
CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.designer.cs | 23
CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx | 32
CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.designer.cs | 23
.gitignore | 2
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 36
CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs | 5
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj.user | 4
CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.designer.cs | 23
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApplyPrint.aspx | 42
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.designer.cs | 23
CY_ECommercePlatform/CY.Infrastructure/CY.Infrastructure.csproj.user | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx | 30
CY_ECommercePlatform/CY.WebForm/Pages/adminclient/CorporateClientsEdit.aspx.designer.cs | 82 +
CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs | 157 +++
CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx | 1
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs | 1
CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx | 2
CY_ECommercePlatform/CY.Application/CY.Application.csproj.user | 2
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs | 11
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 29
CY_ECommercePlatform/CyinOrderWebService/CY.WebService.csproj.user | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx.designer.cs | 29
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs | 1
CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx | 33
CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx | 34
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs | 26
CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx | 30
CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx | 30
CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx | 38
CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.designer.cs | 23
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.designer.cs | 27
116 files changed, 1,859 insertions(+), 555 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4fa5e9f..308b771 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,5 @@
CY_ECommercePlatform/UploadFiles/obj/
CY_ECommercePlatform/UploadFiles/UpLoads/
CY_ECommercePlatform/CY.Config/obj/
+/CY_ECommercePlatform/.vs
+/CY_ECommercePlatform/CY.WebForm/CacheFiles
diff --git a/CY_ECommercePlatform/AbstractFactory/AbstractFactory.csproj b/CY_ECommercePlatform/AbstractFactory/AbstractFactory.csproj
index 30d6ec4..0f97fa9 100644
--- a/CY_ECommercePlatform/AbstractFactory/AbstractFactory.csproj
+++ b/CY_ECommercePlatform/AbstractFactory/AbstractFactory.csproj
@@ -66,42 +66,7 @@
<Name>CY.SQLDAL</Name>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
- <Content Include="bin\Debug\AbstractFactory.dll" />
- <Content Include="bin\Debug\AbstractFactory.pdb" />
- <Content Include="bin\Debug\CY.IBaseDAL.dll" />
- <Content Include="bin\Debug\CY.IBaseDAL.pdb" />
- <Content Include="bin\Debug\CY.IDAL.dll" />
- <Content Include="bin\Debug\CY.IDAL.pdb" />
- <Content Include="bin\Debug\CY.Infrastructure.dll" />
- <Content Include="bin\Debug\CY.Infrastructure.pdb" />
- <Content Include="bin\Debug\CY.Model.dll" />
- <Content Include="bin\Debug\CY.Model.pdb" />
- <Content Include="bin\Debug\CY.SQLDAL.dll" />
- <Content Include="bin\Debug\CY.SQLDAL.pdb" />
- <Content Include="bin\Debug\ICSharpCode.SharpZipLib.dll" />
- <Content Include="bin\Debug\log4net.dll" />
- <Content Include="bin\Debug\Memcached.ClientLibrary.dll" />
- <Content Include="bin\Debug\Microsoft.Practices.ServiceLocation.dll" />
- <Content Include="bin\Debug\Microsoft.Practices.ServiceLocation.pdb" />
- <Content Include="bin\Debug\Microsoft.Practices.ServiceLocation.xml" />
- <Content Include="bin\Debug\Microsoft.Practices.Unity.Configuration.dll" />
- <Content Include="bin\Debug\Microsoft.Practices.Unity.Configuration.xml" />
- <Content Include="bin\Debug\Microsoft.Practices.Unity.dll" />
- <Content Include="bin\Debug\Microsoft.Practices.Unity.xml" />
- <Content Include="bin\Debug\Newtonsoft.Json.dll" />
- <Content Include="bin\Debug\Newtonsoft.Json.xml" />
- <Content Include="obj\Debug\AbstractFactory.csproj.FileListAbsolute.txt" />
- <Content Include="obj\Debug\AbstractFactory.dll" />
- <Content Include="obj\Debug\AbstractFactory.pdb" />
- </ItemGroup>
- <ItemGroup>
- <None Include="obj\Debug\DesignTimeResolveAssemblyReferencesInput.cache" />
- <None Include="obj\Debug\ResolveAssemblyReference.cache" />
- </ItemGroup>
- <ItemGroup>
- <Folder Include="obj\Debug\TempPE\" />
- </ItemGroup>
+ <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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.
diff --git a/CY_ECommercePlatform/AbstractFactory/AbstractFactory.csproj.user b/CY_ECommercePlatform/AbstractFactory/AbstractFactory.csproj.user
index 55f44b9..07dbd5b 100644
--- a/CY_ECommercePlatform/AbstractFactory/AbstractFactory.csproj.user
+++ b/CY_ECommercePlatform/AbstractFactory/AbstractFactory.csproj.user
@@ -1,6 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.Application/CY.Application.csproj b/CY_ECommercePlatform/CY.Application/CY.Application.csproj
index 3e6cbd8..231942f 100644
--- a/CY_ECommercePlatform/CY.Application/CY.Application.csproj
+++ b/CY_ECommercePlatform/CY.Application/CY.Application.csproj
@@ -44,19 +44,7 @@
<Compile Include="CYHttpModule.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
- <ItemGroup>
- <Content Include="bin\Debug\CY.Application.dll" />
- <Content Include="bin\Debug\CY.Application.pdb" />
- <Content Include="obj\Debug\CY.Application.csproj.FileListAbsolute.txt" />
- <Content Include="obj\Debug\CY.Application.dll" />
- <Content Include="obj\Debug\CY.Application.pdb" />
- </ItemGroup>
- <ItemGroup>
- <None Include="obj\Debug\DesignTimeResolveAssemblyReferencesInput.cache" />
- </ItemGroup>
- <ItemGroup>
- <Folder Include="obj\Debug\TempPE\" />
- </ItemGroup>
+ <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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.
diff --git a/CY_ECommercePlatform/CY.Application/CY.Application.csproj.user b/CY_ECommercePlatform/CY.Application/CY.Application.csproj.user
index 55f44b9..07dbd5b 100644
--- a/CY_ECommercePlatform/CY.Application/CY.Application.csproj.user
+++ b/CY_ECommercePlatform/CY.Application/CY.Application.csproj.user
@@ -1,6 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
index c757210..84079f2 100644
--- a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
+++ b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
@@ -270,22 +270,9 @@
<Name>CY.Model</Name>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
- <Folder Include="bin\Debug\" />
- <Folder Include="bin\Release\" />
- <Folder Include="obj\Debug\TempPE\" />
- </ItemGroup>
+ <ItemGroup />
<ItemGroup>
<Compile Include="EC\EC_AcceptWayByCustomersBLL.cs" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="obj\Debug\CY.BLL.csproj.FileListAbsolute.txt" />
- <Content Include="obj\Debug\CY.BLL.dll" />
- <Content Include="obj\Debug\CY.BLL.pdb" />
- </ItemGroup>
- <ItemGroup>
- <None Include="obj\Debug\DesignTimeResolveAssemblyReferencesInput.cache" />
- <None Include="obj\Debug\ResolveAssemblyReference.cache" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj.user b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj.user
index 55f44b9..07dbd5b 100644
--- a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj.user
+++ b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj.user
@@ -1,6 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index 163716d..f67c6a7 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -539,6 +539,10 @@
{
Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime]) >7 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])>7 )";
}
+ else if (DeliveryTime == "閫炬湡")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])<=0 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])<=0 )";
+ }
}
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
index 21b3821..6db6161 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
@@ -158,8 +158,18 @@
{
string Condition = " and od.FirmId ='" + FirmId + "' and od.shifouDelivery = 1 ";
- if (!string.IsNullOrEmpty(DeliveredTime))
- Condition += " and DATEDIFF(day,od.[DeliverTime],'" + DeliveredTime + "')=0 ";
+ if (!string.IsNullOrEmpty(DeliveredTime) )
+ {
+ if(DeliveredTime != "閫炬湡")
+ {
+ Condition += " and DATEDIFF(day,od.[DeliverTime],'" + DeliveredTime + "')=0 ";
+ }
+ else
+ {
+ Condition += " and DATEDIFF(day,GETDATE(),od.[DeliverTime])<=0 ";
+ }
+ }
+
if (!string.IsNullOrEmpty(CarId))
Condition += " and od.CarId = '" + CarId + "'";
diff --git a/CY_ECommercePlatform/CY.Config/CY.Config.csproj.user b/CY_ECommercePlatform/CY.Config/CY.Config.csproj.user
index 55f44b9..07dbd5b 100644
--- a/CY_ECommercePlatform/CY.Config/CY.Config.csproj.user
+++ b/CY_ECommercePlatform/CY.Config/CY.Config.csproj.user
@@ -1,6 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.IBaseDAL/CY.IBaseDAL.csproj.user b/CY_ECommercePlatform/CY.IBaseDAL/CY.IBaseDAL.csproj.user
index 55f44b9..07dbd5b 100644
--- a/CY_ECommercePlatform/CY.IBaseDAL/CY.IBaseDAL.csproj.user
+++ b/CY_ECommercePlatform/CY.IBaseDAL/CY.IBaseDAL.csproj.user
@@ -1,6 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.Infrastructure/CY.Infrastructure.csproj.user b/CY_ECommercePlatform/CY.Infrastructure/CY.Infrastructure.csproj.user
index 55f44b9..07dbd5b 100644
--- a/CY_ECommercePlatform/CY.Infrastructure/CY.Infrastructure.csproj.user
+++ b/CY_ECommercePlatform/CY.Infrastructure/CY.Infrastructure.csproj.user
@@ -1,6 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
index 5e17b8e..798b6e9 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
@@ -510,6 +510,11 @@
get;
set;
}
+
+ /// <summary>
+ /// 鍗板埛鏁伴噺鍗曚綅
+ /// </summary>
+ public string yssldw { get; set; }
#endregion
#region Visiter
@@ -905,7 +910,11 @@
this.shifouDelivery = isChange ? MyConvert.ConvertToInt32(value) : this.shifouDelivery;
theValue = this.shifouDelivery;
}
-
+ else if ("yssldw".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 96)
+ {
+ this.yssldw = isChange ? MyConvert.ConvertToString(value) : this.yssldw;
+ theValue = this.yssldw;
+ }
#endregion
return theValue;
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtend.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtend.cs
index 301369e..31a79eb 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtend.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtend.cs
@@ -219,6 +219,12 @@
#endregion Model
public string PrintPackDeliveryRequir { get; set; }
+
+ /// <summary>
+ /// 鍗板埛鏁伴噺鍗曚綅
+ /// </summary>
+ public int printunit { get; set; }
+
}
}
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs
index bac73cf..a9fa991 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs
@@ -503,13 +503,9 @@
#endregion
-
-
-
-
-
return theValue;
}
+
#endregion
}
}
diff --git a/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs b/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
index 42c5a73..ba4fece 100644
--- a/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
+++ b/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
@@ -50,6 +50,11 @@
public int PrintCount { get; set; }
/// <summary>
+ /// 鍗曚綅浠ｇ爜
+ /// </summary>
+ public int Unit { get; set; }
+
+ /// <summary>
/// 鍗曞弻闈�
/// </summary>
public string SingleOrdouble { get; set; }
@@ -394,10 +399,12 @@
#endregion
#region 璇环浠锋牸璁板綍
+
/// <summary>
/// 璇环浠锋牸鏄庣粏
/// </summary>
public InquiryDetail InquiryDetailObj { get; set; }
+
#endregion
}
}
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaoshenqing.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaoshenqing.cs
index 02608d5..9996ec1 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaoshenqing.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaoshenqing.cs
@@ -53,6 +53,10 @@
public string BusinessManager { get; set; }
+ /// <summary>
+ /// 璇存槑
+ /// </summary>
+ public string remark { get; set; }
public int? Kaipiaoshenqing
{
@@ -266,8 +270,12 @@
this.SellerOrderId = isChange ? MyConvert.ConvertToString(value) : SellerOrderId;
theValue = this.SellerOrderId;
}
+ else if ("remark".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 21)
+ {
+ this.remark = isChange ? MyConvert.ConvertToString(value) : remark;
+ theValue = this.remark;
+ }
-
return theValue;
}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 83404d4..be83822 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -536,6 +536,8 @@
new SqlParameter("@Kehuqianshou",DBNull.Value){SqlDbType=SqlDbType.Int},
new SqlParameter("@KaipiaoshenqingId",DBNull.Value){SqlDbType=SqlDbType.UniqueIdentifier},
new SqlParameter("@buyerId",DBNull.Value){SqlDbType=SqlDbType.UniqueIdentifier},
+ new SqlParameter("@DocumentName",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=50},
+
};
/*
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs
index 0759fca..6df952b 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs
@@ -97,6 +97,7 @@
delayTime,
new SqlParameter("@Productionprogress",trueModel.Productionprogress),
new SqlParameter("@PrintPackDeliveryRequir",trueModel.PrintPackDeliveryRequir),
+ new SqlParameter("@printunit",trueModel.printunit)
};
int i = -1;
@@ -158,6 +159,7 @@
new SqlParameter("@NumPerBag",trueModel.NumPerBag),
new SqlParameter("@BagNum",trueModel.BagNum),
new SqlParameter("@PrintPackDeliveryRequir",trueModel.PrintPackDeliveryRequir),
+ new SqlParameter("@printunit",trueModel.printunit)
};
try
{
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs
index ec9340c..8877a76 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs
@@ -93,10 +93,11 @@
new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
new SqlParameter("@Creater",trueModel.Creater),
new SqlParameter("@SellerOrderId",trueModel.SellerOrderId),
+ new SqlParameter("@remark",trueModel.remark),
};
- string sql = "Insert Into OA_Kaipiaoshenqing ([Keyid],[FirmId],[BuyerId],[Kaipiaoshenqing],[Kehuqianshou], [KehuqianshouTime], [KehuqianshouCreater],[KaipiaoquerenTime], [KaipiaoquerenCreater],[BusinessManagerId], [Creater],[CreateTime],[Updater],[LastUpdateTime],[SellerOrderId])"
- + " Values ( @Keyid,@FirmId,@BuyerId,@Kaipiaoshenqing, @Kehuqianshou, @KehuqianshouTime, @KehuqianshouCreater, @KaipiaoquerenTime, @KaipiaoquerenCreater, @BusinessManagerId, @Creater,@CreateTime,@Updater,@LastUpdateTime,@SellerOrderId )";
+ string sql = "Insert Into OA_Kaipiaoshenqing ([Keyid],[FirmId],[BuyerId],[Kaipiaoshenqing],[Kehuqianshou], [KehuqianshouTime], [KehuqianshouCreater],[KaipiaoquerenTime], [KaipiaoquerenCreater],[BusinessManagerId], [Creater],[CreateTime],[Updater],[LastUpdateTime],[SellerOrderId],remark)"
+ + " Values ( @Keyid,@FirmId,@BuyerId,@Kaipiaoshenqing, @Kehuqianshou, @KehuqianshouTime, @KehuqianshouCreater, @KaipiaoquerenTime, @KaipiaoquerenCreater, @BusinessManagerId, @Creater,@CreateTime,@Updater,@LastUpdateTime,@SellerOrderId,@remark )";
try
{
_dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 94b9b38..70a51a7 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1902,6 +1902,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" />
@@ -2004,6 +2005,7 @@
<Content Include="Pages\financial\FirmAccountPrintTable.aspx" />
<Content Include="Pages\financial\MemberOrderMoneyReceive.aspx" />
<Content Include="Pages\financial\MemberOrderPayList.aspx" />
+ <Content Include="Pages\financial\OrderFinancialPrint.aspx" />
<Content Include="Pages\financial\OrderMoneyBatchReceive.aspx" />
<Content Include="Pages\financial\OutsourcePayMoney.aspx" />
<Content Include="Pages\financial\OutsourcePayOrder.aspx" />
@@ -3491,6 +3493,13 @@
<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>
<SubType>ASPXCodeBehind</SubType>
@@ -4204,6 +4213,13 @@
</Compile>
<Compile Include="Pages\financial\MemberOrderPayList.aspx.designer.cs">
<DependentUpon>MemberOrderPayList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\financial\OrderFinancialPrint.aspx.cs">
+ <DependentUpon>OrderFinancialPrint.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\financial\OrderFinancialPrint.aspx.designer.cs">
+ <DependentUpon>OrderFinancialPrint.aspx</DependentUpon>
</Compile>
<Compile Include="Pages\financial\OrderMoneyBatchReceive.aspx.cs">
<DependentUpon>OrderMoneyBatchReceive.aspx</DependentUpon>
@@ -8667,7 +8683,6 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
- <Folder Include="bin\" />
<Folder Include="CacheFiles\" />
<Folder Include="images\HtmlEditor\ProcessRequest\" />
<Folder Include="images\HtmlEditor\UploadImage\" />
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj.user b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj.user
index 29392f5..d0c714a 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj.user
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
@@ -21,7 +21,7 @@
<StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
- <NativeDebugging>False</NativeDebugging>
+ <NativeDebugging>True</NativeDebugging>
<SQLDebugging>False</SQLDebugging>
<ExternalProgram>
</ExternalProgram>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/adminclient/CorporateClientsEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/adminclient/CorporateClientsEdit.aspx
index be1f7e8..79b19fd 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/adminclient/CorporateClientsEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/adminclient/CorporateClientsEdit.aspx
@@ -51,7 +51,7 @@
<td class="ali03 w100px">閭紪锛�</td>
<td class=""><input id="txtPostcode" type="text" runat="server" class="postnum" maxlength="15" /></td>
<td class="ali03 w100px">鐭俊鎵嬫満锛�</td>
- <td class="w150px"><input id="txtMobile" type="text" runat="server" class="phone" maxlength="15"/></td>
+ <td class="w150px"><input id="txtMobile" type="text" runat="server" class="phone" maxlength="15"/></td><%-- class="phone"--%>
<td class="ali03 ">鑱旂郴鐢佃瘽锛�</td>
<td><input id="txtCompanyPhone" type="text" runat="server" class="" maxlength="15" /></td>
</tr>
@@ -83,7 +83,7 @@
<td class="ali03 ">娉曞畾浠ｈ〃浜猴細</td>
<td><input id="txtLegalRepresentative" type="text" runat="server" maxlength="20" /></td>
<td class="ali03 ">鎵嬫満锛�</td>
- <td><input id="txtLegalMobile" type="text" runat="server" class="phone" maxlength="20" /></td>
+ <td><input id="txtLegalMobile" type="text" runat="server" maxlength="20" /></td>
<td class="ali03 ">QQ锛�</td>
<td ><input id="txtLegalQQ" type="text" runat="server" class="int" maxlength="20" /></td>
</tr>
@@ -91,7 +91,7 @@
<td class="ali03 ">涓氬姟缁忓姙浜猴細</td>
<td><input id="txtBusinessManagers" type="text" runat="server" maxlength="20" /></td>
<td class="ali03 ">鎵嬫満锛�</td>
- <td><input id="txtManagersMobile" type="text" runat="server" class="phone" maxlength="20" /></td>
+ <td><input id="txtManagersMobile" type="text" runat="server" maxlength="20" /></td>
<td class="ali03 ">QQ锛�</td>
<td ><input id="txtManagersQQ" type="text" runat="server" class="int" maxlength="20" /></td>
</tr>
@@ -99,7 +99,7 @@
<td class="ali03 ">璐㈠姟璐熻矗浜猴細</td>
<td><input id="txtFinancialOfficers" type="text" runat="server" maxlength="20" /></td>
<td class="ali03 ">鎵嬫満锛�</td>
- <td><input id="txtOfficersMobile" type="text" runat="server" class="phone" maxlength="20"/></td>
+ <td><input id="txtOfficersMobile" type="text" runat="server" maxlength="20"/></td>
<td class="ali03 ">QQ锛�</td>
<td><input id="txtOfficersQQ" type="text" runat="server" class="int" maxlength="20" /></td>
</tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/adminclient/CorporateClientsEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/adminclient/CorporateClientsEdit.aspx.designer.cs
index c4144d3..0680658 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/adminclient/CorporateClientsEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/adminclient/CorporateClientsEdit.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.adminclient {
-
-
- public partial class AddCorporateClients {
-
+namespace CY.WebForm.Pages.adminclient
+{
+
+
+ public partial class AddCorporateClients
+ {
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// selSourcesInfoId 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selSourcesInfoId;
-
+
/// <summary>
/// selCustomerIndustriesId 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selCustomerIndustriesId;
-
+
/// <summary>
/// selCustomerTypeId 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selCustomerTypeId;
-
+
/// <summary>
/// selBusinessManagerId 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManagerId;
-
+
/// <summary>
/// selAccountManagerId 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selAccountManagerId;
-
+
/// <summary>
/// txtCompanyName 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtCompanyName;
-
+
/// <summary>
/// txtHideMemberId 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtHideMemberId;
-
+
/// <summary>
/// txtHideMemberType 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtHideMemberType;
-
+
/// <summary>
/// txtDetailedAddress 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtDetailedAddress;
-
+
/// <summary>
/// txtPostcode 鎺т欢銆�
/// </summary>
@@ -119,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtPostcode;
-
+
/// <summary>
/// txtMobile 鎺т欢銆�
/// </summary>
@@ -128,7 +130,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtMobile;
-
+
/// <summary>
/// txtCompanyPhone 鎺т欢銆�
/// </summary>
@@ -137,7 +139,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtCompanyPhone;
-
+
/// <summary>
/// txtFax 鎺т欢銆�
/// </summary>
@@ -146,7 +148,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtFax;
-
+
/// <summary>
/// txtEmail 鎺т欢銆�
/// </summary>
@@ -155,7 +157,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtEmail;
-
+
/// <summary>
/// txtQQ 鎺т欢銆�
/// </summary>
@@ -164,7 +166,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtQQ;
-
+
/// <summary>
/// selDegreeImportanId 鎺т欢銆�
/// </summary>
@@ -173,7 +175,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selDegreeImportanId;
-
+
/// <summary>
/// selBusinessAnalysisId 鎺т欢銆�
/// </summary>
@@ -182,7 +184,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessAnalysisId;
-
+
/// <summary>
/// selCreditId 鎺т欢銆�
/// </summary>
@@ -191,7 +193,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selCreditId;
-
+
/// <summary>
/// txtBank 鎺т欢銆�
/// </summary>
@@ -200,7 +202,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtBank;
-
+
/// <summary>
/// txtAccountID 鎺т欢銆�
/// </summary>
@@ -209,7 +211,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtAccountID;
-
+
/// <summary>
/// txtTaxID 鎺т欢銆�
/// </summary>
@@ -218,7 +220,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtTaxID;
-
+
/// <summary>
/// txtLegalRepresentative 鎺т欢銆�
/// </summary>
@@ -227,7 +229,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtLegalRepresentative;
-
+
/// <summary>
/// txtLegalMobile 鎺т欢銆�
/// </summary>
@@ -236,7 +238,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtLegalMobile;
-
+
/// <summary>
/// txtLegalQQ 鎺т欢銆�
/// </summary>
@@ -245,7 +247,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtLegalQQ;
-
+
/// <summary>
/// txtBusinessManagers 鎺т欢銆�
/// </summary>
@@ -254,7 +256,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtBusinessManagers;
-
+
/// <summary>
/// txtManagersMobile 鎺т欢銆�
/// </summary>
@@ -263,7 +265,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtManagersMobile;
-
+
/// <summary>
/// txtManagersQQ 鎺т欢銆�
/// </summary>
@@ -272,7 +274,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtManagersQQ;
-
+
/// <summary>
/// txtFinancialOfficers 鎺т欢銆�
/// </summary>
@@ -281,7 +283,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtFinancialOfficers;
-
+
/// <summary>
/// txtOfficersMobile 鎺т欢銆�
/// </summary>
@@ -290,7 +292,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtOfficersMobile;
-
+
/// <summary>
/// txtOfficersQQ 鎺т欢銆�
/// </summary>
@@ -299,7 +301,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtOfficersQQ;
-
+
/// <summary>
/// txtRemark 鎺т欢銆�
/// </summary>
@@ -308,7 +310,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRemark;
-
+
/// <summary>
/// btn_Submit 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
index edb7f8d..190445f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
@@ -257,6 +257,7 @@
閫佽揣鏃堕棿锛�
</td>
<td colspan="5">
+ <asp:button id="Button0" text="閫炬湡" runat="server" padding="0px" OnClick="btn_Search_Click0" />
<asp:button id="Button1" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click1" />
<asp:button id="Button2" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click2" />
<asp:button id="Button3" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click3" />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
index 471d082..f739ebe 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
@@ -91,7 +91,7 @@
this.selCarIddo.DataBind();
this.selCarIddo.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
-
+ this.Button0.Text = "閫炬湡";
this.Button1.Text = DateTime.Now.ToString("yyyy-MM-dd");
this.Button2.Text = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd");
this.Button3.Text = DateTime.Now.AddDays(2).ToString("yyyy-MM-dd");
@@ -126,7 +126,14 @@
{
BindList();
}
-
+ protected void btn_Search_Click0(object sender, EventArgs e)
+ {
+
+ this.txtDeliveryTime.Value = this.Button0.Text;
+
+ BindList();
+ }
+
protected void btn_Search_Click1(object sender, EventArgs e)
{
@@ -200,6 +207,7 @@
this.Button5.BorderColor = Color.LightBlue;
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button2.Text)
{
@@ -210,6 +218,7 @@
this.Button5.BorderColor = Color.LightBlue;
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button3.Text)
{
@@ -220,6 +229,7 @@
this.Button5.BorderColor = Color.LightBlue;
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button4.Text)
{
@@ -230,6 +240,7 @@
this.Button5.BorderColor = Color.LightBlue;
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button5.Text)
{
@@ -240,6 +251,7 @@
this.Button1.BorderColor = Color.LightBlue;
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button6.Text)
{
@@ -250,6 +262,7 @@
this.Button5.BorderColor = Color.LightBlue;
this.Button1.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button7.Text)
{
@@ -260,8 +273,19 @@
this.Button5.BorderColor = Color.LightBlue;
this.Button6.BorderColor = Color.LightBlue;
this.Button1.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
-
+ else if (this.txtDeliveryTime.Value == this.Button0.Text)
+ {
+ this.Button0.BorderColor = Color.Black;
+ this.Button2.BorderColor = Color.LightBlue;
+ this.Button3.BorderColor = Color.LightBlue;
+ this.Button4.BorderColor = Color.LightBlue;
+ this.Button5.BorderColor = Color.LightBlue;
+ this.Button6.BorderColor = Color.LightBlue;
+ this.Button1.BorderColor = Color.LightBlue;
+ this.Button7.BorderColor = Color.LightBlue;
+ }
Pagination pa = new Pagination();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs
index 1b3b4ba..85c9fb7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs
@@ -42,6 +42,15 @@
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
+ /// Button0 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button0;
+
+ /// <summary>
/// Button1 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx
index b970ba8..d5e8504 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx
@@ -17,7 +17,12 @@
function Viewkaipiao(Keyid, SellerOrderId) {
window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=" + Keyid + "&SellerOrderId=" + SellerOrderId , '', '');
}
-
+
+ function ViewRemark(str) {
+ var re = /<br>/g;
+ //str = str.replace(re, "\n");
+ alertMsg(str);
+ }
//鏌ョ湅瀹㈡埛璧勬枡
function View(personId) {
@@ -137,10 +142,8 @@
<tr>
<%-- <th width="25">
</th>--%>
- <th width="25">
- 缂栧彿
- </th>
- <th style="text-align: center;" width="70">
+ <th width="25">缂栧彿</th>
+ <th style="text-align: center;" width="70">
鐢宠寮�绁ㄦ椂闂�
</th>
<th style="text-align: center;" width="70">
@@ -159,8 +162,9 @@
<th width="60">
閲戦
</th>
-
-
+ <th width="50">
+ 澶囨敞
+ </th>
<th width="60">
寮�绁ㄧ姸鎬�
</th>
@@ -168,9 +172,6 @@
瀹㈡埛绛炬敹
</th>
-
-
-
</tr>
</thead>
<tbody>
@@ -203,13 +204,9 @@
</td>
<td style="text-align: center;">
<%#Eval("BusinessManager")%>
-
-
</td>
<td style="text-align: center;">
<%#Eval("SellerOrderId")%>
-
-
</td>
<td style="text-align: center;">
@@ -218,31 +215,24 @@
</div>
</td>
- <td>
-
+ <td>
<a href='javascript:void(0)' title=' <%#Eval("shuliang")%> ' class='a_under' onclick='Viewkaipiao("<%#Eval("Keyid")%>","<%#Eval("SellerOrderId")%>")'> <%#Eval("shuliang")%> </a>
-
</td>
<td>
<%#Eval("jine", "{0:F}")%>
</td>
- <td>
-
+ <td>
+ <a href="javascript:void(0)" title="<%#Eval("remark").ToString().Replace("\r\n", "<br />")%>" class="a_under" onclick="ViewRemark('<%# Eval("remark").ToString().Replace("\r\n", "<br>")%>')"><%#Eval("remark").ToString().Length>0?"鐐瑰嚮鏌ョ湅":"" %> </a>
+
+ </td>
+ <td>
<%#Eval("KaipiaoshenqingName")%>
-
-
-
</td>
<td>
-
-
<a href='javascript:void(0)' title=' <%#Eval("KehuqianshouName")%> ' class='a_under' onclick='<%#Eval("Kehuqianshou").ToString()=="1"?"Viewkehu(\""+Eval("Keyid")+"\",\""+Eval("SellerOrderId")+"\")":"" %> '> <%#Eval("KehuqianshouName")%> </a>
-
-
-
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx.cs
index 31d2101..e74cbce 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx.cs
@@ -468,11 +468,14 @@
this.selKehuqianshou.DataBind();
this.selKehuqianshou.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
-
- this.selKaipiaoshenqing.DataSource = _sys_DictionaryBLL.GetDataByType("EC_寮�绁ㄧ敵璇�");
+ var dtkpsq= _sys_DictionaryBLL.GetDataByType("EC_寮�绁ㄧ敵璇�");
+ this.selKaipiaoshenqing.DataSource = dtkpsq;
this.selKaipiaoshenqing.DataBind();
this.selKaipiaoshenqing.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
-
+ if(dtkpsq.Count()==2)
+ {
+ this.selKaipiaoshenqing.SelectedIndex = 1;
+ }
this.selBusinessManager.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, true, false);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApplyPrint.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApplyPrint.aspx
index 7f832af..63aab2d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApplyPrint.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApplyPrint.aspx
@@ -40,40 +40,38 @@
<object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width="0" height="0">
<embed id="LODOP_EM" type="application/x-print-lodop" width="0" height="0" pluginspage="/Pages/common/install_lodop32.exe"></embed>
</object>
- <div id='div_tool' >
+ <div id='div_tool'>
</div>
-
-
-
-
<table border="1" cellpadding="0" cellspacing="0" style="border: 0;margin-bottom:10px;margin-top:10px;">
<thead>
<tr>
- <th width="25">
+ <th width="35">
缂栧彿
</th>
- <th style="text-align: center;" width="70">
+ <th style="text-align: center;" width="80">
鐢宠寮�绁ㄦ椂闂�
</th>
<th style="text-align: center;" width="70">
涓氬姟缁忕悊
</th>
- <th style="text-align: center;" width="70">
+ <th style="text-align: center;" width="90">
寮�绁ㄧ敵璇峰崟鍙�
</th>
<th style="text-align: center;"width="150">
瀹㈡埛鍚嶇О
</th>
- <th width="36">
+ <th width="40">
璁㈠崟鏁伴噺
</th>
<th width="60">
閲戦
</th>
-
+ <th width="100">
+ 澶囨敞
+ </th>
<th width="60">
寮�绁ㄧ姸鎬�
@@ -90,8 +88,6 @@
<ItemTemplate>
<tr>
-
-
<td>
<%#Container.ItemIndex +1 /*(UCPager1.PageSize *( UCPager1.PageIndex-1)+1)*/%>
</td>
@@ -124,33 +120,25 @@
<td>
<%#Eval("jine", "{0:F}")%>
</td>
+ <td>
+
+ <div style="width: 120px; word-wrap: break-word; text-align:justify;">
+ <%#Eval("remark")%>
+ </div>
+ </td>
<td>
<%#Eval("KaipiaoshenqingName")%>
-
-
-
</td>
<td>
<%#Eval("KehuqianshouName")%>
-
-
-
-
</td>
-
</tr>
</itemtemplate>
</asp:repeater>
</tbody>
- </table>
-
-
-
-
-
-
+ </table>
</div>
</form>
</body>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
index 5048b76..c500e4c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
@@ -471,6 +471,7 @@
this.selKaipiaoshenqing.DataSource = _sys_DictionaryBLL.GetDataByType("EC_寮�绁ㄧ敵璇�");
this.selKaipiaoshenqing.DataBind();
this.selKaipiaoshenqing.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selKaipiaoshenqing.Value = "1";
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDelayTimeEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDelayTimeEdit.aspx.cs
index 040332d..3e9ea65 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDelayTimeEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDelayTimeEdit.aspx.cs
@@ -79,7 +79,7 @@
bool result = eC_OrderBLL.OldUpdateDelayTime(eC_OrderExtend);
if (result)
- JavaScript.MessageBoxs("鏇存柊鎴愬姛", this, true, true);
+ JavaScript.MessageBox("鏇存柊鎴愬姛", this, true, true);
else
JavaScript.MessageBox("鏇存柊澶辫触", this);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index 9cc124e..875669e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -13,6 +13,19 @@
<script src="../../js/business/Order.js?v=25" type="text/javascript"></script>
<!--鍓嶅彴椤甸潰end-->
<script type="text/javascript" language="javascript">
+
+ function jsPrice(dj) {
+ var num = $("#printCount").val();
+
+ $("#txtSumPrice").val(dj * num);
+ }
+
+ function jsdjPrice(zj) {
+ var num = $("#printCount").val();
+
+ $("#txtUnitPrice").val( (zj/num).toFixed(4) );
+ }
+
function ReBindClients() {
$.ajax({
url: "/Pages/business/OrderEdit.aspx",
@@ -212,13 +225,13 @@
璁㈠崟鍗曚环锛�
</td>
<td align="left">
- <input id='txtUnitPrice' runat="server" maxlength='9' class='float' />
+ <input id='txtUnitPrice' runat="server" maxlength='9' class='float' onchange="jsPrice(this.value)" />
</td>
<td align="right">
璁㈠崟鎬讳环锛�
</td>
<td align="left">
- <input id='txtSumPrice' runat="server" maxlength='9' value='0' class="req float" min="0" />
+ <input id='txtSumPrice' runat="server" maxlength='9' value='0' class="req float" min="0" onchange="jsdjPrice(this.value)" />
</td>
<td align="right">
鏍＄鏂瑰紡锛�
@@ -422,7 +435,8 @@
<td class="contentLeft" colspan="2" style=" padding-left:300px;">
<input type="hidden" id='txtKeyid' runat="server" value='0' /><input type="hidden" value='0' id='txtBillMode' runat="server" />
<input type="hidden" name='Target' value='default' />
- <input name='hidPrintTypeId' id='hidPrintTypeId' type="hidden" /><input type="button" id="btnSaveask" runat="server" value="淇濆瓨璁㈠崟鍜岃姹�" onclick="if(!Saveyaoqiu())return false;" /> <input type="button" id="btnSave" runat="server" value="淇濆瓨璁㈠崟" onclick="if(!Save())return false;" /> <input type="button" value="閲� 缃�" id='btnReset' onclick="ReLoad()" />
+ <input name='hidPrintTypeId' id='hidPrintTypeId' type="hidden" />
+ <input type="button" id="btnSaveask" runat="server" value="淇濆瓨璁㈠崟鍜岃姹�" onclick="if(!Saveyaoqiu())return false;" /> <input type="button" id="btnSave" runat="server" value="淇濆瓨璁㈠崟" onclick="if(!Save())return false;" /> <input type="button" value="閲� 缃�" id='btnReset' onclick="ReLoad()" />
@@ -477,18 +491,23 @@
showWait();
var OldOrderId = document.getElementById('txtKeyid').value;
var ssselPrintTypes = document.getElementById('selPrintTypes').value;
+ alert(7);
if (ssselPrintTypes == -1 || ssselPrintTypes == "-1") {//鍏朵粬绫诲瀷
$("#hidOrderId").val(OldOrderId);
$("#divInquiry").load("/Pages/front/OtherType.aspx", { "PrintTypeId": "-1" });
setTimeout(function () {
+ alert(8);
if (sel.value != "" || sel.value == "0") {
BindControl1(sel.value);
}
}, 1000);
window.hideWaitDiv = window.parent.parent.parent.parent.parent.parent.hideWaitDiv;
- if (window.hideWaitDiv) window.hideWaitDiv();
- } else {
+ if (window.hideWaitDiv)
+ window.hideWaitDiv();
+ }
+ else
+ {
DelayLoadPrintType1(ssselPrintTypes, '1', OldOrderId, 'order');
}
document.getElementById('hidPrintTypeId').value = ssselPrintTypes;
@@ -507,18 +526,22 @@
//淇敼鍙嶇粦鏁版嵁
function BindControl1(orderId) {
+ alert(1);
if (parseInt(orderId) > 0) {
$.ajax({
url: '/Pages/front/InquiryOnLine.aspx?tmp' + (new Date()).valueOf(),
type: "POST",
data: "BindControl1=true&OrderId=" + orderId,
success: function (dataJsonStr) {
+ alert(2);
if (dataJsonStr == null || dataJsonStr == "")
return;
var dataJson = eval('(' + dataJsonStr + ')');
+ alert(dataJson.PrintTypeId);
if (dataJson.PrintTypeId == "-1" || dataJson.PrintTypeId == -1) {
$("[name='printSizeName']").val(dataJson.PrintSizeName);
$("[name='printCount']").val(dataJson.PrintCount);
+ $("#ysUnit").attr("value", dataJson.Unit);
$("[name='txtPrintDemand']").val(dataJson.PrintDemand);
} else {
BindControlByPrintType(dataJson);
@@ -566,6 +589,7 @@
function LoadPrintType1(printTypeId, pvcTypePar, OrderId) {
+ alert(4);
$("#hidOrderId").val(OrderId);
switch (printTypeId) {
//鍚嶇墖
@@ -677,6 +701,7 @@
//鍔ㄦ�佸姞杞介〉闈㈠悗鎵ц鐨勮鍙�
function ExcuteCallBack1() {
+ alert(5);
var printTypeId = $("#hidPrintTypeId").val();
$("#selDigitalPrintType").live("change",
@@ -726,6 +751,7 @@
var ssselprintask = $("#selprintask").val();
//淇敼鍙嶇粦鏁版嵁
+ alert(3);
if (ssselprintask != "" || ssselprintask == "0") {
BindControl1(ssselprintask);
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
index ff9a6b9..1f690b4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
@@ -371,6 +371,7 @@
eC_OrderExtend.CustomerLevelId = MyConvert.ConvertToInt32(Request["selCustormerLevel"]);
eC_OrderExtend.Contacts = MyConvert.ConvertToString(Request["txtContact"]).Trim();
eC_OrderExtend.ContactPhone = MyConvert.ConvertToString(Request["txtPhone"]).Trim();
+ eC_OrderExtend.printunit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
eC_OrderBasic.Remark = eC_OrderExtend.Remark;
eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]).Trim();
@@ -387,6 +388,7 @@
_inquiryCommonModel = new InquiryCommonModel();
_inquiryCommonModel.PrintTypeId = -1;
_inquiryCommonModel.PrintCount = Request["printCount"].ToString().ToInt32().Value;
+ _inquiryCommonModel.Unit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
_inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
_inquiryCommonModel.PrintSizeName = Request["printSizeName"].ToString();
}
@@ -549,6 +551,7 @@
eC_OrderExtend.CustomerLevelId = MyConvert.ConvertToInt32(Request["selCustormerLevel"]);
eC_OrderExtend.Contacts = MyConvert.ConvertToString(Request["txtContact"]).Trim();
eC_OrderExtend.ContactPhone = MyConvert.ConvertToString(Request["txtPhone"]).Trim();
+ eC_OrderExtend.printunit= MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
eC_OrderBasic.Remark = eC_OrderExtend.Remark;
eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]).Trim();
@@ -565,6 +568,7 @@
_inquiryCommonModel = new InquiryCommonModel();
_inquiryCommonModel.PrintTypeId = -1;
_inquiryCommonModel.PrintCount = Request["printCount"].ToString().ToInt32().Value;
+ _inquiryCommonModel.Unit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
_inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
_inquiryCommonModel.PrintSizeName = Request["printSizeName"].ToString();
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 169db99..72a858e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -214,6 +214,12 @@
</select>
</td>
<td class="ali03">
+ 鍗颁欢鍚嶇О锛�
+ </td>
+ <td>
+ <input id='txtSearchyjname' runat="server" maxlength='50' />
+ </td>
+ <td class="ali03">
浠樻鏂瑰紡锛�
</td>
<td>
@@ -241,9 +247,20 @@
<asp:listitem value="0">涓瘎</asp:listitem>
<asp:listitem value="-1">宸瘎</asp:listitem>
</asp:dropdownlist>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
</td>
- <td>
+ <td>
</td>
+ <td class="ali03"> </td>
+ <td> </td>
+ <td class="ali03"> </td>
+ <td> </td>
+ <td class="ali03"> </td>
+ <td> </td>
+ <td> </td>
<td>
<asp:button id="btn_Search" text="鏌ヨ" runat="server" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
<input type="hidden" id='txtCommission' runat="server" />
@@ -304,6 +321,9 @@
</th>
<th width="36">
鏁伴噺
+ </th>
+ <th width="36">
+ 鍗曚綅
</th>
<th style="text-align: center;" width="50">
璁㈠崟鐘舵��
@@ -389,8 +409,8 @@
<%#Eval("SellerOrderId")%></a>--%>
</td>
<td style="text-align: center;">
- <div style="width: 140px; word-wrap: break-word; text-align:justify;">
- <a href='javascript:void(0)' title='鐐瑰嚮鏌ョ湅 <%#Eval("BuyerName").ToString()%> 璧勬枡' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 10 ? (Eval("BuyerName").ToString().Substring(0, 10) + "..") : Eval("BuyerName").ToString()%></a>
+ <div style="word-wrap: break-word; text-align:justify;">
+ <a href='javascript:void(0)' title='<%#Eval("BuyerName").ToString()%>' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 15 ? (Eval("BuyerName").ToString().Substring(0, 15) + "..") : Eval("BuyerName").ToString()%></a>
</div>
</td>
<td>
@@ -406,6 +426,9 @@
<%#Eval("OrderExtend.PrintNum")%>
</td>
<td>
+ <%#Eval("yssldw")%>
+ </td>
+ <td>
<%#Eval("OrderStateObj.Name")%>
</td>
<td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
index 242c3ec..831f812 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
@@ -529,6 +529,7 @@
SetParamValue(searchParam, 19, CurrentUser.TrueMemberId);
SetParamValue(searchParam, 20, CurrentUser.StaffId);
SetParamValue(searchParam, 21, CurrentUser.TrueName);
+ SetParamValue(searchParam, 28, this.txtSearchyjname.Value);
SearchParam = searchParam;
UCPager1.AspNetPager.CurrentPageIndex = 1;//閲嶇疆椤垫暟
//鍐嶆鏌ヨ
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs
index 8d76b73..9f67cc7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs
@@ -150,6 +150,15 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selPayStates;
/// <summary>
+ /// txtSearchyjname 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtSearchyjname;
+
+ /// <summary>
/// selPayType 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
index d616e43..b688c6d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
@@ -5,8 +5,14 @@
<head id="Head1" runat="server">
<title>璁㈠崟鍒楄〃</title>
<uc:cmshead id="CMSHead1" runat="server" />
- <script src="../../js/business/Order.js" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=5" type="text/javascript"></script>
<script type="text/javascript">
+
+ function kaipiaoConfirm(orderId) {
+ var url = "/Pages/business/kaipiaoConfirm.aspx?id=" + orderId;
+ top.Dialog.open({ URL: url, Title: "寮�绁ㄧ敵璇风‘璁�", Height: 300, Width: 580 });
+ }
+
//璁㈠崟璇勪环
function evaluationModel(orderid) {
dialog.open({ URL: "/Pages/business/EvaluationSeller.aspx?orderid=" + orderid, Title: "鍗栧璇勪环", Width: 580, Height: 300 });
@@ -118,6 +124,27 @@
}
);
});
+
+ $(function () {
+ var value_SumPrice = 0;
+ $(".SumPrice").each(function (ii, vv) {
+ value_SumPrice += parseFloat($(vv).text());
+ });
+ $("#AllMoney").html(value_SumPrice.toFixed(2));
+
+ var value_PayedMoney = 0;
+ $(".PayedMoney").each(function (ii, vv) {
+ value_PayedMoney += parseFloat($(vv).text());
+ });
+ $("#AlreadyMoney").html(value_PayedMoney.toFixed(2));
+
+ var value_UnPayedMoney = 0;
+ $(".UnPayedMoney").each(function (ii, vv) {
+ value_UnPayedMoney += parseFloat($(vv).text());
+ });
+ $("#NoMoney").html(value_UnPayedMoney.toFixed(2));
+ });
+
</script>
<style type="text/css">
.tableStyleXS th { padding: 1px 0 1px 3px; background-image:none; border-bottom:1px solid #CCC; }
@@ -144,6 +171,11 @@
cursor: pointer;
width: 26px;
}
+
+
+ .StatisticsMoney td { color: #FF5500; }
+ .StatisticsMoney span { color: #FF5500; font-weight: bold; }
+
</style>
</head>
<body>
@@ -288,7 +320,9 @@
<a href="javascript:;" menu_member_case_id="case_ToBatchPayList" menu_member_case_name="鎵归噺鏀舵" onclick="ToBatchPayList();"><span class="icon_edit">鎵归噺鏀舵</span></a>
<div class="box_tool_line">
</div>
-
+ <a href="javascript:;" menu_member_case_id="case_ToBatchPrintAwbOrder" menu_member_case_name="鎵撳嵃閫佽揣鍗�" onclick="ToPrintAwbOrder()"><span class="icon_edit">鎵撳嵃閫佽揣鍗�</span></a>
+ <div class="clear">
+ </div>
</div>
</div>
</div>
@@ -399,7 +433,7 @@
PayState:<%#Eval("PayState")%>
}" id='ckBox<%#Container.ItemIndex%>' id='ckBox<%#Container.ItemIndex%>' class='ckBox' />
</td>
- <td>
+ <td class="ItemIndex">
<%#Container.ItemIndex +1 /*(UCPager1.PageSize *( UCPager1.PageIndex-1)+1)*/%>
</td>
<td style="text-align: center;">
@@ -438,14 +472,14 @@
<%#Eval("KaipiaoshenqingName").ToString()==""?"鏈敵璇�":Eval("KaipiaoshenqingName").ToString()%>
</td>
- <td>
+ <td class="SumPrice">
<%#Eval("SumPrice", "{0:F}")%>
</td>
- <td>
+ <td class="PayedMoney">
<%#Eval("TradingSingle.PayedMoney", "{0:F}")%>
</td>
- <td>
+ <td class="UnPayedMoney">
<%#Eval("UnPayedMoney","{0:F}")%>
</td>
@@ -493,6 +527,22 @@
</itemtemplate>
</asp:repeater>
</tbody>
+
+ <tr class="StatisticsMoney">
+ <td colspan="12" class="ali03">
+ 鏌ヨ椤圭粺璁★細
+ </td>
+ <td class="ali01" >
+ <span id="AllMoney" runat="server"></span>
+ </td>
+ <td class="ali01">
+ <span id="AlreadyMoney" runat="server"></span>
+ </td>
+ <td class="ali01">
+ <span id="NoMoney" runat="server"></span>
+ </td>
+
+ </tr>
</table>
<%--<uc:ucpager id="UCPager1" runat="server" />--%>
</div>
@@ -507,7 +557,14 @@
var ids = '';
var cks = $("input[name='ckId']:checked");
- if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ if (cks.length == 0)
+ {
+ alertMsg('娌℃湁閫変腑浠讳綍椤癸紒');
+ return;
+ }
+ else
+ {
+ }
var isCan = true;
var Kaipiaoshenqing = 2;
@@ -556,16 +613,17 @@
return;
}
- var msg = ('纭寮�绁ㄧ敵璇峰悧?');
- top.Dialog.confirm(msg, function () {
- DoAcceptAll3(ids);
- });
+ kaipiaoConfirm(ids);
+ //var msg = ('纭寮�绁ㄧ敵璇峰悧?');
+ //top.Dialog.confirm(msg, function () {
+ // DoAcceptAll3(ids);
+ //});
}
}
/*
-鎵归噺澶勭悊寮�绁ㄧ敵璇�
-*/
+ 鎵归噺澶勭悊寮�绁ㄧ敵璇�
+ */
var DoAcceptAll3 = function (orderIds) {
window.submitUrl = "/Pages/business/OrderListBatchOperation.aspx"
CallServer({ Target: "deleteOrderAll3", ids: orderIds }, function (data, textStatus) {
@@ -606,6 +664,32 @@
}
);
+ var i = 1;
+
+ $(".ItemIndex").each(function (ii, vv) {
+
+ $(vv).text(i)
+ i = i + 1;
+ });
+
+
+ var value_SumPrice = 0;
+ $(".SumPrice").each(function (ii, vv) {
+ value_SumPrice += parseFloat($(vv).text());
+ });
+ $("#AllMoney").html(value_SumPrice.toFixed(2));
+
+ var value_PayedMoney = 0;
+ $(".PayedMoney").each(function (ii, vv) {
+ value_PayedMoney += parseFloat($(vv).text());
+ });
+ $("#AlreadyMoney").html(value_PayedMoney.toFixed(2));
+
+ var value_UnPayedMoney = 0;
+ $(".UnPayedMoney").each(function (ii, vv) {
+ value_UnPayedMoney += parseFloat($(vv).text());
+ });
+ $("#NoMoney").html(value_UnPayedMoney.toFixed(2));
//if (!isCan) {
// // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs
index c6aa923..34b1080 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs
@@ -453,6 +453,7 @@
{
// UCPager1.AspNetPager.PageChanged += AspNetPager_PageChanged;
btn_Search.Click += btn_Search_Click;
+
txtCommission.Value = CY.Config.WebInfo.Instance.FirmOrderAgencyFee;
List<EC_OrderDialogue> dialogues = _eC_OrderBasicBLL.SelectPropertyChangeRequest(CurrentUser.MemberId) as List<EC_OrderDialogue>;
@@ -513,6 +514,7 @@
#region 鏌ヨ
+
/// <summary>
/// 鎼滅储鎸夐挳鐐瑰嚮浜嬩欢
/// </summary>
@@ -521,11 +523,11 @@
private void btn_Search_Click(object sender, EventArgs e)
{
- /* if (this.txtCustormerName.Value.Trim() == "")
- {
- Response.Write("瀹㈡埛鍚嶇О涓嶈兘涓虹┖锛岃杈撳叆瀹㈡埛鍚嶇О鍐嶆煡璇⑩�︹��");
- return;
- }*/
+ //if (this.txtCustormerName.Value.Trim() == "")
+ //{
+ // Response.Write("瀹㈡埛鍚嶇О涓嶈兘涓虹┖锛岃杈撳叆瀹㈡埛鍚嶇О鍐嶆煡璇⑩�︹��");
+ // return;
+ //}
Dictionary<int, object> searchParam = new Dictionary<int, object>();
SetParamValue(searchParam, 1, CurrentUser.MemberId);
@@ -556,12 +558,24 @@
// AspNetPager_PageChanged(UCPager1.AspNetPager, new EventArgs());
Infrastructure.Query.Pagination pagination = new Infrastructure.Query.Pagination()
{
- PageSize = 1000,// UCPager1.AspNetPager.PageSize,
+ PageSize = 10000,// UCPager1.AspNetPager.PageSize,
PageIndex = 1// UCPager1.AspNetPager.CurrentPageIndex
};
IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Seller(pagination, SearchParam);//.Where(x=>x.Quchudingdan == 2);
rptData.DataSource = result;
rptData.DataBind();
+
+ //EC_OrderBasic m_EC_OrderBasic = _eC_OrderBasicBLL.SumOrderMoney_receive(pagination, SearchParam);
+ //if (m_EC_OrderBasic != null)
+ //{
+ // //this.AllMoney.InnerText = (m_EC_OrderBasic.OrAllTradingMoney * 9 ?? 0).ToString("0.00");
+ // //this.AlreadyMoney.InnerText = (m_EC_OrderBasic.OrAllPayedMoney * 9 ?? 0).ToString("0.00");
+ // //this.NoMoney.InnerText = (m_EC_OrderBasic.OrAllUnPayedMoney * 9 ?? 0).ToString("0.00");
+ // this.AllMoney.InnerText = (m_EC_OrderBasic.OrAllTradingMoney ?? 0).ToString("0.00");
+ // this.AlreadyMoney.InnerText = (m_EC_OrderBasic.OrAllPayedMoney ?? 0).ToString("0.00");
+ // this.NoMoney.InnerText = (m_EC_OrderBasic.OrAllUnPayedMoney ?? 0).ToString("0.00");
+ //}
+
}
/// <summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.designer.cs
index 8d290f2..7f2b494 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.designer.cs
@@ -202,5 +202,32 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater rptData;
+
+ /// <summary>
+ /// AllMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl AllMoney;
+
+ /// <summary>
+ /// AlreadyMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl AlreadyMoney;
+
+ /// <summary>
+ /// NoMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl NoMoney;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx
index 9e72d93..9c07715 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx
@@ -51,7 +51,7 @@
<option value ="7澶�"> </option>
<option value ="涓�鍛ㄥ悗"> </option>
</select>--%>
-
+ <asp:button id="Button0" text="閫炬湡" runat="server" padding="0px" OnClick="btn_Search_Click0" />
<asp:button id="Button1" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click1" />
<asp:button id="Button2" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click2" />
<asp:button id="Button3" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click3" />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs
index b6c16ca..000af42 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs
@@ -128,6 +128,13 @@
BindList();
}
+ protected void btn_Search_Click0(object sender, EventArgs e)
+ {
+
+ this.txtDeliveryTime.Value = this.Button0.Text;
+
+ BindList();
+ }
protected void btn_Search_Click2(object sender, EventArgs e)
{
@@ -187,7 +194,7 @@
this.selBusinessManager.DataValueField = "Keyid";
this.selBusinessManager.DataBind();
this.selBusinessManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
-
+ this.Button0.Text = "閫炬湡";
this.Button1.Text = "鏄庡ぉ";
this.Button2.Text = "鍚庡ぉ";
this.Button3.Text = "3澶�";
@@ -209,6 +216,7 @@
if (this.txtDeliveryTime.Value == this.Button1.Text)
{
+
this.Button1.BorderColor = Color.Black;
this.Button2.BorderColor = Color.LightBlue;
this.Button3.BorderColor = Color.LightBlue;
@@ -217,6 +225,7 @@
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
this.Button8.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button2.Text)
{
@@ -228,6 +237,7 @@
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
this.Button8.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button3.Text)
{
@@ -239,6 +249,7 @@
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
this.Button8.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button4.Text)
{
@@ -250,6 +261,7 @@
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
this.Button8.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button5.Text)
{
@@ -261,6 +273,7 @@
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
this.Button8.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button6.Text)
{
@@ -272,6 +285,7 @@
this.Button1.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
this.Button8.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button7.Text)
{
@@ -283,6 +297,7 @@
this.Button6.BorderColor = Color.LightBlue;
this.Button1.BorderColor = Color.LightBlue;
this.Button8.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button8.Text)
{
@@ -294,6 +309,19 @@
this.Button6.BorderColor = Color.LightBlue;
this.Button1.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
+ }
+ else if (this.txtDeliveryTime.Value == this.Button0.Text)
+ {
+ this.Button0.BorderColor = Color.Black;
+ this.Button2.BorderColor = Color.LightBlue;
+ this.Button3.BorderColor = Color.LightBlue;
+ this.Button4.BorderColor = Color.LightBlue;
+ this.Button5.BorderColor = Color.LightBlue;
+ this.Button6.BorderColor = Color.LightBlue;
+ this.Button1.BorderColor = Color.LightBlue;
+ this.Button7.BorderColor = Color.LightBlue;
+ this.Button8.BorderColor = Color.LightBlue;
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.designer.cs
index 6e31ab5..1ce008c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.designer.cs
@@ -42,6 +42,15 @@
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
+ /// Button0 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button0;
+
+ /// <summary>
/// Button1 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProductionprogress.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProductionprogress.aspx.cs
index bf7aada..f3e01fc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProductionprogress.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProductionprogress.aspx.cs
@@ -168,7 +168,7 @@
bool result = eC_OrderBLL.OldUpdateProductionprogress(eC_OrderExtend);
if (result)
- JavaScript.MessageBoxs("鎿嶄綔鎴愬姛", this, true, true);
+ JavaScript.MessageBox("鎿嶄綔鎴愬姛", this, true, true);
else
JavaScript.MessageBox("鎿嶄綔澶辫触", this);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx
new file mode 100644
index 0000000..c2bdefb
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx
@@ -0,0 +1,40 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="kaipiaoConfirm.aspx.cs" Inherits="CY.WebForm.Pages.business.kaipiaoConfirm" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head runat="server">
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ </head>
+ <body style="padding:10px">
+ <form runat="server">
+ <table class="tableStyle" >
+ <tr>
+ <td class="ali03 w100px">瀹㈡埛鍚嶇О锛�</td>
+ <td><span id="khname" runat="server"></span></td>
+ </tr>
+ <tr>
+ <td class="ali03">寮�绁ㄩ噾棰濓細</td>
+ <td><span id="kpmoney" runat="server"></span></td>
+ </tr>
+ <tr>
+ <td class="ali03">寮�绁ㄥ強寮傚父閲戦璇存槑锛�</td>
+ <td>
+ <textarea id="txtContent" runat="server" style=" width:380px; height:120px;"></textarea>
+ <input id="txtOrderIds" runat="server" type="hidden" />
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"></td>
+ </tr>
+ <tr id="trbtn" runat="server">
+ <td class="ali02" colspan="2">
+ <asp:Button ID="btn_Submit" Text="鎻愪氦" runat="server" OnClick="btn_Submit_form" />
+ <span style="margin-left:10px"></span>
+ <input type="button" value="鍙栨秷 " onclick="top.Dialog.close()" />
+ </td>
+ </tr>
+ </table>
+ </form>
+ </body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs
new file mode 100644
index 0000000..9f0e539
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs
@@ -0,0 +1,157 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.EC;
+using CY.Model;
+using CY.Infrastructure.Common;
+using CY.BLL.Integrity;
+using CY.BLL;
+using System.Threading.Tasks;
+using System.Transactions;
+
+namespace CY.WebForm.Pages.business
+{
+ //鍚磋緣
+ //鍗栧璇勪环
+ public partial class kaipiaoConfirm : BasePage
+ {
+ EC_OrderBasicBLL bll_EC_OrderBasicBLL = null;
+ EC_OrderBLL _eC_OrderBLL = null;
+ OA_KaipiaoshenqingBLL _oA_KaipiaoshenqingBLL = null;
+ OA_CorporateClientsBLL _oA_CorporateClientsBLL = null;
+
+
+ //鍒濆鍖�
+ public kaipiaoConfirm()
+ {
+ bll_EC_OrderBasicBLL = new EC_OrderBasicBLL();
+ _eC_OrderBLL = new EC_OrderBLL();
+ _oA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ _oA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ InitData();
+ }
+ }
+
+ //缁戝畾鏁版嵁
+ public void InitData()
+ {
+ string orderIdStr = Request["id"];
+ if (!string.IsNullOrEmpty(orderIdStr))
+ {
+ decimal total = 0;
+ string name = "";
+ this.txtOrderIds.Value = orderIdStr;
+ string[] idsArray = orderIdStr.Split(',');
+ if (idsArray != null && idsArray.Length > 0)
+ {
+ foreach(var item in idsArray)
+ {
+ var model = _eC_OrderBLL.GetOrderById(int.Parse(item));
+ if (model != null)
+ {
+ total += model.SumPrice??0;
+ if(string.IsNullOrEmpty(name))
+ {
+ name = model.BuyerName;
+ }
+ }
+ }
+ }
+ kpmoney.InnerText = total.ToString("0.00");
+ khname.InnerText = name;
+ }
+ else
+ {
+ JavaScript.CloseDIVOpener(this);
+ }
+ }
+
+ //鎻愪氦浜嬩欢
+ protected void btn_Submit_form(object sender, EventArgs e)
+ {
+ AcceptAll3();
+ }
+
+ /// <summary>
+ /// 鎵归噺寮�绁ㄧ敵璇�
+ /// </summary>
+ public void AcceptAll3()
+ {
+ string ids = this.txtOrderIds.Value;
+ string[] idsArray = ids.Split(',');
+ if (idsArray != null && idsArray.Length > 0)
+ {
+ EC_OrderBasic eC_OrderBasic = bll_EC_OrderBasicBLL.SelectModelById(idsArray[0].ToInt32().Value);
+ OA_CorporateClients oA_CorporateClients = _oA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, eC_OrderBasic.BuyerId);
+ using (TransactionScope scope = new TransactionScope())
+ {
+ string ssss = DateTime.Now.ToString("yyyyMMdd");
+ string SellerOrderId = ssss + 1.ToString("000");
+
+ string maxSellerOrderId = _oA_KaipiaoshenqingBLL.GetModelByformid(CurrentUser.MemberId).Where(x => x.SellerOrderId.Contains(ssss)).Max(x => x.SellerOrderId);
+ if (!string.IsNullOrWhiteSpace(maxSellerOrderId))
+ {
+ string aaaaaaaaaaaa = maxSellerOrderId.Substring(maxSellerOrderId.Length - 3, 3);
+ SellerOrderId = ssss + (aaaaaaaaaaaa.ToInt32().Value + 1).ToString("000");
+ }
+ OA_Kaipiaoshenqing oA_DeliverPlan = new OA_Kaipiaoshenqing();
+
+
+ oA_DeliverPlan.Keyid = Guid.NewGuid();
+ oA_DeliverPlan.FirmId = CurrentUser.MemberId;
+ oA_DeliverPlan.BuyerId = eC_OrderBasic.BuyerId;
+ oA_DeliverPlan.Kaipiaoshenqing = 1;
+ oA_DeliverPlan.Kehuqianshou = 1;
+ oA_DeliverPlan.SellerOrderId = SellerOrderId;
+ oA_DeliverPlan.remark = this.txtContent.Value;//.Replace("\r\n", "<br>");
+
+ oA_DeliverPlan.KehuqianshouTime = null;
+ oA_DeliverPlan.KehuqianshouCreater = null;
+ oA_DeliverPlan.KaipiaoquerenTime = null;
+ oA_DeliverPlan.KaipiaoquerenCreater = null;
+ oA_DeliverPlan.BusinessManagerId = oA_CorporateClients.BusinessManagerId ?? 0;
+
+ oA_DeliverPlan.Creater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.CreateTime = DateTime.Now;
+ oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.LastUpdateTime = DateTime.Now;
+
+ _oA_KaipiaoshenqingBLL.InsertModel(oA_DeliverPlan);
+
+ DateTime kaipiaoshenqing = DateTime.Now;
+ for (int i = 0; i < idsArray.Length; i++)
+ {
+ bool result = true;
+ EC_OrderExtend model = new EC_OrderExtend();
+ model.Keyid = idsArray[i].ToInt32();
+ model.KaipiaoshenqingCreater = CurrentUser.TrueMemberId;
+ model.KaipiaoshenqingTime = kaipiaoshenqing;
+ model.Kaipiaoshenqing = 1;
+ model.KaipiaoshenqingId = oA_DeliverPlan.Keyid;
+
+ result = _eC_OrderBLL.OldUpdateKaipiaoshenqing(model);
+
+ if (!result)
+ {
+ return;
+ }
+ }
+ scope.Complete();
+ }
+ JavaScript.MessageBox("鎻愪氦鎴愬姛", this);
+
+ JavaScript.RefreshDIVOpener(this);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.designer.cs
new file mode 100644
index 0000000..b914e62
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.designer.cs
@@ -0,0 +1,80 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class kaipiaoConfirm
+ {
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// khname 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl khname;
+
+ /// <summary>
+ /// kpmoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl kpmoney;
+
+ /// <summary>
+ /// txtContent 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtContent;
+
+ /// <summary>
+ /// txtOrderIds 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtOrderIds;
+
+ /// <summary>
+ /// trbtn 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTableRow trbtn;
+
+ /// <summary>
+ /// btn_Submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Submit;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx b/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx
index e6b1393..a6551b8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx
@@ -29,7 +29,7 @@
</script>
<div id="page">
-<webdiyer:AspNetPager ID="AspNetPager1" runat="server" CssClass="paginator" CurrentPageButtonPosition="Center" CustomInfoHTML="鍏�<font style='font-size:13'>%RecordCount%</font>鏉�" ShowCustomInfoSection="Left" Width="100%" CustomInfoSectionWidth="100px" PageIndexBoxType="TextBox" ShowPageIndexBox="Always" SubmitButtonText="Go" TextAfterPageIndexBox="椤�" AlwaysShow="true" TextBeforePageIndexBox="杞埌" PrevPageText="涓婁竴椤�" NextPageText="涓嬩竴椤�" FirstPageText="棣栭〉" LastPageText="鏈〉" PageSize="15" CurrentPageIndex="1">
+<webdiyer:AspNetPager ID="AspNetPager1" runat="server" CssClass="paginator" CurrentPageButtonPosition="Center" CustomInfoHTML="鍏�<font style='font-size:13'>%RecordCount%</font>鏉�" ShowCustomInfoSection="Left" Width="100%" CustomInfoSectionWidth="100px" PageIndexBoxType="TextBox" ShowPageIndexBox="Always" SubmitButtonText="Go" TextAfterPageIndexBox="椤�" AlwaysShow="true" TextBeforePageIndexBox="杞埌" PrevPageText="涓婁竴椤�" NextPageText="涓嬩竴椤�" FirstPageText="棣栭〉" LastPageText="鏈〉" PageSize="25" CurrentPageIndex="1">
</webdiyer:AspNetPager>
<div class="CB"></div>
</div>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx.designer.cs
index 25ae5a8..f137e52 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.common {
-
-
- public partial class UCPager {
-
+namespace CY.WebForm.Pages.common
+{
+
+
+ public partial class UCPager
+ {
+
/// <summary>
/// AspNetPager1 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx
index da50095..8a594c6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx
@@ -31,6 +31,34 @@
$("#NowPageAlreadyMoney").html(value_NowPageAlreadyMoney.toFixed(2));
$("#NowPageNoMoney").html(value_NowPageNoMoney.toFixed(2));
});
+
+ /*
+鎵撳嵃閫佽揣鍗�
+*/
+ function ToPrintdelev() {
+ var txtBeginData= $("#txtBeginData").val();
+ var txtEndDate= $("#txtEndDate").val();
+ var selPrintTypes = $("#selPrintTypes").val();
+
+ var selOrderTypes = $("#selOrderTypes").val();
+ var selPayStates = $("#selPayStates").val();
+ var selCustormerLevels = $("#selCustormerLevels").val();
+ var selAccountManagerId = $("#selAccountManagerId").val();
+ var selBusinessManagerId = $("#selBusinessManagerId").val();
+ var selOrderStates = $("#selOrderStates").val();
+ var txtCreaterName = $("#txtCreaterName").val();
+ var txtOrderId = $("#txtOrderId").val();
+ var txtCustormerName = $("#txtCustormerName").val();
+
+
+ // OpenWindowByUrl();
+ OpenWindowByUrl('/Pages/financial/OrderFinancialPrint.aspx?txtBeginData=' + txtBeginData + '&txtEndDate=' + txtEndDate + '&selPrintTypes=' + selPrintTypes
+ + '&selOrderTypes=' + selOrderTypes + '&selPayStates=' + selPayStates + '&selCustormerLevels=' + selCustormerLevels + '&selAccountManagerId=' + selAccountManagerId
+ + '&selBusinessManagerId=' + selBusinessManagerId + '&selOrderStates=' + selOrderStates + '&txtCreaterName=' + txtCreaterName + '&txtOrderId=' + txtOrderId
+ + '&txtCustormerName=' + txtCustormerName
+ , '', '');
+ }
+
</script>
<style type="text/css">
.th_operate{display<%=null == Request["customeid"]?"1":""%>:none;}
@@ -126,6 +154,7 @@
</td>
<td align="right">
<asp:Button ID="btn_Search" Text="鏌ヨ" runat="server" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+ <input type="button" value='鎵撳嵃' onclick='ToPrintdelev();' />
<input type="hidden" id='txtCommission' runat="server" />
</td>
</tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.designer.cs
index 862ba1d..9f4188e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.financial {
-
-
- public partial class OrderFinancial {
-
+namespace CY.WebForm.Pages.financial
+{
+
+
+ public partial class OrderFinancial
+ {
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// txtBeginData 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtBeginData;
-
+
/// <summary>
/// txtEndDate 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndDate;
-
+
/// <summary>
/// selPrintTypes 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selPrintTypes;
-
+
/// <summary>
/// selOrderTypes 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selOrderTypes;
-
+
/// <summary>
/// selPayStates 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selPayStates;
-
+
/// <summary>
/// selCustormerLevels 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selCustormerLevels;
-
+
/// <summary>
/// selAccountManagerId 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selAccountManagerId;
-
+
/// <summary>
/// selBusinessManagerId 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManagerId;
-
+
/// <summary>
/// selOrderStates 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selOrderStates;
-
+
/// <summary>
/// txtCreaterName 鎺т欢銆�
/// </summary>
@@ -119,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtCreaterName;
-
+
/// <summary>
/// txtOrderId 鎺т欢銆�
/// </summary>
@@ -128,7 +130,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtOrderId;
-
+
/// <summary>
/// txtCustormerName 鎺т欢銆�
/// </summary>
@@ -137,7 +139,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
-
+
/// <summary>
/// btn_Search 鎺т欢銆�
/// </summary>
@@ -146,7 +148,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button btn_Search;
-
+
/// <summary>
/// txtCommission 鎺т欢銆�
/// </summary>
@@ -155,7 +157,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtCommission;
-
+
/// <summary>
/// rptData 鎺т欢銆�
/// </summary>
@@ -164,7 +166,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater rptData;
-
+
/// <summary>
/// NowPageAllMoney 鎺т欢銆�
/// </summary>
@@ -173,7 +175,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowPageAllMoney;
-
+
/// <summary>
/// NowPageAlreadyMoney 鎺т欢銆�
/// </summary>
@@ -182,7 +184,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowPageAlreadyMoney;
-
+
/// <summary>
/// NowPageNoMoney 鎺т欢銆�
/// </summary>
@@ -191,7 +193,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowPageNoMoney;
-
+
/// <summary>
/// AllMoney 鎺т欢銆�
/// </summary>
@@ -200,7 +202,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl AllMoney;
-
+
/// <summary>
/// AlreadyMoney 鎺т欢銆�
/// </summary>
@@ -209,7 +211,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl AlreadyMoney;
-
+
/// <summary>
/// NoMoney 鎺т欢銆�
/// </summary>
@@ -218,7 +220,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NoMoney;
-
+
/// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx
new file mode 100644
index 0000000..ab51455
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx
@@ -0,0 +1,130 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OrderFinancialPrint.aspx.cs" Inherits="CY.WebForm.Pages.financial.OrderFinancialPrint" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <title>璁㈠崟璇︽儏</title>
+ <script src="../../js/utils/jquery-1.5.1.min.js" type="text/javascript"></script>
+ <script src="../../js/common/util.js" type="text/javascript"></script>
+ <script src="../../js/common/KeyBehaviorHook.js" type="text/javascript"></script>
+ <script src="../../js/common/Printterpiliang.js?v=16" type="text/javascript"></script>
+ <script src="../../js/common/LodopFuncs.js" type="text/javascript"></script>
+ <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
+ <!--鍓嶅彴椤甸潰start-->
+ <style type="text/css">
+ .dbody { margin: 0; margin-left: auto; margin-right: auto; }
+ .dtitle { text-align: center; font-size: 19px; font-weight: bold; margin-top: 10px; margin-bottom: 10px; }
+ .dbody table { width: 100%; border: 1px solid #dddddd; font-size: 12px; margin-top: 5px; border-top: 1px #999999 solid; }
+ .dbody table th, .dbody table td { font-weight: normal; height: 20px; line-height: 20px; vertical-align: middle; border: 1px solid #999999; border-top: 0; }
+ .dbody table th { background-color: #E0EDF6; font-weight: bold; }
+ .dbody table td { border-left: 0; padding-left:2px; }
+ .left {text-align: right; }
+ #div_tool { text-align: center; }
+ </style>
+ <script type="text/javascript">
+
+
+
+ </script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div class='dbody'>
+
+ <object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width="0" height="0">
+ <embed id="LODOP_EM" type="application/x-print-lodop" width="0" height="0" pluginspage="/Pages/common/install_lodop32.exe"></embed>
+ </object>
+ <div id='div_tool' printparams='0,2100,2970,"A4"'>
+ </div>
+ <%=ssshtml%>
+
+ <%-- <div class="printtable printtable1">
+ <table border="1" cellpadding="0" cellspacing="0" style="border: 0;">
+
+ <tr>
+
+ <td style="width:3%;">
+ 椤哄簭
+ </td>
+ <td style="text-align: center;" width="7%">
+ 瑕佹眰鍒拌揪鏃堕棿
+ </td>
+
+
+ <td width="10%">
+ 涓氬姟缁忕悊
+ </td>
+ <td width="15%">
+ 瀹㈡埛鍗曚綅
+ </td>
+ <td style="text-align: center;"width="30%">
+ 瀹㈡埛鍦板潃銆佽仈绯讳汉鍙婅仈绯荤數璇�
+ </td>
+
+
+ <td width="5%">
+ 璐у崟鏁伴噺
+ </td>
+ <td width="7%">
+ 杞﹁締
+ </td>
+ <td width="7%">
+ 椹鹃┒鍛�
+ </td>
+ <td width="30%">
+ 娉ㄦ剰浜嬮」
+ </td>
+
+
+ </tr>
+
+
+ <asp:repeater id="RepClientList" runat="server">
+ <itemtemplate>
+ <tr>
+
+
+ <td>
+ <%#Eval("Sort")%>
+ </td>
+
+ <td>
+ <%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>
+ </td>
+
+ <td>
+ <%#Eval("BusinessManager")%>
+ </td>
+ <td>
+ <%#Eval("BuyerName")%>
+ </td>
+
+ <td>
+ <%#Eval("DizhiLianxirenDianhua")%>
+ </td>
+ <td>
+ <%#Eval("shuliang")%>
+ </td>
+ <td>
+ <%#Eval("CarName")%>
+ </td>
+ <td>
+ <%#Eval("DriverName")%>
+ </td>
+ <td>
+ <%#Eval("Zhuyishixiang")%>
+ </td>
+
+ </tr>
+ </itemtemplate>
+ </asp:repeater>
+
+ </table>
+ </div>--%>
+ <br />
+
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx.cs
new file mode 100644
index 0000000..b6f2c20
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx.cs
@@ -0,0 +1,134 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL;
+using CY.Model;
+using CY.Infrastructure.Query;
+using CY.Infrastructure.Common;
+using CY.BLL.Sys;
+using CY.BLL.OA;
+using CY.BLL.EC;
+using CY.BLL.Inquiry;
+using CY.Model.Inquiry;
+
+namespace CY.WebForm.Pages.financial
+{
+ public partial class OrderFinancialPrint : BasePage
+ {
+ EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+
+ public string ssshtml = "";
+
+ //鍒濆鍖�
+ public OrderFinancialPrint()
+ {
+
+ _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+
+ }
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ if (!IsPostBack)
+ {
+
+
+
+
+
+ BindList();
+
+ }
+ }
+
+ //缁戝畾鍒楄〃
+ private void BindList()
+ {
+
+ Pagination pa = new Pagination();
+ pa.PageSize = 10000;
+ pa.PageIndex = 1;
+
+
+
+ Dictionary<int, object> searchParam = new Dictionary<int, object>();
+ Guid customeid = MyConvert.ConvertToGuid(Request["customeid"]);
+ if (!Guid.Empty.Equals(customeid))
+ SetParamValue(searchParam, 0, customeid);
+ SetParamValue(searchParam, 1, CurrentUser.MemberId);
+ SetParamValue(searchParam, 2, Request["txtOrderId"].ToString2());
+ SetParamValue(searchParam, 3, Request["txtCustormerName"].ToString2());
+ SetParamValue(searchParam, 4, Request["txtBeginData"].ToString2());
+ SetParamValue(searchParam, 5, Request["txtEndDate"].ToString2());
+ SetParamValue(searchParam, 6, Request["selPrintTypes"].ToString2());
+ SetParamValue(searchParam, 7, Request["selOrderTypes"].ToString2());
+ SetParamValue(searchParam, 8, Request["selOrderStates"].ToString2());
+ SetParamValue(searchParam, 9, Request["selPayStates"].ToString2());
+ SetParamValue(searchParam, 10, Request["txtCreaterName"].ToString2());
+ SetParamValue(searchParam, 11, Request["selCustormerLevels"].ToString2());
+ SetParamValue(searchParam, 12, Request["selAccountManagerId"].ToString2());
+ SetParamValue(searchParam, 13, Request["selBusinessManagerId"].ToString2());
+
+
+
+
+
+
+ List<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Financial(pa, searchParam).ToList();
+
+
+ int aaa = 1;
+
+ //List<OA_DeliverPlan> oA_DeliverPlans1 = oA_DeliverPlans.OrderBy(x => x.DriverId).ThenBy(x => x.Sort).ToList();
+ ssshtml = "";
+ ssshtml += "<div class=\"printtable printtable1\"> <table border=\"1\" cellpadding=\"0\" cellspacing=\"0\" style=\"border:0;\">";
+ ssshtml += "<tr><th style=\"width:2%;\">缂栧彿</th><th style=\"text-align:center;\"width=\"7%\">璁㈠崟鍙�</th><th width=\"20%\">鍗颁欢鍚嶇О</th><th width=\"15%\">瀹㈡埛鍚嶇О</th><th style=\"text-align:center;\"width=\"5%\">鍗板埛绫诲埆</th><th width=\"5%\">璁㈠崟鐘舵��</th><th width=\"5%\">鏀粯鐘舵��</th><th width=\"5%\">璁㈠崟绫诲瀷</th><th width=\"5%\">鍗板埛鏁伴噺</th><th width=\"5%\">閲戦</th><th width=\"5%\">宸叉敹娆�</th><th width=\"5%\">鏈敹娆�</th></tr>";
+ for (int i = 0; i < result.Count; i++)
+ {
+
+
+
+
+ ssshtml += "<tr><td>" + (i+1) + "</td><td>" + result[i].SellerOrderId + "</td><td>" + result[i].DocumentName + "</td><td>" + result[i].BuyerName + "</td><td>" + result[i].PrintType.PrintName + "</td><td>" + result[i].OrderStateObj.Name + "</td><td>" + result[i].PayStateObj.Name + "</td><td>" + result[i].OrderType.Name + "</td><td>" + result[i].OrderExtend.PrintNum + " </td><td>" + result[i].SumPrice + "</td><td>" + result[i].TradingSingle.PayedMoney + "</td><td>" + result[i].UnPayedMoney + "</td></tr>";
+
+
+
+
+ }
+ ssshtml += "</table></div>";
+
+ // this.RepClientList.DataSource =
+ //this.RepClientList.DataBind();
+ //UCPager1.AspNetPager.RecordCount = pa.RecordCount;
+ }
+
+ /// <summary>
+ /// 璁剧疆鏌ヨ鍙傛暟鏂规硶
+ /// </summary>
+ /// <param name="target">璁剧疆鐩爣</param>
+ /// <param name="key">閿�</param>
+ /// <param name="value">鍊�</param>
+ private static void SetParamValue(Dictionary<int, object> target, int key, object value)
+ {
+ if (string.IsNullOrEmpty(string.Format("{0}", value)))
+ return;
+ else
+ {
+ }
+
+ if (target.ContainsKey(key))
+ {
+ target[key] = value;
+ }
+ else
+ {
+ target.Add(key, value);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx.designer.cs
new file mode 100644
index 0000000..fa8255f
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx.designer.cs
@@ -0,0 +1,35 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.financial
+{
+
+
+ public partial class OrderFinancialPrint
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs
index 811bc01..580d5ec 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs
@@ -66,7 +66,13 @@
string[] orderIds = Request["ids"].Split(',');
string receiveWay = Request["rdoReceiveWay"];
bool isWin = false;
- using (var scope = new TransactionScope())
+ using (var scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ ))
{
foreach (string orderId in orderIds)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx
index e36d08e..a7fd99e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx
@@ -38,21 +38,31 @@
<option value="寮傚瀷">寮傚瀷</option>
</select>
</td>
- <td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
- <div class="xialapb">
- <div class="xialapr">500</div>
- <div class="xialapr">1000</div>
- <div class="xialapr">2000</div>
- <div class="xialapr">3000</div>
- <div class="xialapr">5000</div>
- <div class="xialapr">10000</div>
- <div class="xialapr">20000</div>
- <div class="xialapr">30000</div>
- <div class="xialapr">50000</div>
- </div>
- </div>
+ <td align="center">
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
+ <div class="xialapb">
+ <div class="xialapr">500</div>
+ <div class="xialapr">1000</div>
+ <div class="xialapr">2000</div>
+ <div class="xialapr">3000</div>
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>
+ <div class="xialapr">20000</div>
+ <div class="xialapr">30000</div>
+ <div class="xialapr">50000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
</td>
</tr>
</tbody>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.cs
index 787e85b..beb743e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
{
if (Request["PrintTypeId"]!=null)
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.designer.cs
index f7bf1f2..8211eb6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class Adhesive {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class Adhesive
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx
index a959ea1..18e6b08 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx
@@ -55,18 +55,28 @@
</select>
</td>
<td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" style="height:15px; line-height: 15px; width:80px;" defaultValue="1000" value="1000" class="validateIntSpc"/>
- <div class="xialapb">
- <div class="xialapr">1000</div>
- <div class="xialapr">2000</div>
- <div class="xialapr">5000</div>
- <div class="xialapr">10000</div>
- <div class="xialapr">20000</div>
- <div class="xialapr">30000</div>
- <div class="xialapr">50000</div>
- </div>
- </div>
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" style="height:15px; line-height: 15px; width:80px;" defaultValue="1000" value="1000" class="validateIntSpc"/>
+ <div class="xialapb">
+ <div class="xialapr">1000</div>
+ <div class="xialapr">2000</div>
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>
+ <div class="xialapr">20000</div>
+ <div class="xialapr">30000</div>
+ <div class="xialapr">50000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
</td>
<td>
<select name="printColor0" chg="1" remark="#value#">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.cs
index 8c67c79..f317f39 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -15,7 +16,12 @@
if (!IsPostBack)
{
if (Request["PrintTypeId"] != null)
- PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+ PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.designer.cs
index 5cb5395..29384b1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class AdvertisingCup {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class AdvertisingCup
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx
index 73ea80c..f741c24 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx
@@ -34,16 +34,26 @@
</select>
</td>
<td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" style="height: 15px; line-height: 15px; width:80px;" class="validateIntSpc" defaultValue="5000" value="5000"/>
- <div class="xialapb">
- <div class="xialapr">5000</div>
- <div class="xialapr">10000</div>
- <div class="xialapr">20000</div>
- <div class="xialapr">30000</div>
- <div class="xialapr">50000</div>
- </div>
- </div>
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" style="height: 15px; line-height: 15px; width:80px;" class="validateIntSpc" defaultValue="5000" value="5000"/>
+ <div class="xialapb">
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>
+ <div class="xialapr">20000</div>
+ <div class="xialapr">30000</div>
+ <div class="xialapr">50000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
</td>
</tr>
</tbody>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.cs
index 99bd73a..3e1bd85 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -11,7 +12,13 @@
{
protected void Page_Load(object sender, EventArgs e)
{
-
+ if (!IsPostBack)
+ {
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
+ }
}
}
}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.designer.cs
index 95211a7..bac1fc8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class AdvertisingPoker {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class AdvertisingPoker
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
index 67460fc..e805502 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
@@ -88,20 +88,30 @@
</select>
</td>
<td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
- <div class="xialapb">
- <div class="xialapr">500</div>
- <div class="xialapr">1000</div>
- <div class="xialapr">2000</div>
- <div class="xialapr">3000</div>
- <div class="xialapr">5000</div>
- <div class="xialapr">10000</div>
- <div class="xialapr">20000</div>
- <div class="xialapr">50000</div>
- <div class="xialapr">100000</div>
- </div>
- </div>
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
+ <div class="xialapb">
+ <div class="xialapr">500</div>
+ <div class="xialapr">1000</div>
+ <div class="xialapr">2000</div>
+ <div class="xialapr">3000</div>
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>
+ <div class="xialapr">20000</div>
+ <div class="xialapr">50000</div>
+ <div class="xialapr">100000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
</td>
<td>
<select class="selectLaber" name="singleOrdouble0">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.cs
index d1f5a37..2d2abda 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -15,7 +16,12 @@
if (!IsPostBack)
{
if (Request["PrintTypeId"] != null)
- PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+ PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.designer.cs
index b556f37..b6d2e9e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class BlackAndWhite {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class BlackAndWhite
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx
index 42ac7ee..1df31d2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx
@@ -23,17 +23,28 @@
</span>
</td>
<td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
- <div class="xialapb">
- <div class="xialapr">500</div>
- <div class="xialapr">1000</div>
- <div class="xialapr">2000</div>
- <div class="xialapr">3000</div>
- <div class="xialapr">5000</div>
- <div class="xialapr">10000</div>
- </div>
- </div>
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
+ <div class="xialapb">
+ <div class="xialapr">500</div>
+ <div class="xialapr">1000</div>
+ <div class="xialapr">2000</div>
+ <div class="xialapr">3000</div>
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
+
</td>
<td>
<select name="bindingMode" id="bindingMode">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.cs
index ac6e088..f5cde40 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
{
if (Request["PrintTypeId"] != null)
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.designer.cs
index d7924c1..a81ae26 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class Book {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class Book
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx
index fd0cc1f..b4786e2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx
@@ -74,6 +74,7 @@
</td>
<td align="center">
<input type="text" id="printCount" name="printCount" style="height:15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="5000" value="5000"/>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
</td>
</tr>
</tbody>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.cs
index db9148e..35c519d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
{
if (Request["PrintTypeId"] != null)
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.designer.cs
index 1151abf..e1e18e9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class Calendary {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class Calendary
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx
index a86bcb0..604f8af 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx
@@ -20,19 +20,19 @@
<th style="text-align: center;">
鍗板埛灏哄
</th>
- <th style="text-align: center;">
+ <th style="text-align: center;width:20%">
绾稿紶
</th>
<th style="text-align: center;" class="Brand0">
鍝佺墝
</th>
- <th style="text-align: center;" class="gramWeight0">
+ <th style="text-align: center;width:10%" class="gramWeight0">
鍏嬮噸
</th>
- <th style="text-align: center;">
+ <th style="text-align: center;width:250px">
鍗板埛鏁伴噺
</th>
- <th style="text-align: center;">
+ <th style="text-align: center;width:10%">
鍗曞弻闈�
</th>
</tr>
@@ -85,20 +85,29 @@
</select>
</td>
<td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
- <div class="xialapb">
- <div class="xialapr">500</div>
- <div class="xialapr">1000</div>
- <div class="xialapr">2000</div>
- <div class="xialapr">3000</div>
- <div class="xialapr">5000</div>
- <div class="xialapr">10000</div>
- <div class="xialapr">20000</div>
- <div class="xialapr">50000</div>
- <div class="xialapr">100000</div>
- </div>
- </div>
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
+ <div class="xialapb">
+ <div class="xialapr">500</div>
+ <div class="xialapr">1000</div>
+ <div class="xialapr">2000</div>
+ <div class="xialapr">3000</div>
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>
+ <div class="xialapr">20000</div>
+ <div class="xialapr">50000</div>
+ <div class="xialapr">100000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
</td>
<td>
<select class="selectLaber" name="singleOrdouble0">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx.cs
index d4cd526..7c4aa38 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
{
if (Request["PrintTypeId"] != null)
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx.designer.cs
index ee5e429..88b71f8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class DMInquiry {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class DMInquiry
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx
index 673c968..211497e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx
@@ -75,6 +75,7 @@
</td>
<td align="center">
<input type="text" id="printCount" name="printCount" style="height:15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="5000" value="5000"/>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
</td>
</tr>
</tbody>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.cs
index 748a3f4..36a1661 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
{
if (Request["PrintTypeId"] != null)
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.designer.cs
index 9030c8d..b15dfa2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class DeskCalendar {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class DeskCalendar
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx
index a3713fe..3b7ba89 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx
@@ -77,17 +77,27 @@
</select>
</td>
<td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
- <div class="xialapb">
- <div class="xialapr">500</div>
- <div class="xialapr">1000</div>
- <div class="xialapr">2000</div>
- <div class="xialapr">3000</div>
- <div class="xialapr">5000</div>
- <div class="xialapr">10000</div>
- </div>
- </div>
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
+ <div class="xialapb">
+ <div class="xialapr">500</div>
+ <div class="xialapr">1000</div>
+ <div class="xialapr">2000</div>
+ <div class="xialapr">3000</div>
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
</td>
<td>
<select class="selectLaber" name="printColor0">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.cs
index c3c526b..0644c9b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
{
if (Request["PrintTypeId"] != null)
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.designer.cs
index d46065c..f46b55a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class Envelop {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class Envelop
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index fce0e17..d674ee0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -136,6 +136,7 @@
int bindingMode = -1;
string gildingType = string.Empty;
string laFeng = string.Empty;
+ int ysuint = 1;
if (request["hidPrintTypeId"] != null)
printTypeId = request["hidPrintTypeId"].ToString().ToInt32().Value;
if (request["printMode"] != null)
@@ -224,6 +225,10 @@
gildingType = request["gildingType0"].ToString();
if (request["LaFeng"] != null)
laFeng = request["LaFeng"].ToString();
+
+ if (request["ysUnit"] != null)
+ ysuint = request["ysUnit"].ToString().ToInt32().Value;
+
model.PrintTypeId = printTypeId;
model.PrintMode = printMode;
model.PrintSizeId = sizeId;
@@ -231,6 +236,7 @@
model.GramWeight = gramWeight;
model.BrandId = brandId;
model.PrintCount = printCount;
+ model.Unit = ysuint;
model.SingleOrdouble = singleOrdouble;
if (!string.IsNullOrEmpty(works))
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx
index e08ca1b..d7813a0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx
@@ -104,6 +104,7 @@
</td>
<td align="center">
<input type="text" id="printCount" name="printCount" style="height:15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="5000" value="5000"/>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
</td>
</tr>
</tbody>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs
index c2c8cbb..629d311 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
{
if (Request["PrintTypeId"] != null)
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.designer.cs
index 6c74a56..48cb545 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class NewsPaper {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class NewsPaper
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx
index 22d1433..c23cf1f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx
@@ -69,16 +69,26 @@
</select>
</td>
<td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
- <div class="xialapb">
- <div class="xialapr">100</div>
- <div class="xialapr">200</div>
- <div class="xialapr">300</div>
- <div class="xialapr">500</div>
- <div class="xialapr">1000</div>
- </div>
- </div>
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
+ <div class="xialapb">
+ <div class="xialapr">100</div>
+ <div class="xialapr">200</div>
+ <div class="xialapr">300</div>
+ <div class="xialapr">500</div>
+ <div class="xialapr">1000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
</td>
<td>
<input type="text" name="pageNum" style="width:60px" class="validateInt" defaultValue="1" value="1"/>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.cs
index 1f9d6a7..5cef432 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
{
if (Request["PrintTypeId"] != null)
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.designer.cs
index 48d5be0..be4fac2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class Note {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class Note
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx
index 1dac4c9..c90ad2a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx
@@ -27,6 +27,7 @@
</td>
<td align="left">
<input type="text" id="printCount" name="printCount" runat="server" class="validateInt textinput" value="5000" />
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
</td>
</tr>
<tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx.cs
index 82edc44..57405e9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -14,12 +15,18 @@
get;
set;
}
+
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
if (Request["PrintTypeId"] != null)
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx.designer.cs
index d4f4661..8def2f4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class OtherType {
-
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class OtherType
+ {
+
/// <summary>
/// printSizeName 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText printSizeName;
-
+
/// <summary>
/// printCount 鎺т欢銆�
/// </summary>
@@ -29,7 +31,16 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText printCount;
-
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
+
/// <summary>
/// txtPrintDemand 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx
index c97c95c..ebc7ab3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx
@@ -71,17 +71,27 @@
</select>
</td>
<td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
- <div class="xialapb">
- <div class="xialapr">500</div>
- <div class="xialapr">1000</div>
- <div class="xialapr">2000</div>
- <div class="xialapr">3000</div>
- <div class="xialapr">5000</div>
- <div class="xialapr">10000</div>
- </div>
- </div>
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
+ <div class="xialapb">
+ <div class="xialapr">500</div>
+ <div class="xialapr">1000</div>
+ <div class="xialapr">2000</div>
+ <div class="xialapr">3000</div>
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
</td>
</tr>
</tbody>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.cs
index 65d7c2e..ec5420c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
{
if (Request["PrintTypeId"] != null)
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.designer.cs
index 5ee45e9..acba297 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class Packet {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class Packet
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
index 8e0af7e..8799e6b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
@@ -29,17 +29,27 @@
</span>
</td>
<td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
- <div class="xialapb">
- <div class="xialapr">500</div>
- <div class="xialapr">1000</div>
- <div class="xialapr">2000</div>
- <div class="xialapr">3000</div>
- <div class="xialapr">5000</div>
- <div class="xialapr">10000</div>
- </div>
- </div>
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
+ <div class="xialapb">
+ <div class="xialapr">500</div>
+ <div class="xialapr">1000</div>
+ <div class="xialapr">2000</div>
+ <div class="xialapr">3000</div>
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
</td>
<td>
<select name="bindingMode" id="bindingMode">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.cs
index 5463b6b..ad2ca7a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
{
if (Request["PrintTypeId"] != null)
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.designer.cs
index d4e85b0..95aaf7e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class PictureAlbumNew {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class PictureAlbumNew
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
index af712ac..e0d981a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
@@ -89,16 +89,26 @@
</select>
</td>
<td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
- <div class="xialapb">
- <div class="xialapr">100</div>
- <div class="xialapr">200</div>
- <div class="xialapr">300</div>
- <div class="xialapr">500</div>
- <div class="xialapr">1000</div>
- </div>
- </div>
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
+ <div class="xialapb">
+ <div class="xialapr">100</div>
+ <div class="xialapr">200</div>
+ <div class="xialapr">300</div>
+ <div class="xialapr">500</div>
+ <div class="xialapr">1000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
</td>
<td align="center" class="fsByre">
<div class="xialap">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.cs
index 5a537b4..86e5085 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -10,11 +11,18 @@
public partial class ReceiptDocument : System.Web.UI.Page
{
public int PrintTypeId { get; set; }
+
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
- PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+ if (Request["PrintTypeId"] != null)
+ PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.designer.cs
index bf12e34..6800ed1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class ReceiptDocument {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class ReceiptDocument
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx
index 9d40e64..6f7618e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx
@@ -26,12 +26,10 @@
<th style="text-align: center;" class="Brand0">
鍝佺墝
</th>
- <th style="text-align: center;" class="gramWeight0">
+ <th style="text-align: center;" class="gramWeight0">
鍏嬮噸
</th>
- <th style="text-align: center;">
- 鍗板埛鏁伴噺
- </th>
+ <th>鍗板埛鏁伴噺</th>
</tr>
<tr>
<td>
@@ -70,18 +68,27 @@
<select class="selectLaber" id="gramWeight0" name="gramWeight0">
</select>
</td>
- <td>
- <div class="xialap" style="display: inline-block;">
- <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
- <div class="xialapb">
- <div class="xialapr">500</div>
- <div class="xialapr">1000</div>
- <div class="xialapr">2000</div>
- <div class="xialapr">3000</div>
- <div class="xialapr">5000</div>
- <div class="xialapr">10000</div>
- </div>
- </div>
+ <td >
+ <table>
+ <tr>
+ <td>
+ <div class="xialap" style="display: inline-block;">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
+ <div class="xialapb">
+ <div class="xialapr">500</div>
+ <div class="xialapr">1000</div>
+ <div class="xialapr">2000</div>
+ <div class="xialapr">3000</div>
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
</td>
</tr>
</tbody>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.cs
index 5bc3396..41d22ab 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
{
if (Request["PrintTypeId"] != null)
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.designer.cs
index 1b2c882..7bb42eb 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class Reticule {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class Reticule
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx
index 9b177a7..3314bc6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx
@@ -31,15 +31,25 @@
</select>
</td>
<td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="5000" value="5000"/>
- <div class="xialapb">
- <div class="xialapr">5000</div>
- <div class="xialapr">10000</div>
- <div class="xialapr">20000</div>
- <div class="xialapr">50000</div>
- </div>
- </div>
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="5000" value="5000"/>
+ <div class="xialapb">
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>
+ <div class="xialapr">20000</div>
+ <div class="xialapr">50000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
</td>
<td>
<select class="selectLaber" id="pRoomCard" name="paper0">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.cs
index caae056..73a787c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
{
if (Request["PrintTypeId"] != null)
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.designer.cs
index 85d26c0..44b3cf1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class RoomCard {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class RoomCard
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
index 65bea0d..a4ffe73 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -253,6 +253,7 @@
if (dataJson.PrintTypeId == "-1" || dataJson.PrintTypeId == -1) {
$("[name='printSizeName']").val(dataJson.PrintSizeName);
$("[name='printCount']").val(dataJson.PrintCount);
+ $("[name='ysUnit']").val(dataJson.Unit);
$("[name='txtPrintDemand']").val(dataJson.PrintDemand);
} else {
BindControlByPrintType(dataJson);
@@ -1215,6 +1216,7 @@
}
$("[name='gramWeight0']").val(dataJson.GramWeight);
$("#printCount").val(dataJson.PrintCount);
+ $("[name='ysUnit']").val(dataJson.Unit);
$("[name='RopeTypeName']").val(dataJson.RopeTypeName);
$("[name='RopeColor']").val(dataJson.RopeColor);
$("[name='printColor0']").val(dataJson.PrintColor);
diff --git a/CY_ECommercePlatform/CY.WebForm/js/anonymous/RegisterVerify.js b/CY_ECommercePlatform/CY.WebForm/js/anonymous/RegisterVerify.js
index 931b849..8a9a5ac 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/anonymous/RegisterVerify.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/anonymous/RegisterVerify.js
@@ -113,12 +113,17 @@
$("#GetVerifyCode").attr("disabled", "disabled");
$("#GetVerifyCode").css("color", "#AAAAAA");
return false;
- } else {
- if ($(obj).val() == $(obj).attr("editemail")) {
+ }
+ else
+ {
+ if ($(obj).val() == $(obj).attr("editemail"))
+ {
set_flag_verify(obj, msg, tips, true);
$("#GetVerifyCode").removeAttr("disabled");
$("#GetVerifyCode").css("color", "#AAAAAA");
- } else {
+ }
+ else
+ {
window.IsNoRepeat = undefined;
$.ajax({
url: '/Pages/common/CommonAjax.aspx',
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Custom.js b/CY_ECommercePlatform/CY.WebForm/js/business/Custom.js
index 0fb86b0..5316152 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Custom.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Custom.js
@@ -81,7 +81,7 @@
function verify_customcompany(obj, msg, tips) {
var v_len = $(obj).val().length;
if (v_len < 2 || v_len > 30) {
- set_flag_verify(obj, "闀垮害涓�2-20浣嶅瓧绗�", tips, false);
+ set_flag_verify(obj, "闀垮害涓�2-30浣嶅瓧绗�", tips, false);
return false;
} else {
$.ajax({
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index a026060..8cf007d 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -418,7 +418,9 @@
function printTypeChange(sel) {
showWait();
var OldOrderId = document.getElementById('txtKeyid').value;
- if (sel.value == -1 || sel.value == "-1") {//鍏朵粬绫诲瀷
+ if (sel.value == -1 || sel.value == "-1")
+ {
+ //鍏朵粬绫诲瀷
$("#hidOrderId").val(OldOrderId);
$("#divInquiry").load("/Pages/front/OtherType.aspx", { "PrintTypeId": "-1" });
setTimeout(function () {
@@ -428,10 +430,14 @@
}, 1000);
window.hideWaitDiv = window.parent.parent.parent.parent.parent.parent.hideWaitDiv;
- if (window.hideWaitDiv) window.hideWaitDiv();
- } else {
+ if (window.hideWaitDiv)
+ window.hideWaitDiv();
+ }
+ else
+ {
DelayLoadPrintType(sel.value, '1', OldOrderId, 'order');
}
+
document.getElementById('hidPrintTypeId').value = sel.value;
if ($("#txtKeyid").val() == "0") {
//document.getElementById('txtDocumentName').value = sel.value ? sel.options[sel.selectedIndex].text : '';
@@ -439,9 +445,9 @@
if (sel.value == 6) {
document.getElementById('trbook').style.display = '';
var sselCustormer = document.getElementById('selCustormer').value;
- if (sselCustormer != null && sselCustormer != '') {
+ if (sselCustormer != null && sselCustormer != '')
+ {
-
//CallServer({ Target: "getPrintAsk", id: sselCustormer }, function (data, textStatus) {
// alert(sselCustormer);
// var jobj = false;
diff --git a/CY_ECommercePlatform/CY.WebForm/js/common/Printter.js b/CY_ECommercePlatform/CY.WebForm/js/common/Printter.js
index d4da229..f5d1d7b 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/common/Printter.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/common/Printter.js
@@ -110,7 +110,7 @@
if ($("#div_tool").attr("issideways") == "true") {
- LODOP.ADD_PRINT_TABLE(30, 30, "95%", "89%", $(document.documentElement).html());
+ LODOP.ADD_PRINT_TABLE(30, 30, "95%", "90%", $(document.documentElement).html());
LODOP.SET_SHOW_MODE("LANDSCAPE_DEFROTATED", 1);
} else if ($("#div_tool").attr("issideways") == "printinfo") {
var Oldhtml = "";
diff --git a/CY_ECommercePlatform/CY_ValidaterHttpModule/CY_ValidaterHttpModule.csproj.user b/CY_ECommercePlatform/CY_ValidaterHttpModule/CY_ValidaterHttpModule.csproj.user
index 9b86104..c10e84b 100644
--- a/CY_ECommercePlatform/CY_ValidaterHttpModule/CY_ValidaterHttpModule.csproj.user
+++ b/CY_ECommercePlatform/CY_ValidaterHttpModule/CY_ValidaterHttpModule.csproj.user
@@ -1,6 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CyinOrderWebService/CY.WebService.csproj.user b/CY_ECommercePlatform/CyinOrderWebService/CY.WebService.csproj.user
index 97a088f..f79a8fe 100644
--- a/CY_ECommercePlatform/CyinOrderWebService/CY.WebService.csproj.user
+++ b/CY_ECommercePlatform/CyinOrderWebService/CY.WebService.csproj.user
@@ -9,6 +9,6 @@
<ErrorReportUrlHistory />
<FallbackCulture>zh-CN</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CyinOrderWebService/app.config b/CY_ECommercePlatform/CyinOrderWebService/app.config
index bb1c95c..17c84af 100644
--- a/CY_ECommercePlatform/CyinOrderWebService/app.config
+++ b/CY_ECommercePlatform/CyinOrderWebService/app.config
@@ -93,7 +93,8 @@
</log4net>
<connectionStrings>
- <add name="SqlConnection" connectionString="Data Source=192.168.1.99\CYSQL;Initial Catalog=PrintECTest;User ID=sa;Password=cysql2008" providerName="System.Data.SqlClient" />
+ <!--<add name="SqlConnection" connectionString="Data Source=192.168.1.99\CYSQL;Initial Catalog=PrintECTest;User ID=sa;Password=cysql2008" providerName="System.Data.SqlClient" />-->
+ <add name="SqlConnection" connectionString="Data Source=.;Initial Catalog=ECTest;User ID=sa;Password=123456" providerName="System.Data.SqlClient" />
</connectionStrings>
<appSettings>
<!--闂撮殧鏃堕棿-->
diff --git a/CY_ECommercePlatform/ServiceTest/ServiceTest.csproj.user b/CY_ECommercePlatform/ServiceTest/ServiceTest.csproj.user
index 9b86104..c10e84b 100644
--- a/CY_ECommercePlatform/ServiceTest/ServiceTest.csproj.user
+++ b/CY_ECommercePlatform/ServiceTest/ServiceTest.csproj.user
@@ -1,6 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1