diff --git a/DataBase/版本日志/SGGLDB_V2023-06-05_gaofei.sql b/DataBase/版本日志/SGGLDB_V2023-06-05_gaofei.sql index 22373ca7..1e4d433a 100644 --- a/DataBase/版本日志/SGGLDB_V2023-06-05_gaofei.sql +++ b/DataBase/版本日志/SGGLDB_V2023-06-05_gaofei.sql @@ -305,3 +305,89 @@ EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N' GO + +CREATE TABLE [dbo].[ActionPlan_MainContractOpinion]( + [MainContractOpinionId] [nvarchar](50) NOT NULL, + [MainContractId] [nvarchar](50) NULL, + [OpinionMan] [nvarchar](50) NULL, + [OpinionDate] [datetime] NULL, + [OriginalNum] [nvarchar](100) NULL, + [OriginalContent] [nvarchar](1000) NULL, + [Opinion] [nvarchar](1000) NULL, + CONSTRAINT [PK_ActionPlan_MainContractOpinion] PRIMARY KEY CLUSTERED +( + [MainContractOpinionId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +ALTER TABLE [dbo].[ActionPlan_MainContractOpinion] WITH CHECK ADD CONSTRAINT [FK_ActionPlan_MainContractOpinion_ActionPlan_MainContract] FOREIGN KEY([MainContractId]) +REFERENCES [dbo].[ActionPlan_MainContract] ([MainContractId]) +GO + +ALTER TABLE [dbo].[ActionPlan_MainContractOpinion] CHECK CONSTRAINT [FK_ActionPlan_MainContractOpinion_ActionPlan_MainContract] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ActionPlan_MainContractOpinion', @level2type=N'COLUMN',@level2name=N'MainContractOpinionId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ActionPlan_MainContractOpinion', @level2type=N'COLUMN',@level2name=N'MainContractId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ActionPlan_MainContractOpinion', @level2type=N'COLUMN',@level2name=N'OpinionMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ActionPlan_MainContractOpinion', @level2type=N'COLUMN',@level2name=N'OpinionDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'޸Ľ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ActionPlan_MainContractOpinion', @level2type=N'COLUMN',@level2name=N'Opinion' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܰͬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ActionPlan_MainContractOpinion' +GO + + + +CREATE TABLE [dbo].[ActionPlan_ProjectPlanOpinion]( + [ProjectPlanOpinionId] [nvarchar](50) NOT NULL, + [ProjectPlanId] [nvarchar](50) NULL, + [OpinionMan] [nvarchar](50) NULL, + [OpinionDate] [datetime] NULL, + [OriginalNum] [nvarchar](100) NULL, + [OriginalContent] [nvarchar](1000) NULL, + [Opinion] [nvarchar](1000) NULL, + CONSTRAINT [PK_ActionPlan_ProjectPlanOpinion] PRIMARY KEY CLUSTERED +( + [ProjectPlanOpinionId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +ALTER TABLE [dbo].[ActionPlan_ProjectPlanOpinion] WITH CHECK ADD CONSTRAINT [FK_ActionPlan_ProjectPlanOpinion_ActionPlan_ProjectPlan] FOREIGN KEY([ProjectPlanId]) +REFERENCES [dbo].[ActionPlan_ProjectPlan] ([ProjectPlanId]) +GO + +ALTER TABLE [dbo].[ActionPlan_ProjectPlanOpinion] CHECK CONSTRAINT [FK_ActionPlan_ProjectPlanOpinion_ActionPlan_ProjectPlan] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ActionPlan_ProjectPlanOpinion', @level2type=N'COLUMN',@level2name=N'ProjectPlanOpinionId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ActionPlan_ProjectPlanOpinion', @level2type=N'COLUMN',@level2name=N'ProjectPlanId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ActionPlan_ProjectPlanOpinion', @level2type=N'COLUMN',@level2name=N'OpinionMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ActionPlan_ProjectPlanOpinion', @level2type=N'COLUMN',@level2name=N'OpinionDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'޸Ľ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ActionPlan_ProjectPlanOpinion', @level2type=N'COLUMN',@level2name=N'Opinion' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ߻' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ActionPlan_ProjectPlanOpinion' +GO + + diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 6b69e8fa..a2f00b44 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -707,8 +707,10 @@ + + diff --git a/SGGL/BLL/ZHGL/Plan/MainContractOpinionService.cs b/SGGL/BLL/ZHGL/Plan/MainContractOpinionService.cs new file mode 100644 index 00000000..be983c72 --- /dev/null +++ b/SGGL/BLL/ZHGL/Plan/MainContractOpinionService.cs @@ -0,0 +1,114 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + public class MainContractOpinionService + { + /// + /// 获取列表 + /// + /// + /// + /// + public static IList getListData(string MainContractId, string personId) + { + Model.SGGLDB db = Funs.DB; + if (!string.IsNullOrEmpty(personId)) + { + var res = from x in db.ActionPlan_MainContractOpinion + where x.MainContractId == MainContractId && x.OpinionMan != personId + orderby x.OpinionMan + select x; + return res.ToList(); + } + else + { + var res = from x in db.ActionPlan_MainContractOpinion + where x.MainContractId == MainContractId + orderby x.OpinionMan + select x; + return res.ToList(); + } + } + + /// + /// 根据主键获取明细信息 + /// + /// + /// + public static Model.ActionPlan_MainContractOpinion GetMainContractOpinionById(string MainContractOpinionId) + { + return Funs.DB.ActionPlan_MainContractOpinion.FirstOrDefault(e => e.MainContractOpinionId == MainContractOpinionId); + } + + /// + /// 安全实施计划审批所有相关明细信息 + /// + /// + /// + public static List GetMainContractOpinionByMainContractId(string MainContractId, string personId) + { + return (from x in Funs.DB.ActionPlan_MainContractOpinion where x.MainContractId == MainContractId && x.OpinionMan == personId select x).ToList(); + } + + /// + /// 增加安全实施计划审批信息 + /// + /// 安全实施计划审批实体 + public static void AddMainContractOpinion(Model.ActionPlan_MainContractOpinion Opinion) + { + var db = Funs.DB; + Model.ActionPlan_MainContractOpinion newOpinion = new Model.ActionPlan_MainContractOpinion(); + if (string.IsNullOrWhiteSpace(Opinion.MainContractOpinionId)) + { + newOpinion.MainContractOpinionId = SQLHelper.GetNewID(typeof(Model.ActionPlan_MainContractOpinion)); + } + else + { + newOpinion.MainContractOpinionId = Opinion.MainContractOpinionId; + } + newOpinion.MainContractId = Opinion.MainContractId; + newOpinion.OpinionMan = Opinion.OpinionMan; + newOpinion.OpinionDate = Opinion.OpinionDate; + newOpinion.OriginalNum = Opinion.OriginalNum; + newOpinion.OriginalContent = Opinion.OriginalContent; + newOpinion.Opinion = Opinion.Opinion; + db.ActionPlan_MainContractOpinion.InsertOnSubmit(newOpinion); + db.SubmitChanges(); + } + + /// + /// 修改安全实施计划审批信息 + /// + /// 安全实施计划审批实体 + public static void UpdateMainContractOpinion(Model.ActionPlan_MainContractOpinion Opinion) + { + Model.SGGLDB db = Funs.DB; + Model.ActionPlan_MainContractOpinion newOpinion = db.ActionPlan_MainContractOpinion.First(e => e.MainContractOpinionId == Opinion.MainContractOpinionId); + newOpinion.MainContractId = Opinion.MainContractId; + newOpinion.OpinionMan = Opinion.OpinionMan; + newOpinion.OpinionDate = Opinion.OpinionDate; + newOpinion.OriginalNum = Opinion.OriginalNum; + newOpinion.OriginalContent = Opinion.OriginalContent; + newOpinion.Opinion = Opinion.Opinion; + db.SubmitChanges(); + } + + /// + /// 根据安全实施计划编号删除对应的所有安全实施计划审批信息 + /// + /// 安全实施计划编号 + public static void DeleteMainContractOpinionsByMainContractId(string MainContractId) + { + Model.SGGLDB db = Funs.DB; + var q = (from x in Funs.DB.ActionPlan_MainContractOpinion where x.MainContractId == MainContractId select x).ToList(); + if (q.Count > 0) + { + db.ActionPlan_MainContractOpinion.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } + } +} diff --git a/SGGL/BLL/ZHGL/Plan/MainContractService.cs b/SGGL/BLL/ZHGL/Plan/MainContractService.cs index 08148583..ef96d3af 100644 --- a/SGGL/BLL/ZHGL/Plan/MainContractService.cs +++ b/SGGL/BLL/ZHGL/Plan/MainContractService.cs @@ -93,6 +93,7 @@ namespace BLL Model.ActionPlan_MainContract MainContract = Funs.DB.ActionPlan_MainContract.FirstOrDefault(e => e.MainContractId == MainContractId); if (MainContract != null) { + BLL.MainContractOpinionService.DeleteMainContractOpinionsByMainContractId(MainContractId); BLL.MainContractApproveService.DeleteMainContractApprovesByMainContractId(MainContractId); ///删除附件 BLL.CommonService.DeleteAttachFileById(MainContractId); diff --git a/SGGL/BLL/ZHGL/Plan/ProjectPlanOpinionService.cs b/SGGL/BLL/ZHGL/Plan/ProjectPlanOpinionService.cs new file mode 100644 index 00000000..b972b82e --- /dev/null +++ b/SGGL/BLL/ZHGL/Plan/ProjectPlanOpinionService.cs @@ -0,0 +1,114 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + public class ProjectPlanOpinionService + { + /// + /// 获取列表 + /// + /// + /// + /// + public static IList getListData(string ProjectPlanId,string personId) + { + Model.SGGLDB db = Funs.DB; + if (!string.IsNullOrEmpty(personId)) + { + var res = from x in db.ActionPlan_ProjectPlanOpinion + where x.ProjectPlanId == ProjectPlanId && x.OpinionMan != personId + orderby x.OpinionMan + select x; + return res.ToList(); + } + else + { + var res = from x in db.ActionPlan_ProjectPlanOpinion + where x.ProjectPlanId == ProjectPlanId + orderby x.OpinionMan + select x; + return res.ToList(); + } + } + + /// + /// 根据主键获取明细信息 + /// + /// + /// + public static Model.ActionPlan_ProjectPlanOpinion GetProjectPlanOpinionById(string projectPlanOpinionId) + { + return Funs.DB.ActionPlan_ProjectPlanOpinion.FirstOrDefault(e => e.ProjectPlanOpinionId == projectPlanOpinionId); + } + + /// + /// 安全实施计划审批所有相关明细信息 + /// + /// + /// + public static List GetProjectPlanOpinionByProjectPlanId(string projectPlanId, string personId) + { + return (from x in Funs.DB.ActionPlan_ProjectPlanOpinion where x.ProjectPlanId == projectPlanId && x.OpinionMan == personId select x).ToList(); + } + + /// + /// 增加安全实施计划审批信息 + /// + /// 安全实施计划审批实体 + public static void AddProjectPlanOpinion(Model.ActionPlan_ProjectPlanOpinion Opinion) + { + var db = Funs.DB; + Model.ActionPlan_ProjectPlanOpinion newOpinion = new Model.ActionPlan_ProjectPlanOpinion(); + if (string.IsNullOrWhiteSpace(Opinion.ProjectPlanOpinionId)) + { + newOpinion.ProjectPlanOpinionId = SQLHelper.GetNewID(typeof(Model.ActionPlan_ProjectPlanOpinion)); + } + else + { + newOpinion.ProjectPlanOpinionId = Opinion.ProjectPlanOpinionId; + } + newOpinion.ProjectPlanId = Opinion.ProjectPlanId; + newOpinion.OpinionMan = Opinion.OpinionMan; + newOpinion.OpinionDate = Opinion.OpinionDate; + newOpinion.OriginalNum = Opinion.OriginalNum; + newOpinion.OriginalContent = Opinion.OriginalContent; + newOpinion.Opinion = Opinion.Opinion; + db.ActionPlan_ProjectPlanOpinion.InsertOnSubmit(newOpinion); + db.SubmitChanges(); + } + + /// + /// 修改安全实施计划审批信息 + /// + /// 安全实施计划审批实体 + public static void UpdateProjectPlanOpinion(Model.ActionPlan_ProjectPlanOpinion Opinion) + { + Model.SGGLDB db = Funs.DB; + Model.ActionPlan_ProjectPlanOpinion newOpinion = db.ActionPlan_ProjectPlanOpinion.First(e => e.ProjectPlanOpinionId == Opinion.ProjectPlanOpinionId); + newOpinion.ProjectPlanId = Opinion.ProjectPlanId; + newOpinion.OpinionMan = Opinion.OpinionMan; + newOpinion.OpinionDate = Opinion.OpinionDate; + newOpinion.OriginalNum = Opinion.OriginalNum; + newOpinion.OriginalContent = Opinion.OriginalContent; + newOpinion.Opinion = Opinion.Opinion; + db.SubmitChanges(); + } + + /// + /// 根据安全实施计划编号删除对应的所有安全实施计划审批信息 + /// + /// 安全实施计划编号 + public static void DeleteProjectPlanOpinionsByProjectPlanId(string ProjectPlanId) + { + Model.SGGLDB db = Funs.DB; + var q = (from x in Funs.DB.ActionPlan_ProjectPlanOpinion where x.ProjectPlanId == ProjectPlanId select x).ToList(); + if (q.Count > 0) + { + db.ActionPlan_ProjectPlanOpinion.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } + } +} diff --git a/SGGL/BLL/ZHGL/Plan/ProjectPlanService.cs b/SGGL/BLL/ZHGL/Plan/ProjectPlanService.cs index cf729d9c..00b5df80 100644 --- a/SGGL/BLL/ZHGL/Plan/ProjectPlanService.cs +++ b/SGGL/BLL/ZHGL/Plan/ProjectPlanService.cs @@ -93,6 +93,7 @@ namespace BLL Model.ActionPlan_ProjectPlan ProjectPlan = Funs.DB.ActionPlan_ProjectPlan.FirstOrDefault(e => e.ProjectPlanId == ProjectPlanId); if (ProjectPlan != null) { + BLL.ProjectPlanOpinionService.DeleteProjectPlanOpinionsByProjectPlanId(ProjectPlanId); BLL.ProjectPlanApproveService.DeleteProjectPlanApprovesByProjectPlanId(ProjectPlanId); ///删除附件 BLL.CommonService.DeleteAttachFileById(ProjectPlanId); diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 1a1bfb29..ae0d9ca7 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -42,3 +42,26 @@ IP地址:::1 出错时间:06/05/2023 11:15:20 + +错误信息开始=====> +错误类型:HttpCompileException +错误信息:e:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\ZHGL\Plan\ProjectPlanEdit.aspx(118): error CS1061: “ASP.zhgl_plan_projectplanedit_aspx”不包含“ddlPageSize_SelectedIndexChanged”的定义，并且找不到可接受类型为“ASP.zhgl_plan_projectplanedit_aspx”的第一个参数的扩展方法“ddlPageSize_SelectedIndexChanged”(是否缺少 using 指令或程序集引用?) +错误堆栈: + 在 System.Web.Compilation.BuildManager.PostProcessFoundBuildResult(BuildResult result, Boolean keyFromVPP, VirtualPath virtualPath) + 在 System.Web.Compilation.BuildManager.GetBuildResultFromCacheInternal(String cacheKey, Boolean keyFromVPP, VirtualPath virtualPath, Int64 hashCode, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultFromCacheInternal(VirtualPath virtualPath, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) + 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) + 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) + 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) + 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() + 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) + 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +出错时间:06/05/2023 15:21:11 +出错文件:http://localhost:14646/ZHGL/Plan/ProjectPlanEdit.aspx +IP地址:::1 + +出错时间:06/05/2023 15:21:11 + diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 35122331..9dbf19bd 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1561,12 +1561,14 @@ + + @@ -13594,6 +13596,13 @@ MainContractEdit.aspx + + MainContractOpinionEdit.aspx + ASPXCodeBehind + + + MainContractOpinionEdit.aspx + MainContractView.aspx ASPXCodeBehind @@ -13636,6 +13645,13 @@ ProjectPlanEdit.aspx + + ProjectPlanOpinionEdit.aspx + ASPXCodeBehind + + + ProjectPlanOpinionEdit.aspx + ProjectPlanView.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs index f3e2f9fd..7df7d561 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs @@ -68,7 +68,7 @@ namespace FineUIPro.Web.ZHGL.Plan this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.ProjectId = this.CurrUser.LoginProjectId; this.ActionPlanListId = Request.Params["ActionPlanListId"]; - var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) select x).ToList(); + var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) orderby x.PersonName select x).ToList(); Model.ActionPlan_ActionPlanList actionPlanList = BLL.ActionPlanListService.GetActionPlanListById(this.ActionPlanListId); if (actionPlanList != null) { diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListView.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListView.aspx.cs index 3e95deed..f108f553 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListView.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListView.aspx.cs @@ -36,7 +36,7 @@ namespace FineUIPro.Web.ZHGL.Plan if (!IsPostBack) { this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); - var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) select x).ToList(); + var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) orderby x.PersonName select x).ToList(); this.drpReviewMan.DataTextField = "PersonName"; this.drpReviewMan.DataValueField = "PersonId"; this.drpReviewMan.DataSource = q; diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx index f6ddb464..9ea167f7 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx @@ -68,66 +68,71 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + DataKeyNames="MainContractOpinionId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand" > - + + + - + - - - - - - - - - - - - - @@ -164,6 +169,30 @@ Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="WindowAtt_Close" Width="700px" Height="500px"> + + + + + + + + diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.cs index c886f8a4..787f909c 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.cs @@ -69,7 +69,7 @@ namespace FineUIPro.Web.ZHGL.Plan this.ProjectId = this.CurrUser.LoginProjectId; this.MainContractId = Request.Params["MainContractId"]; ProjectService.InitAllProjectDropDownList(this.drpProject, true); - var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) select x).ToList(); + var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) orderby x.PersonName select x).ToList(); Model.ActionPlan_MainContract MainContract = BLL.MainContractService.GetMainContractById(this.MainContractId); if (MainContract != null) { @@ -129,9 +129,7 @@ namespace FineUIPro.Web.ZHGL.Plan bindApprove(); if (MainContract.States == Const.MainContract_ReCompile || MainContract.States == Const.MainContract_Compile) { - agree.Hidden = true; - options.Hidden = true; - optio.Hidden = true; + this.Opinion.Hidden = true; } if (MainContract.States == Const.MainContract_Reviewing) { @@ -145,27 +143,6 @@ namespace FineUIPro.Web.ZHGL.Plan drpPerson.Readonly = true; ContactImg = -1; } - //提交版本人多次修改 - if (MainContract.CompileMan.Equals(CurrUser.PersonId)) - { - txtMainContractCode.Enabled = true; - txtMainContractName.Enabled = true; - txtVersionNo.Enabled = true; - drpProjectType.Enabled = true; - drpProject.Readonly = true; - drpCompileMan.Enabled = true; - txtCompileDate.Enabled = true; - ContactImg = 0; - Model.ActionPlan_MainContractApprove approve = MainContractApproveService.GetMainContractApproveByApproveMan(MainContractId, CurrUser.PersonId); - if (approve == null) - { - rblIsAgree.Hidden = true; - rblIsAgree.Required = false; - options.Hidden = true; - txtOptions.Required = false; - optio.Hidden = true; - } - } } WindowAtt_Close(null, null); } @@ -174,11 +151,9 @@ namespace FineUIPro.Web.ZHGL.Plan 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.Opinion.Hidden = true; ////自动生成编码 //this.txtMainContractCode.Text = BLL.CodeRecordsService.ReturnCodeByMenuIdProjectId(BLL.Const.OfficeMainContractMenuId, this.ProjectId, this.CurrUser.UnitId); this.txtMainContractName.Text = this.SimpleForm1.Title; @@ -192,7 +167,7 @@ namespace FineUIPro.Web.ZHGL.Plan /// private void bindApprove() { - var list = MainContractApproveService.getListData(MainContractId); + var list = MainContractOpinionService.getListData(MainContractId, this.CurrUser.PersonId); gvApprove.DataSource = list; gvApprove.DataBind(); } @@ -287,8 +262,6 @@ namespace FineUIPro.Web.ZHGL.Plan approve.ApproveDate = DateTime.Now; } approve.Edition = Convert.ToInt32(edtion); - approve.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); - approve.ApproveIdea = txtOptions.Text.Trim(); MainContractApproveService.UpdateMainContractApprove(approve); if (approve.IsAgree == true) { @@ -325,31 +298,13 @@ namespace FineUIPro.Web.ZHGL.Plan if (approve != null) { approve.ApproveDate = DateTime.Now; - approve.ApproveIdea = this.txtOptions.Text.Trim(); - approve.IsAgree = Convert.ToBoolean(this.rblIsAgree.SelectedValue); BLL.MainContractApproveService.UpdateMainContractApprove(approve); } List approve3s = BLL.MainContractApproveService.GetReviewings(MainContractId, edtion); //审批集合 List approve3Ends = BLL.MainContractApproveService.GetReviewingEnds(MainContractId, edtion); //审批完成集合 - int okNum = approve3Ends.Count(x => x.IsAgree == true); //审批同意数量 if (approve3s.Count == approve3Ends.Count) { - if (approve3s.Count == okNum) //全部同意,审批完成 - { - MainContract.States = Const.MainContract_Complete; - } - else //有人不同意，（编制人）修改 - { - Model.ActionPlan_MainContractApprove reApprove = new Model.ActionPlan_MainContractApprove(); - reApprove.MainContractId = MainContract.MainContractId; - reApprove.ApproveMan = MainContract1.CompileMan; - reApprove.ApproveType = Const.MainContract_ReCompile; - edtion++; - reApprove.Edition = edtion; - MainContractApproveService.AddMainContractApprove(reApprove); - MainContract.States = Const.MainContract_ReCompile; - MainContract.Edition = edtion; - } + MainContract.States = Const.MainContract_Complete; } } } @@ -492,5 +447,94 @@ namespace FineUIPro.Web.ZHGL.Plan String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/MainContractAttachUrl&menuId={2}", -1, fileId, Const.OfficeMainContractMenuId))); } + + /// + /// 关闭弹出窗口 + /// + /// + /// + protected void Window1_Close(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + var opinions = BLL.MainContractOpinionService.GetMainContractOpinionByMainContractId(this.MainContractId, this.CurrUser.PersonId); + this.Grid1.DataSource = opinions; + this.Grid1.DataBind(); + } + + #region 新增 + /// + /// 添加 + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MainContractOpinionEdit.aspx?MainContractId={0}", this.MainContractId, "编辑 - "))); + } + #endregion + + #region 编辑 + /// + /// 双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.EditData(); + } + + /// + /// 右键编辑事件 + /// + /// + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + this.EditData(); + } + + /// + /// 编辑数据方法 + /// + private void EditData() + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string id = Grid1.SelectedRowID; + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MainContractOpinionEdit.aspx?MainContractOpinionId={0}", id, "编辑 - "))); + } + #endregion + + /// + /// 右键删除事件 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + BLL.EquipmentInItemService.DeleteEquipmentInItemById(rowID); + } + BindGrid(); + ShowNotify("删除数据成功!（表格数据已重新绑定）", MessageBoxIcon.Success); + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.designer.cs index d5522558..8789b035 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.designer.cs @@ -139,58 +139,58 @@ namespace FineUIPro.Web.ZHGL.Plan { protected global::System.Web.UI.HtmlControls.HtmlGenericControl divC; /// - /// agree 控件。 + /// Opinion 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.FormRow agree; + protected global::FineUIPro.FormRow Opinion; /// - /// rblIsAgree 控件。 + /// Grid1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.RadioButtonList rblIsAgree; + protected global::FineUIPro.Grid Grid1; /// - /// options 控件。 + /// Toolbar2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.FormRow options; + protected global::FineUIPro.Toolbar Toolbar2; /// - /// txtOptions 控件。 + /// ToolbarFill2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextArea txtOptions; + protected global::FineUIPro.ToolbarFill ToolbarFill2; /// - /// optio 控件。 + /// btnNew 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.FormRow optio; + protected global::FineUIPro.Button btnNew; /// - /// btnapprove 控件。 + /// lblNumber 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnapprove; + protected global::System.Web.UI.WebControls.Label lblNumber; /// /// plApprove2 控件。 @@ -210,15 +210,6 @@ namespace FineUIPro.Web.ZHGL.Plan { /// protected global::FineUIPro.Grid gvApprove; - /// - /// Label1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label Label1; - /// /// Label3 控件。 /// @@ -228,15 +219,6 @@ namespace FineUIPro.Web.ZHGL.Plan { /// protected global::System.Web.UI.WebControls.Label Label3; - /// - /// Label2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label Label2; - /// /// Toolbar1 控件。 /// @@ -326,5 +308,41 @@ namespace FineUIPro.Web.ZHGL.Plan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window WindowAtt; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; } } diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractOpinionEdit.aspx b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractOpinionEdit.aspx new file mode 100644 index 00000000..2cbe1bad --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractOpinionEdit.aspx @@ -0,0 +1,52 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MainContractOpinionEdit.aspx.cs" Inherits="FineUIPro.Web.ZHGL.Plan.MainContractOpinionEdit" %> + + + + + + + 编辑 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractOpinionEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractOpinionEdit.aspx.cs new file mode 100644 index 00000000..382600de --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractOpinionEdit.aspx.cs @@ -0,0 +1,100 @@ +using BLL; +using System; + +namespace FineUIPro.Web.ZHGL.Plan +{ + public partial class MainContractOpinionEdit : PageBase + { + #region 定义项 + /// + /// 主键 + /// + public string MainContractOpinionId + { + get + { + return (string)ViewState["MainContractOpinionId"]; + } + set + { + ViewState["MainContractOpinionId"] = value; + } + } + + /// + /// 主表主键 + /// + public string MainContractId + { + get + { + return (string)ViewState["MainContractId"]; + } + set + { + ViewState["MainContractId"] = value; + } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + btnClose.OnClientClick = ActiveWindow.GetHideReference(); + this.MainContractId = Request.Params["MainContractId"]; + this.MainContractOpinionId = Request.Params["MainContractOpinionId"]; + if (!string.IsNullOrEmpty(this.MainContractOpinionId)) + { + Model.ActionPlan_MainContractOpinion opinion = BLL.MainContractOpinionService.GetMainContractOpinionById(this.MainContractOpinionId); + if (opinion != null) + { + this.MainContractId = opinion.MainContractId; + this.txtOriginalNum.Text = opinion.OriginalNum; + this.txtOriginalContent.Text = opinion.OriginalContent; + this.txtOpinion.Text = opinion.Opinion; + } + } + } + } + #endregion + + #region 保存 + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + Model.ActionPlan_MainContractOpinion opinion = new Model.ActionPlan_MainContractOpinion + { + MainContractId = this.MainContractId + }; + opinion.OriginalNum = this.txtOriginalNum.Text.Trim(); + opinion.OriginalContent = this.txtOriginalContent.Text.Trim(); + opinion.Opinion = this.txtOpinion.Text.Trim(); + opinion.OpinionMan = this.CurrUser.PersonId; + opinion.OpinionDate = DateTime.Now; + if (!string.IsNullOrEmpty(this.MainContractOpinionId)) + { + opinion.MainContractOpinionId = this.MainContractOpinionId; + BLL.MainContractOpinionService.UpdateMainContractOpinion(opinion); + } + else + { + this.MainContractOpinionId = SQLHelper.GetNewID(typeof(Model.ActionPlan_MainContractOpinion)); + opinion.MainContractOpinionId = this.MainContractOpinionId; + BLL.MainContractOpinionService.AddMainContractOpinion(opinion); + } + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractOpinionEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractOpinionEdit.aspx.designer.cs new file mode 100644 index 00000000..47a85020 --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractOpinionEdit.aspx.designer.cs @@ -0,0 +1,105 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.ZHGL.Plan { + + + public partial class MainContractOpinionEdit { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtOriginalNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtOriginalNum; + + /// + /// txtOriginalContent 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOriginalContent; + + /// + /// txtOpinion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + } +} diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx index 66130c8a..81cc46ad 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx @@ -71,34 +71,22 @@ - + DataKeyNames="MainContractOpinionId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand" > - + + + - + - - - - - - - - - - - - - diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.cs index 4a52abd9..4752e69f 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.cs @@ -57,7 +57,7 @@ namespace FineUIPro.Web.ZHGL.Plan this.ProjectId = this.CurrUser.LoginProjectId; this.MainContractId = Request.Params["MainContractId"]; ProjectService.InitAllProjectDropDownList(this.drpProject, true); - var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) select x).ToList(); + var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) orderby x.PersonName select x).ToList(); Model.ActionPlan_MainContract MainContract = BLL.MainContractService.GetMainContractById(this.MainContractId); if (MainContract != null) { @@ -137,7 +137,7 @@ namespace FineUIPro.Web.ZHGL.Plan ///
private void bindApprove() { - var list = MainContractApproveService.getListData(MainContractId); + var list = MainContractOpinionService.getListData(MainContractId, null); gvApprove.DataSource = list; gvApprove.DataBind(); } diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.designer.cs index 08391afb..8aa1064b 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.designer.cs @@ -156,15 +156,6 @@ namespace FineUIPro.Web.ZHGL.Plan { /// protected global::FineUIPro.Grid gvApprove; - /// - /// Label1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label Label1; - /// /// Label3 控件。 /// @@ -174,15 +165,6 @@ namespace FineUIPro.Web.ZHGL.Plan { /// protected global::System.Web.UI.WebControls.Label Label3; - /// - /// Label2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label Label2; - /// /// Toolbar1 控件。 /// diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx index 9ebbab53..6af25003 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx @@ -27,8 +27,8 @@ - + LabelAlign="Right"> + @@ -68,66 +68,71 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + DataKeyNames="ProjectPlanOpinionId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand" > - + + + - + - - - - - - - - - - - - - @@ -164,6 +169,30 @@ Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="WindowAtt_Close" Width="700px" Height="500px"> + + + + + + + + diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx.cs index ab2dada8..9cf86dd1 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx.cs @@ -69,7 +69,7 @@ namespace FineUIPro.Web.ZHGL.Plan this.ProjectId = this.CurrUser.LoginProjectId; this.ProjectPlanId = Request.Params["ProjectPlanId"]; ProjectService.InitAllProjectDropDownList(this.drpProject, true); - var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) select x).ToList(); + var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) orderby x.PersonName select x).ToList(); Model.ActionPlan_ProjectPlan ProjectPlan = BLL.ProjectPlanService.GetProjectPlanById(this.ProjectPlanId); if (ProjectPlan != null) { @@ -129,12 +129,11 @@ namespace FineUIPro.Web.ZHGL.Plan bindApprove(); if (ProjectPlan.States == Const.ProjectPlan_ReCompile || ProjectPlan.States == Const.ProjectPlan_Compile) { - agree.Hidden = true; - options.Hidden = true; - optio.Hidden = true; + this.Opinion.Hidden = true; } if (ProjectPlan.States == Const.ProjectPlan_Reviewing) { + BindGrid(); txtProjectPlanCode.Readonly = true; txtProjectPlanName.Readonly = true; txtVersionNo.Readonly = true; @@ -145,27 +144,6 @@ namespace FineUIPro.Web.ZHGL.Plan drpPerson.Readonly = true; ContactImg = -1; } - //提交版本人多次修改 - if (ProjectPlan.CompileMan.Equals(CurrUser.PersonId)) - { - txtProjectPlanCode.Enabled = true; - txtProjectPlanName.Enabled = true; - txtVersionNo.Enabled = true; - drpProjectType.Enabled = true; - drpProject.Readonly = true; - drpCompileMan.Enabled = true; - txtCompileDate.Enabled = true; - ContactImg = 0; - Model.ActionPlan_ProjectPlanApprove approve = ProjectPlanApproveService.GetProjectPlanApproveByApproveMan(ProjectPlanId, CurrUser.PersonId); - if (approve == null) - { - rblIsAgree.Hidden = true; - rblIsAgree.Required = false; - options.Hidden = true; - txtOptions.Required = false; - optio.Hidden = true; - } - } } WindowAtt_Close(null, null); } @@ -174,11 +152,9 @@ namespace FineUIPro.Web.ZHGL.Plan 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.Opinion.Hidden = true; ////自动生成编码 //this.txtProjectPlanCode.Text = BLL.CodeRecordsService.ReturnCodeByMenuIdProjectId(BLL.Const.OfficeProjectPlanMenuId, this.ProjectId, this.CurrUser.UnitId); this.txtProjectPlanName.Text = this.SimpleForm1.Title; @@ -192,7 +168,7 @@ namespace FineUIPro.Web.ZHGL.Plan /// private void bindApprove() { - var list = ProjectPlanApproveService.getListData(ProjectPlanId); + var list = ProjectPlanOpinionService.getListData(ProjectPlanId, this.CurrUser.PersonId); gvApprove.DataSource = list; gvApprove.DataBind(); } @@ -287,8 +263,6 @@ namespace FineUIPro.Web.ZHGL.Plan approve.ApproveDate = DateTime.Now; } approve.Edition = Convert.ToInt32(edtion); - approve.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); - approve.ApproveIdea = txtOptions.Text.Trim(); ProjectPlanApproveService.UpdateProjectPlanApprove(approve); if (approve.IsAgree == true) { @@ -325,31 +299,13 @@ namespace FineUIPro.Web.ZHGL.Plan if (approve != null) { approve.ApproveDate = DateTime.Now; - approve.ApproveIdea = this.txtOptions.Text.Trim(); - approve.IsAgree = Convert.ToBoolean(this.rblIsAgree.SelectedValue); BLL.ProjectPlanApproveService.UpdateProjectPlanApprove(approve); } List approve3s = BLL.ProjectPlanApproveService.GetReviewings(ProjectPlanId, edtion); //审批集合 List approve3Ends = BLL.ProjectPlanApproveService.GetReviewingEnds(ProjectPlanId, edtion); //审批完成集合 - int okNum = approve3Ends.Count(x => x.IsAgree == true); //审批同意数量 if (approve3s.Count == approve3Ends.Count) { - if (approve3s.Count == okNum) //全部同意,审批完成 - { - ProjectPlan.States = Const.ProjectPlan_Complete; - } - else //有人不同意，（编制人）修改 - { - Model.ActionPlan_ProjectPlanApprove reApprove = new Model.ActionPlan_ProjectPlanApprove(); - reApprove.ProjectPlanId = ProjectPlan.ProjectPlanId; - reApprove.ApproveMan = ProjectPlan1.CompileMan; - reApprove.ApproveType = Const.ProjectPlan_ReCompile; - edtion++; - reApprove.Edition = edtion; - ProjectPlanApproveService.AddProjectPlanApprove(reApprove); - ProjectPlan.States = Const.ProjectPlan_ReCompile; - ProjectPlan.Edition= edtion; - } + ProjectPlan.States = Const.ProjectPlan_Complete; } } } @@ -492,5 +448,94 @@ namespace FineUIPro.Web.ZHGL.Plan String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/ProjectPlanAttachUrl&menuId={2}", -1, fileId, Const.OfficeProjectPlanMenuId))); } + + /// + /// 关闭弹出窗口 + /// + /// + /// + protected void Window1_Close(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + var opinions = BLL.ProjectPlanOpinionService.GetProjectPlanOpinionByProjectPlanId(this.ProjectPlanId, this.CurrUser.PersonId); + this.Grid1.DataSource = opinions; + this.Grid1.DataBind(); + } + + #region 新增 + /// + /// 添加 + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectPlanOpinionEdit.aspx?ProjectPlanId={0}", this.ProjectPlanId, "编辑 - "))); + } + #endregion + + #region 编辑 + /// + /// 双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.EditData(); + } + + /// + /// 右键编辑事件 + /// + /// + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + this.EditData(); + } + + /// + /// 编辑数据方法 + /// + private void EditData() + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string id = Grid1.SelectedRowID; + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectPlanOpinionEdit.aspx?ProjectPlanOpinionId={0}", id, "编辑 - "))); + } + #endregion + + /// + /// 右键删除事件 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + BLL.EquipmentInItemService.DeleteEquipmentInItemById(rowID); + } + BindGrid(); + ShowNotify("删除数据成功!（表格数据已重新绑定）", MessageBoxIcon.Success); + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx.designer.cs index 42d8e22b..1e1ad815 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx.designer.cs @@ -139,58 +139,58 @@ namespace FineUIPro.Web.ZHGL.Plan { protected global::System.Web.UI.HtmlControls.HtmlGenericControl divC; /// - /// agree 控件。 + /// Opinion 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.FormRow agree; + protected global::FineUIPro.FormRow Opinion; /// - /// rblIsAgree 控件。 + /// Grid1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.RadioButtonList rblIsAgree; + protected global::FineUIPro.Grid Grid1; /// - /// options 控件。 + /// Toolbar2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.FormRow options; + protected global::FineUIPro.Toolbar Toolbar2; /// - /// txtOptions 控件。 + /// ToolbarFill2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextArea txtOptions; + protected global::FineUIPro.ToolbarFill ToolbarFill2; /// - /// optio 控件。 + /// btnNew 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.FormRow optio; + protected global::FineUIPro.Button btnNew; /// - /// btnapprove 控件。 + /// lblNumber 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnapprove; + protected global::System.Web.UI.WebControls.Label lblNumber; /// /// plApprove2 控件。 @@ -210,15 +210,6 @@ namespace FineUIPro.Web.ZHGL.Plan { /// protected global::FineUIPro.Grid gvApprove; - /// - /// Label1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label Label1; - /// /// Label3 控件。 /// @@ -228,15 +219,6 @@ namespace FineUIPro.Web.ZHGL.Plan { /// protected global::System.Web.UI.WebControls.Label Label3; - /// - /// Label2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label Label2; - /// /// Toolbar1 控件。 /// @@ -326,5 +308,41 @@ namespace FineUIPro.Web.ZHGL.Plan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window WindowAtt; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; } } diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanOpinionEdit.aspx b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanOpinionEdit.aspx new file mode 100644 index 00000000..f21824cc --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanOpinionEdit.aspx @@ -0,0 +1,52 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectPlanOpinionEdit.aspx.cs" Inherits="FineUIPro.Web.ZHGL.Plan.ProjectPlanOpinionEdit" %> + + + + + + + 编辑 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanOpinionEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanOpinionEdit.aspx.cs new file mode 100644 index 00000000..41dba3ff --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanOpinionEdit.aspx.cs @@ -0,0 +1,100 @@ +using BLL; +using System; + +namespace FineUIPro.Web.ZHGL.Plan +{ + public partial class ProjectPlanOpinionEdit : PageBase + { + #region 定义项 + /// + /// 主键 + /// + public string ProjectPlanOpinionId + { + get + { + return (string)ViewState["ProjectPlanOpinionId"]; + } + set + { + ViewState["ProjectPlanOpinionId"] = value; + } + } + + /// + /// 主表主键 + /// + public string ProjectPlanId + { + get + { + return (string)ViewState["ProjectPlanId"]; + } + set + { + ViewState["ProjectPlanId"] = value; + } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + btnClose.OnClientClick = ActiveWindow.GetHideReference(); + this.ProjectPlanId = Request.Params["ProjectPlanId"]; + this.ProjectPlanOpinionId = Request.Params["ProjectPlanOpinionId"]; + if (!string.IsNullOrEmpty(this.ProjectPlanOpinionId)) + { + Model.ActionPlan_ProjectPlanOpinion opinion = BLL.ProjectPlanOpinionService.GetProjectPlanOpinionById(this.ProjectPlanOpinionId); + if (opinion != null) + { + this.ProjectPlanId = opinion.ProjectPlanId; + this.txtOriginalNum.Text = opinion.OriginalNum; + this.txtOriginalContent.Text = opinion.OriginalContent; + this.txtOpinion.Text = opinion.Opinion; + } + } + } + } + #endregion + + #region 保存 + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + Model.ActionPlan_ProjectPlanOpinion opinion = new Model.ActionPlan_ProjectPlanOpinion + { + ProjectPlanId = this.ProjectPlanId + }; + opinion.OriginalNum = this.txtOriginalNum.Text.Trim(); + opinion.OriginalContent = this.txtOriginalContent.Text.Trim(); + opinion.Opinion = this.txtOpinion.Text.Trim(); + opinion.OpinionMan = this.CurrUser.PersonId; + opinion.OpinionDate = DateTime.Now; + if (!string.IsNullOrEmpty(this.ProjectPlanOpinionId)) + { + opinion.ProjectPlanOpinionId = this.ProjectPlanOpinionId; + BLL.ProjectPlanOpinionService.UpdateProjectPlanOpinion(opinion); + } + else + { + this.ProjectPlanOpinionId = SQLHelper.GetNewID(typeof(Model.ActionPlan_ProjectPlanOpinion)); + opinion.ProjectPlanOpinionId = this.ProjectPlanOpinionId; + BLL.ProjectPlanOpinionService.AddProjectPlanOpinion(opinion); + } + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanOpinionEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanOpinionEdit.aspx.designer.cs new file mode 100644 index 00000000..9eb7749c --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanOpinionEdit.aspx.designer.cs @@ -0,0 +1,105 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.ZHGL.Plan { + + + public partial class ProjectPlanOpinionEdit { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtOriginalNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtOriginalNum; + + /// + /// txtOriginalContent 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOriginalContent; + + /// + /// txtOpinion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + } +} diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx index c2966f4d..fac0758b 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx @@ -68,37 +68,26 @@ + - + DataKeyNames="ProjectPlanOpinionId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand" > - + + + - + - - - - - - - - - - - - - diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx.cs index 5aaa5bbb..80240d6a 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx.cs @@ -57,7 +57,7 @@ namespace FineUIPro.Web.ZHGL.Plan this.ProjectId = this.CurrUser.LoginProjectId; this.ProjectPlanId = Request.Params["ProjectPlanId"]; ProjectService.InitAllProjectDropDownList(this.drpProject, true); - var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) select x).ToList(); + var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) orderby x.PersonName select x).ToList(); Model.ActionPlan_ProjectPlan ProjectPlan = BLL.ProjectPlanService.GetProjectPlanById(this.ProjectPlanId); if (ProjectPlan != null) { @@ -137,7 +137,7 @@ namespace FineUIPro.Web.ZHGL.Plan ///
private void bindApprove() { - var list = ProjectPlanApproveService.getListData(ProjectPlanId); + var list = ProjectPlanOpinionService.getListData(ProjectPlanId, null); gvApprove.DataSource = list; gvApprove.DataBind(); } diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx.designer.cs index c9fb435b..529da7c9 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx.designer.cs @@ -156,15 +156,6 @@ namespace FineUIPro.Web.ZHGL.Plan { /// protected global::FineUIPro.Grid gvApprove; - /// - /// Label1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label Label1; - /// /// Label3 控件。 /// @@ -174,15 +165,6 @@ namespace FineUIPro.Web.ZHGL.Plan { /// protected global::System.Web.UI.WebControls.Label Label3; - /// - /// Label2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label Label2; - /// /// Toolbar1 控件。 /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index bc5c748b..2388a716 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -62,6 +62,9 @@ namespace Model partial void InsertActionPlan_MainContractApprove(ActionPlan_MainContractApprove instance); partial void UpdateActionPlan_MainContractApprove(ActionPlan_MainContractApprove instance); partial void DeleteActionPlan_MainContractApprove(ActionPlan_MainContractApprove instance); + partial void InsertActionPlan_MainContractOpinion(ActionPlan_MainContractOpinion instance); + partial void UpdateActionPlan_MainContractOpinion(ActionPlan_MainContractOpinion instance); + partial void DeleteActionPlan_MainContractOpinion(ActionPlan_MainContractOpinion instance); partial void InsertActionPlan_ManagerRule(ActionPlan_ManagerRule instance); partial void UpdateActionPlan_ManagerRule(ActionPlan_ManagerRule instance); partial void DeleteActionPlan_ManagerRule(ActionPlan_ManagerRule instance); @@ -74,6 +77,9 @@ namespace Model partial void InsertActionPlan_ProjectPlanApprove(ActionPlan_ProjectPlanApprove instance); partial void UpdateActionPlan_ProjectPlanApprove(ActionPlan_ProjectPlanApprove instance); partial void DeleteActionPlan_ProjectPlanApprove(ActionPlan_ProjectPlanApprove instance); + partial void InsertActionPlan_ProjectPlanOpinion(ActionPlan_ProjectPlanOpinion instance); + partial void UpdateActionPlan_ProjectPlanOpinion(ActionPlan_ProjectPlanOpinion instance); + partial void DeleteActionPlan_ProjectPlanOpinion(ActionPlan_ProjectPlanOpinion instance); partial void InsertAttachFile(AttachFile instance); partial void UpdateAttachFile(AttachFile instance); partial void DeleteAttachFile(AttachFile instance); @@ -1790,6 +1796,14 @@ namespace Model } } + public System.Data.Linq.Table ActionPlan_MainContractOpinion + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table ActionPlan_ManagerRule { get @@ -1822,6 +1836,14 @@ namespace Model } } + public System.Data.Linq.Table ActionPlan_ProjectPlanOpinion + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table AttachFile { get @@ -12088,6 +12110,8 @@ namespace Model private EntitySet _ActionPlan_MainContractApprove; + private EntitySet _ActionPlan_MainContractOpinion; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -12127,6 +12151,7 @@ namespace Model this._Base_Project = default(EntityRef); this._Person_Persons = default(EntityRef); this._ActionPlan_MainContractApprove = new EntitySet(new Action(this.attach_ActionPlan_MainContractApprove), new Action(this.detach_ActionPlan_MainContractApprove)); + this._ActionPlan_MainContractOpinion = new EntitySet(new Action(this.attach_ActionPlan_MainContractOpinion), new Action(this.detach_ActionPlan_MainContractOpinion)); OnCreated(); } @@ -12499,6 +12524,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_MainContractOpinion_ActionPlan_MainContract", Storage="_ActionPlan_MainContractOpinion", ThisKey="MainContractId", OtherKey="MainContractId", DeleteRule="NO ACTION")] + public EntitySet ActionPlan_MainContractOpinion + { + get + { + return this._ActionPlan_MainContractOpinion; + } + set + { + this._ActionPlan_MainContractOpinion.Assign(value); + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -12530,6 +12568,18 @@ namespace Model this.SendPropertyChanging(); entity.ActionPlan_MainContract = null; } + + private void attach_ActionPlan_MainContractOpinion(ActionPlan_MainContractOpinion entity) + { + this.SendPropertyChanging(); + entity.ActionPlan_MainContract = this; + } + + private void detach_ActionPlan_MainContractOpinion(ActionPlan_MainContractOpinion entity) + { + this.SendPropertyChanging(); + entity.ActionPlan_MainContract = null; + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ActionPlan_MainContractApprove")] @@ -12892,6 +12942,253 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ActionPlan_MainContractOpinion")] + public partial class ActionPlan_MainContractOpinion : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _MainContractOpinionId; + + private string _MainContractId; + + private string _OpinionMan; + + private System.Nullable _OpinionDate; + + private string _OriginalNum; + + private string _OriginalContent; + + private string _Opinion; + + private EntityRef _ActionPlan_MainContract; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnMainContractOpinionIdChanging(string value); + partial void OnMainContractOpinionIdChanged(); + partial void OnMainContractIdChanging(string value); + partial void OnMainContractIdChanged(); + partial void OnOpinionManChanging(string value); + partial void OnOpinionManChanged(); + partial void OnOpinionDateChanging(System.Nullable value); + partial void OnOpinionDateChanged(); + partial void OnOriginalNumChanging(string value); + partial void OnOriginalNumChanged(); + partial void OnOriginalContentChanging(string value); + partial void OnOriginalContentChanged(); + partial void OnOpinionChanging(string value); + partial void OnOpinionChanged(); + #endregion + + public ActionPlan_MainContractOpinion() + { + this._ActionPlan_MainContract = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainContractOpinionId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string MainContractOpinionId + { + get + { + return this._MainContractOpinionId; + } + set + { + if ((this._MainContractOpinionId != value)) + { + this.OnMainContractOpinionIdChanging(value); + this.SendPropertyChanging(); + this._MainContractOpinionId = value; + this.SendPropertyChanged("MainContractOpinionId"); + this.OnMainContractOpinionIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainContractId", DbType="NVarChar(50)")] + public string MainContractId + { + get + { + return this._MainContractId; + } + set + { + if ((this._MainContractId != value)) + { + if (this._ActionPlan_MainContract.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnMainContractIdChanging(value); + this.SendPropertyChanging(); + this._MainContractId = value; + this.SendPropertyChanged("MainContractId"); + this.OnMainContractIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OpinionMan", DbType="NVarChar(50)")] + public string OpinionMan + { + get + { + return this._OpinionMan; + } + set + { + if ((this._OpinionMan != value)) + { + this.OnOpinionManChanging(value); + this.SendPropertyChanging(); + this._OpinionMan = value; + this.SendPropertyChanged("OpinionMan"); + this.OnOpinionManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OpinionDate", DbType="DateTime")] + public System.Nullable OpinionDate + { + get + { + return this._OpinionDate; + } + set + { + if ((this._OpinionDate != value)) + { + this.OnOpinionDateChanging(value); + this.SendPropertyChanging(); + this._OpinionDate = value; + this.SendPropertyChanged("OpinionDate"); + this.OnOpinionDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OriginalNum", DbType="NVarChar(100)")] + public string OriginalNum + { + get + { + return this._OriginalNum; + } + set + { + if ((this._OriginalNum != value)) + { + this.OnOriginalNumChanging(value); + this.SendPropertyChanging(); + this._OriginalNum = value; + this.SendPropertyChanged("OriginalNum"); + this.OnOriginalNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OriginalContent", DbType="NVarChar(1000)")] + public string OriginalContent + { + get + { + return this._OriginalContent; + } + set + { + if ((this._OriginalContent != value)) + { + this.OnOriginalContentChanging(value); + this.SendPropertyChanging(); + this._OriginalContent = value; + this.SendPropertyChanged("OriginalContent"); + this.OnOriginalContentChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Opinion", DbType="NVarChar(1000)")] + public string Opinion + { + get + { + return this._Opinion; + } + set + { + if ((this._Opinion != value)) + { + this.OnOpinionChanging(value); + this.SendPropertyChanging(); + this._Opinion = value; + this.SendPropertyChanged("Opinion"); + this.OnOpinionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_MainContractOpinion_ActionPlan_MainContract", Storage="_ActionPlan_MainContract", ThisKey="MainContractId", OtherKey="MainContractId", IsForeignKey=true)] + public ActionPlan_MainContract ActionPlan_MainContract + { + get + { + return this._ActionPlan_MainContract.Entity; + } + set + { + ActionPlan_MainContract previousValue = this._ActionPlan_MainContract.Entity; + if (((previousValue != value) + || (this._ActionPlan_MainContract.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._ActionPlan_MainContract.Entity = null; + previousValue.ActionPlan_MainContractOpinion.Remove(this); + } + this._ActionPlan_MainContract.Entity = value; + if ((value != null)) + { + value.ActionPlan_MainContractOpinion.Add(this); + this._MainContractId = value.MainContractId; + } + else + { + this._MainContractId = default(string); + } + this.SendPropertyChanged("ActionPlan_MainContract"); + } + } + } + + 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)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ActionPlan_ManagerRule")] public partial class ActionPlan_ManagerRule : INotifyPropertyChanging, INotifyPropertyChanged { @@ -13916,6 +14213,8 @@ namespace Model private EntitySet _ActionPlan_ProjectPlanApprove; + private EntitySet _ActionPlan_ProjectPlanOpinion; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -13955,6 +14254,7 @@ namespace Model this._Base_Project = default(EntityRef); this._Person_Persons = default(EntityRef); this._ActionPlan_ProjectPlanApprove = new EntitySet(new Action(this.attach_ActionPlan_ProjectPlanApprove), new Action(this.detach_ActionPlan_ProjectPlanApprove)); + this._ActionPlan_ProjectPlanOpinion = new EntitySet(new Action(this.attach_ActionPlan_ProjectPlanOpinion), new Action(this.detach_ActionPlan_ProjectPlanOpinion)); OnCreated(); } @@ -14327,6 +14627,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ProjectPlanOpinion_ActionPlan_ProjectPlan", Storage="_ActionPlan_ProjectPlanOpinion", ThisKey="ProjectPlanId", OtherKey="ProjectPlanId", DeleteRule="NO ACTION")] + public EntitySet ActionPlan_ProjectPlanOpinion + { + get + { + return this._ActionPlan_ProjectPlanOpinion; + } + set + { + this._ActionPlan_ProjectPlanOpinion.Assign(value); + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -14358,6 +14671,18 @@ namespace Model this.SendPropertyChanging(); entity.ActionPlan_ProjectPlan = null; } + + private void attach_ActionPlan_ProjectPlanOpinion(ActionPlan_ProjectPlanOpinion entity) + { + this.SendPropertyChanging(); + entity.ActionPlan_ProjectPlan = this; + } + + private void detach_ActionPlan_ProjectPlanOpinion(ActionPlan_ProjectPlanOpinion entity) + { + this.SendPropertyChanging(); + entity.ActionPlan_ProjectPlan = null; + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ActionPlan_ProjectPlanApprove")] @@ -14720,6 +15045,253 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ActionPlan_ProjectPlanOpinion")] + public partial class ActionPlan_ProjectPlanOpinion : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _ProjectPlanOpinionId; + + private string _ProjectPlanId; + + private string _OpinionMan; + + private System.Nullable _OpinionDate; + + private string _OriginalNum; + + private string _OriginalContent; + + private string _Opinion; + + private EntityRef _ActionPlan_ProjectPlan; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnProjectPlanOpinionIdChanging(string value); + partial void OnProjectPlanOpinionIdChanged(); + partial void OnProjectPlanIdChanging(string value); + partial void OnProjectPlanIdChanged(); + partial void OnOpinionManChanging(string value); + partial void OnOpinionManChanged(); + partial void OnOpinionDateChanging(System.Nullable value); + partial void OnOpinionDateChanged(); + partial void OnOriginalNumChanging(string value); + partial void OnOriginalNumChanged(); + partial void OnOriginalContentChanging(string value); + partial void OnOriginalContentChanged(); + partial void OnOpinionChanging(string value); + partial void OnOpinionChanged(); + #endregion + + public ActionPlan_ProjectPlanOpinion() + { + this._ActionPlan_ProjectPlan = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectPlanOpinionId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string ProjectPlanOpinionId + { + get + { + return this._ProjectPlanOpinionId; + } + set + { + if ((this._ProjectPlanOpinionId != value)) + { + this.OnProjectPlanOpinionIdChanging(value); + this.SendPropertyChanging(); + this._ProjectPlanOpinionId = value; + this.SendPropertyChanged("ProjectPlanOpinionId"); + this.OnProjectPlanOpinionIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectPlanId", DbType="NVarChar(50)")] + public string ProjectPlanId + { + get + { + return this._ProjectPlanId; + } + set + { + if ((this._ProjectPlanId != value)) + { + if (this._ActionPlan_ProjectPlan.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnProjectPlanIdChanging(value); + this.SendPropertyChanging(); + this._ProjectPlanId = value; + this.SendPropertyChanged("ProjectPlanId"); + this.OnProjectPlanIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OpinionMan", DbType="NVarChar(50)")] + public string OpinionMan + { + get + { + return this._OpinionMan; + } + set + { + if ((this._OpinionMan != value)) + { + this.OnOpinionManChanging(value); + this.SendPropertyChanging(); + this._OpinionMan = value; + this.SendPropertyChanged("OpinionMan"); + this.OnOpinionManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OpinionDate", DbType="DateTime")] + public System.Nullable OpinionDate + { + get + { + return this._OpinionDate; + } + set + { + if ((this._OpinionDate != value)) + { + this.OnOpinionDateChanging(value); + this.SendPropertyChanging(); + this._OpinionDate = value; + this.SendPropertyChanged("OpinionDate"); + this.OnOpinionDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OriginalNum", DbType="NVarChar(100)")] + public string OriginalNum + { + get + { + return this._OriginalNum; + } + set + { + if ((this._OriginalNum != value)) + { + this.OnOriginalNumChanging(value); + this.SendPropertyChanging(); + this._OriginalNum = value; + this.SendPropertyChanged("OriginalNum"); + this.OnOriginalNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OriginalContent", DbType="NVarChar(1000)")] + public string OriginalContent + { + get + { + return this._OriginalContent; + } + set + { + if ((this._OriginalContent != value)) + { + this.OnOriginalContentChanging(value); + this.SendPropertyChanging(); + this._OriginalContent = value; + this.SendPropertyChanged("OriginalContent"); + this.OnOriginalContentChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Opinion", DbType="NVarChar(1000)")] + public string Opinion + { + get + { + return this._Opinion; + } + set + { + if ((this._Opinion != value)) + { + this.OnOpinionChanging(value); + this.SendPropertyChanging(); + this._Opinion = value; + this.SendPropertyChanged("Opinion"); + this.OnOpinionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ProjectPlanOpinion_ActionPlan_ProjectPlan", Storage="_ActionPlan_ProjectPlan", ThisKey="ProjectPlanId", OtherKey="ProjectPlanId", IsForeignKey=true)] + public ActionPlan_ProjectPlan ActionPlan_ProjectPlan + { + get + { + return this._ActionPlan_ProjectPlan.Entity; + } + set + { + ActionPlan_ProjectPlan previousValue = this._ActionPlan_ProjectPlan.Entity; + if (((previousValue != value) + || (this._ActionPlan_ProjectPlan.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._ActionPlan_ProjectPlan.Entity = null; + previousValue.ActionPlan_ProjectPlanOpinion.Remove(this); + } + this._ActionPlan_ProjectPlan.Entity = value; + if ((value != null)) + { + value.ActionPlan_ProjectPlanOpinion.Add(this); + this._ProjectPlanId = value.ProjectPlanId; + } + else + { + this._ProjectPlanId = default(string); + } + this.SendPropertyChanged("ActionPlan_ProjectPlan"); + } + } + } + + 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)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.AttachFile")] public partial class AttachFile : INotifyPropertyChanging, INotifyPropertyChanged {