修改项目安全实施计划

SGGL/BLL/BLL.csproj

@@ -393,6 +393,7 @@
     <Compile Include="HSSE\Accident\AccidentReportOtherService.cs" />
     <Compile Include="HSSE\Accident\AccidentReportService.cs" />
     <Compile Include="HSSE\Accident\NoFourLetoffService.cs" />
+    <Compile Include="HSSE\ActionPlan\ActionPlanListApproveService.cs" />
     <Compile Include="HSSE\ActionPlan\ActionPlanListService.cs" />
     <Compile Include="HSSE\ActionPlan\ActionPlan_CompanyManagerRuleService.cs" />
     <Compile Include="HSSE\ActionPlan\ActionPlan_ManagerRuleService.cs" />

SGGL/BLL/Common/AttachFileService.cs

@@ -151,6 +151,27 @@ namespace BLL
             return res;
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="toKeyId"></param>
+        /// <param name="menuId"></param>
+        /// <returns></returns>
+        public static Boolean Getfile(string toKeyId)
+        {
+            bool res = false;
+            var q = Funs.DB.AttachFile.FirstOrDefault((x => x.ToKeyId == toKeyId));
+            if (q != null)
+            {
+                var file = q.AttachUrl;
+                if (!string.IsNullOrEmpty(file))
+                {
+                    res = true;
+                }
+            }
+            return res;
+        }
+
         /// <summary>
         /// 
         /// </summary>

SGGL/BLL/Common/Const.cs

@@ -943,7 +943,10 @@
         /// 同步记录
         /// </summary>
         public const string RealNameSynchroRecordMenuId = "F36E6C54-E39F-4032-874D-548EE090A35B";
-
+        /// <summary>
+        /// 实施计划
+        /// </summary>
+        public const string OfficeActionPlanListMenuId = "B6A2B6EB-6B90-4953-B544-83FFF4F0EC19";
         /// <summary>
         /// 总包施工质量计划
         /// </summary>
@@ -3431,6 +3434,47 @@
         public const string ProjectInformation_DrillPlanHalfYearReportId = "10";
         #endregion
 
+        #region 安全流程定义
+        #region 安全实施计划流程定义
+
+        /// <summary>
+        /// 重报
+        /// </summary>
+        public const string ActionPlanList_ReCompile = "0";
+
+        /// <summary>
+        /// 编制
+        /// </summary>
+        public static string ActionPlanList_Compile = "1";
+
+        /// <summary>
+        /// 会签
+        /// </summary>
+        public static string ActionPlanList_Audit = "2";
+
+        /// <summary>
+        /// 评审负责人办理
+        /// </summary>
+        public static string ActionPlanList_Review = "3";
+
+        /// <summary>
+        /// 施工管理部评审
+        /// </summary>
+        public static string ActionPlanList_Reviewing = "4";
+
+        /// <summary>
+        /// 评审负责人办理
+        /// </summary>
+        public static string ActionPlanList_Review2 = "5";
+
+        /// <summary>
+        /// 审批完成
+        /// </summary>
+        public static string ActionPlanList_Complete = "C";
+
+        #endregion
+        #endregion
+
         #region 质量
         #region  质量管理
         #region 基础设置

SGGL/BLL/HSSE/ActionPlan/ActionPlanListApproveService.cs

@@ -0,0 +1,482 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+    public class ActionPlanListApproveService
+    {
+        public static Model.ActionPlan_ActionPlanListApprove GetSee(string ActionPlanListId, string userId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            return db.ActionPlan_ActionPlanListApprove.FirstOrDefault(x => x.ActionPlanListId == ActionPlanListId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
+        }
+
+        public static Model.ActionPlan_ActionPlanListApprove GetReview(string ActionPlanListId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            return db.ActionPlan_ActionPlanListApprove.FirstOrDefault(x => x.ActionPlanListId == ActionPlanListId && x.ApproveType == "R");
+        }
+
+        public static void See(string ActionPlanListId, string userId)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var res = db.ActionPlan_ActionPlanListApprove.FirstOrDefault(x => x.ActionPlanListId == ActionPlanListId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
+                if (res != null)
+                {
+                    res.ApproveDate = DateTime.Now;
+                    db.SubmitChanges();
+                }
+            }
+        }
+
+        /// <summary>
+        /// 部门评审小组审批信息
+        /// </summary>
+        /// <param name="MainPlanId"></param>
+        /// <returns></returns>
+        public static List<Model.ActionPlan_ActionPlanListApprove> GetReviewings(string ActionPlanListId, int edtion)
+        {
+            return (from x in Funs.DB.ActionPlan_ActionPlanListApprove where x.ActionPlanListId == ActionPlanListId && x.ApproveType == BLL.Const.ActionPlanList_Reviewing && x.Edition == edtion select x).ToList();
+        }
+
+        /// <summary>
+        /// 部门评审小组审批信息
+        /// </summary>
+        /// <param name="MainPlanId"></param>
+        /// <returns></returns>
+        public static List<Model.ActionPlan_ActionPlanListApprove> GetReviewingEnds(string ActionPlanListId, int edtion)
+        {
+            return (from x in Funs.DB.ActionPlan_ActionPlanListApprove where x.ActionPlanListId == ActionPlanListId && x.ApproveType == BLL.Const.ActionPlanList_Reviewing && x.Edition == edtion && x.ApproveDate != null select x).ToList();
+        }
+
+        /// <summary>
+        /// 部门评审小组审批人员Id集合
+        /// </summary>
+        /// <param name="MainPlanId"></param>
+        /// <returns></returns>
+        public static List<string> GetReviewingPersonIds(string ActionPlanListId)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                return (from x in db.ActionPlan_ActionPlanListApprove where x.ActionPlanListId == ActionPlanListId && x.ApproveType == BLL.Const.ActionPlanList_Reviewing select x.ApproveMan).ToList();
+            }
+        }
+
+        /// <summary>
+        /// 根据安全实施计划编号获取对应的所有未办理安全实施计划审批信息
+        /// </summary>
+        /// <param name="ActionPlanListId">安全实施计划编号</param>
+        public static List<Model.ActionPlan_ActionPlanListApprove> GetActionPlanListApprovesNotHandleList(string ActionPlanListId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            return (from x in Funs.DB.ActionPlan_ActionPlanListApprove where x.ActionPlanListId == ActionPlanListId && x.ApproveType != "S" && x.ApproveDate == null select x).ToList();
+        }
+
+        /// <summary>
+        /// 根据安全实施计划发布Id获取对应组会签人id集合信息
+        /// </summary>
+        /// <param name="ActionPlanListCode">安全实施计划发布Id</param>
+        /// <returns>安全实施计划审批集合</returns>
+        public static List<string> GetUserIdsApprovesBySignType(string ActionPlanListId, string signType)
+        {
+            var edtion = GetUserIdsApprovesBySignTypeEditon(ActionPlanListId);
+            return (from x in Funs.DB.ActionPlan_ActionPlanListApprove where x.ActionPlanListId == ActionPlanListId && x.ApproveType != "S" && x.SignType == signType && x.Edition == edtion select x.ApproveMan).ToList();
+        }
+
+        public static int? GetUserIdsApprovesBySignTypeEditon(string ActionPlanListId)
+        {
+            int edition = 0;
+            var actionPlanList = Funs.DB.ActionPlan_ActionPlanList.FirstOrDefault(p => p.ActionPlanListId == ActionPlanListId);
+            if (actionPlanList != null)
+            {
+                edition = Convert.ToInt32(actionPlanList.Edition);
+            }
+            return edition;
+        }
+
+        /// <summary>
+        /// 修改安全实施计划审批信息
+        /// </summary>
+        /// <param name="managerRuleApprove">安全实施计划审批实体</param>
+        public static void UpdateActionPlanListApprove(Model.ActionPlan_ActionPlanListApprove approve)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.ActionPlan_ActionPlanListApprove newApprove = db.ActionPlan_ActionPlanListApprove.First(e => e.ActionPlanListApproveId == approve.ActionPlanListApproveId && e.ApproveDate == null);
+            newApprove.ActionPlanListId = approve.ActionPlanListId;
+            newApprove.ApproveMan = approve.ApproveMan;
+            newApprove.ApproveDate = approve.ApproveDate;
+            newApprove.ApproveIdea = approve.ApproveIdea;
+            newApprove.IsAgree = approve.IsAgree;
+            newApprove.ApproveType = approve.ApproveType;
+            newApprove.Edition = approve.Edition;
+            db.SubmitChanges();
+        }
+        /// <summary>
+        /// 根据安全实施计划发布Id获取所以对应安全实施计划审批信息(查询全部会签状态)
+        /// </summary>
+        /// <param name="ActionPlanListCode">安全实施计划发布Id</param>
+        /// <returns>安全实施计划审批集合</returns>
+        public static List<Model.ActionPlan_ActionPlanListApprove> GetHandleActionPlanListApprovesByActionPlanListId(string ActionPlanListId, int edition)
+        {
+            var list = Funs.DB.ActionPlan_ActionPlanListApprove.Where(p => p.ActionPlanListId == ActionPlanListId && p.ApproveType == Const.ActionPlanList_Audit && p.Edition == edition).ToList();
+            return list;
+
+        }
+
+        public static List<Model.ActionPlan_ActionPlanListApprove> GetHandleConstruct(string ActionPlanListId, int edition)
+        {
+            var list = Funs.DB.ActionPlan_ActionPlanListApprove.Where(p => p.ActionPlanListId == ActionPlanListId && p.ApproveType != "S" && p.ApproveDate != null && p.Edition == edition).ToList();
+            return list;
+
+        }
+        /// <summary>
+        /// 根据安全实施计划发布Id获取所以对应安全实施计划审批信息
+        /// </summary>
+        /// <param name="ActionPlanListCode">安全实施计划发布Id</param>
+        /// <returns>安全实施计划审批集合</returns>
+        public static List<Model.ActionPlan_ActionPlanListApprove> GetActionPlanListApprovesByActionPlanListId(string ActionPlanListId, string state)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var reDate = (from x in db.ActionPlan_ActionPlanListApprove where x.ActionPlanListId == ActionPlanListId && x.ApproveType == BLL.Const.ActionPlanList_ReCompile orderby x.ApproveDate descending select x.ApproveDate).FirstOrDefault();
+            if (reDate == null)
+            {
+                return (from x in db.ActionPlan_ActionPlanListApprove where x.ActionPlanListId == ActionPlanListId && x.ApproveType == state select x).ToList();
+            }
+            else
+            {
+                return (from x in db.ActionPlan_ActionPlanListApprove where x.ActionPlanListId == ActionPlanListId && x.ApproveType == state && (x.ApproveDate == null || x.ApproveDate > reDate) select x).ToList();
+            }
+        }
+
+        /// <summary>
+        /// 获取安全实施计划模板列表
+        /// </summary>
+        /// <param name="satartRowIndex"></param>
+        /// <param name="maximumRows"></param>
+        /// <returns></returns>
+        public static IList<Model.ActionPlan_ActionPlanListApprove> getListData(string ActionPlanListId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var res = from x in db.ActionPlan_ActionPlanListApprove
+                      where x.ActionPlanListId == ActionPlanListId && x.ApproveDate != null && x.ApproveType != "S"
+                      orderby x.ApproveDate
+                      select x;
+
+            //select new
+            //{
+            //    x.ActionPlanListApproveId,
+            //    x.ActionPlanListId,
+            //    x.ApproveMan,
+            //    x.ApproveDate,
+            //    x.IsAgree,
+            //    x.ApproveIdea,
+            //    x.ApproveType,
+            //    x.SignType,
+            //    //= x.IsAgree == true ? "是" : "否",
+            //};
+            return res.ToList();
+        }
+
+        /// <summary>
+        /// 获取未代办的记录数量
+        /// </summary>
+        /// <param name="satartRowIndex"></param>
+        /// <param name="maximumRows"></param>
+        /// <returns></returns>
+        public static int getListActionPlanApproveCount(string ActionPlanListId, string man, string signType)
+        {
+
+            var res = (from x in Funs.DB.ActionPlan_ActionPlanListApprove
+                       where x.ActionPlanListId == ActionPlanListId && x.ApproveDate == null && x.ApproveType != "S" && x.ApproveMan.Equals(man) && x.SignType == signType
+                       orderby x.ApproveDate
+                       select x).Count();
+            return res;
+        }
+        public static IList<Model.ActionPlan_ActionPlanListApprove> getListActionPlanApprove(string ActionPlanListId, string man)
+        {
+
+            var res = (from x in Funs.DB.ActionPlan_ActionPlanListApprove
+                       where x.ActionPlanListId == ActionPlanListId && x.ApproveDate == null && x.ApproveType != "S" && x.ApproveMan.Equals(man)
+                       orderby x.ApproveDate
+                       select x).ToList();
+            return res;
+        }
+        /// <summary>
+        /// 删除未代办的记录
+        /// </summary>
+        /// <param name="ActionPlanListId"></param>
+        public static void delActionPlanApprove(string ActionPlanListId, string man)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var q = (from x in Funs.DB.ActionPlan_ActionPlanListApprove where x.ActionPlanListId == ActionPlanListId && x.ApproveType != "S" && x.ApproveMan.Equals(man) && x.ApproveDate == null select x).ToList();
+            if (q.Count > 0)
+            {
+                db.ActionPlan_ActionPlanListApprove.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+        }
+
+
+        /// <summary>
+        /// 根据安全实施计划编号删除对应的所有安全实施计划审批信息
+        /// </summary>
+        /// <param name="ActionPlanListCode">安全实施计划编号</param>
+        public static void DeleteActionPlanListApprovesByActionPlanListId(string ActionPlanListId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var q = (from x in Funs.DB.ActionPlan_ActionPlanListApprove where x.ActionPlanListId == ActionPlanListId select x).ToList();
+            if (q.Count > 0)
+            {
+                db.ActionPlan_ActionPlanListApprove.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+        }
+        /// <summary>
+        /// 根据安全实施计划编号获取一个安全实施计划审批信息
+        /// </summary>
+        /// <param name="ActionPlanListCode">安全实施计划编号</param>
+        /// <returns>一个安全实施计划审批实体</returns>
+        public static Model.ActionPlan_ActionPlanListApprove GetActionPlanListApproveByApproveMan(string ActionPlanListId, string approveMan)
+        {
+
+            return Funs.DB.ActionPlan_ActionPlanListApprove.FirstOrDefault(x => x.ActionPlanListId == ActionPlanListId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
+        }
+        public static Model.ActionPlan_ActionPlanListApprove GetConstructSoluAppByApproveMan(string ActionPlanListId, string approveMan, int edtion)
+        {
+
+            return Funs.DB.ActionPlan_ActionPlanListApprove.FirstOrDefault(x => x.ActionPlanListId == ActionPlanListId && x.Edition == edtion && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
+        }
+
+        public static Model.ActionPlan_ActionPlanListApprove GetConstructSolApproveByApproveMan(string ActionPlanListId, string approveMan)
+        {
+            return Funs.DB.ActionPlan_ActionPlanListApprove.FirstOrDefault(x => x.ActionPlanListId == ActionPlanListId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
+        }
+
+
+        /// <summary>
+        /// 增加安全实施计划审批信息
+        /// </summary>
+        /// <param name="managerRuleApprove">安全实施计划审批实体</param>
+        public static void AddActionPlanListApprove(Model.ActionPlan_ActionPlanListApprove approve)
+        {
+            var db = Funs.DB;
+            Model.ActionPlan_ActionPlanListApprove newApprove = new Model.ActionPlan_ActionPlanListApprove();
+            if (string.IsNullOrWhiteSpace(approve.ActionPlanListApproveId))
+            {
+                newApprove.ActionPlanListApproveId = SQLHelper.GetNewID(typeof(Model.ActionPlan_ActionPlanListApprove));
+            }
+            else
+            {
+                newApprove.ActionPlanListApproveId = approve.ActionPlanListApproveId;
+            }
+            newApprove.ActionPlanListId = approve.ActionPlanListId;
+            newApprove.ApproveMan = approve.ApproveMan;
+            newApprove.ApproveDate = approve.ApproveDate;
+            newApprove.ApproveIdea = approve.ApproveIdea;
+            newApprove.IsAgree = approve.IsAgree;
+            newApprove.ApproveType = approve.ApproveType;
+            newApprove.SignType = approve.SignType;
+            newApprove.Edition = approve.Edition;
+            db.ActionPlan_ActionPlanListApprove.InsertOnSubmit(newApprove);
+            db.SubmitChanges();
+        }
+        public static void AddActionPlanListApproveForApi(Model.ActionPlan_ActionPlanListApprove approve)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                Model.ActionPlan_ActionPlanListApprove newApprove = new Model.ActionPlan_ActionPlanListApprove();
+                if (string.IsNullOrWhiteSpace(approve.ActionPlanListApproveId))
+                {
+                    newApprove.ActionPlanListApproveId = SQLHelper.GetNewID(typeof(Model.ActionPlan_ActionPlanListApprove));
+                }
+                else
+                {
+                    newApprove.ActionPlanListApproveId = approve.ActionPlanListApproveId;
+                }
+                newApprove.ActionPlanListId = approve.ActionPlanListId;
+                newApprove.ApproveMan = approve.ApproveMan;
+                newApprove.ApproveDate = approve.ApproveDate;
+                newApprove.ApproveIdea = approve.ApproveIdea;
+                newApprove.IsAgree = approve.IsAgree;
+                newApprove.ApproveType = approve.ApproveType;
+                newApprove.SignType = approve.SignType;
+                newApprove.Edition = approve.Edition;
+                db.ActionPlan_ActionPlanListApprove.InsertOnSubmit(newApprove);
+                db.SubmitChanges();
+            }
+        }
+        public static List<Model.ActionPlan_ActionPlanListApprove> getListDataForApi(string ActionPlanListId, int edition)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var q = from x in db.ActionPlan_ActionPlanListApprove
+                        where x.ActionPlanListId == ActionPlanListId && x.Edition == edition && x.ApproveDate != null && x.ApproveType != "S"
+                        orderby x.ApproveDate
+                        select new
+                        {
+                            x.ActionPlanListApproveId,
+                            x.ActionPlanListId,
+                            x.ApproveMan,
+                            ApproveManName = (from y in db.Person_Persons where y.PersonId == x.ApproveMan select y.PersonName).First(),
+                            x.ApproveDate,
+                            x.IsAgree,
+                            x.ApproveIdea,
+                            x.ApproveType,
+                            x.SignType,
+                        };
+                var list = q.ToList();
+                List<Model.ActionPlan_ActionPlanListApprove> res = new List<Model.ActionPlan_ActionPlanListApprove>();
+                foreach (var item in list)
+                {
+                    Model.ActionPlan_ActionPlanListApprove ap = new Model.ActionPlan_ActionPlanListApprove();
+                    ap.ActionPlanListApproveId = item.ActionPlanListApproveId;
+                    ap.ActionPlanListId = item.ActionPlanListId;
+                    ap.ApproveMan = item.ApproveMan + "$" + item.ApproveManName;
+                    ap.ApproveDate = item.ApproveDate;
+                    ap.IsAgree = item.IsAgree;
+                    ap.ApproveIdea = item.ApproveIdea;
+                    ap.ApproveType = item.ApproveType;
+                    ap.SignType = item.SignType;
+                    ap.AttachUrl = AttachFileService.getFileUrl(ap.ActionPlanListApproveId);
+                    res.Add(ap);
+                }
+                return res;
+            }
+        }
+        public static List<Model.ActionPlan_ActionPlanListApprove> getListDataForApi(string ActionPlanListId)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var q = from x in db.ActionPlan_ActionPlanListApprove
+                        where x.ActionPlanListId == ActionPlanListId && x.ApproveDate != null && x.ApproveType != "S"
+                        orderby x.ApproveDate
+                        select new
+                        {
+                            x.ActionPlanListApproveId,
+                            x.ActionPlanListId,
+                            x.ApproveMan,
+                            ApproveManName = (from y in db.Person_Persons where y.PersonId == x.ApproveMan select y.PersonName).First(),
+                            x.ApproveDate,
+                            x.IsAgree,
+                            x.ApproveIdea,
+                            x.ApproveType,
+                            x.SignType,
+                        };
+                var list = q.ToList();
+                List<Model.ActionPlan_ActionPlanListApprove> res = new List<Model.ActionPlan_ActionPlanListApprove>();
+                foreach (var item in list)
+                {
+                    Model.ActionPlan_ActionPlanListApprove ap = new Model.ActionPlan_ActionPlanListApprove();
+                    ap.ActionPlanListApproveId = item.ActionPlanListApproveId;
+                    ap.ActionPlanListId = item.ActionPlanListId;
+                    ap.ApproveMan = item.ApproveMan + "$" + item.ApproveManName;
+                    ap.ApproveDate = item.ApproveDate;
+                    ap.IsAgree = item.IsAgree;
+                    ap.ApproveIdea = item.ApproveIdea;
+                    ap.ApproveType = item.ApproveType;
+                    ap.SignType = item.SignType;
+                    ap.AttachUrl = AttachFileService.getFileUrl(ap.ActionPlanListApproveId);
+                    res.Add(ap);
+                }
+                return res;
+            }
+        }
+        public static Model.ActionPlan_ActionPlanListApprove getCurrApproveForApi(string ActionPlanListId, string approveMan, int edition)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                Model.ActionPlan_ActionPlanListApprove newApprove = db.ActionPlan_ActionPlanListApprove.FirstOrDefault(e => e.ActionPlanListId == ActionPlanListId && e.ApproveMan == approveMan && e.Edition == edition && e.ApproveType != "S" && e.ApproveDate == null);
+                if (newApprove != null)
+                {
+                    newApprove.ApproveIdea = Person_PersonsService.GetPersonsNameById(newApprove.ApproveMan);
+                }
+                return newApprove;
+            }
+        }
+        public static List<Model.ActionPlan_ActionPlanListApprove> getConApproveForApi(string ActionPlanListId, int edition)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                List<Model.ActionPlan_ActionPlanListApprove> res = new List<Model.ActionPlan_ActionPlanListApprove>();
+                var newApproves = db.ActionPlan_ActionPlanListApprove.Where(e => e.ActionPlanListId == ActionPlanListId && e.Edition == edition && e.ApproveType == "2").ToList();
+                if (newApproves != null)
+                {
+                    foreach (Model.ActionPlan_ActionPlanListApprove newApprove in newApproves)
+                    {
+                        Model.ActionPlan_ActionPlanListApprove a = new Model.ActionPlan_ActionPlanListApprove();
+                        a.ActionPlanListApproveId = newApprove.ActionPlanListApproveId;
+                        a.ActionPlanListId = newApprove.ActionPlanListId;
+                        a.ApproveDate = newApprove.ApproveDate;
+                        a.ApproveMan = newApprove.ApproveMan;
+                        a.ApproveType = newApprove.ApproveType;
+                        a.Edition = newApprove.Edition;
+                        a.IsAgree = newApprove.IsAgree;
+                        var name = Person_PersonsService.GetPersonsNameById(newApprove.ApproveMan);
+                        if (!string.IsNullOrEmpty(name))
+                        {
+                            a.ApproveMan = a.ApproveMan + "$" + name;
+                        }
+                        a.AttachUrl = AttachFileService.getFileUrl(a.ActionPlanListApproveId);
+                        res.Add(a);
+                    }
+                }
+                return res;
+            }
+        }
+        public static List<Model.ActionPlan_ActionPlanListApprove> getConApprovesForApi(string ActionPlanListId, int edition)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                List<Model.ActionPlan_ActionPlanListApprove> res = new List<Model.ActionPlan_ActionPlanListApprove>();
+                var newApproves = db.ActionPlan_ActionPlanListApprove.Where(e => e.ActionPlanListId == ActionPlanListId && e.Edition == edition).ToList();
+                if (newApproves != null)
+                {
+                    foreach (Model.ActionPlan_ActionPlanListApprove newApprove in newApproves)
+                    {
+                        Model.ActionPlan_ActionPlanListApprove a = new Model.ActionPlan_ActionPlanListApprove();
+                        a.ActionPlanListApproveId = newApprove.ActionPlanListApproveId;
+                        a.ActionPlanListId = newApprove.ActionPlanListId;
+                        a.ApproveDate = newApprove.ApproveDate;
+                        a.ApproveMan = newApprove.ApproveMan;
+                        a.ApproveType = newApprove.ApproveType;
+                        a.Edition = newApprove.Edition;
+                        a.IsAgree = newApprove.IsAgree;
+                        var name = Person_PersonsService.GetPersonsNameById(newApprove.ApproveMan);
+                        if (!string.IsNullOrEmpty(name))
+                        {
+                            a.ApproveMan = a.ApproveMan + "$" + name;
+                        }
+                        a.AttachUrl = AttachFileService.getFileUrl(a.ActionPlanListApproveId);
+                        res.Add(a);
+                    }
+                }
+                return res;
+            }
+        }
+        public static Model.ActionPlan_ActionPlanListApprove UpdateActionPlanListApproveForApi(Model.ActionPlan_ActionPlanListApprove approve)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                Model.ActionPlan_ActionPlanListApprove newApprove = db.ActionPlan_ActionPlanListApprove.First(e => e.ActionPlanListApproveId == approve.ActionPlanListApproveId);
+                if (!string.IsNullOrEmpty(approve.ActionPlanListId))
+                    newApprove.ActionPlanListId = approve.ActionPlanListId;
+                if (!string.IsNullOrEmpty(approve.ApproveMan))
+                    newApprove.ApproveMan = approve.ApproveMan;
+                if (approve.ApproveDate.HasValue)
+                    newApprove.ApproveDate = approve.ApproveDate;
+                if (!string.IsNullOrEmpty(approve.ApproveIdea))
+                    newApprove.ApproveIdea = approve.ApproveIdea;
+                if (approve.IsAgree.HasValue)
+                    newApprove.IsAgree = approve.IsAgree;
+                if (!string.IsNullOrEmpty(approve.ApproveType))
+                    newApprove.ApproveType = approve.ApproveType;
+
+                db.SubmitChanges();
+                AttachFileService.updateAttachFile(approve.AttachUrl, newApprove.ActionPlanListApproveId, Const.ProjectActionPlanListMenuId);
+                return newApprove;
+            }
+        }
+    }
+}

SGGL/BLL/HSSE/ActionPlan/ActionPlanListService.cs

@@ -45,6 +45,10 @@ namespace BLL
                 ActionPlanListName = actionPlanList.ActionPlanListName,
                 VersionNo = actionPlanList.VersionNo,
                 ProjectType = actionPlanList.ProjectType,
+                Edition = actionPlanList.Edition,
+                IsReview = actionPlanList.IsReview,
+                ReviewMan = actionPlanList.ReviewMan,
+                IsCompanyReview = actionPlanList.IsCompanyReview,
                 ActionPlanListContents = actionPlanList.ActionPlanListContents,
                 CompileMan = actionPlanList.CompileMan,
                 CompileDate = actionPlanList.CompileDate,
@@ -72,6 +76,10 @@ namespace BLL
                 newActionPlanList.ActionPlanListName = actionPlanList.ActionPlanListName;
                 newActionPlanList.VersionNo = actionPlanList.VersionNo;
                 newActionPlanList.ProjectType = actionPlanList.ProjectType;
+                newActionPlanList.Edition = actionPlanList.Edition;
+                newActionPlanList.IsReview = actionPlanList.IsReview;
+                newActionPlanList.ReviewMan = actionPlanList.ReviewMan;
+                newActionPlanList.IsCompanyReview = actionPlanList.IsCompanyReview;
                 newActionPlanList.ActionPlanListContents = actionPlanList.ActionPlanListContents;
                 newActionPlanList.CompileMan = actionPlanList.CompileMan;
                 newActionPlanList.CompileDate = actionPlanList.CompileDate;
@@ -89,6 +97,7 @@ namespace BLL
             Model.ActionPlan_ActionPlanList actionPlanList = Funs.DB.ActionPlan_ActionPlanList.FirstOrDefault(e => e.ActionPlanListId == actionPlanListId);
             if (actionPlanList != null)
             {
+                BLL.ActionPlanListApproveService.DeleteActionPlanListApprovesByActionPlanListId(actionPlanListId);
                 ////删除审核流程表
                 BLL.CommonService.DeleteFlowOperateByID(actionPlanList.ActionPlanListId);
                 ///删除附件
@@ -99,5 +108,68 @@ namespace BLL
                 Funs.DB.SubmitChanges();
             }
         }
+
+        /// <summary>
+        /// 把状态转换代号为文字形式
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        /// 
+        public static string ConvertState(object state)
+        {
+            if (state != null)
+            {
+                if (state.ToString() == BLL.Const.ActionPlanList_ReCompile)
+                {
+                    return "重报";
+                }
+                else if (state.ToString() == BLL.Const.ActionPlanList_Compile)
+                {
+                    return "编制";
+                }
+                else if (state.ToString() == BLL.Const.ActionPlanList_Audit)
+                {
+                    return "会签";
+                }
+                else if (state.ToString() == BLL.Const.ActionPlanList_Review)
+                {
+                    return "评审负责人办理";
+                }
+                else if (state.ToString() == BLL.Const.ActionPlanList_Reviewing)
+                {
+                    return "施工管理部评审";
+                }
+                else if (state.ToString() == BLL.Const.ActionPlanList_Review2)
+                {
+                    return "评审负责人办理";
+                }
+                else if (state.ToString() == BLL.Const.ActionPlanList_Complete)
+                {
+                    return "审批完成";
+                }
+            }
+            return "";
+        }
+
+        public static string IsAgree(Object type, Object res)
+        {
+            string result = string.Empty;
+            if (type.ToString().Equals(Const.ActionPlanList_ReCompile) || type.ToString().Equals(Const.ActionPlanList_Compile))
+            {
+                res = null;
+            }
+            if (res != null)
+            {
+                if (Convert.ToBoolean(res))
+                {
+                    result = "是";
+                }
+                else
+                {
+                    result = "否";
+                }
+            }
+            return result;
+        }
     }
 }

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -40,6 +40,7 @@
     <WarningLevel>3</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>7.2</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -1534,6 +1535,9 @@
     <Content Include="ZHGL\Information\SafetyQuarterlyReportEdit.aspx" />
     <Content Include="ZHGL\Information\WorkSummaryReport.aspx" />
     <Content Include="ZHGL\Information\WorkSummaryReportEdit.aspx" />
+    <Content Include="ZHGL\Plan\ActionPlanList.aspx" />
+    <Content Include="ZHGL\Plan\ActionPlanListEdit.aspx" />
+    <Content Include="ZHGL\Plan\ActionPlanListView.aspx" />
     <Content Include="ZHGL\Plan\MainPlan.aspx" />
     <Content Include="ZHGL\Plan\MainPlanEdit.aspx" />
     <Content Include="ZHGL\Plan\MainPlanView.aspx" />
@@ -13373,6 +13377,27 @@
     <Compile Include="ZHGL\Information\WorkSummaryReportEdit.aspx.designer.cs">
       <DependentUpon>WorkSummaryReportEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="ZHGL\Plan\ActionPlanList.aspx.cs">
+      <DependentUpon>ActionPlanList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ZHGL\Plan\ActionPlanList.aspx.designer.cs">
+      <DependentUpon>ActionPlanList.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ZHGL\Plan\ActionPlanListEdit.aspx.cs">
+      <DependentUpon>ActionPlanListEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ZHGL\Plan\ActionPlanListEdit.aspx.designer.cs">
+      <DependentUpon>ActionPlanListEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ZHGL\Plan\ActionPlanListView.aspx.cs">
+      <DependentUpon>ActionPlanListView.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ZHGL\Plan\ActionPlanListView.aspx.designer.cs">
+      <DependentUpon>ActionPlanListView.aspx</DependentUpon>
+    </Compile>
     <Compile Include="ZHGL\Plan\MainPlan.aspx.cs">
       <DependentUpon>MainPlan.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx

@@ -66,12 +66,20 @@
                             RendererFunction="renderProjectType">
                         </f:RenderField>
                         <f:WindowField TextAlign="Left" Width="80px" WindowID="WindowAtt" HeaderText="附件"
-                            Text="详细" ToolTip="附件上传查看" DataIFrameUrlFields="ActionPlanListId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ActionPlanListAttachUrl&menuId=CBC47C8B-141C-446B-90D9-CE8F5AE66CE4"
+                            Text="详细" ToolTip="附件上传查看" DataIFrameUrlFields="ActionPlanListId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/ActionPlanListAttachUrl&menuId=CBC47C8B-141C-446B-90D9-CE8F5AE66CE4"
                             HeaderTextAlign="Center" />
-                        <f:RenderField Width="180px" ColumnID="FlowOperateName" DataField="FlowOperateName"
-                            SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
+                        <f:TemplateField ColumnID="State" Width="60px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="False">
+                            <ItemTemplate>
+                                <asp:Label ID="Label1" runat="server" Text='<%# BLL.ActionPlanListService.ConvertState(Eval("States")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:TemplateField ColumnID="ApproveMan" Width="60px" HeaderText="办理人" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="False">
+                            <ItemTemplate>
+                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertApproveMan(Eval("ActionPlanListId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
                     </Columns>
                     <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@@ -90,7 +98,7 @@
         </f:Panel>
         <f:Window ID="Window1" Title="实施计划" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
-            Width="1024px" Height="600px">
+            Width="1300px" Height="660px">
         </f:Window>
         <f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
@@ -100,6 +108,9 @@
             <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
                 Hidden="true" runat="server" Text="编辑">
             </f:MenuButton>
+            <f:MenuButton ID="btnMenuView" EnablePostBack="true" runat="server" Text="查看" Icon="ApplicationViewIcons"
+                    OnClick="btnMenuView_Click">
+                </f:MenuButton>
             <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
                 Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server"
                 Text="删除">

SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.cs

@@ -58,10 +58,8 @@ namespace FineUIPro.Web.HSSE.ActionPlan
         {
             if (!string.IsNullOrEmpty(this.ProjectId))
             {
-                string strSql = "SELECT ActionPlanList.ActionPlanListId,ActionPlanList.ProjectId,CodeRecords.Code AS ActionPlanListCode,ActionPlanList.ActionPlanListName,ActionPlanList.VersionNo,(CASE ProjectType WHEN '1' THEN '系统内项目' WHEN '2' THEN '系统外项目' WHEN '3' THEN '海外项目' END ) AS ProjectType,ActionPlanList.ActionPlanListContents,ActionPlanList.CompileMan,Users.PersonName AS CompileManName, ActionPlanList.CompileDate,ActionPlanList.States"
-                            + @" ,(CASE WHEN ActionPlanList.States = " + BLL.Const.State_0 + " OR ActionPlanList.States IS NULL THEN '待['+OperateUser.PersonName+']提交' WHEN ActionPlanList.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.PersonName+']办理' END) AS  FlowOperateName"
+                string strSql = "SELECT ActionPlanList.ActionPlanListId,ActionPlanList.ProjectId,ActionPlanListCode,ActionPlanList.ActionPlanListName,ActionPlanList.VersionNo,(CASE ProjectType WHEN '1' THEN '系统内项目' WHEN '2' THEN '系统外项目' WHEN '3' THEN '海外项目' END ) AS ProjectType,ActionPlanList.ActionPlanListContents,ActionPlanList.CompileMan,Users.PersonName AS CompileManName, ActionPlanList.CompileDate,ActionPlanList.States"
                             + @" FROM ActionPlan_ActionPlanList AS ActionPlanList "
-                            + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON ActionPlanList.ActionPlanListId=CodeRecords.DataId "
                             + @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON ActionPlanList.ActionPlanListId=FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
                             + @" LEFT JOIN Person_Persons AS OperateUser ON FlowOperate.OperaterId=OperateUser.PersonId "
                             + @" LEFT JOIN Person_Persons AS Users ON Users.PersonId = ActionPlanList.CompileMan "
@@ -184,23 +182,65 @@ namespace FineUIPro.Web.HSSE.ActionPlan
                 Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
                 return;
             }
-
-            string id = Grid1.SelectedRowID;
-            var actionPlanList = BLL.ActionPlanListService.GetActionPlanListById(id);
-            if (actionPlanList != null)
+            string id = Grid1.SelectedRowID.Split(',')[0];
+            Model.ActionPlan_ActionPlanList actionPlanList = ActionPlanListService.GetActionPlanListById(id);
+            if (actionPlanList.States == Const.ActionPlanList_Complete)
             {
-                if (this.btnMenuEdit.Hidden || actionPlanList.States == BLL.Const.State_2)   ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
+                Alert.ShowInTop("该文件已经审批完成,无法操作,请右键查看!", MessageBoxIcon.Warning);
+                return;
+            }
+            else if (actionPlanList.States == Const.ActionPlanList_Compile)
+            {
+                if (actionPlanList.CompileMan == CurrUser.PersonId || CurrUser.PersonId == Const.sysglyId)
                 {
-                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ActionPlanListView.aspx?ActionPlanListId={0}", id, "查看 - ")));
+
+                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ActionPlanListEdit.aspx?actionPlanListId={0}", id)));
                 }
                 else
                 {
-                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ActionPlanListEdit.aspx?ActionPlanListId={0}", id, "编辑 - ")));
+                    Alert.ShowInTop("您不是编制人，无法操作！请右键查看", MessageBoxIcon.Warning);
+                    return;
+                }
+            }
+            else if (actionPlanList.States == Const.ActionPlanList_Audit || actionPlanList.States == Const.ActionPlanList_ReCompile || actionPlanList.States == Const.ActionPlanList_Review)
+            {
+                Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(id, CurrUser.PersonId);
+                if (approve != null || CurrUser.PersonId == Const.sysglyId)
+                {
+                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ActionPlanListEdit.aspx?actionPlanListId={0}", id)));
+                    return;
+                    //Response.Redirect("ActionPlanListAudit.aspx?actionPlanListId=" + id);
+                    //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckListView.aspx?CheckControlCode={0}", id, "查看 - ")));
+                }
+                else
+                {
+                    if (actionPlanList.CompileMan.Equals(CurrUser.PersonId))
+                    {
+                        PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ActionPlanListEdit.aspx?actionPlanListId={0}", id)));
+                    }
+                    else
+                    {
+                        Alert.ShowInTop("您不是办理用户，无法操作！请右键查看", MessageBoxIcon.Warning);
+                        return;
+                    }
+
                 }
             }
         }
         #endregion
 
+        protected void btnMenuView_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string id = Grid1.SelectedRowID.Split(',')[0];
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ActionPlanListView.aspx?ActionPlanListId={0}", id)));
+
+        }
+
         #region 删除
         /// <summary>
         /// 右键删除事件
@@ -306,6 +346,30 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             Response.Write(GetGridTableHtml(Grid1));
             Response.End();
         }
-        #endregion        
+        #endregion
+
+        /// <summary>
+        /// 把办理人转换代号为文字形式
+        /// </summary>
+        /// <param name="ActionPlanListId"></param>
+        /// <returns></returns>
+        /// 
+        public static string ConvertApproveMan(object ActionPlanListId)
+        {
+            string name = string.Empty;
+            if (ActionPlanListId != null)
+            {
+                var approves = BLL.ActionPlanListApproveService.GetActionPlanListApprovesNotHandleList(ActionPlanListId.ToString());
+                foreach (var item in approves)
+                {
+                    name += BLL.Person_PersonsService.GetPersonsNameById(item.ApproveMan) + ",";
+                }
+                if (!string.IsNullOrEmpty(name))
+                {
+                    name = name.Substring(0, name.Length - 1);
+                }
+            }
+            return name;
+        }
     }
 }

SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.designer.cs

@@ -120,6 +120,24 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
         
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+        
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+        
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -183,6 +201,15 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
         
+        /// <summary>
+        /// btnMenuView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuView;
+        
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx

@@ -1,7 +1,6 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ActionPlanListEdit.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.ActionPlan.ActionPlanListEdit" ValidateRequest="false" %>
-<%@ Register Src="~/Controls/FlowOperateControl.ascx" TagName="FlowOperateControl"
-    TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 <html>
 <head runat="server">
@@ -11,85 +10,218 @@
 </head>
 <body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1"/>
-    <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" Title="安全实施计划"
-        BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
-        <Rows>
-            <f:FormRow>
-                <Items>
-                    <f:TextBox ID="txtActionPlanListCode" runat="server" Label="编号" Readonly="true"
-                        LabelAlign="Right" LabelWidth="120px">
-                    </f:TextBox>
-                    <f:TextBox ID="txtActionPlanListName" runat="server" Label="名称" Required="true"
-                        ShowRedStar="true" LabelAlign="Right" LabelWidth="120px">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:TextBox ID="txtVersionNo" runat="server" Label="版本号" LabelAlign="Right" LabelWidth="120px">
-                    </f:TextBox>
-                    <f:DropDownList ID="drpProjectType" runat="server" Label="项目类型" LabelAlign="Right"
-                        LabelWidth="120px">
-                        <f:ListItem Value="1" Text="系统内项目" Selected="true" />
-                        <f:ListItem Value="2" Text="系统外项目" />
-                        <f:ListItem Value="3" Text="海外项目" />
-                    </f:DropDownList>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:DropDownList ID="drpCompileMan" runat="server" Label="编制人" LabelAlign="Right"
-                        LabelWidth="120px">
-                    </f:DropDownList>
-                    <f:DatePicker ID="txtCompileDate" runat="server" Label="编制日期" LabelAlign="Right"
-                        EnableEdit="true" LabelWidth="120px">
-                    </f:DatePicker>
-                </Items>
-            </f:FormRow>
-            <f:FormRow runat="server" ID="trAtt">
-                <Items>
-                    <f:ContentPanel ID="ContentPanel2" runat="server" ShowHeader="false" EnableCollapse="true"
-                        BodyPadding="0px" Height="100px">
-                        <div runat="server" id="divC"></div>
-                    </f:ContentPanel>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
-                        BodyPadding="0px" MarginLeft="10px">
-                        <uc1:FlowOperateControl ID="ctlAuditFlow" runat="server" />
-                    </f:ContentPanel>
-                </Items>
-            </f:FormRow>
-        </Rows>
-        <Toolbars>
-            <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
-                <Items>
-                    <f:Label runat="server" ID="lbTemp">
-                    </f:Label>
-                    <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
-                        OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
-                    </f:Button>
-                    <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                    </f:ToolbarFill>
-                     <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="SimpleForm1"
-                         OnClick="btnSave_Click">
-                    </f:Button>
-                    <f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ValidateForms="SimpleForm1"
-                        OnClick="btnSubmit_Click">
-                    </f:Button>
-                    <f:Button ID="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
-                    </f:Button>
-                </Items>
-            </f:Toolbar>
-        </Toolbars>
-    </f:Form>
-    <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true" 
-        Target="Parent" EnableResize="false" runat="server" IsModal="true"  OnClose="WindowAtt_Close"
-        Width="700px"  Height="500px">
-    </f:Window>
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" Title="安全实施计划"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtActionPlanListCode" runat="server" Label="编号" ShowRedStar="true" Required="true"
+                            LabelAlign="Right" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:TextBox ID="txtActionPlanListName" runat="server" Label="名称" Required="true"
+                            ShowRedStar="true" LabelAlign="Right" LabelWidth="120px">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtVersionNo" runat="server" Label="版本号" LabelAlign="Right" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:DropDownList ID="drpProjectType" runat="server" Label="项目类型" LabelAlign="Right"
+                            LabelWidth="120px">
+                            <f:ListItem Value="1" Text="系统内项目" Selected="true" />
+                            <f:ListItem Value="2" Text="系统外项目" />
+                            <f:ListItem Value="3" Text="海外项目" />
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpCompileMan" runat="server" Label="编制人" LabelAlign="Right"
+                            LabelWidth="120px">
+                        </f:DropDownList>
+                        <f:DatePicker ID="txtCompileDate" runat="server" Label="编制日期" LabelAlign="Right"
+                            EnableEdit="true" LabelWidth="120px">
+                        </f:DatePicker>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:RadioButtonList runat="server" ID="rblIsReview" Label="备案/部门评审" LabelWidth="120px" AutoPostBack="true" OnSelectedIndexChanged="rblIsReview_SelectedIndexChanged">
+                            <f:RadioItem Text="备案" Value="False" Selected="true" />
+                            <f:RadioItem Text="部门评审" Value="True" />
+                        </f:RadioButtonList>
+                        <f:DropDownList ID="drpReviewMan" runat="server" Label="评审负责人" LabelAlign="Right" Hidden="true" EnableEdit="true"
+                            LabelWidth="120px">
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow runat="server" ID="trAtt">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel2" runat="server" ShowHeader="false" EnableCollapse="true"
+                            BodyPadding="0px" Height="100px">
+                            <div runat="server" id="divC"></div>
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Panel ID="Panel2" IsFluid="true" CssClass="mytable blockpanel" runat="server" AutoScroll="true" ShowBorder="true"
+                            Layout="Table" TableConfigColumns="3" ShowHeader="true" Title="总包会签">
+                            <Items>
+                                <f:Panel ID="Panel1" Title="Panel1" Width="200px"
+                                    TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false" Height="200px">
+                                    <Items>
+                                        <f:Tree runat="server" ID="trOne" ShowHeader="false" AutoScroll="true" ShowBorder="false" OnNodeCheck="trOne_NodeCheck" EnableArrows="true">
+                                        </f:Tree>
+                                    </Items>
+                                </f:Panel>
+                                <f:Panel ID="Panel3" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
+                                    TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
+                                    <Items>
+                                        <f:Tree runat="server" ID="trTwo" ShowHeader="false" ShowBorder="false" OnNodeCheck="trTwo_NodeCheck">
+                                            <Nodes>
+                                            </Nodes>
+                                        </f:Tree>
+                                    </Items>
+                                </f:Panel>
+                                <f:Panel ID="Panel4" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
+                                    TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
+                                    <Items>
+                                        <f:Tree runat="server" ID="trThree" ShowHeader="false" ShowBorder="false" OnNodeCheck="trThree_NodeCheck">
+                                            <Nodes>
+                                            </Nodes>
+                                        </f:Tree>
+                                    </Items>
+                                </f:Panel>
+                                <f:Panel ID="Panel5" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
+                                    TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
+                                    <Items>
+                                        <f:Tree runat="server" ID="trFour" ShowHeader="false" ShowBorder="false" OnNodeCheck="trFour_NodeCheck">
+                                            <Nodes>
+                                            </Nodes>
+                                        </f:Tree>
+                                    </Items>
+                                </f:Panel>
+                                <f:Panel ID="Panel6" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
+                                    TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
+                                    <Items>
+                                        <f:Tree runat="server" ID="trFive" ShowHeader="false" ShowBorder="false" OnNodeCheck="trFive_NodeCheck">
+                                            <Nodes>
+                                            </Nodes>
+                                        </f:Tree>
+                                    </Items>
+                                </f:Panel>
+                                <f:Panel ID="Panel7" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
+                                    TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
+                                    <Items>
+                                        <f:Tree runat="server" ID="trSixe" ShowHeader="false" ShowBorder="false" OnNodeCheck="trSixe_NodeCheck">
+                                            <Nodes>
+                                            </Nodes>
+                                        </f:Tree>
+                                    </Items>
+                                </f:Panel>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ID="agree">
+                    <Items>
+
+                        <f:RadioButtonList runat="server" ID="rblIsAgree" Label="是否同意" ShowRedStar="true" AutoPostBack="true">
+                            <f:RadioItem Text="同意" Value="true" Selected="true" />
+                            <f:RadioItem Text="不同意" Value="false" />
+                        </f:RadioButtonList>
+                        <f:Label runat="server" CssStyle="display:none"></f:Label>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ID="options">
+                    <Items>
+                        <f:TextArea ID="txtOptions" ShowRedStar="true" Required="true" runat="server" Label="办理意见" MaxLength="3000">
+                        </f:TextArea>
+
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ID="optio">
+
+                    <Items>
+                        <f:Panel ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
+                            <Items>
+                                <f:Label runat="server" Text="附件：" ShowRedStar="true" CssStyle="padding-left:53px" Width="100px" CssClass="marginr" ShowLabel="false"></f:Label>
+                                <f:Button ID="btnapprove" Text="附件" ToolTip="上传及查看" Icon="TableCell" OnClick="btnapprove_Click" runat="server">
+                                </f:Button>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ID="plApprove2">
+                    <Items>
+
+                        <f:ContentPanel Title="审批列表" ShowBorder="true"
+                            BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
+                            runat="server">
+                            <f:Grid ID="gvApprove" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false"
+                                DataKeyNames="ActionPlanListApproveId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand" ForceFit="true">
+                                <Columns>
+                                    <f:RowNumberField Width="40px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" />
+                                    <f:TemplateField ColumnID="ApproveType" Width="150px" HeaderText="办理类型" HeaderTextAlign="Center" TextAlign="Center"
+                                        EnableLock="true" Locked="False">
+                                        <ItemTemplate>
+                                            <asp:Label ID="Label1" runat="server" Text='<%# BLL.ActionPlanListService.ConvertState(Eval("ApproveType")) %>'></asp:Label>
+                                        </ItemTemplate>
+                                    </f:TemplateField>
+                                    <f:TemplateField ColumnID="ApproveMan" Width="150px" HeaderText="办理人员" HeaderTextAlign="Center" TextAlign="Center"
+                                        EnableLock="true" Locked="False">
+                                        <ItemTemplate>
+                                            <asp:Label ID="Label3" runat="server" Text='<%# man(Eval("ApproveMan")) %>'></asp:Label>
+                                        </ItemTemplate>
+                                    </f:TemplateField>
+                                    <f:TemplateField ColumnID="IsAgree" Width="100px" HeaderText="是否同意" HeaderTextAlign="Center" TextAlign="Center"
+                                        EnableLock="true" Locked="False">
+                                        <ItemTemplate>
+                                            <asp:Label ID="Label2" runat="server" Text='<%# BLL.ActionPlanListService.IsAgree(Eval("ApproveType"),Eval("IsAgree")) %>'></asp:Label>
+                                        </ItemTemplate>
+                                    </f:TemplateField>
+                                    <f:BoundField Width="100px" DataField="ApproveDate" HeaderTextAlign="Center" TextAlign="Center" DataFormatString="{0:yyyy-MM-dd}" HeaderText="办理时间" />
+                                    <f:BoundField Width="180px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center" HeaderText="办理意见" />
+                                    <f:LinkButtonField HeaderText="附件" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" />
+                                </Columns>
+                            </f:Grid>
+                        </f:ContentPanel>
+
+                    </Items>
+
+                </f:FormRow>
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:Label runat="server" ID="lbTemp">
+                        </f:Label>
+                        <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
+                            OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
+                        </f:Button>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                        </f:ToolbarFill>
+                        <f:HiddenField ID="txtEdition" runat="server"></f:HiddenField>
+                        <f:HiddenField ID="HFActionPlanListId" runat="server"></f:HiddenField>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="SimpleForm1"
+                            OnClick="btnSave_Click">
+                        </f:Button>
+                        <f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ValidateForms="SimpleForm1"
+                            OnClick="btnSubmit_Click">
+                        </f:Button>
+                        <f:Button ID="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+        <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="WindowAtt_Close"
+            Width="700px" Height="500px">
+        </f:Window>
     </form>
 </body>
 </html>

SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx.cs

@@ -1,5 +1,6 @@
 using BLL;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace FineUIPro.Web.HSSE.ActionPlan
@@ -35,6 +36,23 @@ namespace FineUIPro.Web.HSSE.ActionPlan
                 ViewState["ProjectId"] = value;
             }
         }
+
+        public int ContactImg
+        {
+            get
+            {
+                return Convert.ToInt32(ViewState["ContactImg"]);
+            }
+            set
+            {
+                ViewState["ContactImg"] = value;
+            }
+        }
+
+        /// <summary>
+        /// 定义会签意见集合
+        /// </summary>
+        public static List<Model.ActionPlan_ActionPlanListApprove> approves = new List<Model.ActionPlan_ActionPlanListApprove>();
         #endregion
 
         #region 加载
@@ -49,25 +67,36 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             {
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 this.ProjectId = this.CurrUser.LoginProjectId;
-
                 BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpCompileMan, this.ProjectId, null, null, true);
+                BLL.Person_PersonsService.InitUserUnitIdDepartIdDropDownList(this.drpReviewMan, BLL.Const.UnitId_SEDIN, BLL.Const.Depart_constructionId, true);
+                CQMSConstructSolutionService.setRoleTree(trOne, this.CurrUser.LoginProjectId, "专业工程师", Const.ProjectUnitType_1, Const.ZBCNEngineer);
+                CQMSConstructSolutionService.setRoleTree(trTwo, this.CurrUser.LoginProjectId, "质量组", Const.ProjectUnitType_1, Const.QAManager + "," + Const.CQEngineer);
+                CQMSConstructSolutionService.setRoleTree(trThree, this.CurrUser.LoginProjectId, "HSE组", Const.ProjectUnitType_1, Const.HSSEManager + "," + Const.HSSEEngineer);
+                CQMSConstructSolutionService.setRoleTree(trFour, this.CurrUser.LoginProjectId, "控制组", Const.ProjectUnitType_1, Const.ControlManager + "," + Const.KZEngineer);
+                CQMSConstructSolutionService.setRoleTree(trFive, this.CurrUser.LoginProjectId, "施工经理", Const.ProjectUnitType_1, Const.ConstructionManager + "," + Const.ConstructionAssistantManager);
+                CQMSConstructSolutionService.setRoleTree(trSixe, this.CurrUser.LoginProjectId, "项目经理", Const.ProjectUnitType_1, Const.ProjectManager);
+                ContactImg = 0;
                 this.ActionPlanListId = Request.Params["ActionPlanListId"];
                 if (!string.IsNullOrEmpty(this.ActionPlanListId))
                 {
                     Model.ActionPlan_ActionPlanList actionPlanList = BLL.ActionPlanListService.GetActionPlanListById(this.ActionPlanListId);
                     if (actionPlanList != null)
                     {
+                        HFActionPlanListId.Text = this.ActionPlanListId;
                         this.ProjectId = actionPlanList.ProjectId;
                         if (this.ProjectId != this.CurrUser.LoginProjectId)
                         {
                             BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpCompileMan, this.ProjectId, null, null, true);
                         }
-
+                        if (actionPlanList.Edition != null)
+                        {
+                            txtEdition.Text = actionPlanList.Edition.ToString();
+                        }
                         ///读取编号
-                        this.txtActionPlanListCode.Text = BLL.CodeRecordsService.ReturnCodeByDataId(this.ActionPlanListId);
+                        this.txtActionPlanListCode.Text = actionPlanList.ActionPlanListCode;
                         this.txtActionPlanListName.Text = actionPlanList.ActionPlanListName;
                         this.txtVersionNo.Text = actionPlanList.VersionNo;
-                        this.drpProjectType.SelectedValue = actionPlanList.VersionNo;
+                        this.drpProjectType.SelectedValue = actionPlanList.ProjectType;
                         if (!string.IsNullOrEmpty(actionPlanList.CompileMan))
                         {
                             this.drpCompileMan.SelectedValue = actionPlanList.CompileMan;
@@ -76,33 +105,235 @@ namespace FineUIPro.Web.HSSE.ActionPlan
                         {
                             this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", actionPlanList.CompileDate);
                         }
-                        //this.txtActionPlanListContents.Text = HttpUtility.HtmlDecode(actionPlanList.ActionPlanListContents);
+                        if (actionPlanList.IsReview == true)
+                        {
+                            this.rblIsReview.SelectedValue = "True";
+                            this.drpReviewMan.Hidden = false;
+                            this.drpReviewMan.SelectedValue = actionPlanList.ReviewMan;
+                        }
+                        else
+                        {
+                            this.rblIsReview.SelectedValue = "False";
+                        }
+                        bindApprove();
+                        var zyUserIds = ActionPlanListApproveService.GetUserIdsApprovesBySignType(ActionPlanListId, "ZY");
+                        if (zyUserIds.Count > 0)
+                        {
+                            SetCheck(trOne, zyUserIds);
+                        }
+                        var zlUserIds = ActionPlanListApproveService.GetUserIdsApprovesBySignType(ActionPlanListId, "ZL");
+                        if (zlUserIds.Count > 0)
+                        {
+                            SetCheck(trTwo, zlUserIds);
+                        }
+                        var aqUserIds = ActionPlanListApproveService.GetUserIdsApprovesBySignType(ActionPlanListId, "AQ");
+                        if (aqUserIds.Count > 0)
+                        {
+                            SetCheck(trThree, aqUserIds);
+                        }
+                        var kzUserIds = ActionPlanListApproveService.GetUserIdsApprovesBySignType(ActionPlanListId, "KZ");
+                        if (kzUserIds.Count > 0)
+                        {
+                            SetCheck(trFour, kzUserIds);
+                        }
+                        var sgUserIds = ActionPlanListApproveService.GetUserIdsApprovesBySignType(ActionPlanListId, "SG");
+                        if (sgUserIds.Count > 0)
+                        {
+                            SetCheck(trFive, sgUserIds);
+                        }
+                        var xmUserIds = ActionPlanListApproveService.GetUserIdsApprovesBySignType(ActionPlanListId, "XM");
+                        if (xmUserIds.Count > 0)
+                        {
+                            SetCheck(trSixe, xmUserIds);
+                        }
+                        if (actionPlanList.States == Const.ActionPlanList_ReCompile || actionPlanList.States == Const.ActionPlanList_Compile)
+                        {
+                            agree.Hidden = true;
+                            options.Hidden = true;
+                            optio.Hidden = true;
+                        }
+                        if (actionPlanList.States == Const.ActionPlanList_Audit)
+                        {
+                            txtActionPlanListCode.Readonly = true;
+                            txtActionPlanListName.Readonly = true;
+                            txtVersionNo.Readonly = true;
+                            drpProjectType.Readonly = true;
+                            drpCompileMan.Readonly = true;
+                            txtCompileDate.Readonly = true;
+                            rblIsReview.Readonly = true;
+                            drpReviewMan.Readonly = true;
+                            ContactImg = -1;
+                            Panel2.Enabled = false;
+                        }
+                        //提交版本人多次修改
+                        if (actionPlanList.CompileMan.Equals(CurrUser.PersonId))
+                        {
+                            txtActionPlanListCode.Enabled = true;
+                            txtActionPlanListName.Enabled = true;
+                            txtVersionNo.Enabled = true;
+                            drpProjectType.Enabled = true;
+                            drpCompileMan.Enabled = true;
+                            txtCompileDate.Enabled = true;
+                            ContactImg = 0;
+                            Panel2.Enabled = true;
+                            Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(ActionPlanListId, CurrUser.PersonId);
+                            if (approve == null)
+                            {
+                                rblIsAgree.Hidden = true;
+                                rblIsAgree.Required = false;
+                                options.Hidden = true;
+                                txtOptions.Required = false;
+                                optio.Hidden = true;
+                            }
+                        }
                     }
+                    WindowAtt_Close(null, null);
                 }
                 else
                 {
                     this.drpCompileMan.SelectedValue = this.CurrUser.PersonId;
                     this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
-                    //var codeTemplateRule = BLL.ProjectData_CodeTemplateRuleService.GetProjectData_CodeTemplateRuleByMenuIdProjectId(BLL.Const.ProjectActionPlanListMenuId, this.ProjectId);
-                    //if (codeTemplateRule != null)
-                    //{
-                    //    this.txtActionPlanListContents.Text = HttpUtility.HtmlDecode(codeTemplateRule.Template);
-                    //}
-
+                    this.trAtt.Hidden = true;
+                    agree.Hidden = true;
+                    txtEdition.Text = "0";
+                    options.Hidden = true;
+                    optio.Hidden = true;
+                    plApprove2.Hidden = true;
                     ////自动生成编码
                     this.txtActionPlanListCode.Text = BLL.CodeRecordsService.ReturnCodeByMenuIdProjectId(BLL.Const.ProjectActionPlanListMenuId, this.ProjectId, this.CurrUser.UnitId);
                     this.txtActionPlanListName.Text = this.SimpleForm1.Title;
                     this.txtVersionNo.Text = "V1.0";
                 }
-
-                ///初始化审核菜单
-                this.ctlAuditFlow.MenuId = BLL.Const.ProjectActionPlanListMenuId;
-                this.ctlAuditFlow.DataId = this.ActionPlanListId;
-                this.ctlAuditFlow.ProjectId = this.ProjectId;
-                this.ctlAuditFlow.UnitId = this.CurrUser.UnitId;
-                WindowAtt_Close(null, null);
             }
         }
+
+        /// <summary>
+        /// 审批列表
+        /// </summary>
+        private void bindApprove()
+        {
+            var list = ActionPlanListApproveService.getListData(ActionPlanListId);
+            gvApprove.DataSource = list;
+            gvApprove.DataBind();
+        }
+        #endregion
+
+        #region 动态加载角色树
+
+        /// <summary>
+        /// 设置树的节点选择
+        /// </summary>
+        /// <param name="nodes"></param>
+        /// <param name="role"></param>
+        private void SetCheck(Tree tree, List<string> userIds)
+        {
+            foreach (TreeNode tn in tree.Nodes[0].Nodes)
+            {
+                if (userIds.Contains(tn.NodeID))
+                {
+                    tn.Checked = true;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 判断是否有选择
+        /// </summary>
+        /// <param name="node"></param>
+        /// <returns></returns>
+        public Boolean nodesCheckd(Tree node)
+        {
+            bool res = false;
+            if (node.Nodes[0].Nodes.Count > 0)
+            {
+                foreach (var item in node.Nodes[0].Nodes)
+                {
+                    if (item.Checked)
+                    {
+                        res = true;
+                        break;
+                    }
+                }
+            }
+            return res;
+        }
+        #endregion
+
+        #region 树结构的全选
+        protected void trOne_NodeCheck(object sender, TreeCheckEventArgs e)
+        {
+            if (e.Checked)
+            {
+                trOne.CheckAllNodes(e.Node.Nodes);
+            }
+            else
+            {
+                trOne.UncheckAllNodes(e.Node.Nodes);
+            }
+        }
+
+        protected void trTwo_NodeCheck(object sender, TreeCheckEventArgs e)
+        {
+            if (e.Checked)
+            {
+                trTwo.CheckAllNodes(e.Node.Nodes);
+            }
+            else
+            {
+                trTwo.UncheckAllNodes(e.Node.Nodes);
+            }
+        }
+
+        protected void trThree_NodeCheck(object sender, TreeCheckEventArgs e)
+        {
+            if (e.Checked)
+            {
+                trThree.CheckAllNodes(e.Node.Nodes);
+            }
+            else
+            {
+                trThree.UncheckAllNodes(e.Node.Nodes);
+            }
+        }
+
+        protected void trFour_NodeCheck(object sender, TreeCheckEventArgs e)
+        {
+            if (e.Checked)
+            {
+                trFour.CheckAllNodes(e.Node.Nodes);
+            }
+            else
+            {
+                trFour.UncheckAllNodes(e.Node.Nodes);
+            }
+        }
+
+        protected void trFive_NodeCheck(object sender, TreeCheckEventArgs e)
+        {
+            if (e.Checked)
+            {
+                trFive.CheckAllNodes(e.Node.Nodes);
+            }
+            else
+            {
+                trFive.UncheckAllNodes(e.Node.Nodes);
+            }
+
+        }
+
+        protected void trSixe_NodeCheck(object sender, TreeCheckEventArgs e)
+        {
+            if (e.Checked)
+            {
+                trSixe.CheckAllNodes(e.Node.Nodes);
+            }
+            else
+            {
+                trSixe.UncheckAllNodes(e.Node.Nodes);
+            }
+        }
+
+
         #endregion
 
         #region 保存
@@ -113,6 +344,11 @@ namespace FineUIPro.Web.HSSE.ActionPlan
         /// <param name="e"></param>
         protected void btnSave_Click(object sender, EventArgs e)
         {
+            if (this.drpCompileMan.SelectedValue == BLL.Const._Null)
+            {
+                Alert.ShowInTop("请选择编制人!", MessageBoxIcon.Warning);
+                return;
+            }
             this.SaveData(BLL.Const.BtnSave);
             PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
         }
@@ -124,9 +360,40 @@ namespace FineUIPro.Web.HSSE.ActionPlan
         /// <param name="e"></param>
         protected void btnSubmit_Click(object sender, EventArgs e)
         {
-            if (this.ctlAuditFlow.NextStep == BLL.Const.State_1 && this.ctlAuditFlow.NextPerson == BLL.Const._Null)
+            if (this.drpCompileMan.SelectedValue == BLL.Const._Null)
             {
-                Alert.ShowInTop("请选择下一步办理人！", MessageBoxIcon.Warning);
+                Alert.ShowInTop("请选择编制人!", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.rblIsReview.SelectedValue == "True" && this.drpReviewMan.SelectedValue == BLL.Const._Null)
+            {
+                Alert.ShowInTop("请选择评审负责人!", MessageBoxIcon.Warning);
+                return;
+            }
+            if (!AttachFileService.Getfile(HFActionPlanListId.Text, Const.ProjectActionPlanListMenuId))
+            {
+                Alert.ShowInTop("请上传附件!", MessageBoxIcon.Warning);
+                return;
+            }
+            List<FineUIPro.Tree> list = new List<FineUIPro.Tree>();
+            list.Add(trOne);
+            list.Add(trTwo);
+            list.Add(trThree);
+            list.Add(trFour);
+            list.Add(trFive);
+            list.Add(trSixe);
+            var res = false;
+            foreach (var item in list)
+            {
+                if (nodesCheckd(item))
+                {
+                    res = true;
+                    break;
+                }
+            }
+            if (!res)
+            {
+                Alert.ShowInTop("请选择总包会签人员!", MessageBoxIcon.Warning);
                 return;
             }
             this.SaveData(BLL.Const.BtnSubmit);
@@ -156,26 +423,383 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             {
                 actionPlanList.CompileDate = Convert.ToDateTime(this.txtCompileDate.Text.Trim());
             }
-            actionPlanList.States = BLL.Const.State_0;
             if (type == BLL.Const.BtnSubmit)
             {
-                actionPlanList.States = this.ctlAuditFlow.NextStep;
+                actionPlanList.States = BLL.Const.ActionPlanList_Audit;
             }
+            else
+            {
+                actionPlanList.States = BLL.Const.ActionPlanList_Compile;
+            }
+            actionPlanList.IsReview = Convert.ToBoolean(this.rblIsReview.SelectedValue);
+            if (this.drpReviewMan.SelectedValue != BLL.Const._Null)
+            {
+                actionPlanList.ReviewMan = this.drpReviewMan.SelectedValue;
+            }
+            int edtion = Convert.ToInt32(txtEdition.Text);
+            actionPlanList.Edition = edtion;
             if (!string.IsNullOrEmpty(this.ActionPlanListId))
             {
                 actionPlanList.ActionPlanListId = this.ActionPlanListId;
+                Model.ActionPlan_ActionPlanList actionPlanList1 = ActionPlanListService.GetActionPlanListById(ActionPlanListId);
+                if (type == BLL.Const.BtnSubmit)
+                {
+                    if (CurrUser.PersonId != actionPlanList1.CompileMan)   //办理人不是编制人，提示查看审批信息
+                    {
+                        Model.ActionPlan_ActionPlanListApprove sApprove = new Model.ActionPlan_ActionPlanListApprove();
+                        sApprove.ActionPlanListId = actionPlanList.ActionPlanListId;
+                        sApprove.ApproveMan = actionPlanList1.CompileMan;
+                        sApprove.ApproveType = "S";
+                        ActionPlanListApproveService.AddActionPlanListApprove(sApprove);
+
+                        if (actionPlanList1.States == Const.ActionPlanList_Audit)
+                        {
+                            actionPlanList.States = actionPlanList1.States;
+
+                        }
+                        else
+                        {
+                            actionPlanList.States = Const.ActionPlanList_Audit;
+                        }
+                    }
+                    else
+                    {
+                        countersign(actionPlanList.ActionPlanListId);
+                        actionPlanList.States = actionPlanList1.States;
+                    }
+
+                    if (!CurrUser.PersonId.Equals(actionPlanList1.CompileMan))
+                    {
+                        Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetConstructSoluAppByApproveMan(ActionPlanListId, CurrUser.PersonId, Convert.ToInt32(actionPlanList1.Edition));
+                        if (type == BLL.Const.BtnSubmit)
+                        {
+                            approve.ApproveDate = DateTime.Now;
+                        }
+                        approve.Edition = Convert.ToInt32(edtion);
+                        approve.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
+                        approve.ApproveIdea = txtOptions.Text.Trim();
+                        ActionPlanListApproveService.UpdateActionPlanListApprove(approve);
+                    }
+                    else
+                    {
+                        if (type == BLL.Const.BtnSubmit)
+                        {
+                            if (actionPlanList1.States == Const.ActionPlanList_Audit)//==会签状态升级版本
+                            {
+                                Model.ActionPlan_ActionPlanListApprove reApprove = new Model.ActionPlan_ActionPlanListApprove();
+                                reApprove.ActionPlanListId = actionPlanList.ActionPlanListId;
+                                reApprove.ApproveDate = DateTime.Now;
+                                reApprove.ApproveMan = actionPlanList1.CompileMan;
+                                reApprove.ApproveType = Const.ActionPlanList_ReCompile;
+                                edtion++;
+                                reApprove.Edition = edtion;
+                                ActionPlanListApproveService.AddActionPlanListApprove(reApprove);
+                            }
+                            else
+                            {
+                                Model.ActionPlan_ActionPlanListApprove approves = ActionPlanListApproveService.GetConstructSolApproveByApproveMan(ActionPlanListId, actionPlanList1.CompileMan);
+                                approves.ApproveDate = DateTime.Now;
+                                ActionPlanListApproveService.UpdateActionPlanListApprove(approves);
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    actionPlanList.States = actionPlanList1.States;
+                }
+                //提交时候，更新提交版本
+                if (CurrUser.PersonId.Equals(actionPlanList1.CompileMan))
+                {
+                    if (actionPlanList1.States != Const.ActionPlanList_Audit)
+                    {
+                        edtion++;
+                    }
+                    actionPlanList.Edition = Convert.ToInt32(edtion);
+                    actionPlanList.States = Const.ActionPlanList_Audit;
+                }
                 BLL.ActionPlanListService.UpdateActionPlanList(actionPlanList);
+                //判断状态，全部会签同意，则审批完成
+                if (type == BLL.Const.BtnSubmit)
+                {
+                    List<Model.ActionPlan_ActionPlanListApprove> allApproves = ActionPlanListApproveService.GetHandleActionPlanListApprovesByActionPlanListId(ActionPlanListId, actionPlanList.Edition == null ? 0 : Convert.ToInt32(actionPlanList.Edition));
+                    var count = allApproves.Where(p => p.ApproveDate != null && p.IsAgree != null && Convert.ToBoolean(p.IsAgree)).Count();//查询会签同意的
+                    var fcount = allApproves.Where(p => p.ApproveDate != null && p.IsAgree != null && !Convert.ToBoolean(p.IsAgree)).Count();//查询会签不同意的
+                    if ((count + fcount) == allApproves.Count)
+                    {
+                        if (count == allApproves.Count)
+                        {
+                            var actionPlan = ActionPlanListService.GetActionPlanListById(ActionPlanListId);
+                            if (this.rblIsReview.SelectedValue == "True") //评审
+                            {
+                                actionPlan.States = Const.ActionPlanList_Review;
+                                Model.ActionPlan_ActionPlanListApprove approve1 = new Model.ActionPlan_ActionPlanListApprove();
+                                approve1.ActionPlanListId = actionPlanList.ActionPlanListId;
+                                approve1.ApproveMan = this.drpReviewMan.SelectedValue;
+                                approve1.ApproveType = Const.ActionPlanList_Review;
+                                approve1.Edition = Convert.ToInt32(txtEdition.Text);
+                                ActionPlanListApproveService.AddActionPlanListApprove(approve1);
+                            }
+                            else //备案
+                            {
+                                actionPlan.States = Const.ActionPlanList_Complete;
+                            }
+                            actionPlan.CompileDate = DateTime.Now;
+                            ActionPlanListService.UpdateActionPlanList(actionPlan);
+                        }
+                        //有不同意意见，打回重新编制
+                        if (fcount > 0)
+                        {
+                            var actionPlan = ActionPlanListService.GetActionPlanListById(ActionPlanListId);
+                            Model.ActionPlan_ActionPlanListApprove reApprove = new Model.ActionPlan_ActionPlanListApprove();
+                            reApprove.ActionPlanListId = actionPlanList.ActionPlanListId;
+                            reApprove.ApproveMan = actionPlan.CompileMan;
+                            reApprove.ApproveType = Const.ActionPlanList_ReCompile;
+                            edtion++;
+                            reApprove.Edition = edtion;
+                            ActionPlanListApproveService.AddActionPlanListApprove(reApprove);
+
+                            actionPlan.States = Const.ActionPlanList_ReCompile;
+                            actionPlan.CompileDate = DateTime.Now;
+                            actionPlanList.States = Const.ActionPlanList_ReCompile;
+                            ActionPlanListService.UpdateActionPlanList(actionPlan);
+                        }
+                    }
+
+                }
                 BLL.LogService.AddSys_Log(this.CurrUser, this.txtActionPlanListCode.Text, this.ActionPlanListId, BLL.Const.ProjectActionPlanListMenuId, Const.BtnModify);
             }
             else
             {
-                this.ActionPlanListId = SQLHelper.GetNewID(typeof(Model.ActionPlan_ActionPlanList));
-                actionPlanList.ActionPlanListId = this.ActionPlanListId;
+                if (!string.IsNullOrEmpty(HFActionPlanListId.Text))
+                {
+                    actionPlanList.ActionPlanListId = HFActionPlanListId.Text;
+                }
+                else
+                {
+                    actionPlanList.ActionPlanListId = SQLHelper.GetNewID(typeof(Model.ActionPlan_ActionPlanList));
+                }
                 BLL.ActionPlanListService.AddActionPlanList(actionPlanList);
+                if (type == BLL.Const.BtnSubmit)
+                {
+                    Model.ActionPlan_ActionPlanListApprove approve1 = new Model.ActionPlan_ActionPlanListApprove();
+                    approve1.ActionPlanListId = actionPlanList.ActionPlanListId;
+                    approve1.ApproveDate = DateTime.Now;
+                    approve1.ApproveMan = this.CurrUser.PersonId;
+                    approve1.ApproveType = Const.ActionPlanList_Compile;
+                    approve1.Edition = Convert.ToInt32(txtEdition.Text);
+                    ActionPlanListApproveService.AddActionPlanListApprove(approve1);
+                }
+                else
+                {
+                    Model.ActionPlan_ActionPlanListApprove approve1 = new Model.ActionPlan_ActionPlanListApprove();
+                    approve1.ActionPlanListId = actionPlanList.ActionPlanListId;
+                    approve1.ApproveMan = this.CurrUser.PersonId;
+                    approve1.ApproveType = Const.ActionPlanList_Compile;
+                    approve1.Edition = Convert.ToInt32(txtEdition.Text);
+                    ActionPlanListApproveService.AddActionPlanListApprove(approve1);
+                }
+                //提交
+                if (type == BLL.Const.BtnSubmit)
+                {
+                    countersign(actionPlanList.ActionPlanListId);
+                }
                 BLL.LogService.AddSys_Log(this.CurrUser, this.txtActionPlanListCode.Text, this.ActionPlanListId, BLL.Const.ProjectActionPlanListMenuId, Const.BtnAdd);
             }
-            ////保存流程审核数据         
-            this.ctlAuditFlow.btnSaveData(this.ProjectId, BLL.Const.ProjectActionPlanListMenuId, this.ActionPlanListId, (type == BLL.Const.BtnSubmit ? true : false), actionPlanList.ActionPlanListName, "../ActionPlan/ActionPlanListView.aspx?ActionPlanListId={0}");
+
+        }
+
+        /// <summary>
+        /// 删除未选择的代办记录
+        /// </summary>
+        /// <param name="actionPlanListId"></param>
+        private void delActionPlanListApprove(string actionPlanListId, string man, string signType)
+        {
+            var count = ActionPlanListApproveService.getListActionPlanApproveCount(actionPlanListId, man, signType);
+            if (count > 0)
+            {
+                ActionPlanListApproveService.delActionPlanApprove(actionPlanListId, man);
+            }
+        }
+
+        /// <summary>
+        /// 会签
+        /// </summary>
+        private void countersign(string actionPlanListId)
+        {
+            var ActionPlan = ActionPlanListService.GetActionPlanListById(ActionPlanListId);
+            if (trOne.Nodes[0].Nodes.Count > 0)
+            {
+                foreach (TreeNode tn in trOne.Nodes[0].Nodes)
+                {
+                    if (tn.Checked)
+                    {
+                        Model.ActionPlan_ActionPlanListApprove approve = new Model.ActionPlan_ActionPlanListApprove();
+                        approve.ActionPlanListId = actionPlanListId;
+                        approve.ApproveMan = tn.NodeID;
+                        approve.ApproveType = Const.ActionPlanList_Audit;
+                        approve.SignType = "ZY";
+                        int edtion = Convert.ToInt32(txtEdition.Text);
+                        if (ActionPlan != null)
+                        {
+                            edtion++;
+                        }
+                        approve.Edition = edtion;
+                        delActionPlanListApprove(ActionPlanListId, tn.NodeID, "ZY");
+                        ActionPlanListApproveService.AddActionPlanListApprove(approve);
+                        APICommonService.SendSubscribeMessage(approve.ApproveMan, "项目安全实施计划待办理", this.CurrUser.PersonName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now));
+                    }
+                    else
+                    {
+                        delActionPlanListApprove(ActionPlanListId, tn.NodeID, "ZY");
+                    }
+
+                }
+            }
+            if (trTwo.Nodes[0].Nodes.Count > 0)
+            {
+
+                foreach (TreeNode tn in trTwo.Nodes[0].Nodes)
+                {
+                    if (tn.Checked)
+                    {
+                        Model.ActionPlan_ActionPlanListApprove approve = new Model.ActionPlan_ActionPlanListApprove();
+                        approve.ActionPlanListId = actionPlanListId;
+                        approve.ApproveMan = tn.NodeID;
+                        approve.ApproveType = Const.ActionPlanList_Audit;
+                        approve.SignType = "ZL";
+                        int edtion = Convert.ToInt32(txtEdition.Text);
+                        if (ActionPlan != null)
+                        {
+                            edtion++;
+                        }
+                        approve.Edition = edtion;
+                        delActionPlanListApprove(ActionPlanListId, tn.NodeID, "ZL");
+                        ActionPlanListApproveService.AddActionPlanListApprove(approve);
+                        APICommonService.SendSubscribeMessage(approve.ApproveMan, "项目安全实施计划待办理", this.CurrUser.PersonName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now));
+                    }
+                    else
+                    {
+                        delActionPlanListApprove(ActionPlanListId, tn.NodeID, "ZL");
+                    }
+
+                }
+            }
+            if (trThree.Nodes[0].Nodes.Count > 0)
+            {
+
+                foreach (TreeNode tn in trThree.Nodes[0].Nodes)
+                {
+                    if (tn.Checked)
+                    {
+                        Model.ActionPlan_ActionPlanListApprove approve = new Model.ActionPlan_ActionPlanListApprove();
+                        approve.ActionPlanListId = actionPlanListId;
+                        approve.ApproveMan = tn.NodeID;
+                        approve.ApproveType = Const.ActionPlanList_Audit;
+                        approve.SignType = "AQ";
+                        int edtion = Convert.ToInt32(txtEdition.Text);
+                        if (ActionPlan != null)
+                        {
+                            edtion++;
+                        }
+                        approve.Edition = edtion;
+                        delActionPlanListApprove(ActionPlanListId, tn.NodeID, "AQ");
+                        ActionPlanListApproveService.AddActionPlanListApprove(approve);
+                        APICommonService.SendSubscribeMessage(approve.ApproveMan, "项目安全实施计划待办理", this.CurrUser.PersonName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now));
+                    }
+                    else
+                    {
+                        delActionPlanListApprove(ActionPlanListId, tn.NodeID, "AQ");
+                    }
+
+                }
+            }
+            if (trFour.Nodes[0].Nodes.Count > 0)
+            {
+
+                foreach (TreeNode tn in trFour.Nodes[0].Nodes)
+                {
+                    if (tn.Checked)
+                    {
+                        Model.ActionPlan_ActionPlanListApprove approve = new Model.ActionPlan_ActionPlanListApprove();
+                        approve.ActionPlanListId = actionPlanListId;
+                        approve.ApproveMan = tn.NodeID;
+                        approve.ApproveType = Const.ActionPlanList_Audit;
+                        approve.SignType = "KZ";
+                        int edtion = Convert.ToInt32(txtEdition.Text);
+                        if (ActionPlan != null)
+                        {
+                            edtion++;
+                        }
+                        approve.Edition = edtion;
+                        delActionPlanListApprove(ActionPlanListId, tn.NodeID, "KZ");
+                        ActionPlanListApproveService.AddActionPlanListApprove(approve);
+                        APICommonService.SendSubscribeMessage(approve.ApproveMan, "项目安全实施计划待办理", this.CurrUser.PersonName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now));
+
+                    }
+                    else
+                    {
+                        delActionPlanListApprove(ActionPlanListId, tn.NodeID, "KZ");
+                    }
+
+                }
+            }
+            if (trFive.Nodes[0].Nodes.Count > 0)
+            {
+
+                foreach (TreeNode tn in trFive.Nodes[0].Nodes)
+                {
+                    if (tn.Checked)
+                    {
+                        Model.ActionPlan_ActionPlanListApprove approve = new Model.ActionPlan_ActionPlanListApprove();
+                        approve.ActionPlanListId = actionPlanListId;
+                        approve.ApproveMan = tn.NodeID;
+                        approve.ApproveType = Const.ActionPlanList_Audit;
+                        approve.SignType = "SG";
+                        int edtion = Convert.ToInt32(txtEdition.Text);
+                        if (ActionPlan != null)
+                        {
+                            edtion++;
+                        }
+                        approve.Edition = edtion;
+                        delActionPlanListApprove(ActionPlanListId, tn.NodeID, "SG");
+                        ActionPlanListApproveService.AddActionPlanListApprove(approve);
+                        APICommonService.SendSubscribeMessage(approve.ApproveMan, "项目安全实施计划待办理", this.CurrUser.PersonName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now));
+                    }
+                    else
+                    {
+                        delActionPlanListApprove(ActionPlanListId, tn.NodeID, "SG");
+                    }
+                }
+            }
+            if (trSixe.Nodes[0].Nodes.Count > 0)
+            {
+
+                foreach (TreeNode tn in trSixe.Nodes[0].Nodes)
+                {
+                    if (tn.Checked)
+                    {
+                        Model.ActionPlan_ActionPlanListApprove approve = new Model.ActionPlan_ActionPlanListApprove();
+                        approve.ActionPlanListId = actionPlanListId;
+                        approve.ApproveMan = tn.NodeID;
+                        approve.ApproveType = Const.ActionPlanList_Audit;
+                        approve.SignType = "XM";
+                        int edtion = Convert.ToInt32(txtEdition.Text);
+                        if (ActionPlan != null)
+                        {
+                            edtion++;
+                        }
+                        approve.Edition = edtion;
+                        delActionPlanListApprove(ActionPlanListId, tn.NodeID, "XM");
+                        ActionPlanListApproveService.AddActionPlanListApprove(approve);
+                        APICommonService.SendSubscribeMessage(approve.ApproveMan, "项目安全实施计划待办理", this.CurrUser.PersonName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now));
+                    }
+                    else
+                    {
+                        delActionPlanListApprove(ActionPlanListId, tn.NodeID, "XM");
+                    }
+                }
+            }
         }
         #endregion
 
@@ -187,18 +811,31 @@ namespace FineUIPro.Web.HSSE.ActionPlan
         /// <param name="e"></param>
         protected void btnAttachUrl_Click(object sender, EventArgs e)
         {
-            if (string.IsNullOrEmpty(this.ActionPlanListId))
+            if (string.IsNullOrEmpty(HFActionPlanListId.Text))   //新增记录
             {
-                SaveData(BLL.Const.BtnSave);
+                HFActionPlanListId.Text = SQLHelper.GetNewID(typeof(Model.ActionPlan_ActionPlanList));
+            }
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ActionPlanListAttachUrl&menuId={1}&type={2}", HFActionPlanListId.Text, BLL.Const.ProjectActionPlanListMenuId, ContactImg)));
+        }
+
+        protected void btnapprove_Click(object sender, EventArgs e)
+        {
+            //HFConstructSolutionId.Text
+            var approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(HFActionPlanListId.Text, CurrUser.PersonId);
+            if (approve != null)
+            {
+                var approveId = approve.ActionPlanListApproveId;
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(
+                String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/ActionPlanListAttachUrl&menuId={2}",
+                0, approveId, Const.ProjectActionPlanListMenuId)));
             }
-            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ActionPlanListAttachUrl&menuId={1}", this.ActionPlanListId, BLL.Const.ProjectActionPlanListMenuId)));
         }
         #endregion
 
         protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
         {
             this.divC.InnerHtml = string.Empty;
-            var getAtt = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.ActionPlanListId);
+            var getAtt = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == HFActionPlanListId.Text);
             if (getAtt != null)
             {
                 this.divC.InnerHtml = UploadAttachmentService.ShowAttachment("../../", getAtt.AttachUrl);
@@ -208,5 +845,45 @@ namespace FineUIPro.Web.HSSE.ActionPlan
                 this.trAtt.Hidden = true;
             }
         }
+
+        public string man(Object man)
+        {
+            string appman = string.Empty;
+            if (Person_PersonsService.GetPerson_PersonsById(man.ToString()) != null)
+            {
+                appman = Person_PersonsService.GetPerson_PersonsById(man.ToString()).PersonName;
+            }
+            return appman;
+        }
+
+        protected void gvApprove_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            object[] keys = gvApprove.DataKeys[e.RowIndex];
+            string fileId = string.Empty;
+            if (keys == null)
+            {
+                return;
+            }
+            else
+            {
+                fileId = keys[0].ToString();
+            }
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(
+                 String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/ActionPlanListAttachUrl&menuId={2}",
+                 -1, fileId, Const.ProjectActionPlanListMenuId)));
+        }
+
+        protected void rblIsReview_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (this.rblIsReview.SelectedValue == "True")
+            {
+                this.drpReviewMan.Hidden = false;
+            }
+            else
+            {
+                this.drpReviewMan.Hidden = true;
+                this.drpReviewMan.SelectedValue = BLL.Const._Null;
+            }
+        }
     }
 }

SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx.designer.cs

@@ -93,6 +93,24 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// </remarks>
         protected global::FineUIPro.DatePicker txtCompileDate;
         
+        /// <summary>
+        /// rblIsReview 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblIsReview;
+        
+        /// <summary>
+        /// drpReviewMan 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpReviewMan;
+        
         /// <summary>
         /// trAtt 控件。
         /// </summary>
@@ -121,22 +139,220 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divC;
         
         /// <summary>
-        /// ContentPanel1 控件。
+        /// Panel2 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.ContentPanel ContentPanel1;
+        protected global::FineUIPro.Panel Panel2;
         
         /// <summary>
-        /// ctlAuditFlow 控件。
+        /// Panel1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Web.Controls.FlowOperateControl ctlAuditFlow;
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// trOne 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree trOne;
+        
+        /// <summary>
+        /// Panel3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel3;
+        
+        /// <summary>
+        /// trTwo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree trTwo;
+        
+        /// <summary>
+        /// Panel4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel4;
+        
+        /// <summary>
+        /// trThree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree trThree;
+        
+        /// <summary>
+        /// Panel5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel5;
+        
+        /// <summary>
+        /// trFour 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree trFour;
+        
+        /// <summary>
+        /// Panel6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel6;
+        
+        /// <summary>
+        /// trFive 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree trFive;
+        
+        /// <summary>
+        /// Panel7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel7;
+        
+        /// <summary>
+        /// trSixe 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree trSixe;
+        
+        /// <summary>
+        /// agree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FormRow agree;
+        
+        /// <summary>
+        /// rblIsAgree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblIsAgree;
+        
+        /// <summary>
+        /// options 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FormRow options;
+        
+        /// <summary>
+        /// txtOptions 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtOptions;
+        
+        /// <summary>
+        /// optio 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FormRow optio;
+        
+        /// <summary>
+        /// btnapprove 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnapprove;
+        
+        /// <summary>
+        /// plApprove2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FormRow plApprove2;
+        
+        /// <summary>
+        /// gvApprove 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvApprove;
+        
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+        
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label3;
+        
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
         
         /// <summary>
         /// Toolbar1 控件。
@@ -174,6 +390,24 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
         
+        /// <summary>
+        /// txtEdition 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField txtEdition;
+        
+        /// <summary>
+        /// HFActionPlanListId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField HFActionPlanListId;
+        
         /// <summary>
         /// btnSave 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListView.aspx

@@ -1,8 +1,6 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ActionPlanListView.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.ActionPlan.ActionPlanListView" ValidateRequest="false" %>
 
-<%@ Register Src="~/Controls/FlowOperateControl.ascx" TagName="FlowOperateControl"
-    TagPrefix="uc1" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -29,7 +27,7 @@
                 <Items>
                     <f:TextBox ID="txtVersionNo" runat="server" Label="版 本 号" LabelAlign="Right" LabelWidth="120px"  Readonly="true">
                     </f:TextBox>
-                    <f:DropDownList ID="drpProjectType" runat="server" Label="项目类型" LabelAlign="Right" Enabled="false"
+                    <f:DropDownList ID="drpProjectType" runat="server" Label="项目类型" LabelAlign="Right" Readonly="true"
                         LabelWidth="120px">
                         <f:ListItem Value="1" Text="系统内项目" Selected="true" />
                         <f:ListItem Value="2" Text="系统外项目" />
@@ -48,20 +46,123 @@
                 </Items>
             </f:FormRow>
             <f:FormRow>
-                <Items>
-                    <f:HtmlEditor runat="server" Label="实施计划内容" ID="txtActionPlanListContents" ShowLabel="false"
-                        Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="220" LabelAlign="Right">
-                    </f:HtmlEditor>
-                </Items>
-            </f:FormRow>
+                    <Items>
+                        <f:RadioButtonList runat="server" ID="rblIsReview" Label="备案/部门评审" LabelWidth="120px" Readonly="true">
+                            <f:RadioItem Text="备案" Value="False" Selected="true" />
+                            <f:RadioItem Text="部门评审" Value="True" />
+                        </f:RadioButtonList>
+                        <f:DropDownList ID="drpReviewMan" runat="server" Label="评审负责人" LabelAlign="Right" Hidden="true" EnableEdit="true" Readonly="true"
+                            LabelWidth="120px">
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+            <f:FormRow runat="server" ID="trAtt">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel2" runat="server" ShowHeader="false" EnableCollapse="true"
+                            BodyPadding="0px" Height="100px">
+                            <div runat="server" id="divC"></div>
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
             <f:FormRow>
-                <Items>
-                    <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
-                        BodyPadding="0px">
-                        <uc1:FlowOperateControl ID="ctlAuditFlow" runat="server" />
-                    </f:ContentPanel>
-                </Items>
-            </f:FormRow>
+                    <Items>
+                        <f:Panel ID="Panel2" IsFluid="true" CssClass="mytable blockpanel" runat="server" ShowBorder="true"
+                            Layout="Table" TableConfigColumns="3" ShowHeader="true" Title="总包会签">
+                            <Items>
+                                <f:Panel ID="Panel1" Title="Panel1" Width="200px" Height="200px"
+                                    TableRowspan="5" runat="server" BodyPadding="10px" AutoScroll="true" ShowBorder="false" ShowHeader="false">
+                                    <Items>
+                                        <f:Tree runat="server" ID="trOne" ShowHeader="false" ShowBorder="false" EnableArrows="true">
+                                        </f:Tree>
+                                    </Items>
+                                </f:Panel>
+                                <f:Panel ID="Panel3" Title="Panel1" Width="200px" AutoScroll="true" Layout="Fit" Height="200px"
+                                    TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
+                                    <Items>
+                                        <f:Tree runat="server" ID="trTwo" ShowHeader="false" ShowBorder="false">
+                                            <Nodes>
+                                            </Nodes>
+                                        </f:Tree>
+                                    </Items>
+                                </f:Panel>
+                                <f:Panel ID="Panel4" Title="Panel1" Width="200px" AutoScroll="true" Layout="Fit" Height="200px"
+                                    TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
+                                    <Items>
+                                        <f:Tree runat="server" ID="trThree" ShowHeader="false" ShowBorder="false">
+                                            <Nodes>
+                                            </Nodes>
+                                        </f:Tree>
+                                    </Items>
+                                </f:Panel>
+                                <f:Panel ID="Panel5" Title="Panel1" Width="200px" AutoScroll="true" Layout="Fit" Height="200px"
+                                    TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
+                                    <Items>
+                                        <f:Tree runat="server" ID="trFour" ShowHeader="false" ShowBorder="false">
+                                            <Nodes>
+                                            </Nodes>
+                                        </f:Tree>
+                                    </Items>
+                                </f:Panel>
+                                <f:Panel ID="Panel6" Title="Panel1" Width="200px" AutoScroll="true" Layout="Fit" Height="200px"
+                                    TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
+                                    <Items>
+                                        <f:Tree runat="server" ID="trFive" ShowHeader="false" ShowBorder="false">
+                                            <Nodes>
+                                            </Nodes>
+                                        </f:Tree>
+                                    </Items>
+                                </f:Panel>
+                                <f:Panel ID="Panel7" Title="Panel1" Width="200px" AutoScroll="true" Layout="Fit" Height="200px"
+                                    TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
+                                    <Items>
+                                        <f:Tree runat="server" ID="trSixe" ShowHeader="false" ShowBorder="false">
+                                            <Nodes>
+                                            </Nodes>
+                                        </f:Tree>
+                                    </Items>
+                                </f:Panel>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ID="plApprove2">
+                    <Items>
+
+                        <f:ContentPanel Title="审批列表" ShowBorder="true"
+                            BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
+                            runat="server">
+                            <f:Grid ID="gvApprove" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false"
+                                DataKeyNames="ActionPlanListApproveId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand" ForceFit="true">
+                                <Columns>
+                                    <f:RowNumberField Width="40px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" />
+                                    <f:TemplateField ColumnID="ApproveType" Width="150px" HeaderText="办理类型" HeaderTextAlign="Center" TextAlign="Center"
+                                        EnableLock="true" Locked="False">
+                                        <ItemTemplate>
+                                            <asp:Label ID="Label1" runat="server" Text='<%# BLL.ActionPlanListService.ConvertState(Eval("ApproveType")) %>'></asp:Label>
+                                        </ItemTemplate>
+                                    </f:TemplateField>
+                                    <f:TemplateField ColumnID="ApproveMan" Width="150px" HeaderText="办理人员" HeaderTextAlign="Center" TextAlign="Center"
+                                        EnableLock="true" Locked="False">
+                                        <ItemTemplate>
+                                            <asp:Label ID="Label3" runat="server" Text='<%# man(Eval("ApproveMan")) %>'></asp:Label>
+                                        </ItemTemplate>
+                                    </f:TemplateField>
+                                    <f:TemplateField ColumnID="IsAgree" Width="100px" HeaderText="是否同意" HeaderTextAlign="Center" TextAlign="Center"
+                                        EnableLock="true" Locked="False">
+                                        <ItemTemplate>
+                                            <asp:Label ID="Label2" runat="server" Text='<%# BLL.ActionPlanListService.IsAgree(Eval("ApproveType"),Eval("IsAgree")) %>'></asp:Label>
+                                        </ItemTemplate>
+                                    </f:TemplateField>
+                                    <f:BoundField Width="100px" DataField="ApproveDate" HeaderTextAlign="Center" TextAlign="Center" DataFormatString="{0:yyyy-MM-dd}" HeaderText="办理时间" />
+                                    <f:BoundField Width="180px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center" HeaderText="办理意见" />
+                                    <f:LinkButtonField HeaderText="附件" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" />
+                                </Columns>
+                            </f:Grid>
+                        </f:ContentPanel>
+
+                    </Items>
+
+                </f:FormRow>
         </Rows>
         <Toolbars>
             <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">

SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListView.aspx.cs

@@ -1,5 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Web;
+using BLL;
+using System.Linq;
 
 namespace FineUIPro.Web.HSSE.ActionPlan
 {
@@ -33,7 +36,13 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             if (!IsPostBack)
             {
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
-
+                BLL.Person_PersonsService.InitUserUnitIdDepartIdDropDownList(this.drpReviewMan, BLL.Const.UnitId_SEDIN, BLL.Const.Depart_constructionId, true);
+                CQMSConstructSolutionService.setRoleTree(trOne, this.CurrUser.LoginProjectId, "专业工程师", Const.ProjectUnitType_1, Const.ZBCNEngineer);
+                CQMSConstructSolutionService.setRoleTree(trTwo, this.CurrUser.LoginProjectId, "质量组", Const.ProjectUnitType_1, Const.QAManager + "," + Const.CQEngineer);
+                CQMSConstructSolutionService.setRoleTree(trThree, this.CurrUser.LoginProjectId, "HSE组", Const.ProjectUnitType_1, Const.HSSEManager + "," + Const.HSSEEngineer);
+                CQMSConstructSolutionService.setRoleTree(trFour, this.CurrUser.LoginProjectId, "控制组", Const.ProjectUnitType_1, Const.ControlManager + "," + Const.KZEngineer);
+                CQMSConstructSolutionService.setRoleTree(trFive, this.CurrUser.LoginProjectId, "施工经理", Const.ProjectUnitType_1, Const.ConstructionManager + "," + Const.ConstructionAssistantManager);
+                CQMSConstructSolutionService.setRoleTree(trSixe, this.CurrUser.LoginProjectId, "项目经理", Const.ProjectUnitType_1, Const.ProjectManager);
                 this.ActionPlanListId = Request.Params["ActionPlanListId"];
                 if (!string.IsNullOrEmpty(this.ActionPlanListId))
                 {
@@ -41,23 +50,89 @@ namespace FineUIPro.Web.HSSE.ActionPlan
                     if (actionPlanList != null)
                     {
                         ///读取编号
-                        this.txtActionPlanListCode.Text = BLL.CodeRecordsService.ReturnCodeByDataId(this.ActionPlanListId);
+                        this.txtActionPlanListCode.Text = actionPlanList.ActionPlanListCode;
                         this.txtActionPlanListName.Text = actionPlanList.ActionPlanListName;
                         this.txtVersionNo.Text = actionPlanList.VersionNo;
-                        this.drpProjectType.SelectedValue = actionPlanList.VersionNo;
+                        this.drpProjectType.SelectedValue = actionPlanList.ProjectType;
                         this.drpCompileMan.Text = BLL.Person_PersonsService.GetPersonsNameById(actionPlanList.CompileMan);
                         this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", actionPlanList.CompileDate);
-                        this.txtActionPlanListContents.Text = HttpUtility.HtmlDecode(actionPlanList.ActionPlanListContents);
+                        if (actionPlanList.IsReview == true)
+                        {
+                            this.rblIsReview.SelectedValue = "True";
+                            this.drpReviewMan.Hidden = false;
+                            this.drpReviewMan.SelectedValue = actionPlanList.ReviewMan;
+                        }
+                        else
+                        {
+                            this.rblIsReview.SelectedValue = "False";
+                        }
+                        var list = ActionPlanListApproveService.getListData(ActionPlanListId);
+                        gvApprove.DataSource = list;
+                        gvApprove.DataBind();
+                        var zyUserIds = ActionPlanListApproveService.GetUserIdsApprovesBySignType(ActionPlanListId, "ZY");
+                        if (zyUserIds.Count > 0)
+                        {
+                            SetCheck(trOne, zyUserIds);
+                        }
+                        var zlUserIds = ActionPlanListApproveService.GetUserIdsApprovesBySignType(ActionPlanListId, "ZL");
+                        if (zlUserIds.Count > 0)
+                        {
+                            SetCheck(trTwo, zlUserIds);
+                        }
+                        var aqUserIds = ActionPlanListApproveService.GetUserIdsApprovesBySignType(ActionPlanListId, "AQ");
+                        if (aqUserIds.Count > 0)
+                        {
+                            SetCheck(trThree, aqUserIds);
+                        }
+                        var kzUserIds = ActionPlanListApproveService.GetUserIdsApprovesBySignType(ActionPlanListId, "KZ");
+                        if (kzUserIds.Count > 0)
+                        {
+                            SetCheck(trFour, kzUserIds);
+                        }
+                        var sgUserIds = ActionPlanListApproveService.GetUserIdsApprovesBySignType(ActionPlanListId, "SG");
+                        if (sgUserIds.Count > 0)
+                        {
+                            SetCheck(trFive, sgUserIds);
+                        }
+                        var xmUserIds = ActionPlanListApproveService.GetUserIdsApprovesBySignType(ActionPlanListId, "XM");
+                        if (xmUserIds.Count > 0)
+                        {
+                            SetCheck(trSixe, xmUserIds);
+                        }
+                        WindowAtt_Close(null, null);
                     }
                 }
+            }
+        }
 
-                ///初始化审核菜单
-                this.ctlAuditFlow.MenuId = BLL.Const.ProjectActionPlanListMenuId;
-                this.ctlAuditFlow.DataId = this.ActionPlanListId;
+        public string man(Object man)
+        {
+            string appman = string.Empty;
+            if (Person_PersonsService.GetPerson_PersonsById(man.ToString()) != null)
+            {
+                appman = Person_PersonsService.GetPerson_PersonsById(man.ToString()).PersonName;
+            }
+            return appman;
+        }
+
+        /// <summary>
+        /// 设置树的节点选择
+        /// </summary>
+        /// <param name="nodes"></param>
+        /// <param name="role"></param>
+        private void SetCheck(Tree tree, List<string> userIds)
+        {
+            foreach (TreeNode tn in tree.Nodes[0].Nodes)
+            {
+                if (userIds.Contains(tn.NodeID))
+                {
+                    tn.Checked = true;
+                }
             }
         }
         #endregion
 
+
         #region 附件上传
         /// <summary>
         /// 上传附件
@@ -72,5 +147,36 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             }
         }
         #endregion
+
+        protected void gvApprove_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            object[] keys = gvApprove.DataKeys[e.RowIndex];
+            string fileId = string.Empty;
+            if (keys == null)
+            {
+                return;
+            }
+            else
+            {
+                fileId = keys[0].ToString();
+            }
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(
+                 String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/ActionPlanListAttachUrl&menuId={2}",
+                 -1, fileId, Const.ProjectActionPlanListMenuId)));
+        }
+
+        protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
+        {
+            this.divC.InnerHtml = string.Empty;
+            var getAtt = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.ActionPlanListId);
+            if (getAtt != null)
+            {
+                this.divC.InnerHtml = UploadAttachmentService.ShowAttachment("../../", getAtt.AttachUrl);
+            }
+            else
+            {
+                this.trAtt.Hidden = true;
+            }
+        }
     }
 }

SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListView.aspx.designer.cs

@@ -94,31 +94,211 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         protected global::FineUIPro.TextBox txtCompileDate;
         
         /// <summary>
-        /// txtActionPlanListContents 控件。
+        /// rblIsReview 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HtmlEditor txtActionPlanListContents;
+        protected global::FineUIPro.RadioButtonList rblIsReview;
         
         /// <summary>
-        /// ContentPanel1 控件。
+        /// drpReviewMan 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.ContentPanel ContentPanel1;
+        protected global::FineUIPro.DropDownList drpReviewMan;
         
         /// <summary>
-        /// ctlAuditFlow 控件。
+        /// trAtt 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Web.Controls.FlowOperateControl ctlAuditFlow;
+        protected global::FineUIPro.FormRow trAtt;
+        
+        /// <summary>
+        /// ContentPanel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel2;
+        
+        /// <summary>
+        /// divC 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divC;
+        
+        /// <summary>
+        /// Panel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel2;
+        
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// trOne 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree trOne;
+        
+        /// <summary>
+        /// Panel3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel3;
+        
+        /// <summary>
+        /// trTwo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree trTwo;
+        
+        /// <summary>
+        /// Panel4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel4;
+        
+        /// <summary>
+        /// trThree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree trThree;
+        
+        /// <summary>
+        /// Panel5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel5;
+        
+        /// <summary>
+        /// trFour 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree trFour;
+        
+        /// <summary>
+        /// Panel6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel6;
+        
+        /// <summary>
+        /// trFive 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree trFive;
+        
+        /// <summary>
+        /// Panel7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel7;
+        
+        /// <summary>
+        /// trSixe 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree trSixe;
+        
+        /// <summary>
+        /// plApprove2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FormRow plApprove2;
+        
+        /// <summary>
+        /// gvApprove 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvApprove;
+        
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+        
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label3;
+        
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
         
         /// <summary>
         /// Toolbar1 控件。

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

@@ -0,0 +1,143 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ActionPlanList.aspx.cs" Inherits="FineUIPro.Web.ZHGL.Plan.ActionPlanList" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>实施计划</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="实施计划" EnableCollapse="true"
+                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="ActionPlanListId"
+                    DataIDField="ActionPlanListId" AllowSorting="true" ForceFit="true"
+                    SortField="CompileDate" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
+                    EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList runat="server" ID="drpProject" EnableEdit="true" 
+                                    LabelAlign="Right" EmptyText="请选择项目">
+                                </f:DropDownList>
+                                <f:TextBox runat="server" ID="txtActionPlanListCode" EmptyText="按编号查询"
+                                    Width="200px" LabelAlign="right">
+                                </f:TextBox>
+                                <f:TextBox runat="server" ID="txtActionPlanListName" EmptyText="按名称查询"
+                                    Width="200px" LabelAlign="right">
+                                </f:TextBox>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                </f:ToolbarFill>
+                                <f:Button ID="btnQuery" Text="查询" Icon="SystemSearch"
+                                    EnablePostBack="true" OnClick="TextBox_TextChanged" runat="server">
+                                </f:Button>
+                                <f:Button ID="btnNew" Text="新增" Icon="Add" EnablePostBack="false" Hidden="true"
+                                    runat="server">
+                                </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="100px" ColumnID="ActionPlanListCode" DataField="ActionPlanListCode"
+                            SortField="ActionPlanListCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="ActionPlanListName" DataField="ActionPlanListName" ExpandUnusedSpace="True"
+                            SortField="ActionPlanListName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" ExpandUnusedSpace="True"
+                            SortField="ProjectName" FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="VersionNo" DataField="VersionNo" SortField="VersionNo"
+                            FieldType="String" HeaderText="版本号" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="140px" ColumnID="ProjectType" DataField="ProjectType" SortField="ProjectType"
+                            FieldType="String" HeaderText="项目类型" HeaderTextAlign="Center" TextAlign="Left"
+                            RendererFunction="renderProjectType">
+                        </f:RenderField>
+                        <f:WindowField TextAlign="Left" Width="80px" WindowID="WindowAtt" HeaderText="附件"
+                            Text="详细" ToolTip="附件上传查看" DataIFrameUrlFields="ActionPlanListId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/ActionPlanListAttachUrl&menuId=CBC47C8B-141C-446B-90D9-CE8F5AE66CE4"
+                            HeaderTextAlign="Center" />
+                        <f:TemplateField ColumnID="State" Width="60px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="False">
+                            <ItemTemplate>
+                                <asp:Label ID="Label1" runat="server" Text='<%# BLL.ActionPlanListService.ConvertState(Eval("States")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:TemplateField ColumnID="ApproveMan" Width="60px" HeaderText="办理人" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="False">
+                            <ItemTemplate>
+                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertApproveMan(Eval("ActionPlanListId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="实施计划" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="1300px" Height="660px">
+        </f:Window>
+        <f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+            Height="500px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
+                Hidden="true" runat="server" Text="编辑">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuView" EnablePostBack="true" runat="server" Text="查看" Icon="ApplicationViewIcons"
+                    OnClick="btnMenuView_Click">
+                </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
+                Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server"
+                Text="删除">
+            </f:MenuButton>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        function renderProjectType(value) {
+        }
+
+        var menuID = '<%= Menu1.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>

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

@@ -0,0 +1,355 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.ZHGL.Plan
+{
+    public partial class ActionPlanList : PageBase
+    {
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ////权限按钮方法
+                this.GetButtonPower();
+                this.btnNew.OnClientClick = Window1.GetShowReference("ActionPlanListEdit.aspx") + "return false;";
+                ProjectService.InitAllProjectDropDownList(this.drpProject, false);
+                drpProject.Items.Insert(0, new FineUIPro.ListItem("公司本部", "Company"));
+                Funs.FineUIPleaseSelect(drpProject, "按项目/公司本部查询");
+                // 绑定表格
+                this.BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = "SELECT ActionPlanList.ActionPlanListId,ActionPlanList.ProjectId,Project.ProjectName,ActionPlanListCode,ActionPlanList.ActionPlanListName,ActionPlanList.VersionNo,(CASE ActionPlanList.ProjectType WHEN '1' THEN '系统内项目' WHEN '2' THEN '系统外项目' WHEN '3' THEN '海外项目' END ) AS ProjectType,ActionPlanList.ActionPlanListContents,ActionPlanList.CompileMan,Users.PersonName AS CompileManName, ActionPlanList.CompileDate,ActionPlanList.States"
+                        + @" FROM ActionPlan_ActionPlanList AS ActionPlanList "
+                        + @" LEFT JOIN Base_Project AS Project ON ActionPlanList.ProjectId=Project.ProjectId "
+                        + @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON ActionPlanList.ActionPlanListId=FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
+                        + @" LEFT JOIN Person_Persons AS OperateUser ON FlowOperate.OperaterId=OperateUser.PersonId "
+                        + @" LEFT JOIN Person_Persons AS Users ON Users.PersonId = ActionPlanList.CompileMan "
+                        + @" WHERE 1=1 ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            if (this.drpProject.SelectedValue != BLL.Const._Null)
+            {
+                if (this.drpProject.SelectedValue == "Company")
+                {
+                    strSql += " AND ActionPlanList.ProjectId is null";
+                }
+                else
+                {
+                    strSql += " AND ActionPlanList.ProjectId = @ProjectId";
+                    listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
+                }
+            }
+            if (!string.IsNullOrEmpty(this.txtActionPlanListCode.Text.Trim()))
+            {
+                strSql += " AND ActionPlanListCode LIKE @ActionPlanListCode";
+                listStr.Add(new SqlParameter("@ActionPlanListCode", "%" + this.txtActionPlanListCode.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(this.txtActionPlanListName.Text.Trim()))
+            {
+                strSql += " AND ActionPlanListName LIKE @ActionPlanListName";
+                listStr.Add(new SqlParameter("@ActionPlanListName", "%" + this.txtActionPlanListName.Text.Trim() + "%"));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 分页 排序
+        /// <summary>
+        /// 改变索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页下拉选择事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+            BLL.LogService.AddSys_Log(this.CurrUser, string.Empty, string.Empty, BLL.Const.OfficeActionPlanListMenuId, Const.BtnQuery);
+        }
+        #endregion
+
+        #region 编辑
+        /// <summary>
+        /// 双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.EditData();
+        }
+
+        /// <summary>
+        /// 右键编辑事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuEdit_Click(object sender, EventArgs e)
+        {
+            this.EditData();
+        }
+
+        /// <summary>
+        /// 编辑数据方法
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string id = Grid1.SelectedRowID.Split(',')[0];
+            Model.ActionPlan_ActionPlanList actionPlanList = ActionPlanListService.GetActionPlanListById(id);
+            if (actionPlanList.States == Const.ActionPlanList_Complete)
+            {
+                Alert.ShowInTop("该文件已经审批完成,无法操作,请右键查看!", MessageBoxIcon.Warning);
+                return;
+            }
+            else if (actionPlanList.States == Const.ActionPlanList_Compile)
+            {
+                if (actionPlanList.CompileMan == CurrUser.PersonId || CurrUser.PersonId == Const.sysglyId)
+                {
+
+                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ActionPlanListEdit.aspx?actionPlanListId={0}", id)));
+                }
+                else
+                {
+                    Alert.ShowInTop("您不是编制人，无法操作！请右键查看", MessageBoxIcon.Warning);
+                    return;
+                }
+            }
+            else if (actionPlanList.States == Const.ActionPlanList_Review || actionPlanList.States == Const.ActionPlanList_Reviewing || actionPlanList.States == Const.ActionPlanList_ReCompile || actionPlanList.States == Const.ActionPlanList_Review2)
+            {
+                Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(id, CurrUser.PersonId);
+                if (approve != null || CurrUser.PersonId == Const.sysglyId)
+                {
+                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ActionPlanListEdit.aspx?actionPlanListId={0}", id)));
+                    return;
+                    //Response.Redirect("ActionPlanListAudit.aspx?actionPlanListId=" + id);
+                    //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckListView.aspx?CheckControlCode={0}", id, "查看 - ")));
+                }
+                else
+                {
+                    if (actionPlanList.CompileMan.Equals(CurrUser.PersonId))
+                    {
+                        PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ActionPlanListEdit.aspx?actionPlanListId={0}", id)));
+                    }
+                    else
+                    {
+                        Alert.ShowInTop("您不是办理用户，无法操作！请右键查看", MessageBoxIcon.Warning);
+                        return;
+                    }
+                }
+            }
+        }
+        #endregion
+
+        protected void btnMenuView_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string id = Grid1.SelectedRowID.Split(',')[0];
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ActionPlanListView.aspx?ActionPlanListId={0}", id)));
+
+        }
+
+        #region 删除
+        /// <summary>
+        /// 右键删除事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDelete_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length > 0)
+            {
+                bool isShow = false;
+                if (Grid1.SelectedRowIndexArray.Length == 1)
+                {
+                    isShow = true;
+                }
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                    if (this.judgementDelete(rowID, isShow))
+                    {
+                        var getV = BLL.ActionPlanListService.GetActionPlanListById(rowID);
+                        if (getV != null)
+                        {
+                            BLL.LogService.AddSys_Log(this.CurrUser, getV.ActionPlanListCode, getV.ActionPlanListId, BLL.Const.OfficeActionPlanListMenuId, Const.BtnDelete);
+                            BLL.ActionPlanListService.DeleteActionPlanListById(rowID);
+                        }
+                    }
+                }
+                BindGrid();
+                ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+            }
+        }
+
+        /// <summary>
+        /// 判断是否可以删除
+        /// </summary>
+        /// <returns></returns>
+        private bool judgementDelete(string id, bool isShow)
+        {
+            string content = string.Empty;
+
+            if (string.IsNullOrEmpty(content))
+            {
+                return true;
+            }
+            else
+            {
+                if (isShow)
+                {
+                    Alert.ShowInTop(content);
+                }
+                return false;
+            }
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == "0")
+            {
+                return;
+            }
+
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.OfficeActionPlanListMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnAdd))
+                {
+                    this.btnNew.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnMenuEdit.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnMenuDelete.Hidden = false;
+                }
+            }
+        }
+        #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("安全实施计划" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = 5000;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+        #endregion
+
+        /// <summary>
+        /// 把办理人转换代号为文字形式
+        /// </summary>
+        /// <param name="ActionPlanListId"></param>
+        /// <returns></returns>
+        /// 
+        public static string ConvertApproveMan(object ActionPlanListId)
+        {
+            string name = string.Empty;
+            if (ActionPlanListId != null)
+            {
+                var approves = BLL.ActionPlanListApproveService.GetActionPlanListApprovesNotHandleList(ActionPlanListId.ToString());
+                foreach (var item in approves)
+                {
+                    name += BLL.Person_PersonsService.GetPersonsNameById(item.ApproveMan) + ",";
+                }
+                if (!string.IsNullOrEmpty(name))
+                {
+                    name = name.Substring(0, name.Length - 1);
+                }
+            }
+            return name;
+        }
+    }
+}

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

@@ -0,0 +1,231 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.ZHGL.Plan {
+    
+    
+    public partial class ActionPlanList {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+        
+        /// <summary>
+        /// txtActionPlanListCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtActionPlanListCode;
+        
+        /// <summary>
+        /// txtActionPlanListName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtActionPlanListName;
+        
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+        
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+        
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+        
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
+        /// <summary>
+        /// lblNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblNumber;
+        
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+        
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+        
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+        
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+        
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+        
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+        
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+        
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+        
+        /// <summary>
+        /// btnMenuEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuEdit;
+        
+        /// <summary>
+        /// btnMenuView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuView;
+        
+        /// <summary>
+        /// btnMenuDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDelete;
+    }
+}

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

@@ -0,0 +1,181 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ActionPlanListEdit.aspx.cs" Inherits="FineUIPro.Web.ZHGL.Plan.ActionPlanListEdit" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>编辑实施计划</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" Title="安全实施计划"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtActionPlanListCode" runat="server" Label="编号" ShowRedStar="true" Required="true"
+                            LabelAlign="Right" LabelWidth="140px">
+                        </f:TextBox>
+                        <f:TextBox ID="txtActionPlanListName" runat="server" Label="名称" Required="true"
+                            ShowRedStar="true" LabelAlign="Right" LabelWidth="120px">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtVersionNo" runat="server" Label="版本号" LabelAlign="Right" LabelWidth="140px">
+                        </f:TextBox>
+                        <f:DropDownList ID="drpProjectType" runat="server" Label="项目类型" LabelAlign="Right"
+                            LabelWidth="120px">
+                            <f:ListItem Value="1" Text="系统内项目" Selected="true" />
+                            <f:ListItem Value="2" Text="系统外项目" />
+                            <f:ListItem Value="3" Text="海外项目" />
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpCompileMan" runat="server" Label="编制人" LabelAlign="Right"
+                            LabelWidth="140px">
+                        </f:DropDownList>
+                        <f:DatePicker ID="txtCompileDate" runat="server" Label="编制日期" LabelAlign="Right"
+                            EnableEdit="true" LabelWidth="120px">
+                        </f:DatePicker>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:RadioButtonList runat="server" ID="rblIsReview" Label="备案/部门评审" LabelWidth="140px" AutoPostBack="true" OnSelectedIndexChanged="rblIsReview_SelectedIndexChanged">
+                            <f:RadioItem Text="备案" Value="False" Selected="true" />
+                            <f:RadioItem Text="部门评审" Value="True" />
+                        </f:RadioButtonList>
+                        <f:DropDownList ID="drpReviewMan" runat="server" Label="评审负责人" LabelAlign="Right" Hidden="true" EnableEdit="true"
+                            LabelWidth="120px">
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpPerson" runat="server" LabelWidth="140px" Label="评审人员" LabelAlign="Right" EnableCheckBoxSelect="true" EnableMultiSelect="true" EnableEdit="true">
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                 <f:FormRow>
+                    <Items>
+                        <f:RadioButtonList runat="server" ID="rblIsCompanyReview" Label="备案/公司部门评审" Hidden="true" LabelWidth="140px" AutoPostBack="true" OnSelectedIndexChanged="rblIsCompanyReview_SelectedIndexChanged">
+                            <f:RadioItem Text="备案" Value="False" Selected="true" />
+                            <f:RadioItem Text="公司部门评审" Value="True" />
+                        </f:RadioButtonList>
+                        <f:Label runat="server" Hidden="true"></f:Label>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow runat="server" ID="trAtt">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel2" runat="server" ShowHeader="false" EnableCollapse="true"
+                            BodyPadding="0px" Height="100px">
+                            <div runat="server" id="divC"></div>
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ID="agree">
+                    <Items>
+
+                        <f:RadioButtonList runat="server" ID="rblIsAgree" Label="是否同意" ShowRedStar="true" AutoPostBack="true">
+                            <f:RadioItem Text="同意" Value="true" Selected="true" />
+                            <f:RadioItem Text="不同意" Value="false" />
+                        </f:RadioButtonList>
+                        <f:Label runat="server" CssStyle="display:none"></f:Label>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ID="options">
+                    <Items>
+                        <f:TextArea ID="txtOptions" ShowRedStar="true" Required="true" runat="server" Label="办理意见" MaxLength="3000">
+                        </f:TextArea>
+
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ID="optio">
+
+                    <Items>
+                        <f:Panel ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
+                            <Items>
+                                <f:Label runat="server" Text="附件：" ShowRedStar="true" CssStyle="padding-left:53px" Width="100px" CssClass="marginr" ShowLabel="false"></f:Label>
+                                <f:Button ID="btnapprove" Text="附件" ToolTip="上传及查看" Icon="TableCell" OnClick="btnapprove_Click" runat="server">
+                                </f:Button>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ID="plApprove2">
+                    <Items>
+
+                        <f:ContentPanel Title="审批列表" ShowBorder="true"
+                            BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
+                            runat="server">
+                            <f:Grid ID="gvApprove" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false"
+                                DataKeyNames="ActionPlanListApproveId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand" ForceFit="true">
+                                <Columns>
+                                    <f:RowNumberField Width="40px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" />
+                                    <f:TemplateField ColumnID="ApproveType" Width="150px" HeaderText="办理类型" HeaderTextAlign="Center" TextAlign="Center"
+                                        EnableLock="true" Locked="False">
+                                        <ItemTemplate>
+                                            <asp:Label ID="Label1" runat="server" Text='<%# BLL.ActionPlanListService.ConvertState(Eval("ApproveType")) %>'></asp:Label>
+                                        </ItemTemplate>
+                                    </f:TemplateField>
+                                    <f:TemplateField ColumnID="ApproveMan" Width="150px" HeaderText="办理人员" HeaderTextAlign="Center" TextAlign="Center"
+                                        EnableLock="true" Locked="False">
+                                        <ItemTemplate>
+                                            <asp:Label ID="Label3" runat="server" Text='<%# man(Eval("ApproveMan")) %>'></asp:Label>
+                                        </ItemTemplate>
+                                    </f:TemplateField>
+                                    <f:TemplateField ColumnID="IsAgree" Width="100px" HeaderText="是否同意" HeaderTextAlign="Center" TextAlign="Center"
+                                        EnableLock="true" Locked="False">
+                                        <ItemTemplate>
+                                            <asp:Label ID="Label2" runat="server" Text='<%# BLL.ActionPlanListService.IsAgree(Eval("ApproveType"),Eval("IsAgree")) %>'></asp:Label>
+                                        </ItemTemplate>
+                                    </f:TemplateField>
+                                    <f:BoundField Width="100px" DataField="ApproveDate" HeaderTextAlign="Center" TextAlign="Center" DataFormatString="{0:yyyy-MM-dd}" HeaderText="办理时间" />
+                                    <f:BoundField Width="180px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center" HeaderText="办理意见" />
+                                    <f:LinkButtonField HeaderText="附件" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" />
+                                </Columns>
+                            </f:Grid>
+                        </f:ContentPanel>
+
+                    </Items>
+
+                </f:FormRow>
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:Label runat="server" ID="lbTemp">
+                        </f:Label>
+                        <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
+                            OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
+                        </f:Button>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                        </f:ToolbarFill>
+                        <f:HiddenField ID="txtEdition" runat="server"></f:HiddenField>
+                        <f:HiddenField ID="HFActionPlanListId" runat="server"></f:HiddenField>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="SimpleForm1"
+                            OnClick="btnSave_Click">
+                        </f:Button>
+                        <f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ValidateForms="SimpleForm1"
+                            OnClick="btnSubmit_Click">
+                        </f:Button>
+                        <f:Button ID="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+        <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="WindowAtt_Close"
+            Width="700px" Height="500px">
+        </f:Window>
+    </form>
+</body>
+</html>

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

@@ -0,0 +1,613 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace FineUIPro.Web.ZHGL.Plan
+{
+    public partial class ActionPlanListEdit : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string ActionPlanListId
+        {
+            get
+            {
+                return (string)ViewState["ActionPlanListId"];
+            }
+            set
+            {
+                ViewState["ActionPlanListId"] = value;
+            }
+        }
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+
+        public int ContactImg
+        {
+            get
+            {
+                return Convert.ToInt32(ViewState["ContactImg"]);
+            }
+            set
+            {
+                ViewState["ContactImg"] = value;
+            }
+        }
+
+        /// <summary>
+        /// 定义会签意见集合
+        /// </summary>
+        public static List<Model.ActionPlan_ActionPlanListApprove> approves = new List<Model.ActionPlan_ActionPlanListApprove>();
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            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 select x).ToList();
+                Model.ActionPlan_ActionPlanList actionPlanList = BLL.ActionPlanListService.GetActionPlanListById(this.ActionPlanListId);
+                if (actionPlanList != null)
+                {
+                    var compileMan = BLL.Person_PersonsService.GetPerson_PersonsById(actionPlanList.CompileMan);
+                    if (compileMan != null)
+                    {
+                        q.Add(compileMan);
+                    }
+                }
+                this.drpCompileMan.DataTextField = "PersonName";
+                this.drpCompileMan.DataValueField = "PersonId";
+                this.drpCompileMan.DataSource = q;
+                this.drpCompileMan.DataBind();
+                Funs.FineUIPleaseSelect(this.drpCompileMan);
+                this.drpReviewMan.DataTextField = "PersonName";
+                this.drpReviewMan.DataValueField = "PersonId";
+                this.drpReviewMan.DataSource = q;
+                this.drpReviewMan.DataBind();
+                Funs.FineUIPleaseSelect(this.drpReviewMan);
+                this.drpPerson.DataTextField = "PersonName";
+                this.drpPerson.DataValueField = "PersonId";
+                this.drpPerson.DataSource = q;
+                this.drpPerson.DataBind();
+                Funs.FineUIPleaseSelect(this.drpPerson);
+                ContactImg = 0;
+                if (!string.IsNullOrEmpty(this.ActionPlanListId))
+                {
+                    if (actionPlanList != null)
+                    {
+                        HFActionPlanListId.Text = this.ActionPlanListId;
+                        this.ProjectId = actionPlanList.ProjectId;
+                        if (this.ProjectId != this.CurrUser.LoginProjectId)
+                        {
+                            BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpCompileMan, this.ProjectId, null, null, true);
+                        }
+                        if (actionPlanList.Edition != null)
+                        {
+                            txtEdition.Text = actionPlanList.Edition.ToString();
+                        }
+                        ///读取编号
+                        this.txtActionPlanListCode.Text = actionPlanList.ActionPlanListCode;
+                        this.txtActionPlanListName.Text = actionPlanList.ActionPlanListName;
+                        this.txtVersionNo.Text = actionPlanList.VersionNo;
+                        if (!string.IsNullOrEmpty(actionPlanList.ProjectType))
+                        {
+                            this.drpProjectType.SelectedValue = actionPlanList.ProjectType;
+                        }
+                        else
+                        {
+                            this.drpProjectType.Hidden = true;
+                        }
+                        if (!string.IsNullOrEmpty(actionPlanList.CompileMan))
+                        {
+                            this.drpCompileMan.SelectedValue = actionPlanList.CompileMan;
+                        }
+                        if (actionPlanList.CompileDate != null)
+                        {
+                            this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", actionPlanList.CompileDate);
+                        }
+                        if (actionPlanList.IsReview == true)
+                        {
+                            this.rblIsReview.SelectedValue = "True";
+                            this.drpReviewMan.Hidden = false;
+                            this.drpReviewMan.SelectedValue = actionPlanList.ReviewMan;
+                        }
+                        else
+                        {
+                            this.rblIsReview.SelectedValue = "False";
+                        }
+                        List<string> list = BLL.ActionPlanListApproveService.GetReviewingPersonIds(this.ActionPlanListId);
+                        if (list.Count > 0)
+                        {
+                            this.drpPerson.SelectedValueArray = list.ToArray();
+                        }
+                        bindApprove();
+                        if (actionPlanList.States == Const.ActionPlanList_ReCompile || actionPlanList.States == Const.ActionPlanList_Compile)
+                        {
+                            agree.Hidden = true;
+                            options.Hidden = true;
+                            optio.Hidden = true;
+                        }
+                        if (actionPlanList.States == Const.ActionPlanList_Review)
+                        {
+                            txtActionPlanListCode.Readonly = true;
+                            txtActionPlanListName.Readonly = true;
+                            txtVersionNo.Readonly = true;
+                            drpProjectType.Readonly = true;
+                            drpCompileMan.Readonly = true;
+                            txtCompileDate.Readonly = true;
+                            rblIsReview.Readonly = true;
+                            drpReviewMan.Readonly = true;
+                            ContactImg = -1;
+                        }
+                        else if (actionPlanList.States == Const.ActionPlanList_Reviewing)
+                        {
+                            txtActionPlanListCode.Readonly = true;
+                            txtActionPlanListName.Readonly = true;
+                            txtVersionNo.Readonly = true;
+                            drpProjectType.Readonly = true;
+                            drpCompileMan.Readonly = true;
+                            txtCompileDate.Readonly = true;
+                            rblIsReview.Readonly = true;
+                            drpReviewMan.Readonly = true;
+                            drpPerson.Readonly = true;
+                            ContactImg = -1;
+                        }
+                        else if (actionPlanList.States == Const.ActionPlanList_Review2)
+                        {
+                            txtActionPlanListCode.Readonly = true;
+                            txtActionPlanListName.Readonly = true;
+                            txtVersionNo.Readonly = true;
+                            drpProjectType.Readonly = true;
+                            drpCompileMan.Readonly = true;
+                            txtCompileDate.Readonly = true;
+                            rblIsReview.Readonly = true;
+                            drpReviewMan.Readonly = true;
+                            drpPerson.Readonly = true;
+                            rblIsCompanyReview.Hidden = false;
+                            if (actionPlanList.IsCompanyReview == true)
+                            {
+                                rblIsCompanyReview.SelectedValue = "True";
+                            }
+                            else
+                            {
+                                rblIsCompanyReview.SelectedValue = "False";
+                            }
+                            ContactImg = -1;
+                        }
+                        //提交版本人多次修改
+                        if (actionPlanList.CompileMan.Equals(CurrUser.PersonId))
+                        {
+                            txtActionPlanListCode.Enabled = true;
+                            txtActionPlanListName.Enabled = true;
+                            txtVersionNo.Enabled = true;
+                            drpProjectType.Enabled = true;
+                            drpCompileMan.Enabled = true;
+                            txtCompileDate.Enabled = true;
+                            ContactImg = 0;
+                            Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(ActionPlanListId, CurrUser.PersonId);
+                            if (approve == null)
+                            {
+                                rblIsAgree.Hidden = true;
+                                rblIsAgree.Required = false;
+                                options.Hidden = true;
+                                txtOptions.Required = false;
+                                optio.Hidden = true;
+                            }
+                        }
+                    }
+                    WindowAtt_Close(null, null);
+                }
+                else
+                {
+                    this.drpCompileMan.SelectedValue = this.CurrUser.PersonId;
+                    this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+                    this.trAtt.Hidden = true;
+                    agree.Hidden = true;
+                    txtEdition.Text = "0";
+                    options.Hidden = true;
+                    optio.Hidden = true;
+                    plApprove2.Hidden = true;
+                    ////自动生成编码
+                    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.drpReviewMan.SelectedValue = this.CurrUser.PersonId;
+                    this.drpPerson.Hidden = true;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 审批列表
+        /// </summary>
+        private void bindApprove()
+        {
+            var list = ActionPlanListApproveService.getListData(ActionPlanListId);
+            gvApprove.DataSource = list;
+            gvApprove.DataBind();
+        }
+        #endregion
+
+        #region 保存
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (this.drpCompileMan.SelectedValue == BLL.Const._Null)
+            {
+                Alert.ShowInTop("请选择编制人!", MessageBoxIcon.Warning);
+                return;
+            }
+            this.SaveData(BLL.Const.BtnSave);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+        }
+
+        /// <summary>
+        /// 提交按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSubmit_Click(object sender, EventArgs e)
+        {
+            if (this.drpCompileMan.SelectedValue == BLL.Const._Null)
+            {
+                Alert.ShowInTop("请选择编制人!", MessageBoxIcon.Warning);
+                return;
+            }
+            if (string.IsNullOrEmpty(HFActionPlanListId.Text))
+            {
+                Alert.ShowInTop("请上传附件!", MessageBoxIcon.Warning);
+                return;
+            }
+            if (rblIsReview.SelectedValue == "True" && this.drpPerson.SelectedItemArray.Length == 1 && this.drpPerson.SelectedValue == Const._Null && this.rblIsAgree.SelectedValue == "true")
+            {
+                Alert.ShowInTop("请选择评审人员!", MessageBoxIcon.Warning);
+                return;
+            }
+            this.SaveData(BLL.Const.BtnSubmit);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+        }
+
+        /// <summary>
+        /// 保存数据
+        /// </summary>
+        /// <param name="type"></param>
+        private void SaveData(string type)
+        {
+            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,
+            };
+            if (this.drpCompileMan.SelectedValue != BLL.Const._Null)
+            {
+                actionPlanList.CompileMan = this.drpCompileMan.SelectedValue;
+            }
+            if (!string.IsNullOrEmpty(this.txtCompileDate.Text.Trim()))
+            {
+                actionPlanList.CompileDate = Convert.ToDateTime(this.txtCompileDate.Text.Trim());
+            }
+            actionPlanList.IsReview = Convert.ToBoolean(this.rblIsReview.SelectedValue);
+            if (this.drpReviewMan.SelectedValue != BLL.Const._Null)
+            {
+                actionPlanList.ReviewMan = this.drpReviewMan.SelectedValue;
+            }
+            int edtion = Convert.ToInt32(txtEdition.Text);
+            actionPlanList.Edition = edtion;
+            if (rblIsCompanyReview.Hidden == false)
+            {
+                actionPlanList.IsCompanyReview = Convert.ToBoolean(this.rblIsCompanyReview.SelectedValue);
+            }
+            if (!string.IsNullOrEmpty(this.ActionPlanListId))
+            {
+                actionPlanList.ActionPlanListId = this.ActionPlanListId;
+                Model.ActionPlan_ActionPlanList actionPlanList1 = ActionPlanListService.GetActionPlanListById(ActionPlanListId);
+                if (type == BLL.Const.BtnSubmit)
+                {
+                    if (actionPlanList1.States == Const.ActionPlanList_Review)
+                    {
+                        Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetConstructSoluAppByApproveMan(ActionPlanListId, CurrUser.PersonId, Convert.ToInt32(actionPlanList1.Edition));
+                        if (type == BLL.Const.BtnSubmit)
+                        {
+                            approve.ApproveDate = DateTime.Now;
+                        }
+                        approve.Edition = Convert.ToInt32(edtion);
+                        approve.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
+                        approve.ApproveIdea = txtOptions.Text.Trim();
+                        ActionPlanListApproveService.UpdateActionPlanListApprove(approve);
+                        if (approve.IsAgree == true)
+                        {
+                            foreach (var item in this.drpPerson.SelectedValueArray)
+                            {
+                                if (item != Const._Null)
+                                {
+                                    Model.ActionPlan_ActionPlanListApprove approve2 = new Model.ActionPlan_ActionPlanListApprove();
+                                    approve2.ActionPlanListId = actionPlanList.ActionPlanListId;
+                                    approve2.ApproveMan = item;
+                                    approve2.ApproveType = Const.ActionPlanList_Reviewing;
+                                    approve2.Edition = Convert.ToInt32(edtion);
+                                    BLL.ActionPlanListApproveService.AddActionPlanListApprove(approve2);
+                                }
+                            }
+                            actionPlanList.States = Const.ActionPlanList_Reviewing;
+                        }
+                        else
+                        {
+                            Model.ActionPlan_ActionPlanListApprove reApprove = new Model.ActionPlan_ActionPlanListApprove();
+                            reApprove.ActionPlanListId = actionPlanList.ActionPlanListId;
+                            reApprove.ApproveMan = actionPlanList1.CompileMan;
+                            reApprove.ApproveType = Const.ActionPlanList_ReCompile;
+                            edtion++;
+                            reApprove.Edition = edtion;
+                            ActionPlanListApproveService.AddActionPlanListApprove(reApprove);
+                            actionPlanList.States = Const.ActionPlanList_ReCompile;
+                        }
+                    }
+                    else if (actionPlanList1.States == Const.ActionPlanList_Reviewing)
+                    {
+                        actionPlanList.States = Const.ActionPlanList_Reviewing;
+                        Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetConstructSoluAppByApproveMan(ActionPlanListId, CurrUser.PersonId, Convert.ToInt32(actionPlanList1.Edition));
+                        if (approve != null)
+                        {
+                            approve.ApproveDate = DateTime.Now;
+                            approve.ApproveIdea = this.txtOptions.Text.Trim();
+                            approve.IsAgree = Convert.ToBoolean(this.rblIsAgree.SelectedValue);
+                            BLL.ActionPlanListApproveService.UpdateActionPlanListApprove(approve);
+                        }
+                        List<Model.ActionPlan_ActionPlanListApprove> approve3s = BLL.ActionPlanListApproveService.GetReviewings(ActionPlanListId, edtion);  //审批集合
+                        List<Model.ActionPlan_ActionPlanListApprove> approve3Ends = BLL.ActionPlanListApproveService.GetReviewingEnds(ActionPlanListId, edtion);  //审批完成集合
+                        int okNum = approve3Ends.Count(x => x.IsAgree == true);  //审批同意数量
+                        if (approve3s.Count == approve3Ends.Count)
+                        {
+                            if (approve3s.Count == okNum)  //全部同意,返回评审负责人办理
+                            {
+                                Model.ActionPlan_ActionPlanListApprove approve2 = new Model.ActionPlan_ActionPlanListApprove();
+                                approve2.ActionPlanListId = actionPlanList.ActionPlanListId;
+                                approve2.ApproveMan = actionPlanList.ReviewMan;
+                                approve2.ApproveType = Const.ActionPlanList_Review2;
+                                approve2.Edition = Convert.ToInt32(edtion);
+                                BLL.ActionPlanListApproveService.AddActionPlanListApprove(approve2);
+                                actionPlanList.States = Const.ActionPlanList_Review2;
+                            }
+                            else   //有人不同意，（编制人）修改
+                            {
+                                Model.ActionPlan_ActionPlanListApprove reApprove = new Model.ActionPlan_ActionPlanListApprove();
+                                reApprove.ActionPlanListId = actionPlanList.ActionPlanListId;
+                                reApprove.ApproveMan = actionPlanList1.CompileMan;
+                                reApprove.ApproveType = Const.ActionPlanList_ReCompile;
+                                edtion++;
+                                reApprove.Edition = edtion;
+                                ActionPlanListApproveService.AddActionPlanListApprove(reApprove);
+                                actionPlanList.States = Const.ActionPlanList_ReCompile;
+                            }
+                        }
+                    }
+                    else if (actionPlanList1.States == Const.ActionPlanList_Review2)
+                    {
+                        if (rblIsCompanyReview.SelectedValue == "True")  //公司部门评审
+                        {
+
+                        }
+                        else   //备案
+                        {
+                            Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetConstructSoluAppByApproveMan(ActionPlanListId, CurrUser.PersonId, Convert.ToInt32(actionPlanList1.Edition));
+                            if (type == BLL.Const.BtnSubmit)
+                            {
+                                approve.ApproveDate = DateTime.Now;
+                            }
+                            approve.Edition = Convert.ToInt32(edtion);
+                            approve.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
+                            approve.ApproveIdea = txtOptions.Text.Trim();
+                            ActionPlanListApproveService.UpdateActionPlanListApprove(approve);
+                            actionPlanList.States = Const.ActionPlanList_Complete;
+                        }
+                    }
+                }
+                else
+                {
+                    actionPlanList.States = actionPlanList1.States;
+                }
+                //提交时候，更新提交版本
+                //if (CurrUser.PersonId.Equals(actionPlanList1.CompileMan))
+                //{
+                //    if (actionPlanList1.States != Const.ActionPlanList_Audit)
+                //    {
+                //        edtion++;
+                //    }
+                //    actionPlanList.Edition = Convert.ToInt32(edtion);
+                //    actionPlanList.States = Const.ActionPlanList_Audit;
+                //}
+                BLL.ActionPlanListService.UpdateActionPlanList(actionPlanList);
+                BLL.LogService.AddSys_Log(this.CurrUser, this.txtActionPlanListCode.Text, this.ActionPlanListId, BLL.Const.OfficeActionPlanListMenuId, Const.BtnModify);
+            }
+            else
+            {
+                if (!string.IsNullOrEmpty(HFActionPlanListId.Text))
+                {
+                    actionPlanList.ActionPlanListId = HFActionPlanListId.Text;
+                }
+                else
+                {
+                    actionPlanList.ActionPlanListId = SQLHelper.GetNewID(typeof(Model.ActionPlan_ActionPlanList));
+                }
+                actionPlanList.States = BLL.Const.ActionPlanList_Compile;
+                if (type == BLL.Const.BtnSubmit)
+                {
+                    if (rblIsReview.SelectedValue == "True")  //施工管理部评审
+                    {
+                        actionPlanList.States = BLL.Const.ActionPlanList_Reviewing;
+                    }
+                    else
+                    {
+                        actionPlanList.States = BLL.Const.ActionPlanList_Complete;
+                    }
+                }
+                BLL.ActionPlanListService.AddActionPlanList(actionPlanList);
+                if (type == BLL.Const.BtnSubmit)
+                {
+                    Model.ActionPlan_ActionPlanListApprove approve1 = new Model.ActionPlan_ActionPlanListApprove();
+                    approve1.ActionPlanListId = actionPlanList.ActionPlanListId;
+                    approve1.ApproveDate = DateTime.Now;
+                    approve1.ApproveMan = this.CurrUser.PersonId;
+                    approve1.ApproveType = Const.ActionPlanList_Compile;
+                    approve1.Edition = Convert.ToInt32(txtEdition.Text);
+                    ActionPlanListApproveService.AddActionPlanListApprove(approve1);
+                    if (rblIsReview.SelectedValue == "True")  //施工管理部评审
+                    {
+                        foreach (var item in this.drpPerson.SelectedValueArray)
+                        {
+                            if (item != Const._Null)
+                            {
+                                Model.ActionPlan_ActionPlanListApprove approve2 = new Model.ActionPlan_ActionPlanListApprove();
+                                approve2.ActionPlanListId = actionPlanList.ActionPlanListId;
+                                approve2.ApproveMan = item;
+                                approve2.ApproveType = Const.ActionPlanList_Reviewing;
+                                approve2.Edition = Convert.ToInt32(edtion);
+                                BLL.ActionPlanListApproveService.AddActionPlanListApprove(approve2);
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    Model.ActionPlan_ActionPlanListApprove approve1 = new Model.ActionPlan_ActionPlanListApprove();
+                    approve1.ActionPlanListId = actionPlanList.ActionPlanListId;
+                    approve1.ApproveMan = this.CurrUser.PersonId;
+                    approve1.ApproveType = Const.ActionPlanList_Compile;
+                    approve1.Edition = Convert.ToInt32(txtEdition.Text);
+                    ActionPlanListApproveService.AddActionPlanListApprove(approve1);
+                }
+                BLL.LogService.AddSys_Log(this.CurrUser, this.txtActionPlanListCode.Text, this.ActionPlanListId, BLL.Const.OfficeActionPlanListMenuId, Const.BtnAdd);
+            }
+
+        }
+        #endregion
+
+        #region 附件上传
+        /// <summary>
+        /// 上传附件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAttachUrl_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(HFActionPlanListId.Text))   //新增记录
+            {
+                HFActionPlanListId.Text = SQLHelper.GetNewID(typeof(Model.ActionPlan_ActionPlanList));
+            }
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ActionPlanListAttachUrl&menuId={1}&type={2}", HFActionPlanListId.Text, BLL.Const.OfficeActionPlanListMenuId, ContactImg)));
+        }
+
+        protected void btnapprove_Click(object sender, EventArgs e)
+        {
+            //HFConstructSolutionId.Text
+            var approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(HFActionPlanListId.Text, CurrUser.PersonId);
+            if (approve != null)
+            {
+                var approveId = approve.ActionPlanListApproveId;
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(
+                String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/ActionPlanListAttachUrl&menuId={2}",
+                0, approveId, Const.OfficeActionPlanListMenuId)));
+            }
+        }
+        #endregion
+
+        protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
+        {
+            this.divC.InnerHtml = string.Empty;
+            var getAtt = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == HFActionPlanListId.Text);
+            if (getAtt != null)
+            {
+                this.divC.InnerHtml = UploadAttachmentService.ShowAttachment("../../", getAtt.AttachUrl);
+            }
+            else
+            {
+                this.trAtt.Hidden = true;
+            }
+        }
+
+        public string man(Object man)
+        {
+            string appman = string.Empty;
+            if (Person_PersonsService.GetPerson_PersonsById(man.ToString()) != null)
+            {
+                appman = Person_PersonsService.GetPerson_PersonsById(man.ToString()).PersonName;
+            }
+            return appman;
+        }
+
+        protected void gvApprove_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            object[] keys = gvApprove.DataKeys[e.RowIndex];
+            string fileId = string.Empty;
+            if (keys == null)
+            {
+                return;
+            }
+            else
+            {
+                fileId = keys[0].ToString();
+            }
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(
+                 String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/ActionPlanListAttachUrl&menuId={2}",
+                 -1, fileId, Const.OfficeActionPlanListMenuId)));
+        }
+
+        protected void rblIsReview_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (this.rblIsReview.SelectedValue == "True")
+            {
+                this.drpReviewMan.Hidden = false;
+                this.drpPerson.Hidden = false;
+            }
+            else
+            {
+                this.drpReviewMan.Hidden = true;
+                this.drpPerson.Hidden = true;
+                this.drpReviewMan.SelectedValue = this.CurrUser.PersonId;
+            }
+        }
+
+        protected void rblIsCompanyReview_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (this.rblIsCompanyReview.SelectedValue == "True")
+            {
+
+            }
+            else
+            {
+
+            }
+        }
+    }
+}

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

@@ -0,0 +1,348 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.ZHGL.Plan {
+    
+    
+    public partial class ActionPlanListEdit {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+        
+        /// <summary>
+        /// txtActionPlanListCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtActionPlanListCode;
+        
+        /// <summary>
+        /// txtActionPlanListName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtActionPlanListName;
+        
+        /// <summary>
+        /// txtVersionNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtVersionNo;
+        
+        /// <summary>
+        /// drpProjectType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProjectType;
+        
+        /// <summary>
+        /// drpCompileMan 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpCompileMan;
+        
+        /// <summary>
+        /// txtCompileDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtCompileDate;
+        
+        /// <summary>
+        /// rblIsReview 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblIsReview;
+        
+        /// <summary>
+        /// drpReviewMan 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpReviewMan;
+        
+        /// <summary>
+        /// drpPerson 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpPerson;
+        
+        /// <summary>
+        /// rblIsCompanyReview 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblIsCompanyReview;
+        
+        /// <summary>
+        /// trAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FormRow trAtt;
+        
+        /// <summary>
+        /// ContentPanel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel2;
+        
+        /// <summary>
+        /// divC 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divC;
+        
+        /// <summary>
+        /// agree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FormRow agree;
+        
+        /// <summary>
+        /// rblIsAgree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblIsAgree;
+        
+        /// <summary>
+        /// options 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FormRow options;
+        
+        /// <summary>
+        /// txtOptions 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtOptions;
+        
+        /// <summary>
+        /// optio 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FormRow optio;
+        
+        /// <summary>
+        /// btnapprove 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnapprove;
+        
+        /// <summary>
+        /// plApprove2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FormRow plApprove2;
+        
+        /// <summary>
+        /// gvApprove 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvApprove;
+        
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+        
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label3;
+        
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+        
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// lbTemp 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lbTemp;
+        
+        /// <summary>
+        /// btnAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttachUrl;
+        
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+        
+        /// <summary>
+        /// txtEdition 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField txtEdition;
+        
+        /// <summary>
+        /// HFActionPlanListId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField HFActionPlanListId;
+        
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+        
+        /// <summary>
+        /// btnSubmit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSubmit;
+        
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+        
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+    }
+}

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

@@ -0,0 +1,143 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ActionPlanListView.aspx.cs" Inherits="FineUIPro.Web.ZHGL.Plan.ActionPlanListView" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>实施计划查看页面</title>
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" Title="安全实施计划"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtActionPlanListCode" runat="server" Label="编号" Readonly="true"
+                            LabelAlign="Right" LabelWidth="140px">
+                        </f:TextBox>
+                        <f:TextBox ID="txtActionPlanListName" runat="server" Label="名称" Readonly="true" LabelAlign="Right" LabelWidth="120px">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtVersionNo" runat="server" Label="版 本 号" LabelAlign="Right" LabelWidth="140px" Readonly="true">
+                        </f:TextBox>
+                        <f:DropDownList ID="drpProjectType" runat="server" Label="项目类型" LabelAlign="Right" Readonly="true"
+                            LabelWidth="120px">
+                            <f:ListItem Value="1" Text="系统内项目" Selected="true" />
+                            <f:ListItem Value="2" Text="系统外项目" />
+                            <f:ListItem Value="3" Text="海外项目" />
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="drpCompileMan" runat="server" Label="编制人" LabelAlign="Right"
+                            LabelWidth="140px" Readonly="true">
+                        </f:TextBox>
+                        <f:TextBox ID="txtCompileDate" runat="server" Label="编制日期" LabelAlign="Right"
+                            LabelWidth="120px" Readonly="true">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:RadioButtonList runat="server" ID="rblIsReview" Label="备案/部门评审" LabelWidth="140px" Readonly="true">
+                            <f:RadioItem Text="备案" Value="False" Selected="true" />
+                            <f:RadioItem Text="部门评审" Value="True" />
+                        </f:RadioButtonList>
+                        <f:DropDownList ID="drpReviewMan" runat="server" Label="评审负责人" LabelAlign="Right" Hidden="true" EnableEdit="true" Readonly="true"
+                            LabelWidth="120px">
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpPerson" runat="server" Readonly="true" LabelWidth="140px" Label="评审人员" LabelAlign="Right" EnableCheckBoxSelect="true" EnableMultiSelect="true" EnableEdit="true">
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:RadioButtonList runat="server" ID="rblIsCompanyReview" Label="备案/公司部门评审" Hidden="true" LabelWidth="140px" Readonly="true" >
+                            <f:RadioItem Text="备案" Value="False" Selected="true" />
+                            <f:RadioItem Text="公司部门评审" Value="True" />
+                        </f:RadioButtonList>
+                        <f:Label runat="server" Hidden="true"></f:Label>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow runat="server" ID="trAtt">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel2" runat="server" ShowHeader="false" EnableCollapse="true"
+                            BodyPadding="0px" Height="100px">
+                            <div runat="server" id="divC"></div>
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ID="plApprove2">
+                    <Items>
+
+                        <f:ContentPanel Title="审批列表" ShowBorder="true"
+                            BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
+                            runat="server">
+                            <f:Grid ID="gvApprove" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false"
+                                DataKeyNames="ActionPlanListApproveId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand" ForceFit="true">
+                                <Columns>
+                                    <f:RowNumberField Width="40px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" />
+                                    <f:TemplateField ColumnID="ApproveType" Width="150px" HeaderText="办理类型" HeaderTextAlign="Center" TextAlign="Center"
+                                        EnableLock="true" Locked="False">
+                                        <ItemTemplate>
+                                            <asp:Label ID="Label1" runat="server" Text='<%# BLL.ActionPlanListService.ConvertState(Eval("ApproveType")) %>'></asp:Label>
+                                        </ItemTemplate>
+                                    </f:TemplateField>
+                                    <f:TemplateField ColumnID="ApproveMan" Width="150px" HeaderText="办理人员" HeaderTextAlign="Center" TextAlign="Center"
+                                        EnableLock="true" Locked="False">
+                                        <ItemTemplate>
+                                            <asp:Label ID="Label3" runat="server" Text='<%# man(Eval("ApproveMan")) %>'></asp:Label>
+                                        </ItemTemplate>
+                                    </f:TemplateField>
+                                    <f:TemplateField ColumnID="IsAgree" Width="100px" HeaderText="是否同意" HeaderTextAlign="Center" TextAlign="Center"
+                                        EnableLock="true" Locked="False">
+                                        <ItemTemplate>
+                                            <asp:Label ID="Label2" runat="server" Text='<%# BLL.ActionPlanListService.IsAgree(Eval("ApproveType"),Eval("IsAgree")) %>'></asp:Label>
+                                        </ItemTemplate>
+                                    </f:TemplateField>
+                                    <f:BoundField Width="100px" DataField="ApproveDate" HeaderTextAlign="Center" TextAlign="Center" DataFormatString="{0:yyyy-MM-dd}" HeaderText="办理时间" />
+                                    <f:BoundField Width="180px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center" HeaderText="办理意见" />
+                                    <f:LinkButtonField HeaderText="附件" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" />
+                                </Columns>
+                            </f:Grid>
+                        </f:ContentPanel>
+
+                    </Items>
+
+                </f:FormRow>
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:Label runat="server" ID="lbTemp">
+                        </f:Label>
+                        <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
+                            OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
+                        </f:Button>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                        </f:ToolbarFill>
+                        <f:Button ID="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+        <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+            Height="500px">
+        </f:Window>
+    </form>
+</body>
+</html>

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

@@ -0,0 +1,172 @@
+using System;
+using System.Collections.Generic;
+using System.Web;
+using BLL;
+using System.Linq;
+
+namespace FineUIPro.Web.ZHGL.Plan
+{
+    public partial class ActionPlanListView : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string ActionPlanListId
+        {
+            get
+            {
+                return (string)ViewState["ActionPlanListId"];
+            }
+            set
+            {
+                ViewState["ActionPlanListId"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                BLL.Person_PersonsService.InitUserUnitIdDepartIdDropDownList(this.drpReviewMan, BLL.Const.UnitId_SEDIN, BLL.Const.Depart_constructionId, true);
+                BLL.Person_PersonsService.InitUserUnitIdDepartIdDropDownList(this.drpPerson, BLL.Const.UnitId_SEDIN, BLL.Const.Depart_constructionId, true);
+                this.ActionPlanListId = Request.Params["ActionPlanListId"];
+                if (!string.IsNullOrEmpty(this.ActionPlanListId))
+                {
+                    Model.ActionPlan_ActionPlanList actionPlanList = BLL.ActionPlanListService.GetActionPlanListById(this.ActionPlanListId);
+                    if (actionPlanList != null)
+                    {
+                        ///读取编号
+                        this.txtActionPlanListCode.Text = actionPlanList.ActionPlanListCode;
+                        this.txtActionPlanListName.Text = actionPlanList.ActionPlanListName;
+                        this.txtVersionNo.Text = actionPlanList.VersionNo;
+                        if (!string.IsNullOrEmpty(actionPlanList.ProjectType))
+                        {
+                            this.drpProjectType.SelectedValue = actionPlanList.ProjectType;
+                        }
+                        else
+                        {
+                            this.drpProjectType.Hidden = true;
+                        }
+                        this.drpCompileMan.Text = BLL.Person_PersonsService.GetPersonsNameById(actionPlanList.CompileMan);
+                        this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", actionPlanList.CompileDate);
+                        if (actionPlanList.IsReview == true)
+                        {
+                            this.rblIsReview.SelectedValue = "True";
+                            this.drpReviewMan.Hidden = false;
+                            this.drpReviewMan.SelectedValue = actionPlanList.ReviewMan;
+                        }
+                        else
+                        {
+                            this.rblIsReview.SelectedValue = "False";
+                            this.drpPerson.Hidden = true;
+                        }
+                        List<string> list2 = BLL.ActionPlanListApproveService.GetReviewingPersonIds(this.ActionPlanListId);
+                        if (list2.Count > 0)
+                        {
+                            this.drpPerson.SelectedValueArray = list2.ToArray();
+                        }
+                        if (actionPlanList.IsCompanyReview != null)
+                        {
+                            rblIsCompanyReview.Hidden = false;
+                            if (actionPlanList.IsCompanyReview == true)
+                            {
+                                rblIsCompanyReview.SelectedValue = "True";
+                            }
+                            else
+                            {
+                                rblIsCompanyReview.SelectedValue = "False";
+                            }
+                        }
+                        var list = ActionPlanListApproveService.getListData(ActionPlanListId);
+                        gvApprove.DataSource = list;
+                        gvApprove.DataBind();
+                        WindowAtt_Close(null, null);
+                    }
+                }
+            }
+        }
+
+        public string man(Object man)
+        {
+            string appman = string.Empty;
+            if (Person_PersonsService.GetPerson_PersonsById(man.ToString()) != null)
+            {
+                appman = Person_PersonsService.GetPerson_PersonsById(man.ToString()).PersonName;
+            }
+            return appman;
+        }
+
+        /// <summary>
+        /// 设置树的节点选择
+        /// </summary>
+        /// <param name="nodes"></param>
+        /// <param name="role"></param>
+        private void SetCheck(Tree tree, List<string> userIds)
+        {
+            foreach (TreeNode tn in tree.Nodes[0].Nodes)
+            {
+                if (userIds.Contains(tn.NodeID))
+                {
+                    tn.Checked = true;
+                }
+            }
+        }
+        #endregion
+
+
+        #region 附件上传
+        /// <summary>
+        /// 上传附件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAttachUrl_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.ActionPlanListId))
+            {
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ActionPlanListAttachUrl&menuId={1}&type=-1", this.ActionPlanListId, BLL.Const.ProjectActionPlanListMenuId)));
+            }
+        }
+        #endregion
+
+        protected void gvApprove_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            object[] keys = gvApprove.DataKeys[e.RowIndex];
+            string fileId = string.Empty;
+            if (keys == null)
+            {
+                return;
+            }
+            else
+            {
+                fileId = keys[0].ToString();
+            }
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(
+                 String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/ActionPlanListAttachUrl&menuId={2}",
+                 -1, fileId, Const.ProjectActionPlanListMenuId)));
+        }
+
+        protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
+        {
+            this.divC.InnerHtml = string.Empty;
+            var getAtt = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.ActionPlanListId);
+            if (getAtt != null)
+            {
+                this.divC.InnerHtml = UploadAttachmentService.ShowAttachment("../../", getAtt.AttachUrl);
+            }
+            else
+            {
+                this.trAtt.Hidden = true;
+            }
+        }
+    }
+}

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

@@ -0,0 +1,258 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.ZHGL.Plan {
+    
+    
+    public partial class ActionPlanListView {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+        
+        /// <summary>
+        /// txtActionPlanListCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtActionPlanListCode;
+        
+        /// <summary>
+        /// txtActionPlanListName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtActionPlanListName;
+        
+        /// <summary>
+        /// txtVersionNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtVersionNo;
+        
+        /// <summary>
+        /// drpProjectType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProjectType;
+        
+        /// <summary>
+        /// drpCompileMan 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox drpCompileMan;
+        
+        /// <summary>
+        /// txtCompileDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtCompileDate;
+        
+        /// <summary>
+        /// rblIsReview 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblIsReview;
+        
+        /// <summary>
+        /// drpReviewMan 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpReviewMan;
+        
+        /// <summary>
+        /// drpPerson 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpPerson;
+        
+        /// <summary>
+        /// rblIsCompanyReview 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblIsCompanyReview;
+        
+        /// <summary>
+        /// trAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FormRow trAtt;
+        
+        /// <summary>
+        /// ContentPanel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel2;
+        
+        /// <summary>
+        /// divC 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divC;
+        
+        /// <summary>
+        /// plApprove2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FormRow plApprove2;
+        
+        /// <summary>
+        /// gvApprove 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvApprove;
+        
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+        
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label3;
+        
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+        
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// lbTemp 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lbTemp;
+        
+        /// <summary>
+        /// btnAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttachUrl;
+        
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+        
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+        
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+    }
+}

SGGL/Model/Model.cs

@@ -50,6 +50,9 @@ namespace Model
     partial void InsertActionPlan_ActionPlanList(ActionPlan_ActionPlanList instance);
     partial void UpdateActionPlan_ActionPlanList(ActionPlan_ActionPlanList instance);
     partial void DeleteActionPlan_ActionPlanList(ActionPlan_ActionPlanList instance);
+    partial void InsertActionPlan_ActionPlanListApprove(ActionPlan_ActionPlanListApprove instance);
+    partial void UpdateActionPlan_ActionPlanListApprove(ActionPlan_ActionPlanListApprove instance);
+    partial void DeleteActionPlan_ActionPlanListApprove(ActionPlan_ActionPlanListApprove instance);
     partial void InsertActionPlan_CompanyManagerRule(ActionPlan_CompanyManagerRule instance);
     partial void UpdateActionPlan_CompanyManagerRule(ActionPlan_CompanyManagerRule instance);
     partial void DeleteActionPlan_CompanyManagerRule(ActionPlan_CompanyManagerRule instance);
@@ -1725,6 +1728,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<ActionPlan_ActionPlanListApprove> ActionPlan_ActionPlanListApprove
+		{
+			get
+			{
+				return this.GetTable<ActionPlan_ActionPlanListApprove>();
+			}
+		}
+		
 		public System.Data.Linq.Table<ActionPlan_CompanyManagerRule> ActionPlan_CompanyManagerRule
 		{
 			get
@@ -10549,10 +10560,20 @@ namespace Model
 		
 		private string _States;
 		
+		private System.Nullable<int> _Edition;
+		
+		private System.Nullable<bool> _IsReview;
+		
+		private string _ReviewMan;
+		
+		private System.Nullable<bool> _IsCompanyReview;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Person_Persons> _Person_Persons;
 		
+		private EntitySet<ActionPlan_ActionPlanListApprove> _ActionPlan_ActionPlanListApprove;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -10577,12 +10598,21 @@ namespace Model
     partial void OnCompileDateChanged();
     partial void OnStatesChanging(string value);
     partial void OnStatesChanged();
+    partial void OnEditionChanging(System.Nullable<int> value);
+    partial void OnEditionChanged();
+    partial void OnIsReviewChanging(System.Nullable<bool> value);
+    partial void OnIsReviewChanged();
+    partial void OnReviewManChanging(string value);
+    partial void OnReviewManChanged();
+    partial void OnIsCompanyReviewChanging(System.Nullable<bool> value);
+    partial void OnIsCompanyReviewChanged();
     #endregion
 		
 		public ActionPlan_ActionPlanList()
 		{
 			this._Base_Project = default(EntityRef<Base_Project>);
 			this._Person_Persons = default(EntityRef<Person_Persons>);
+			this._ActionPlan_ActionPlanListApprove = new EntitySet<ActionPlan_ActionPlanListApprove>(new Action<ActionPlan_ActionPlanListApprove>(this.attach_ActionPlan_ActionPlanListApprove), new Action<ActionPlan_ActionPlanListApprove>(this.detach_ActionPlan_ActionPlanListApprove));
 			OnCreated();
 		}
 		
@@ -10794,6 +10824,86 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Edition", DbType="Int")]
+		public System.Nullable<int> Edition
+		{
+			get
+			{
+				return this._Edition;
+			}
+			set
+			{
+				if ((this._Edition != value))
+				{
+					this.OnEditionChanging(value);
+					this.SendPropertyChanging();
+					this._Edition = value;
+					this.SendPropertyChanged("Edition");
+					this.OnEditionChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsReview", DbType="Bit")]
+		public System.Nullable<bool> IsReview
+		{
+			get
+			{
+				return this._IsReview;
+			}
+			set
+			{
+				if ((this._IsReview != value))
+				{
+					this.OnIsReviewChanging(value);
+					this.SendPropertyChanging();
+					this._IsReview = value;
+					this.SendPropertyChanged("IsReview");
+					this.OnIsReviewChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewMan", DbType="NVarChar(50)")]
+		public string ReviewMan
+		{
+			get
+			{
+				return this._ReviewMan;
+			}
+			set
+			{
+				if ((this._ReviewMan != value))
+				{
+					this.OnReviewManChanging(value);
+					this.SendPropertyChanging();
+					this._ReviewMan = value;
+					this.SendPropertyChanged("ReviewMan");
+					this.OnReviewManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCompanyReview", DbType="Bit")]
+		public System.Nullable<bool> IsCompanyReview
+		{
+			get
+			{
+				return this._IsCompanyReview;
+			}
+			set
+			{
+				if ((this._IsCompanyReview != value))
+				{
+					this.OnIsCompanyReviewChanging(value);
+					this.SendPropertyChanging();
+					this._IsCompanyReview = value;
+					this.SendPropertyChanged("IsCompanyReview");
+					this.OnIsCompanyReviewChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ActionPlanList_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -10862,6 +10972,391 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ActionPlanListApprove_ActionPlan_ActionPlanList", Storage="_ActionPlan_ActionPlanListApprove", ThisKey="ActionPlanListId", OtherKey="ActionPlanListId", DeleteRule="NO ACTION")]
+		public EntitySet<ActionPlan_ActionPlanListApprove> ActionPlan_ActionPlanListApprove
+		{
+			get
+			{
+				return this._ActionPlan_ActionPlanListApprove;
+			}
+			set
+			{
+				this._ActionPlan_ActionPlanListApprove.Assign(value);
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+		
+		private void attach_ActionPlan_ActionPlanListApprove(ActionPlan_ActionPlanListApprove entity)
+		{
+			this.SendPropertyChanging();
+			entity.ActionPlan_ActionPlanList = this;
+		}
+		
+		private void detach_ActionPlan_ActionPlanListApprove(ActionPlan_ActionPlanListApprove entity)
+		{
+			this.SendPropertyChanging();
+			entity.ActionPlan_ActionPlanList = null;
+		}
+	}
+	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ActionPlan_ActionPlanListApprove")]
+	public partial class ActionPlan_ActionPlanListApprove : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _ActionPlanListApproveId;
+		
+		private string _ActionPlanListId;
+		
+		private string _ApproveMan;
+		
+		private System.Nullable<System.DateTime> _ApproveDate;
+		
+		private System.Nullable<bool> _IsAgree;
+		
+		private string _ApproveIdea;
+		
+		private string _ApproveType;
+		
+		private string _AttachUrl;
+		
+		private string _SignType;
+		
+		private System.Nullable<int> _Edition;
+		
+		private EntityRef<ActionPlan_ActionPlanList> _ActionPlan_ActionPlanList;
+		
+		private EntityRef<Person_Persons> _Person_Persons;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnActionPlanListApproveIdChanging(string value);
+    partial void OnActionPlanListApproveIdChanged();
+    partial void OnActionPlanListIdChanging(string value);
+    partial void OnActionPlanListIdChanged();
+    partial void OnApproveManChanging(string value);
+    partial void OnApproveManChanged();
+    partial void OnApproveDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnApproveDateChanged();
+    partial void OnIsAgreeChanging(System.Nullable<bool> value);
+    partial void OnIsAgreeChanged();
+    partial void OnApproveIdeaChanging(string value);
+    partial void OnApproveIdeaChanged();
+    partial void OnApproveTypeChanging(string value);
+    partial void OnApproveTypeChanged();
+    partial void OnAttachUrlChanging(string value);
+    partial void OnAttachUrlChanged();
+    partial void OnSignTypeChanging(string value);
+    partial void OnSignTypeChanged();
+    partial void OnEditionChanging(System.Nullable<int> value);
+    partial void OnEditionChanged();
+    #endregion
+		
+		public ActionPlan_ActionPlanListApprove()
+		{
+			this._ActionPlan_ActionPlanList = default(EntityRef<ActionPlan_ActionPlanList>);
+			this._Person_Persons = default(EntityRef<Person_Persons>);
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActionPlanListApproveId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string ActionPlanListApproveId
+		{
+			get
+			{
+				return this._ActionPlanListApproveId;
+			}
+			set
+			{
+				if ((this._ActionPlanListApproveId != value))
+				{
+					this.OnActionPlanListApproveIdChanging(value);
+					this.SendPropertyChanging();
+					this._ActionPlanListApproveId = value;
+					this.SendPropertyChanged("ActionPlanListApproveId");
+					this.OnActionPlanListApproveIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActionPlanListId", DbType="NVarChar(50)")]
+		public string ActionPlanListId
+		{
+			get
+			{
+				return this._ActionPlanListId;
+			}
+			set
+			{
+				if ((this._ActionPlanListId != value))
+				{
+					if (this._ActionPlan_ActionPlanList.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnActionPlanListIdChanging(value);
+					this.SendPropertyChanging();
+					this._ActionPlanListId = value;
+					this.SendPropertyChanged("ActionPlanListId");
+					this.OnActionPlanListIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(50)")]
+		public string ApproveMan
+		{
+			get
+			{
+				return this._ApproveMan;
+			}
+			set
+			{
+				if ((this._ApproveMan != value))
+				{
+					if (this._Person_Persons.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnApproveManChanging(value);
+					this.SendPropertyChanging();
+					this._ApproveMan = value;
+					this.SendPropertyChanged("ApproveMan");
+					this.OnApproveManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ApproveDate
+		{
+			get
+			{
+				return this._ApproveDate;
+			}
+			set
+			{
+				if ((this._ApproveDate != value))
+				{
+					this.OnApproveDateChanging(value);
+					this.SendPropertyChanging();
+					this._ApproveDate = value;
+					this.SendPropertyChanged("ApproveDate");
+					this.OnApproveDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsAgree", DbType="Bit")]
+		public System.Nullable<bool> IsAgree
+		{
+			get
+			{
+				return this._IsAgree;
+			}
+			set
+			{
+				if ((this._IsAgree != value))
+				{
+					this.OnIsAgreeChanging(value);
+					this.SendPropertyChanging();
+					this._IsAgree = value;
+					this.SendPropertyChanged("IsAgree");
+					this.OnIsAgreeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")]
+		public string ApproveIdea
+		{
+			get
+			{
+				return this._ApproveIdea;
+			}
+			set
+			{
+				if ((this._ApproveIdea != value))
+				{
+					this.OnApproveIdeaChanging(value);
+					this.SendPropertyChanging();
+					this._ApproveIdea = value;
+					this.SendPropertyChanged("ApproveIdea");
+					this.OnApproveIdeaChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Char(1)")]
+		public string ApproveType
+		{
+			get
+			{
+				return this._ApproveType;
+			}
+			set
+			{
+				if ((this._ApproveType != value))
+				{
+					this.OnApproveTypeChanging(value);
+					this.SendPropertyChanging();
+					this._ApproveType = value;
+					this.SendPropertyChanged("ApproveType");
+					this.OnApproveTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttachUrl", DbType="NVarChar(200)")]
+		public string AttachUrl
+		{
+			get
+			{
+				return this._AttachUrl;
+			}
+			set
+			{
+				if ((this._AttachUrl != value))
+				{
+					this.OnAttachUrlChanging(value);
+					this.SendPropertyChanging();
+					this._AttachUrl = value;
+					this.SendPropertyChanged("AttachUrl");
+					this.OnAttachUrlChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SignType", DbType="NVarChar(20)")]
+		public string SignType
+		{
+			get
+			{
+				return this._SignType;
+			}
+			set
+			{
+				if ((this._SignType != value))
+				{
+					this.OnSignTypeChanging(value);
+					this.SendPropertyChanging();
+					this._SignType = value;
+					this.SendPropertyChanged("SignType");
+					this.OnSignTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Edition", DbType="Int")]
+		public System.Nullable<int> Edition
+		{
+			get
+			{
+				return this._Edition;
+			}
+			set
+			{
+				if ((this._Edition != value))
+				{
+					this.OnEditionChanging(value);
+					this.SendPropertyChanging();
+					this._Edition = value;
+					this.SendPropertyChanged("Edition");
+					this.OnEditionChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ActionPlanListApprove_ActionPlan_ActionPlanList", Storage="_ActionPlan_ActionPlanList", ThisKey="ActionPlanListId", OtherKey="ActionPlanListId", IsForeignKey=true)]
+		public ActionPlan_ActionPlanList ActionPlan_ActionPlanList
+		{
+			get
+			{
+				return this._ActionPlan_ActionPlanList.Entity;
+			}
+			set
+			{
+				ActionPlan_ActionPlanList previousValue = this._ActionPlan_ActionPlanList.Entity;
+				if (((previousValue != value) 
+							|| (this._ActionPlan_ActionPlanList.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._ActionPlan_ActionPlanList.Entity = null;
+						previousValue.ActionPlan_ActionPlanListApprove.Remove(this);
+					}
+					this._ActionPlan_ActionPlanList.Entity = value;
+					if ((value != null))
+					{
+						value.ActionPlan_ActionPlanListApprove.Add(this);
+						this._ActionPlanListId = value.ActionPlanListId;
+					}
+					else
+					{
+						this._ActionPlanListId = default(string);
+					}
+					this.SendPropertyChanged("ActionPlan_ActionPlanList");
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ActionPlanListApprove_Person_Persons", Storage="_Person_Persons", ThisKey="ApproveMan", OtherKey="PersonId", IsForeignKey=true)]
+		public Person_Persons Person_Persons
+		{
+			get
+			{
+				return this._Person_Persons.Entity;
+			}
+			set
+			{
+				Person_Persons previousValue = this._Person_Persons.Entity;
+				if (((previousValue != value) 
+							|| (this._Person_Persons.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Person_Persons.Entity = null;
+						previousValue.ActionPlan_ActionPlanListApprove.Remove(this);
+					}
+					this._Person_Persons.Entity = value;
+					if ((value != null))
+					{
+						value.ActionPlan_ActionPlanListApprove.Add(this);
+						this._ApproveMan = value.PersonId;
+					}
+					else
+					{
+						this._ApproveMan = default(string);
+					}
+					this.SendPropertyChanged("Person_Persons");
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -93804,7 +94299,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(2000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(1000)")]
 		public string CanWelderCode
 		{
 			get
@@ -93824,7 +94319,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderId", DbType="NVarChar(4000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderId", DbType="NVarChar(3000)")]
 		public string CanWelderId
 		{
 			get
@@ -149256,6 +149751,8 @@ namespace Model
 		
 		private EntitySet<ActionPlan_ActionPlanList> _ActionPlan_ActionPlanList;
 		
+		private EntitySet<ActionPlan_ActionPlanListApprove> _ActionPlan_ActionPlanListApprove;
+		
 		private EntitySet<ActionPlan_CompanyManagerRule> _ActionPlan_CompanyManagerRule;
 		
 		private EntitySet<ActionPlan_ManagerRule> _ActionPlan_ManagerRule;
@@ -149848,6 +150345,7 @@ namespace Model
 			this._Accident_AccidentReportOtherItem = new EntitySet<Accident_AccidentReportOtherItem>(new Action<Accident_AccidentReportOtherItem>(this.attach_Accident_AccidentReportOtherItem), new Action<Accident_AccidentReportOtherItem>(this.detach_Accident_AccidentReportOtherItem));
 			this._Accident_NoFourLetoff = new EntitySet<Accident_NoFourLetoff>(new Action<Accident_NoFourLetoff>(this.attach_Accident_NoFourLetoff), new Action<Accident_NoFourLetoff>(this.detach_Accident_NoFourLetoff));
 			this._ActionPlan_ActionPlanList = new EntitySet<ActionPlan_ActionPlanList>(new Action<ActionPlan_ActionPlanList>(this.attach_ActionPlan_ActionPlanList), new Action<ActionPlan_ActionPlanList>(this.detach_ActionPlan_ActionPlanList));
+			this._ActionPlan_ActionPlanListApprove = new EntitySet<ActionPlan_ActionPlanListApprove>(new Action<ActionPlan_ActionPlanListApprove>(this.attach_ActionPlan_ActionPlanListApprove), new Action<ActionPlan_ActionPlanListApprove>(this.detach_ActionPlan_ActionPlanListApprove));
 			this._ActionPlan_CompanyManagerRule = new EntitySet<ActionPlan_CompanyManagerRule>(new Action<ActionPlan_CompanyManagerRule>(this.attach_ActionPlan_CompanyManagerRule), new Action<ActionPlan_CompanyManagerRule>(this.detach_ActionPlan_CompanyManagerRule));
 			this._ActionPlan_ManagerRule = new EntitySet<ActionPlan_ManagerRule>(new Action<ActionPlan_ManagerRule>(this.attach_ActionPlan_ManagerRule), new Action<ActionPlan_ManagerRule>(this.detach_ActionPlan_ManagerRule));
 			this._ActionPlan_ProjectManagerRule = new EntitySet<ActionPlan_ProjectManagerRule>(new Action<ActionPlan_ProjectManagerRule>(this.attach_ActionPlan_ProjectManagerRule), new Action<ActionPlan_ProjectManagerRule>(this.detach_ActionPlan_ProjectManagerRule));
@@ -151437,6 +151935,19 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ActionPlanListApprove_Person_Persons", Storage="_ActionPlan_ActionPlanListApprove", ThisKey="PersonId", OtherKey="ApproveMan", DeleteRule="NO ACTION")]
+		public EntitySet<ActionPlan_ActionPlanListApprove> ActionPlan_ActionPlanListApprove
+		{
+			get
+			{
+				return this._ActionPlan_ActionPlanListApprove;
+			}
+			set
+			{
+				this._ActionPlan_ActionPlanListApprove.Assign(value);
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_CompanyManagerRule_Person_Persons_CompileMan", Storage="_ActionPlan_CompanyManagerRule", ThisKey="PersonId", OtherKey="CompileMan", DeleteRule="NO ACTION")]
 		public EntitySet<ActionPlan_CompanyManagerRule> ActionPlan_CompanyManagerRule
 		{
@@ -154575,6 +155086,18 @@ namespace Model
 			entity.Person_Persons = null;
 		}
 		
+		private void attach_ActionPlan_ActionPlanListApprove(ActionPlan_ActionPlanListApprove entity)
+		{
+			this.SendPropertyChanging();
+			entity.Person_Persons = this;
+		}
+		
+		private void detach_ActionPlan_ActionPlanListApprove(ActionPlan_ActionPlanListApprove entity)
+		{
+			this.SendPropertyChanging();
+			entity.Person_Persons = null;
+		}
+		
 		private void attach_ActionPlan_CompanyManagerRule(ActionPlan_CompanyManagerRule entity)
 		{
 			this.SendPropertyChanging();
@@ -202920,7 +203443,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RewardAndPunishDecision", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RewardAndPunishDecision", DbType="NVarChar(100)")]
 		public string RewardAndPunishDecision
 		{
 			get
@@ -257822,8 +258345,6 @@ namespace Model
 		
 		private string _DNDia;
 		
-		private System.Nullable<decimal> _Size;
-		
 		private System.Nullable<decimal> _Thickness;
 		
 		private string _Remark;
@@ -257972,22 +258493,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Size", DbType="Decimal(8,3)")]
-		public System.Nullable<decimal> Size
-		{
-			get
-			{
-				return this._Size;
-			}
-			set
-			{
-				if ((this._Size != value))
-				{
-					this._Size = value;
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Thickness", DbType="Decimal(8,3)")]
 		public System.Nullable<decimal> Thickness
 		{
@@ -259340,7 +259845,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(2000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(1000)")]
 		public string CanWelderCode
 		{
 			get
@@ -259356,7 +259861,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderId", DbType="NVarChar(4000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderId", DbType="NVarChar(3000)")]
 		public string CanWelderId
 		{
 			get