修改安全实施计划

SGGL/BLL/PHTGL/OAWebSevice.cs

@@ -40,6 +40,7 @@ namespace BLL
 
             }
             url = url + PHTUrl;
+            //LogService.AddSys_Log(Person_PersonsService.GetPerson_PersonsById(personId),"", ID, "ActionPlanListEdit",url);
             return url;
         }
         public static string getAppurl(string projectid, string formname, string ID, string userid)

SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx

@@ -24,6 +24,13 @@
                         </f:TextBox>
                     </Items>
                 </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpProject" runat="server"  EnableEdit="true" LabelWidth="140px"
+                            Label="项目" >
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
                 <f:FormRow>
                     <Items>
                         <f:TextBox ID="txtVersionNo" runat="server" Label="版本号" LabelAlign="Right" LabelWidth="140px">

SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs

@@ -66,7 +66,6 @@ namespace FineUIPro.Web.ZHGL.Plan
             if (!IsPostBack)
             {
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
-                this.ProjectId = this.CurrUser.LoginProjectId;
                 this.ActionPlanListId = Request.Params["ActionPlanListId"];
                 var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) orderby x.PersonName select x).ToList();
                 Model.ActionPlan_ActionPlanList actionPlanList = BLL.ActionPlanListService.GetActionPlanListById(this.ActionPlanListId);
@@ -93,6 +92,7 @@ namespace FineUIPro.Web.ZHGL.Plan
                 this.drpPerson.DataSource = q;
                 this.drpPerson.DataBind();
                 Funs.FineUIPleaseSelect(this.drpPerson);
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 ContactImg = 0;
                 if (!string.IsNullOrEmpty(this.ActionPlanListId))
                 {
@@ -120,6 +120,10 @@ namespace FineUIPro.Web.ZHGL.Plan
                         {
                             this.drpProjectType.Hidden = true;
                         }
+                        if (!string.IsNullOrEmpty(actionPlanList.ProjectId))
+                        {
+                            this.drpProject.SelectedValue = actionPlanList.ProjectId;
+                        }
                         if (!string.IsNullOrEmpty(actionPlanList.CompileMan))
                         {
                             this.drpCompileMan.SelectedValue = actionPlanList.CompileMan;
@@ -264,7 +268,7 @@ namespace FineUIPro.Web.ZHGL.Plan
                     //this.txtActionPlanListCode.Text = BLL.CodeRecordsService.ReturnCodeByMenuIdProjectId(BLL.Const.OfficeActionPlanListMenuId, this.ProjectId, this.CurrUser.UnitId);
                     this.txtActionPlanListName.Text = this.SimpleForm1.Title;
                     this.txtVersionNo.Text = "V1.0";
-                    this.drpProjectType.Hidden = true;
+                    //this.drpProjectType.Hidden = true;
                     this.drpReviewMan.SelectedValue = this.CurrUser.PersonId;
                     this.drpPerson.Hidden = true;
                 }
@@ -333,12 +337,15 @@ namespace FineUIPro.Web.ZHGL.Plan
         {
             Model.ActionPlan_ActionPlanList actionPlanList = new Model.ActionPlan_ActionPlanList
             {
-                ProjectId = this.ProjectId,
                 ActionPlanListCode = this.txtActionPlanListCode.Text.Trim(),
                 ActionPlanListName = this.txtActionPlanListName.Text.Trim(),
                 VersionNo = this.txtVersionNo.Text.Trim(),
-                //ProjectType = this.drpProjectType.SelectedValue,
+                ProjectType = this.drpProjectType.SelectedValue,
             };
+            if (this.drpProject.SelectedValue != BLL.Const._Null)
+            {
+                actionPlanList.ProjectId = this.drpProject.SelectedValue;
+            }
             if (this.drpCompileMan.SelectedValue != BLL.Const._Null)
             {
                 actionPlanList.CompileMan = this.drpCompileMan.SelectedValue;

SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.designer.cs

@@ -57,6 +57,15 @@ namespace FineUIPro.Web.ZHGL.Plan {
         /// </remarks>
         protected global::FineUIPro.TextBox txtActionPlanListName;
         
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+        
         /// <summary>
         /// txtVersionNo 控件。
         /// </summary>

SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListView.aspx

@@ -23,6 +23,13 @@
                         </f:TextBox>
                     </Items>
                 </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpProject" runat="server"  EnableEdit="true" LabelWidth="140px" Readonly="true"
+                            Label="项目" >
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
                 <f:FormRow>
                     <Items>
                         <f:TextBox ID="txtVersionNo" runat="server" Label="版 本 号" LabelAlign="Right" LabelWidth="140px" Readonly="true">

SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListView.aspx.cs

@@ -47,6 +47,7 @@ namespace FineUIPro.Web.ZHGL.Plan
                 this.drpPerson.DataSource = q;
                 this.drpPerson.DataBind();
                 Funs.FineUIPleaseSelect(this.drpPerson);
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 this.ActionPlanListId = Request.Params["ActionPlanListId"];
                 if (!string.IsNullOrEmpty(this.ActionPlanListId))
                 {
@@ -78,6 +79,10 @@ namespace FineUIPro.Web.ZHGL.Plan
                             this.rblIsReview.SelectedValue = "False";
                             this.drpPerson.Hidden = true;
                         }
+                        if (!string.IsNullOrEmpty(actionPlanList.ProjectId))
+                        {
+                            this.drpProject.SelectedValue = actionPlanList.ProjectId;
+                        }
                         List<string> list2 = BLL.ActionPlanListApproveService.GetReviewingPersonIds(this.ActionPlanListId);
                         if (list2.Count > 0)
                         {

SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListView.aspx.designer.cs

@@ -57,6 +57,15 @@ namespace FineUIPro.Web.ZHGL.Plan {
         /// </remarks>
         protected global::FineUIPro.TextBox txtActionPlanListName;
         
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+        
         /// <summary>
         /// txtVersionNo 控件。
         /// </summary>