From 7992fcc44d231e823736fd36483bf990a28b0536 Mon Sep 17 00:00:00 2001
From: CB2-20200827ONU\Administrator <liaoxujun@qq.com>
Date: 星期五, 08 十月 2021 09:24:29 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project
---
CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt | 2
CY_ECommercePlatform/CY.WebForm/CacheFiles/QuoteDemand.txt | 2
CY_ECommercePlatform/CY.WebForm/Properties/PublishProfiles/FolderProfile.pubxml.user | 63 +
CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportPrint.aspx.designer.cs | 62 +
CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportList.aspx | 238 +++++++
数据库修改.sql | 0
CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportPrint.aspx | 158 ++++
CY_ECommercePlatform/CY.WebForm/CacheFiles/SeckillBusiness.txt | 2
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs | 70 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportList.aspx.designer.cs | 134 ++++
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs | 10
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 24
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs | 2
CY_ECommercePlatform/.vs/CY_ECommercePlatform/v16/.suo | 0
CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportPrint.aspx.cs | 199 ++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReprotKehu.aspx | 204 ++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReprotKehu.aspx.designer.cs | 44 +
CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs | 58 +
开票修改.sql | 16
CY_ECommercePlatform/CY.WebForm/Web.config | 8
CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportList.aspx.cs | 294 +++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReprotKehu.aspx.cs | 306 +++++++++
CY_ECommercePlatform/.vs/CY_ECommercePlatform/config/applicationhost.config | 4
23 files changed, 1,859 insertions(+), 41 deletions(-)
diff --git a/CY_ECommercePlatform/.vs/CY_ECommercePlatform/config/applicationhost.config b/CY_ECommercePlatform/.vs/CY_ECommercePlatform/config/applicationhost.config
index 087d812..c5dbd90 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="E:\workdir\chuanyin\CY_ECommercePlatform\CY.WebForm" />
+ <virtualDirectory path="/" physicalPath="D:\chuanyin-group-project-git\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="E:\workdir\chuanyin\CY_ECommercePlatform\UploadFiles" />
+ <virtualDirectory path="/" physicalPath="D:\chuanyin-group-project-git\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 d9ea89f..a989fff 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/CY.BLL/EC/EC_OrderBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs
index c120241..a021731 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs
@@ -339,5 +339,15 @@
{
return _iEC_OrderDAL.GetxiaoshouyejiList(pagination, FirmId, BusinessManagerId, chaxuntime);
}
+
+
+ /// <summary>
+ /// 鑾峰彇涓氱哗鏌ヨ
+ /// </summary>
+ /// <returns></returns>
+ public IEnumerable<OA_DeliverPlan> GetyewurenportList(Infrastructure.Query.Pagination pagination, Guid FirmId, string BusinessManagerId, string chaxuntimestart, string chaxuntimeend)
+ {
+ return _iEC_OrderDAL.GetyewurenportList(pagination, FirmId, BusinessManagerId, chaxuntimestart, chaxuntimeend);
+ }
}
}
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs
index ad53fd1..af42034 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs
@@ -178,5 +178,7 @@
IEnumerable<OA_DeliverPlan> GetxiaoshouyejiList(Infrastructure.Query.Pagination pagination, Guid FirmId, string BusinessManagerId, string chaxuntime);
+
+ IEnumerable<OA_DeliverPlan> GetyewurenportList(Infrastructure.Query.Pagination pagination, Guid FirmId, string BusinessManagerId, string chaxuntimestart, string chaxuntimeend);
}
}
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
index fea6baf..40a4952 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
@@ -271,6 +271,42 @@
}
/// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public DateTime? chaxuntimestart
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public DateTime? chaxuntimeend
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 鍥炴瀹㈡埛
+ /// </summary>
+ public decimal? huikuankehu
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 鏈洖娆惧鎴�
+ /// </summary>
+ public decimal? weihuikuankehu
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
/// 鏈粯娆�
/// </summary>
public decimal UnPayedMoney
@@ -654,9 +690,27 @@
this.chaxuntime = isChange ? MyConvert.ConvertToDateTime(value) : chaxuntime;
theValue = this.chaxuntime;
}
+ else if ("chaxuntimestart".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 49)
+ {
+ this.chaxuntimestart = isChange ? MyConvert.ConvertToDateTime(value) : chaxuntimestart;
+ theValue = this.chaxuntimestart;
+ }
+ else if ("chaxuntimeend".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 50)
+ {
+ this.chaxuntimeend = isChange ? MyConvert.ConvertToDateTime(value) : chaxuntimeend;
+ theValue = this.chaxuntimeend;
+ }
+ else if ("huikuankehu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 51)
+ {
+ this.huikuankehu = isChange ? MyConvert.ConvertToDecimal(value) : huikuankehu;
+ theValue = this.huikuankehu;
+ }
+ else if ("weihuikuankehu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 52)
+ {
+ this.weihuikuankehu = isChange ? MyConvert.ConvertToDecimal(value) : weihuikuankehu;
+ theValue = this.weihuikuankehu;
+ }
-
-
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
index a7c47f2..f2ddddf 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
@@ -1369,5 +1369,75 @@
return null == result ? null : result;//杩斿洖缁撴灉
}
+
+
+ /// <summary>
+ /// 鑾峰彇涓氬姟缁忕悊涓氱哗
+ /// </summary>
+ /// <returns></returns>
+
+ public IEnumerable<OA_DeliverPlan> GetyewurenportList(Infrastructure.Query.Pagination pagination, Guid FirmId, string BusinessManagerId, string chaxuntimestart, string chaxuntimeend)
+ {
+ string selectTarget = " t.* ";
+ string where = " and os.[FirmId] ='" + FirmId + "'";
+
+ if (!string.IsNullOrEmpty(BusinessManagerId))
+ {
+ where += " and os.Keyid='" + BusinessManagerId + "'";
+ }
+
+ string fromSouce = "( ";
+
+ fromSouce += " select os.DepartmentId,os.[Name] as BusinessManager ,os.[Keyid] as BusinessManagerId, os.FirmId,gendan.gendanshuliang,xinzeng.xinzengshuliang,wanjie.wanjieshuliang,xiadan.xiadanshuliang,ob.shuliang,ob.SumPrice,ob.PayedMoney,eob.kaipiaojine,huifang.huifangshuliang ,'" + chaxuntimestart + "' as chaxuntimestart ,'" + chaxuntimeend + "' as chaxuntimeend ,obhuikuan.huikuankehu,obweihuikuan.weihuikuankehu ";
+ fromSouce += " from [OA_Staff] os ";
+ fromSouce += " left join ( select COUNT(*) gendanshuliang ,oc.BusinessManagerId from OA_CorporateClients oc where ( oc.Shifouwanjie is null or oc.Shifouwanjie=2 ) and DATEDIFF(DAY,oc.CreateTime,'" + chaxuntimestart + "') <=0 and DATEDIFF(DAY,oc.CreateTime,'" + chaxuntimeend + "') >=0 group by oc.BusinessManagerId ) gendan on gendan.BusinessManagerId = os.Keyid ";
+ fromSouce += " left join ( select COUNT(*) xinzengshuliang ,oc.BusinessManagerId from OA_CorporateClients oc where DATEDIFF(DAY,oc.CreateTime,'" + chaxuntimestart + "') <=0 and DATEDIFF(DAY,oc.CreateTime,'" + chaxuntimeend + "') >=0 group by oc.BusinessManagerId ) xinzeng on xinzeng.BusinessManagerId = os.Keyid ";
+ fromSouce += " left join ( select COUNT(*) wanjieshuliang ,oc.BusinessManagerId from OA_CorporateClients oc where oc.Shifouwanjie=1 and DATEDIFF(DAY,oc.[LastUpdateTime],'" + chaxuntimestart + "') <=0 and DATEDIFF(DAY,oc.[LastUpdateTime],'" + chaxuntimeend + "') >=0 group by oc.BusinessManagerId ) wanjie on wanjie.BusinessManagerId = os.Keyid ";
+ fromSouce += " left join ( select COUNT( distinct oc.Keyid) xiadanshuliang ,oc.BusinessManagerId from OA_CorporateClients oc Inner Join EC_OrderBasic ob On oc.Keyid=ob.[BuyerId] where DATEDIFF(DAY,ob.CreateTime,'" + chaxuntimestart + "') <=0 and DATEDIFF(DAY,ob.CreateTime,'" + chaxuntimeend + "') >=0 group by oc.BusinessManagerId ) xiadan on xiadan.BusinessManagerId = os.Keyid ";
+ fromSouce += " left join ( select COUNT(*) huifangshuliang,occ.Creater as BusinessManagerId from OA_CorporateClientsVisit occ where DATEDIFF(DAY,occ.[VisitTime],'" + chaxuntimestart + "') <=0 and DATEDIFF(DAY,occ.[VisitTime],'" + chaxuntimeend + "') >=0 group by occ.Creater ) huifang on huifang.BusinessManagerId = os.MemberId ";
+ fromSouce += " left join ( select oc.BusinessManagerId,sum(ob.SumPrice) SumPrice,sum(ts.PayedMoney) PayedMoney ,COUNT(*) as shuliang ";
+ fromSouce += " from EC_OrderBasic ob ";
+ fromSouce += " Inner Join EC_OrderExtend as oe On(ob.Keyid=oe.Keyid) ";
+ fromSouce += " Inner Join Pay_TradingSingle as ts On(ob.Keyid = ts.OrderId) ";
+ fromSouce += " Inner Join OA_CorporateClients as oc On(ob.BuyerId = oc.Keyid) ";
+ fromSouce += " left join EC_AwbInfo ea on ob.Keyid = ea.Keyid where DATEDIFF(DAY,ob.CreateTime,'" + chaxuntimestart + "') <=0 and DATEDIFF(DAY,ob.CreateTime,'" + chaxuntimeend + "') >=0 ";
+ fromSouce += " group by oc.BusinessManagerId ) ob on os.Keyid = ob.BusinessManagerId ";
+
+ fromSouce += " left join ( select oc.BusinessManagerId ,COUNT( distinct ob.BuyerId ) as huikuankehu ";
+ fromSouce += " from EC_OrderBasic ob ";
+ fromSouce += " Inner Join EC_OrderExtend as oe On(ob.Keyid=oe.Keyid) ";
+ fromSouce += " Inner Join Pay_TradingSingle as ts On(ob.Keyid = ts.OrderId) ";
+ fromSouce += " Inner Join OA_CorporateClients as oc On(ob.BuyerId = oc.Keyid) ";
+ fromSouce += " left join EC_AwbInfo ea on ob.Keyid = ea.Keyid where DATEDIFF(DAY,ob.CreateTime,'" + chaxuntimestart + "') <=0 and DATEDIFF(DAY,ob.CreateTime,'" + chaxuntimeend + "') >=0 and ob.PayState = -1 ";
+ fromSouce += " group by oc.BusinessManagerId ) obhuikuan on os.Keyid = obhuikuan.BusinessManagerId ";
+
+
+ fromSouce += " left join ( select oc.BusinessManagerId ,COUNT( distinct ob.BuyerId ) as weihuikuankehu ";
+ fromSouce += " from EC_OrderBasic ob ";
+ fromSouce += " Inner Join EC_OrderExtend as oe On(ob.Keyid=oe.Keyid) ";
+ fromSouce += " Inner Join Pay_TradingSingle as ts On(ob.Keyid = ts.OrderId) ";
+ fromSouce += " Inner Join OA_CorporateClients as oc On(ob.BuyerId = oc.Keyid) ";
+ fromSouce += " left join EC_AwbInfo ea on ob.Keyid = ea.Keyid where DATEDIFF(DAY,ob.CreateTime,'" + chaxuntimestart + "') <=0 and DATEDIFF(DAY,ob.CreateTime,'" + chaxuntimeend + "') >=0 and ob.PayState != -1 ";
+ fromSouce += " group by oc.BusinessManagerId ) obweihuikuan on os.Keyid = obweihuikuan.BusinessManagerId ";
+
+
+ fromSouce += " left join ( select oc.BusinessManagerId,sum(ob.SumPrice) kaipiaojine ";
+ fromSouce += " from EC_OrderBasic ob ";
+ fromSouce += " Inner Join EC_OrderExtend as oe On(ob.Keyid=oe.Keyid) ";
+ fromSouce += " Inner Join OA_CorporateClients as oc On(ob.BuyerId = oc.Keyid) ";
+ fromSouce += " left join EC_AwbInfo ea on ob.Keyid = ea.Keyid ";
+ fromSouce += " left join OA_Kaipiaoshenqing ks on ks.Keyid = oe.KaipiaoshenqingId ";
+ fromSouce += " where ks.Kaipiaoshenqing = 3 and DATEDIFF(DAY,ob.CreateTime,'" + chaxuntimestart + "') <=0 and DATEDIFF(DAY,ob.CreateTime,'" + chaxuntimeend + "') >=0 ";
+ fromSouce += " group by oc.BusinessManagerId ) eob on os.Keyid = eob.BusinessManagerId ";
+ fromSouce += " where os.Status='鍦ㄨ亴' And IsBusinessManager='true' " + where;
+
+
+ fromSouce += " )as t ";
+
+ var result = _dataBase.SelectModelPage<Model.OA_DeliverPlan>(pagination, selectTarget, fromSouce, " DepartmentId ASC");//鎵ц鏌ヨ
+ return null == result ? null : result;//杩斿洖缁撴灉
+ }
+
+
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index b273fc9..8f89351 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1992,6 +1992,9 @@
<Content Include="Pages\business\xiaoshouyejiKehu.aspx" />
<Content Include="Pages\business\xiaoshouyejiList.aspx" />
<Content Include="Pages\business\xiaoshouyejiPrint.aspx" />
+ <Content Include="Pages\business\xiaoshouyejiReportList.aspx" />
+ <Content Include="Pages\business\xiaoshouyejiReportPrint.aspx" />
+ <Content Include="Pages\business\xiaoshouyejiReprotKehu.aspx" />
<Content Include="Pages\business\xiaoshouyejiVisit.aspx" />
<Content Include="Pages\business\YujihuikuanTimeEdit.aspx" />
<Content Include="Pages\common\CMSMergerOrder.ascx" />
@@ -4132,6 +4135,27 @@
<Compile Include="Pages\business\xiaoshouyejiPrint.aspx.designer.cs">
<DependentUpon>xiaoshouyejiPrint.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\xiaoshouyejiReportList.aspx.cs">
+ <DependentUpon>xiaoshouyejiReportList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\xiaoshouyejiReportList.aspx.designer.cs">
+ <DependentUpon>xiaoshouyejiReportList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\xiaoshouyejiReportPrint.aspx.cs">
+ <DependentUpon>xiaoshouyejiReportPrint.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\xiaoshouyejiReportPrint.aspx.designer.cs">
+ <DependentUpon>xiaoshouyejiReportPrint.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\xiaoshouyejiReprotKehu.aspx.cs">
+ <DependentUpon>xiaoshouyejiReprotKehu.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\xiaoshouyejiReprotKehu.aspx.designer.cs">
+ <DependentUpon>xiaoshouyejiReprotKehu.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\xiaoshouyejiVisit.aspx.cs">
<DependentUpon>xiaoshouyejiVisit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt b/CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt
index 79763a9..ca0b933 100644
--- a/CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt
+++ b/CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt
@@ -1 +1 @@
-2021-09-22 09:05:10
\ No newline at end of file
+2021-09-15 14:03:44
\ 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 79763a9..ca0b933 100644
--- a/CY_ECommercePlatform/CY.WebForm/CacheFiles/QuoteDemand.txt
+++ b/CY_ECommercePlatform/CY.WebForm/CacheFiles/QuoteDemand.txt
@@ -1 +1 @@
-2021-09-22 09:05:10
\ No newline at end of file
+2021-09-15 14:03:44
\ 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 79763a9..ca0b933 100644
--- a/CY_ECommercePlatform/CY.WebForm/CacheFiles/SeckillBusiness.txt
+++ b/CY_ECommercePlatform/CY.WebForm/CacheFiles/SeckillBusiness.txt
@@ -1 +1 @@
-2021-09-22 09:05:10
\ No newline at end of file
+2021-09-15 14:03:44
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportList.aspx
new file mode 100644
index 0000000..9d5f545
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportList.aspx
@@ -0,0 +1,238 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xiaoshouyejiReportList.aspx.cs" Inherits="CY.WebForm.Pages.business.xiaoshouyejiReportList" %>
+
+<!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">
+ <title>閿�鍞哗鏁堟煡璇�</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <style type="text/css">
+ .tableStyle th { padding: 1px; }
+ .tableStyle td { padding: 1px; }
+ </style>
+ <script type="text/javascript">
+ /*
+鎵撳嵃閫佽揣鍗�
+*/
+ function ToPrintdelev() {
+
+
+
+ var txtDeliveryTime = $("#txtDeliveryTime").val();
+ var selBusinessManagerId = $("#selBusinessManagerId").val();
+
+
+ // OpenWindowByUrl();
+ window.open('/Pages/business/xiaoshouyejiReportPrint.aspx?txtDeliveryTime=' + txtDeliveryTime + '&selBusinessManagerId=' + selBusinessManagerId, '', '');
+ }
+
+ //鏌ョ湅
+ function onViewWeihu(BusinessManagerId, chaxuntime) {
+ top.Dialog.open({ URL: "/Pages/business/xiaoshouyejiVisit.aspx?BusinessManagerId=" + BusinessManagerId + "&chaxuntime=" + chaxuntime, Title: "鏌ョ湅瀹㈡埛鍥炶璁板綍", Width: 900, Height: 750 });
+ }
+
+ //鏌ョ湅
+ function onViewgendankehu(BusinessManagerId, chaxuntime) {
+
+ top.Dialog.open({ URL: "/Pages/business/xiaoshouyejiKehu.aspx?BusinessManagerId=" + BusinessManagerId + "&chaxuntime=" + chaxuntime + "&leixing=gendan" , Title: "鏌ョ湅璺熷崟瀹㈡埛", Width: 1200, Height: 900 });
+ }
+
+ //鏌ョ湅
+ function onViewxinzengkehu(BusinessManagerId, chaxuntimestart, chaxuntimeend, leixing) {
+ top.Dialog.open({ URL: "/Pages/business/xiaoshouyejiReprotKehu.aspx?BusinessManagerId=" + BusinessManagerId + "&chaxuntimestart=" + chaxuntimestart + "&chaxuntimeend=" + chaxuntimeend + "&leixing=" + leixing, Title: "鏌ョ湅鏂板瀹㈡埛", Width: 1200, Height: 900 });
+ }
+
+ </script>
+ <script type="text/javascript">
+ $(function () {
+ $("#selOrderMoney").change(function () {
+ $("#txtOrderMoney").val("");
+ });
+ $("#selLastOrderTime").change(function () {
+ $("#txtLastOrderTime").val("");
+ });
+ });
+ </script>
+</head>
+<body>
+ <form id="form1" runat="server" class="form">
+ <div id="scrollContent">
+ <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false">
+ <table class="TableNewStyle" width="100%">
+ <tr>
+
+ <td colspan="6">
+ <%-- <select keepdefaultstyle='true' id='selDeliveryTime' runat="server" datatextfield="Name" datavaluefield="MeanValue">
+ <option value ="">鍏ㄩ儴</option>
+ <option value ="鏄庡ぉ" selected="selected"> </option>
+ <option value ="鍚庡ぉ"> </option>
+ <option value ="3澶�"> </option>
+ <option value ="4澶�"> </option>
+ <option value ="5澶�"> </option>
+ <option value ="6澶�"> </option>
+ <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" />
+ <asp:button id="Button4" text="鏈勾涓氱哗" runat="server" padding="0px" OnClick="btn_Search_Click4" />
+ <asp:button id="Button5" text="涓婂勾涓氱哗" runat="server" padding="0px" OnClick="btn_Search_Click5" />
+ <input type="hidden" runat="server" id="txtDeliveryTime" />
+ </td>
+
+
+ <td class="ali03 ">
+ 涓氬姟缁忕悊锛�
+ </td>
+ <td>
+ <select id="selBusinessManagerId" runat="server" keepdefaultstyle='true'>
+ <option value="">鍏ㄩ儴</option>
+ </select>
+ </td>
+ <td>
+ <asp:Button CssClass="button" ID="btn_Search" Text="鏌ヨ" runat="server" padding="0px" OnClick="btn_Search_Click" />
+ <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+ <input type="button" value='鎵撳嵃' onclick='ToPrintdelev();' />
+ </td>
+ </tr>
+
+
+
+ </table>
+ </div>
+
+ <div>
+ <asp:Repeater ID="RepClientList" runat="server">
+ <HeaderTemplate>
+ <table class="tableStyle" useclick="false" usecheckbox="true" sortmode="true" style="text-align: center;">
+ <tr>
+
+ <th style="text-align: center;">
+ 搴忓彿
+ </th>
+
+ <th style="text-align: center;">
+ 涓氬姟缁忕悊
+ </th>
+ <th style="text-align: center;">
+ 鏂板璁㈠崟
+ </th>
+ <th style="text-align: center;">
+ 浜у��
+ </th>
+ <th style="text-align: center;">
+ 鏂板瀹㈡埛
+ </th>
+ <th style="text-align: center;">
+ 瀹岀粨瀹㈡埛
+ </th>
+
+ <th style="text-align: center;">
+ 搴旀敹娆惧鎴�
+ </th>
+ <th style="text-align: center;">
+ 搴旀敹娆鹃噾棰�
+ </th>
+ <%-- <th style="text-align: center;">
+ 璺熷崟瀹㈡埛
+ </th>
+ --%>
+
+ <%-- <th style="text-align: center;">
+ 瀹㈡埛鍥炶
+ </th>--%>
+ <%-- <th style="text-align: center;">
+ 涓嬪崟瀹㈡埛
+ </th>--%>
+
+
+ <%-- <th style="text-align: center;">
+ 寮�绁ㄩ噾棰�
+ </th>--%>
+ <th style="text-align: center;">
+ 鍥炴瀹㈡埛
+ </th>
+ <th style="text-align: center;">
+ 鍥炴閲戦
+ </th>
+ <th style="text-align: center;">
+ 鏈洖娆惧鎴�
+ </th>
+ <th style="text-align: center;">
+ 鏈敹娆鹃噾棰�
+ </th>
+
+
+
+
+
+
+ </tr>
+ </HeaderTemplate>
+ <ItemTemplate>
+ <tr>
+
+ <td>
+ <%#Container.ItemIndex + (UCPager1.PageSize *( UCPager1.PageIndex-1)+1)%>
+ </td>
+ <td>
+
+ <%#Eval("BusinessManager")%>
+ </td>
+ <td>
+ <%#Eval("shuliang")%>
+ </td>
+ <td>
+ <%#Eval("SumPrice", "{0:F2}")%>
+ </td>
+ <td>
+ <a href='javascript:void(0)' onclick="onViewxinzengkehu('<%#Eval("BusinessManagerId")%>','<%#Eval("chaxuntimestart")%>','<%#Eval("chaxuntimeend")%>','xinzeng')"><%#Eval("xinzengshuliang")%></a>
+
+ </td>
+ <td>
+ <%#Eval("wanjieshuliang")%>
+ </td>
+ <td>
+ <a href='javascript:void(0)' onclick="onViewxinzengkehu('<%#Eval("BusinessManagerId")%>','<%#Eval("chaxuntimestart")%>','<%#Eval("chaxuntimeend")%>','yingshoukuan')">
+ <%#Eval("xiadanshuliang")%>
+ </a>
+
+ </td>
+ <td>
+ <%#Eval("SumPrice", "{0:F2}")%>
+ </td>
+
+
+
+ <td>
+ <a href='javascript:void(0)' onclick="onViewxinzengkehu('<%#Eval("BusinessManagerId")%>','<%#Eval("chaxuntimestart")%>','<%#Eval("chaxuntimeend")%>','yishoukuan')">
+ <%#Eval("huikuankehu")%>
+ </a>
+ </td>
+ <td>
+ <%#Eval("PayedMoney", "{0:F2}")%>
+ </td>
+ <td>
+ <a href='javascript:void(0)' onclick="onViewxinzengkehu('<%#Eval("BusinessManagerId")%>','<%#Eval("chaxuntimestart")%>','<%#Eval("chaxuntimeend")%>','weishoukuan')">
+ <%#Eval("weihuikuankehu")%>
+ </a>
+
+ </td>
+ <td>
+ <%#Eval("UnPayedMoney", "{0:F2}")%>
+ </td>
+ </tr>
+ </ItemTemplate>
+ <FooterTemplate>
+ </table>
+ </FooterTemplate>
+ </asp:Repeater>
+ <div id="page">
+ <uc:UCPager ID="UCPager1" runat="server" />
+ </div>
+ </div>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportList.aspx.cs
new file mode 100644
index 0000000..97ba550
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportList.aspx.cs
@@ -0,0 +1,294 @@
+锘縰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 System.Drawing;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class xiaoshouyejiReportList : BasePage
+ {
+
+ EC_OrderBLL bll_EC_OrderBLL = null;
+
+ OA_StaffBLL bll_OA_StaffBLL = null;
+
+
+ //鍒濆鍖�
+ public xiaoshouyejiReportList()
+ {
+
+ bll_EC_OrderBLL = new EC_OrderBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+
+ }
+
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
+ if (!IsPostBack)
+ {
+ InitialSelectData();
+ BindList();
+
+ }
+ }
+
+ //鍔犺浇鏌ヨ鏉′欢
+ protected void InitialSelectData()
+ {
+ if (this.txtDeliveryTime.Value == "")
+ {
+ this.txtDeliveryTime.Value = "鏈懆涓氱哗";
+ }
+
+ //涓氬姟缁忕悊
+ this.selBusinessManagerId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, true, false);
+ this.selBusinessManagerId.DataTextField = "Name";
+ this.selBusinessManagerId.DataValueField = "Keyid";
+ this.selBusinessManagerId.DataBind();
+ this.selBusinessManagerId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+
+
+
+ }
+
+ //缁戝畾鍒楄〃
+ private void BindList()
+ {
+ if (this.txtDeliveryTime.Value == "")
+ {
+ this.txtDeliveryTime.Value = this.Button0.Text;
+ }
+
+ if (this.txtDeliveryTime.Value == this.Button0.Text)
+ {
+ this.Button0.BorderColor = Color.Black;
+ this.Button1.BorderColor = Color.LightBlue;
+ this.Button2.BorderColor = Color.LightBlue;
+ this.Button3.BorderColor = Color.LightBlue;
+ this.Button4.BorderColor = Color.LightBlue;
+ this.Button5.BorderColor = Color.LightBlue;
+
+
+ }
+ else if (this.txtDeliveryTime.Value == this.Button1.Text)
+ {
+ this.Button1.BorderColor = Color.Black;
+ this.Button2.BorderColor = Color.LightBlue;
+ this.Button3.BorderColor = Color.LightBlue;
+ this.Button4.BorderColor = Color.LightBlue;
+ this.Button5.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
+ }
+ else if (this.txtDeliveryTime.Value == this.Button2.Text)
+ {
+ this.Button2.BorderColor = Color.Black;
+ this.Button3.BorderColor = Color.LightBlue;
+ this.Button4.BorderColor = Color.LightBlue;
+ this.Button5.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
+ this.Button1.BorderColor = Color.LightBlue;
+ }
+ else if (this.txtDeliveryTime.Value == this.Button3.Text)
+ {
+ this.Button3.BorderColor = Color.Black;
+ this.Button4.BorderColor = Color.LightBlue;
+ this.Button5.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
+ this.Button1.BorderColor = Color.LightBlue;
+ this.Button2.BorderColor = Color.LightBlue;
+ }
+ else if (this.txtDeliveryTime.Value == this.Button4.Text)
+ {
+ this.Button4.BorderColor = Color.Black;
+ this.Button5.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
+ this.Button1.BorderColor = Color.LightBlue;
+ this.Button2.BorderColor = Color.LightBlue;
+ this.Button3.BorderColor = Color.LightBlue;
+ }
+ else if (this.txtDeliveryTime.Value == this.Button5.Text)
+ {
+ this.Button5.BorderColor = Color.Black;
+ this.Button0.BorderColor = Color.LightBlue;
+ this.Button1.BorderColor = Color.LightBlue;
+ this.Button2.BorderColor = Color.LightBlue;
+ this.Button3.BorderColor = Color.LightBlue;
+ this.Button4.BorderColor = Color.LightBlue;
+ }
+ string chaxuntimestart = "";
+ string chaxuntimeend = "";
+
+ if (this.txtDeliveryTime.Value== "鏈懆涓氱哗")
+ {
+ DateTime nowTime = DateTime.Now;
+ #region 鑾峰彇鏈懆绗竴澶�
+ //鏄熸湡涓�涓虹涓�澶�
+ int weeknow = Convert.ToInt32(nowTime.DayOfWeek);
+
+ //鍥犱负鏄互鏄熸湡涓�涓虹涓�澶╋紝鎵�浠ヨ鍒ゆ柇weeknow绛変簬0鏃讹紝瑕佸悜鍓嶆帹6澶┿��
+ weeknow = (weeknow == 0 ? (7 - 1) : (weeknow - 1));
+ int daydiff = (-1) * weeknow;
+
+ //鏈懆绗竴澶�
+ DateTime FirstDay = nowTime.AddDays(daydiff);
+ #endregion
+
+ #region 鑾峰彇鏈懆鏈�鍚庝竴澶�
+ //鏄熸湡澶╀负鏈�鍚庝竴澶�
+ int lastWeekDay = Convert.ToInt32(nowTime.DayOfWeek);
+ lastWeekDay = lastWeekDay == 0 ? (7 - lastWeekDay) : lastWeekDay;
+ int lastWeekDiff = (7 - lastWeekDay);
+
+ //鏈懆鏈�鍚庝竴澶�
+ DateTime LastDay = nowTime.AddDays(lastWeekDiff);
+
+ #endregion
+ chaxuntimestart = FirstDay.ToString("yyyy-MM-dd");
+ chaxuntimeend = LastDay.ToString("yyyy-MM-dd");
+
+ }
+ else if(this.txtDeliveryTime.Value == "涓婂懆涓氱哗")
+ {
+ DateTime nowTime = DateTime.Now.AddDays(-7);
+ #region 鑾峰彇鏈懆绗竴澶�
+ //鏄熸湡涓�涓虹涓�澶�
+ int weeknow = Convert.ToInt32(nowTime.DayOfWeek);
+
+ //鍥犱负鏄互鏄熸湡涓�涓虹涓�澶╋紝鎵�浠ヨ鍒ゆ柇weeknow绛変簬0鏃讹紝瑕佸悜鍓嶆帹6澶┿��
+ weeknow = (weeknow == 0 ? (7 - 1) : (weeknow - 1));
+ int daydiff = (-1) * weeknow;
+
+ //鏈懆绗竴澶�
+ DateTime FirstDay = nowTime.AddDays(daydiff);
+ #endregion
+
+ #region 鑾峰彇鏈懆鏈�鍚庝竴澶�
+ //鏄熸湡澶╀负鏈�鍚庝竴澶�
+ int lastWeekDay = Convert.ToInt32(nowTime.DayOfWeek);
+ lastWeekDay = lastWeekDay == 0 ? (7 - lastWeekDay) : lastWeekDay;
+ int lastWeekDiff = (7 - lastWeekDay);
+
+ //鏈懆鏈�鍚庝竴澶�
+ DateTime LastDay = nowTime.AddDays(lastWeekDiff);
+
+ #endregion
+ chaxuntimestart = FirstDay.ToString("yyyy-MM-dd");
+ chaxuntimeend = LastDay.ToString("yyyy-MM-dd");
+ }
+ else if (this.txtDeliveryTime.Value == "鏈湀涓氱哗")
+ {
+ chaxuntimestart = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.ToString("yyyy-MM-dd");
+
+ chaxuntimeend = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd");
+
+ }
+ else if (this.txtDeliveryTime.Value == "涓婃湀涓氱哗")
+ {
+ chaxuntimestart = DateTime.Now.AddMonths(-1).AddDays(1 - DateTime.Now.Day).Date.ToString("yyyy-MM-dd");
+
+ chaxuntimeend = DateTime.Now.AddMonths(-1).AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd");
+ }
+ else if (this.txtDeliveryTime.Value == "鏈勾涓氱哗")
+ {
+ DateTime dt = DateTime.Now;
+ //鏈勾绗竴澶�
+ chaxuntimestart = new DateTime(dt.Year,1,1).ToString("yyyy-MM-dd");
+ chaxuntimeend = new DateTime(dt.Year, 12, 31).ToString("yyyy-MM-dd");
+ }
+ else if (this.txtDeliveryTime.Value == "涓婂勾涓氱哗")
+ {
+ DateTime dt = DateTime.Now.AddYears(-1);
+ //鏈勾绗竴澶�
+ chaxuntimestart = new DateTime(dt.Year, 1, 1).ToString("yyyy-MM-dd");
+ chaxuntimeend = new DateTime(dt.Year, 12, 31).ToString("yyyy-MM-dd");
+ }
+
+
+
+
+
+ Pagination pa = new Pagination();
+ pa.PageSize = UCPager1.AspNetPager.PageSize;
+ pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
+ this.RepClientList.DataSource = bll_EC_OrderBLL.GetyewurenportList(pa,
+ CurrentUser.MemberId,
+
+ this.selBusinessManagerId.Value,
+ chaxuntimestart,
+ chaxuntimeend
+
+ );
+ this.RepClientList.DataBind();
+ UCPager1.AspNetPager.RecordCount = pa.RecordCount;
+ }
+
+ //鍒嗛〉浜嬩欢
+ protected void AspNetPager1_PageChanged(object src, EventArgs e)
+ {
+ BindList();
+ }
+
+ //鏌ヨ浜嬩欢
+ protected void btn_Search_Click(object sender, EventArgs e)
+ {
+ 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)
+ {
+
+ this.txtDeliveryTime.Value = this.Button1.Text;
+
+ BindList();
+ }
+
+ protected void btn_Search_Click2(object sender, EventArgs e)
+ {
+
+ this.txtDeliveryTime.Value = this.Button2.Text;
+
+ BindList();
+ }
+ protected void btn_Search_Click3(object sender, EventArgs e)
+ {
+
+ this.txtDeliveryTime.Value = this.Button3.Text;
+
+ BindList();
+ }
+ protected void btn_Search_Click4(object sender, EventArgs e)
+ {
+
+ this.txtDeliveryTime.Value = this.Button4.Text;
+
+ BindList();
+ }
+ protected void btn_Search_Click5(object sender, EventArgs e)
+ {
+
+ this.txtDeliveryTime.Value = this.Button5.Text;
+
+ BindList();
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportList.aspx.designer.cs
new file mode 100644
index 0000000..a5c3991
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportList.aspx.designer.cs
@@ -0,0 +1,134 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class xiaoshouyejiReportList
+ {
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ 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>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button1;
+
+ /// <summary>
+ /// Button2 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button2;
+
+ /// <summary>
+ /// Button3 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button3;
+
+ /// <summary>
+ /// Button4 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button4;
+
+ /// <summary>
+ /// Button5 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button5;
+
+ /// <summary>
+ /// txtDeliveryTime 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtDeliveryTime;
+
+ /// <summary>
+ /// selBusinessManagerId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManagerId;
+
+ /// <summary>
+ /// btn_Search 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Search;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+
+ /// <summary>
+ /// UCPager1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportPrint.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportPrint.aspx
new file mode 100644
index 0000000..b8440e3
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportPrint.aspx
@@ -0,0 +1,158 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xiaoshouyejiReportPrint.aspx.cs" Inherits="CY.WebForm.Pages.business.xiaoshouyejiReportPrint" %>
+
+<!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 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/Printter.js?v=14" 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">
+ window.printBeginCallBack = function () {
+ document.getElementById('fram_operate').style.display = 'none';
+ };
+ window.printOverCallBack = function () {
+ document.getElementById('fram_operate').style.display = '';
+ };
+
+
+ </script>
+</head>
+<body style='padding: 0; margin: 0;' onbeforeprint="OnPrint()" onafterprint="OnPrintOver()">
+ <form id="form1" runat="server">
+ <input type="hidden" runat="server" id="hideOrderId" />
+ <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' >
+ </div>
+ <table border="1" cellpadding="0" cellspacing="0" style="border: 0;margin-bottom:10px;margin-top:10px;">
+ <tr>
+ <td> <label id="labchaxuntime" runat="server"></label> </td>
+ </tr>
+ </table>
+
+
+
+
+ <table border="1" cellpadding="0" cellspacing="0" style="border: 0;margin-bottom:10px;margin-top:10px;">
+ <thead>
+ <tr>
+
+
+ <th style="text-align: center;">
+ 搴忓彿
+ </th>
+
+ <th style="text-align: center;">
+ 涓氬姟缁忕悊
+ </th>
+ <th style="text-align: center;">
+ 鏂板璁㈠崟
+ </th>
+ <th style="text-align: center;">
+ 浜у��
+ </th>
+ <th style="text-align: center;">
+ 鏂板瀹㈡埛
+ </th>
+ <th style="text-align: center;">
+ 瀹岀粨瀹㈡埛
+ </th>
+
+ <th style="text-align: center;">
+ 搴旀敹娆惧鎴�
+ </th>
+ <th style="text-align: center;">
+ 搴旀敹娆鹃噾棰�
+ </th>
+
+ <th style="text-align: center;">
+ 鍥炴瀹㈡埛
+ </th>
+ <th style="text-align: center;">
+ 鍥炴閲戦
+ </th>
+ <th style="text-align: center;">
+ 鏈洖娆惧鎴�
+ </th>
+ <th style="text-align: center;">
+ 鏈敹娆鹃噾棰�
+ </th>
+
+
+
+ </tr>
+ </thead>
+ <tbody>
+ <asp:Repeater runat="server" ID='rptOrder'>
+ <ItemTemplate>
+ <tr>
+ <td>
+ <%#Container.ItemIndex +1%>
+ </td>
+ <td>
+ <%#Eval("BusinessManager")%>
+ </td>
+ <td>
+ <%#Eval("shuliang")%>
+ </td>
+ <td>
+ <%#Eval("SumPrice", "{0:F2}")%>
+ </td>
+ <td>
+ <%#Eval("xinzengshuliang")%>
+ </td>
+ <td>
+ <%#Eval("wanjieshuliang")%>
+ </td>
+ <td>
+ <%#Eval("xiadanshuliang")%>
+ </td>
+ <td>
+ <%#Eval("SumPrice", "{0:F2}")%>
+ </td>
+
+
+ <td>
+ <%#Eval("huikuankehu")%>
+ </td>
+ <td>
+ <%#Eval("PayedMoney", "{0:F2}")%>
+ </td>
+ <td>
+ <%#Eval("weihuikuankehu")%>
+ </td>
+ <td>
+ <%#Eval("UnPayedMoney", "{0:F2}")%>
+ </td>
+ </tr>
+ </itemtemplate>
+ </asp:repeater>
+ </tbody>
+ </table>
+
+
+
+
+
+
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportPrint.aspx.cs
new file mode 100644
index 0000000..6807eec
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportPrint.aspx.cs
@@ -0,0 +1,199 @@
+锘縰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.Infrastructure.Common;
+using CY.Model;
+using CY.BLL;
+using CY.Model.Inquiry;
+using CY.BLL.Sys;
+using CY.Infrastructure.Query;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class xiaoshouyejiReportPrint : BasePage
+ {
+ EC_OrderBLL bll_EC_OrderBLL = new EC_OrderBLL();
+
+ string txtDeliveryTime = "";
+ /// <summary>
+ /// 椤甸潰鍔犺浇浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ switch (Request["Target"])
+ {
+ case "GetCommunication":
+ break;
+ case "print":
+ break;
+ default:
+ Page_Load_Default();
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ Response.Clear();
+ Response.Write("-1");
+ }
+ Response.End();
+ }
+
+
+ /// <summary>
+ /// 榛樿鍔犺浇浜嬩欢鏂规硶
+ /// </summary>
+ private void Page_Load_Default()
+ {
+
+ if (string.IsNullOrEmpty(Request["txtDeliveryTime"]))
+ {
+ JavaScript.MessageBox("蹇呴』濉啓鏌ヨ鏃堕棿", this);
+ return;
+ }
+
+ LoadOrderInfo();
+ }
+
+ /// <summary>
+ /// 鍔犺浇璁㈠崟淇℃伅
+ /// </summary>
+ private bool LoadOrderInfo()
+ {
+
+
+
+ txtDeliveryTime = Request["txtDeliveryTime"] == null ? "" : Request["txtDeliveryTime"];
+
+
+
+ string selBusinessManagerId = Request["selBusinessManagerId"] == null ? "" : Request["selBusinessManagerId"];
+
+
+ string chaxuntimestart = "";
+ string chaxuntimeend = "";
+
+ if (this.txtDeliveryTime == "鏈懆涓氱哗")
+ {
+ DateTime nowTime = DateTime.Now;
+ #region 鑾峰彇鏈懆绗竴澶�
+ //鏄熸湡涓�涓虹涓�澶�
+ int weeknow = Convert.ToInt32(nowTime.DayOfWeek);
+
+ //鍥犱负鏄互鏄熸湡涓�涓虹涓�澶╋紝鎵�浠ヨ鍒ゆ柇weeknow绛変簬0鏃讹紝瑕佸悜鍓嶆帹6澶┿��
+ weeknow = (weeknow == 0 ? (7 - 1) : (weeknow - 1));
+ int daydiff = (-1) * weeknow;
+
+ //鏈懆绗竴澶�
+ DateTime FirstDay = nowTime.AddDays(daydiff);
+ #endregion
+
+ #region 鑾峰彇鏈懆鏈�鍚庝竴澶�
+ //鏄熸湡澶╀负鏈�鍚庝竴澶�
+ int lastWeekDay = Convert.ToInt32(nowTime.DayOfWeek);
+ lastWeekDay = lastWeekDay == 0 ? (7 - lastWeekDay) : lastWeekDay;
+ int lastWeekDiff = (7 - lastWeekDay);
+
+ //鏈懆鏈�鍚庝竴澶�
+ DateTime LastDay = nowTime.AddDays(lastWeekDiff);
+
+ #endregion
+ chaxuntimestart = FirstDay.ToString("yyyy-MM-dd");
+ chaxuntimeend = LastDay.ToString("yyyy-MM-dd");
+
+ }
+ else if (this.txtDeliveryTime == "涓婂懆涓氱哗")
+ {
+ DateTime nowTime = DateTime.Now.AddDays(-7);
+ #region 鑾峰彇鏈懆绗竴澶�
+ //鏄熸湡涓�涓虹涓�澶�
+ int weeknow = Convert.ToInt32(nowTime.DayOfWeek);
+
+ //鍥犱负鏄互鏄熸湡涓�涓虹涓�澶╋紝鎵�浠ヨ鍒ゆ柇weeknow绛変簬0鏃讹紝瑕佸悜鍓嶆帹6澶┿��
+ weeknow = (weeknow == 0 ? (7 - 1) : (weeknow - 1));
+ int daydiff = (-1) * weeknow;
+
+ //鏈懆绗竴澶�
+ DateTime FirstDay = nowTime.AddDays(daydiff);
+ #endregion
+
+ #region 鑾峰彇鏈懆鏈�鍚庝竴澶�
+ //鏄熸湡澶╀负鏈�鍚庝竴澶�
+ int lastWeekDay = Convert.ToInt32(nowTime.DayOfWeek);
+ lastWeekDay = lastWeekDay == 0 ? (7 - lastWeekDay) : lastWeekDay;
+ int lastWeekDiff = (7 - lastWeekDay);
+
+ //鏈懆鏈�鍚庝竴澶�
+ DateTime LastDay = nowTime.AddDays(lastWeekDiff);
+
+ #endregion
+ chaxuntimestart = FirstDay.ToString("yyyy-MM-dd");
+ chaxuntimeend = LastDay.ToString("yyyy-MM-dd");
+ }
+ else if (this.txtDeliveryTime == "鏈湀涓氱哗")
+ {
+ chaxuntimestart = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.ToString("yyyy-MM-dd");
+
+ chaxuntimeend = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd");
+
+ }
+ else if (this.txtDeliveryTime == "涓婃湀涓氱哗")
+ {
+ chaxuntimestart = DateTime.Now.AddMonths(-1).AddDays(1 - DateTime.Now.Day).Date.ToString("yyyy-MM-dd");
+
+ chaxuntimeend = DateTime.Now.AddMonths(-1).AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd");
+ }
+ else if (this.txtDeliveryTime == "鏈勾涓氱哗")
+ {
+ DateTime dt = DateTime.Now;
+ //鏈勾绗竴澶�
+ chaxuntimestart = new DateTime(dt.Year, 1, 1).ToString("yyyy-MM-dd");
+ chaxuntimeend = new DateTime(dt.Year, 12, 31).ToString("yyyy-MM-dd");
+ }
+ else if (this.txtDeliveryTime == "涓婂勾涓氱哗")
+ {
+ DateTime dt = DateTime.Now.AddYears(-1);
+ //鏈勾绗竴澶�
+ chaxuntimestart = new DateTime(dt.Year, 1, 1).ToString("yyyy-MM-dd");
+ chaxuntimeend = new DateTime(dt.Year, 12, 31).ToString("yyyy-MM-dd");
+ }
+
+
+
+
+
+ Infrastructure.Query.Pagination pagination = new Infrastructure.Query.Pagination()
+ {
+ PageSize = 1000,
+ PageIndex = 1
+ };
+
+
+
+ this.rptOrder.DataSource = bll_EC_OrderBLL.GetyewurenportList(pagination,
+ CurrentUser.MemberId,
+
+ selBusinessManagerId,
+ chaxuntimestart,
+ chaxuntimeend
+ );
+ this.rptOrder.DataBind();
+
+
+
+
+
+
+ return true;
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportPrint.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportPrint.aspx.designer.cs
new file mode 100644
index 0000000..6de25e1
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReportPrint.aspx.designer.cs
@@ -0,0 +1,62 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class xiaoshouyejiReportPrint
+ {
+
+ /// <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;
+
+ /// <summary>
+ /// hideOrderId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden hideOrderId;
+
+ /// <summary>
+ /// labchaxuntime 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl labchaxuntime;
+
+ /// <summary>
+ /// rptOrder 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater rptOrder;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReprotKehu.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReprotKehu.aspx
new file mode 100644
index 0000000..e54fdf4
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReprotKehu.aspx
@@ -0,0 +1,204 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xiaoshouyejiReprotKehu.aspx.cs" Inherits="CY.WebForm.Pages.business.xiaoshouyejiReprotKehu" %>
+
+<!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">
+ <title>閿�鍞笟缁╁鎴�</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <style type="text/css">
+ .tableStyle th { padding: 1px; }
+ .tableStyle td { padding: 1px; }
+ </style>
+ <script type="text/javascript">
+ ///娣诲姞
+ function addModel() {
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsEdit.aspx", Title: "鏂板瀹㈡埛", Width: 900, Height: 750 });
+ }
+
+ //鏌ョ湅
+ function onView(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsDetail.aspx?Keyid=" + keyid, Title: "鏌ョ湅瀹㈡埛", Width: 900, Height: 750 });
+ }
+ //鏌ョ湅
+ function onViewWeihu(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsVisit.aspx?Keyid=" + keyid, Title: "鏌ョ湅瀹㈡埛缁存姢璁板綍", Width: 900, Height: 750 });
+ }
+
+ //淇敼
+ function onEdit(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsEdit.aspx?Keyid=" + keyid, Title: "淇敼瀹㈡埛", Width: 900, Height: 750 });
+ }
+
+ //鍒犻櫎
+ function onDelete(keyid) {
+ top.Dialog.confirm("纭畾瑕佸垹闄よ瀹㈡埛鍚楋紵", function () {
+ window.location = "/Pages/business/CorporateClientsList.aspx?delete=" + keyid;
+ });
+ }
+
+ //璁㈠崟鍏宠仈
+ function onChange(keyid) {
+ top.Dialog.confirm("纭鍚戞瀹㈡埛寮�閫氳鍗曞叧鑱斿悧锛�", function () {
+ $.ajax({
+ url: "/Pages/common/CommonAjax.aspx?data=" + (new Date()).valueOf(),
+ type: "POST",
+ dataType: "html",
+ data: { customchangetype: "customchangetype", keyid: keyid },
+ global: false,
+ cache: false,
+ async: false,
+ success: function (data) {
+ alertMsg(data);
+ window.location = "/Pages/business/CorporateClientsList.aspx";
+ }
+ });
+ });
+ }
+
+ //璁剧疆璇环鍙傛暟
+ function SetInquiryPar(keyid) {
+ window.location.href = "/Pages/sysInquiry/InquiryParameterList.aspx?CustomerId=" + keyid;
+ }
+
+ //鍚堝苟瀹㈡埛
+ function mergerModel() {
+ var keyid = "";
+ var num = 0;
+ $(".SelectCheck:checked").each(function (ii, vv) {
+ keyid = keyid + "|" + $(vv).attr("value_kid");
+ num++;
+ });
+ if (num == 0)
+ alertMsg("鏈�変腑浠讳綍瀹㈡埛");
+ else if (num != 2)
+ alertMsg("鍗曟鍚堝苟鍙兘閫夋嫨涓や釜瀹㈡埛");
+ else
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsMerger.aspx?Keyid=" + keyid, Title: "鍚堝苟瀹㈡埛", Width: 500, Height: 300, Modal: false });
+ }
+ </script>
+ <script type="text/javascript">
+ $(function () {
+ $("#selOrderMoney").change(function () {
+ $("#txtOrderMoney").val("");
+ });
+ $("#selLastOrderTime").change(function () {
+ $("#txtLastOrderTime").val("");
+ });
+ });
+ </script>
+</head>
+<body>
+ <form id="form1" runat="server" class="form">
+ <div id="scrollContent">
+
+
+ <div>
+ <asp:Repeater ID="RepClientList" runat="server">
+ <HeaderTemplate>
+ <table class="tableStyle" useclick="false" usecheckbox="true" sortmode="true" style="text-align: center;">
+ <tr>
+
+ <th style="text-align: center;">
+ 缂栧彿
+ </th>
+ <th style="text-align: center;">
+ 寤烘。鏃堕棿
+ </th>
+ <th style="text-align: center;">
+ 鎵�鍦ㄥ尯鍩�
+ </th>
+ <th style="text-align: center;">
+ 鍚嶇О
+ </th>
+ <th style="text-align: center;">
+ 淇¤獕
+ </th>
+ <th style="text-align: center;">
+ 鑱旂郴浜�
+ </th>
+ <th style="text-align: center;">
+ 鑱旂郴鎵嬫満
+ </th>
+ <th style="text-align: center;" class="case_email">
+ 鐢靛瓙閭
+ </th>
+ <th style="text-align: center;">
+ 瀹㈡埛绾у埆
+ </th>
+ <th style="text-align: center;">
+ 棰勪粯娆句綑棰�
+ </th>
+ <th style="text-align: center;">
+ 鎺堜俊棰濆害
+ </th>
+ <th style="text-align: center;">
+ 涓嬪崟鏁伴噺
+ </th>
+ <th style="text-align: center;">
+ 涓嬪崟浜у��
+ </th>
+ <th style="text-align: center;">
+ 瀹岀粨鐘舵��
+ </th>
+
+ </tr>
+ </HeaderTemplate>
+ <ItemTemplate>
+ <tr>
+
+ <td>
+ <%#Eval("CustomerId")%>
+ </td>
+ <td>
+ <%#Eval("CreateTime", "{0:yyyy-MM-dd}")%>
+ </td>
+ <td>
+ <%#Eval("City").ToString().IndexOf("鍏朵粬") >= 0 ? Eval("Province") : Eval("City")%><%#Eval("County")%>
+ </td>
+ <td>
+ <a class="a_under" style="color: <%#Eval("Keyid").ToString() == Eval("MemberId").ToString() ? "" : "green"%>;" href="/Pages/financial/OrderFinancial.aspx?customeid=<%#Eval("MemberId")%>" title="鐐瑰嚮鏌ョ湅璁㈠崟璁板綍">
+ <%#Eval("CompanyName")%></a>
+ </td>
+ <td>
+ <%#Eval("CreditIdName")%>
+ </td>
+ <td>
+ <%#Eval("BusinessManagers")%>
+ </td>
+ <td>
+ <%#Eval("Mobile")%>
+ </td>
+ <td class="case_email">
+ <%#Eval("Email")%>
+ </td>
+ <td>
+ <%#Eval("DegreeImportanIdName")%>
+ </td>
+ <td class="green">
+ <%#Eval("Prepayments", "{0:F2}")%>
+ </td>
+ <td>
+ <%#Eval("Credit", "{0:F2}")%>
+ </td>
+ <td>
+ <%#Eval("OrderCount")%>
+ </td>
+ <td>
+ <%#Eval("OrderMoney", "{0:F2}")%>
+ </td>
+ <td>
+ <%#Eval("ShifouwanjieName")%>
+ </td>
+
+ </tr>
+ </ItemTemplate>
+ <FooterTemplate>
+ </table>
+ </FooterTemplate>
+ </asp:Repeater>
+
+ </div>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReprotKehu.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReprotKehu.aspx.cs
new file mode 100644
index 0000000..876e1eb
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReprotKehu.aspx.cs
@@ -0,0 +1,306 @@
+锘縰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;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class xiaoshouyejiReprotKehu : BasePage
+ {
+ OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = null;
+ Sys_DictionaryBLL _Sys_DictionaryBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ OA_CustomerApplyBLL bll_OA_CustomerApplyBLL = null;
+ EC_MemberBasicBLL bll_EC_MemberBasicBLL = null;
+ Sys_CitySiteBLL bll_Sys_CitySiteBLL = null;
+ EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+
+ //鍒濆鍖�
+ public xiaoshouyejiReprotKehu()
+ {
+ _Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ bll_OA_CustomerApplyBLL = new OA_CustomerApplyBLL();
+ bll_EC_MemberBasicBLL = new EC_MemberBasicBLL();
+ bll_Sys_CitySiteBLL = new Sys_CitySiteBLL();
+ _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ }
+
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ if (!IsPostBack)
+ {
+
+ BindList();
+
+ }
+
+
+ }
+
+
+ //缁戝畾鍒楄〃
+ private void BindList()
+ {
+
+
+ string BusinessManagerId = Request["BusinessManagerId"];
+
+ string chaxuntimestart = Request["chaxuntimestart"];
+ string chaxuntimeend = Request["chaxuntimeend"];
+
+ string leixing = Request["leixing"];
+
+ DateTime datebegin = DateTime.Parse(chaxuntimestart);
+ DateTime dateend = DateTime.Parse(chaxuntimeend).AddDays(1);
+ Pagination pa = new Pagination();
+ pa.PageSize = 10000;
+ pa.PageIndex = 1;
+
+ if (leixing == "yingshoukuan")
+ {
+
+ Dictionary<int, object> searchParam = new Dictionary<int, object>();
+
+ SetParamValue(searchParam, 1, CurrentUser.MemberId);
+ SetParamValue(searchParam, 2, "");
+ SetParamValue(searchParam, 3, "");
+ SetParamValue(searchParam, 4, chaxuntimestart);
+ SetParamValue(searchParam, 5, dateend.ToString("yyyy-MM-dd"));
+ SetParamValue(searchParam, 6, "");
+ SetParamValue(searchParam, 7, "");
+ SetParamValue(searchParam, 8, "");
+ SetParamValue(searchParam, 9, "");//浠樻鐘舵�� -1
+ SetParamValue(searchParam, 10, "");
+ SetParamValue(searchParam, 11, "");
+ SetParamValue(searchParam, 12, "");
+ SetParamValue(searchParam, 13, BusinessManagerId);
+ SetParamValue(searchParam, 14, "");
+ SetParamValue(searchParam, 15, "");
+ SetParamValue(searchParam, 16, "");
+ SetParamValue(searchParam, 18, 0);
+ SetParamValue(searchParam, 19, "");
+ SetParamValue(searchParam, 20, "");
+ SetParamValue(searchParam, 21, "");
+ List<Guid> result = _eC_OrderBasicBLL.SelectModelPage_Seller(pa, searchParam).Select(x=>x.BuyerId).ToList();
+
+
+
+
+ this.RepClientList.DataSource = bll_OA_CorporateClientsBLL.GetModelPageList(pa,
+ CurrentUser.MemberId,
+ "",
+ null,
+ null,
+ "",
+ BusinessManagerId,
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ false,
+ CurrentUser.TrueMemberId,
+ CurrentUser.StaffId,
+ "").Where(x => result.Contains(x.Keyid));
+ this.RepClientList.DataBind();
+ }
+ else if (leixing == "xinzeng")
+ {
+
+ this.RepClientList.DataSource = bll_OA_CorporateClientsBLL.GetModelPageList(pa,
+ CurrentUser.MemberId,
+ "",
+ null,
+ null,
+ "",
+ BusinessManagerId,
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ false,
+ CurrentUser.TrueMemberId,
+ CurrentUser.StaffId,
+ "").Where(x => x.CreateTime >= datebegin && x.CreateTime < dateend);
+ this.RepClientList.DataBind();
+ }else if (leixing == "yishoukuan")
+ {
+
+ Dictionary<int, object> searchParam = new Dictionary<int, object>();
+
+ SetParamValue(searchParam, 1, CurrentUser.MemberId);
+ SetParamValue(searchParam, 2, "");
+ SetParamValue(searchParam, 3, "");
+ SetParamValue(searchParam, 4, chaxuntimestart);
+ SetParamValue(searchParam, 5, dateend.ToString("yyyy-MM-dd"));
+ SetParamValue(searchParam, 6, "");
+ SetParamValue(searchParam, 7, "");
+ SetParamValue(searchParam, 8, "");
+ SetParamValue(searchParam, 9, "-1");//浠樻鐘舵��
+ SetParamValue(searchParam, 10, "");
+ SetParamValue(searchParam, 11, "");
+ SetParamValue(searchParam, 12, "");
+ SetParamValue(searchParam, 13, BusinessManagerId);
+ SetParamValue(searchParam, 14, "");
+ SetParamValue(searchParam, 15, "");
+ SetParamValue(searchParam, 16, "");
+ SetParamValue(searchParam, 18, 0);
+ SetParamValue(searchParam, 19, "");
+ SetParamValue(searchParam, 20, "");
+ SetParamValue(searchParam, 21, "");
+ List<Guid> result = _eC_OrderBasicBLL.SelectModelPage_Seller(pa, searchParam).Select(x => x.BuyerId).ToList();
+
+
+
+
+ this.RepClientList.DataSource = bll_OA_CorporateClientsBLL.GetModelPageList(pa,
+ CurrentUser.MemberId,
+ "",
+ null,
+ null,
+ "",
+ BusinessManagerId,
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ false,
+ CurrentUser.TrueMemberId,
+ CurrentUser.StaffId,
+ "").Where(x => result.Contains(x.Keyid));
+ this.RepClientList.DataBind();
+ }
+ else if (leixing == "weishoukuan")
+ {
+
+ Dictionary<int, object> searchParam = new Dictionary<int, object>();
+
+ SetParamValue(searchParam, 1, CurrentUser.MemberId);
+ SetParamValue(searchParam, 2, "");
+ SetParamValue(searchParam, 3, "");
+ SetParamValue(searchParam, 4, chaxuntimestart);
+ SetParamValue(searchParam, 5, dateend.ToString("yyyy-MM-dd"));
+ SetParamValue(searchParam, 6, "");
+ SetParamValue(searchParam, 7, "");
+ SetParamValue(searchParam, 8, "");
+ SetParamValue(searchParam, 9, "");//浠樻鐘舵��
+ SetParamValue(searchParam, 10, "");
+ SetParamValue(searchParam, 11, "");
+ SetParamValue(searchParam, 12, "");
+ SetParamValue(searchParam, 13, BusinessManagerId);
+ SetParamValue(searchParam, 14, "");
+ SetParamValue(searchParam, 15, "");
+ SetParamValue(searchParam, 16, "");
+ SetParamValue(searchParam, 18, 0);
+ SetParamValue(searchParam, 19, "");
+ SetParamValue(searchParam, 20, "");
+ SetParamValue(searchParam, 21, "");
+ List<Guid> result = _eC_OrderBasicBLL.SelectModelPage_Seller(pa, searchParam).Where(x=>x.PayState!=-1).Select(x => x.BuyerId).ToList();
+
+
+
+
+ this.RepClientList.DataSource = bll_OA_CorporateClientsBLL.GetModelPageList(pa,
+ CurrentUser.MemberId,
+ "",
+ null,
+ null,
+ "",
+ BusinessManagerId,
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ false,
+ CurrentUser.TrueMemberId,
+ CurrentUser.StaffId,
+ "").Where(x => result.Contains(x.Keyid));
+ this.RepClientList.DataBind();
+ }
+
+
+ }
+
+
+ /// <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/business/xiaoshouyejiReprotKehu.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReprotKehu.aspx.designer.cs
new file mode 100644
index 0000000..fd3fd01
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiReprotKehu.aspx.designer.cs
@@ -0,0 +1,44 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class xiaoshouyejiReprotKehu
+ {
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Properties/PublishProfiles/FolderProfile.pubxml.user b/CY_ECommercePlatform/CY.WebForm/Properties/PublishProfiles/FolderProfile.pubxml.user
index cb16234..a1b85e0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/CY_ECommercePlatform/CY.WebForm/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <_PublishTargetUrl>D:\chuanyin-group-project\CY_ECommercePlatform\CY.WebForm\bin\app.publish\</_PublishTargetUrl>
+ <_PublishTargetUrl>D:\chuanyin-group-project-git\CY_ECommercePlatform\CY.WebForm\bin\app.publish\</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
<File Include="Ajax.ashx">
@@ -26,10 +26,10 @@
<publishTime>11/21/2013 14:54:33</publishTime>
</File>
<File Include="bin/AbstractFactory.dll">
- <publishTime>06/15/2021 09:33:14</publishTime>
+ <publishTime>09/09/2021 15:34:28</publishTime>
</File>
<File Include="bin/AbstractFactory.pdb">
- <publishTime>06/15/2021 09:33:14</publishTime>
+ <publishTime>09/09/2021 15:34:28</publishTime>
</File>
<File Include="bin/Ajax.dll">
<publishTime>04/02/2013 10:59:52</publishTime>
@@ -44,28 +44,28 @@
<publishTime>04/02/2013 10:59:52</publishTime>
</File>
<File Include="bin/CY.BLL.dll">
- <publishTime>06/15/2021 09:33:14</publishTime>
+ <publishTime>09/09/2021 15:34:28</publishTime>
</File>
<File Include="bin/CY.BLL.pdb">
- <publishTime>06/15/2021 09:33:14</publishTime>
+ <publishTime>09/09/2021 15:34:28</publishTime>
</File>
<File Include="bin/CY.Config.dll">
- <publishTime>04/14/2021 15:49:08</publishTime>
+ <publishTime>09/03/2021 13:49:04</publishTime>
</File>
<File Include="bin/CY.Config.pdb">
- <publishTime>04/14/2021 15:49:08</publishTime>
+ <publishTime>09/03/2021 13:49:04</publishTime>
</File>
<File Include="bin/CY.IBaseDAL.dll">
- <publishTime>04/14/2021 15:49:08</publishTime>
+ <publishTime>09/03/2021 13:49:04</publishTime>
</File>
<File Include="bin/CY.IBaseDAL.pdb">
- <publishTime>04/14/2021 15:49:08</publishTime>
+ <publishTime>09/03/2021 13:49:04</publishTime>
</File>
<File Include="bin/CY.IDAL.dll">
- <publishTime>06/15/2021 09:33:13</publishTime>
+ <publishTime>09/09/2021 15:34:26</publishTime>
</File>
<File Include="bin/CY.IDAL.pdb">
- <publishTime>06/15/2021 09:33:13</publishTime>
+ <publishTime>09/09/2021 15:34:26</publishTime>
</File>
<File Include="bin/CY.Infrastructure.dll">
<publishTime>04/14/2021 15:49:08</publishTime>
@@ -74,46 +74,46 @@
<publishTime>04/14/2021 15:49:08</publishTime>
</File>
<File Include="bin/CY.Model.dll">
- <publishTime>06/15/2021 09:33:12</publishTime>
+ <publishTime>09/09/2021 15:34:26</publishTime>
</File>
<File Include="bin/CY.Model.pdb">
- <publishTime>06/15/2021 09:33:12</publishTime>
+ <publishTime>09/09/2021 15:34:26</publishTime>
</File>
<File Include="bin/CY.Pay.dll">
- <publishTime>06/15/2021 09:33:14</publishTime>
+ <publishTime>09/09/2021 15:34:28</publishTime>
</File>
<File Include="bin/CY.Pay.pdb">
- <publishTime>06/15/2021 09:33:14</publishTime>
+ <publishTime>09/09/2021 15:34:28</publishTime>
</File>
<File Include="bin/CY.SendMessage.dll">
- <publishTime>06/15/2021 09:33:12</publishTime>
+ <publishTime>09/09/2021 15:34:26</publishTime>
</File>
<File Include="bin/CY.SendMessage.dll.config">
<publishTime>07/28/2013 12:13:12</publishTime>
</File>
<File Include="bin/CY.SendMessage.pdb">
- <publishTime>06/15/2021 09:33:12</publishTime>
+ <publishTime>09/09/2021 15:34:26</publishTime>
</File>
<File Include="bin/CY.SendMessage.XmlSerializers.dll">
- <publishTime>06/15/2021 09:33:13</publishTime>
+ <publishTime>09/09/2021 15:34:27</publishTime>
</File>
<File Include="bin/CY.SQLDAL.dll">
- <publishTime>06/15/2021 09:33:14</publishTime>
+ <publishTime>09/09/2021 15:34:27</publishTime>
</File>
<File Include="bin/CY.SQLDAL.pdb">
- <publishTime>06/15/2021 09:33:14</publishTime>
+ <publishTime>09/09/2021 15:34:27</publishTime>
</File>
<File Include="bin/CY.WebForm.dll">
- <publishTime>06/15/2021 09:33:16</publishTime>
+ <publishTime>09/09/2021 15:34:30</publishTime>
</File>
<File Include="bin/CY.WebForm.pdb">
- <publishTime>06/15/2021 09:33:16</publishTime>
+ <publishTime>09/09/2021 15:34:30</publishTime>
</File>
<File Include="bin/CY_ValidaterHttpModule.dll">
- <publishTime>04/23/2021 13:44:05</publishTime>
+ <publishTime>09/03/2021 13:49:05</publishTime>
</File>
<File Include="bin/CY_ValidaterHttpModule.pdb">
- <publishTime>04/23/2021 13:44:05</publishTime>
+ <publishTime>09/03/2021 13:49:05</publishTime>
</File>
<File Include="bin/ICSharpCode.SharpZipLib.dll">
<publishTime>04/02/2013 10:59:51</publishTime>
@@ -5474,7 +5474,7 @@
<publishTime>04/13/2021 14:25:29</publishTime>
</File>
<File Include="Pages/business/DeliverPlanList.aspx">
- <publishTime>04/30/2021 13:53:49</publishTime>
+ <publishTime>09/06/2021 09:43:41</publishTime>
</File>
<File Include="Pages/business/DeliverPlanPrint.aspx">
<publishTime>04/29/2021 14:48:58</publishTime>
@@ -5606,13 +5606,13 @@
<publishTime>05/12/2021 16:48:04</publishTime>
</File>
<File Include="Pages/business/OrderListBatchOperation.aspx">
- <publishTime>05/07/2021 16:57:08</publishTime>
+ <publishTime>09/06/2021 13:45:31</publishTime>
</File>
<File Include="Pages/business/OrderOperate.aspx">
<publishTime>05/08/2014 16:17:48</publishTime>
</File>
<File Include="Pages/business/OrderProdactionList.aspx">
- <publishTime>04/27/2021 15:59:26</publishTime>
+ <publishTime>09/06/2021 09:43:31</publishTime>
</File>
<File Include="Pages/business/OrderProdactionListchejian.aspx">
<publishTime>04/27/2021 11:17:21</publishTime>
@@ -5918,7 +5918,7 @@
<publishTime>07/28/2013 12:13:55</publishTime>
</File>
<File Include="Pages/common/UCPager.ascx">
- <publishTime>11/21/2013 14:55:07</publishTime>
+ <publishTime>09/06/2021 09:55:33</publishTime>
</File>
<File Include="Pages/common/UIPrintTypeList.ascx">
<publishTime>05/08/2014 16:17:40</publishTime>
@@ -6002,7 +6002,10 @@
<publishTime>05/14/2014 10:03:52</publishTime>
</File>
<File Include="Pages/financial/OrderFinancial.aspx">
- <publishTime>05/08/2014 16:17:38</publishTime>
+ <publishTime>09/03/2021 13:19:57</publishTime>
+ </File>
+ <File Include="Pages/financial/OrderFinancialPrint.aspx">
+ <publishTime>09/03/2021 13:22:25</publishTime>
</File>
<File Include="Pages/financial/OrderMoneyBatchReceive.aspx">
<publishTime>04/16/2021 09:32:46</publishTime>
@@ -8201,7 +8204,7 @@
<publishTime>07/28/2013 12:13:36</publishTime>
</File>
<File Include="Web.config">
- <publishTime>04/21/2021 15:22:36</publishTime>
+ <publishTime>09/03/2021 13:49:11</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Web.config b/CY_ECommercePlatform/CY.WebForm/Web.config
index 07a3e20..f0003a3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Web.config
+++ b/CY_ECommercePlatform/CY.WebForm/Web.config
@@ -267,10 +267,10 @@
</exceptionPolicies>
</exceptionHandling>
<connectionStrings>
- <add name="SqlConnection" connectionString="Server=CB2-20200827ONU;Database=ECTEST;Trusted_Connection=True;" providerName="System.Data.SqlClient" />
- <!-- <add name="SqlConnection"
- connectionString="Data Source=DESKTOP-8E2C3RS;Initial Catalog=ECTEST;User ID=sa;Password=123456"
- providerName="System.Data.SqlClient" />-->
+ <!--<add name="SqlConnection" connectionString="Server=CB2-20200827ONU;Database=ECTEST;Trusted_Connection=True;" providerName="System.Data.SqlClient" />-->
+ <add name="SqlConnection"
+ connectionString="Data Source=.;Initial Catalog=ECTEST;User ID=sa;Password=123456"
+ providerName="System.Data.SqlClient" />
<!--<add name="SqlConnection"
connectionString="Data Source=118.123.213.60\SQLSERVER2008;Initial Catalog=ECTEST;User ID=sa;Password=123qwe!@#;"
providerName="System.Data.SqlClient" />-->
diff --git "a/\345\274\200\347\245\250\344\277\256\346\224\271.sql" "b/\345\274\200\347\245\250\344\277\256\346\224\271.sql"
index eb54f96..4ce58ab 100644
--- "a/\345\274\200\347\245\250\344\277\256\346\224\271.sql"
+++ "b/\345\274\200\347\245\250\344\277\256\346\224\271.sql"
@@ -1,6 +1,16 @@
USE [ECTEST]
GO
+
+
+
+INSERT INTO [Sys_Dictionary]([Name] ,[DicType] ,[LastUpdateTime] ,[Operator] ,[MeanValue]) VALUES ('张','印刷单位',getdate(),'管理员',1)
+ INSERT INTO [Sys_Dictionary]([Name] ,[DicType] ,[LastUpdateTime] ,[Operator] ,[MeanValue]) VALUES ('本','印刷单位',getdate(),'管理员',2)
+ INSERT INTO [Sys_Dictionary]([Name] ,[DicType] ,[LastUpdateTime] ,[Operator] ,[MeanValue]) VALUES ('册','印刷单位',getdate(),'管理员',3)
+ INSERT INTO [Sys_Dictionary]([Name] ,[DicType] ,[LastUpdateTime] ,[Operator] ,[MeanValue]) VALUES ('只','印刷单位',getdate(),'管理员',4)
+
+ go
+
--2021.09.10 增加备注
alter table [OA_Kaipiaoshenqing]
add [remark] nvarchar(250) null
@@ -22,9 +32,15 @@
alter table [EC_OrderExtend]
add [printunit] [int] NULL
+ go
+
update [EC_OrderExtend] set [printunit]=1
+go
+
ALTER TABLE [dbo].[EC_OrderExtend] ADD CONSTRAINT [DF_EC_OrderExtend_printunit] DEFAULT ((1)) FOR [printunit]
+go
+
--更新存储过程[sp_EC_OrderBasic_Search_Seller] ，订单查询sql
--更新存储过程sp_EC_OrderExtend_Insert，sp_EC_OrderExtend_Update， 订单扩展sql
\ No newline at end of file
diff --git "a/\346\225\260\346\215\256\345\272\223\344\277\256\346\224\271.sql" "b/\346\225\260\346\215\256\345\272\223\344\277\256\346\224\271.sql"
index 870058e..4e2bb75 100644
--- "a/\346\225\260\346\215\256\345\272\223\344\277\256\346\224\271.sql"
+++ "b/\346\225\260\346\215\256\345\272\223\344\277\256\346\224\271.sql"
Binary files differ
--
Gitblit v1.9.1