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

修改项目策划、总包合同

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs
+1 -1
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)
{
SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListView.aspx.cs
+1 -1
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;
SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx
+74 -45
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>
SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.cs
+94 -50
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);
}
}
}
SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.designer.cs
Generated
+48 -30
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;
}
}
SGGL/FineUIPro.Web/ZHGL/Plan/MainContractOpinionEdit.aspx
+52
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>
SGGL/FineUIPro.Web/ZHGL/Plan/MainContractOpinionEdit.aspx.cs
+100
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
}
}
SGGL/FineUIPro.Web/ZHGL/Plan/MainContractOpinionEdit.aspx.designer.cs
Generated
+105
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;
}
}
SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx
+7 -19
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>
SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.cs
+2 -2
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();
}
SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.designer.cs
Generated
-18
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>
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx
+76 -47
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>
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx.cs
+95 -50
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);
}
}
}
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx.designer.cs
Generated
+48 -30
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;
}
}
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanOpinionEdit.aspx
+52
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>
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanOpinionEdit.aspx.cs
+100
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
}
}
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanOpinionEdit.aspx.designer.cs
Generated
+105
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;
}
}
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx
+8 -19
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>
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx.cs
+2 -2
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();
}
SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx.designer.cs
Generated
-18
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>