From dfbeaf00996f22400dd0b6a11d61550da8d6d32a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 16 五月 2025 08:36:37 +0800
Subject: [PATCH] 这个查看权限这里要修改，这个部门前面加个框框，如果我没这个框框打勾，这个部门的人的名字就不出来好，我在框框部门的前面的框框里面打了勾过后。好，这个部门的人就全部出来，而且系统自动把它打起。好，我再具体哪个人那儿再那个给我再点一下，就是不打，就那样子做。
---
CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs | 6 +
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx.cs | 75 ++++++++++++++++--
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluDetail.aspx.cs | 13 ++-
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaDetail.aspx.cs | 13 ++-
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx | 14 +++
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx | 16 +++
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx.cs | 76 ++++++++++++++++---
7 files changed, 180 insertions(+), 33 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs
index f092f8c..c43cf54 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs
@@ -722,6 +722,12 @@
this.Shejicountneiye = isChange ? MyConvert.ConvertToInt32(value) : this.Shejicountneiye;
theValue = this.Shejicountneiye;
}
+ else if ("printunit".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 74)
+ {
+ this.printunit = isChange ? MyConvert.ConvertToInt32(value).Value : this.printunit;
+ theValue = this.printunit;
+ }
+
#endregion
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx
index ce53a5a..0f98352 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx
@@ -9,7 +9,7 @@
//鎵归噺鍒犻櫎
function onAllDelete() {
var deleteKeyIds = "";
- $(":checkbox").each(
+ $("input[name='depart']").each(
function () {
if ($(this).is(":checked")) {
deleteKeyIds += $(this).val() + ",";
@@ -24,6 +24,20 @@
$("#deleteKeyIds").val(deleteKeyIds);
}
}
+
+
+ function changedepartment(departid) {
+
+
+ if ($("#department" + departid).is(':checked')) {
+ $(".depart" + departid).show();
+ $(".spann" + departid).show();
+ } else {
+ $(".depart" + departid).hide();
+ $(".spann" + departid).hide();
+ $(".depart" + departid).attr('checked', false);
+ }
+ }
</script>
</head>
<body>
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..f718653 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\" 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>";
}
+
+
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluDetail.aspx.cs
index dc5fc23..80520e0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluDetail.aspx.cs
@@ -64,8 +64,14 @@
this.txtLianxiren.InnerText = adm_Tongxunlu.lianxiren;
this.txtLianxidianhua.InnerText = adm_Tongxunlu.lianxidianhua;
this.txtBeuzhu.InnerText = adm_Tongxunlu.beuzhu;
-
- var oA_Staffs = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).OrderBy(x => x.DepartmentId).ToList();
+ var Jusequanxian = adm_Tongxunlu.Jusequanxian;
+ var Jusequanxians = Jusequanxian.Trim(',').Split(',');
+ var juesequanxian = new List<int?>();
+ foreach (var juese in Jusequanxians)
+ {
+ juesequanxian.Add(juese.ToInt32());
+ }
+ var oA_Staffs = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x=> juesequanxian.Contains(x.Keyid)).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)
@@ -86,8 +92,7 @@
}
- var Jusequanxian = adm_Tongxunlu.Jusequanxian;
- var Jusequanxians = Jusequanxian.Trim(',').Split(',');
+
if (Jusequanxians.Count(x => x == oA_Staffs[i].Keyid.Value.ToString()) > 0)
{
staffs += " <input disabled=\"disabled\" type =\"checkbox\" checked=\"checked\" value='" + oA_Staffs[i].Keyid + "' />" + oA_Staffs[i].Name;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx
index cc608bc..7610757 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx
@@ -9,7 +9,7 @@
//鎵归噺鍒犻櫎
function onAllDelete() {
var deleteKeyIds = "";
- $(":checkbox").each(
+ $("input[name='depart']").each(
function () {
if ($(this).is(":checked")) {
deleteKeyIds += $(this).val() + ",";
@@ -24,6 +24,18 @@
$("#deleteKeyIds").val(deleteKeyIds);
}
}
+ function changedepartment(departid) {
+
+
+ if ($("#department" + departid).is(':checked')) {
+ $(".depart" + departid).show();
+ $(".spann" + departid).show();
+ } else {
+ $(".depart" + departid).hide();
+ $(".spann" + departid).hide();
+ $(".depart" + departid).attr('checked', false);
+ }
+ }
</script>
</head>
<body>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx.cs
index b399ba9..bdf78a7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.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 += "<br/> <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\" class=\"depart" + departid + "\" value='" + oA_Staffs[i].Keyid + "' />" + "" + "<span class=\"spann" + departid + "\" >" + oA_Staffs[i].Name + "</span>";
}
}
@@ -101,40 +104,89 @@
this.txtmima.Value = adm_zhanghaomima.mima;
this.txtmibao.Text = adm_zhanghaomima.mibao;
-
+ var Jusequanxian = adm_zhanghaomima.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_zhanghaomima.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>";
}
-
+
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaDetail.aspx.cs
index d733dda..19954e5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaDetail.aspx.cs
@@ -65,8 +65,14 @@
this.txtmima.InnerText = adm_zhanghaomima.mima;
this.txtmibao.InnerText = adm_zhanghaomima.mibao;
-
- var oA_Staffs = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).OrderBy(x => x.DepartmentId).ToList();
+ var Jusequanxian = adm_zhanghaomima.Jusequanxian;
+ var Jusequanxians = Jusequanxian.Trim(',').Split(',');
+ var juesequanxian = new List<int?>();
+ foreach (var juese in Jusequanxians)
+ {
+ juesequanxian.Add(juese.ToInt32());
+ }
+ var oA_Staffs = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => juesequanxian.Contains(x.Keyid)).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)
@@ -87,8 +93,7 @@
}
- var Jusequanxian = adm_zhanghaomima.Jusequanxian;
- var Jusequanxians = Jusequanxian.Trim(',').Split(',');
+
if (Jusequanxians.Count(x => x == oA_Staffs[i].Keyid.Value.ToString()) > 0)
{
staffs += " <input disabled=\"disabled\" type =\"checkbox\" checked=\"checked\" value='" + oA_Staffs[i].Keyid + "' />" + oA_Staffs[i].Name;
--
Gitblit v1.9.1