From 259584df9c06ade70f1f351affb35d4922e1263d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 十一月 2025 16:23:13 +0800
Subject: [PATCH] 这个打印送货单,你们给我做两种,做一张打印没得数量的,做一张打印有数量的。送货单格式就是32开,就哎就是A4排一半。你们打了测试,注意,美观。 把那个把它做出来,下一批就用这个自动打。 不是不是打印的要数量都是有数量,要没得数量都没得数量。就是点打印的时候就两个按钮嘛,一个是有数量打印,或者或者或者空白送货单打印。 现在这个现在的送货单都是没有数量噻。现在那个要的,比如你那里再打你那个打印关闭的按钮,要把搞成两个打印嘛,就是打印空白送货单和打印送货单。 好点打印空白送货单的,就是现在这样子。点打印送货单,打印的就是那个跟有有就是有数据的送货单。作业本送货统计查询,状态查询需要修改逻辑

---
 CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx.cs |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx.cs
index e4f923b..08b7b35 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx.cs
@@ -43,6 +43,13 @@
                 this.txtSPS_Department.DataBind();
                 this.txtSPS_Department.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
 
+                this.selStatus.DataSource = bll_Sys_DictionaryBLL.GetDataByType("鍛樺伐鍦ㄨ亴鐘舵��");
+                this.selStatus.DataTextField = "Name";
+                this.selStatus.DataValueField = "Name";
+                this.selStatus.DataBind();
+                this.selStatus.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+                this.selStatus.Value = "鍦ㄨ亴";
+
                 BindList();
             }
         }
@@ -53,7 +60,7 @@
             Pagination pa = new Pagination();
             pa.PageSize = UCPager1.AspNetPager.PageSize;
             pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
-            this.RepClientList.DataSource = bll_OA_WageAwardPunishBLL.SelectModelPageByWage(pa, CurrentUser.MemberId,this.txtSPS_Department.Value.ToInt32(),this.txtPlanPeople.Value.Trim(),this.txtRegTimeStart.Value);
+            this.RepClientList.DataSource = bll_OA_WageAwardPunishBLL.SelectModelPageByWage(pa, CurrentUser.MemberId,this.txtSPS_Department.Value.ToInt32(),this.txtPlanPeople.Value.Trim(),this.txtRegTimeStart.Value, this.txtRegTimeEnd.Value,this.selStatus.Value);
             this.RepClientList.DataBind();
             UCPager1.AspNetPager.RecordCount = pa.RecordCount;
         }

--
Gitblit v1.9.1