From 451ec557d579f8f9e1b0c84754709cc8b3d2090e Mon Sep 17 00:00:00 2001 From: username@email.com <yzy2002yzy@163.com> Date: 星期三, 07 五月 2025 08:37:46 +0800 Subject: [PATCH] 人事管理里边增加 一个权限 --- CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs | 2 CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx.cs | 12 CY_ECommercePlatform/CY.BLL/OA/Adm_zhanghaomimaBLL.cs | 31 + CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx.designer.cs | 9 CY_ECommercePlatform/CY.SQLDAL/OA/Adm_tongxunluDAL.cs | 39 ++ CY_ECommercePlatform/CY.SQLDAL/OA/Adm_zhanghaomimaDAL.cs | 38 ++ CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx | 18 CY_ECommercePlatform/CY.IDAL/OA/IAdm_tongxunluDAL.cs | 7 CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx.cs | 74 ++++ CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx.designer.cs | 9 CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx.cs | 71 +++- CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaDetail.aspx.cs | 42 ++ CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx | 31 + CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx.cs | 23 + CY_ECommercePlatform/CY.BLL/OA/Adm_tongxunluBLL.cs | 32 + CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx | 31 + CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx.designer.cs | 9 CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx.cs | 64 ++- CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs | 16 + CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluDetail.aspx | 10 CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluDetail.aspx.cs | 41 ++ CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx | 7 CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaDetail.aspx | 10 CY_ECommercePlatform/CY.IDAL/OA/IAdm_zhanghaomimaDAL.cs | 7 CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs | 2 CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx | 18 CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx.cs | 23 + CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx | 48 -- CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx | 48 -- CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx.designer.cs | 9 CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx.cs | 77 +++++ 31 files changed, 664 insertions(+), 194 deletions(-) diff --git a/CY_ECommercePlatform/CY.BLL/OA/Adm_tongxunluBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/Adm_tongxunluBLL.cs index d883838..37a38ed 100644 --- a/CY_ECommercePlatform/CY.BLL/OA/Adm_tongxunluBLL.cs +++ b/CY_ECommercePlatform/CY.BLL/OA/Adm_tongxunluBLL.cs @@ -115,12 +115,26 @@ return _IAdm_tongxunluDAL.GetModelByKeyid(keyid); } - /// <summary> - /// 鍒犻櫎鍚堜綔瀹㈡埛 - /// </summary> - /// <param name="rType"></param> - /// <returns></returns> - public bool DeleteModel(CY.Model.Adm_tongxunlu rType) + + + /// <summary> + /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛 + /// </summary> + /// <param name="Keyid">涓婚敭id</param> + /// <returns></returns> + public IEnumerable<Model.Adm_tongxunlu> GetModelByKeyids(string keyids) + { + + return _IAdm_tongxunluDAL.GetModelByKeyids(keyids); + } + + + /// <summary> + /// 鍒犻櫎鍚堜綔瀹㈡埛 + /// </summary> + /// <param name="rType"></param> + /// <returns></returns> + public bool DeleteModel(CY.Model.Adm_tongxunlu rType) { try { @@ -138,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) + public IEnumerable<Adm_tongxunlu> SelectModelPage(Pagination pa, Guid FirmId, string type_id, string danwei_name,bool IsChangyongziliao,int? staffid) { string Condition = " and ok.FirmId ='" + FirmId + "' and ok.rec_status = 'A' "; @@ -152,6 +166,10 @@ { Condition += " and ok.danwei_name like '%" + danwei_name + "%'"; } + if(IsChangyongziliao == false && staffid.HasValue && staffid>0) + { + Condition += " and ok.Jusequanxian like '%," + staffid + ",%'"; + } Query query = new Query(); IList<Criterion> criterias = new List<Criterion>() diff --git a/CY_ECommercePlatform/CY.BLL/OA/Adm_zhanghaomimaBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/Adm_zhanghaomimaBLL.cs index d6d1f6a..617dfda 100644 --- a/CY_ECommercePlatform/CY.BLL/OA/Adm_zhanghaomimaBLL.cs +++ b/CY_ECommercePlatform/CY.BLL/OA/Adm_zhanghaomimaBLL.cs @@ -104,12 +104,24 @@ return _IAdm_zhanghaomimaDAL.GetModelByformid(formid); } - /// <summary> - /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛 - /// </summary> - /// <param name="Keyid">涓婚敭id</param> - /// <returns></returns> - public Adm_zhanghaomima GetModelByKeyid(int keyid) + /// <summary> + /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛 + /// </summary> + /// <param name="Keyid">涓婚敭id</param> + /// <returns></returns> + public IEnumerable<Model.Adm_zhanghaomima> GetModelByKeyids(string keyids) + { + + return _IAdm_zhanghaomimaDAL.GetModelByKeyids(keyids); + } + + + /// <summary> + /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛 + /// </summary> + /// <param name="Keyid">涓婚敭id</param> + /// <returns></returns> + public Adm_zhanghaomima GetModelByKeyid(int keyid) { return _IAdm_zhanghaomimaDAL.GetModelByKeyid(keyid); @@ -138,7 +150,7 @@ /// </summary> /// <param name="pa"></param> /// <returns></returns> - public IEnumerable<Adm_zhanghaomima> SelectModelPage(Pagination pa, Guid FirmId, string type_id, string chanpinxiangmu) + public IEnumerable<Adm_zhanghaomima> SelectModelPage(Pagination pa, Guid FirmId, string type_id, string chanpinxiangmu, bool IsChangyongziliao, int? staffid) { string Condition = " and ok.FirmId ='" + FirmId + "' and ok.rec_status = 'A' "; @@ -153,6 +165,11 @@ Condition += " and ok.chanpinxiangmu like '%" + chanpinxiangmu + "%'"; } + if (IsChangyongziliao == false && staffid.HasValue && staffid > 0) + { + Condition += " and ok.Jusequanxian like '%," + staffid + ",%'"; + } + Query query = new Query(); IList<Criterion> criterias = new List<Criterion>() { diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IAdm_tongxunluDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IAdm_tongxunluDAL.cs index ec62c18..b8b143b 100644 --- a/CY_ECommercePlatform/CY.IDAL/OA/IAdm_tongxunluDAL.cs +++ b/CY_ECommercePlatform/CY.IDAL/OA/IAdm_tongxunluDAL.cs @@ -21,6 +21,13 @@ Adm_tongxunlu GetModelByKeyid(int keyid); /// <summary> + /// 鏍规嵁缂栧彿鑾峰緱淇℃伅 + /// </summary> + /// <param name="keyids">缂栧彿</param> + /// <returns></returns> + IEnumerable<Adm_tongxunlu> GetModelByKeyids(string keyids); + + /// <summary> /// 鏍规嵁formid鑾峰緱淇℃伅 /// </summary> /// <param name="Keyid">缂栧彿</param> diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IAdm_zhanghaomimaDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IAdm_zhanghaomimaDAL.cs index 8f11eb2..ff62290 100644 --- a/CY_ECommercePlatform/CY.IDAL/OA/IAdm_zhanghaomimaDAL.cs +++ b/CY_ECommercePlatform/CY.IDAL/OA/IAdm_zhanghaomimaDAL.cs @@ -21,6 +21,13 @@ Adm_zhanghaomima GetModelByKeyid(int keyid); /// <summary> + /// 鏍规嵁缂栧彿鑾峰緱淇℃伅 + /// </summary> + /// <param name="keyids">缂栧彿</param> + /// <returns></returns> + IEnumerable<Adm_zhanghaomima> GetModelByKeyids(string keyids); + + /// <summary> /// 鏍规嵁formid鑾峰緱淇℃伅 /// </summary> /// <param name="Keyid">缂栧彿</param> diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs index 78a62d6..73e87c6 100644 --- a/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs +++ b/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs @@ -363,6 +363,16 @@ } /// <summary> + /// BF_IsChangyongziliao + /// </summary> + public bool? BF_IsChangyongziliao + { + get; + + set; + } + + /// <summary> /// 鎵�鍦ㄩ儴闂� /// </summary> public int? DepartmentId @@ -1351,6 +1361,12 @@ this.BF_IsGongwen = isChange ? MyConvert.ConvertToBoolean(value) : BF_IsGongwen; theValue = this.BF_IsGongwen; } + else if ("BF_IsChangyongziliao".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 70) + { + this.BF_IsChangyongziliao = isChange ? MyConvert.ConvertToBoolean(value) : BF_IsChangyongziliao; + theValue = this.BF_IsChangyongziliao; + } + return theValue; } diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/Adm_tongxunluDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/Adm_tongxunluDAL.cs index 010f0fc..ada61e6 100644 --- a/CY_ECommercePlatform/CY.SQLDAL/OA/Adm_tongxunluDAL.cs +++ b/CY_ECommercePlatform/CY.SQLDAL/OA/Adm_tongxunluDAL.cs @@ -69,11 +69,12 @@ new SqlParameter("@createtime",trueModel.createtime), new SqlParameter("@modifier",trueModel.modifier), new SqlParameter("@modifytime",trueModel.modifytime), - + new SqlParameter("@Jusequanxian",string.IsNullOrEmpty(trueModel.Jusequanxian)?"":trueModel.Jusequanxian), + }; - string sql = "Insert Into Adm_tongxunlu ([FirmId],[type_id],[danwei_name],[lianxiren], [lianxidianhua], [beuzhu],[rec_status], [creater],[createtime], [modifier],[modifytime])" - + " Values (@FirmId,@type_id,@danwei_name, @lianxiren, @lianxidianhua, @beuzhu, @rec_status, @creater, @createtime, @modifier,@modifytime)"; + string sql = "Insert Into Adm_tongxunlu ([FirmId],[type_id],[danwei_name],[lianxiren], [lianxidianhua], [beuzhu],[rec_status], [creater],[createtime], [modifier],[modifytime],[Jusequanxian])" + + " Values (@FirmId,@type_id,@danwei_name, @lianxiren, @lianxidianhua, @beuzhu, @rec_status, @creater, @createtime, @modifier,@modifytime,@Jusequanxian)"; try { _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>()); @@ -165,6 +166,38 @@ /// <summary> + /// 鏍规嵁缂栧彿鑾峰緱淇℃伅 + /// </summary> + /// <param name="Keyid">缂栧彿</param> + /// <returns></returns> + public IEnumerable<Adm_tongxunlu> GetModelByKeyids(string keyids) + { + try + { + string condition = " "; + if (!string.IsNullOrEmpty(keyids)) + { + condition = " Keyid in (" + keyids + ")"; + } + else + { + return null; + } + + // return null;//閿欒鏁版嵁杩斾細绌� + + return _dataBase.SelectModel<Adm_tongxunlu>("*", "Adm_tongxunlu", condition) as IList<Adm_tongxunlu>;//鎵ц鏌ヨ + + + } + catch (Exception ex) + { + throw ex; + } + } + + + /// <summary> /// 鍏ㄩ儴鏌ヨ /// </summary> /// <param name="query"></param> diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/Adm_zhanghaomimaDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/Adm_zhanghaomimaDAL.cs index a10cafd..8a81138 100644 --- a/CY_ECommercePlatform/CY.SQLDAL/OA/Adm_zhanghaomimaDAL.cs +++ b/CY_ECommercePlatform/CY.SQLDAL/OA/Adm_zhanghaomimaDAL.cs @@ -69,10 +69,11 @@ new SqlParameter("@createtime",trueModel.createtime), new SqlParameter("@modifier",trueModel.modifier), new SqlParameter("@modifytime",trueModel.modifytime), + new SqlParameter("@Jusequanxian",string.IsNullOrEmpty(trueModel.Jusequanxian)?"":trueModel.Jusequanxian), }; - string sql = "Insert Into Adm_zhanghaomima ([FirmId],[type_id],[chanpinxiangmu],[zhanghao], [mima], [mibao],[rec_status], [creater],[createtime], [modifier],[modifytime])" - + " Values (@FirmId,@type_id,@chanpinxiangmu, @zhanghao, @mima, @mibao, @rec_status, @creater, @createtime, @modifier,@modifytime)"; + string sql = "Insert Into Adm_zhanghaomima ([FirmId],[type_id],[chanpinxiangmu],[zhanghao], [mima], [mibao],[rec_status], [creater],[createtime], [modifier],[modifytime],[Jusequanxian])" + + " Values (@FirmId,@type_id,@chanpinxiangmu, @zhanghao, @mima, @mibao, @rec_status, @creater, @createtime, @modifier,@modifytime,@Jusequanxian)"; try { _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>()); @@ -164,6 +165,39 @@ } + + /// <summary> + /// 鏍规嵁缂栧彿鑾峰緱淇℃伅 + /// </summary> + /// <param name="Keyid">缂栧彿</param> + /// <returns></returns> + public IEnumerable<Adm_zhanghaomima> GetModelByKeyids(string keyids) + { + try + { + string condition = " "; + if (!string.IsNullOrEmpty(keyids)) + { + condition = " Keyid in (" + keyids + ")"; + } + else + { + return null; + } + + // return null;//閿欒鏁版嵁杩斾細绌� + + return _dataBase.SelectModel<Adm_zhanghaomima>("*", "Adm_zhanghaomima", condition) as IList<Adm_zhanghaomima>;//鎵ц鏌ヨ + + + } + catch (Exception ex) + { + throw ex; + } + } + + /// <summary> /// 鍏ㄩ儴鏌ヨ /// </summary> diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs index 5b9376f..6c36f3f 100644 --- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs +++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs @@ -102,6 +102,7 @@ new SqlParameter("@BF_Isbaoxiaojingli", trueModel.BF_Isbaoxiaojingli) , new SqlParameter("@BF_IsBaoxiaozhuguan", trueModel.BF_IsBaoxiaozhuguan) , new SqlParameter("@BF_IsGongwen", trueModel.BF_IsGongwen.HasValue?trueModel.BF_IsGongwen.Value:false) , + new SqlParameter("@BF_IsChangyongziliao", trueModel.BF_IsChangyongziliao.HasValue?trueModel.BF_IsChangyongziliao.Value:false) , }; try { @@ -197,6 +198,7 @@ new SqlParameter("@BF_Isbaoxiaojingli", trueModel.BF_Isbaoxiaojingli) , new SqlParameter("@BF_IsBaoxiaozhuguan", trueModel.BF_IsBaoxiaozhuguan) , new SqlParameter("@BF_IsGongwen", trueModel.BF_IsGongwen.HasValue?trueModel.BF_IsGongwen.Value:false) , + new SqlParameter("@BF_IsChangyongziliao", trueModel.BF_IsChangyongziliao.HasValue?trueModel.BF_IsChangyongziliao.Value:false) , }; try { diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs index fca4f88..ef60b10 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs +++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs @@ -1282,7 +1282,7 @@ { try { - if (CurrentUser.MemberType == "绠$悊鍛�") + if (CurrentUser.MemberType == "绠$悊鍛�" || !CurrentUser.StaffId.HasValue || CurrentUser.StaffId.Value == 0) { return ""; } diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx index dfc2777..e623c16 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx +++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx @@ -159,6 +159,9 @@ <th> 鍏枃鏉冮檺 </th> + <th> + 甯哥敤璧勬枡鏉冮檺 + </th> <th> 鎿嶄綔 </th> @@ -231,6 +234,10 @@ <span onclick="CompledWork('<%#Eval("Keyid")%>',7)"> <%#bool.Parse(Eval("BF_IsGongwen").ToString()) ? "鈭�" : "脳"%></span> </td> + <td class="Operate" > + <span onclick="CompledWork('<%#Eval("Keyid")%>',8)"> + <%#bool.Parse(Eval("BF_IsChangyongziliao").ToString()) ? "鈭�" : "脳"%></span> + </td> <td class="Operate"> <span menu_member_case_id="case_ViewThings" menu_member_case_name="鐗╁搧棰嗗彇璁板綍" onclick="ViewModel('<%#Eval("MemberId")%>')">鐗╁搧棰嗗彇璁板綍</span> diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx.cs index 36c9eca..b690a64 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx.cs +++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx.cs @@ -107,9 +107,13 @@ else if (type.ToInt32() == 7) { this.types.InnerText = "鍏枃鏉冮檺锛�"; - this.IsBusinessManager.SelectedValue = m_OA_Staff.BF_Isbaoxiaojingli ? "True" : "False"; + this.IsBusinessManager.SelectedValue = m_OA_Staff.BF_IsGongwen.HasValue&&m_OA_Staff.BF_IsGongwen.Value ? "True" : "False"; } - + else if (type.ToInt32() == 8) + { + this.types.InnerText = "甯哥敤璧勬枡鏉冮檺锛�"; + this.IsBusinessManager.SelectedValue = m_OA_Staff.BF_IsChangyongziliao.HasValue&& m_OA_Staff.BF_IsChangyongziliao.Value ? "True" : "False"; + } } @@ -153,6 +157,10 @@ { m_OA_Staff.BF_IsGongwen = this.IsBusinessManager.SelectedValue.ToBoolean2(); } + else if (type.ToInt32() == 8) + { + m_OA_Staff.BF_IsChangyongziliao = this.IsBusinessManager.SelectedValue.ToBoolean2(); + } diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx index 67faa7b..ce53a5a 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx @@ -6,7 +6,24 @@ <title>鏂板/淇敼閫氳褰曠鐞�</title> <uc:CMSHead ID="CMSHead1" runat="server" /> <script type="text/javascript"> - + //鎵归噺鍒犻櫎 + function onAllDelete() { + var deleteKeyIds = ""; + $(":checkbox").each( + function () { + if ($(this).is(":checked")) { + deleteKeyIds += $(this).val() + ","; + } + } + ) + if (deleteKeyIds == "") { + $("#deleteKeyIds").val(deleteKeyIds); + } + else { + deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1); + $("#deleteKeyIds").val(deleteKeyIds); + } + } </script> </head> <body> @@ -58,12 +75,20 @@ <asp:TextBox ID="txtBeuzhu" TextMode="MultiLine" runat="server" Width="690px" Height="60px" MaxLength="300"></asp:TextBox> </td> </tr> - + <tr> + <td class="ali03" valign="top"> + 鏌ョ湅鍛樺伐锛� + </td> + <td > + <%=staffs %> + <input type="hidden" id="deleteKeyIds" name="deleteKeyIds" runat="server" /> + </td> + </tr> <tr> <td colspan="2" style="text-align: center;"> - <asp:Button ID="btn_submit" runat="server" OnClick="btn_submit_form" Text="鎻愪氦" /> + <asp:Button ID="btn_submit" runat="server" OnClientClick="onAllDelete()" OnClick="btn_submit_form" Text="鎻愪氦" /> </td> </tr> </table> 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 86c4734..202ecda 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx.cs +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx.cs @@ -20,12 +20,17 @@ { Adm_tongxunluBLL bll_Adm_tongxunluBLL = null; Sys_DictionaryBLL bll_Sys_DictionaryBLL = null; + OA_StaffBLL bll_OA_StaffBLL = null; + OA_DepartmentBll bll_OA_DepartmentBll = null; + public string staffs = ""; //鍒濆鍖� public Adm_tongxunluAdd() { bll_Adm_tongxunluBLL = new Adm_tongxunluBLL(); bll_Sys_DictionaryBLL = new Sys_DictionaryBLL(); + bll_OA_StaffBLL = new OA_StaffBLL(); + bll_OA_DepartmentBll = new OA_DepartmentBll(); } //椤甸潰鍔犺浇 @@ -53,7 +58,35 @@ this.txtLianxiren.Value = ""; this.txtLianxidianhua.Value = ""; this.txtBeuzhu.Text = ""; - + + if (string.IsNullOrEmpty(Request["keyid"])) + { + 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 department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId); + if (department != null) + { + staffs += "<br/>" + department.Name + ":"; + } + } + if (i == 0) + { + var department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId); + if (department != null) + { + staffs += department.Name + ":"; + } + + } + staffs += " <input type=\"checkbox\" value='" + oA_Staffs[i].Keyid + "' />" + oA_Staffs[i].Name; + + } + } + + if (!string.IsNullOrEmpty(Request["keyid"])) { @@ -65,6 +98,43 @@ this.txtLianxiren.Value = adm_Tongxunlu.lianxiren; this.txtLianxidianhua.Value = adm_Tongxunlu.lianxidianhua; this.txtBeuzhu.Text = adm_Tongxunlu.beuzhu; + + + 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 department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId); + if (department != null) + { + staffs += "<br/>" + department.Name + ":"; + } + } + if (i == 0) + { + var department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId); + if (department != null) + { + staffs += department.Name + ":"; + } + + } + + var Jusequanxian = adm_Tongxunlu.Jusequanxian; + var Jusequanxians = Jusequanxian.Trim(',').Split(','); + if (Jusequanxians.Count(x => x == oA_Staffs[i].Keyid.Value.ToString()) > 0) + { + staffs += " <input type=\"checkbox\" checked=\"checked\" value='" + oA_Staffs[i].Keyid + "' />" + oA_Staffs[i].Name; + } + else + { + staffs += " <input type=\"checkbox\" value='" + oA_Staffs[i].Keyid + "' />" + oA_Staffs[i].Name; + } + + + + } } } @@ -91,6 +161,7 @@ adm_Tongxunlu.rec_status = "A"; adm_Tongxunlu.modifier = CurrentUser.ShortName; adm_Tongxunlu.modifytime = DateTime.Now; + adm_Tongxunlu.Jusequanxian = "," + this.deleteKeyIds.Value + ","; if (bll_Adm_tongxunluBLL.UpdateModel(adm_Tongxunlu)) @@ -115,6 +186,7 @@ adm_Tongxunlu.createtime = DateTime.Now; adm_Tongxunlu.modifier = adm_Tongxunlu.creater; adm_Tongxunlu.modifytime = adm_Tongxunlu.createtime; + adm_Tongxunlu.Jusequanxian = "," + this.deleteKeyIds.Value + ","; diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx.designer.cs index 4afeda6..2940034 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx.designer.cs +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluAdd.aspx.designer.cs @@ -87,6 +87,15 @@ protected global::System.Web.UI.WebControls.TextBox txtBeuzhu; /// <summary> + /// deleteKeyIds 鎺т欢銆� + /// </summary> + /// <remarks> + /// 鑷姩鐢熸垚鐨勫瓧娈点�� + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲�� + /// </remarks> + protected global::System.Web.UI.HtmlControls.HtmlInputHidden deleteKeyIds; + + /// <summary> /// btn_submit 鎺т欢銆� /// </summary> /// <remarks> diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluDetail.aspx index ae19750..3160848 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluDetail.aspx +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluDetail.aspx @@ -61,7 +61,15 @@ <span id="txtBeuzhu" runat="server" ></span> </td> </tr> - + <tr> + <td class="ali03" valign="top"> + 鏌ョ湅鍛樺伐锛� + </td> + <td > + + <%=staffs %> + </td> + </tr> 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 0a3f140..dc5fc23 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluDetail.aspx.cs +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluDetail.aspx.cs @@ -20,12 +20,17 @@ { Adm_tongxunluBLL bll_Adm_tongxunluBLL = null; Sys_DictionaryBLL bll_Sys_DictionaryBLL = null; + OA_StaffBLL bll_OA_StaffBLL = null; + OA_DepartmentBll bll_OA_DepartmentBll = null; + public string staffs = ""; //鍒濆鍖� public Adm_tongxunluDetail() { bll_Adm_tongxunluBLL = new Adm_tongxunluBLL(); bll_Sys_DictionaryBLL = new Sys_DictionaryBLL(); + bll_OA_StaffBLL = new OA_StaffBLL(); + bll_OA_DepartmentBll = new OA_DepartmentBll(); } //椤甸潰鍔犺浇 @@ -59,6 +64,42 @@ 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(); + for (int i = 0; i < oA_Staffs.Count; i++) + { + 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) + { + staffs += "<br/>" + department.Name + ":"; + } + } + if (i == 0) + { + var department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId); + if (department != null) + { + staffs += department.Name + ":"; + } + + } + + 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; + } + else + { + staffs += " <input disabled=\"disabled\" type =\"checkbox\" value='" + oA_Staffs[i].Keyid + "' />" + oA_Staffs[i].Name; + } + + + + } } } diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx index 814dbfb..893f377 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx @@ -40,13 +40,12 @@ } ) if (deleteKeyIds == "") { - // deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1); - //window.location = "/Pages/work/OA_DocumentJuese.aspx?deleteKeyIds=" + deleteKeyIds + "&&orderkeyid=<%=keyid %>"; + $("#deleteKeyIds").val(deleteKeyIds); } else { deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1); - // window.location = "/Pages/work/OA_DocumentJuese.aspx?deleteKeyIds=" + deleteKeyIds + "&&orderkeyid=<%=keyid %>"; + $("#deleteKeyIds").val(deleteKeyIds); } } @@ -76,39 +75,16 @@ </div> </div> <div> - <asp:Repeater ID="RepClientList" runat="server"> - <HeaderTemplate> - <table class="tableStyle"> - <tr> - <th width="25"> - </th> - <th width="30" style="text-align: center"> - 缂栧彿 - </th> - <th style="text-align: center"> - 鍚嶇О - </th> - - </tr> - </HeaderTemplate> - <ItemTemplate> - <tr> - <td> - <input type="checkbox" value='<%#Eval("Keyid")%>' <%#Eval("ShifouCheck") %> /> - </td> - <td style="text-align: center"> - <%#Container.ItemIndex + 1 %> - </td> - <td style="text-align: center"> - <%#Eval("RoleName")%> - </td> - - </tr> - </ItemTemplate> - <FooterTemplate> - </table> - </FooterTemplate> - </asp:Repeater> + <table class="tableStyle" style="margin: 10px auto;" cellpadding="0" cellspacing="0"> + <tr> + <td class="ali03" valign="top"> + 鏌ョ湅鍛樺伐锛� + </td> + <td > + <%=staffs %> + </td> + </tr> + </table> </div> </div> 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 27a413a..2c84fd7 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx.cs +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx.cs @@ -16,14 +16,16 @@ public partial class Adm_tongxunluJuese : BasePage { Adm_tongxunluBLL bll_Adm_tongxunluBLL = null; - OA_FirmRoleBLL oA_FirmRoleBLL = null; - public string keyid = ""; + OA_StaffBLL bll_OA_StaffBLL = null; + OA_DepartmentBll bll_OA_DepartmentBll = null; + public string staffs = ""; //鍒濆鍖� public Adm_tongxunluJuese() { bll_Adm_tongxunluBLL = new Adm_tongxunluBLL(); - oA_FirmRoleBLL = new OA_FirmRoleBLL(); + bll_OA_StaffBLL = new OA_StaffBLL(); + bll_OA_DepartmentBll = new OA_DepartmentBll(); } //椤甸潰鍔犺浇 @@ -42,35 +44,31 @@ //缁戝畾鏁版嵁 private void BindList() { - keyid = Request["keyid"]; - if (!string.IsNullOrEmpty(Request["keyid"])) + 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 adm_Tongxunlu = bll_Adm_tongxunluBLL.GetModelByKeyid(Request["keyid"].ToInt32().Value); - if (adm_Tongxunlu != null) + if (i != 0 && oA_Staffs[i].DepartmentId != oA_Staffs[i - 1].DepartmentId) { - var Jusequanxian = adm_Tongxunlu.Jusequanxian; - var oA_FirmRoles = oA_FirmRoleBLL.SelectList(CurrentUser.MemberId).Where(x=>x.IsUsed == true); - foreach(var oA_FirmRole in oA_FirmRoles) + var department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId); + if (department != null) { - if (!string.IsNullOrEmpty(Jusequanxian)) - { - var Jusequanxians = Jusequanxian.Split(','); - if(Jusequanxians.Count(x => x == oA_FirmRole.Keyid.Value.ToString()) > 0) - { - oA_FirmRole.ShifouCheck = "checked=\"checked\""; - } - } - - - + staffs += "<br/>" + department.Name + ":"; } - this.RepClientList.DataSource = oA_FirmRoles; - this.RepClientList.DataBind(); } + if (i == 0) + { + var department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId); + if (department != null) + { + staffs += department.Name + ":"; + } + + } + staffs += " <input type=\"checkbox\" value='" + oA_Staffs[i].Keyid + "' />" + oA_Staffs[i].Name; + } - } @@ -80,9 +78,21 @@ try { - var adm_Tongxunlu = bll_Adm_tongxunluBLL.GetModelByKeyid(Request["keyid"].ToInt32().Value); - adm_Tongxunlu.Jusequanxian = deleteKeyIds.Value; - if (bll_Adm_tongxunluBLL.UpdateModel(adm_Tongxunlu)) + var adm_Tongxunlus = bll_Adm_tongxunluBLL.GetModelByKeyids(Request["keyid"]).ToList(); + + var ssss = true; + if (adm_Tongxunlus != null && adm_Tongxunlus.Count > 0) + { + foreach (var adm_Tongxunlu in adm_Tongxunlus) + { + + adm_Tongxunlu.Jusequanxian = "," + deleteKeyIds.Value + ","; + ssss = bll_Adm_tongxunluBLL.UpdateModel(adm_Tongxunlu); + } + } + + + if (ssss) { JavaScript.MessageBox("淇濆瓨鎴愬姛", this, true, false); } diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx.designer.cs index 9f0c991..58873eb 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx.designer.cs +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluJuese.aspx.designer.cs @@ -58,14 +58,5 @@ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲�� /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlInputHidden deleteKeyIds; - - /// <summary> - /// RepClientList 鎺т欢銆� - /// </summary> - /// <remarks> - /// 鑷姩鐢熸垚鐨勫瓧娈点�� - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲�� - /// </remarks> - protected global::System.Web.UI.WebControls.Repeater RepClientList; } } diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx index 22c69eb..7816fc6 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx @@ -46,15 +46,13 @@ } ) if (deleteKeyIds == "") { - top.Dialog.alert("璇烽�夋嫨瑕佸垹闄ょ殑閫氳褰�", function () { + top.Dialog.alert("璇烽�夋嫨瑕佽缃潈闄愮殑璐﹀彿瀵嗙爜", function () { }); return; } else { deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1); - top.Dialog.confirm("纭畾瑕佸垹闄ゆ墍閫夐�氳褰曞悧锛�", function () { - window.location = "/Pages/work/Adm_tongxunluList.aspx?deleteKeyIds=" + deleteKeyIds; - }); + top.Dialog.open({ URL: "/Pages/work/Adm_tongxunluJuese.aspx?keyid=" + deleteKeyIds, Title: "璐﹀彿瀵嗙爜璁剧疆鏉冮檺绠$悊", Width: 850, Height: 600 }); } } </script> @@ -90,10 +88,10 @@ <div class="left"> <div class="right"> <div class="padding_top5 padding_left10"> - <a href="javascript:;" onclick="addModel()" menu_member_case_id="case_addModel" menu_member_case_name="鏂板閫氳褰�"><span class="icon_add">鏂板閫氳褰�</span></a> - <%-- <div class="box_tool_line"> + <a href="javascript:;" onclick="addModel()" <%=BF_IsChangyongziliao %> menu_member_case_id="case_addModel" menu_member_case_name="鏂板閫氳褰�"><span class="icon_add">鏂板閫氳褰�</span></a> + <div class="box_tool_line"> </div> - <a href="javascript:;" onclick="onAllDelete()" menu_member_case_id="case_onAllDeleteList" menu_member_case_name="鎵归噺鍒犻櫎"><span class="icon_delete">鎵归噺鍒犻櫎</span></a>--%> + <a href="javascript:;" onclick="onAllDelete()" <%=BF_IsChangyongziliao %> menu_member_case_id="case_onAllchakanList" menu_member_case_name="鎵归噺鏌ョ湅鏉冮檺"><span class="icon_edit">鎵归噺鏌ョ湅鏉冮檺</span></a> <div class="clear"> </div> </div> @@ -159,10 +157,10 @@ </td> <td class="Operate " style="text-align: center"> <span menu_member_case_id="case_OnDetail" menu_member_case_name="鏌ョ湅" onclick="onEdit('<%#Eval("Keyid")%>')">鏌ョ湅</span> - <span menu_member_case_id="case_OnUdate" menu_member_case_name="淇敼" onclick="editModel('<%#Eval("Keyid")%>')">淇敼</span> - <span menu_member_case_id="case_OnDele" menu_member_case_name="鍒犻櫎" onclick="onDele('<%#Eval("Keyid")%>')">鍒犻櫎</span> + <span <%=BF_IsChangyongziliao %> menu_member_case_id="case_OnUdate" menu_member_case_name="淇敼" onclick="editModel('<%#Eval("Keyid")%>')">淇敼</span> + <span <%=BF_IsChangyongziliao %> menu_member_case_id="case_OnDele" menu_member_case_name="鍒犻櫎" onclick="onDele('<%#Eval("Keyid")%>')">鍒犻櫎</span> - <span menu_member_case_id="case_Juesequanxian" menu_member_case_name="鏌ョ湅瑙掕壊鏉冮檺" onclick="Juesequanxian('<%#Eval("Keyid")%>')">鏌ョ湅瑙掕壊鏉冮檺</span> + <%-- <span <%=BF_IsChangyongziliao %> menu_member_case_id="case_Juesequanxian" menu_member_case_name="鏌ョ湅瑙掕壊鏉冮檺" onclick="Juesequanxian('<%#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 38fbdef..44ed4ad 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx.cs +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx.cs @@ -19,6 +19,7 @@ Adm_tongxunluBLL bll_Adm_tongxunluBLL = null; Sys_DictionaryBLL bll_Sys_DictionaryBLL = null; OA_StaffBLL bll_OA_StaffBLL = null; + public string BF_IsChangyongziliao = ""; //鍒濆鍖� public Adm_tongxunluList() @@ -59,6 +60,8 @@ this.seltype.DataBind(); this.seltype.Items.Insert(0, new ListItem("鍏ㄩ儴", "")); + + BindList(); } @@ -89,13 +92,31 @@ //缁戝畾鏁版嵁 private void BindList() { + var oA_Staff = bll_OA_StaffBLL.GetModelByKeyid(CurrentUser.StaffId); + var IsChangyongziliao = false; + if (oA_Staff != null) + { + if (oA_Staff.BF_IsChangyongziliao.HasValue && oA_Staff.BF_IsChangyongziliao.Value == true) + { + BF_IsChangyongziliao = ""; + } + else + { + BF_IsChangyongziliao = "style=\"display:none;\""; + } + if (oA_Staff.BF_IsChangyongziliao.HasValue) + { + IsChangyongziliao = oA_Staff.BF_IsChangyongziliao.Value; + } + } + Pagination pa = new Pagination(); 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()); + this.RepClientList.DataSource = bll_Adm_tongxunluBLL.SelectModelPage(pa, CurrentUser.MemberId, this.seltype.Value, this.txtdanwei_name.Value.Trim(), IsChangyongziliao, CurrentUser.StaffId); this.RepClientList.DataBind(); UCPager1.AspNetPager.RecordCount = pa.RecordCount; } diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx index 9098ddf..b3ae1e1 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx @@ -6,7 +6,24 @@ <title>鏂板/淇敼閫氳璐﹀彿瀵嗙爜</title> <uc:CMSHead ID="CMSHead1" runat="server" /> <script type="text/javascript"> - + //鎵归噺鍒犻櫎 + function onAllDelete() { + var deleteKeyIds = ""; + $(":checkbox").each( + function () { + if ($(this).is(":checked")) { + deleteKeyIds += $(this).val() + ","; + } + } + ) + if (deleteKeyIds == "") { + $("#deleteKeyIds").val(deleteKeyIds); + } + else { + deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1); + $("#deleteKeyIds").val(deleteKeyIds); + } + } </script> </head> <body> @@ -58,12 +75,20 @@ <asp:TextBox ID="txtmibao" TextMode="MultiLine" runat="server" Width="690px" Height="60px" MaxLength="300"></asp:TextBox> </td> </tr> - + <tr> + <td class="ali03" valign="top"> + 鏌ョ湅鍛樺伐锛� + </td> + <td > + <%=staffs %> + <input type="hidden" id="deleteKeyIds" name="deleteKeyIds" runat="server" /> + </td> + </tr> <tr> <td colspan="2" style="text-align: center;"> - <asp:Button ID="btn_submit" runat="server" OnClick="btn_submit_form" Text="鎻愪氦" /> + <asp:Button ID="btn_submit" runat="server" OnClientClick="onAllDelete()" OnClick="btn_submit_form" Text="鎻愪氦" /> </td> </tr> </table> 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 29c84b3..b399ba9 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx.cs +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx.cs @@ -20,12 +20,17 @@ { Adm_zhanghaomimaBLL bll_Adm_zhanghaomimaBLL = null; Sys_DictionaryBLL bll_Sys_DictionaryBLL = null; + OA_StaffBLL bll_OA_StaffBLL = null; + OA_DepartmentBll bll_OA_DepartmentBll = null; + public string staffs = ""; //鍒濆鍖� public Adm_zhanghaomimaAdd() { bll_Adm_zhanghaomimaBLL = new Adm_zhanghaomimaBLL(); bll_Sys_DictionaryBLL = new Sys_DictionaryBLL(); + bll_OA_StaffBLL = new OA_StaffBLL(); + bll_OA_DepartmentBll = new OA_DepartmentBll(); } //椤甸潰鍔犺浇 @@ -53,7 +58,37 @@ this.txtzhanghao.Value = ""; this.txtmima.Value = ""; this.txtmibao.Text = ""; - + + if (string.IsNullOrEmpty(Request["keyid"])) + { + 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 department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId); + if (department != null) + { + staffs += "<br/>" + department.Name + ":"; + } + } + if (i == 0) + { + var department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId); + if (department != null) + { + staffs += department.Name + ":"; + } + + } + staffs += " <input type=\"checkbox\" value='" + oA_Staffs[i].Keyid + "' />" + oA_Staffs[i].Name; + + } + } + + + + if (!string.IsNullOrEmpty(Request["keyid"])) { @@ -65,6 +100,43 @@ this.txtzhanghao.Value = adm_zhanghaomima.zhanghao; this.txtmima.Value = adm_zhanghaomima.mima; this.txtmibao.Text = adm_zhanghaomima.mibao; + + + 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 department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId); + if (department != null) + { + staffs += "<br/>" + department.Name + ":"; + } + } + if (i == 0) + { + var department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId); + if (department != null) + { + staffs += department.Name + ":"; + } + + } + + var Jusequanxian = adm_zhanghaomima.Jusequanxian; + var Jusequanxians = Jusequanxian.Trim(',').Split(','); + if (Jusequanxians.Count(x => x == oA_Staffs[i].Keyid.Value.ToString()) > 0) + { + staffs += " <input type=\"checkbox\" checked=\"checked\" value='" + oA_Staffs[i].Keyid + "' />" + oA_Staffs[i].Name; + } + else + { + staffs += " <input type=\"checkbox\" value='" + oA_Staffs[i].Keyid + "' />" + oA_Staffs[i].Name; + } + + + + } } } @@ -91,6 +163,7 @@ adm_zhanghaomima.rec_status = "A"; adm_zhanghaomima.modifier = CurrentUser.ShortName; adm_zhanghaomima.modifytime = DateTime.Now; + adm_zhanghaomima.Jusequanxian = "," + this.deleteKeyIds.Value + ","; if (bll_Adm_zhanghaomimaBLL.UpdateModel(adm_zhanghaomima)) @@ -116,7 +189,7 @@ adm_zhanghaomima.modifier = adm_zhanghaomima.creater; adm_zhanghaomima.modifytime = adm_zhanghaomima.createtime; - + adm_zhanghaomima.Jusequanxian = "," + this.deleteKeyIds.Value + ","; if (bll_Adm_zhanghaomimaBLL.InsertModel(adm_zhanghaomima)) diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx.designer.cs index ee82e71..00addc0 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx.designer.cs +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaAdd.aspx.designer.cs @@ -87,6 +87,15 @@ protected global::System.Web.UI.WebControls.TextBox txtmibao; /// <summary> + /// deleteKeyIds 鎺т欢銆� + /// </summary> + /// <remarks> + /// 鑷姩鐢熸垚鐨勫瓧娈点�� + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲�� + /// </remarks> + protected global::System.Web.UI.HtmlControls.HtmlInputHidden deleteKeyIds; + + /// <summary> /// btn_submit 鎺т欢銆� /// </summary> /// <remarks> diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaDetail.aspx index a28a740..b78cfab 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaDetail.aspx +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaDetail.aspx @@ -61,7 +61,15 @@ <span id="txtmibao" runat="server" ></span> </td> </tr> - + <tr> + <td class="ali03" valign="top"> + 鏌ョ湅鍛樺伐锛� + </td> + <td > + + <%=staffs %> + </td> + </tr> 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 c0d09d2..d733dda 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaDetail.aspx.cs +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaDetail.aspx.cs @@ -20,12 +20,17 @@ { Adm_zhanghaomimaBLL bll_Adm_zhanghaomimaBLL = null; Sys_DictionaryBLL bll_Sys_DictionaryBLL = null; + OA_StaffBLL bll_OA_StaffBLL = null; + OA_DepartmentBll bll_OA_DepartmentBll = null; + public string staffs = ""; //鍒濆鍖� public Adm_zhanghaomimaDetail() { bll_Adm_zhanghaomimaBLL = new Adm_zhanghaomimaBLL(); bll_Sys_DictionaryBLL = new Sys_DictionaryBLL(); + bll_OA_StaffBLL = new OA_StaffBLL(); + bll_OA_DepartmentBll = new OA_DepartmentBll(); } //椤甸潰鍔犺浇 @@ -59,6 +64,43 @@ this.txtzhanghao.InnerText = adm_zhanghaomima.zhanghao; 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(); + for (int i = 0; i < oA_Staffs.Count; i++) + { + 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) + { + staffs += "<br/>" + department.Name + ":"; + } + } + if (i == 0) + { + var department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId); + if (department != null) + { + staffs += department.Name + ":"; + } + + } + + 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; + } + else + { + staffs += " <input disabled=\"disabled\" type =\"checkbox\" value='" + oA_Staffs[i].Keyid + "' />" + oA_Staffs[i].Name; + } + + + + } } } diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx index 5002fee..550f00c 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx @@ -40,13 +40,12 @@ } ) if (deleteKeyIds == "") { - // deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1); - //window.location = "/Pages/work/OA_DocumentJuese.aspx?deleteKeyIds=" + deleteKeyIds + "&&orderkeyid=<%=keyid %>"; + $("#deleteKeyIds").val(deleteKeyIds); } else { deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1); - // window.location = "/Pages/work/OA_DocumentJuese.aspx?deleteKeyIds=" + deleteKeyIds + "&&orderkeyid=<%=keyid %>"; + $("#deleteKeyIds").val(deleteKeyIds); } } @@ -76,39 +75,16 @@ </div> </div> <div> - <asp:Repeater ID="RepClientList" runat="server"> - <HeaderTemplate> - <table class="tableStyle"> - <tr> - <th width="25"> - </th> - <th width="30" style="text-align: center"> - 缂栧彿 - </th> - <th style="text-align: center"> - 鍚嶇О - </th> - - </tr> - </HeaderTemplate> - <ItemTemplate> - <tr> - <td> - <input type="checkbox" value='<%#Eval("Keyid")%>' <%#Eval("ShifouCheck") %> /> - </td> - <td style="text-align: center"> - <%#Container.ItemIndex + 1 %> - </td> - <td style="text-align: center"> - <%#Eval("RoleName")%> - </td> - - </tr> - </ItemTemplate> - <FooterTemplate> - </table> - </FooterTemplate> - </asp:Repeater> + <table class="tableStyle" style="margin: 10px auto;" cellpadding="0" cellspacing="0"> + <tr> + <td class="ali03" valign="top"> + 鏌ョ湅鍛樺伐锛� + </td> + <td > + <%=staffs %> + </td> + </tr> + </table> </div> </div> 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 ff98be0..dd98bdb 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx.cs +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx.cs @@ -16,14 +16,17 @@ public partial class Adm_zhanghaomimaJuese : BasePage { Adm_zhanghaomimaBLL bll_Adm_zhanghaomimaBLL = null; - OA_FirmRoleBLL oA_FirmRoleBLL = null; - public string keyid = ""; + OA_StaffBLL bll_OA_StaffBLL = null; + OA_DepartmentBll bll_OA_DepartmentBll = null; + public string staffs = ""; //鍒濆鍖� public Adm_zhanghaomimaJuese() { bll_Adm_zhanghaomimaBLL = new Adm_zhanghaomimaBLL(); - oA_FirmRoleBLL = new OA_FirmRoleBLL(); + bll_OA_StaffBLL = new OA_StaffBLL(); + bll_OA_DepartmentBll = new OA_DepartmentBll(); + } //椤甸潰鍔犺浇 @@ -42,31 +45,40 @@ //缁戝畾鏁版嵁 private void BindList() { - keyid = Request["keyid"]; if (!string.IsNullOrEmpty(Request["keyid"])) { - var adm_zhanghaomima = bll_Adm_zhanghaomimaBLL.GetModelByKeyid(Request["keyid"].ToInt32().Value); - if (adm_zhanghaomima != null) - { - var Jusequanxian = adm_zhanghaomima.Jusequanxian; - var oA_FirmRoles = oA_FirmRoleBLL.SelectList(CurrentUser.MemberId).Where(x=>x.IsUsed == true); - foreach(var oA_FirmRole in oA_FirmRoles) + // var adm_zhanghaomima = bll_Adm_zhanghaomimaBLL.GetModelByKeyids(Request["keyid"]).ToList(); + + + + + + //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++) { - if (!string.IsNullOrEmpty(Jusequanxian)) + if (i != 0 && oA_Staffs[i].DepartmentId != oA_Staffs[i - 1].DepartmentId) { - var Jusequanxians = Jusequanxian.Split(','); - if(Jusequanxians.Count(x => x == oA_FirmRole.Keyid.Value.ToString()) > 0) + var department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId); + if (department != null) { - oA_FirmRole.ShifouCheck = "checked=\"checked\""; + staffs += "<br/>" + department.Name + ":"; } } - + if (i == 0) + { + var department = bll_OA_DepartmentBll.GetModelByKeyid(oA_Staffs[i].DepartmentId); + if (department != null) + { + staffs += department.Name + ":"; + } + } + staffs += " <input type=\"checkbox\" value='" + oA_Staffs[i].Keyid + "' />" + oA_Staffs[i].Name; } - this.RepClientList.DataSource = oA_FirmRoles; - this.RepClientList.DataBind(); - } + // } } @@ -80,9 +92,26 @@ try { - var adm_zhanghaomima = bll_Adm_zhanghaomimaBLL.GetModelByKeyid(Request["keyid"].ToInt32().Value); - adm_zhanghaomima.Jusequanxian = deleteKeyIds.Value; - if (bll_Adm_zhanghaomimaBLL.UpdateModel(adm_zhanghaomima)) + var adm_zhanghaomimas = bll_Adm_zhanghaomimaBLL.GetModelByKeyids(Request["keyid"]).ToList(); + + + + var ssss = true; + + if (adm_zhanghaomimas != null && adm_zhanghaomimas.Count > 0) + { + foreach (var adm_Zhanghaomima in adm_zhanghaomimas) + { + + adm_Zhanghaomima.Jusequanxian = "," + deleteKeyIds.Value + ","; + ssss= bll_Adm_zhanghaomimaBLL.UpdateModel(adm_Zhanghaomima); + } + } + + + + + if (ssss) { JavaScript.MessageBox("淇濆瓨鎴愬姛", this, true, false); } diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx.designer.cs index 1b3f8d0..ca18106 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx.designer.cs +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaJuese.aspx.designer.cs @@ -58,14 +58,5 @@ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲�� /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlInputHidden deleteKeyIds; - - /// <summary> - /// RepClientList 鎺т欢銆� - /// </summary> - /// <remarks> - /// 鑷姩鐢熸垚鐨勫瓧娈点�� - /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲�� - /// </remarks> - protected global::System.Web.UI.WebControls.Repeater RepClientList; } } diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx index 7de25bc..11dd4d5 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx @@ -46,15 +46,13 @@ } ) if (deleteKeyIds == "") { - top.Dialog.alert("璇烽�夋嫨瑕佸垹闄ょ殑璐﹀彿瀵嗙爜", function () { + top.Dialog.alert("璇烽�夋嫨瑕佽缃潈闄愮殑璐﹀彿瀵嗙爜", function () { }); return; } else { deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1); - top.Dialog.confirm("纭畾瑕佸垹闄ゆ墍閫夎处鍙峰瘑鐮佸悧锛�", function () { - window.location = "/Pages/work/Adm_zhanghaomimaList.aspx?deleteKeyIds=" + deleteKeyIds; - }); + top.Dialog.open({ URL: "/Pages/work/Adm_zhanghaomimaJuese.aspx?keyid=" + deleteKeyIds, Title: "璐﹀彿瀵嗙爜璁剧疆鏉冮檺绠$悊", Width: 850, Height: 600 }); } } </script> @@ -90,10 +88,10 @@ <div class="left"> <div class="right"> <div class="padding_top5 padding_left10"> - <a href="javascript:;" onclick="addModel()" menu_member_case_id="case_addModel" menu_member_case_name="鏂板璐﹀彿瀵嗙爜"><span class="icon_add">鏂板璐﹀彿瀵嗙爜</span></a> - <%-- <div class="box_tool_line"> + <a href="javascript:;" onclick="addModel()" <%=BF_IsChangyongziliao %> menu_member_case_id="case_addModel" menu_member_case_name="鏂板璐﹀彿瀵嗙爜"><span class="icon_add">鏂板璐﹀彿瀵嗙爜</span></a> + <div class="box_tool_line"> </div> - <a href="javascript:;" onclick="onAllDelete()" menu_member_case_id="case_onAllDeleteList" menu_member_case_name="鎵归噺鍒犻櫎"><span class="icon_delete">鎵归噺鍒犻櫎</span></a>--%> + <a href="javascript:;" onclick="onAllDelete()" <%=BF_IsChangyongziliao %> menu_member_case_id="case_onAllchakanList" menu_member_case_name="鎵归噺鏌ョ湅鏉冮檺"><span class="icon_edit">鎵归噺鏌ョ湅鏉冮檺</span></a> <div class="clear"> </div> </div> @@ -159,10 +157,10 @@ </td> <td class="Operate " style="text-align: center"> <span menu_member_case_id="case_OnDetail" menu_member_case_name="鏌ョ湅" onclick="onEdit('<%#Eval("Keyid")%>')">鏌ョ湅</span> - <span menu_member_case_id="case_OnUdate" menu_member_case_name="淇敼" onclick="editModel('<%#Eval("Keyid")%>')">淇敼</span> - <span menu_member_case_id="case_OnDele" menu_member_case_name="鍒犻櫎" onclick="onDele('<%#Eval("Keyid")%>')">鍒犻櫎</span> + <span <%=BF_IsChangyongziliao %> menu_member_case_id="case_OnUdate" menu_member_case_name="淇敼" onclick="editModel('<%#Eval("Keyid")%>')">淇敼</span> + <span <%=BF_IsChangyongziliao %> menu_member_case_id="case_OnDele" menu_member_case_name="鍒犻櫎" onclick="onDele('<%#Eval("Keyid")%>')">鍒犻櫎</span> - <span menu_member_case_id="case_Juesequanxian" menu_member_case_name="鏌ョ湅瑙掕壊鏉冮檺" onclick="Juesequanxian('<%#Eval("Keyid")%>')">鏌ョ湅瑙掕壊鏉冮檺</span> + <%-- <span <%=BF_IsChangyongziliao %> menu_member_case_id="case_Juesequanxian" menu_member_case_name="鏌ョ湅瑙掕壊鏉冮檺" onclick="Juesequanxian('<%#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 123dc8a..8ff0948 100644 --- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx.cs +++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_zhanghaomimaList.aspx.cs @@ -19,6 +19,7 @@ Adm_zhanghaomimaBLL bll_Adm_zhanghaomimaBLL = null; Sys_DictionaryBLL bll_Sys_DictionaryBLL = null; OA_StaffBLL bll_OA_StaffBLL = null; + public string BF_IsChangyongziliao = ""; //鍒濆鍖� public Adm_zhanghaomimaList() @@ -58,7 +59,7 @@ this.seltype.DataTextField = "Name"; this.seltype.DataBind(); this.seltype.Items.Insert(0, new ListItem("鍏ㄩ儴", "")); - + BindList(); } @@ -89,13 +90,31 @@ //缁戝畾鏁版嵁 private void BindList() { + var oA_Staff = bll_OA_StaffBLL.GetModelByKeyid(CurrentUser.StaffId); + var IsChangyongziliao = false; + if (oA_Staff != null) + { + if (oA_Staff.BF_IsChangyongziliao.HasValue && oA_Staff.BF_IsChangyongziliao.Value == true) + { + BF_IsChangyongziliao = ""; + } + else + { + BF_IsChangyongziliao = "style=\"display:none;\""; + } + if (oA_Staff.BF_IsChangyongziliao.HasValue) + { + IsChangyongziliao = oA_Staff.BF_IsChangyongziliao.Value; + } + } + 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()); + this.RepClientList.DataSource = bll_Adm_zhanghaomimaBLL.SelectModelPage(pa, CurrentUser.MemberId, this.seltype.Value, this.txtchanpinxiangmu.Value.Trim(), IsChangyongziliao, CurrentUser.StaffId); this.RepClientList.DataBind(); UCPager1.AspNetPager.RecordCount = pa.RecordCount; } -- Gitblit v1.9.1