lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改项目策划、总包合同

This commit is contained in:
高飞 2023-06-05 16:41:08 +08:00
parent ac62dd3074
commit 9c2efb128b
29 changed files with 1899 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
DataBase/版本日志/SGGLDB_V2023-06-05_gaofei.sql
View File

@ -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

2
SGGL/BLL/BLL.csproj
View File

@ -707,8 +707,10 @@
<Compile Include="ZHGL\Meeting\CompanySafetyMeetingService.cs" />
<Compile Include="ZHGL\Meeting\CompanySpecialMeetingService.cs" />
<Compile Include="ZHGL\Plan\MainContractApproveService.cs" />
<Compile Include="ZHGL\Plan\MainContractOpinionService.cs" />
<Compile Include="ZHGL\Plan\MainContractService.cs" />
<Compile Include="ZHGL\Plan\ProjectPlanApproveService.cs" />
<Compile Include="ZHGL\Plan\ProjectPlanOpinionService.cs" />
<Compile Include="ZHGL\Plan\ProjectPlanService.cs" />
<Compile Include="ZHGL\RealName\BasicDataService.cs" />
<Compile Include="ZHGL\RealName\CityService.cs" />

114
SGGL/BLL/ZHGL/Plan/MainContractOpinionService.cs Normal file
View File

@ -0,0 +1,114 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace BLL
{
public class MainContractOpinionService
{
/// <summary>
/// 获取列表
/// </summary>
/// <param name="satartRowIndex"></param>
/// <param name="maximumRows"></param>
/// <returns></returns>
public static IList<Model.ActionPlan_MainContractOpinion> 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();
}
}
/// <summary>
/// 根据主键获取明细信息
/// </summary>
/// <param name="equipmentInItemId"></param>
/// <returns></returns>
public static Model.ActionPlan_MainContractOpinion GetMainContractOpinionById(string MainContractOpinionId)
{
return Funs.DB.ActionPlan_MainContractOpinion.FirstOrDefault(e => e.MainContractOpinionId == MainContractOpinionId);
}
/// <summary>
/// 安全实施计划审批所有相关明细信息
/// </summary>
/// <param name="equipmentInId"></param>
/// <returns></returns>
public static List<Model.ActionPlan_MainContractOpinion> GetMainContractOpinionByMainContractId(string MainContractId, string personId)
{
return (from x in Funs.DB.ActionPlan_MainContractOpinion where x.MainContractId == MainContractId && x.OpinionMan == personId select x).ToList();
}
/// <summary>
/// 增加安全实施计划审批信息
/// </summary>
/// <param name="managerRuleOpinion">安全实施计划审批实体</param>
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();
}
/// <summary>
/// 修改安全实施计划审批信息
/// </summary>
/// <param name="managerRuleOpinion">安全实施计划审批实体</param>
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();
}
/// <summary>
/// 根据安全实施计划编号删除对应的所有安全实施计划审批信息
/// </summary>
/// <param name="MainContractCode">安全实施计划编号</param>
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();
}
}
}
}

1
SGGL/BLL/ZHGL/Plan/MainContractService.cs
View File

@ -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);

114
SGGL/BLL/ZHGL/Plan/ProjectPlanOpinionService.cs Normal file
View File

@ -0,0 +1,114 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace BLL
{
public class ProjectPlanOpinionService
{
/// <summary>
/// 获取列表
/// </summary>
/// <param name="satartRowIndex"></param>
/// <param name="maximumRows"></param>
/// <returns></returns>
public static IList<Model.ActionPlan_ProjectPlanOpinion> 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();
}
}
/// <summary>
/// 根据主键获取明细信息
/// </summary>
/// <param name="equipmentInItemId"></param>
/// <returns></returns>
public static Model.ActionPlan_ProjectPlanOpinion GetProjectPlanOpinionById(string projectPlanOpinionId)
{
return Funs.DB.ActionPlan_ProjectPlanOpinion.FirstOrDefault(e => e.ProjectPlanOpinionId == projectPlanOpinionId);
}
/// <summary>
/// 安全实施计划审批所有相关明细信息
/// </summary>
/// <param name="equipmentInId"></param>
/// <returns></returns>
public static List<Model.ActionPlan_ProjectPlanOpinion> GetProjectPlanOpinionByProjectPlanId(string projectPlanId, string personId)
{
return (from x in Funs.DB.ActionPlan_ProjectPlanOpinion where x.ProjectPlanId == projectPlanId && x.OpinionMan == personId select x).ToList();
}
/// <summary>
/// 增加安全实施计划审批信息
/// </summary>
/// <param name="managerRuleOpinion">安全实施计划审批实体</param>
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();
}
/// <summary>
/// 修改安全实施计划审批信息
/// </summary>
/// <param name="managerRuleOpinion">安全实施计划审批实体</param>
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();
}
/// <summary>
/// 根据安全实施计划编号删除对应的所有安全实施计划审批信息
/// </summary>
/// <param name="ProjectPlanCode">安全实施计划编号</param>
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();
}
}
}
}

1
SGGL/BLL/ZHGL/Plan/ProjectPlanService.cs
View File

@ -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);

23
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -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

16
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -1561,12 +1561,14 @@
<Content Include="ZHGL\Plan\ActionPlanListView.aspx" />
<Content Include="ZHGL\Plan\MainContract.aspx" />
<Content Include="ZHGL\Plan\MainContractEdit.aspx" />
<Content Include="ZHGL\Plan\MainContractOpinionEdit.aspx" />
<Content Include="ZHGL\Plan\MainContractView.aspx" />
<Content Include="ZHGL\Plan\MainPlan.aspx" />
<Content Include="ZHGL\Plan\MainPlanEdit.aspx" />
<Content Include="ZHGL\Plan\MainPlanView.aspx" />
<Content Include="ZHGL\Plan\ProjectPlan.aspx" />
<Content Include="ZHGL\Plan\ProjectPlanEdit.aspx" />
<Content Include="ZHGL\Plan\ProjectPlanOpinionEdit.aspx" />
<Content Include="ZHGL\Plan\ProjectPlanView.aspx" />
<Content Include="ZHGL\RealName\BasicData.aspx" />
<Content Include="ZHGL\RealName\OnPost.aspx" />
@ -13594,6 +13596,13 @@
<Compile Include="ZHGL\Plan\MainContractEdit.aspx.designer.cs">
<DependentUpon>MainContractEdit.aspx</DependentUpon>
</Compile>
<Compile Include="ZHGL\Plan\MainContractOpinionEdit.aspx.cs">
<DependentUpon>MainContractOpinionEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ZHGL\Plan\MainContractOpinionEdit.aspx.designer.cs">
<DependentUpon>MainContractOpinionEdit.aspx</DependentUpon>
</Compile>
<Compile Include="ZHGL\Plan\MainContractView.aspx.cs">
<DependentUpon>MainContractView.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -13636,6 +13645,13 @@
<Compile Include="ZHGL\Plan\ProjectPlanEdit.aspx.designer.cs">
<DependentUpon>ProjectPlanEdit.aspx</DependentUpon>
</Compile>
<Compile Include="ZHGL\Plan\ProjectPlanOpinionEdit.aspx.cs">
<DependentUpon>ProjectPlanOpinionEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ZHGL\Plan\ProjectPlanOpinionEdit.aspx.designer.cs">
<DependentUpon>ProjectPlanOpinionEdit.aspx</DependentUpon>
</Compile>
<Compile Include="ZHGL\Plan\ProjectPlanView.aspx.cs">
<DependentUpon>ProjectPlanView.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

2
SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs
View File

@ -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)
{

2
SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListView.aspx.cs
View File

@ -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;

119
SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx
View File

@ -68,66 +68,71 @@
</f:ContentPanel>
</Items>
</f:FormRow>
<f:FormRow ID="agree">
<f:FormRow runat="server" ID="Opinion">
<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>
<f:ContentPanel Title="评审意见" ShowBorder="true"
BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
runat="server">
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="评审意见" EnableCollapse="true"
runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="MainContractOpinionId"
DataIDField="MainContractOpinionId" AllowPaging="false" IsDatabasePaging="true" PageSize="1000"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True"
Height="220px">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:ToolbarFill ID="ToolbarFill2" runat="server">
</f:ToolbarFill>
<f:Button ID="btnNew" Icon="Add" runat="server" Text="新增" ToolTip="新增意见" ValidateForms="SimpleForm1"
OnClick="btnNew_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="50px" 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="140px" ColumnID="OriginalNum" DataField="OriginalNum" SortField="OriginalNum"
FieldType="String" HeaderText="原文章节号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="500px" ColumnID="OriginalContent" DataField="OriginalContent" SortField="OriginalContent"
FieldType="String" HeaderText="原文内容" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="500px" ColumnID="Opinion" DataField="Opinion" ExpandUnusedSpace="true"
SortField="Opinion" FieldType="String" HeaderText="修改建议" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
</f:Grid>
</f:ContentPanel>
</Items>
</f:FormRow>
<f:FormRow ID="plApprove2">
<Items>
<f:ContentPanel Title="审批列表" ShowBorder="true"
<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="MainContractApproveId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand" ForceFit="true">
DataKeyNames="MainContractOpinionId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand" >
<Columns>
<f:RowNumberField Width="40px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" />
<f:TemplateField ColumnID="ApproveType" Width="150px" HeaderText="办理类型" HeaderTextAlign="Center" TextAlign="Center"
<f:BoundField Width="140px" DataField="OriginalNum" HeaderTextAlign="Center" TextAlign="Left" HeaderText="原文章节号" />
<f:BoundField Width="500px" DataField="OriginalContent" HeaderTextAlign="Center" TextAlign="Left" HeaderText="原文内容" />
<f:BoundField Width="500px" DataField="Opinion" HeaderTextAlign="Center" TextAlign="Left" HeaderText="修改建议" ExpandUnusedSpace="true" />
<f:TemplateField ColumnID="ApproveMan" Width="100px" HeaderText="建议提出人" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.MainContractService.ConvertState(Eval("ApproveType")) %>'></asp:Label>
<asp:Label ID="Label3" runat="server" Text='<%# man(Eval("OpinionMan")) %>'></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.MainContractService.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>
@ -164,6 +169,30 @@
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="WindowAtt_Close"
Width="700px" Height="500px">
</f:Window>
<f:Window ID="Window1" Title="评审意见" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="800px" Height="500px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
runat="server" Text="编辑">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
</f:MenuButton>
</f:Menu>
</form>
<script type="text/javascript">
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>

144
SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.cs
View File

@ -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
/// </summary>
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<Model.ActionPlan_MainContractApprove> approve3s = BLL.MainContractApproveService.GetReviewings(MainContractId, edtion); //审批集合
List<Model.ActionPlan_MainContractApprove> 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)));
}
/// <summary>
/// 关闭弹出窗口
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window1_Close(object sender, EventArgs e)
{
BindGrid();
}
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
var opinions = BLL.MainContractOpinionService.GetMainContractOpinionByMainContractId(this.MainContractId, this.CurrUser.PersonId);
this.Grid1.DataSource = opinions;
this.Grid1.DataBind();
}
#region 新增
/// <summary>
/// 添加
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnNew_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MainContractOpinionEdit.aspx?MainContractId={0}", this.MainContractId, "编辑 - ")));
}
#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;
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MainContractOpinionEdit.aspx?MainContractOpinionId={0}", id, "编辑 - ")));
}
#endregion
/// <summary>
/// 右键删除事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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);
}
}
}

78
SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.designer.cs generated
View File

@ -139,58 +139,58 @@ namespace FineUIPro.Web.ZHGL.Plan {
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divC;
/// <summary>
/// agree 控件。
/// Opinion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow agree;
protected global::FineUIPro.FormRow Opinion;
/// <summary>
/// rblIsAgree 控件。
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsAgree;
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// options 控件。
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow options;
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtOptions 控件。
/// ToolbarFill2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOptions;
protected global::FineUIPro.ToolbarFill ToolbarFill2;
/// <summary>
/// optio 控件。
/// btnNew 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow optio;
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnapprove 控件。
/// lblNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnapprove;
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// plApprove2 控件。
@ -210,15 +210,6 @@ namespace FineUIPro.Web.ZHGL.Plan {
/// </remarks>
protected global::FineUIPro.Grid gvApprove;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label3 控件。
/// </summary>
@ -228,15 +219,6 @@ namespace FineUIPro.Web.ZHGL.Plan {
/// </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>
@ -326,5 +308,41 @@ namespace FineUIPro.Web.ZHGL.Plan {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuDelete;
}
}

52
SGGL/FineUIPro.Web/ZHGL/Plan/MainContractOpinionEdit.aspx Normal file
View File

@ -0,0 +1,52 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MainContractOpinionEdit.aspx.cs" Inherits="FineUIPro.Web.ZHGL.Plan.MainContractOpinionEdit" %>
<!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"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtOriginalNum" runat="server" ShowRedStar="true" Required="true" Label="原文章节号" LabelAlign="Right" MaxLength="50" LabelWidth="150px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtOriginalContent" ShowRedStar="true" Required="true" runat="server" Label="原文内容" MaxLength="1000" LabelWidth="150px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion" ShowRedStar="true" Required="true" runat="server" Label="修改建议" MaxLength="1000" LabelWidth="150px">
</f:TextArea>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<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="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
</form>
</body>
</html>

100
SGGL/FineUIPro.Web/ZHGL/Plan/MainContractOpinionEdit.aspx.cs Normal file
View File

@ -0,0 +1,100 @@
using BLL;
using System;
namespace FineUIPro.Web.ZHGL.Plan
{
public partial class MainContractOpinionEdit : PageBase
{
#region 定义项
/// <summary>
/// 主键
/// </summary>
public string MainContractOpinionId
{
get
{
return (string)ViewState["MainContractOpinionId"];
}
set
{
ViewState["MainContractOpinionId"] = value;
}
}
/// <summary>
/// 主表主键
/// </summary>
public string MainContractId
{
get
{
return (string)ViewState["MainContractId"];
}
set
{
ViewState["MainContractId"] = value;
}
}
#endregion
#region 加载
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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 保存
/// <summary>
/// 保存按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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
}
}

105
SGGL/FineUIPro.Web/ZHGL/Plan/MainContractOpinionEdit.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,105 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.ZHGL.Plan {
public partial class MainContractOpinionEdit {
/// <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>
/// txtOriginalNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtOriginalNum;
/// <summary>
/// txtOriginalContent 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOriginalContent;
/// <summary>
/// txtOpinion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnClose 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
}
}

26
SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx
View File

@ -71,34 +71,22 @@
<f:FormRow ID="plApprove2">
<Items>
<f:ContentPanel Title="审批列表" ShowBorder="true"
<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="MainContractApproveId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand" ForceFit="true">
DataKeyNames="MainContractOpinionId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand" >
<Columns>
<f:RowNumberField Width="40px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" />
<f:TemplateField ColumnID="ApproveType" Width="150px" HeaderText="办理类型" HeaderTextAlign="Center" TextAlign="Center"
<f:BoundField Width="140px" DataField="OriginalNum" HeaderTextAlign="Center" TextAlign="Left" HeaderText="原文章节号" />
<f:BoundField Width="500px" DataField="OriginalContent" HeaderTextAlign="Center" TextAlign="Left" HeaderText="原文内容" />
<f:BoundField Width="500px" DataField="Opinion" HeaderTextAlign="Center" TextAlign="Left" HeaderText="修改建议" ExpandUnusedSpace="true" />
<f:TemplateField ColumnID="ApproveMan" Width="100px" HeaderText="建议提出人" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.MainContractService.ConvertState(Eval("ApproveType")) %>'></asp:Label>
<asp:Label ID="Label3" runat="server" Text='<%# man(Eval("OpinionMan")) %>'></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.MainContractService.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>

4
SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.cs
View File

@ -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
/// </summary>
private void bindApprove()
{
var list = MainContractApproveService.getListData(MainContractId);
var list = MainContractOpinionService.getListData(MainContractId, null);
gvApprove.DataSource = list;
gvApprove.DataBind();
}

18
SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.designer.cs generated
View File

@ -156,15 +156,6 @@ namespace FineUIPro.Web.ZHGL.Plan {
/// </remarks>
protected global::FineUIPro.Grid gvApprove;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label3 控件。
/// </summary>
@ -174,15 +165,6 @@ namespace FineUIPro.Web.ZHGL.Plan {
/// </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>

123
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx
View File

@ -27,8 +27,8 @@
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpProject" EnableEdit="true" LabelWidth="140px" Label="项目名称"
LabelAlign="Right" >
</f:DropDownList>
LabelAlign="Right">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
@ -68,66 +68,71 @@
</f:ContentPanel>
</Items>
</f:FormRow>
<f:FormRow ID="agree">
<f:FormRow runat="server" ID="Opinion">
<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>
<f:ContentPanel Title="评审意见" ShowBorder="true"
BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
runat="server">
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="评审意见" EnableCollapse="true"
runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="ProjectPlanOpinionId"
DataIDField="ProjectPlanOpinionId" AllowPaging="false" IsDatabasePaging="true" PageSize="1000"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True"
Height="220px">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:ToolbarFill ID="ToolbarFill2" runat="server">
</f:ToolbarFill>
<f:Button ID="btnNew" Icon="Add" runat="server" Text="新增" ToolTip="新增意见" ValidateForms="SimpleForm1"
OnClick="btnNew_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="50px" 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="140px" ColumnID="OriginalNum" DataField="OriginalNum" SortField="OriginalNum"
FieldType="String" HeaderText="原文章节号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="500px" ColumnID="OriginalContent" DataField="OriginalContent" SortField="OriginalContent"
FieldType="String" HeaderText="原文内容" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="500px" ColumnID="Opinion" DataField="Opinion" ExpandUnusedSpace="true"
SortField="Opinion" FieldType="String" HeaderText="修改建议" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
</f:Grid>
</f:ContentPanel>
</Items>
</f:FormRow>
<f:FormRow ID="plApprove2">
<Items>
<f:ContentPanel Title="审批列表" ShowBorder="true"
<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="ProjectPlanApproveId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand" ForceFit="true">
DataKeyNames="ProjectPlanOpinionId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand" >
<Columns>
<f:RowNumberField Width="40px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" />
<f:TemplateField ColumnID="ApproveType" Width="150px" HeaderText="办理类型" HeaderTextAlign="Center" TextAlign="Center"
<f:BoundField Width="140px" DataField="OriginalNum" HeaderTextAlign="Center" TextAlign="Left" HeaderText="原文章节号" />
<f:BoundField Width="500px" DataField="OriginalContent" HeaderTextAlign="Center" TextAlign="Left" HeaderText="原文内容" />
<f:BoundField Width="500px" DataField="Opinion" HeaderTextAlign="Center" TextAlign="Left" HeaderText="修改建议" ExpandUnusedSpace="true" />
<f:TemplateField ColumnID="ApproveMan" Width="100px" HeaderText="建议提出人" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.ProjectPlanService.ConvertState(Eval("ApproveType")) %>'></asp:Label>
<asp:Label ID="Label3" runat="server" Text='<%# man(Eval("OpinionMan")) %>'></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.ProjectPlanService.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>
@ -164,6 +169,30 @@
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="WindowAtt_Close"
Width="700px" Height="500px">
</f:Window>
<f:Window ID="Window1" Title="评审意见" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="800px" Height="500px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
runat="server" Text="编辑">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
</f:MenuButton>
</f:Menu>
</form>
<script type="text/javascript">
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>

145
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx.cs
View File

@ -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
/// </summary>
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<Model.ActionPlan_ProjectPlanApprove> approve3s = BLL.ProjectPlanApproveService.GetReviewings(ProjectPlanId, edtion); //审批集合
List<Model.ActionPlan_ProjectPlanApprove> 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)));
}
/// <summary>
/// 关闭弹出窗口
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window1_Close(object sender, EventArgs e)
{
BindGrid();
}
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
var opinions = BLL.ProjectPlanOpinionService.GetProjectPlanOpinionByProjectPlanId(this.ProjectPlanId, this.CurrUser.PersonId);
this.Grid1.DataSource = opinions;
this.Grid1.DataBind();
}
#region 新增
/// <summary>
/// 添加
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnNew_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectPlanOpinionEdit.aspx?ProjectPlanId={0}", this.ProjectPlanId, "编辑 - ")));
}
#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;
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectPlanOpinionEdit.aspx?ProjectPlanOpinionId={0}", id, "编辑 - ")));
}
#endregion
/// <summary>
/// 右键删除事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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);
}
}
}

78
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx.designer.cs generated
View File

@ -139,58 +139,58 @@ namespace FineUIPro.Web.ZHGL.Plan {
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divC;
/// <summary>
/// agree 控件。
/// Opinion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow agree;
protected global::FineUIPro.FormRow Opinion;
/// <summary>
/// rblIsAgree 控件。
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsAgree;
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// options 控件。
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow options;
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtOptions 控件。
/// ToolbarFill2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOptions;
protected global::FineUIPro.ToolbarFill ToolbarFill2;
/// <summary>
/// optio 控件。
/// btnNew 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow optio;
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnapprove 控件。
/// lblNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnapprove;
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// plApprove2 控件。
@ -210,15 +210,6 @@ namespace FineUIPro.Web.ZHGL.Plan {
/// </remarks>
protected global::FineUIPro.Grid gvApprove;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label3 控件。
/// </summary>
@ -228,15 +219,6 @@ namespace FineUIPro.Web.ZHGL.Plan {
/// </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>
@ -326,5 +308,41 @@ namespace FineUIPro.Web.ZHGL.Plan {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuDelete;
}
}

52
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanOpinionEdit.aspx Normal file
View File

@ -0,0 +1,52 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectPlanOpinionEdit.aspx.cs" Inherits="FineUIPro.Web.ZHGL.Plan.ProjectPlanOpinionEdit" %>
<!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"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtOriginalNum" runat="server" ShowRedStar="true" Required="true" Label="原文章节号" LabelAlign="Right" MaxLength="50" LabelWidth="150px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtOriginalContent" ShowRedStar="true" Required="true" runat="server" Label="原文内容" MaxLength="1000" LabelWidth="150px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtOpinion" ShowRedStar="true" Required="true" runat="server" Label="修改建议" MaxLength="1000" LabelWidth="150px">
</f:TextArea>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<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="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
</form>
</body>
</html>

100
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanOpinionEdit.aspx.cs Normal file
View File

@ -0,0 +1,100 @@
using BLL;
using System;
namespace FineUIPro.Web.ZHGL.Plan
{
public partial class ProjectPlanOpinionEdit : PageBase
{
#region 定义项
/// <summary>
/// 主键
/// </summary>
public string ProjectPlanOpinionId
{
get
{
return (string)ViewState["ProjectPlanOpinionId"];
}
set
{
ViewState["ProjectPlanOpinionId"] = value;
}
}
/// <summary>
/// 主表主键
/// </summary>
public string ProjectPlanId
{
get
{
return (string)ViewState["ProjectPlanId"];
}
set
{
ViewState["ProjectPlanId"] = value;
}
}
#endregion
#region 加载
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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 保存
/// <summary>
/// 保存按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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
}
}

105
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanOpinionEdit.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,105 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.ZHGL.Plan {
public partial class ProjectPlanOpinionEdit {
/// <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>
/// txtOriginalNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtOriginalNum;
/// <summary>
/// txtOriginalContent 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOriginalContent;
/// <summary>
/// txtOpinion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOpinion;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnClose 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
}
}

27
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx
View File

@ -68,37 +68,26 @@
</f:ContentPanel>
</Items>
</f:FormRow>
<f:FormRow ID="plApprove2">
<Items>
<f:ContentPanel Title="审批列表" ShowBorder="true"
<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="ProjectPlanApproveId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand" ForceFit="true">
DataKeyNames="ProjectPlanOpinionId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand" >
<Columns>
<f:RowNumberField Width="40px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" />
<f:TemplateField ColumnID="ApproveType" Width="150px" HeaderText="办理类型" HeaderTextAlign="Center" TextAlign="Center"
<f:BoundField Width="140px" DataField="OriginalNum" HeaderTextAlign="Center" TextAlign="Left" HeaderText="原文章节号" />
<f:BoundField Width="500px" DataField="OriginalContent" HeaderTextAlign="Center" TextAlign="Left" HeaderText="原文内容" />
<f:BoundField Width="500px" DataField="Opinion" HeaderTextAlign="Center" TextAlign="Left" HeaderText="修改建议" ExpandUnusedSpace="true" />
<f:TemplateField ColumnID="ApproveMan" Width="100px" HeaderText="建议提出人" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.ProjectPlanService.ConvertState(Eval("ApproveType")) %>'></asp:Label>
<asp:Label ID="Label3" runat="server" Text='<%# man(Eval("OpinionMan")) %>'></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.ProjectPlanService.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>

4
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx.cs
View File

@ -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
/// </summary>
private void bindApprove()
{
var list = ProjectPlanApproveService.getListData(ProjectPlanId);
var list = ProjectPlanOpinionService.getListData(ProjectPlanId, null);
gvApprove.DataSource = list;
gvApprove.DataBind();
}

18
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx.designer.cs generated
View File

@ -156,15 +156,6 @@ namespace FineUIPro.Web.ZHGL.Plan {
/// </remarks>
protected global::FineUIPro.Grid gvApprove;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label3 控件。
/// </summary>
@ -174,15 +165,6 @@ namespace FineUIPro.Web.ZHGL.Plan {
/// </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>

572
SGGL/Model/Model.cs
View File

@ -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> ActionPlan_MainContractOpinion
{
get
{
return this.GetTable<ActionPlan_MainContractOpinion>();
}
}
public System.Data.Linq.Table<ActionPlan_ManagerRule> ActionPlan_ManagerRule
{
get
@ -1822,6 +1836,14 @@ namespace Model
}
}
public System.Data.Linq.Table<ActionPlan_ProjectPlanOpinion> ActionPlan_ProjectPlanOpinion
{
get
{
return this.GetTable<ActionPlan_ProjectPlanOpinion>();
}
}
public System.Data.Linq.Table<AttachFile> AttachFile
{
get
@ -12088,6 +12110,8 @@ namespace Model
private EntitySet<ActionPlan_MainContractApprove> _ActionPlan_MainContractApprove;
private EntitySet<ActionPlan_MainContractOpinion> _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<Base_Project>);
this._Person_Persons = default(EntityRef<Person_Persons>);
this._ActionPlan_MainContractApprove = new EntitySet<ActionPlan_MainContractApprove>(new Action<ActionPlan_MainContractApprove>(this.attach_ActionPlan_MainContractApprove), new Action<ActionPlan_MainContractApprove>(this.detach_ActionPlan_MainContractApprove));
this._ActionPlan_MainContractOpinion = new EntitySet<ActionPlan_MainContractOpinion>(new Action<ActionPlan_MainContractOpinion>(this.attach_ActionPlan_MainContractOpinion), new Action<ActionPlan_MainContractOpinion>(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> 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<System.DateTime> _OpinionDate;
private string _OriginalNum;
private string _OriginalContent;
private string _Opinion;
private EntityRef<ActionPlan_MainContract> _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<System.DateTime> 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<ActionPlan_MainContract>);
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<System.DateTime> 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> _ActionPlan_ProjectPlanApprove;
private EntitySet<ActionPlan_ProjectPlanOpinion> _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<Base_Project>);
this._Person_Persons = default(EntityRef<Person_Persons>);
this._ActionPlan_ProjectPlanApprove = new EntitySet<ActionPlan_ProjectPlanApprove>(new Action<ActionPlan_ProjectPlanApprove>(this.attach_ActionPlan_ProjectPlanApprove), new Action<ActionPlan_ProjectPlanApprove>(this.detach_ActionPlan_ProjectPlanApprove));
this._ActionPlan_ProjectPlanOpinion = new EntitySet<ActionPlan_ProjectPlanOpinion>(new Action<ActionPlan_ProjectPlanOpinion>(this.attach_ActionPlan_ProjectPlanOpinion), new Action<ActionPlan_ProjectPlanOpinion>(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> 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<System.DateTime> _OpinionDate;
private string _OriginalNum;
private string _OriginalContent;
private string _Opinion;
private EntityRef<ActionPlan_ProjectPlan> _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<System.DateTime> 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<ActionPlan_ProjectPlan>);
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<System.DateTime> 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
{