From a980cd04341d71216e0f59bd4b7327fe9fc50032 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 21 五月 2025 11:41:46 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs | 87 ++++++++++++++++++++++++++++++++++---------
1 files changed, 68 insertions(+), 19 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
index 471d082..06c85df 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
@@ -66,11 +66,11 @@
//鍔犺浇鏌ヨ鏉′欢
protected void InitialSelectData()
{
- this.selDriverId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.SM_Post.Equals("椹鹃┒鍛�")) ;
- this.selDriverId.DataTextField = "Name";
- this.selDriverId.DataValueField = "Keyid";
- this.selDriverId.DataBind();
- this.selDriverId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ //this.selDriverId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.BF_IsDriver == true);//.Where(x => x.SM_Post.Equals("椹鹃┒鍛�")) ;
+ //this.selDriverId.DataTextField = "Name";
+ //this.selDriverId.DataValueField = "Keyid";
+ //this.selDriverId.DataBind();
+ //this.selDriverId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
this.selCarId.DataSource = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);
this.selCarId.DataTextField = "CarNumber";
@@ -79,19 +79,28 @@
this.selCarId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
- this.selDriverIddo.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.SM_Post.Equals("椹鹃┒鍛�"));
- this.selDriverIddo.DataTextField = "Name";
- this.selDriverIddo.DataValueField = "Keyid";
- this.selDriverIddo.DataBind();
- this.selDriverIddo.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ 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.selCarIddo.DataSource = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);
- this.selCarIddo.DataTextField = "CarNumber";
- this.selCarIddo.DataValueField = "Keyid";
- this.selCarIddo.DataBind();
- this.selCarIddo.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selPaiche.Value = "2";
+ //this.selDriverIddo.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.BF_IsDriver == true);//.Where(x => x.SM_Post.Equals("椹鹃┒鍛�"));
+ //this.selDriverIddo.DataTextField = "Name";
+ //this.selDriverIddo.DataValueField = "Keyid";
+ //this.selDriverIddo.DataBind();
+ //this.selDriverIddo.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+ //this.selCarIddo.DataSource = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);
+ //this.selCarIddo.DataTextField = "CarNumber";
+ //this.selCarIddo.DataValueField = "Keyid";
+ //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 +135,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 +216,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 +227,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 +238,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 +249,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 +260,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 +271,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 +282,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();
@@ -272,9 +305,25 @@
CurrentUser.MemberId,
this.txtDeliveryTime.Value,
this.selCarId.Value,
- this.selDriverId.Value
+ "",
+ "",
+ this.txtCustormerName.Value.Trim(),
+ this.selBusinessManager.Value,this.selPaiche.Value
);
-
+
+ foreach (var oA_DeliverPlan in oA_DeliverPlans)
+ {
+ oA_DeliverPlan.DizhiLianxirenDianhua = oA_DeliverPlan.Dizhi;
+ if (!string.IsNullOrEmpty(oA_DeliverPlan.Lianxiren))
+ {
+ oA_DeliverPlan.DizhiLianxirenDianhua += " 鑱旂郴浜猴細" + oA_DeliverPlan.Lianxiren;
+ }
+
+ if (!string.IsNullOrEmpty(oA_DeliverPlan.Dianhua))
+ {
+ oA_DeliverPlan.DizhiLianxirenDianhua += " 鐢佃瘽锛�" + oA_DeliverPlan.Dianhua;
+ }
+ }
--
Gitblit v1.9.1