From e7f2c6aa2638cde347ec1401c76a7a627cee4921 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 24 四月 2025 08:50:26 +0800
Subject: [PATCH] 人事管理里边增加公文管理权限 完成

---
 CY_ECommercePlatform/CY.Model/OA/OA_Document.cs                             |    2 +
 CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx             |    4 +-
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs    |    6 ++
 CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs                                |   15 +++++++
 CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs                            |    2 +
 CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx              |    8 +++
 CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx.cs |   11 ++++-
 CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx.cs          |   21 ++++++++++
 8 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Document.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Document.cs
index 15c97e3..90bafe7 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Document.cs
+++ b/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>		
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs
index ff5b7d3..78a62d6 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs
+++ b/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;
         }
 
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs
index 693abff..5b9376f 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs
+++ b/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
             {
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
index a586666..773b3ad 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
+++ b/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;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx
index 5538fa4..dfc2777 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx
+++ b/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> 
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx.cs
index 6a2d838..36c9eca 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx.cs
+++ b/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();
+                }
 
-              
 
 
 
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx
index c508648..5fb09ce 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx
+++ b/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>
 
 
                             
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx.cs
index 5e87ecd..80e4bdc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx.cs
+++ b/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;
         }

--
Gitblit v1.9.1