From 1435b5b13b3857a20292d5c869f95e0c2ae5ffea Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期一, 13 九月 2021 15:09:24 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project
---
CY_ECommercePlatform/CY.WebForm/CacheFiles/QuoteDemand.txt | 2
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx | 130 ++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.designer.cs | 62 ++--
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDelayTimeEdit.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProductionprogress.aspx.cs | 2
CY_ECommercePlatform/.vs/CY_ECommercePlatform/v16/.suo | 0
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs | 30 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx | 1
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs | 1
CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx | 2
CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx.designer.cs | 35 ++
CY_ECommercePlatform/CY.WebForm/CacheFiles/SeckillBusiness.txt | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx | 29 ++
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx.cs | 134 +++++++++++
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 8
CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs | 14 +
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs | 26 +
CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx.designer.cs | 16
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs | 30 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx | 82 ++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.designer.cs | 27 ++
28 files changed, 612 insertions(+), 65 deletions(-)
diff --git a/CY_ECommercePlatform/.vs/CY_ECommercePlatform/v16/.suo b/CY_ECommercePlatform/.vs/CY_ECommercePlatform/v16/.suo
index 349e32d..2223c7f 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_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index 163716d..f67c6a7 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -539,6 +539,10 @@
{
Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime]) >7 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])>7 )";
}
+ else if (DeliveryTime == "閫炬湡")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])<=0 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])<=0 )";
+ }
}
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
index 21b3821..6db6161 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
@@ -158,8 +158,18 @@
{
string Condition = " and od.FirmId ='" + FirmId + "' and od.shifouDelivery = 1 ";
- if (!string.IsNullOrEmpty(DeliveredTime))
- Condition += " and DATEDIFF(day,od.[DeliverTime],'" + DeliveredTime + "')=0 ";
+ if (!string.IsNullOrEmpty(DeliveredTime) )
+ {
+ if(DeliveredTime != "閫炬湡")
+ {
+ Condition += " and DATEDIFF(day,od.[DeliverTime],'" + DeliveredTime + "')=0 ";
+ }
+ else
+ {
+ Condition += " and DATEDIFF(day,GETDATE(),od.[DeliverTime])<=0 ";
+ }
+ }
+
if (!string.IsNullOrEmpty(CarId))
Condition += " and od.CarId = '" + CarId + "'";
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 65ca44d..404c4cd 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1989,6 +1989,7 @@
<Content Include="Pages\financial\FirmAccountPrintTable.aspx" />
<Content Include="Pages\financial\MemberOrderMoneyReceive.aspx" />
<Content Include="Pages\financial\MemberOrderPayList.aspx" />
+ <Content Include="Pages\financial\OrderFinancialPrint.aspx" />
<Content Include="Pages\financial\OrderMoneyBatchReceive.aspx" />
<Content Include="Pages\financial\OutsourcePayMoney.aspx" />
<Content Include="Pages\financial\OutsourcePayOrder.aspx" />
@@ -4180,6 +4181,13 @@
<Compile Include="Pages\financial\MemberOrderPayList.aspx.designer.cs">
<DependentUpon>MemberOrderPayList.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\financial\OrderFinancialPrint.aspx.cs">
+ <DependentUpon>OrderFinancialPrint.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\financial\OrderFinancialPrint.aspx.designer.cs">
+ <DependentUpon>OrderFinancialPrint.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\financial\OrderMoneyBatchReceive.aspx.cs">
<DependentUpon>OrderMoneyBatchReceive.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt b/CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt
index f3f003f..cb71307 100644
--- a/CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt
+++ b/CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt
@@ -1 +1 @@
-2021-09-13 09:09:46
\ No newline at end of file
+2021-09-13 15:06:28
\ 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 f3f003f..cb71307 100644
--- a/CY_ECommercePlatform/CY.WebForm/CacheFiles/QuoteDemand.txt
+++ b/CY_ECommercePlatform/CY.WebForm/CacheFiles/QuoteDemand.txt
@@ -1 +1 @@
-2021-09-13 09:09:46
\ No newline at end of file
+2021-09-13 15:06:28
\ 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 f3f003f..cb71307 100644
--- a/CY_ECommercePlatform/CY.WebForm/CacheFiles/SeckillBusiness.txt
+++ b/CY_ECommercePlatform/CY.WebForm/CacheFiles/SeckillBusiness.txt
@@ -1 +1 @@
-2021-09-13 09:09:46
\ No newline at end of file
+2021-09-13 15:06:28
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs
index 51ca2b1..0a82ad4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs
@@ -42,8 +42,10 @@
if (!IsPostBack)
{
BindProvince();
- BindList();
InitialSelectData();
+
+ BindList();
+
}
if (!string.IsNullOrEmpty(Request["delete"]))
@@ -59,6 +61,7 @@
else
JavaScript.MessageBox("鍒犻櫎澶辫触", this);
}
+
}
//鍔犺浇鏌ヨ鏉′欢
@@ -104,7 +107,8 @@
this.selShifouwanjie.DataValueField = "MeanValue";
this.selShifouwanjie.DataBind();
this.selShifouwanjie.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
-
+ this.selShifouwanjie.Value = "2";
+
}
//缁戝畾鍒楄〃
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
index edb7f8d..190445f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
@@ -257,6 +257,7 @@
閫佽揣鏃堕棿锛�
</td>
<td colspan="5">
+ <asp:button id="Button0" text="閫炬湡" runat="server" padding="0px" OnClick="btn_Search_Click0" />
<asp:button id="Button1" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click1" />
<asp:button id="Button2" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click2" />
<asp:button id="Button3" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click3" />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
index 471d082..f739ebe 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
@@ -91,7 +91,7 @@
this.selCarIddo.DataBind();
this.selCarIddo.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
-
+ this.Button0.Text = "閫炬湡";
this.Button1.Text = DateTime.Now.ToString("yyyy-MM-dd");
this.Button2.Text = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd");
this.Button3.Text = DateTime.Now.AddDays(2).ToString("yyyy-MM-dd");
@@ -126,7 +126,14 @@
{
BindList();
}
-
+ protected void btn_Search_Click0(object sender, EventArgs e)
+ {
+
+ this.txtDeliveryTime.Value = this.Button0.Text;
+
+ BindList();
+ }
+
protected void btn_Search_Click1(object sender, EventArgs e)
{
@@ -200,6 +207,7 @@
this.Button5.BorderColor = Color.LightBlue;
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button2.Text)
{
@@ -210,6 +218,7 @@
this.Button5.BorderColor = Color.LightBlue;
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button3.Text)
{
@@ -220,6 +229,7 @@
this.Button5.BorderColor = Color.LightBlue;
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button4.Text)
{
@@ -230,6 +240,7 @@
this.Button5.BorderColor = Color.LightBlue;
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button5.Text)
{
@@ -240,6 +251,7 @@
this.Button1.BorderColor = Color.LightBlue;
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button6.Text)
{
@@ -250,6 +262,7 @@
this.Button5.BorderColor = Color.LightBlue;
this.Button1.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button7.Text)
{
@@ -260,8 +273,19 @@
this.Button5.BorderColor = Color.LightBlue;
this.Button6.BorderColor = Color.LightBlue;
this.Button1.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
-
+ else if (this.txtDeliveryTime.Value == this.Button0.Text)
+ {
+ this.Button0.BorderColor = Color.Black;
+ this.Button2.BorderColor = Color.LightBlue;
+ this.Button3.BorderColor = Color.LightBlue;
+ this.Button4.BorderColor = Color.LightBlue;
+ this.Button5.BorderColor = Color.LightBlue;
+ this.Button6.BorderColor = Color.LightBlue;
+ this.Button1.BorderColor = Color.LightBlue;
+ this.Button7.BorderColor = Color.LightBlue;
+ }
Pagination pa = new Pagination();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs
index 1b3b4ba..85c9fb7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs
@@ -42,6 +42,15 @@
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
+ /// Button0 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button0;
+
+ /// <summary>
/// Button1 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
index 5048b76..c500e4c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
@@ -471,6 +471,7 @@
this.selKaipiaoshenqing.DataSource = _sys_DictionaryBLL.GetDataByType("EC_寮�绁ㄧ敵璇�");
this.selKaipiaoshenqing.DataBind();
this.selKaipiaoshenqing.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selKaipiaoshenqing.Value = "1";
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDelayTimeEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDelayTimeEdit.aspx.cs
index 040332d..3e9ea65 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDelayTimeEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDelayTimeEdit.aspx.cs
@@ -79,7 +79,7 @@
bool result = eC_OrderBLL.OldUpdateDelayTime(eC_OrderExtend);
if (result)
- JavaScript.MessageBoxs("鏇存柊鎴愬姛", this, true, true);
+ JavaScript.MessageBox("鏇存柊鎴愬姛", this, true, true);
else
JavaScript.MessageBox("鏇存柊澶辫触", this);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
index 662279a..b688c6d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
@@ -5,7 +5,7 @@
<head id="Head1" runat="server">
<title>璁㈠崟鍒楄〃</title>
<uc:cmshead id="CMSHead1" runat="server" />
- <script src="../../js/business/Order.js" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=5" type="text/javascript"></script>
<script type="text/javascript">
function kaipiaoConfirm(orderId) {
@@ -124,6 +124,27 @@
}
);
});
+
+ $(function () {
+ var value_SumPrice = 0;
+ $(".SumPrice").each(function (ii, vv) {
+ value_SumPrice += parseFloat($(vv).text());
+ });
+ $("#AllMoney").html(value_SumPrice.toFixed(2));
+
+ var value_PayedMoney = 0;
+ $(".PayedMoney").each(function (ii, vv) {
+ value_PayedMoney += parseFloat($(vv).text());
+ });
+ $("#AlreadyMoney").html(value_PayedMoney.toFixed(2));
+
+ var value_UnPayedMoney = 0;
+ $(".UnPayedMoney").each(function (ii, vv) {
+ value_UnPayedMoney += parseFloat($(vv).text());
+ });
+ $("#NoMoney").html(value_UnPayedMoney.toFixed(2));
+ });
+
</script>
<style type="text/css">
.tableStyleXS th { padding: 1px 0 1px 3px; background-image:none; border-bottom:1px solid #CCC; }
@@ -150,6 +171,11 @@
cursor: pointer;
width: 26px;
}
+
+
+ .StatisticsMoney td { color: #FF5500; }
+ .StatisticsMoney span { color: #FF5500; font-weight: bold; }
+
</style>
</head>
<body>
@@ -294,7 +320,9 @@
<a href="javascript:;" menu_member_case_id="case_ToBatchPayList" menu_member_case_name="鎵归噺鏀舵" onclick="ToBatchPayList();"><span class="icon_edit">鎵归噺鏀舵</span></a>
<div class="box_tool_line">
</div>
-
+ <a href="javascript:;" menu_member_case_id="case_ToBatchPrintAwbOrder" menu_member_case_name="鎵撳嵃閫佽揣鍗�" onclick="ToPrintAwbOrder()"><span class="icon_edit">鎵撳嵃閫佽揣鍗�</span></a>
+ <div class="clear">
+ </div>
</div>
</div>
</div>
@@ -405,7 +433,7 @@
PayState:<%#Eval("PayState")%>
}" id='ckBox<%#Container.ItemIndex%>' id='ckBox<%#Container.ItemIndex%>' class='ckBox' />
</td>
- <td>
+ <td class="ItemIndex">
<%#Container.ItemIndex +1 /*(UCPager1.PageSize *( UCPager1.PageIndex-1)+1)*/%>
</td>
<td style="text-align: center;">
@@ -444,14 +472,14 @@
<%#Eval("KaipiaoshenqingName").ToString()==""?"鏈敵璇�":Eval("KaipiaoshenqingName").ToString()%>
</td>
- <td>
+ <td class="SumPrice">
<%#Eval("SumPrice", "{0:F}")%>
</td>
- <td>
+ <td class="PayedMoney">
<%#Eval("TradingSingle.PayedMoney", "{0:F}")%>
</td>
- <td>
+ <td class="UnPayedMoney">
<%#Eval("UnPayedMoney","{0:F}")%>
</td>
@@ -499,6 +527,22 @@
</itemtemplate>
</asp:repeater>
</tbody>
+
+ <tr class="StatisticsMoney">
+ <td colspan="12" class="ali03">
+ 鏌ヨ椤圭粺璁★細
+ </td>
+ <td class="ali01" >
+ <span id="AllMoney" runat="server"></span>
+ </td>
+ <td class="ali01">
+ <span id="AlreadyMoney" runat="server"></span>
+ </td>
+ <td class="ali01">
+ <span id="NoMoney" runat="server"></span>
+ </td>
+
+ </tr>
</table>
<%--<uc:ucpager id="UCPager1" runat="server" />--%>
</div>
@@ -620,6 +664,32 @@
}
);
+ var i = 1;
+
+ $(".ItemIndex").each(function (ii, vv) {
+
+ $(vv).text(i)
+ i = i + 1;
+ });
+
+
+ var value_SumPrice = 0;
+ $(".SumPrice").each(function (ii, vv) {
+ value_SumPrice += parseFloat($(vv).text());
+ });
+ $("#AllMoney").html(value_SumPrice.toFixed(2));
+
+ var value_PayedMoney = 0;
+ $(".PayedMoney").each(function (ii, vv) {
+ value_PayedMoney += parseFloat($(vv).text());
+ });
+ $("#AlreadyMoney").html(value_PayedMoney.toFixed(2));
+
+ var value_UnPayedMoney = 0;
+ $(".UnPayedMoney").each(function (ii, vv) {
+ value_UnPayedMoney += parseFloat($(vv).text());
+ });
+ $("#NoMoney").html(value_UnPayedMoney.toFixed(2));
//if (!isCan) {
// // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs
index c6aa923..34b1080 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs
@@ -453,6 +453,7 @@
{
// UCPager1.AspNetPager.PageChanged += AspNetPager_PageChanged;
btn_Search.Click += btn_Search_Click;
+
txtCommission.Value = CY.Config.WebInfo.Instance.FirmOrderAgencyFee;
List<EC_OrderDialogue> dialogues = _eC_OrderBasicBLL.SelectPropertyChangeRequest(CurrentUser.MemberId) as List<EC_OrderDialogue>;
@@ -513,6 +514,7 @@
#region 鏌ヨ
+
/// <summary>
/// 鎼滅储鎸夐挳鐐瑰嚮浜嬩欢
/// </summary>
@@ -521,11 +523,11 @@
private void btn_Search_Click(object sender, EventArgs e)
{
- /* if (this.txtCustormerName.Value.Trim() == "")
- {
- Response.Write("瀹㈡埛鍚嶇О涓嶈兘涓虹┖锛岃杈撳叆瀹㈡埛鍚嶇О鍐嶆煡璇⑩�︹��");
- return;
- }*/
+ //if (this.txtCustormerName.Value.Trim() == "")
+ //{
+ // Response.Write("瀹㈡埛鍚嶇О涓嶈兘涓虹┖锛岃杈撳叆瀹㈡埛鍚嶇О鍐嶆煡璇⑩�︹��");
+ // return;
+ //}
Dictionary<int, object> searchParam = new Dictionary<int, object>();
SetParamValue(searchParam, 1, CurrentUser.MemberId);
@@ -556,12 +558,24 @@
// AspNetPager_PageChanged(UCPager1.AspNetPager, new EventArgs());
Infrastructure.Query.Pagination pagination = new Infrastructure.Query.Pagination()
{
- PageSize = 1000,// UCPager1.AspNetPager.PageSize,
+ PageSize = 10000,// UCPager1.AspNetPager.PageSize,
PageIndex = 1// UCPager1.AspNetPager.CurrentPageIndex
};
IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Seller(pagination, SearchParam);//.Where(x=>x.Quchudingdan == 2);
rptData.DataSource = result;
rptData.DataBind();
+
+ //EC_OrderBasic m_EC_OrderBasic = _eC_OrderBasicBLL.SumOrderMoney_receive(pagination, SearchParam);
+ //if (m_EC_OrderBasic != null)
+ //{
+ // //this.AllMoney.InnerText = (m_EC_OrderBasic.OrAllTradingMoney * 9 ?? 0).ToString("0.00");
+ // //this.AlreadyMoney.InnerText = (m_EC_OrderBasic.OrAllPayedMoney * 9 ?? 0).ToString("0.00");
+ // //this.NoMoney.InnerText = (m_EC_OrderBasic.OrAllUnPayedMoney * 9 ?? 0).ToString("0.00");
+ // this.AllMoney.InnerText = (m_EC_OrderBasic.OrAllTradingMoney ?? 0).ToString("0.00");
+ // this.AlreadyMoney.InnerText = (m_EC_OrderBasic.OrAllPayedMoney ?? 0).ToString("0.00");
+ // this.NoMoney.InnerText = (m_EC_OrderBasic.OrAllUnPayedMoney ?? 0).ToString("0.00");
+ //}
+
}
/// <summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.designer.cs
index 8d290f2..7f2b494 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.designer.cs
@@ -202,5 +202,32 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater rptData;
+
+ /// <summary>
+ /// AllMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl AllMoney;
+
+ /// <summary>
+ /// AlreadyMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl AlreadyMoney;
+
+ /// <summary>
+ /// NoMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl NoMoney;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx
index 9e72d93..9c07715 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx
@@ -51,7 +51,7 @@
<option value ="7澶�"> </option>
<option value ="涓�鍛ㄥ悗"> </option>
</select>--%>
-
+ <asp:button id="Button0" text="閫炬湡" runat="server" padding="0px" OnClick="btn_Search_Click0" />
<asp:button id="Button1" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click1" />
<asp:button id="Button2" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click2" />
<asp:button id="Button3" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click3" />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs
index b6c16ca..000af42 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs
@@ -128,6 +128,13 @@
BindList();
}
+ protected void btn_Search_Click0(object sender, EventArgs e)
+ {
+
+ this.txtDeliveryTime.Value = this.Button0.Text;
+
+ BindList();
+ }
protected void btn_Search_Click2(object sender, EventArgs e)
{
@@ -187,7 +194,7 @@
this.selBusinessManager.DataValueField = "Keyid";
this.selBusinessManager.DataBind();
this.selBusinessManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
-
+ this.Button0.Text = "閫炬湡";
this.Button1.Text = "鏄庡ぉ";
this.Button2.Text = "鍚庡ぉ";
this.Button3.Text = "3澶�";
@@ -209,6 +216,7 @@
if (this.txtDeliveryTime.Value == this.Button1.Text)
{
+
this.Button1.BorderColor = Color.Black;
this.Button2.BorderColor = Color.LightBlue;
this.Button3.BorderColor = Color.LightBlue;
@@ -217,6 +225,7 @@
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
this.Button8.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button2.Text)
{
@@ -228,6 +237,7 @@
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
this.Button8.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button3.Text)
{
@@ -239,6 +249,7 @@
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
this.Button8.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button4.Text)
{
@@ -250,6 +261,7 @@
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
this.Button8.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button5.Text)
{
@@ -261,6 +273,7 @@
this.Button6.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
this.Button8.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button6.Text)
{
@@ -272,6 +285,7 @@
this.Button1.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
this.Button8.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button7.Text)
{
@@ -283,6 +297,7 @@
this.Button6.BorderColor = Color.LightBlue;
this.Button1.BorderColor = Color.LightBlue;
this.Button8.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
}
else if (this.txtDeliveryTime.Value == this.Button8.Text)
{
@@ -294,6 +309,19 @@
this.Button6.BorderColor = Color.LightBlue;
this.Button1.BorderColor = Color.LightBlue;
this.Button7.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
+ }
+ else if (this.txtDeliveryTime.Value == this.Button0.Text)
+ {
+ this.Button0.BorderColor = Color.Black;
+ this.Button2.BorderColor = Color.LightBlue;
+ this.Button3.BorderColor = Color.LightBlue;
+ this.Button4.BorderColor = Color.LightBlue;
+ this.Button5.BorderColor = Color.LightBlue;
+ this.Button6.BorderColor = Color.LightBlue;
+ this.Button1.BorderColor = Color.LightBlue;
+ this.Button7.BorderColor = Color.LightBlue;
+ this.Button8.BorderColor = Color.LightBlue;
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.designer.cs
index 6e31ab5..1ce008c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.designer.cs
@@ -42,6 +42,15 @@
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
+ /// Button0 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button0;
+
+ /// <summary>
/// Button1 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProductionprogress.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProductionprogress.aspx.cs
index bf7aada..f3e01fc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProductionprogress.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProductionprogress.aspx.cs
@@ -168,7 +168,7 @@
bool result = eC_OrderBLL.OldUpdateProductionprogress(eC_OrderExtend);
if (result)
- JavaScript.MessageBoxs("鎿嶄綔鎴愬姛", this, true, true);
+ JavaScript.MessageBox("鎿嶄綔鎴愬姛", this, true, true);
else
JavaScript.MessageBox("鎿嶄綔澶辫触", this);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx b/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx
index e6b1393..a6551b8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx
@@ -29,7 +29,7 @@
</script>
<div id="page">
-<webdiyer:AspNetPager ID="AspNetPager1" runat="server" CssClass="paginator" CurrentPageButtonPosition="Center" CustomInfoHTML="鍏�<font style='font-size:13'>%RecordCount%</font>鏉�" ShowCustomInfoSection="Left" Width="100%" CustomInfoSectionWidth="100px" PageIndexBoxType="TextBox" ShowPageIndexBox="Always" SubmitButtonText="Go" TextAfterPageIndexBox="椤�" AlwaysShow="true" TextBeforePageIndexBox="杞埌" PrevPageText="涓婁竴椤�" NextPageText="涓嬩竴椤�" FirstPageText="棣栭〉" LastPageText="鏈〉" PageSize="15" CurrentPageIndex="1">
+<webdiyer:AspNetPager ID="AspNetPager1" runat="server" CssClass="paginator" CurrentPageButtonPosition="Center" CustomInfoHTML="鍏�<font style='font-size:13'>%RecordCount%</font>鏉�" ShowCustomInfoSection="Left" Width="100%" CustomInfoSectionWidth="100px" PageIndexBoxType="TextBox" ShowPageIndexBox="Always" SubmitButtonText="Go" TextAfterPageIndexBox="椤�" AlwaysShow="true" TextBeforePageIndexBox="杞埌" PrevPageText="涓婁竴椤�" NextPageText="涓嬩竴椤�" FirstPageText="棣栭〉" LastPageText="鏈〉" PageSize="25" CurrentPageIndex="1">
</webdiyer:AspNetPager>
<div class="CB"></div>
</div>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx.designer.cs
index 25ae5a8..f137e52 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.common {
-
-
- public partial class UCPager {
-
+namespace CY.WebForm.Pages.common
+{
+
+
+ public partial class UCPager
+ {
+
/// <summary>
/// AspNetPager1 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx
index da50095..8a594c6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx
@@ -31,6 +31,34 @@
$("#NowPageAlreadyMoney").html(value_NowPageAlreadyMoney.toFixed(2));
$("#NowPageNoMoney").html(value_NowPageNoMoney.toFixed(2));
});
+
+ /*
+鎵撳嵃閫佽揣鍗�
+*/
+ function ToPrintdelev() {
+ var txtBeginData= $("#txtBeginData").val();
+ var txtEndDate= $("#txtEndDate").val();
+ var selPrintTypes = $("#selPrintTypes").val();
+
+ var selOrderTypes = $("#selOrderTypes").val();
+ var selPayStates = $("#selPayStates").val();
+ var selCustormerLevels = $("#selCustormerLevels").val();
+ var selAccountManagerId = $("#selAccountManagerId").val();
+ var selBusinessManagerId = $("#selBusinessManagerId").val();
+ var selOrderStates = $("#selOrderStates").val();
+ var txtCreaterName = $("#txtCreaterName").val();
+ var txtOrderId = $("#txtOrderId").val();
+ var txtCustormerName = $("#txtCustormerName").val();
+
+
+ // OpenWindowByUrl();
+ OpenWindowByUrl('/Pages/financial/OrderFinancialPrint.aspx?txtBeginData=' + txtBeginData + '&txtEndDate=' + txtEndDate + '&selPrintTypes=' + selPrintTypes
+ + '&selOrderTypes=' + selOrderTypes + '&selPayStates=' + selPayStates + '&selCustormerLevels=' + selCustormerLevels + '&selAccountManagerId=' + selAccountManagerId
+ + '&selBusinessManagerId=' + selBusinessManagerId + '&selOrderStates=' + selOrderStates + '&txtCreaterName=' + txtCreaterName + '&txtOrderId=' + txtOrderId
+ + '&txtCustormerName=' + txtCustormerName
+ , '', '');
+ }
+
</script>
<style type="text/css">
.th_operate{display<%=null == Request["customeid"]?"1":""%>:none;}
@@ -126,6 +154,7 @@
</td>
<td align="right">
<asp:Button ID="btn_Search" Text="鏌ヨ" runat="server" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+ <input type="button" value='鎵撳嵃' onclick='ToPrintdelev();' />
<input type="hidden" id='txtCommission' runat="server" />
</td>
</tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.designer.cs
index 862ba1d..9f4188e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.financial {
-
-
- public partial class OrderFinancial {
-
+namespace CY.WebForm.Pages.financial
+{
+
+
+ public partial class OrderFinancial
+ {
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// txtBeginData 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtBeginData;
-
+
/// <summary>
/// txtEndDate 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndDate;
-
+
/// <summary>
/// selPrintTypes 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selPrintTypes;
-
+
/// <summary>
/// selOrderTypes 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selOrderTypes;
-
+
/// <summary>
/// selPayStates 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selPayStates;
-
+
/// <summary>
/// selCustormerLevels 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selCustormerLevels;
-
+
/// <summary>
/// selAccountManagerId 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selAccountManagerId;
-
+
/// <summary>
/// selBusinessManagerId 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManagerId;
-
+
/// <summary>
/// selOrderStates 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selOrderStates;
-
+
/// <summary>
/// txtCreaterName 鎺т欢銆�
/// </summary>
@@ -119,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtCreaterName;
-
+
/// <summary>
/// txtOrderId 鎺т欢銆�
/// </summary>
@@ -128,7 +130,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtOrderId;
-
+
/// <summary>
/// txtCustormerName 鎺т欢銆�
/// </summary>
@@ -137,7 +139,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
-
+
/// <summary>
/// btn_Search 鎺т欢銆�
/// </summary>
@@ -146,7 +148,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button btn_Search;
-
+
/// <summary>
/// txtCommission 鎺т欢銆�
/// </summary>
@@ -155,7 +157,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtCommission;
-
+
/// <summary>
/// rptData 鎺т欢銆�
/// </summary>
@@ -164,7 +166,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater rptData;
-
+
/// <summary>
/// NowPageAllMoney 鎺т欢銆�
/// </summary>
@@ -173,7 +175,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowPageAllMoney;
-
+
/// <summary>
/// NowPageAlreadyMoney 鎺т欢銆�
/// </summary>
@@ -182,7 +184,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowPageAlreadyMoney;
-
+
/// <summary>
/// NowPageNoMoney 鎺т欢銆�
/// </summary>
@@ -191,7 +193,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowPageNoMoney;
-
+
/// <summary>
/// AllMoney 鎺т欢銆�
/// </summary>
@@ -200,7 +202,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl AllMoney;
-
+
/// <summary>
/// AlreadyMoney 鎺т欢銆�
/// </summary>
@@ -209,7 +211,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl AlreadyMoney;
-
+
/// <summary>
/// NoMoney 鎺т欢銆�
/// </summary>
@@ -218,7 +220,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NoMoney;
-
+
/// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx
new file mode 100644
index 0000000..ab51455
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx
@@ -0,0 +1,130 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OrderFinancialPrint.aspx.cs" Inherits="CY.WebForm.Pages.financial.OrderFinancialPrint" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <title>璁㈠崟璇︽儏</title>
+ <script src="../../js/utils/jquery-1.5.1.min.js" type="text/javascript"></script>
+ <script src="../../js/common/util.js" type="text/javascript"></script>
+ <script src="../../js/common/KeyBehaviorHook.js" type="text/javascript"></script>
+ <script src="../../js/common/Printterpiliang.js?v=16" type="text/javascript"></script>
+ <script src="../../js/common/LodopFuncs.js" type="text/javascript"></script>
+ <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
+ <!--鍓嶅彴椤甸潰start-->
+ <style type="text/css">
+ .dbody { margin: 0; margin-left: auto; margin-right: auto; }
+ .dtitle { text-align: center; font-size: 19px; font-weight: bold; margin-top: 10px; margin-bottom: 10px; }
+ .dbody table { width: 100%; border: 1px solid #dddddd; font-size: 12px; margin-top: 5px; border-top: 1px #999999 solid; }
+ .dbody table th, .dbody table td { font-weight: normal; height: 20px; line-height: 20px; vertical-align: middle; border: 1px solid #999999; border-top: 0; }
+ .dbody table th { background-color: #E0EDF6; font-weight: bold; }
+ .dbody table td { border-left: 0; padding-left:2px; }
+ .left {text-align: right; }
+ #div_tool { text-align: center; }
+ </style>
+ <script type="text/javascript">
+
+
+
+ </script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div class='dbody'>
+
+ <object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width="0" height="0">
+ <embed id="LODOP_EM" type="application/x-print-lodop" width="0" height="0" pluginspage="/Pages/common/install_lodop32.exe"></embed>
+ </object>
+ <div id='div_tool' printparams='0,2100,2970,"A4"'>
+ </div>
+ <%=ssshtml%>
+
+ <%-- <div class="printtable printtable1">
+ <table border="1" cellpadding="0" cellspacing="0" style="border: 0;">
+
+ <tr>
+
+ <td style="width:3%;">
+ 椤哄簭
+ </td>
+ <td style="text-align: center;" width="7%">
+ 瑕佹眰鍒拌揪鏃堕棿
+ </td>
+
+
+ <td width="10%">
+ 涓氬姟缁忕悊
+ </td>
+ <td width="15%">
+ 瀹㈡埛鍗曚綅
+ </td>
+ <td style="text-align: center;"width="30%">
+ 瀹㈡埛鍦板潃銆佽仈绯讳汉鍙婅仈绯荤數璇�
+ </td>
+
+
+ <td width="5%">
+ 璐у崟鏁伴噺
+ </td>
+ <td width="7%">
+ 杞﹁締
+ </td>
+ <td width="7%">
+ 椹鹃┒鍛�
+ </td>
+ <td width="30%">
+ 娉ㄦ剰浜嬮」
+ </td>
+
+
+ </tr>
+
+
+ <asp:repeater id="RepClientList" runat="server">
+ <itemtemplate>
+ <tr>
+
+
+ <td>
+ <%#Eval("Sort")%>
+ </td>
+
+ <td>
+ <%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>
+ </td>
+
+ <td>
+ <%#Eval("BusinessManager")%>
+ </td>
+ <td>
+ <%#Eval("BuyerName")%>
+ </td>
+
+ <td>
+ <%#Eval("DizhiLianxirenDianhua")%>
+ </td>
+ <td>
+ <%#Eval("shuliang")%>
+ </td>
+ <td>
+ <%#Eval("CarName")%>
+ </td>
+ <td>
+ <%#Eval("DriverName")%>
+ </td>
+ <td>
+ <%#Eval("Zhuyishixiang")%>
+ </td>
+
+ </tr>
+ </itemtemplate>
+ </asp:repeater>
+
+ </table>
+ </div>--%>
+ <br />
+
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx.cs
new file mode 100644
index 0000000..b6f2c20
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx.cs
@@ -0,0 +1,134 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL;
+using CY.Model;
+using CY.Infrastructure.Query;
+using CY.Infrastructure.Common;
+using CY.BLL.Sys;
+using CY.BLL.OA;
+using CY.BLL.EC;
+using CY.BLL.Inquiry;
+using CY.Model.Inquiry;
+
+namespace CY.WebForm.Pages.financial
+{
+ public partial class OrderFinancialPrint : BasePage
+ {
+ EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+
+ public string ssshtml = "";
+
+ //鍒濆鍖�
+ public OrderFinancialPrint()
+ {
+
+ _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+
+ }
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ if (!IsPostBack)
+ {
+
+
+
+
+
+ BindList();
+
+ }
+ }
+
+ //缁戝畾鍒楄〃
+ private void BindList()
+ {
+
+ Pagination pa = new Pagination();
+ pa.PageSize = 10000;
+ pa.PageIndex = 1;
+
+
+
+ Dictionary<int, object> searchParam = new Dictionary<int, object>();
+ Guid customeid = MyConvert.ConvertToGuid(Request["customeid"]);
+ if (!Guid.Empty.Equals(customeid))
+ SetParamValue(searchParam, 0, customeid);
+ SetParamValue(searchParam, 1, CurrentUser.MemberId);
+ SetParamValue(searchParam, 2, Request["txtOrderId"].ToString2());
+ SetParamValue(searchParam, 3, Request["txtCustormerName"].ToString2());
+ SetParamValue(searchParam, 4, Request["txtBeginData"].ToString2());
+ SetParamValue(searchParam, 5, Request["txtEndDate"].ToString2());
+ SetParamValue(searchParam, 6, Request["selPrintTypes"].ToString2());
+ SetParamValue(searchParam, 7, Request["selOrderTypes"].ToString2());
+ SetParamValue(searchParam, 8, Request["selOrderStates"].ToString2());
+ SetParamValue(searchParam, 9, Request["selPayStates"].ToString2());
+ SetParamValue(searchParam, 10, Request["txtCreaterName"].ToString2());
+ SetParamValue(searchParam, 11, Request["selCustormerLevels"].ToString2());
+ SetParamValue(searchParam, 12, Request["selAccountManagerId"].ToString2());
+ SetParamValue(searchParam, 13, Request["selBusinessManagerId"].ToString2());
+
+
+
+
+
+
+ List<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Financial(pa, searchParam).ToList();
+
+
+ int aaa = 1;
+
+ //List<OA_DeliverPlan> oA_DeliverPlans1 = oA_DeliverPlans.OrderBy(x => x.DriverId).ThenBy(x => x.Sort).ToList();
+ ssshtml = "";
+ ssshtml += "<div class=\"printtable printtable1\"> <table border=\"1\" cellpadding=\"0\" cellspacing=\"0\" style=\"border:0;\">";
+ ssshtml += "<tr><th style=\"width:2%;\">缂栧彿</th><th style=\"text-align:center;\"width=\"7%\">璁㈠崟鍙�</th><th width=\"20%\">鍗颁欢鍚嶇О</th><th width=\"15%\">瀹㈡埛鍚嶇О</th><th style=\"text-align:center;\"width=\"5%\">鍗板埛绫诲埆</th><th width=\"5%\">璁㈠崟鐘舵��</th><th width=\"5%\">鏀粯鐘舵��</th><th width=\"5%\">璁㈠崟绫诲瀷</th><th width=\"5%\">鍗板埛鏁伴噺</th><th width=\"5%\">閲戦</th><th width=\"5%\">宸叉敹娆�</th><th width=\"5%\">鏈敹娆�</th></tr>";
+ for (int i = 0; i < result.Count; i++)
+ {
+
+
+
+
+ ssshtml += "<tr><td>" + (i+1) + "</td><td>" + result[i].SellerOrderId + "</td><td>" + result[i].DocumentName + "</td><td>" + result[i].BuyerName + "</td><td>" + result[i].PrintType.PrintName + "</td><td>" + result[i].OrderStateObj.Name + "</td><td>" + result[i].PayStateObj.Name + "</td><td>" + result[i].OrderType.Name + "</td><td>" + result[i].OrderExtend.PrintNum + " </td><td>" + result[i].SumPrice + "</td><td>" + result[i].TradingSingle.PayedMoney + "</td><td>" + result[i].UnPayedMoney + "</td></tr>";
+
+
+
+
+ }
+ ssshtml += "</table></div>";
+
+ // this.RepClientList.DataSource =
+ //this.RepClientList.DataBind();
+ //UCPager1.AspNetPager.RecordCount = pa.RecordCount;
+ }
+
+ /// <summary>
+ /// 璁剧疆鏌ヨ鍙傛暟鏂规硶
+ /// </summary>
+ /// <param name="target">璁剧疆鐩爣</param>
+ /// <param name="key">閿�</param>
+ /// <param name="value">鍊�</param>
+ private static void SetParamValue(Dictionary<int, object> target, int key, object value)
+ {
+ if (string.IsNullOrEmpty(string.Format("{0}", value)))
+ return;
+ else
+ {
+ }
+
+ if (target.ContainsKey(key))
+ {
+ target[key] = value;
+ }
+ else
+ {
+ target.Add(key, value);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx.designer.cs
new file mode 100644
index 0000000..fa8255f
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancialPrint.aspx.designer.cs
@@ -0,0 +1,35 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.financial
+{
+
+
+ public partial class OrderFinancialPrint
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs
index 811bc01..580d5ec 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs
@@ -66,7 +66,13 @@
string[] orderIds = Request["ids"].Split(',');
string receiveWay = Request["rdoReceiveWay"];
bool isWin = false;
- using (var scope = new TransactionScope())
+ using (var scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ ))
{
foreach (string orderId in orderIds)
{
--
Gitblit v1.9.1