username@email.com
2025-04-24 e7f2c6aa2638cde347ec1401c76a7a627cee4921
人事管理里边增加公文管理权限 完成
8个文件已修改
69 ■■■■ 已修改文件
CY_ECommercePlatform/CY.Model/OA/OA_Document.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/OA/OA_Document.cs
@@ -34,6 +34,8 @@
        private DateTime? _lastupdatetime;
        private string _operator;
        public string BF_IsGongwen {get;set;}
        /// <summary>
        /// 主键--标识ID
        /// </summary>        
CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs
@@ -353,6 +353,16 @@
        }
        /// <summary>
        /// BF_IsGongwen
        /// </summary>
        public bool? BF_IsGongwen
        {
            get;
            set;
        }
        /// <summary>
        /// 所在部门
        /// </summary>        
        public int? DepartmentId
@@ -1336,6 +1346,11 @@
                this.BF_Isbaoxiaojingli = isChange ? MyConvert.ConvertToBoolean(value) : BF_Isbaoxiaojingli;
                theValue = this.BF_Isbaoxiaojingli;
            }
            else if ("BF_IsGongwen".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 69)
            {
                this.BF_IsGongwen = isChange ? MyConvert.ConvertToBoolean(value) : BF_IsGongwen;
                theValue = this.BF_IsGongwen;
            }
            return theValue;
        }
CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs
@@ -101,6 +101,7 @@
                    new SqlParameter("@BF_IsDriver", trueModel.BF_IsDriver) ,
                      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) ,
            };
            try
            {
@@ -195,6 +196,7 @@
                    new SqlParameter("@BF_IsDriver", trueModel.BF_IsDriver) ,
                         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) ,
            };
            try
            {
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
@@ -165,7 +165,11 @@
                    {
                        _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
                    }
                    var ssss = /*_inquiryCommonModel.PrintDemand +*/ _inquiryCommonModel.AfterWorksDemand.Replace("封面后道:", "").Replace("内页后道:", "");
                    var ssss = "";
                    if (!string.IsNullOrEmpty(_inquiryCommonModel.AfterWorksDemand))
                    {
                        ssss = /*_inquiryCommonModel.PrintDemand +*/ _inquiryCommonModel.AfterWorksDemand.Replace("封面后道:", "").Replace("内页后道:", "");
                    }
                    if(_eC_OrderBasic.PrintTypeId == -1)
                    {
                        ssss = _inquiryCommonModel.PrintDemand;
CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx
@@ -156,7 +156,9 @@
                             <th>
                                报销经理
                            </th>
                             <th>
                                公文权限
                            </th>
                            <th>
                                操作
                            </th>
@@ -225,6 +227,10 @@
                                <span   onclick="CompledWork('<%#Eval("Keyid")%>',6)">
                            <%#bool.Parse(Eval("BF_Isbaoxiaojingli").ToString()) ? "√" : "×"%></span>
                        </td>
                         <td class="Operate" >
                                <span   onclick="CompledWork('<%#Eval("Keyid")%>',7)">
                            <%#bool.Parse(Eval("BF_IsGongwen").ToString()) ? "√" : "×"%></span>
                        </td>
                      
                        <td class="Operate">
                            <span menu_member_case_id="case_ViewThings" menu_member_case_name="物品领取记录" onclick="ViewModel('<%#Eval("MemberId")%>')">物品领取记录</span> 
CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx.cs
@@ -104,8 +104,12 @@
                    this.types.InnerText = "报销经理:";
                    this.IsBusinessManager.SelectedValue = m_OA_Staff.BF_Isbaoxiaojingli ? "True" : "False";
                }
                else if (type.ToInt32() == 7)
                {
                    this.types.InnerText = "公文权限:";
                    this.IsBusinessManager.SelectedValue = m_OA_Staff.BF_Isbaoxiaojingli ? "True" : "False";
                }
            }
                 
@@ -145,8 +149,11 @@
                {
                    m_OA_Staff.BF_Isbaoxiaojingli = this.IsBusinessManager.SelectedValue.ToBoolean2();
                }
                else if (type.ToInt32() == 7)
                {
                    m_OA_Staff.BF_IsGongwen = this.IsBusinessManager.SelectedValue.ToBoolean2();
                }
CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx
@@ -204,9 +204,9 @@
                            <%#Eval("DM_PrintStatus").ToString() == "1" ? "未打印" : "已打印"%>
                        </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_OnUpdate" 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 menu_member_case_id="case_OnDetail" menu_member_case_name="查看" onclick="onEdit('<%#Eval("Keyid")%>')">查看</span>    <span menu_member_case_id="case_OnUpdate" menu_member_case_name="修改" <%#Eval("BF_IsGongwen") %> onclick="editModel('<%#Eval("Keyid")%>')">修改</span>   <span menu_member_case_id="case_OnDele" menu_member_case_name="删除" <%#Eval("BF_IsGongwen") %>  onclick="onDele('<%#Eval("Keyid")%>')">删除</span>
                             <span menu_member_case_id="case_Juesequanxian" menu_member_case_name="查看角色权限" onclick="Juesequanxian('<%#Eval("Keyid")%>')">查看角色权限</span>
                             <span menu_member_case_id="case_Juesequanxian" menu_member_case_name="查看角色权限" <%#Eval("BF_IsGongwen") %>  onclick="Juesequanxian('<%#Eval("Keyid")%>')">查看角色权限</span>
                            
CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx.cs
@@ -17,12 +17,14 @@
    {
        OA_DocumentBLL bll_OA_DocumentBLL = null;
        OA_DocumentDicBLL bll_OA_DocumentDicBLL = null;
        OA_StaffBLL bll_OA_StaffBLL = null;
        //初始化
        public OA_DocumentList()
        {
            bll_OA_DocumentBLL = new OA_DocumentBLL();
            bll_OA_DocumentDicBLL = new OA_DocumentDicBLL();
            bll_OA_StaffBLL = new OA_StaffBLL();
        }
        //页面加载
@@ -82,7 +84,24 @@
            Pagination pa = new Pagination();
            pa.PageSize = UCPager1.AspNetPager.PageSize;
            pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
            this.RepClientList.DataSource = bll_OA_DocumentBLL.SelectModelPage(pa, CurrentUser.MemberId, this.txtDM_PromulgatedDateStart.Value.ToDateTime2(), this.txtDM_PromulgatedDateEnd.Value.ToDateTime2(), this.DM_Status.Value.ToInt32(), this.DM_PostingSector.Value.ToInt32(), "", "", this.DM_DocumentType.Value, this.DM_DocumentNumber.Value, this.DM_Title.Value, "", "", "", null, null, null, null, null, null, null, null, null, "");
            var oA_Documents = bll_OA_DocumentBLL.SelectModelPage(pa, CurrentUser.MemberId, this.txtDM_PromulgatedDateStart.Value.ToDateTime2(), this.txtDM_PromulgatedDateEnd.Value.ToDateTime2(), this.DM_Status.Value.ToInt32(), this.DM_PostingSector.Value.ToInt32(), "", "", this.DM_DocumentType.Value, this.DM_DocumentNumber.Value, this.DM_Title.Value, "", "", "", null, null, null, null, null, null, null, null, null, "");
            var oA_Staff = bll_OA_StaffBLL.GetModelByKeyid(CurrentUser.StaffId);
            foreach (var oA_Document in oA_Documents)
            {
                if (oA_Staff != null)
                {
                    if (oA_Staff.BF_IsGongwen.HasValue && oA_Staff.BF_IsGongwen.Value == true)
                    {
                        oA_Document.BF_IsGongwen = "";
                    }
                    else
                    {
                        oA_Document.BF_IsGongwen = "style=\"display:none;\"";
                    }
                }
            }
            this.RepClientList.DataSource = oA_Documents;
            this.RepClientList.DataBind();
            UCPager1.AspNetPager.RecordCount = pa.RecordCount;
        }