From eea9ea3094e223d531ec058a1ef6e1656b0a5216 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 10 三月 2025 09:05:22 +0800
Subject: [PATCH] 送货单逾期不要 就是要订单没有送货的逾期 完成 送货管理下 未送货订单 /Pages/business/OrderSonghuoanchiList.aspx 01
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.designer.cs | 53 +
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx | 203 +++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx.cs | 357 ++++++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx | 6
CY_ECommercePlatform/CY.WebForm/js/business/Order.js | 32 +
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs | 94 ++++
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs | 20
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 11
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs | 14
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx.designer.cs | 224 ++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanZhuyishixiang.aspx.cs | 6
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 8
CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.cs | 188 ++++---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx | 48 +-
15 files changed, 1,136 insertions(+), 132 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index 84ff7ae..902ceab 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -674,6 +674,100 @@
+ /// <summary>
+ /// 鏌ヨ瀹㈡埛棰勪粯娆惧垪琛�
+ /// </summary>
+ /// <param name="pa"></param>
+ /// <returns></returns>
+ public IEnumerable<EC_OrderBasic> GetModelPageListForSonghuoyanchis(Pagination pa, string DeliveryTime, string Province, string City, string County, string BuyerName, string BusinessManagerId, string SellerOrderId, string DocumentName, Guid SellerId)
+ {
+ string Condition = " and ( ob.[OrderState] ='1' or ob.[OrderState] ='2' or ob.[OrderState] ='3' or ob.[OrderState] ='4' ) and SellerId='" + SellerId + "' ";
+
+ if (!string.IsNullOrEmpty(DeliveryTime))
+ {
+ if (DeliveryTime == "鏄庡ぉ")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=1 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=1 )";
+ }
+ else if (DeliveryTime == "鍚庡ぉ")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=2 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=2 )";
+ }
+ else if (DeliveryTime == "3澶�")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=3 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=3 )";
+ }
+ else if (DeliveryTime == "4澶�")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=4 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=4 )";
+ }
+ else if (DeliveryTime == "5澶�")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=5 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=5) ";
+ }
+ else if (DeliveryTime == "6澶�")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=6 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=6) ";
+ }
+ else if (DeliveryTime == "7澶�")
+ {
+ 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]) >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 )";
+ }
+
+ }
+
+ if (!string.IsNullOrEmpty(Province))
+ Condition += string.Format(" and CustomerCommunications.Province='{0}'", Province);
+
+ if (!string.IsNullOrEmpty(City))
+ Condition += string.Format(" and CustomerCommunications.City='{0}'", City);
+
+ if (!string.IsNullOrEmpty(County))
+ Condition += string.Format(" and CustomerCommunications.County='{0}'", County);
+
+ if (!string.IsNullOrEmpty(BuyerName))
+ {
+ Condition += " and ob.BuyerName like '%" + BuyerName + "%'";
+ }
+ if (!string.IsNullOrEmpty(BusinessManagerId))
+ {
+ Condition += string.Format(" and oe.BusinessManagerId='{0}'", BusinessManagerId);
+ }
+
+
+
+ if (!string.IsNullOrEmpty(SellerOrderId))
+ {
+ Condition += " and ob.SellerOrderId like '%" + SellerOrderId + "%'"; ;
+ }
+ if (!string.IsNullOrEmpty(DocumentName))
+ {
+ Condition += " and ob.DocumentName like '%" + DocumentName + "%'"; ;
+ }
+
+
+ Query query = new Query();
+ IList<Criterion> criterias = new List<Criterion>()
+ {
+ new Criterion("", Condition),
+
+ new Criterion("orderBy"," [DeliveryTime] DESC ")
+ };
+ query.Criteria = criterias;
+ return _eC_OrderBasicDAL.SelectModelPage_weiwangong(query, pa);
+ }
+
+
+
+
/// <summary>
/// 鏍规嵁鏂板璁㈠崟鎿嶄綔锛屽苟淇敼璁㈠崟鐘舵��
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
index 418b40b..0771cec 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
@@ -157,7 +157,7 @@
string CarId, string DriverId,string trueMemberId ="", string CustormerName = "", string BusinessManager = "")
{
string Condition = " and od.FirmId ='" + FirmId + "' and od.shifouDelivery = 1 ";
- string sort = " case when Sort is null then 1 else 0 end asc,Sort asc ";
+ string sort = " Dizhi asc ";
if (!string.IsNullOrEmpty(DeliveredTime) )
{
if(DeliveredTime != "閫炬湡")
@@ -168,7 +168,7 @@
else
{
Condition += " and DATEDIFF(day,GETDATE(),od.[DeliverTime])<0 and od.[DeliveredTime] is null ";
- sort = " DeliverTime desc,Sort asc ";
+ sort = " DeliverTime desc,Dizhi asc ";
}
}
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs
index 15f14f2..cc277fd 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs
@@ -132,6 +132,26 @@
get { return _documentname; }
}
+
+ /// <summary>
+ /// 鍗颁欢鍚嶇О
+ /// </summary>
+ public string Shifoubiaohongwangong
+ {
+ get;
+ set;
+
+ }
+ /// <summary>
+ /// 鍗颁欢鍚嶇О
+ /// </summary>
+ public string Shifoubiaohongsonghuo
+ {
+ get;
+ set;
+
+ }
+
/// <summary>
/// 浜よ揣鏃堕棿
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 713ca6c..d39ebaf 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1893,6 +1893,7 @@
<Content Include="Pages\business\DeliverPlanPaiche.aspx" />
<Content Include="Pages\business\DeliverPlanShifou.aspx" />
<Content Include="Pages\business\DeliverPlanLishiPrint.aspx" />
+ <Content Include="Pages\business\OrderSonghuoanchiList.aspx" />
<Content Include="Pages\business\OrderUpLoadLiuyang.aspx" />
<Content Include="Pages\business\WaixieOrderPrint.aspx" />
<Content Include="Pages\business\Waixiefukuanweikaipiao.aspx" />
@@ -3392,6 +3393,13 @@
<Compile Include="Pages\business\DeliverPlanLishiPrint.aspx.designer.cs">
<DependentUpon>DeliverPlanLishiPrint.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\OrderSonghuoanchiList.aspx.cs">
+ <DependentUpon>OrderSonghuoanchiList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\OrderSonghuoanchiList.aspx.designer.cs">
+ <DependentUpon>OrderSonghuoanchiList.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\OrderUpLoadLiuyang.aspx.cs">
<DependentUpon>OrderUpLoadLiuyang.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
index 0f3af0c..9233c2b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
@@ -434,7 +434,7 @@
<input type="button" value='鏂板閫佽揣' onclick='ToAddorder();' />
<input type="button" value='娲捐溅' onclick='ToAllAccept3();' />
- <input type="button" value='鍗曟嵁绉讳氦' onclick='ToAllAccept4();' />
+ <%-- <input type="button" value='鍗曟嵁绉讳氦' onclick='ToAllAccept4();' /> --%>
<input type="button" value='鎵撳嵃鍏ㄩ儴' onclick='ToPrintdelev();' />
</td>
@@ -495,9 +495,9 @@
<th style="text-align: center;" width="70">
瑕佹眰鍒拌揪鏃堕棿
</th>
- <th style="text-align: center;"width="100">
+ <%-- <th style="text-align: center;"width="100">
瀹為檯鍒拌揪鏃堕棿
- </th>
+ </th>--%>
<th width="70">
涓氬姟缁忕悊
</th>
@@ -510,32 +510,34 @@
<th width="60">
- 璐у崟鏁伴噺
+ 璁㈠崟鏁伴噺
</th>
- <th width="60">
+ <%-- <th width="60">
杞﹁締
- </th>
+ </th>--%>
<th width="60">
椹鹃┒鍛�
</th>
- <th width="200">
- 闂鍙嶉
- </th>
+ <%-- <th width="200">
+ 闂鍙嶉 </th>
+ --%>
+
+
<th width="200">
娉ㄦ剰浜嬮」
</th>
- <th width="200">
+ <%-- <th width="200">
宸ヤ綔鑰冭瘎
</th>
<th width="60">
绉讳氦鐘舵��
- </th>
+ </th>--%>
<th width="60">
鎵撳嵃閫佽揣鍗�
</th>
- <th width="60">
+ <%-- <th width="60">
閫佽揣鍗曞浘鐗�
- </th>
+ </th>--%>
</tr>
</thead>
<tbody>
@@ -561,9 +563,9 @@
<td>
<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>
</td>
- <td>
+ <%--<td>
<%#Eval("DeliveredTime", "{0:yyyy-MM-dd}")%>
- </td>
+ </td>--%>
<td>
<%#Eval("BusinessManager")%>
</td>
@@ -577,30 +579,30 @@
<td>
<%#Eval("shuliang")%>
</td>
- <td>
+ <%--<td>
<%#Eval("CarName")%>
- </td>
+ </td>--%>
<td>
<%#Eval("DriverName")%>
</td>
- <td>
+ <%-- <td>
<%#Eval("wentifankui")%>
- </td>
+ </td>--%>
<td>
<a href='javascript:void(0)' title='鐐瑰嚮淇敼娉ㄦ剰浜嬮」' class='a_under' onclick='ViewZhuyishixiang("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>")'> <%#Eval("Zhuyishixiang").ToString()==""?"淇敼娉ㄦ剰浜嬮」":Eval("Zhuyishixiang")%> </a>
</td>
- <td>
+ <%--<td>
<a href='javascript:void(0)' title='鐐瑰嚮淇敼宸ヤ綔鑰冭瘎' class='a_under' onclick='ViewGongzuokaoping("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>")' ><%#Eval("Gongzuokaoping").ToString()==""?"淇敼宸ヤ綔鑰冭瘎":Eval("Gongzuokaoping")%> </a>
</td>
<td style="text-align: center;">
<%#Eval("TransferName")==null || Eval("TransferName").ToString()==""?"鏈Щ浜�":Eval("TransferName")%>
- </td>
+ </td>--%>
<td>
<a href='javascript:void(0)' title='鎵撳嵃閫佽揣鍗�' class='a_under' onclick='ToPrintDriverorder("<%#Eval("Keyid")%>")'> 鎵撳嵃 </a>
</td>
- <td>
+ <%--<td>
<a href='javascript:void(0)' title='閫佽揣鍗曞浘鐗�' class='a_under' onclick='onViewuplod("<%#Eval("Keyid")%>")'> 閫佽揣鍗曞浘鐗� </a>
- </td>
+ </td>--%>
</tr>
</itemtemplate>
</asp:repeater>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanZhuyishixiang.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanZhuyishixiang.aspx.cs
index 4d3da45..e06eae0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanZhuyishixiang.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanZhuyishixiang.aspx.cs
@@ -40,7 +40,7 @@
OA_DeliverPlan oA_DeliverPlan = oA_DeliverPlanBLL.GetModelByKeyid(Request["Keyid"].ToGuid2(), Request["BuyerId"].ToGuid2(), Request["DeliverTime"].ToDateTime2());
if (oA_DeliverPlan != null)
{
- this.txtZhuyishixiang.Value = oA_DeliverPlan.Zhuyishixiang ;
+ this.txtZhuyishixiang.Value = oA_DeliverPlan.Remark ;
}
@@ -83,6 +83,7 @@
oA_DeliverPlan.BuyerId = BuyerId;
oA_DeliverPlan.DeliveredTime = null;
oA_DeliverPlan.Zhuyishixiang = Zhuyishixiang;
+ oA_DeliverPlan.Remark = Zhuyishixiang;
oA_DeliverPlan.Gongzuokaoping = "";
oA_DeliverPlan.CarId = 0;
oA_DeliverPlan.DriverId = 0;
@@ -99,6 +100,9 @@
else
{
oA_DeliverPlan.Zhuyishixiang = Zhuyishixiang;
+ oA_DeliverPlan.Remark = Zhuyishixiang;
+ oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.LastUpdateTime = DateTime.Now;
result = oA_DeliverPlanBLL.UpdateModel(oA_DeliverPlan);
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx
index 001a63f..86a05fe 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx
@@ -44,7 +44,11 @@
<body>
<form id="form1" runat="server" class="form">
<table class="tableStyle">
- <tr><td class="ali03">璁㈠崟缂栧彿锛�</td><td colspan="3"><%=Request["OrderShowId"] %></td></tr>
+ <asp:Repeater ID="RepClientList" runat="server">
+ <ItemTemplate>
+ <tr><td class="ali03">璁㈠崟缂栧彿锛�</td><td colspan="3"> <%#Eval("SellerOrderId")%></td></tr>
+ </ItemTemplate>
+ </asp:Repeater>
<tr><td class="ali03">閫佽揣鐘舵�侊細</td><td colspan="3"><asp:RadioButtonList ID="radDeliverType" runat="server" RepeatDirection="Horizontal"><asp:ListItem Value="-1" Text="鏈�佽揣"></asp:ListItem><asp:ListItem Value="1" Text="宸查�佽揣" Selected="True"></asp:ListItem></asp:RadioButtonList></td></tr>
<tr><td class="ali03">璐ц繍鍗曞彿锛�</td><td colspan="3"><asp:TextBox ID="txtTheAwb" runat="server"></asp:TextBox></td></tr>
<tr><td class="ali03">閫佽揣浜猴細</td><td colspan="3"><asp:TextBox ID="txtDeliverPerson" runat="server"></asp:TextBox></td></tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.cs
index 227855c..6a4daa9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.cs
@@ -17,20 +17,20 @@
private EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
private Sys_DictionaryBLL _bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
private EC_AcceptWayByOrderBLL _AcceptWayByOrderBLL = new EC_AcceptWayByOrderBLL();
- public int orderId
- {
- get
- {
- if (Request["id"] != null)
- {
- return Request["id"].ToString().ToInt32().Value;
- }
- else
- {
- return 0;
- }
- }
- }
+ //public int orderId
+ //{
+ // get
+ // {
+ // if (Request["id"] != null)
+ // {
+ // return Request["id"].ToString().ToInt32().Value;
+ // }
+ // else
+ // {
+ // return 0;
+ // }
+ // }
+ //}
/// <summary>
/// 缁戝畾鏀惰揣鏂瑰紡
@@ -50,9 +50,13 @@
if (!IsPostBack)
{
BindAcceptType();
- if (orderId != 0)
- {
- EC_AwbInfo model = _eC_OrderBasicBLL.SelectAwbInfoById(orderId);
+
+ List<EC_OrderBasic> m_EC_OrderBasicList = _eC_OrderBasicBLL.GetEC_OrderBasicListByKeyid(Request["ids"].ToString2().Trim(','), CurrentUser.MemberId) as List<EC_OrderBasic>;
+ this.RepClientList.DataSource = m_EC_OrderBasicList;
+ this.RepClientList.DataBind();
+
+
+ EC_AwbInfo model = _eC_OrderBasicBLL.SelectAwbInfoById(m_EC_OrderBasicList[0].Keyid.Value);
if (model != null)
{
this.txtTheAwb.Text = model.TheAwb;
@@ -86,7 +90,7 @@
else
{
this.txtDeliverTime.Text = DateTime.Now.ToShortDateString();
- EC_AcceptWayByOrder acceptWayByOrder = _AcceptWayByOrderBLL.GetModelByTargetId(orderId);
+ EC_AcceptWayByOrder acceptWayByOrder = _AcceptWayByOrderBLL.GetModelByTargetId(m_EC_OrderBasicList[0].Keyid.Value);
if (acceptWayByOrder != null)
{
this.ddlAcceptType.SelectedValue = acceptWayByOrder.AcceptTypeId.ToString();
@@ -118,7 +122,7 @@
}
}
}
- }
+
}
}
@@ -127,76 +131,100 @@
protected void btnSubmit_Click(object sender, EventArgs e)
{
bool isSuccess = false;
- EC_AwbInfo eC_AwbInfo = new EC_AwbInfo();
- eC_AwbInfo.Keyid = orderId;
- eC_AwbInfo.TheAwb = this.txtTheAwb.Text;
- eC_AwbInfo.DeliverPerson = this.txtDeliverPerson.Text;
- if (this.txtDeliverTime.Text != string.Empty)
- eC_AwbInfo.DeliverTime = this.txtDeliverTime.Text.ToDateTime2();
+ string[] ids = Request["ids"].ToString2().Trim(',').Split(',');
- eC_AwbInfo.AcceptTypeId = ddlAcceptType.SelectedValue.ToString().ToInt32().Value;
- switch (eC_AwbInfo.AcceptTypeId)
+ foreach (var item in ids)
{
- case 104:
- eC_AwbInfo.AppointCourierCompany = string.Empty;
- eC_AwbInfo.FetchAddress = string.Empty;
- eC_AwbInfo.FetchContacts = string.Empty;
- eC_AwbInfo.FetchPhoneNum = string.Empty;
- break;
- case 105:
- eC_AwbInfo.AppointCourierCompany = this.txtAppointCourierCompany.Text;
- eC_AwbInfo.FetchAddress = this.txtFetchAddress.Text;
- eC_AwbInfo.FetchContacts = this.txtFetchContacts.Text;
- eC_AwbInfo.FetchPhoneNum = this.txtFetchPhoneNum.Text;
- break;
- case 106:
- eC_AwbInfo.AppointCourierCompany = string.Empty;
- eC_AwbInfo.FetchAddress = string.Empty;
- eC_AwbInfo.FetchContacts = this.txtAcceptPerson.Text;
- eC_AwbInfo.FetchPhoneNum = this.txtAcceptPhoneNum.Text;
- break;
- case 107:
- eC_AwbInfo.AppointCourierCompany = this.txtAppointCourierCompany.Text;
- eC_AwbInfo.FetchAddress = this.txtFetchAddress.Text;
- eC_AwbInfo.FetchContacts = this.txtFetchContacts.Text;
- eC_AwbInfo.FetchPhoneNum = this.txtFetchPhoneNum.Text;
- break;
+ EC_AwbInfo eC_AwbInfo = new EC_AwbInfo();
+ eC_AwbInfo.Keyid = item.ToInt32();
+ eC_AwbInfo.TheAwb = this.txtTheAwb.Text;
+ eC_AwbInfo.DeliverPerson = this.txtDeliverPerson.Text;
+ if (this.txtDeliverTime.Text != string.Empty)
+ eC_AwbInfo.DeliverTime = this.txtDeliverTime.Text.ToDateTime2();
+
+ eC_AwbInfo.AcceptTypeId = ddlAcceptType.SelectedValue.ToString().ToInt32().Value;
+ switch (eC_AwbInfo.AcceptTypeId)
+ {
+ case 104:
+ eC_AwbInfo.AppointCourierCompany = string.Empty;
+ eC_AwbInfo.FetchAddress = string.Empty;
+ eC_AwbInfo.FetchContacts = string.Empty;
+ eC_AwbInfo.FetchPhoneNum = string.Empty;
+ break;
+ case 105:
+ eC_AwbInfo.AppointCourierCompany = this.txtAppointCourierCompany.Text;
+ eC_AwbInfo.FetchAddress = this.txtFetchAddress.Text;
+ eC_AwbInfo.FetchContacts = this.txtFetchContacts.Text;
+ eC_AwbInfo.FetchPhoneNum = this.txtFetchPhoneNum.Text;
+ break;
+ case 106:
+ eC_AwbInfo.AppointCourierCompany = string.Empty;
+ eC_AwbInfo.FetchAddress = string.Empty;
+ eC_AwbInfo.FetchContacts = this.txtAcceptPerson.Text;
+ eC_AwbInfo.FetchPhoneNum = this.txtAcceptPhoneNum.Text;
+ break;
+ case 107:
+ eC_AwbInfo.AppointCourierCompany = this.txtAppointCourierCompany.Text;
+ eC_AwbInfo.FetchAddress = this.txtFetchAddress.Text;
+ eC_AwbInfo.FetchContacts = this.txtFetchContacts.Text;
+ eC_AwbInfo.FetchPhoneNum = this.txtFetchPhoneNum.Text;
+ break;
+ }
+ eC_AwbInfo.Remark = this.txtRemark.Text;
+ eC_AwbInfo.Operate.OrderId = eC_AwbInfo.Keyid;
+ eC_AwbInfo.Operate.Remark = eC_AwbInfo.Remark;
+ eC_AwbInfo.Operate.Operator = CurrentUser.ShortName;
+ //int orderState = Request["OrderState"].ToString().ToInt32().Value;
+ var order = _eC_OrderBasicBLL.SelectModelById(item.ToInt32().Value);
+ int orderState = order.OrderState.Value;
+ if (orderState == -1)
+ {
+ eC_AwbInfo.Operate.OperateType = -1;
+ }
+ else if (this.radDeliverType.SelectedValue == "1")
+ {
+ eC_AwbInfo.Operate.OperateType = 5;
+ }
+ else
+ {
+ eC_AwbInfo.Operate.OperateType = 4;
+ }
+
+ isSuccess = _eC_OrderBasicBLL.DeliverPresswork(eC_AwbInfo);
+ if (isSuccess)
+ {
+ EC_OrderBasic m_EC_OrderBasic_Out = _eC_OrderBasicBLL.SelectFromOutOrderById(eC_AwbInfo.Keyid.ToInt32() ?? 0);
+ if (m_EC_OrderBasic_Out != null)
+ {
+ EC_AwbInfo m_EC_AwbInfoOut = new EC_AwbInfo();
+ m_EC_AwbInfoOut = eC_AwbInfo;
+ m_EC_AwbInfoOut.Keyid = m_EC_OrderBasic_Out.Keyid;
+ m_EC_AwbInfoOut.Operate.OrderId = eC_AwbInfo.Keyid;
+ isSuccess = _eC_OrderBasicBLL.DeliverPresswork(m_EC_AwbInfoOut);
+ if (!isSuccess)
+ {
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ }
+
+ }
+ else
+ {
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
}
- eC_AwbInfo.Remark = this.txtRemark.Text;
- eC_AwbInfo.Operate.OrderId = eC_AwbInfo.Keyid;
- eC_AwbInfo.Operate.Remark = eC_AwbInfo.Remark;
- eC_AwbInfo.Operate.Operator = CurrentUser.ShortName;
- int orderState = Request["OrderState"].ToString().ToInt32().Value;
- if (orderState == -1)
- {
- eC_AwbInfo.Operate.OperateType = -1;
- }
- else if (this.radDeliverType.SelectedValue == "1")
- {
- eC_AwbInfo.Operate.OperateType = 5;
- }
- else
- {
- eC_AwbInfo.Operate.OperateType = 4;
- }
+
+
- isSuccess = _eC_OrderBasicBLL.DeliverPresswork(eC_AwbInfo);
+
+
if (isSuccess)
{
- EC_OrderBasic m_EC_OrderBasic_Out = _eC_OrderBasicBLL.SelectFromOutOrderById(eC_AwbInfo.Keyid.ToInt32() ?? 0);
- if (m_EC_OrderBasic_Out != null)
- {
- EC_AwbInfo m_EC_AwbInfoOut = new EC_AwbInfo();
- m_EC_AwbInfoOut = eC_AwbInfo;
- m_EC_AwbInfoOut.Keyid = m_EC_OrderBasic_Out.Keyid;
- m_EC_AwbInfoOut.Operate.OrderId = eC_AwbInfo.Keyid;
- isSuccess = _eC_OrderBasicBLL.DeliverPresswork(m_EC_AwbInfoOut);
- }
- JavaScript.MessageBox("鎿嶄綔鎴愬姛", this,true,true);
+ JavaScript.MessageBox("鎿嶄綔鎴愬姛", this, true, true);
}
else
{
- JavaScript.MessageBox("鎿嶄綔澶辫触",this);
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.designer.cs
index 4c97bef..4c2aa90 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.business {
-
-
- public partial class DeliverWork {
-
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverWork
+ {
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,16 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+
/// <summary>
/// radDeliverType 鎺т欢銆�
/// </summary>
@@ -38,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.RadioButtonList radDeliverType;
-
+
/// <summary>
/// txtTheAwb 鎺т欢銆�
/// </summary>
@@ -47,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtTheAwb;
-
+
/// <summary>
/// txtDeliverPerson 鎺т欢銆�
/// </summary>
@@ -56,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtDeliverPerson;
-
+
/// <summary>
/// txtDeliverTime 鎺т欢銆�
/// </summary>
@@ -65,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtDeliverTime;
-
+
/// <summary>
/// ddlAcceptType 鎺т欢銆�
/// </summary>
@@ -74,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlAcceptType;
-
+
/// <summary>
/// txtAppointCourierCompany 鎺т欢銆�
/// </summary>
@@ -83,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtAppointCourierCompany;
-
+
/// <summary>
/// txtFetchContacts 鎺т欢銆�
/// </summary>
@@ -92,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtFetchContacts;
-
+
/// <summary>
/// txtFetchAddress 鎺т欢銆�
/// </summary>
@@ -101,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtFetchAddress;
-
+
/// <summary>
/// txtFetchPhoneNum 鎺т欢銆�
/// </summary>
@@ -110,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtFetchPhoneNum;
-
+
/// <summary>
/// txtAcceptPerson 鎺т欢銆�
/// </summary>
@@ -119,7 +130,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtAcceptPerson;
-
+
/// <summary>
/// txtAcceptPhoneNum 鎺т欢銆�
/// </summary>
@@ -128,7 +139,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtAcceptPhoneNum;
-
+
/// <summary>
/// txtRemark 鎺т欢銆�
/// </summary>
@@ -137,7 +148,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtRemark;
-
+
/// <summary>
/// btnSubmit 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 0e15ff0..353778e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -5,7 +5,7 @@
<head id="Head1" runat="server">
<title>璁㈠崟鍒楄〃</title>
<uc:cmshead id="CMSHead1" runat="server" />
- <script src="../../js/business/Order.js?v=7" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=8" type="text/javascript"></script>
<script type="text/javascript">
//璁㈠崟璇勪环
function evaluationModel(orderid) {
@@ -50,7 +50,7 @@
function DeliverWork(orderId, orderCode, orderState) {
- var url = "/Pages/business/DeliverWork.aspx?id=" + orderId;
+ var url = "/Pages/business/DeliverWork.aspx?ids=" + orderId;
url += "&OrderShowId=" + orderCode;
url += "&OrderState=" + orderState;
top.Dialog.open({ URL: url, Title: "閫佽揣", Height: 450, Width: 680 });
@@ -371,6 +371,9 @@
<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>
+ <a href="javascript:;" menu_member_case_id="case_ToSonghuoList" menu_member_case_name="鎵归噺閫佽揣" onclick="ToDeliverWork();"><span class="icon_edit">鎵归噺閫佽揣</span></a>
+ <div class="box_tool_line">
+ </div>
<a href="javascript:;" menu_member_case_id="case_ToPrintAwbOrder" menu_member_case_name="鎵撳嵃閫佽揣鍗�" onclick="ToPrintAwbOrder()"><span class="icon_edit">鎵撳嵃閫佽揣鍗�</span></a>
<%-- <div class="box_tool_line">
</div>
@@ -589,11 +592,11 @@
</td>
<td class="td_hide" menu_member_case_id="case_CompledWork" menu_member_case_name="瀹屽伐">
<span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"瀹屽伐")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "瀹屽伐")?"title='宸插畬宸�'":"title='瀹屽伐'"%> style='display: ' onclick="CompledWork(<%#Eval("Keyid")%>)">
- <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "瀹屽伐") ? "鈭�" : "瀹屽伐"%></span>
+ <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "瀹屽伐") ? "鈭�" : Eval("Shifoubiaohongwangong")%></span>
</td>
<td class="td_hide" menu_member_case_id="case_DeliverWork" menu_member_case_name="閫佽揣">
<span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"閫佽揣")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "閫佽揣")?"title='宸查�佽揣'":"title='閫佽揣'"%> style='display: ' onclick='DeliverWork(<%#Eval("Keyid")%>,"<%#Eval("SellerOrderId")%>","<%#Eval("OrderState")%>")'>
- <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "閫佽揣") ? "鈭�" : "閫佽揣"%></span>
+ <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "閫佽揣") ? "鈭�" : Eval("Shifoubiaohongsonghuo")%></span>
</td>
<td class="td_hide" menu_member_case_id="case_ShowDoDelay" menu_member_case_name="鎾ゅ崟">
<span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"鎾ゅ崟")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鎾ゅ崟")?"title='宸叉挙鍗�'":"title='鎾ゅ崟'"%> style='display: ' onclick="ShowDoDelay({dtypeId:4,defaultarget:'<%#Eval("TradingSingle.PayedMoney", "{0:F}")%>',orderid:<%#Eval("Keyid")%>,orderShowId:'<%#Eval("SellerOrderId")%>',receiver:'<%#Eval("BuyerId")%>',orderState:'<%#Eval("OrderState")%>',orderType:'<%#Eval("OrderTypeId")%>',title:'鎾ゅ崟绠＄悊' })">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
index 0a891b2..cbf326d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
@@ -674,6 +674,20 @@
PageIndex = UCPager1.AspNetPager.CurrentPageIndex
};
IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Seller(pagination, SearchParam);
+
+ foreach (var eC_OrderBasic in result)
+ {
+ if(eC_OrderBasic.DeliveryTime.HasValue && eC_OrderBasic.DeliveryTime.Value < DateTime.Now.Date)
+ {
+ eC_OrderBasic.Shifoubiaohongwangong = "<p style=\"color:red;\">瀹屽伐</p>";
+ eC_OrderBasic.Shifoubiaohongsonghuo = "<p style=\"color:red;\">閫佽揣</p>";
+ }
+ else
+ {
+ eC_OrderBasic.Shifoubiaohongwangong = "瀹屽伐";
+ eC_OrderBasic.Shifoubiaohongsonghuo = "閫佽揣";
+ }
+ }
rptData.DataSource = result;
rptData.DataBind();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx
new file mode 100644
index 0000000..299a7fe
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx
@@ -0,0 +1,203 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OrderSonghuoanchiList.aspx.cs" Inherits="CY.WebForm.Pages.business.OrderSonghuoanchiList" %>
+
+<!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>
+ <uc:cmshead id="CMSHead1" runat="server" />
+ <script src="../../js/business/Order.js" type="text/javascript"></script>
+ <script type="text/javascript">
+ //鏌ョ湅瀹㈡埛璧勬枡
+ function View(Keyid, DelayTime) {
+ top.Dialog.open({ URL: "/Pages/business/OrderDelayTimeEdit.aspx?Keyid=" + Keyid + "&DelayTime=" + DelayTime, Title: "寤惰繜閫佽揣鏃堕棿", Width: 300, Height: 300 });
+ }
+
+ //鍚庨亾澶栧崗
+ function outAfterWorks(works, Keyid, SellerOrderId) {
+ top.Dialog.open({ URL: "/Pages/business/OrderProductionprogress.aspx?SellerOrderId=" + SellerOrderId + "&Keyid=" + Keyid + "&works=" + works, Title: works, Width: 300, Height: 300 });
+ }
+ </script>
+ <style type="text/css">
+ .tableStyleXS th { padding: 1px 0 1px 3px; background-image:none; border-bottom:1px solid #CCC; }
+ .tableStyleXS td { padding: 1px 0 1px 3px; }
+ .TableNewStyle select { width: 80px; }
+ .td_hide span { text-decoration: default; display: none; text-align: center; }
+ span.hand_no { cursor: default; display: block; font-size: 12px; }
+ span.hand_no:hover { text-decoration: none; }
+ span.hand_yes { cursor: pointer; display: block; font-size: 12px; }
+ .td_hide { cursor: pointer; }
+ </style>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div id="scrollContent" style="width: auto;">
+ <div class="box1">
+ <table class="TableNewStyle" style="width: 100%;">
+ <tr>
+
+
+ <td class="ali03">
+ 浜よ揣鏃堕棿锛�
+ </td>
+ <td colspan="11">
+ <%-- <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" />
+ <asp:button id="Button6" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click6" />
+ <asp:button id="Button7" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click7" />
+ <asp:button id="Button8" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click8" Width="60px" />
+ <input type="hidden" runat="server" id="txtDeliveryTime" />
+ </td>
+
+
+ </tr>
+
+ <tr>
+ <td class="ali03">
+ 鎵�鍦ㄥ尯鍩燂細
+ </td>
+ <td>
+ <asp:DropDownList ID="selectProvince" runat="server" keepDefaultStyle="true" AutoPostBack="true" OnSelectedIndexChanged="ChangeProvince" Width="70px">
+ </asp:DropDownList>
+ <asp:DropDownList ID="selectCity" runat="server" keepDefaultStyle="true" AutoPostBack="true" OnSelectedIndexChanged="ChangeCity" Width="70px">
+ </asp:DropDownList>
+ <asp:DropDownList ID="selectCounty" runat="server" keepDefaultStyle="true" AutoPostBack="false" Width="70px">
+ </asp:DropDownList>
+ </td>
+ <td class="ali03">
+ 瀹㈡埛鍗曚綅锛�
+ </td>
+ <td>
+ <input id='txtCustormerName' runat="server" maxlength='50' />
+ </td>
+ <td class="ali03">
+ 涓氬姟缁忕悊锛�
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
+ </td>
+ <td class="ali03">
+ 璁㈠崟缂栧彿锛�
+ </td>
+ <td>
+ <input id='txtSellerOrderId' runat="server" maxlength='25' />
+ </td>
+ <td class="ali03">
+ 鍗颁欢鍚嶇О锛�
+ </td>
+ <td>
+ <input id='txtDocumentName' runat="server" maxlength='25' />
+ </td>
+ <td>
+ </td>
+ <td>
+ <asp: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;' />
+ </td>
+
+ </tr>
+ </table>
+ </div>
+
+ <div clear="fl">
+ <table class="tableStyle tableStyleXS" useclick="false" usecheckbox="true" sortmode="false">
+ <thead>
+ <tr>
+
+ <th width="25">
+ 搴忓彿
+ </th>
+ <th style="text-align: center;" width="50">
+ 涓氬姟缁忕悊
+ </th>
+ <th style="text-align: center;"width="70">
+ 瀹㈡埛鍗曚綅
+ </th>
+ <th width="70">
+ 璁㈠崟鍙�
+ </th>
+ <th width="250">
+ 鍗颁欢鍚嶇О
+ </th>
+ <th style="text-align: center;"width="50">
+ 鏁伴噺
+ </th>
+
+
+ <th width="50">
+ 閲戦
+ </th>
+
+ <th width="50">
+ 浜よ揣鏃堕棿
+ </th>
+ <th width="50">
+ 寤惰繜閫佽揣鏃堕棿
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <asp:repeater id="RepClientList" runat="server">
+ <itemtemplate>
+ <tr>
+
+ <td>
+ <%#Container.ItemIndex + (UCPager1.PageSize *( UCPager1.PageIndex-1)+1)%>
+ </td>
+
+
+ <td>
+ <%#Eval("BusinessManager ")%>
+ </td>
+
+ <td>
+ <%#Eval("BuyerName")%>
+ </td>
+ <td>
+ <%#Eval("SellerOrderId")%>
+ </td>
+ <td>
+ <%#Eval("DocumentName")%>
+ </td>
+ <td>
+ <%#Eval("OrderExtend.PrintNum")%>
+ </td>
+
+ <td>
+ <%#Eval("SumPrice", "{0:F}")%>
+ </td>
+
+ <td>
+ <%#Eval("DeliveryTime", "{0:yyyy-MM-dd}")%>
+ </td>
+ <td>
+ <a href='javascript:void(0)' title='鐐瑰嚮淇敼寤惰繜鏃ユ湡' class='a_under' onclick='View("<%#Eval("Keyid")%>","<%#Eval("DelayTime", "{0:yyyy-MM-dd}")%>")'> <%#Eval("DelayTime")==null?"淇敼寤惰繜":Eval("DelayTime", "{0:yyyy-MM-dd}")%> </a>
+
+
+ </td>
+
+ </tr>
+ </itemtemplate>
+ </asp:repeater>
+ </tbody>
+ </table>
+ <uc:ucpager id="UCPager1" runat="server" />
+ </div>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx.cs
new file mode 100644
index 0000000..206fe86
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx.cs
@@ -0,0 +1,357 @@
+锘縰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;
+using System.Drawing;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class OrderSonghuoanchiList : BasePage
+ {
+ Sys_CitySiteBLL bll_Sys_CitySiteBLL = null;
+ EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ AfterParameterInfoBLL _afterParameterInfoBLL = null;
+
+ //鍒濆鍖�
+ public OrderSonghuoanchiList()
+ {
+ bll_Sys_CitySiteBLL = new Sys_CitySiteBLL();
+ _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ _afterParameterInfoBLL = new AfterParameterInfoBLL();
+ }
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
+ if (!IsPostBack)
+ {
+ BindProvince();
+ InitialSelectData();
+ BindList();
+
+ }
+
+ }
+
+
+
+
+
+
+ //缁戝畾鐪�
+ protected void BindProvince()
+ {
+ this.selectProvince.Items.Clear();
+ if (CurrentUser.TrueType == "鍛樺伐")
+ this.selectProvince.DataSource = bll_Sys_CitySiteBLL.SelectStaffManageProvinceList(CurrentUser.TrueMemberId);
+ else
+ this.selectProvince.DataSource = bll_Sys_CitySiteBLL.SelectAllNextModel(0, 0, 1);
+
+ this.selectProvince.DataTextField = "Name";
+ this.selectProvince.DataValueField = "Keyid";
+ this.selectProvince.DataBind();
+ this.selectProvince.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selectCity.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selectCounty.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ }
+
+ //鏀瑰彉鐪佺粦瀹氬競
+ protected void ChangeProvince(object sender, EventArgs e)
+ {
+ this.selectCity.Items.Clear();
+ this.selectCounty.Items.Clear();
+ Sys_CitySite m_Sys_CitySite = bll_Sys_CitySiteBLL.GetModelByKeyid(this.selectProvince.SelectedValue.ToInt32() ?? 0);
+ if (m_Sys_CitySite != null)
+ {
+ if (CurrentUser.TrueType == "鍛樺伐")
+ this.selectCity.DataSource = bll_Sys_CitySiteBLL.SelectStaffManageCityList(m_Sys_CitySite.Keyid, CurrentUser.TrueMemberId);
+ else
+ this.selectCity.DataSource = bll_Sys_CitySiteBLL.SelectAllNextModel(m_Sys_CitySite.Keyid, 0, 2);
+
+ this.selectCity.DataTextField = "Name";
+ this.selectCity.DataValueField = "Keyid";
+ this.selectCity.DataBind();
+ }
+ this.selectCity.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selectCounty.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ }
+
+ //鏀瑰彉甯傜粦瀹氬尯
+ protected void ChangeCity(object sender, EventArgs e)
+ {
+ this.selectCounty.Items.Clear();
+ Sys_CitySite m_Sys_CitySite = bll_Sys_CitySiteBLL.GetModelByKeyid(this.selectCity.SelectedValue.ToInt32() ?? 0);
+ if (m_Sys_CitySite != null)
+ {
+ if (CurrentUser.TrueType == "鍛樺伐")
+ this.selectCounty.DataSource = bll_Sys_CitySiteBLL.SelectStaffManageCountryList(m_Sys_CitySite.ProvinceId, m_Sys_CitySite.Keyid, CurrentUser.TrueMemberId);
+ else
+ this.selectCounty.DataSource = bll_Sys_CitySiteBLL.SelectProxyNextModel(m_Sys_CitySite.ProvinceId, m_Sys_CitySite.Keyid, 3);
+
+ this.selectCounty.DataTextField = "Name";
+ this.selectCounty.DataValueField = "Keyid";
+ this.selectCounty.DataBind();
+ }
+ this.selectCounty.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ }
+
+ //鍒嗛〉浜嬩欢
+ protected void AspNetPager1_PageChanged(object src, EventArgs e)
+ {
+ BindList();
+ }
+
+ //鏌ヨ浜嬩欢
+ protected void btn_Search_Click(object sender, EventArgs e)
+ {
+ BindList();
+ }
+
+
+ protected void btn_Search_Click1(object sender, EventArgs e)
+ {
+
+ this.txtDeliveryTime.Value = this.Button1.Text;
+
+ 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)
+ {
+
+ 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();
+ }
+ protected void btn_Search_Click6(object sender, EventArgs e)
+ {
+
+ this.txtDeliveryTime.Value = this.Button6.Text;
+
+ BindList();
+ }
+ protected void btn_Search_Click7(object sender, EventArgs e)
+ {
+
+ this.txtDeliveryTime.Value = this.Button7.Text;
+
+ BindList();
+ }
+ protected void btn_Search_Click8(object sender, EventArgs e)
+ {
+
+ this.txtDeliveryTime.Value = this.Button8.Text;
+
+ BindList();
+ }
+
+
+ //鍔犺浇鏌ヨ鏉′欢
+ protected void InitialSelectData()
+ {
+ this.selBusinessManager.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, true, false);
+ this.selBusinessManager.DataTextField = "Name";
+ 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澶�";
+ this.Button4.Text = "4澶�";
+ this.Button5.Text = "5澶�";
+ this.Button6.Text = "6澶�";
+ this.Button7.Text = "7澶�";
+ this.Button8.Text = "涓�鍛ㄥ悗";
+
+ }
+
+ //缁戝畾鍒楄〃
+ private void BindList()
+ {
+ if (this.txtDeliveryTime.Value == "")
+ {
+ this.txtDeliveryTime.Value = this.Button1.Text;
+ }
+
+ 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.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)
+ {
+ this.Button2.BorderColor = Color.Black;
+ this.Button1.BorderColor = Color.LightBlue;
+ this.Button3.BorderColor = Color.LightBlue;
+ this.Button4.BorderColor = Color.LightBlue;
+ this.Button5.BorderColor = Color.LightBlue;
+ 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)
+ {
+ this.Button3.BorderColor = Color.Black;
+ this.Button2.BorderColor = Color.LightBlue;
+ this.Button1.BorderColor = Color.LightBlue;
+ this.Button4.BorderColor = Color.LightBlue;
+ this.Button5.BorderColor = Color.LightBlue;
+ 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)
+ {
+ this.Button4.BorderColor = Color.Black;
+ this.Button2.BorderColor = Color.LightBlue;
+ this.Button3.BorderColor = Color.LightBlue;
+ this.Button1.BorderColor = Color.LightBlue;
+ this.Button5.BorderColor = Color.LightBlue;
+ 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)
+ {
+ this.Button5.BorderColor = Color.Black;
+ this.Button2.BorderColor = Color.LightBlue;
+ this.Button3.BorderColor = Color.LightBlue;
+ this.Button4.BorderColor = Color.LightBlue;
+ this.Button1.BorderColor = Color.LightBlue;
+ 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)
+ {
+ this.Button6.BorderColor = Color.Black;
+ this.Button2.BorderColor = Color.LightBlue;
+ this.Button3.BorderColor = Color.LightBlue;
+ this.Button4.BorderColor = Color.LightBlue;
+ this.Button5.BorderColor = Color.LightBlue;
+ 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)
+ {
+ this.Button7.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.Button8.BorderColor = Color.LightBlue;
+ this.Button0.BorderColor = Color.LightBlue;
+ }
+ else if (this.txtDeliveryTime.Value == this.Button8.Text)
+ {
+ this.Button8.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.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;
+ }
+
+
+ DateTime? beginTime = null;
+ DateTime? endTime = null;
+ Pagination pa = new Pagination();
+ pa.PageSize = UCPager1.AspNetPager.PageSize;
+ pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
+
+ IEnumerable < EC_OrderBasic > eC_OrderBasics = _eC_OrderBasicBLL.GetModelPageListForSonghuoyanchis(pa,
+
+ this.txtDeliveryTime.Value,
+ this.selectProvince.SelectedItem.Text.Replace("鍏ㄩ儴", ""),
+ this.selectCity.SelectedItem.Text.Replace("鍏ㄩ儴", ""),
+ this.selectCounty.SelectedItem.Text.Replace("鍏ㄩ儴", ""),
+ this.txtCustormerName.Value,
+ this.selBusinessManager.Value,
+ this.txtSellerOrderId.Value,
+ this.txtDocumentName.Value,
+ CurrentUser.MemberId);
+ IList<SysInquiry_AfterParameterInfo> afterInfos = _afterParameterInfoBLL.GetModelList();
+
+
+ this.RepClientList.DataSource = eC_OrderBasics;
+
+
+
+ this.RepClientList.DataBind();
+ UCPager1.AspNetPager.RecordCount = pa.RecordCount;
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx.designer.cs
new file mode 100644
index 0000000..8a0777c
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx.designer.cs
@@ -0,0 +1,224 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class OrderSonghuoanchiList
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <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>
+ /// Button6 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button6;
+
+ /// <summary>
+ /// Button7 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button7;
+
+ /// <summary>
+ /// Button8 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button8;
+
+ /// <summary>
+ /// txtDeliveryTime 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtDeliveryTime;
+
+ /// <summary>
+ /// selectProvince 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.DropDownList selectProvince;
+
+ /// <summary>
+ /// selectCity 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.DropDownList selectCity;
+
+ /// <summary>
+ /// selectCounty 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.DropDownList selectCounty;
+
+ /// <summary>
+ /// txtCustormerName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
+
+ /// <summary>
+ /// selBusinessManager 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManager;
+
+ /// <summary>
+ /// txtSellerOrderId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtSellerOrderId;
+
+ /// <summary>
+ /// txtDocumentName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtDocumentName;
+
+ /// <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/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index 5cdb982..1954352 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -276,6 +276,38 @@
}
}
+
+
+
+/*
+鎵归噺瀹屽伐
+*/
+function ToDeliverWork(operateFn, validateFn) {
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+ cks.each(function (ii, vv) {
+ var ckVal = $(this).val();
+ var ckValJson = eval('(' + ckVal + ')');
+ // if (parseInt(ckValJson.orderType) < 1 && ckValJson.orderState == 1) {
+ // isCan = false;
+ // return false;
+ // }
+ if (ckValJson.orderState == 1 || ckValJson.orderState <= 0) {
+ isCan = false;
+ return false;
+ }
+ ids = ids + ',' + $(vv).attr("value_keyid");
+ });
+ if (isCan) {
+ dialog.open({ URL: "/Pages/business/DeliverWork.aspx?ids=" + ids, Title: '瀹屽伐', Height: 600, Width: 680 });
+ }
+ else {
+ alertMsg("鎵�閫夎鍗曟湭鍙楃悊锛屾垨宸插喕缁擄紝鎴栬�呭凡缁堟锛屾垨宸插畬鎴愶紝涓嶈兘鎿嶄綔瀹屽伐锛�");
+ }
+}
+
function SendToServer(sparam) {
CallServer(sparam, function (data, textStatus) {
--
Gitblit v1.9.1