From 17f9893bcf92ce8f68f88c6d97b957b025a2cd5e Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 17 十月 2022 10:10:23 +0800
Subject: [PATCH] 修改批量收款不查询终止订单，完结客户可以修改
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs | 2 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs | 1 +
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
index 857104a..57a765a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
@@ -193,8 +193,9 @@
<td class="ali02" colspan="6">
+ <asp:Button ID="btn_Submit" Text="淇濆瓨" runat="server" OnClick="btn_Submit_Config" />
<% if (Shifouwanjie != "1") {%>
- <asp:Button ID="btn_Submit" Text="淇濆瓨" runat="server" OnClick="btn_Submit_Config" /> <asp:Button ID="btn_wanjie" Text="瀹岀粨" runat="server" OnClick="btn_Submit_Wanjie" />
+ <asp:Button ID="btn_wanjie" Text="瀹岀粨" runat="server" OnClick="btn_Submit_Wanjie" />
<% } %>
<input type="hidden" id="HideKeyid" value="<%=Request["Keyid"]%>" />
<input type="hidden" id="saveKey" runat="server" />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
index e68413e..41575e2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
@@ -142,6 +142,7 @@
m_OA_CorporateClients.DegreeImportanId = this.selDegreeImportanId.Value.ToInt32() ?? 0;
m_OA_CorporateClients.AccountManagerId = this.selAccountManagerId.Value.ToInt32() ?? 0;
m_OA_CorporateClients.BusinessManagerId = this.selBusinessManagerId.Value.ToInt32() ?? 0;
+ m_OA_CorporateClients.Shifouwanjie = 2;
//add by zyyao
m_OA_CorporateClients.Paytime = this.selPaytime.Value.ToInt32() ?? 0;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs
index 34b1080..fdcc644 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs
@@ -561,7 +561,7 @@
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);
+ IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Seller(pagination, SearchParam).Where(x => x.OrderState != 0);//.Where(x=>x.Quchudingdan == 2);
rptData.DataSource = result;
rptData.DataBind();
--
Gitblit v1.9.1