From 4bf2b5d9caa83082f690a84c4518f3ad6ad6d599 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 29 七月 2025 12:28:08 +0800
Subject: [PATCH] 20250722 通讯录账号密码显示查看权限，根据查看权限查询 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx.cs | 11
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx.designer.cs | 9 +
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx.designer.cs | 9 +
CY_ECommercePlatform/CY.BLL/OA/Adm_zhanghaomimaBLL.cs | 15 +
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentDetail.aspx | 69 ++++++++
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx | 35 +++-
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx | 36 +++-
CY_ECommercePlatform/CY.Model/OA/Adm_tongxunlu.cs | 17 ++
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx.cs | 49 +++++
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx.cs | 42 ++--
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx | 18 ++
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx | 17 ++
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx | 1
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx.cs | 53 ++++++
CY_ECommercePlatform/CY.BLL/OA/Adm_tongxunluBLL.cs | 15 +
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx | 1
CY_ECommercePlatform/CY.Model/OA/Adm_zhanghaomima.cs | 15 +
CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx.cs | 2
21 files changed, 365 insertions(+), 61 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/Adm_tongxunluBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/Adm_tongxunluBLL.cs
index 37a38ed..c7d8954 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/Adm_tongxunluBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/Adm_tongxunluBLL.cs
@@ -152,7 +152,7 @@
/// </summary>
/// <param name="pa"></param>
/// <returns></returns>
- public IEnumerable<Adm_tongxunlu> SelectModelPage(Pagination pa, Guid FirmId, string type_id, string danwei_name,bool IsChangyongziliao,int? staffid)
+ public IEnumerable<Adm_tongxunlu> SelectModelPage(Pagination pa, Guid FirmId, string type_id, string danwei_name,bool IsChangyongziliao,int? staffid, string selquanxin)
{
string Condition = " and ok.FirmId ='" + FirmId + "' and ok.rec_status = 'A' ";
@@ -162,6 +162,19 @@
Condition += " and ok.type_id = " + type_id + "";
}
+ if (!string.IsNullOrEmpty(selquanxin))
+ {
+ if (selquanxin == "1")
+ {
+ Condition += " and ( ok.[Jusequanxian] = '' or ok.[Jusequanxian] = ',,' )";
+ }
+ else if (selquanxin == "2")
+ {
+ Condition += " and (ok.[Jusequanxian] != '' and ok.[Jusequanxian] != ',,' )";
+ }
+
+ }
+
if (!string.IsNullOrEmpty(danwei_name))
{
Condition += " and ok.danwei_name like '%" + danwei_name + "%'";
diff --git a/CY_ECommercePlatform/CY.BLL/OA/Adm_zhanghaomimaBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/Adm_zhanghaomimaBLL.cs
index 617dfda..efcb2de 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/Adm_zhanghaomimaBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/Adm_zhanghaomimaBLL.cs
@@ -150,7 +150,7 @@
/// </summary>
/// <param name="pa"></param>
/// <returns></returns>
- public IEnumerable<Adm_zhanghaomima> SelectModelPage(Pagination pa, Guid FirmId, string type_id, string chanpinxiangmu, bool IsChangyongziliao, int? staffid)
+ public IEnumerable<Adm_zhanghaomima> SelectModelPage(Pagination pa, Guid FirmId, string type_id, string chanpinxiangmu, bool IsChangyongziliao, int? staffid, string selquanxin)
{
string Condition = " and ok.FirmId ='" + FirmId + "' and ok.rec_status = 'A' ";
@@ -160,6 +160,19 @@
Condition += " and ok.type_id = " + type_id + "";
}
+ if (!string.IsNullOrEmpty(selquanxin))
+ {
+ if (selquanxin == "1")
+ {
+ Condition += " and ( ok.[Jusequanxian] = '' or ok.[Jusequanxian] = ',,' )";
+ }
+ else if (selquanxin == "2")
+ {
+ Condition += " and (ok.[Jusequanxian] != '' and ok.[Jusequanxian] != ',,' )";
+ }
+
+ }
+
if (!string.IsNullOrEmpty(chanpinxiangmu))
{
Condition += " and ok.chanpinxiangmu like '%" + chanpinxiangmu + "%'";
diff --git a/CY_ECommercePlatform/CY.Model/OA/Adm_tongxunlu.cs b/CY_ECommercePlatform/CY.Model/OA/Adm_tongxunlu.cs
index e9e63c8..f6389d8 100644
--- a/CY_ECommercePlatform/CY.Model/OA/Adm_tongxunlu.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/Adm_tongxunlu.cs
@@ -65,6 +65,7 @@
/// beuzhu
/// </summary>
public string beuzhu { get; set; }
+ public string beuzhuName { get; set; }
/// <summary>
/// rec_status A/D
@@ -117,6 +118,22 @@
set;
}
+ /// <summary>
+ /// Jusequanxian
+ /// </summary>
+ public string JusequanxianName
+ {
+ get;
+ set;
+ }
+
+ public string JusequanxianNameshot
+ {
+ get;
+ set;
+ }
+
+
#endregion Model
#region Visiter
diff --git a/CY_ECommercePlatform/CY.Model/OA/Adm_zhanghaomima.cs b/CY_ECommercePlatform/CY.Model/OA/Adm_zhanghaomima.cs
index 1268c71..c532fd8 100644
--- a/CY_ECommercePlatform/CY.Model/OA/Adm_zhanghaomima.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/Adm_zhanghaomima.cs
@@ -65,6 +65,7 @@
/// mibao
/// </summary>
public string mibao { get; set; }
+ public string mibaoName { get; set; }
/// <summary>
/// rec_status A/D
@@ -116,6 +117,20 @@
set;
}
+ /// <summary>
+ /// Jusequanxian
+ /// </summary>
+ public string JusequanxianName
+ {
+ get;
+ set;
+ }
+
+ public string JusequanxianNameshot
+ {
+ get;
+ set;
+ }
#endregion Model
#region Visiter
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
index 3793491..91530ef 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
@@ -440,7 +440,7 @@
- <a href='javascript:void(0)' title=' <%#Eval("KaipiaoshenqingName")%> ' class='a_under' onclick='<%#Eval("Kaipiaoshenqing").ToString()=="1"?"Viewkehu(\""+Eval("Keyid")+"\")":"" %> '> <%#Eval("KaipiaoshenqingName")%> </a>
+ <a href='javascript:void(0)' title=' <%#Eval("KaipiaoshenqingName")%> ' class='a_under' onclick='Viewkehu("<%#Eval("Keyid") %>")'> <%#Eval("KaipiaoshenqingName")%> </a>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs
index c014709..2bea581 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs
@@ -56,7 +56,11 @@
_eC_OrderBLL = new EC_OrderBLL();
btnSubmit.ServerClick += new EventHandler(btnSubmit_ServerClick);
- LoadOrder();
+ if (!IsPostBack)
+ {
+ LoadOrder();
+ }
+
if (IsPostBack || IsCallback)
return;
@@ -146,7 +150,7 @@
//this.txtSellerOrderId.InnerText = oA_Kaipiaoshenqing.SellerOrderId;
this.txtshuliang.InnerText = oA_Kaipiaoshenqing.Dingdanshu.ToString();
-
+ this.txtFapiaohao.Value = oA_Kaipiaoshenqing.Fapiaohao;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx
index 0f98352..f66027c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx
@@ -31,6 +31,7 @@
if ($("#department" + departid).is(':checked')) {
$(".depart" + departid).show();
+ $(".depart" + departid).attr('checked', true);
$(".spann" + departid).show();
} else {
$(".depart" + departid).hide();
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 f718653..4469ba7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx.cs
@@ -84,7 +84,7 @@
}
}
- staffs += " <input type=\"checkbox\" name = \"depart\" class=\"depart" + departid + "\" value='" + oA_Staffs[i].Keyid + "' />" + "" + "<span class=\"spann" + departid + "\" >" + oA_Staffs[i].Name+"</span>";
+ 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>";
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx
index 893f377..873bc03 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx
@@ -49,6 +49,21 @@
$("#deleteKeyIds").val(deleteKeyIds);
}
}
+
+
+ function changedepartment(departid) {
+
+
+ if ($("#department" + departid).is(':checked')) {
+ $(".depart" + departid).show();
+ $(".depart" + departid).attr('checked', true);
+ $(".spann" + departid).show();
+ } else {
+ $(".depart" + departid).hide();
+ $(".spann" + departid).hide();
+ $(".depart" + departid).attr('checked', false);
+ }
+ }
</script>
</head>
@@ -77,7 +92,7 @@
<div>
<table class="tableStyle" style="margin: 10px auto;" cellpadding="0" cellspacing="0">
<tr>
- <td class="ali03" valign="top">
+ <td class="ali03 w120px" valign="top">
鏌ョ湅鍛樺伐锛�
</td>
<td >
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx.cs
index 2c84fd7..87ef378 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx.cs
@@ -44,6 +44,7 @@
//缁戝畾鏁版嵁
private void BindList()
{
+ 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++)
{
@@ -52,7 +53,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)
@@ -60,11 +62,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>";
}
@@ -94,7 +97,7 @@
if (ssss)
{
- JavaScript.MessageBox("淇濆瓨鎴愬姛", this, true, false);
+ JavaScript.MessageBox("淇濆瓨鎴愬姛", this, true, true);
}
else
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx
index 7816fc6..af4e37c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx
@@ -76,6 +76,17 @@
<td>
<input type="text" id="txtdanwei_name" runat="server" class="w120px" />
</td>
+
+ <td class="ali03">
+ 鏌ョ湅鏉冮檺锛�
+ </td>
+ <td>
+ <select id="selquanxin" runat="server" keepdefaultstyle="true">
+ <option value="">璇烽�夋嫨</option>
+ <option value="1">鍏ㄩ儴鍚屼簨</option>
+ <option value="2">閮ㄥ垎鍚屼簨</option>
+ </select>
+ </td>
<td>
<asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" />
</td>
@@ -104,30 +115,32 @@
<div>
<asp:Repeater ID="RepClientList" runat="server">
<HeaderTemplate>
- <table class="tableStyle">
+ <table class="tableStyle" width="100%;">
<tr>
<th width="25">
</th>
<th width="30" style="text-align: center">
缂栧彿
</th>
- <th style="text-align: center">
+ <th style="text-align: center"width="30">
绫诲埆
</th>
- <th style="text-align: center">
+ <th style="text-align: center"width="30">
鍗曚綅鍚嶇О
</th>
- <th style="text-align: center">
+ <th style="text-align: center"width="30">
鑱旂郴浜�
</th>
- <th style="text-align: center">
+ <th style="text-align: center"width="30">
鑱旂郴鐢佃瘽
</th>
- <th style="text-align: center">
+ <th style="text-align: center"width="300">
澶囨敞
</th>
-
- <th style="text-align: center">
+ <th style="text-align: center"width="300">
+ 鏌ョ湅鏉冮檺
+ </th>
+ <th style="text-align: center"width="100">
鎿嶄綔
</th>
</tr>
@@ -152,8 +165,11 @@
<td style="text-align: center">
<%#Eval("lianxidianhua")%>
</td>
- <td style="text-align: center">
- <%#Eval("beuzhu")%>
+ <td style="text-align: center" title="<%#Eval("beuzhu")%>">
+ <%#Eval("beuzhuName")%>
+ </td>
+ <td style="text-align: center" title="<%#Eval("JusequanxianName")%>">
+ <%#Eval("JusequanxianNameshot")%>
</td>
<td class="Operate " style="text-align: center">
<span menu_member_case_id="case_OnDetail" menu_member_case_name="鏌ョ湅" onclick="onEdit('<%#Eval("Keyid")%>')">鏌ョ湅</span>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx.cs
index 44ed4ad..9584130 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx.cs
@@ -114,9 +114,52 @@
pa.PageSize = UCPager1.AspNetPager.PageSize;
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
-
-
- this.RepClientList.DataSource = bll_Adm_tongxunluBLL.SelectModelPage(pa, CurrentUser.MemberId, this.seltype.Value, this.txtdanwei_name.Value.Trim(), IsChangyongziliao, CurrentUser.StaffId);
+ var adm_Tongxunlus = bll_Adm_tongxunluBLL.SelectModelPage(pa, CurrentUser.MemberId, this.seltype.Value, this.txtdanwei_name.Value.Trim(), IsChangyongziliao, CurrentUser.StaffId, this.selquanxin.Value);
+ if(adm_Tongxunlus!=null)
+ {
+ var oA_Staffs = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId,null,null);
+ foreach(var adm_Tongxunlu in adm_Tongxunlus)
+ {
+ if (adm_Tongxunlu.beuzhu.Length > 40)
+ {
+ adm_Tongxunlu.beuzhuName = adm_Tongxunlu.beuzhu.Substring(0, 40);
+ }
+ else
+ {
+ adm_Tongxunlu.beuzhuName = adm_Tongxunlu.beuzhu;
+ }
+ if (string.IsNullOrEmpty(adm_Tongxunlu.Jusequanxian))
+ {
+ adm_Tongxunlu.JusequanxianName = "";
+
+ }
+ else
+ {
+ var Jusequanxia = adm_Tongxunlu.Jusequanxian.Trim(',').Split(',');
+ var Jusequanxian = new List<int?>();
+ foreach(var jjj in Jusequanxia)
+ {
+ Jusequanxian.Add(jjj.ToInt32());
+ }
+
+ var staffs = oA_Staffs.Where(x => Jusequanxian.Contains(x.Keyid)).ToList();
+ adm_Tongxunlu.JusequanxianName = "";
+ foreach (var staff in staffs)
+ {
+ adm_Tongxunlu.JusequanxianName += staff.Name + ",";
+ }
+ if (adm_Tongxunlu.JusequanxianName.Length > 40)
+ {
+ adm_Tongxunlu.JusequanxianNameshot = adm_Tongxunlu.JusequanxianName.Substring(0, 40);
+ }
+ else
+ {
+ adm_Tongxunlu.JusequanxianNameshot = adm_Tongxunlu.JusequanxianName;
+ }
+ }
+ }
+ }
+ this.RepClientList.DataSource = adm_Tongxunlus;
this.RepClientList.DataBind();
UCPager1.AspNetPager.RecordCount = pa.RecordCount;
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx.designer.cs
index 92c5751..4bc33da 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx.designer.cs
@@ -60,6 +60,15 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtdanwei_name;
/// <summary>
+ /// selquanxin 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selquanxin;
+
+ /// <summary>
/// btn_Submit 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx
index 7610757..f029971 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx
@@ -29,6 +29,7 @@
if ($("#department" + departid).is(':checked')) {
$(".depart" + departid).show();
+ $(".depart" + departid).attr('checked', true);
$(".spann" + departid).show();
} else {
$(".depart" + departid).hide();
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 bdf78a7..733f183 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx.cs
@@ -84,7 +84,7 @@
}
}
- staffs += " <input type=\"checkbox\" name = \"depart\" class=\"depart" + departid + "\" value='" + oA_Staffs[i].Keyid + "' />" + "" + "<span class=\"spann" + departid + "\" >" + oA_Staffs[i].Name + "</span>";
+ staffs += " <input type=\"checkbox\" name = \"depart\" class=\"depart" + departid + "\" checked=\"checked\" value='" + oA_Staffs[i].Keyid + "' />" + "" + "<span class=\"spann" + departid + "\" >" + oA_Staffs[i].Name + "</span>";
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx
index 550f00c..5ce3bf4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx
@@ -49,7 +49,21 @@
$("#deleteKeyIds").val(deleteKeyIds);
}
}
-
+
+
+ function changedepartment(departid) {
+
+
+ if ($("#department" + departid).is(':checked')) {
+ $(".depart" + departid).show();
+ $(".depart" + departid).attr('checked', true);
+ $(".spann" + departid).show();
+ } else {
+ $(".depart" + departid).hide();
+ $(".spann" + departid).hide();
+ $(".depart" + departid).attr('checked', false);
+ }
+ }
</script>
</head>
<body>
@@ -77,7 +91,7 @@
<div>
<table class="tableStyle" style="margin: 10px auto;" cellpadding="0" cellspacing="0">
<tr>
- <td class="ali03" valign="top">
+ <td class="ali03 w120px" valign="top">
鏌ョ湅鍛樺伐锛�
</td>
<td >
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx.cs
index dd98bdb..21bd71c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx.cs
@@ -47,38 +47,40 @@
{
if (!string.IsNullOrEmpty(Request["keyid"]))
{
- // var adm_zhanghaomima = bll_Adm_zhanghaomimaBLL.GetModelByKeyids(Request["keyid"]).ToList();
+ // var adm_zhanghaomima = bll_Adm_zhanghaomimaBLL.GetModelByKeyids(Request["keyid"]).ToList();
-
+ string departid = "";
//if (adm_zhanghaomima != null && adm_zhanghaomima.Count>0)
//{
- 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++)
+ 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)
{
- if (i != 0 && oA_Staffs[i].DepartmentId != oA_Staffs[i - 1].DepartmentId)
+ var department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId);
+ if (department != null)
{
- 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)
+ }
+ if (i == 0)
+ {
+ var department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId);
+ if (department != null)
{
- 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>";
+
+ }
+ // }
}
@@ -113,7 +115,7 @@
if (ssss)
{
- JavaScript.MessageBox("淇濆瓨鎴愬姛", this, true, false);
+ JavaScript.MessageBox("淇濆瓨鎴愬姛", this, true, true);
}
else
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx
index 399031f..caa1a18 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx
@@ -76,6 +76,17 @@
<td>
<input type="text" id="txtchanpinxiangmu" runat="server" class="w120px" />
</td>
+
+ <td class="ali03">
+ 鏌ョ湅鏉冮檺锛�
+ </td>
+ <td>
+ <select id="selquanxin" runat="server" keepdefaultstyle="true">
+ <option value="">璇烽�夋嫨</option>
+ <option value="1">鍏ㄩ儴鍚屼簨</option>
+ <option value="2">閮ㄥ垎鍚屼簨</option>
+ </select>
+ </td>
<td>
<asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" />
</td>
@@ -104,30 +115,33 @@
<div>
<asp:Repeater ID="RepClientList" runat="server">
<HeaderTemplate>
- <table class="tableStyle">
+ <table class="tableStyle" width="100%;">
<tr>
<th width="25">
</th>
<th width="30" style="text-align: center">
缂栧彿
</th>
- <th style="text-align: center">
+ <th style="text-align: center" width="30" >
绫诲埆
</th>
- <th style="text-align: center">
+ <th style="text-align: center" width="30" >
椤圭洰
</th>
- <th style="text-align: center">
+ <th style="text-align: center" width="30" >
璐﹀彿
</th>
- <th style="text-align: center">
+ <th style="text-align: center" width="30" >
瀵嗙爜
</th>
- <th style="text-align: center">
+ <th style="text-align: center" width="200" >
瀵嗕繚
</th>
+ <th style="text-align: center"width="200">
+ 鏌ョ湅鏉冮檺
+ </th>
- <th style="text-align: center">
+ <th style="text-align: center" width="100" >
鎿嶄綔
</th>
</tr>
@@ -152,8 +166,11 @@
<td style="text-align: center">
<%#Eval("mima")%>
</td>
- <td style="text-align: center">
- <%#Eval("mibao")%>
+ <td style="text-align: center" title="<%#Eval("mibao")%>">
+ <%#Eval("mibaoName")%>
+ </td>
+ <td style="text-align: center" title="<%#Eval("JusequanxianName")%>">
+ <%#Eval("JusequanxianNameshot")%>
</td>
<td class="Operate " style="text-align: center">
<span menu_member_case_id="case_OnDetail" menu_member_case_name="鏌ョ湅" onclick="onEdit('<%#Eval("Keyid")%>')">鏌ョ湅</span>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx.cs
index 8ff0948..408230b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx.cs
@@ -111,10 +111,55 @@
Pagination pa = new Pagination();
pa.PageSize = UCPager1.AspNetPager.PageSize;
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
-
-
-
- this.RepClientList.DataSource = bll_Adm_zhanghaomimaBLL.SelectModelPage(pa, CurrentUser.MemberId, this.seltype.Value, this.txtchanpinxiangmu.Value.Trim(), IsChangyongziliao, CurrentUser.StaffId);
+
+
+
+ var adm_Zhanghaomimas = bll_Adm_zhanghaomimaBLL.SelectModelPage(pa, CurrentUser.MemberId, this.seltype.Value, this.txtchanpinxiangmu.Value.Trim(), IsChangyongziliao, CurrentUser.StaffId, this.selquanxin.Value);
+ if (adm_Zhanghaomimas != null)
+ {
+ var oA_Staffs = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null);
+ foreach (var adm_Tongxunlu in adm_Zhanghaomimas)
+ {
+ if (adm_Tongxunlu.mibao.Length > 30)
+ {
+ adm_Tongxunlu.mibaoName = adm_Tongxunlu.mibao.Substring(0, 30);
+ }
+ else
+ {
+ adm_Tongxunlu.mibaoName = adm_Tongxunlu.mibao;
+ }
+ if (string.IsNullOrEmpty(adm_Tongxunlu.Jusequanxian))
+ {
+ adm_Tongxunlu.JusequanxianName = "";
+
+ }
+ else
+ {
+ var Jusequanxia = adm_Tongxunlu.Jusequanxian.Trim(',').Split(',');
+ var Jusequanxian = new List<int?>();
+ foreach (var jjj in Jusequanxia)
+ {
+ Jusequanxian.Add(jjj.ToInt32());
+ }
+
+ var staffs = oA_Staffs.Where(x => Jusequanxian.Contains(x.Keyid)).ToList();
+ adm_Tongxunlu.JusequanxianName = "";
+ foreach (var staff in staffs)
+ {
+ adm_Tongxunlu.JusequanxianName += staff.Name + ",";
+ }
+ if (adm_Tongxunlu.JusequanxianName.Length > 30)
+ {
+ adm_Tongxunlu.JusequanxianNameshot = adm_Tongxunlu.JusequanxianName.Substring(0, 30);
+ }
+ else
+ {
+ adm_Tongxunlu.JusequanxianNameshot = adm_Tongxunlu.JusequanxianName;
+ }
+ }
+ }
+ }
+ this.RepClientList.DataSource = adm_Zhanghaomimas;
this.RepClientList.DataBind();
UCPager1.AspNetPager.RecordCount = pa.RecordCount;
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx.designer.cs
index 7ac1015..a65afb6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx.designer.cs
@@ -60,6 +60,15 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtchanpinxiangmu;
/// <summary>
+ /// selquanxin 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selquanxin;
+
+ /// <summary>
/// btn_Submit 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentDetail.aspx
index ffcd9b1..d23208c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentDetail.aspx
@@ -13,12 +13,79 @@
.tableStyle div { text-align: left; overflow: visible; line-height: 15px; }
.tableStyle tr, td, th { padding: 0px; height: auto; }
</style>
+ <script type="text/javascript">
+ Preview = function () {
+ OnPrint();
+ try {
+ LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
+ if ((LODOP == null) || (typeof (LODOP.VERSION) == "undefined")) return;
+ var div_tool = document.getElementById('div_tool');
+ var printparams = div_tool.getAttribute('printparams');
+
+ if (!printparams) {
+ // alert("1");
+ // LODOP.SET_PRINT_PAGESIZE(0, 1700, 1200, "A4");
+ }
+ else {
+ printparams = printparams.toString().split(',');
+ LODOP.SET_PRINT_PAGESIZE(parseInt(printparams[0]), parseInt(printparams[1]), parseInt(printparams[2]), printparams[3]);
+ }
+
+
+ if ($("#div_tool").attr("issideways") == "true") {
+ LODOP.ADD_PRINT_TABLE(30, 30, "95%", "90%", $(document.documentElement).html());
+ LODOP.SET_SHOW_MODE("LANDSCAPE_DEFROTATED", 1);
+ } else if ($("#div_tool").attr("issideways") == "printinfo") {
+ var Oldhtml = "";
+ if (printStyle != "" && printStyle != undefined && printContent !== "") {
+ Oldhtml = printStyle + "<body>" + printContent + "</body>";
+ LODOP.ADD_PRINT_HTM(30, 30, "95%", "90%", Oldhtml);
+ }
+ else {
+ $(".warning").remove();
+ //alert($(document.documentElement).html());
+ LODOP.ADD_PRINT_HTM(30, 43, "95%", "90%", $(document.documentElement).html());
+ }
+ } else {
+ var Oldhtml = "";
+ if (printStyle != "" && printStyle != undefined && printContent !== "") {
+ Oldhtml = printStyle + "<body>" + printContent + "</body>";
+ LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", Oldhtml);
+ }
+ else {
+ $(".warning").remove();
+ /*alert($(document.documentElement).html());*/
+ /* LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", $(document.documentElement).html());*/
+
+ // 鑾峰彇HTML鍐呭
+ var content = $(document.documentElement).html();
+
+ // 灏嗗唴瀹规寜鍒嗛〉鏍囩鍒嗗壊
+ var pages = content.split('<div class="page-break"></div>');
+ // 閬嶅巻姣忎竴椤电殑鍐呭
+ for (var i = 0; i < pages.length; i++) {
+ /* alert(pages[i]);*/
+ if (i > 0) LODOP.NewPage(); // 瀵逛簬闈炵涓�椤碉紝娣诲姞鏂伴〉
+
+ // 娣诲姞鎵撳嵃鍐呭
+ LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", pages[i]);
+ }
+ }
+ }
+ LODOP.PREVIEW();
+
+ } catch (e) {
+ //alertMsg('寮傚父淇℃伅锛�' + e.message);
+ }
+ OnPrintOver();
+ }
+ </script>
</head>
<body>
<object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width="0" height="0">
<embed id="LODOP_EM" type="application/x-print-lodop" width="0" height="0" pluginspage="/Pages/common/install_lodop32.exe"></embed>
</object>
- <div id='div_tool' issideways="true" printparams='1,2100,2970, "A4"'>
+ <div id='div_tool' issideways="printinfo" printparams='1,2100,2970, "A4"'>
</div>
<form id="form1" class="form2" runat="server">
<table style="width: 590px; margin-top: 30px; margin: 0 auto;">
--
Gitblit v1.9.1