关键事项、邮件管理、任务管理

This commit is contained in:
2025-03-13 10:52:32 +08:00
parent 7a242ed776
commit c73bb1124d
99 changed files with 9738 additions and 3791 deletions
+68 -63
View File
@@ -19,48 +19,50 @@
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="员工信息" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="GJSXID" EnableColumnLines="true"
DataIDField="GJSXID" AllowSorting="true" SortField="GJSXID"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="员工信息" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="GJSXID" EnableColumnLines="true"
DataIDField="GJSXID" AllowSorting="true" SortField="GJSXID"
SortDirection="desc" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:DropDownList runat="server" ID="state" Label="状态" MaxLength="50" LabelWidth="110px">
<f:ListItem Text="关闭" Value="0" />
<f:ListItem Text="开放" Value="1" />
<f:ListItem Selected="true" Text="正在进行" Value="2" />
</f:DropDownList>
<f:DropDownList ID="DropUnitId" runat="server" Label="责任单位" EnableEdit="true" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropUserId" runat="server" Label="提出人" EnableEdit="true" LabelWidth="110px" >
</f:DropDownList>
<f:DropDownList ID="DropQuestionTypeID" runat="server" Label="问题类别" EnableEdit="true" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropCNProfessional_ID" runat="server" Label="专业" EnableEdit="true" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropUser_ReceiveID" runat="server" Label="接受人" EnableEdit="true" LabelWidth="110px" >
</f:DropDownList>
<f:DropDownList ID="DropUser_Acceptance" runat="server" Label="验收人" EnableEdit="true" LabelWidth="110px" >
</f:DropDownList>
<f:DropDownList runat="server" ID="state" Label="状态" MaxLength="50" LabelWidth="110px">
<f:ListItem Text="关闭" Value="0" />
<f:ListItem Text="开放" Value="1" />
<f:ListItem Selected="true" Text="正在进行" Value="2" />
</f:DropDownList>
<f:DropDownList ID="DropUnitId" runat="server" Label="责任单位" EnableEdit="true" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropUserId" runat="server" Label="提出人" EnableEdit="true" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropQuestionTypeID" runat="server" Label="紧急程度" EnableEdit="true" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropGJSXTypeID" runat="server" Label="事项类别" EnableEdit="true" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropCNProfessional_ID" runat="server" Label="专业" EnableEdit="true" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropUser_ReceiveID" runat="server" Label="接受人" EnableEdit="true" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropUser_Acceptance" runat="server" Label="验收人" EnableEdit="true" LabelWidth="110px">
</f:DropDownList>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="要求完成时间" ID="txtStartTime" Width="250px" LabelWidth="110px"
LabelAlign="right" EnableEdit="false" >
</f:DatePicker>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="至" ID="txtEndTime" Width="190px" LabelWidth="50px"
LabelAlign="right" EnableEdit="false" OnTextChanged="TextBox_TextChanged">
</f:DatePicker>
<f:Button ID="btnQuery" OnClick="TextBox_TextChanged" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" runat="server" >
</f:Button>
<f:ToolbarFill runat="server">
</f:ToolbarFill>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server"
Hidden="true">
</f:Button>
<%-- <f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationAdd" Hidden="true" runat="server"
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="要求完成时间" ID="txtStartTime" Width="250px" LabelWidth="110px"
LabelAlign="right" EnableEdit="false">
</f:DatePicker>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="至" ID="txtEndTime" Width="190px" LabelWidth="50px"
LabelAlign="right" EnableEdit="false" OnTextChanged="TextBox_TextChanged">
</f:DatePicker>
<f:Button ID="btnQuery" OnClick="TextBox_TextChanged" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" runat="server">
</f:Button>
<f:ToolbarFill runat="server">
</f:ToolbarFill>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server"
Hidden="true">
</f:Button>
<%-- <f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationAdd" Hidden="true" runat="server"
OnClick="btnImport_Click">
</f:Button>--%>
</Items>
@@ -72,47 +74,50 @@
<f:RenderField Width="100px" ColumnID="GJSXID" DataField="GJSXID" SortField="GJSXID" Hidden="true"
FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Detail" DataField="Detail" SortField="Detail"
<f:RenderField Width="200px" ColumnID="GJSXTypeName" DataField="GJSXTypeName" SortField="GJSXTypeName"
FieldType="String" HeaderText="事项类别" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Detail" DataField="Detail" SortField="Detail"
FieldType="String" HeaderText="事项描述" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="QuestionTypeName" DataField="QuestionTypeName" SortField="QuestionTypeName"
FieldType="String" HeaderText="问题类别" HeaderTextAlign="Center" TextAlign="Left" >
FieldType="String" HeaderText="紧急程度" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="State" DataField="State" SortField="State"
FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate"
FieldType="String" HeaderText="提出日期" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="120px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate"
HeaderText="提出日期" HeaderTextAlign="Center" TextAlign="Center" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="CompleteDate" DataField="CompleteDate" SortField="CompleteDate"
FieldType="String" HeaderText="要求完成日期" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="130px" ColumnID="CompleteDate" DataField="CompleteDate" SortField="CompleteDate"
HeaderText="要求完成日期" HeaderTextAlign="Center" TextAlign="Center" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="CloseDate" DataField="CloseDate" SortField="CloseDate"
FieldType="String" HeaderText="关闭日期" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="140px" ColumnID="CloseDate" DataField="CloseDate" SortField="CloseDate"
HeaderText="关闭日期" HeaderTextAlign="Center" TextAlign="Center" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="User_ReceiveID" DataField="User_ReceiveID" SortField="User_ReceiveID"
FieldType="String" HeaderText="接受人" HeaderTextAlign="Center" TextAlign="Left" >
FieldType="String" HeaderText="接受人" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="User_Acceptance" DataField="User_Acceptance"
FieldType="String" HeaderText="验收人" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="100px" ColumnID="User_Acceptance" DataField="User_Acceptance"
FieldType="String" HeaderText="验收人" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="username" DataField="username"
FieldType="String" HeaderText="提出人" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="100px" ColumnID="username" DataField="username"
FieldType="String" HeaderText="提出人" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="unitname" DataField="unitname"
FieldType="String" HeaderText="责任单位" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="150px" ColumnID="unitname" DataField="unitname"
FieldType="String" HeaderText="责任单位" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="CNProfessionalID" DataField="CNProfessionalID"
FieldType="String" HeaderText="专业" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="150px" ColumnID="CNProfessionalID" DataField="CNProfessionalID"
FieldType="String" HeaderText="专业" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="AttachUrl" DataField="AttachUrl"
<f:RenderField Width="150px" ColumnID="AttachUrl" DataField="AttachUrl"
FieldType="String" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<%-- <f:TemplateField ColumnID="Certificate" Width="250px" HeaderText="职业资格证书" HeaderTextAlign="Center" TextAlign="Left">
<%-- <f:TemplateField ColumnID="Certificate" Width="250px" HeaderText="职业资格证书" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertCertificateName(Eval("UserId")) %>'></asp:Label>
</ItemTemplate>
@@ -133,7 +138,7 @@
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数:">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
@@ -141,12 +146,12 @@
</f:Panel>
<f:Window ID="Window1" Title="关键事项" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px"
Height="560px">
Height="720px">
</f:Window>
<f:Window ID="Window2" Title="导入人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="false"
CloseAction="HidePostBack" Width="1000px" Height="560px">
</f:Window>
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
Hidden="true" runat="server" Text="编辑" Icon="Pencil">
+16 -11
View File
@@ -26,15 +26,17 @@ namespace FineUIPro.Web.PZHGL.GJSX
CNProfessionalService.InitCNProfessional(this.DropCNProfessional_ID, true);
//编号
string projectCode = BLL.ProjectService.GetProjectCodeByProjectId(this.CurrUser.LoginProjectId);
//问题类别
//紧急程度
QuestionTypeService.InitQuestionTypeDropDownList(this.DropQuestionTypeID, true);
//事项类别
GJSXTypeService.InitGJSXTypeDropDownList(this.DropGJSXTypeID, false);
//验收人
UserService.InitUserDropDownList(DropUser_ReceiveID, CurrUser.LoginProjectId, true, string.Empty);
//接收人
UserService.InitUserDropDownList(DropUser_Acceptance, CurrUser.LoginProjectId, true, string.Empty);
//提出人
UserService.InitUserDropDownList( DropUserId, CurrUser.LoginProjectId, true, string.Empty);
UserService.InitUserDropDownList(DropUserId, CurrUser.LoginProjectId, true, string.Empty);
Funs.DropDownPageSize(this.ddlPageSize);
////权限按钮方法
this.GetButtonPower();
@@ -55,7 +57,6 @@ namespace FineUIPro.Web.PZHGL.GJSX
/// </summary>
private void BindGrid()
{
string strSql = "";
List<SqlParameter> listStr = new List<SqlParameter>();
@@ -67,7 +68,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
{
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
}
if ( this.state.SelectedValue!="null")//状态
if (this.state.SelectedValue != "null")//状态
{
strSql += " AND state LIKE " + "'%" + this.state.SelectedText.Trim() + "%'";
}
@@ -84,21 +85,25 @@ namespace FineUIPro.Web.PZHGL.GJSX
{
strSql += " AND unitname LIKE " + "'%" + this.DropUnitId.SelectedText.Trim() + "%'";
}
if ( this.DropCNProfessional_ID.SelectedValue!= Const._Null)//专业
if (this.DropCNProfessional_ID.SelectedValue != Const._Null)//专业
{
strSql += " AND CNProfessionalId LIKE " + "'%" + this.DropCNProfessional_ID.SelectedText.Trim() + "%'";
}
if (this.DropQuestionTypeID.SelectedValue != Const._Null)//问题类型
if (this.DropQuestionTypeID.SelectedValue != Const._Null)//紧急程度
{
strSql += " AND QuestionTypeName LIKE " + "'%" + this.DropQuestionTypeID.SelectedText.Trim() + "%'";
}
if (this.DropGJSXTypeID.SelectedValue != Const._Null)//事项类别
{
strSql += " AND GJSXTypeName LIKE " + "'%" + this.DropGJSXTypeID.SelectedText.Trim() + "%'";
}
if (this.DropUser_Acceptance.SelectedValue != Const._Null)//验收人
{
strSql += " AND user_Acceptance LIKE " + "'%" + this.DropUser_Acceptance.SelectedText.Trim() + "%'";
}
if ( !string .IsNullOrEmpty( this.txtStartTime.Text))//要求完成时间 start
if (!string.IsNullOrEmpty(this.txtStartTime.Text))//要求完成时间 start
{
strSql += " AND CompleteDate > convert(datetime,"+"'" + this.txtStartTime.Text.Trim() + "')";
strSql += " AND CompleteDate > convert(datetime," + "'" + this.txtStartTime.Text.Trim() + "')";
}
if (!string.IsNullOrEmpty(this.txtEndTime.Text))//要求完成时间 end
{
@@ -115,7 +120,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
Grid1.DataBind();
}
#region
/// <summary>
@@ -143,7 +148,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
if (buttonList.Contains(BLL.Const.BtnAdd))
{
this.btnNew.Hidden = false;
// this.btnImport.Hidden = false;
// this.btnImport.Hidden = false;
}
if (buttonList.Contains(BLL.Const.BtnModify))
{
+38 -27
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.PZHGL.GJSX {
public partial class GJSXFind {
namespace FineUIPro.Web.PZHGL.GJSX
{
public partial class GJSXFind
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// state 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList state;
/// <summary>
/// DropUnitId 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropUnitId;
/// <summary>
/// DropUserId 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropUserId;
/// <summary>
/// DropQuestionTypeID 控件。
/// </summary>
@@ -92,7 +94,16 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropQuestionTypeID;
/// <summary>
/// DropGJSXTypeID 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropGJSXTypeID;
/// <summary>
/// DropCNProfessional_ID 控件。
/// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropCNProfessional_ID;
/// <summary>
/// DropUser_ReceiveID 控件。
/// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropUser_ReceiveID;
/// <summary>
/// DropUser_Acceptance 控件。
/// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropUser_Acceptance;
/// <summary>
/// txtStartTime 控件。
/// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartTime;
/// <summary>
/// txtEndTime 控件。
/// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
/// <summary>
/// btnQuery 控件。
/// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// btnNew 控件。
/// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>关键事项统计</title>
<title>关键事项统计</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<style type="text/css">
.f-grid-row .f-grid-cell-inner {
@@ -14,39 +14,37 @@
</style>
</head>
<body>
<form id="form1" runat="server">
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="关键事项统计" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="allcount" EnableColumnLines="true"
DataIDField="allcount" AllowSorting="true" SortField="allcount"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="关键事项统计" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="allcount" EnableColumnLines="true"
DataIDField="allcount" AllowSorting="true" SortField="allcount"
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" AllowCellEditing="true" ClicksToEdit="1">
OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" AllowCellEditing="true" ClicksToEdit="1">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:DropDownList ID="DropUnitId" runat="server" Label="责任单位" AutoSelectFirstItem="false" EmptyText="请选择一项" MaxLength="50" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropCreatuser" runat="server" Label="提出人" AutoSelectFirstItem="false" EmptyText="请选择一项" MaxLength="50" LabelWidth="110px" >
</f:DropDownList>
<f:DropDownList ID="DropUser_ReceiveID" runat="server" Label="接受人" AutoSelectFirstItem="false" EmptyText="请选择一项" MaxLength="50" LabelWidth="110px" >
</f:DropDownList>
<f:DropDownList ID="DropQuestionTypeID" runat="server" Label="问题类别" AutoSelectFirstItem="false" EmptyText="请选择一项" MaxLength="50" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropCNProfessional_ID" runat="server" Label="专业" AutoSelectFirstItem="false" EmptyText="请选择一项" MaxLength="50" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropUser_Acceptance" runat="server" Label="验收人" AutoSelectFirstItem="false" EmptyText="请选择一项" MaxLength="50" LabelWidth="110px" >
</f:DropDownList>
<f:Button ID="btnQuery" OnClick="TextBox_TextChanged" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" runat="server" >
</f:Button>
<f:DropDownList ID="DropUnitId" runat="server" Label="责任单位" AutoSelectFirstItem="false" EmptyText="请选择一项" MaxLength="50" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropCreatuser" runat="server" Label="提出人" AutoSelectFirstItem="false" EmptyText="请选择一项" MaxLength="50" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropUser_ReceiveID" runat="server" Label="接受人" AutoSelectFirstItem="false" EmptyText="请选择一项" MaxLength="50" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropQuestionTypeID" runat="server" Label="紧急程度" AutoSelectFirstItem="false" EmptyText="请选择一项" MaxLength="50" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropGJSXTypeID" runat="server" Label="事项类别" AutoSelectFirstItem="false" EmptyText="请选择一项" MaxLength="50" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropCNProfessional_ID" runat="server" Label="专业" AutoSelectFirstItem="false" EmptyText="请选择一项" MaxLength="50" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropUser_Acceptance" runat="server" Label="验收人" AutoSelectFirstItem="false" EmptyText="请选择一项" MaxLength="50" LabelWidth="110px">
</f:DropDownList>
<f:Button ID="btnQuery" OnClick="TextBox_TextChanged" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" runat="server">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
@@ -77,25 +75,25 @@
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数:">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="关键事项统计" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px"
Height="560px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" EnablePostBack="true"
<f:MenuButton ID="btnMenuEdit" EnablePostBack="true"
Hidden="true" runat="server" Text="编辑" Icon="Pencil">
</f:MenuButton>
</f:Menu>
</form>
<script type="text/jscript">
<script type="text/jscript">
var menuID = '<%= Menu1.ClientID %>';
// 返回false,来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
@@ -22,8 +22,10 @@ namespace FineUIPro.Web.PZHGL.GJSX
CNProfessionalService.InitCNProfessional(this.DropCNProfessional_ID, true);
//编号
string projectCode = BLL.ProjectService.GetProjectCodeByProjectId(this.CurrUser.LoginProjectId);
//问题类别
//紧急程度
QuestionTypeService.InitQuestionTypeDropDownList(this.DropQuestionTypeID, true);
//事项类别
GJSXTypeService.InitGJSXTypeDropDownList(this.DropGJSXTypeID, false);
//验收人
UserService.InitUserDropDownList(DropUser_ReceiveID, CurrUser.LoginProjectId, false, string.Empty);
//接收人
@@ -32,7 +34,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
BindGrid();
}
}
protected void TextBox_TextChanged(object sender, EventArgs e)
@@ -46,7 +48,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
//@unit nvarchar(50)= null, --责任单位
//@projectId nvarchar(50) = null, --所属项目
//@CNProfessional_ID nvarchar(500) = null, --专业
//@questionType nvarchar(500)= null, --问题类别
//@questionType nvarchar(500)= null, --紧急程度
//@processMan nvarchar(50) = null, --接收人
//@User_Acceptance nvarchar(50) = null--验收人
@@ -55,6 +57,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
string projectid = CurrUser.LoginProjectId;
string CNProfessional_ID = DropCNProfessional_ID.SelectedValue;
string questionType = DropQuestionTypeID.SelectedValue;
string GJSXType = DropGJSXTypeID.SelectedValue;
string processMan = DropUser_ReceiveID.SelectedValue;
string User_Acceptance = DropUser_Acceptance.SelectedValue;
//if (userid is null)
@@ -77,6 +80,10 @@ namespace FineUIPro.Web.PZHGL.GJSX
{
questionType = null;
}
if (GJSXType == "null")
{
GJSXType = null;
}
//if (processMan is null)
//{
// processMan = "";
@@ -95,11 +102,12 @@ namespace FineUIPro.Web.PZHGL.GJSX
listStr.Add(new SqlParameter("@projectid", projectid));
listStr.Add(new SqlParameter("@CNProfessional_ID", CNProfessional_ID));
listStr.Add(new SqlParameter("@questionType", questionType));
listStr.Add(new SqlParameter("@GJSXType", GJSXType));
listStr.Add(new SqlParameter("@processMan", processMan));
listStr.Add(new SqlParameter("@User_Acceptance", User_Acceptance));
SqlParameter[] parameter = listStr.ToArray();
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunProc("Sp_GJSXStatistic", parameter);
@@ -107,7 +115,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
var table = this.GetPagedDataTable(Grid1, tb);
this.Grid1.DataSource = table;
this.Grid1.DataBind();
}
/// <summary>
@@ -130,7 +138,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
BindGrid();
}
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
@@ -144,7 +152,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
/// <param name="e"></param>
protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
{
// this.EditData();
// this.EditData();
}
}
}
+33 -22
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.PZHGL.GJSX {
public partial class GJSXInfoCount {
namespace FineUIPro.Web.PZHGL.GJSX
{
public partial class GJSXInfoCount
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// DropUnitId 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropUnitId;
/// <summary>
/// DropCreatuser 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropCreatuser;
/// <summary>
/// DropUser_ReceiveID 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropUser_ReceiveID;
/// <summary>
/// DropQuestionTypeID 控件。
/// </summary>
@@ -92,7 +94,16 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropQuestionTypeID;
/// <summary>
/// DropGJSXTypeID 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropGJSXTypeID;
/// <summary>
/// DropCNProfessional_ID 控件。
/// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropCNProfessional_ID;
/// <summary>
/// DropUser_Acceptance 控件。
/// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropUser_Acceptance;
/// <summary>
/// btnQuery 控件。
/// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
+38 -35
View File
@@ -19,12 +19,12 @@
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="关键事项" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="GJSXID" EnableColumnLines="true"
DataIDField="GJSXID" AllowSorting="true" SortField="GJSXID"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="关键事项" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="GJSXID" EnableColumnLines="true"
DataIDField="GJSXID" AllowSorting="true" SortField="GJSXID"
SortDirection="desc" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
@@ -41,7 +41,7 @@
OnTextChanged="TextBox_TextChanged" Width="300px" LabelWidth="60px">
</f:TextBox>
<f:CheckBox runat="server" ID="ckbAll" Label="全部" LabelAlign="Right" AutoPostBack="true" OnCheckedChanged="ckbAll_CheckedChanged"></f:CheckBox>
<f:TextBox runat="server" Label="问题类型" ID="txtBase_QuestionType" EmptyText="输入查询条件" AutoPostBack="true"
<f:TextBox runat="server" Label="紧急程度" ID="txtBase_QuestionType" EmptyText="输入查询条件" AutoPostBack="true"
OnTextChanged="TextBox_TextChanged" Width="300px" LabelWidth="80px">
</f:TextBox>
<f:TextBox runat="server" Label="验收人" ID="txtuser_Acceptance" EmptyText="输入查询条件" AutoPostBack="true"
@@ -60,7 +60,7 @@
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server"
Hidden="true">
</f:Button>
<%--<f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationAdd" Hidden="true" runat="server"
<%--<f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationAdd" Hidden="true" runat="server"
OnClick="btnImport_Click">
</f:Button>--%>
</Items>
@@ -72,48 +72,51 @@
<%--<f:RenderField Width="120px" ColumnID="GJSXID" DataField="GJSXID" SortField="GJSXID"
FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>--%>
<f:RenderField Width="220px" ColumnID="GJSXTypeName" DataField="GJSXTypeName" SortField="GJSXTypeName"
FieldType="String" HeaderText="事项类别" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="350px" ColumnID="Detail" DataField="Detail" SortField="Detail"
FieldType="String" HeaderText="事项描述" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="QuestionTypeName" DataField="QuestionTypeName" SortField="QuestionTypeName"
FieldType="String" HeaderText="问题类别" HeaderTextAlign="Center" TextAlign="Left" >
FieldType="String" HeaderText="紧急程度" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="unitname" DataField="unitname"
<f:RenderField Width="200px" ColumnID="unitname" DataField="unitname"
FieldType="String" HeaderText="责任单位" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="CNProfessionalID" DataField="CNProfessionalID"
FieldType="String" HeaderText="专业" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="150px" ColumnID="CNProfessionalID" DataField="CNProfessionalID"
FieldType="String" HeaderText="专业" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="Certificate" Width="150px" HeaderText="事项进展情况" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertProgressDetail(Eval("GJSXID")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertProgressDetail(Eval("GJSXID")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="90px" ColumnID="State" DataField="State" SortField="State"
FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate"
FieldType="String" HeaderText="提出日期" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="120px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate"
HeaderText="提出日期" HeaderTextAlign="Center" TextAlign="Center" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="CompleteDate" DataField="CompleteDate" SortField="CompleteDate"
FieldType="String" HeaderText="要求完成日期" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="130px" ColumnID="CompleteDate" DataField="CompleteDate" SortField="CompleteDate"
HeaderText="要求完成日期" HeaderTextAlign="Center" TextAlign="Center" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="CloseDate" DataField="CloseDate" SortField="CloseDate"
FieldType="String" HeaderText="关闭日期" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="140px" ColumnID="CloseDate" DataField="CloseDate" SortField="CloseDate"
HeaderText="关闭日期" HeaderTextAlign="Center" TextAlign="Center" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="User_ReceiveID" DataField="User_ReceiveID" SortField="User_ReceiveID"
FieldType="String" HeaderText="跟踪人" HeaderTextAlign="Center" TextAlign="Left" >
<f:RenderField Width="100px" ColumnID="User_ReceiveID" DataField="User_ReceiveID" SortField="User_ReceiveID"
FieldType="String" HeaderText="跟踪人" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="User_Acceptance" DataField="User_Acceptance"
FieldType="String" HeaderText="责任人" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="100px" ColumnID="User_Acceptance" DataField="User_Acceptance"
FieldType="String" HeaderText="责任人" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="username" DataField="username"
FieldType="String" HeaderText="提出人" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="100px" ColumnID="username" DataField="username"
FieldType="String" HeaderText="提出人" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<%-- <f:TemplateField ColumnID="Certificate" Width="250px" HeaderText="职业资格证书" HeaderTextAlign="Center" TextAlign="Left">
<%-- <f:TemplateField ColumnID="Certificate" Width="250px" HeaderText="职业资格证书" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertCertificateName(Eval("UserId")) %>'></asp:Label>
</ItemTemplate>
@@ -134,7 +137,7 @@
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数:">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
@@ -142,18 +145,18 @@
</f:Panel>
<f:Window ID="Window1" Title="关键事项" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px"
Height="560px">
Height="720px">
</f:Window>
<f:Window ID="Window2" Title="导入人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="false"
CloseAction="HidePostBack" Width="1000px" Height="560px">
</f:Window>
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
Hidden="true" runat="server" Text="编辑" Icon="Pencil">
</f:MenuButton>
<f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据?" OnClick="btnMenuDel_Click" Hidden="true">
</f:MenuButton>
</f:MenuButton>
</f:Menu>
</form>
<script type="text/jscript">
+22 -34
View File
@@ -4,9 +4,6 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.PZHGL.GJSX
{
@@ -62,32 +59,22 @@ namespace FineUIPro.Web.PZHGL.GJSX
private void BindGrid()
{
string strSql = @"select
a.GJSXID
,a.ProjectId
,a.detail
,a.Userid
,b.username
,a.createDate
,User_ReceiveID = STUFF((SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.User_ReceiveID + ',') > 0 FOR XML PATH('')), 1, 1,'')
, CNProfessionalId = STUFF((SELECT ',' + Base_CNProfessional.ProfessionalName FROM dbo.Base_CNProfessional where PATINDEX('%,' + RTRIM(Base_CNProfessional.CNProfessionalId) + ',%', ',' + a.CNProfessional_ID + ',') > 0 FOR XML PATH('')), 1, 1,'')
,Base_Project.ProjectName
,Base_Unit.unitname
,a.CloseDate
,case a.state when 2 then '正在进行' when 3 then '待关闭' when 0 then '已关闭' when 1 then '开放' end as state
,QuestionTypeName = STUFF((SELECT ',' + Base_QuestionType.QuestionTypeName FROM dbo.Base_QuestionType where PATINDEX('%,' + RTRIM(Base_QuestionType.QuestionTypeID) + ',%', ',' + a.QuestionTypeID + ',') > 0 FOR XML PATH('')), 1, 1,'')
,a.IsManypeople
,a.CompleteDate
,a.AttachUrl
,user_Acceptance = STUFF((SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.user_Acceptance + ',') > 0 FOR XML PATH('')), 1, 1,'')
from GJSX as a left join Sys_User as b on a.UserId = b.UserId
left join[dbo].[Base_Project] on a.ProjectId = Base_Project.ProjectId
left join[dbo].[Base_Unit] on a.UnitId = Base_Unit.UnitId
left join[dbo].[Base_QuestionType] on a.QuestionTypeID = Base_QuestionType.QuestionTypeID
string strSql = @"select
a.GJSXID,a.ProjectId,a.detail,a.Userid,b.username,a.createDate
,User_ReceiveID = STUFF((SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.User_ReceiveID + ',') > 0 FOR XML PATH('')), 1, 1,'')
, CNProfessionalId = STUFF((SELECT ',' + Base_CNProfessional.ProfessionalName FROM dbo.Base_CNProfessional where PATINDEX('%,' + RTRIM(Base_CNProfessional.CNProfessionalId) + ',%', ',' + a.CNProfessional_ID + ',') > 0 FOR XML PATH('')), 1, 1,'')
,Base_Project.ProjectName,Base_Unit.unitname,a.CloseDate
,case a.state when 2 then '正在进行' when 3 then '待办' when 0 then '已关闭' when 1 then '开放' end as state
,QuestionTypeName = STUFF((SELECT ',' + Base_QuestionType.QuestionTypeName FROM dbo.Base_QuestionType where PATINDEX('%,' + RTRIM(Base_QuestionType.QuestionTypeID) + ',%', ',' + a.QuestionTypeID + ',') > 0 FOR XML PATH('')), 1, 1,'')
,GJSXTypeName = STUFF((SELECT ',' + Base_GJSXType.GJSXTypeName FROM dbo.Base_GJSXType where PATINDEX('%,' + RTRIM(Base_GJSXType.GJSXTypeID) + ',%', ',' + a.GJSXTypeID + ',') > 0 FOR XML PATH('')), 1, 1,'')
,a.IsManypeople,a.CompleteDate,a.AttachUrl
,user_Acceptance = STUFF((SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.user_Acceptance + ',') > 0 FOR XML PATH('')), 1, 1,'')
from GJSX as a
left join Sys_User as b on a.UserId = b.UserId
left join[dbo].[Base_Project] on a.ProjectId = Base_Project.ProjectId
left join[dbo].[Base_Unit] on a.UnitId = Base_Unit.UnitId
left join[dbo].[Base_QuestionType] on a.QuestionTypeID = Base_QuestionType.QuestionTypeID
left join[dbo].[Base_GJSXType] on a.GJSXTypeID = Base_GJSXType.GJSXTypeID
where a.ProjectId = @ProjectId";
List<SqlParameter> listStr = new List<SqlParameter>();
@@ -102,14 +89,14 @@ namespace FineUIPro.Web.PZHGL.GJSX
var uid = CurrUser.UserId;
//listStr.Add(new SqlParameter("@sql_where", strSql));
//我创建的
if (classify=="0")
if (classify == "0")
{
strSql += " AND a.Userid='" + uid + "' ";
}
//待我处理
else if (classify == "1")
{
strSql += " AND (a.state ='2' and a.User_Acceptance like'%"+ uid + "%' ) or (a.state ='3' and (a.Userid like'%" + uid + "%' or a.User_ReceiveID like'%" + uid + "%' ))";
strSql += " AND (a.state ='2' and a.User_Acceptance like'%" + uid + "%' ) or (a.state ='3' and (a.Userid like'%" + uid + "%' or a.User_ReceiveID like'%" + uid + "%' ))";
}
//我已处理
else if (classify == "2")
@@ -296,10 +283,11 @@ namespace FineUIPro.Web.PZHGL.GJSX
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("GJSXListEdit.aspx?EditType=Edit&Id={0}", Id, "编辑 - ")));
}
else {
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("GJSXListEdit.aspx?EditType=See&Id={0}", Id),"查看 - "));
else
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("GJSXListEdit.aspx?EditType=See&Id={0}", Id), "查看 - "));
}
}
#region
+153 -124
View File
@@ -5,8 +5,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>编辑员工</title>
<%-- <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />--%>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<%-- <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />--%>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<style>
</style>
@@ -17,61 +17,63 @@
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:ContentPanel ID="ContentPanel1" Title="编辑关键事项" ShowBorder="true"
<f:FormRow>
<Items>
<f:ContentPanel ID="ContentPanel1" Title="编辑关键事项" ShowBorder="true"
BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
runat="server">
<f:Form ID="Form_edit" ShowBorder="false" ShowHeader="false" AutoScroll="true"
<f:Form ID="Form_edit" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtGJSXID" runat="server" Label="编号" Hidden="true" MaxLength="20" LabelWidth="110px">
</f:TextBox>
<f:DropDownList ID="DropUnitId" runat="server" Label="责任单位" MaxLength="50" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropCNProfessional_ID" runat="server" Label="专业" MaxLength="50" LabelWidth="110px" EnableCheckBoxSelect="true" EnableMultiSelect="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtGJSXID" runat="server" Label="编号" Hidden="true" MaxLength="20" LabelWidth="110px">
</f:TextBox>
<f:DropDownList ID="DropUnitId" runat="server" Label="责任单位" MaxLength="50" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="DropCNProfessional_ID" runat="server" Label="专业" MaxLength="50" LabelWidth="110px" EnableCheckBoxSelect="true" EnableMultiSelect="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtUserID" runat="server" Label="提出人" MaxLength="20" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="110px">
</f:TextBox>
<f:DatePicker ID="Date_CreateDate" runat="server" Label="提出日期"
<f:DatePicker ID="Date_CreateDate" runat="server" Label="提出日期"
LabelWidth="110px">
</f:DatePicker>
<f:DropDownList ID="DropQuestionTypeID" runat="server" Label="问题类别" MaxLength="50" LabelWidth="110px" EnableCheckBoxSelect="true" EnableMultiSelect="true">
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="DropQuestionTypeID" runat="server" Label="紧急程度" MaxLength="50" LabelWidth="110px" EnableCheckBoxSelect="true" EnableMultiSelect="true">
</f:DropDownList>
<f:DropDownList ID="DropGJSXTypeID" runat="server" Label="事项类别" MaxLength="50" LabelWidth="110px" EnableCheckBoxSelect="true" EnableMultiSelect="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="DropUser_Acceptance" runat="server" Label="责任人" MaxLength="50" LabelWidth="110px"
<f:DropDownList ID="DropUser_Acceptance" runat="server" Label="责任人" MaxLength="50" LabelWidth="110px"
EnableCheckBoxSelect="true" EnableEdit="true">
</f:DropDownList>
<f:DatePicker ID="Date_CompleteDate" runat="server" Label="要求完成日期" ShowRedStar="true"
<f:DatePicker ID="Date_CompleteDate" runat="server" Label="要求完成日期" ShowRedStar="true"
LabelWidth="110px">
</f:DatePicker>
<f:DropDownList ID="DropUser_ReceiveID" runat="server" Label="跟踪人" MaxLength="50" LabelWidth="110px"
EnableCheckBoxSelect="true" EnableEdit="true"
OnSelectedIndexChanged="DropUser_ReceiveID_TextChanged" AutoPostBack="true">
<f:DropDownList ID="DropUser_ReceiveID" runat="server" Label="跟踪人" MaxLength="50" LabelWidth="110px"
EnableCheckBoxSelect="true" EnableEdit="true"
OnSelectedIndexChanged="DropUser_ReceiveID_TextChanged" AutoPostBack="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownBox runat="server" ID="drpCsUsers" MultiSelectSeparator="," AutoPostBack="true" LabelWidth="120px"
Label="抄送人员" EmptyText="请从下拉表格中选择" EnableMultiSelect="true" MatchFieldWidth="false">
<f:DropDownBox runat="server" ID="drpCsUsers" MultiSelectSeparator="," AutoPostBack="true" LabelWidth="110px"
Label="抄送人员" EmptyText="请从下拉表格中选择" EnableMultiSelect="true" MatchFieldWidth="false">
<PopPanel>
<f:Grid ID="Grid4" Width="800px" Height="300px" Hidden="true"
DataIDField="UserId" DataTextField="UserName" EnableMultiSelect="true" KeepCurrentSelection="true"
PageSize="100" ShowBorder="true" ShowHeader="false"
PageSize="100" ShowBorder="true" ShowHeader="false"
AllowPaging="true" IsDatabasePaging="true" runat="server" EnableCheckBoxSelect="true"
DataKeyNames="UserId" OnPageIndexChange="Grid4_PageIndexChange"
AllowSorting="true" SortField="UserName" SortDirection="ASC"
@@ -93,11 +95,11 @@
</Toolbars>
</f:Grid>
</PopPanel>
</f:DropDownBox>
</f:DropDownBox>
</Items>
</f:FormRow>
<%-- <f:FormRow>
<%-- <f:FormRow>
<Items>
<f:RadioButtonList ID="rblState" runat="server" Label="状态" LabelWidth="110px" Enabled="false">
@@ -116,86 +118,118 @@
</f:RadioButtonList>
</Items>
</f:FormRow>--%>
<f:FormRow>
<Items>
<f:TextArea ID="txtDetail" runat="server" Height="100px" Label="事项描述" MaxLength="1000">
</f:TextArea>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</f:ContentPanel>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtDetail" runat="server" Height="100px" Label="事项描述" MaxLength="1000" LabelWidth="110px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1" MarginLeft="5px">
</f:Button>
</Items>
</f:FormRow>
<f:FormRow ID="rowProgressStatus" Hidden="true">
<Items>
<f:RadioButtonList ID="rblProgressStatus" runat="server" Label="进展申请" LabelWidth="110px" Width="420px"
AutoColumnWidth="true">
<f:RadioItem Value="0" Text="持续跟踪" />
<f:RadioItem Value="1" Text="申请关闭" />
</f:RadioButtonList>
</Items>
</f:FormRow>
<f:FormRow ID="rowCloseProgressCheck" Hidden="true">
<Items>
<f:RadioButtonList ID="rblProgressResult" runat="server" Label="申请结果" LabelWidth="110px" Width="420px"
AutoColumnWidth="true">
<f:RadioItem Value="0" Text="同意" Selected="true"/>
<f:RadioItem Value="1" Text="驳回" />
</f:RadioButtonList>
</Items>
<Items>
<f:TextBox ID="txtProgressReason" runat="server" Label="说明" MaxLength="1000" LabelWidth="110px">
</f:TextBox>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</f:ContentPanel>
</Items>
</f:FormRow>
<f:FormRow ID="Progress_detail" Hidden="true">
<Items>
<f:ContentPanel ID="ContentPanel2" Title="关键事项进展" ShowBorder="true"
<Items>
<f:ContentPanel ID="ContentPanel2" Title="关键事项进展" ShowBorder="true"
BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
runat="server">
<Toolbars>
<f:Toolbar ID="Toolbar131" Position="Top" runat="server" ToolbarAlign="Right" CssClass="Toolbar2" Hidden="true">
<Items>
<f:Button ID="btnNewOtherManagement" Text="新增" ToolTip="新增" Icon="Add" runat="server" OnClick="btnNew_Click" >
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Toolbars>
<f:Toolbar ID="Toolbar131" Position="Top" runat="server" ToolbarAlign="Right" CssClass="Toolbar2" Hidden="true">
<Items>
<f:ToolbarFill ID="ToolbarFill2" runat="server">
</f:ToolbarFill>
<f:Button ID="btnNewOtherManagement" Text="新增" ToolTip="新增" Icon="Add" runat="server" OnClick="btnNew_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Items>
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="关键事项进展" EnableCollapse="false"
runat="server" BoxFlex="1" DataKeyNames="Cuid" EnableColumnLines="true" IsFluid="true"
DataIDField="Cuid" SortField="cuid" AllowSorting="true"
SortDirection="desc" AllowCellEditing="true" ClicksToEdit="1" OnRowCommand="gvOperateComplianceObligations_RowCommand">
<Columns>
<f:LinkButtonField Width="40px" ConfirmText="删除选中行?" ConfirmTarget="Parent" CommandName="Delete"
ToolTip="删除" Icon="Delete" TextAlign="Center" />
runat="server" BoxFlex="1" DataKeyNames="Cuid" EnableColumnLines="true" IsFluid="true"
DataIDField="Cuid" SortField="Sort" AllowSorting="true"
SortDirection="asc" AllowCellEditing="true" ClicksToEdit="1" OnRowCommand="gvOperateComplianceObligations_RowCommand">
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="45px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="140px" ColumnID="Progress_user" DataField="Progress_user" SortField="Progress_user"
FieldType="String" HeaderText="事项进展负责人" HeaderTextAlign="Center" TextAlign="Left" RendererFunction="renderProgress_user" >
<Editor>
<f:DropDownList ID="DropProgress_user" Required="true" runat="server">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Date" DataField="Date" FieldType="Date"
Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="日期">
<Editor>
<f:DatePicker ID="DatePicker1" Required="true" runat="server">
</f:DatePicker>
</Editor>
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Progress_detail" DataField="Progress_detail" SortField="Progress_detail"
FieldType="String" HeaderText="事项进展情况" HeaderTextAlign="Center" TextAlign="Left">
<Editor>
<f:TextBox ID="tbxEditorName" Required="true" runat="server" >
</f:TextBox>
</Editor>
</f:RenderField>
<f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
TextAlign="Center" ToolTip="附件查看" Icon="Find" />
<Columns>
<f:LinkButtonField Width="40px" ConfirmText="删除选中行?" ConfirmTarget="Parent" CommandName="Delete"
ToolTip="删除" Icon="Delete" TextAlign="Center" />
<f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl1" ColumnID="AttachUrl1" Hidden="true"
TextAlign="Center" ToolTip="附件查看" Icon="Find" />
</Columns>
</f:Grid>
</Items>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="45px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="140px" ColumnID="Progress_user" DataField="Progress_user" SortField="Progress_user"
FieldType="String" HeaderText="事项进展负责人" HeaderTextAlign="Center" TextAlign="Left" RendererFunction="renderProgress_user">
<Editor>
<f:DropDownList ID="DropProgress_user" Required="true" runat="server">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Date" DataField="Date" FieldType="Date"
Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="日期">
<Editor>
<f:DatePicker ID="DatePicker1" Required="true" runat="server">
</f:DatePicker>
</Editor>
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Progress_detail" DataField="Progress_detail" SortField="Progress_detail"
FieldType="String" HeaderText="事项进展情况" HeaderTextAlign="Center" TextAlign="Left">
<Editor>
<f:TextBox ID="tbxEditorName" Required="true" runat="server">
</f:TextBox>
</Editor>
</f:RenderField>
<f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
TextAlign="Center" ToolTip="附件查看" Icon="Find" />
<f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl1" ColumnID="AttachUrl1" Hidden="true"
TextAlign="Center" ToolTip="附件查看" Icon="Find" />
</Columns>
</f:Grid>
</Items>
</f:Form>
</f:ContentPanel>
</Items>
</f:FormRow>
<%-- <f:FormRow ID="nextProgress">
</f:ContentPanel>
</Items>
</f:FormRow>
<%-- <f:FormRow ID="nextProgress">
<Items>
<f:ContentPanel ID="ContentPanel3" Title="下一步流程" ShowBorder="true"
BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
@@ -223,24 +257,19 @@
</f:ContentPanel>
</Items>
</f:FormRow>--%>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1" MarginLeft="5px">
</f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="Button1" ToolTip="关闭" Icon="SystemSaveNew" runat="server" OnClick="btnsubmit_Close" Hidden="true" >
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="Button1" ToolTip="关闭" Icon="SystemSaveNew" runat="server" OnClick="btnsubmit_Close" Hidden="true">
</f:Button>
<f:Button ID="btnsubmit" ToolTip="提交" Icon="SystemSaveNew" runat="server" OnClick="btnsubmit_Click" >
<f:Button ID="btnsubmit" ToolTip="提交" Icon="SystemSaveNew" runat="server" OnClick="btnsubmit_Click">
</f:Button>
<f:Button ID="btnSave" ToolTip="保存" Icon="SystemSave" runat="server"
OnClick="btnSave_Click" >
<f:Button ID="btnSave" ToolTip="保存" Icon="SystemSave" runat="server"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
</f:Button>
@@ -248,10 +277,10 @@
</f:Toolbar>
</Toolbars>
</f:Form>
<f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
<f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
<f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="880px"
@@ -259,12 +288,12 @@
</f:Window>
</form>
<script>
var DropProgress_userID= '<%= DropProgress_user.ClientID %>';
var DropProgress_userID = '<%= DropProgress_user.ClientID %>';
function renderProgress_user(value) {
return F(DropProgress_userID).getTextByValue(value);
}
</script>
</body>
</html>
+308 -166
View File
@@ -85,6 +85,11 @@ namespace FineUIPro.Web.PZHGL.GJSX
Alert.ShowInParent("问题类别!", MessageBoxIcon.Warning);
return;
}
if (this.DropGJSXTypeID.SelectedValue == Const._Null)
{
Alert.ShowInParent("事项类别!", MessageBoxIcon.Warning);
return;
}
if (this.DropUser_Acceptance.SelectedValue == Const._Null)
{
Alert.ShowInParent("请选择责任人!", MessageBoxIcon.Warning);
@@ -100,7 +105,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
Alert.ShowInParent("请选择要求完成日期!", MessageBoxIcon.Warning);
return;
}
string EditType = Request.Params["EditType"];
if (EditType == "add")
@@ -142,14 +147,15 @@ namespace FineUIPro.Web.PZHGL.GJSX
//编号
//问题类别
QuestionTypeService.InitQuestionTypeDropDownList(this.DropQuestionTypeID, false);
//事项类别
GJSXTypeService.InitGJSXTypeDropDownList(this.DropGJSXTypeID, false);
//跟踪人 默认是自己
UserService.InitUserDropDownList(DropUser_ReceiveID, CurrUser.LoginProjectId, false, string.Empty);
DropUser_ReceiveID.SelectedValue = CurrUser.UserId;
//跟踪人 默认是自己
//责任人 默认是自己
UserService.InitUserDropDownList(DropUser_Acceptance, CurrUser.LoginProjectId, false, string.Empty);
//事项进展负责人
UserService.InitUserDropDownList(DropProgress_user, CurrUser.LoginProjectId, false, string.Empty);
@@ -159,6 +165,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
if (EditType == "add")
{
//DropUser_ReceiveID.SelectedValue = CurrUser.UserId;
txtGJSXID.Readonly = true;
txtUserID.Readonly = true;
//Date_CreateDate.Readonly = true;
@@ -194,20 +201,15 @@ namespace FineUIPro.Web.PZHGL.GJSX
{
this.DropUnitId.SelectedValue = user.UnitId;
}
this.txtUserID.Text = user.UserName;
}
}
}
if (EditType == "Edit" || EditType=="See") //添加事项进展
if (EditType == "Edit" || EditType == "See") //添加事项进展
{
//this.Progress_detail.Visible = true;
//this.nextProgress.Visible = true;
btnSave.Visible = false;
TextIsEnable(false); //使文本不可编辑
Model.GJSX gjsx = BLL.GJSXService.GetGJSXById(ID);
@@ -225,6 +227,8 @@ namespace FineUIPro.Web.PZHGL.GJSX
//if (tb != null && tb.Rows.Count > 0)
//{
if (!string.IsNullOrEmpty(gjsx.CsUsers))
{
drpCsUsers.Values = gjsx.CsUsers.Split(',');
@@ -232,49 +236,55 @@ namespace FineUIPro.Web.PZHGL.GJSX
}
txtGJSXID.Text = gjsx.GJSXID;
DropUnitId.SelectedValue = gjsx.UnitId;
if (!string.IsNullOrEmpty(gjsx.CNProfessional_ID))
{
List<string> list_CNProfessional_ID = gjsx.CNProfessional_ID.Split(',').ToList();
DropCNProfessional_ID.SelectedValueArray = list_CNProfessional_ID.ToArray();
}
if (!string.IsNullOrEmpty(gjsx.QuestionTypeID))
{
List<string> list_QuestionTypeID = gjsx.QuestionTypeID.Split(',').ToList();
DropQuestionTypeID.SelectedValueArray = list_QuestionTypeID.ToArray();
}
if (!string.IsNullOrEmpty(gjsx.User_Acceptance))
{
List<string> list_User_Acceptance = gjsx.User_Acceptance.Split(',').ToList();
DropUser_Acceptance.SelectedValueArray = list_User_Acceptance.ToArray();
}
if (!string.IsNullOrEmpty(gjsx.User_ReceiveID))
{
List<string> list_User_ReceiveID = gjsx.User_ReceiveID.Split(',').ToList();
DropUser_ReceiveID.SelectedValueArray = list_User_ReceiveID.ToArray();
//if (DropUser_ReceiveID.SelectedItemArray.Length > 1)
//{
// lblIsManyPeople.Hidden = false;
// lblIsManyPeople.SelectedValue = gjsx.IsManypeople;
//}
DropUnitId.SelectedValue = gjsx.UnitId;
if (!string.IsNullOrEmpty(gjsx.CNProfessional_ID))
{
List<string> list_CNProfessional_ID = gjsx.CNProfessional_ID.Split(',').ToList();
DropCNProfessional_ID.SelectedValueArray = list_CNProfessional_ID.ToArray();
}
// Date_CloseDate.Text = tb.Rows[0]["CloseDate"].ToString();
//txtDetail.Text = tb.Rows[0]["detail"].ToString();
//txtUserID.Text = tb.Rows[0]["username"].ToString().Trim();
//Date_CreateDate.Text = tb.Rows[0]["createDate"].ToString();
//Date_CompleteDate.Text = tb.Rows[0]["CompleteDate"].ToString();
if (!string.IsNullOrEmpty(gjsx.QuestionTypeID))
{
List<string> list_QuestionTypeID = gjsx.QuestionTypeID.Split(',').ToList();
DropQuestionTypeID.SelectedValueArray = list_QuestionTypeID.ToArray();
}
if (!string.IsNullOrEmpty(gjsx.GJSXTypeId))
{
List<string> list_GJSXTypeID = gjsx.GJSXTypeId.Split(',').ToList();
DropGJSXTypeID.SelectedValueArray = list_GJSXTypeID.ToArray();
}
if (!string.IsNullOrEmpty(gjsx.User_Acceptance))
{
List<string> list_User_Acceptance = gjsx.User_Acceptance.Split(',').ToList();
DropUser_Acceptance.SelectedValueArray = list_User_Acceptance.ToArray();
}
if (!string.IsNullOrEmpty(gjsx.User_ReceiveID))
{
//DropUser_ReceiveID.SelectedValue = gjsx.User_ReceiveID;
List<string> list_User_ReceiveID = gjsx.User_ReceiveID.Split(',').ToList();
DropUser_ReceiveID.SelectedValueArray = list_User_ReceiveID.ToArray();
//if (DropUser_ReceiveID.SelectedItemArray.Length > 1)
//{
// lblIsManyPeople.Hidden = false;
// lblIsManyPeople.SelectedValue = gjsx.IsManypeople;
//}
}
// Date_CloseDate.Text = tb.Rows[0]["CloseDate"].ToString();
//txtDetail.Text = tb.Rows[0]["detail"].ToString();
//txtUserID.Text = tb.Rows[0]["username"].ToString().Trim();
//Date_CreateDate.Text = tb.Rows[0]["createDate"].ToString();
//Date_CompleteDate.Text = tb.Rows[0]["CompleteDate"].ToString();
txtDetail.Text = gjsx.Detail;
txtUserID.Text = BLL.UserService.GetUserNameByUserId(gjsx.UserID);
if (gjsx.CreateDate != null)
{
Date_CreateDate.Text = string.Format("{0:yyyy-MM-dd}",gjsx.CreateDate);
}
if (gjsx.CompleteDate != null)
{
Date_CompleteDate.Text = string.Format("{0:yyyy-MM-dd}", gjsx.CompleteDate);
}
//rblState.SelectedValue = gjsx.State.ToString().Trim();
txtDetail.Text = gjsx.Detail;
txtUserID.Text = BLL.UserService.GetUserNameByUserId(gjsx.UserID);
if (gjsx.CreateDate != null)
{
Date_CreateDate.Text = string.Format("{0:yyyy-MM-dd}", gjsx.CreateDate);
}
if (gjsx.CompleteDate != null)
{
Date_CompleteDate.Text = string.Format("{0:yyyy-MM-dd}", gjsx.CompleteDate);
}
//rblState.SelectedValue = gjsx.State.ToString().Trim();
//}
@@ -288,8 +298,8 @@ namespace FineUIPro.Web.PZHGL.GJSX
Grid2Binging();
}
var state = BLL.GJSXService.GetGJSXById(txtGJSXID.Text).State.Trim();
if (gjsx.UserID == this.CurrUser.UserId) //如果当前登录人是提出人
{
if (gjsx.UserID == this.CurrUser.UserId)
{//如果当前登录人是提出人
//rblIsClosed.Visible = false;
if (state == "1")
{
@@ -298,18 +308,33 @@ namespace FineUIPro.Web.PZHGL.GJSX
txtUserID.Readonly = true;
Date_CreateDate.Readonly = true;
}
else if (state=="2")
else if (state == "2")
{
Progress_detail.Hidden = false;
btnsubmit.Hidden = true;
Button1.Hidden = true;
btnsubmit.Hidden = true;
btnSave.Hidden = true;
Grid2Binging();
Grid2.AllColumns[0].Hidden = true;
Grid2.AllColumns[5].Hidden = true;
Grid2.AllColumns[6].Hidden = false;
}
else {
else
{
if (EditType == "Edit" && state == "3" && !string.IsNullOrWhiteSpace(gjsx.ProgressStatus) && gjsx.ProgressStatus == "1")//gjsx.ProgressStatus.Trim() == "1"
{//负责人申请关闭
this.rblProgressStatus.SelectedIndex = int.Parse(gjsx.ProgressStatus);
rowProgressStatus.Hidden = false;
rowCloseProgressCheck.Hidden = false;
}
else
{
Button1.Hidden = false;
btnsubmit.Hidden = true;
}
btnSave.Visible = false;
Progress_detail.Hidden = false;
btnsubmit.Hidden = true;
Button1.Hidden = false;
Grid2Binging();
Grid2.AllColumns[0].Hidden = true;
@@ -321,63 +346,38 @@ namespace FineUIPro.Web.PZHGL.GJSX
{
Button1.Hidden = true;
}
}
else if (!string.IsNullOrEmpty(gjsx.User_ReceiveID) && gjsx.User_ReceiveID.Contains(this.CurrUser.UserId)) //跟踪人
{
if (state == "3")
{
Progress_detail.Hidden = false;
btnSave.Visible = false;
btnsubmit.Hidden = true;
Button1.Hidden = false;
Grid2Binging();
Grid2.AllColumns[0].Hidden = true;
Grid2.AllColumns[5].Hidden = true;
Grid2.AllColumns[6].Hidden = false;
}
else {
Progress_detail.Hidden = false;
btnSave.Visible = false;
btnsubmit.Hidden = true;
Button1.Hidden = true;
}
if (state == "0") {
Grid2.AllColumns[0].Hidden = true;
Grid2.AllColumns[5].Hidden = true;
Grid2.AllColumns[6].Hidden = false;
Grid2Binging();
Button1.Hidden = true;
}
//rblIsClosed.Visible = false;
//if (BLL.GJSXProcessService.GetGJSXProcessByGJSXIDAndUserId(this.txtGJSXID.Text, this.CurrUser.UserId) > 0)
//{
// Grid2Binging();
//}
}
else if (!string.IsNullOrEmpty(gjsx.User_Acceptance) && gjsx.User_Acceptance.Contains(this.CurrUser.UserId)) //如果当前登录人为责任人
{
else if (!string.IsNullOrEmpty(gjsx.User_Acceptance) && gjsx.User_Acceptance.Contains(this.CurrUser.UserId))
{//如果当前登录人为责任人
if (state == "2")
{
rowProgressStatus.Hidden = false;
if (!string.IsNullOrWhiteSpace(gjsx.ProgressStatus))
{
this.rblProgressStatus.SelectedIndex = int.Parse(gjsx.ProgressStatus);
}
Toolbar131.Hidden = false;
Progress_detail.Hidden = false;
btnSave.Visible = false;
btnsubmit.Hidden = false;
Button1.Hidden = true;
Grid2Binging();
Grid2.AllColumns[0].Hidden = true;
Grid2.AllColumns[5].Hidden = true;
Grid2.AllColumns[6].Hidden = false;
}
else {
else
{
Progress_detail.Hidden = true;
btnSave.Visible = false;
btnsubmit.Hidden = true;
Button1.Hidden = true;
}
if (state=="0" || state=="3")
if (state == "0" || state == "3")
{
Progress_detail.Hidden = false;
Grid2Binging();
@@ -386,10 +386,59 @@ namespace FineUIPro.Web.PZHGL.GJSX
Grid2.AllColumns[6].Hidden = false;
}
}
else if (!string.IsNullOrEmpty(gjsx.User_ReceiveID) && gjsx.User_ReceiveID.Contains(this.CurrUser.UserId))
{//跟踪人
if (state == "0")
{
Grid2.AllColumns[0].Hidden = true;
Grid2.AllColumns[5].Hidden = true;
Grid2.AllColumns[6].Hidden = false;
Grid2Binging();
Button1.Hidden = true;
}
else if (state == "3")
{
if (EditType == "Edit" && !string.IsNullOrWhiteSpace(gjsx.ProgressStatus) && gjsx.ProgressStatus == "1")//gjsx.ProgressStatus.Trim() == "1"
{//负责人申请关闭
this.rblProgressStatus.SelectedIndex = int.Parse(gjsx.ProgressStatus);
rowProgressStatus.Hidden = false;
rowCloseProgressCheck.Hidden = false;
}
else
{
Button1.Hidden = false;
btnsubmit.Hidden = true;
}
Progress_detail.Hidden = false;
btnSave.Visible = false;
Grid2Binging();
Grid2.AllColumns[0].Hidden = true;
Grid2.AllColumns[5].Hidden = true;
Grid2.AllColumns[6].Hidden = false;
}
else
{
Progress_detail.Hidden = false;
btnSave.Visible = false;
btnsubmit.Hidden = true;
Button1.Hidden = true;
}
//rblIsClosed.Visible = false;
//if (BLL.GJSXProcessService.GetGJSXProcessByGJSXIDAndUserId(this.txtGJSXID.Text, this.CurrUser.UserId) > 0)
//{
// Grid2Binging();
//}
}
else //浏览者
{
Progress_detail.Hidden = false;
//Progress_detail.Enabled = false;
//this.nextProgress.Visible = false;
btnSave.Visible = false;
@@ -402,7 +451,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
}
if (!string.IsNullOrEmpty(gjsx.User_Acceptance) && gjsx.User_Acceptance.Contains(this.CurrUser.UserId)
&& state=="2") //如果当前登录人为责任人
&& state == "2") //如果当前登录人为责任人
{
if (state == "2")
{
@@ -430,46 +479,47 @@ namespace FineUIPro.Web.PZHGL.GJSX
}
}
if (BLL.GJSXService.GetGJSXById(this.txtGJSXID.Text).IsManypeople == "1")
{
//int i = 0;
//List<string> infos = this.DropUser_ReceiveID.Text.Trim().Split(',').ToList();
//foreach (var item in infos)
//{
// Model.Sys_User user = BLL.UserService.GetUserByUserName(item);
// if (user != null)
// {
// if (user.UserId == this.CurrUser.UserId)
// {
// i++;
// }
// }
//}
//if (i > 0)
//{
// this.nextProgress.Visible = false;
// if (BLL.GJSXProcessService.GetGJSXProcessByGJSXIDAndUserId(this.txtGJSXID.Text, this.CurrUser.UserId) > 1)
// {
// this.nextProgress.Visible = true;
// this.rblIsClosed.Visible = false;
// }
//}
//else
//{
// this.nextProgress.Visible = true;
// this.rblIsClosed.Visible = false;
//}
//if (IsClosed_ManyPeople())
//{
// this.nextProgress.Visible = true;
// this.rblIsClosed.Visible = true;
//}
//else
//{
// this.rblIsClosed.Visible = false;
//if (BLL.GJSXService.GetGJSXById(this.txtGJSXID.Text).IsManypeople == "1")
//{
//int i = 0;
//List<string> infos = this.DropUser_ReceiveID.Text.Trim().Split(',').ToList();
//foreach (var item in infos)
//{
// Model.Sys_User user = BLL.UserService.GetUserByUserName(item);
// if (user != null)
// {
// if (user.UserId == this.CurrUser.UserId)
// {
// i++;
// }
// }
//}
//if (i > 0)
//{
// this.nextProgress.Visible = false;
// if (BLL.GJSXProcessService.GetGJSXProcessByGJSXIDAndUserId(this.txtGJSXID.Text, this.CurrUser.UserId) > 1)
// {
// this.nextProgress.Visible = true;
// this.rblIsClosed.Visible = false;
// }
//}
//else
//{
// this.nextProgress.Visible = true;
// this.rblIsClosed.Visible = false;
//}
//if (IsClosed_ManyPeople())
//{
// this.nextProgress.Visible = true;
// this.rblIsClosed.Visible = true;
//}
//else
//{
// this.rblIsClosed.Visible = false;
//}
//}
//}
}
if (BLL.GJSXService.GetGJSXById(this.txtGJSXID.Text).State.Trim() == "0")
{
//Progress_detail.Enabled = false;
@@ -477,6 +527,8 @@ namespace FineUIPro.Web.PZHGL.GJSX
btnsubmit.Visible = false;
}
btnSave.Visible = false;
TextIsEnable(false); //使文本不可编辑
}
}
@@ -493,10 +545,11 @@ namespace FineUIPro.Web.PZHGL.GJSX
txtUserID.Enabled = isStart;
Date_CreateDate.Enabled = isStart;
DropQuestionTypeID.Enabled = isStart;
DropGJSXTypeID.Enabled = isStart;
DropUser_Acceptance.Enabled = isStart;
Date_CompleteDate.Enabled = isStart;
DropUser_ReceiveID.Enabled = isStart;
// Date_CloseDate.Enabled = isStart;
//Date_CloseDate.Enabled = isStart;
txtDetail.Enabled = isStart;
drpCsUsers.Enabled = isStart;
//lblIsManyPeople.Enabled = isStart;
@@ -541,10 +594,8 @@ namespace FineUIPro.Web.PZHGL.GJSX
{
// 姓名
UpdateDataRow("Progress_detail", rowDict, rowData);
}
private DataRow FindRowByID(string rowID)
{
DataTable table = Table;
@@ -577,7 +628,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
_Detail.Progress_user = Table.Rows[i]["Progress_user"].ToString();
_Detail.Date = DateTime.Parse(Table.Rows[i]["Date"].ToString());
_Detail.Progress_detail = Table.Rows[i]["Progress_detail"].ToString();
Model.GJSX_detail isExit_detail = BLL.GJSXItemService.GetGJSXMXById(_Detail.Cuid);
@@ -591,14 +642,14 @@ namespace FineUIPro.Web.PZHGL.GJSX
BLL.GJSXItemService.UpdateGJSXdetail(_Detail);
}
}
}
/// <summary>
/// 保存
/// </summary>
/// <param name="state">状态【1:开放、2:正在进行、3:待关闭、0:已关闭】</param>
private void save(string state)
{
Model.GJSX gjsx = new Model.GJSX();
{
gjsx.GJSXID = this.txtGJSXID.Text;
@@ -613,6 +664,12 @@ namespace FineUIPro.Web.PZHGL.GJSX
gjsx.CompleteDate = DateTime.Parse(Date_CompleteDate.Text);
gjsx.AttachUrl = "";
}
string progressStatus = this.rblProgressStatus.SelectedValue;
if (!string.IsNullOrWhiteSpace(progressStatus))
{
//gjsx.ProgressStatus = state == "2" ? null : progressStatus;
gjsx.ProgressStatus = progressStatus;
}
//抄送人
string sendUserIds = string.Empty;
@@ -664,6 +721,20 @@ namespace FineUIPro.Web.PZHGL.GJSX
}
}
}
foreach (var item in this.DropGJSXTypeID.SelectedValueArray)
{
if (item != BLL.Const._Null)
{
if (string.IsNullOrEmpty(gjsx.GJSXTypeId))
{
gjsx.GJSXTypeId = item;
}
else
{
gjsx.GJSXTypeId += "," + item;
}
}
}
foreach (var item in this.DropCNProfessional_ID.SelectedValueArray)
{
if (item != BLL.Const._Null)
@@ -693,9 +764,9 @@ namespace FineUIPro.Web.PZHGL.GJSX
gjsx.ProjectId = isExitGjsx.ProjectId;
GJSXService.UpdateGJSX(gjsx);
}
}
protected void DropUser_ReceiveID_TextChanged(object sender, EventArgs e)
{
//if (DropUser_ReceiveID.SelectedItemArray.Length > 1)
@@ -716,11 +787,10 @@ namespace FineUIPro.Web.PZHGL.GJSX
{
IsClosed_ManyPeople = false;
}
}
return IsClosed_ManyPeople;
}
/// <summary>
/// 提交
/// </summary>
@@ -743,6 +813,11 @@ namespace FineUIPro.Web.PZHGL.GJSX
Alert.ShowInParent("问题类别!", MessageBoxIcon.Warning);
return;
}
if (this.DropGJSXTypeID.SelectedValue == Const._Null)
{
Alert.ShowInParent("事项类别!", MessageBoxIcon.Warning);
return;
}
if (this.DropUser_Acceptance.SelectedValue == Const._Null)
{
Alert.ShowInParent("请选择责任人!", MessageBoxIcon.Warning);
@@ -809,14 +884,50 @@ namespace FineUIPro.Web.PZHGL.GJSX
{
save("2");
}
else {
//责任人的时候保存关键事项
else
{
var gjsx = BLL.GJSXService.GetGJSXById(txtGJSXID.Text);
if (gjsx.User_Acceptance.Contains(this.CurrUser.UserId))
{
save("3");
{//责任人的时候保存关键事项
//进展状态
string progressStatus = this.rblProgressStatus.SelectedValue;
if (progressStatus == "0")
{//持续跟踪
save("2");
}
else if (progressStatus == "1")
{//申请关闭
save("3");
}
//save("3");
OperateComplianceObligationsCSort();
}
else if (gjsx.UserID.Contains(this.CurrUser.UserId) || gjsx.User_ReceiveID.Contains(this.CurrUser.UserId))
{//提出人、跟踪人审批责任人提出申请关闭请求
//进展状态
string progressResult = this.rblProgressResult.SelectedValue;
if (progressResult == "0")
{//同意申请关闭
save("0");
}
else if (progressResult == "1")
{//驳回申请关闭
save("2");
}
string progressReason = this.txtProgressReason.Text.Trim();
Model.GJSX_detail detail = new Model.GJSX_detail
{
Cuid = SQLHelper.GetNewID(typeof(Model.GJSX_detail)),
GJSXID = txtGJSXID.Text,
Progress_user = this.CurrUser.UserId,
Progress_detail = $"{(progressResult == "0" ? "" : "")}申请关闭{(!string.IsNullOrWhiteSpace(progressReason) ? "" : "")}{progressReason}",
Date = DateTime.Now,
Sort = GJSX_detail.Count,
};
GJSXItemService.AddGJSXMX(detail);
}
}
}
@@ -825,7 +936,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
// save("2");
//}
//else {
// //责任人的时候保存关键事项
// var gjsx = BLL.GJSXService.GetGJSXById(txtGJSXID.Text);
// if (gjsx.User_Acceptance.Contains(this.CurrUser.UserId))
@@ -834,8 +945,8 @@ namespace FineUIPro.Web.PZHGL.GJSX
// OperateComplianceObligationsCSort();
// }
//}
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
//if (nextreceuserid != null)
//{
@@ -862,12 +973,20 @@ namespace FineUIPro.Web.PZHGL.GJSX
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnsubmit_Close(object sender, EventArgs e) {
protected void btnsubmit_Close(object sender, EventArgs e)
{
Close();
}
/// <summary>
/// 闭环
/// </summary>
private void Close()
{
save("0");
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
/// <summary>
/// 保存按钮
/// </summary>
@@ -890,6 +1009,11 @@ namespace FineUIPro.Web.PZHGL.GJSX
Alert.ShowInParent("问题类别!", MessageBoxIcon.Warning);
return;
}
if (this.DropGJSXTypeID.SelectedValue == Const._Null)
{
Alert.ShowInParent("事项类别!", MessageBoxIcon.Warning);
return;
}
if (this.DropUser_Acceptance.SelectedValue == Const._Null)
{
Alert.ShowInParent("请选择责任人!", MessageBoxIcon.Warning);
@@ -1075,10 +1199,13 @@ namespace FineUIPro.Web.PZHGL.GJSX
}
}
/// <summary>
/// 关键事项进展明细
/// </summary>
private void OperateComplianceObligationsCSort()
{
var list = Funs.DB.GJSX_detail.Where(x => x.GJSXID == txtGJSXID.Text).ToList();
if (list.Count>0)
if (list.Count > 0)
{
Funs.DB.GJSX_detail.DeleteAllOnSubmit(list);
Funs.DB.SubmitChanges();
@@ -1089,6 +1216,20 @@ namespace FineUIPro.Web.PZHGL.GJSX
coc.GJSXID = txtGJSXID.Text;
BLL.GJSXItemService.AddGJSXMX(coc);
}
string progressStatus = this.rblProgressStatus.SelectedValue;
if (progressStatus == "1")
{//责任人申请关闭
Model.GJSX_detail detail = new Model.GJSX_detail
{
Cuid = SQLHelper.GetNewID(typeof(Model.GJSX_detail)),
GJSXID = txtGJSXID.Text,
Progress_user = this.CurrUser.UserId,
Progress_detail = "申请关闭",
Date = DateTime.Now,
Sort = GJSX_detail.Count,
};
GJSXItemService.AddGJSXMX(detail);
}
}
@@ -1104,8 +1245,9 @@ namespace FineUIPro.Web.PZHGL.GJSX
var hazardSort = new Model.GJSX_detail
{
Cuid = this.Grid2.Rows[i].DataKeys[0].ToString(),
Progress_user= values.Value<string>("Progress_user").ToString(),
Progress_user = values.Value<string>("Progress_user").ToString(),
Progress_detail = values.Value<string>("Progress_detail").ToString(),
Sort = i
};
if (!string.IsNullOrEmpty(values.Value<string>("Date").ToString()))
{
+72 -9
View File
@@ -113,6 +113,15 @@ namespace FineUIPro.Web.PZHGL.GJSX
/// </remarks>
protected global::FineUIPro.DropDownList DropQuestionTypeID;
/// <summary>
/// DropGJSXTypeID 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropGJSXTypeID;
/// <summary>
/// DropUser_Acceptance 控件。
/// </summary>
@@ -176,6 +185,60 @@ namespace FineUIPro.Web.PZHGL.GJSX
/// </remarks>
protected global::FineUIPro.TextArea txtDetail;
/// <summary>
/// btnAttachUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// rowProgressStatus 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow rowProgressStatus;
/// <summary>
/// rblProgressStatus 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblProgressStatus;
/// <summary>
/// rowCloseProgressCheck 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow rowCloseProgressCheck;
/// <summary>
/// rblProgressResult 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblProgressResult;
/// <summary>
/// txtProgressReason 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProgressReason;
/// <summary>
/// Progress_detail 控件。
/// </summary>
@@ -203,6 +266,15 @@ namespace FineUIPro.Web.PZHGL.GJSX
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar131;
/// <summary>
/// ToolbarFill2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill2;
/// <summary>
/// btnNewOtherManagement 控件。
/// </summary>
@@ -266,15 +338,6 @@ namespace FineUIPro.Web.PZHGL.GJSX
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnAttachUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>