From 632aca9c1a73cd278e091b827e8491ada9a1aab4 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期一, 13 九月 2021 15:01:53 +0800
Subject: [PATCH] 开票申请显示备注 开票状态修改
---
CY_ECommercePlatform/CY.BLL/CY.BLL.csproj | 15 --
CY_ECommercePlatform/CY.WebForm/CacheFiles/QuoteDemand.txt | 2
CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs | 5
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj.user | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApplyPrint.aspx | 42 +++-----
CY_ECommercePlatform/ServiceTest/ServiceTest.csproj.user | 2
CY_ECommercePlatform/CY.Infrastructure/CY.Infrastructure.csproj.user | 2
CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs | 6 -
CY_ECommercePlatform/UploadFiles/UploadFiles.csproj.user | 7 +
CY_ECommercePlatform/.vs/CY_ECommercePlatform/v16/.suo | 0
CY_ECommercePlatform/CY.Application/CY.Application.csproj | 14 --
CY_ECommercePlatform/.vs/CY_ECommercePlatform/config/applicationhost.config | 4
CY_ECommercePlatform/CY.BLL/CY.BLL.csproj.user | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx | 44 +++-----
CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx.cs | 9 +
CY_ECommercePlatform/CY.Application/CY.Application.csproj.user | 2
CY_ECommercePlatform/CY_ValidaterHttpModule/CY_ValidaterHttpModule.csproj.user | 2
CY_ECommercePlatform/CyinOrderWebService/CY.WebService.csproj.user | 2
CY_ECommercePlatform/CY.WebForm/CacheFiles/SeckillBusiness.txt | 2
CY_ECommercePlatform/CyinOrderWebService/app.config | 3
CY_ECommercePlatform/CY.Config/CY.Config.csproj.user | 2
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 9 +
CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaoshenqing.cs | 10 +
CY_ECommercePlatform/UploadFiles/UploadFiles.csproj | 11 +
CY_ECommercePlatform/AbstractFactory/AbstractFactory.csproj.user | 2
CY_ECommercePlatform/AbstractFactory/AbstractFactory.csproj | 37 -------
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx | 28 ++++-
CY_ECommercePlatform/CY.WebForm/js/common/Printter.js | 2
CY_ECommercePlatform/CY.IBaseDAL/CY.IBaseDAL.csproj.user | 2
30 files changed, 116 insertions(+), 156 deletions(-)
diff --git a/CY_ECommercePlatform/.vs/CY_ECommercePlatform/config/applicationhost.config b/CY_ECommercePlatform/.vs/CY_ECommercePlatform/config/applicationhost.config
index 0356e2f..a4de06d 100644
--- a/CY_ECommercePlatform/.vs/CY_ECommercePlatform/config/applicationhost.config
+++ b/CY_ECommercePlatform/.vs/CY_ECommercePlatform/config/applicationhost.config
@@ -162,7 +162,7 @@
</site>
<site name="CY.WebForm" id="2">
<application path="/" applicationPool="Clr4ClassicAppPool">
- <virtualDirectory path="/" physicalPath="D:\chuanyin-group-project\CY_ECommercePlatform\CY.WebForm" />
+ <virtualDirectory path="/" physicalPath="D:\qianwj\chuanyin-group-project\CY_ECommercePlatform\CY.WebForm" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:8888:localhost" />
@@ -170,7 +170,7 @@
</site>
<site name="UploadFiles" id="3">
<application path="/" applicationPool="Clr4IntegratedAppPool">
- <virtualDirectory path="/" physicalPath="D:\chuanyin-group-project\CY_ECommercePlatform\UploadFiles" />
+ <virtualDirectory path="/" physicalPath="D:\qianwj\chuanyin-group-project\CY_ECommercePlatform\UploadFiles" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:51112:localhost" />
diff --git a/CY_ECommercePlatform/.vs/CY_ECommercePlatform/v16/.suo b/CY_ECommercePlatform/.vs/CY_ECommercePlatform/v16/.suo
index f807ea4..349e32d 100644
--- a/CY_ECommercePlatform/.vs/CY_ECommercePlatform/v16/.suo
+++ b/CY_ECommercePlatform/.vs/CY_ECommercePlatform/v16/.suo
Binary files differ
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 64a7420..41f0e07 100644
--- a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
+++ b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
@@ -269,22 +269,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.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_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/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/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 af9bafd..65ca44d 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1886,6 +1886,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" />
@@ -3457,6 +3458,13 @@
</Compile>
<Compile Include="Pages\business\EvaluationBuyer.aspx.designer.cs">
<DependentUpon>EvaluationBuyer.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\kaipiaoConfirm.aspx.cs">
+ <DependentUpon>kaipiaoConfirm.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\kaipiaoConfirm.aspx.designer.cs">
+ <DependentUpon>kaipiaoConfirm.aspx</DependentUpon>
</Compile>
<Compile Include="Pages\business\EvaluationSeller.aspx.cs">
<DependentUpon>EvaluationSeller.aspx</DependentUpon>
@@ -8634,7 +8642,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..2015451 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 />
diff --git a/CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt b/CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt
index 4d68dfe..f3f003f 100644
--- a/CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt
+++ b/CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt
@@ -1 +1 @@
-2021-06-17 11:38:42
\ No newline at end of file
+2021-09-13 09:09:46
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/CacheFiles/QuoteDemand.txt b/CY_ECommercePlatform/CY.WebForm/CacheFiles/QuoteDemand.txt
index 4d68dfe..f3f003f 100644
--- a/CY_ECommercePlatform/CY.WebForm/CacheFiles/QuoteDemand.txt
+++ b/CY_ECommercePlatform/CY.WebForm/CacheFiles/QuoteDemand.txt
@@ -1 +1 @@
-2021-06-17 11:38:42
\ No newline at end of file
+2021-09-13 09:09:46
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/CacheFiles/SeckillBusiness.txt b/CY_ECommercePlatform/CY.WebForm/CacheFiles/SeckillBusiness.txt
index 4d68dfe..f3f003f 100644
--- a/CY_ECommercePlatform/CY.WebForm/CacheFiles/SeckillBusiness.txt
+++ b/CY_ECommercePlatform/CY.WebForm/CacheFiles/SeckillBusiness.txt
@@ -1 +1 @@
-2021-06-17 11:38:42
\ No newline at end of file
+2021-09-13 09:09:46
\ No newline at end of file
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/OrderListBatchOperation.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
index d616e43..662279a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
@@ -7,6 +7,12 @@
<uc:cmshead id="CMSHead1" runat="server" />
<script src="../../js/business/Order.js" 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 });
@@ -507,7 +513,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 +569,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) {
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
diff --git a/CY_ECommercePlatform/UploadFiles/UploadFiles.csproj b/CY_ECommercePlatform/UploadFiles/UploadFiles.csproj
index 8656873..0a9c766 100644
--- a/CY_ECommercePlatform/UploadFiles/UploadFiles.csproj
+++ b/CY_ECommercePlatform/UploadFiles/UploadFiles.csproj
@@ -14,6 +14,12 @@
<AssemblyName>UploadFiles</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<UseIISExpress>false</UseIISExpress>
+ <Use64BitIISExpress />
+ <IISExpressSSLPort />
+ <IISExpressAnonymousAuthentication />
+ <IISExpressWindowsAuthentication />
+ <IISExpressUseClassicPipelineMode />
+ <UseGlobalApplicationHostFile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -33,9 +39,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Brettle.Web.NeatUpload, Version=1.2.3610.4520, Culture=neutral">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\Brettle.Web.NeatUpload.dll</HintPath>
+ <Reference Include="Brettle.Web.NeatUpload">
+ <HintPath>..\CY.WebForm\DLL\Brettle.Web.NeatUpload.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
diff --git a/CY_ECommercePlatform/UploadFiles/UploadFiles.csproj.user b/CY_ECommercePlatform/UploadFiles/UploadFiles.csproj.user
index 0374c69..41ac623 100644
--- a/CY_ECommercePlatform/UploadFiles/UploadFiles.csproj.user
+++ b/CY_ECommercePlatform/UploadFiles/UploadFiles.csproj.user
@@ -3,6 +3,13 @@
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<ProjectView>ProjectFiles</ProjectView>
+ <UseIISExpress>false</UseIISExpress>
+ <Use64BitIISExpress />
+ <IISExpressSSLPort />
+ <IISExpressAnonymousAuthentication />
+ <IISExpressWindowsAuthentication />
+ <IISExpressUseClassicPipelineMode />
+ <UseGlobalApplicationHostFile />
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
--
Gitblit v1.9.1