From c05f1b8cf051bb46f6ec8f9855a9c3fd11c88f67 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 24 十月 2025 09:33:24 +0800
Subject: [PATCH] 修改一下订单管理和生产管理的流程
---
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 2 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 6 +++---
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx.cs | 6 +++---
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 885bfba..62d4cd8 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -1176,7 +1176,7 @@
new SqlParameter("@createTimeEnd",DBNull.Value){SqlDbType=SqlDbType.Date},
new SqlParameter("@printType",DBNull.Value){SqlDbType=SqlDbType.Int},
new SqlParameter("@orderType",DBNull.Value){SqlDbType=SqlDbType.Int},
- new SqlParameter("@orderState",DBNull.Value){SqlDbType=SqlDbType.Int},
+ new SqlParameter("@orderState",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
new SqlParameter("@orderPayState",DBNull.Value){SqlDbType=SqlDbType.Int},
new SqlParameter("@creater",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
new SqlParameter("@customerLevel",DBNull.Value){SqlDbType=SqlDbType.Int},
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx.cs
index 1d39af2..cbf8ab6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx.cs
@@ -87,12 +87,12 @@
this.selPrintTypes.Items.Insert(0, new ListItem("鎵�鏈�", ""));
this.selOrderTypes.Items.Add(new ListItem("鎵�鏈�", ""));
this.selOrderStates.Items.Add(new ListItem("鎵�鏈�", ""));
- this.selOrderStates.Items.Add(new ListItem("鏈紑宸�", "2"));
+ this.selOrderStates.Items.Add(new ListItem("鏈紑宸�", "1,2"));
this.selOrderStates.Items.Add(new ListItem("宸插紑宸�", "3"));
this.selPrintTypes.Value = "";
this.selOrderTypes.Value = "";
- this.selOrderStates.Value = "2";
+ this.selOrderStates.Value = "1,2";
this.selPayStates.Value = "";
this.selClientManager.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, true);
@@ -172,7 +172,7 @@
/// <param name="e"></param>
private void AspNetPager_PageChanged(object sender, EventArgs e)
{
- if(this.selOrderStates.Value == "2")
+ if(this.selOrderStates.Value == "1,2")
{
UCPager1.AspNetPager.PageSize = 1000;
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
index 91530ef..54db765 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
@@ -380,7 +380,7 @@
<tr>
<td>
- <%#Container.ItemIndex +1 /*(UCPager1.PageSize *( UCPager1.PageIndex-1)+1)*/%>
+ <%#(UCPager1.PageSize *( UCPager1.PageIndex-1) + Container.ItemIndex +1)%>
</td>
<td>
<%#Eval("CreateTime", "{0:yyyy-MM-dd}")%>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 39dc123..ec0aa74 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -389,9 +389,9 @@
<a href="javascript:;" class='delete' menu_member_case_id="case_deleteOrderList" menu_member_case_name="鎵归噺鍒犻櫎" onclick="ToBatch(BatchDelete,IsObjCanntDelete);"><span class="icon_delete">鎵归噺鍒犻櫎</span></a>
<div class="box_tool_line">
</div>
- <a href="javascript:;" menu_member_case_id="case_ToAllAcceptList" menu_member_case_name="鎵归噺鍙楃悊" onclick="ToAllAccept();"><span class="icon_edit">鎵归噺鍙楃悊</span></a>
+ <%-- <a href="javascript:;" menu_member_case_id="case_ToAllAcceptList" menu_member_case_name="鎵归噺鍙楃悊" onclick="ToAllAccept();"><span class="icon_edit">鎵归噺鍙楃悊</span></a>
<div class="box_tool_line">
- </div>
+ </div>--%>
<a href="javascript:;" menu_member_case_id="case_ToCompledList" menu_member_case_name="鎵归噺瀹屽伐" onclick="ToCompled();"><span class="icon_edit">鎵归噺瀹屽伐</span></a>
<div class="box_tool_line">
</div>
@@ -605,7 +605,7 @@
<%#true.Equals(Eval("IsPrint")) ? "鈭�" : "鎵撳嵃"%></span>
</td>
<td class="td_hide" menu_member_case_id="case_ToAccept" menu_member_case_name="鍙楃悊">
- <span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"鍙楃悊")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ?"title='宸插彈鐞�'":"title='鍙楃悊'"%> onclick="ToAccept(<%#Eval("SumPrice" )%>,'<%#Eval("SellerOrderId")%>',<%#Eval("Keyid")%>,<%#Eval("OrderTypeId")%>)">
+ <span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"鍙楃悊")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ?"title='宸插彈鐞�'":"title='鍙楃悊'"%> <%--onclick="ToAccept(<%#Eval("SumPrice" )%>,'<%#Eval("SellerOrderId")%>',<%#Eval("Keyid")%>,<%#Eval("OrderTypeId")%>)"--%> >
<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ? "鈭�" : "鍙楃悊"%></span>
</td>
<td >
--
Gitblit v1.9.1