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/work/Adm_tongxunluAdd.aspx.cs | 75 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 insertions(+), 11 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx.cs
index 202ecda..4469ba7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx.cs
@@ -61,6 +61,7 @@
if (string.IsNullOrEmpty(Request["keyid"]))
{
+ string departid = "";
var oA_Staffs = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).OrderBy(x => x.DepartmentId).ToList();
for (int i = 0; i < oA_Staffs.Count; i++)
{
@@ -69,7 +70,8 @@
var department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId);
if (department != null)
{
- staffs += "<br/>" + department.Name + ":";
+ departid = department.Keyid.Value.ToString();
+ staffs += "<br/> <input type=\"checkbox\" id=\"department" + department.Keyid + "\" checked=\"checked\" value='" + department.Keyid + "' onchange=\"changedepartment('" + department.Keyid + "')\" />" + department.Name + ":";
}
}
if (i == 0)
@@ -77,11 +79,12 @@
var department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId);
if (department != null)
{
- staffs += department.Name + ":";
+ departid = department.Keyid.Value.ToString();
+ staffs += " <input type=\"checkbox\" id=\"department" + department.Keyid + "\" checked=\"checked\" value='" + department.Keyid + "' onchange=\"changedepartment('" + department.Keyid + "')\" />" + department.Name + ":";
}
}
- staffs += " <input type=\"checkbox\" value='" + oA_Staffs[i].Keyid + "' />" + oA_Staffs[i].Name;
+ staffs += " <input type=\"checkbox\" name = \"depart\" checked=\"checked\" class=\"depart" + departid + "\" value='" + oA_Staffs[i].Keyid + "' />" + "" + "<span class=\"spann" + departid + "\" >" + oA_Staffs[i].Name+"</span>";
}
}
@@ -99,38 +102,88 @@
this.txtLianxidianhua.Value = adm_Tongxunlu.lianxidianhua;
this.txtBeuzhu.Text = adm_Tongxunlu.beuzhu;
-
+ var Jusequanxian = adm_Tongxunlu.Jusequanxian;
+ var Jusequanxians = Jusequanxian.Trim(',').Split(',');
+ var juesequanxian = new List<int?>();
+ foreach (var juese in Jusequanxians)
+ {
+ juesequanxian.Add(juese.ToInt32());
+ }
+ string departid = "";
+ bool shifouxianshi = false;
var oA_Staffs = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).OrderBy(x => x.DepartmentId).ToList();
for (int i = 0; i < oA_Staffs.Count; i++)
{
if (i != 0 && oA_Staffs[i].DepartmentId != oA_Staffs[i - 1].DepartmentId)
{
+ var ocount = oA_Staffs.Count(x => x.DepartmentId == oA_Staffs[i].DepartmentId && juesequanxian.Contains(x.Keyid));
+ if (ocount > 0)
+ {
+ shifouxianshi = true;
+ }
+ else
+ {
+ shifouxianshi = false;
+ }
var department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId);
if (department != null)
{
- staffs += "<br/>" + department.Name + ":";
+ departid = department.Keyid.Value.ToString();
+ if (shifouxianshi)
+ {
+ staffs += "<br/> <input type=\"checkbox\" id=\"department" + department.Keyid + "\" checked=\"checked\" value='" + department.Keyid + "' onchange=\"changedepartment('" + department.Keyid + "')\" />" + department.Name + ":";
+ }
+ else
+ {
+ staffs += "<br/> <input type=\"checkbox\" id=\"department" + department.Keyid + "\" value='" + department.Keyid + "' onchange=\"changedepartment('" + department.Keyid + "')\" />" + department.Name + ":";
+ }
}
}
if (i == 0)
{
+ var ocount = oA_Staffs.Count(x => x.DepartmentId == oA_Staffs[i].DepartmentId && juesequanxian.Contains(x.Keyid));
+ if (ocount > 0)
+ {
+ shifouxianshi = true;
+ }
+ else
+ {
+ shifouxianshi = false;
+ }
var department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId);
if (department != null)
{
- staffs += department.Name + ":";
+ departid = department.Keyid.Value.ToString();
+ if (shifouxianshi)
+ {
+ staffs += " <input type=\"checkbox\" id=\"department" + department.Keyid + "\" checked=\"checked\" value='" + department.Keyid + "' onchange=\"changedepartment('" + department.Keyid + "')\" />" + department.Name + ":";
+ }
+ else
+ {
+ staffs += " <input type=\"checkbox\" id=\"department" + department.Keyid + "\" value='" + department.Keyid + "' onchange=\"changedepartment('" + department.Keyid + "')\" />" + department.Name + ":";
+ }
+
}
}
- var Jusequanxian = adm_Tongxunlu.Jusequanxian;
- var Jusequanxians = Jusequanxian.Trim(',').Split(',');
- if (Jusequanxians.Count(x => x == oA_Staffs[i].Keyid.Value.ToString()) > 0)
+ if (shifouxianshi)
{
- staffs += " <input type=\"checkbox\" checked=\"checked\" value='" + oA_Staffs[i].Keyid + "' />" + oA_Staffs[i].Name;
+ if (Jusequanxians.Count(x => x == oA_Staffs[i].Keyid.Value.ToString()) > 0)
+ {
+ staffs += " <input type=\"checkbox\" checked=\"checked\" name = \"depart\" class=\"depart" + departid + "\" value='" + oA_Staffs[i].Keyid + "' />" + "" + "<span class=\"spann" + departid + "\" >" + oA_Staffs[i].Name + "</span>";
+ }
+ else
+ {
+ staffs += " <input type=\"checkbox\" name = \"depart\" class=\"depart" + departid + "\" value='" + oA_Staffs[i].Keyid + "' />" + "" + "<span class=\"spann" + departid + "\" >" + oA_Staffs[i].Name + "</span>";
+ }
}
else
{
- staffs += " <input type=\"checkbox\" value='" + oA_Staffs[i].Keyid + "' />" + oA_Staffs[i].Name;
+ staffs += " <input type=\"checkbox\" style=\"display:none;\" name = \"depart\" class=\"depart" + departid + "\" value='" + oA_Staffs[i].Keyid + "' />" + "" + "<span style=\"display:none;\" class=\"spann" + departid + "\" >" + oA_Staffs[i].Name + "</span>";
}
+
+
--
Gitblit v1.9.1