From 2fee7b9b90c1acf7a17aef84ee22c2a31b801fe2 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 三月 2025 08:34:42 +0800
Subject: [PATCH] 送货管理  增加查询  业务经理   客户名称   完成  查询送货安排的历史 完成

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs |   64 ++++++++++++++++++++++++-------
 1 files changed, 49 insertions(+), 15 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..85f920b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
@@ -66,7 +66,7 @@
         //鍔犺浇鏌ヨ鏉′欢
         protected void InitialSelectData()
         {
-            this.selDriverId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.SM_Post.Equals("椹鹃┒鍛�")) ;
+            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();
@@ -79,19 +79,26 @@
             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.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.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.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 +133,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 +214,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 +225,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 +236,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 +247,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 +258,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 +269,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 +280,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,7 +303,10 @@
                 CurrentUser.MemberId,
                 this.txtDeliveryTime.Value,
                  this.selCarId.Value,
-                this.selDriverId.Value
+                this.selDriverId.Value,
+                "",
+                  this.txtCustormerName.Value.Trim(),
+                    this.selBusinessManager.Value
               );
           
 

--
Gitblit v1.9.1