lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

关键事项优化；进度管理，月计划统计调整

Browse Source
This commit is contained in:
夏菊
2025-03-14 20:12:23 +08:00
parent 8a7efa5b3a
commit fcab29b4fb
14 changed files with 335 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx
+1 -1
View File
@@ -146,7 +146,7 @@
</f:Panel>
<f:Window ID="Window1" Title="关键事项" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px"
Height="720px">
Height="880px">
</f:Window>
<f:Window ID="Window2" Title="导入人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="false"
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs
+1 -1
View File
@@ -30,7 +30,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
//紧急程度
QuestionTypeService.InitQuestionTypeDropDownList(this.DropQuestionTypeID, true);
//事项类别
GJSXTypeService.InitGJSXTypeDropDownList(this.DropGJSXTypeID, false);
GJSXTypeService.InitGJSXTypeDropDownList(this.DropGJSXTypeID, true);
//验收人
UserService.InitUserDropDownList(DropUser_ReceiveID, CurrUser.LoginProjectId, true, string.Empty);
//接收人
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx
+1 -1
View File
@@ -145,7 +145,7 @@
</f:Panel>
<f:Window ID="Window1" Title="关键事项" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px"
Height="720px">
Height="880px">
</f:Window>
<f:Window ID="Window2" Title="导入人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="false"
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx
+46 -9
View File
@@ -131,7 +131,7 @@
</f:Button>
</Items>
</f:FormRow>
<f:FormRow ID="rowProgressStatus" Hidden="true">
<%--<f:FormRow ID="rowProgressStatus" Hidden="true">
<Items>
<f:RadioButtonList ID="rblProgressStatus" runat="server" Label="进展申请" LabelWidth="110px" Width="420px"
AutoColumnWidth="true">
@@ -152,8 +152,7 @@
<f:TextBox ID="txtProgressReason" runat="server" Label="说明" MaxLength="1000" LabelWidth="110px">
</f:TextBox>
</Items>
</f:FormRow>
</f:FormRow>--%>
</Rows>
</f:Form>
</f:ContentPanel>
@@ -164,7 +163,7 @@
<f:FormRow ID="Progress_detail" Hidden="true">
<Items>
<f:ContentPanel ID="ContentPanel2" Title="关键事项进展" ShowBorder="true"
BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
BodyPadding="2px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
runat="server">
<Toolbars>
<f:Toolbar ID="Toolbar131" Position="Top" runat="server" ToolbarAlign="Right" CssClass="Toolbar2" Hidden="true">
@@ -176,14 +175,13 @@
</Items>
</f:Toolbar>
</Toolbars>
<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="Sort" AllowSorting="true"
DataIDField="Cuid" SortField="Sort" AllowSorting="false"
SortDirection="asc" AllowCellEditing="true" ClicksToEdit="1" OnRowCommand="gvOperateComplianceObligations_RowCommand">
<Columns>
@@ -199,21 +197,30 @@
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Date" DataField="Date" FieldType="Date"
<f:RenderField Width="150px" 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"
<f:RenderField MinWidth="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:RenderField MinWidth="100px" ColumnID="ProgressStatus" DataField="ProgressStatus"
FieldType="String" HeaderText="进展申请" HeaderTextAlign="Center" TextAlign="Left">
<Editor>
<f:DropDownList ID="ddlProgressStatus" runat="server" >
<f:ListItem Value="" Text="" ></f:ListItem>
<f:ListItem Value="持续跟踪" Text="持续跟踪" Selected="true"></f:ListItem>
<f:ListItem Value="申请关闭" Text="申请关闭"></f:ListItem>
</f:DropDownList>
</Editor>
</f:RenderField>
<f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
TextAlign="Center" ToolTip="附件查看" Icon="Find" />
@@ -225,6 +232,36 @@
</f:Grid>
</Items>
</f:Form>
<f:Form ID="ApproveForm" ShowBorder="false" ShowHeader="false" AutoScroll="true" Hidden="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<%--<f:FormRow ID="rowProgressStatus" Hidden="true">
<Items>
<f:DropDownList ID="ddlProgressStatus" runat="server" Label="进展申请" LabelWidth="100px">
<f:ListItem Value="0" Text="持续跟踪"></f:ListItem>
<f:ListItem Value="1" Text="申请关闭"></f:ListItem>
</f:DropDownList>
</Items>
</f:FormRow> ID="rowCloseProgressCheck"--%>
<f:FormRow >
<Items>
<f:RadioButtonList ID="rblProgressResult" runat="server" Label="申请结果" LabelWidth="100px" Width="420px"
AutoColumnWidth="true">
<f:RadioItem Value="0" Text="同意" Selected="true" />
<f:RadioItem Value="1" Text="驳回" />
</f:RadioButtonList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtProgressReason" runat="server" Label="说明" MaxLength="1000" LabelWidth="100px">
</f:TextBox>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</f:ContentPanel>
</Items>
</f:FormRow>
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
+78 -56
View File
@@ -158,6 +158,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
//事项进展负责人
UserService.InitUserDropDownList(DropProgress_user, CurrUser.LoginProjectId, false, string.Empty);
//DropProgress_user.SelectedValue = this.CurrUser.UserId;
////下一接受人
//UserService.InitUserDropDownList(DropNextRecipient, CurrUser.LoginProjectId, false, string.Empty);
@@ -228,7 +229,6 @@ namespace FineUIPro.Web.PZHGL.GJSX
//if (tb != null && tb.Rows.Count > 0)
//{
if (!string.IsNullOrEmpty(gjsx.CsUsers))
{
drpCsUsers.Values = gjsx.CsUsers.Split(',');
@@ -317,16 +317,17 @@ namespace FineUIPro.Web.PZHGL.GJSX
Grid2Binging();
Grid2.AllColumns[0].Hidden = true;
Grid2.AllColumns[5].Hidden = true;
Grid2.AllColumns[6].Hidden = false;
Grid2.AllColumns[6].Hidden = true;
Grid2.AllColumns[7].Hidden = false;
}
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;
//this.rblProgressStatus.SelectedIndex = int.Parse(gjsx.ProgressStatus);
this.ddlProgressStatus.SelectedValue = gjsx.ProgressStatus;
//rowProgressStatus.Hidden = false;
ApproveForm.Hidden = false;
}
else
{
@@ -338,8 +339,8 @@ namespace FineUIPro.Web.PZHGL.GJSX
Grid2Binging();
Grid2.AllColumns[0].Hidden = true;
Grid2.AllColumns[5].Hidden = true;
Grid2.AllColumns[6].Hidden = false;
Grid2.AllColumns[6].Hidden = true;
Grid2.AllColumns[7].Hidden = false;
}
if (state == "0")
@@ -352,10 +353,11 @@ namespace FineUIPro.Web.PZHGL.GJSX
{//如果当前登录人为责任人
if (state == "2")
{
rowProgressStatus.Hidden = false;
//rowProgressStatus.Hidden = false;
if (!string.IsNullOrWhiteSpace(gjsx.ProgressStatus))
{
this.rblProgressStatus.SelectedIndex = int.Parse(gjsx.ProgressStatus);
//this.rblProgressStatus.SelectedIndex = int.Parse(gjsx.ProgressStatus);
this.ddlProgressStatus.SelectedValue = gjsx.ProgressStatus;
}
Toolbar131.Hidden = false;
@@ -366,8 +368,8 @@ namespace FineUIPro.Web.PZHGL.GJSX
Grid2Binging();
Grid2.AllColumns[0].Hidden = true;
Grid2.AllColumns[5].Hidden = true;
Grid2.AllColumns[6].Hidden = false;
Grid2.AllColumns[6].Hidden = true;
Grid2.AllColumns[7].Hidden = false;
}
else
{
@@ -382,8 +384,8 @@ namespace FineUIPro.Web.PZHGL.GJSX
Progress_detail.Hidden = false;
Grid2Binging();
Grid2.AllColumns[0].Hidden = true;
Grid2.AllColumns[5].Hidden = true;
Grid2.AllColumns[6].Hidden = false;
Grid2.AllColumns[6].Hidden = true;
Grid2.AllColumns[7].Hidden = false;
}
}
else if (!string.IsNullOrEmpty(gjsx.User_ReceiveID) && gjsx.User_ReceiveID.Contains(this.CurrUser.UserId))
@@ -391,8 +393,8 @@ namespace FineUIPro.Web.PZHGL.GJSX
if (state == "0")
{
Grid2.AllColumns[0].Hidden = true;
Grid2.AllColumns[5].Hidden = true;
Grid2.AllColumns[6].Hidden = false;
Grid2.AllColumns[6].Hidden = true;
Grid2.AllColumns[7].Hidden = false;
Grid2Binging();
Button1.Hidden = true;
}
@@ -400,9 +402,10 @@ namespace FineUIPro.Web.PZHGL.GJSX
{
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;
//this.rblProgressStatus.SelectedIndex = int.Parse(gjsx.ProgressStatus);
this.ddlProgressStatus.SelectedValue = gjsx.ProgressStatus;
//rowProgressStatus.Hidden = false;
ApproveForm.Hidden = false;
}
else
{
@@ -415,8 +418,8 @@ namespace FineUIPro.Web.PZHGL.GJSX
Grid2Binging();
Grid2.AllColumns[0].Hidden = true;
Grid2.AllColumns[5].Hidden = true;
Grid2.AllColumns[6].Hidden = false;
Grid2.AllColumns[6].Hidden = true;
Grid2.AllColumns[7].Hidden = false;
}
else
{
@@ -446,8 +449,8 @@ namespace FineUIPro.Web.PZHGL.GJSX
Button1.Hidden = true;
Grid2Binging();
Grid2.AllColumns[0].Hidden = true;
Grid2.AllColumns[5].Hidden = true;
Grid2.AllColumns[6].Hidden = false;
Grid2.AllColumns[6].Hidden = true;
Grid2.AllColumns[7].Hidden = false;
}
if (!string.IsNullOrEmpty(gjsx.User_Acceptance) && gjsx.User_Acceptance.Contains(this.CurrUser.UserId)
@@ -474,8 +477,8 @@ namespace FineUIPro.Web.PZHGL.GJSX
Progress_detail.Hidden = false;
Grid2Binging();
Grid2.AllColumns[0].Hidden = true;
Grid2.AllColumns[5].Hidden = true;
Grid2.AllColumns[6].Hidden = false;
Grid2.AllColumns[6].Hidden = true;
Grid2.AllColumns[7].Hidden = false;
}
}
@@ -594,6 +597,8 @@ namespace FineUIPro.Web.PZHGL.GJSX
{
// 姓名
UpdateDataRow("Progress_detail", rowDict, rowData);
// 姓名
UpdateDataRow("ProgressStatus", rowDict, rowData);
}
private DataRow FindRowByID(string rowID)
@@ -628,6 +633,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();
_Detail.ProgressStatus = Table.Rows[i]["ProgressStatus"].ToString();
Model.GJSX_detail isExit_detail = BLL.GJSXItemService.GetGJSXMXById(_Detail.Cuid);
@@ -635,7 +641,6 @@ namespace FineUIPro.Web.PZHGL.GJSX
if (isExit_detail == null)
{
BLL.GJSXItemService.AddGJSXMX(_Detail);
}
else
{
@@ -664,13 +669,14 @@ 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 progressStatus = this.rblProgressStatus.SelectedValue;
//string progressStatus = this.ddlProgressStatus.SelectedValue;
//if (!string.IsNullOrWhiteSpace(progressStatus))
//{
// //gjsx.ProgressStatus = state == "2" ? null : progressStatus;
// gjsx.ProgressStatus = progressStatus;
//}
gjsx.ProgressStatus = state == "3" ? "1" : "0";
//抄送人
string sendUserIds = string.Empty;
if (!string.IsNullOrEmpty(drpCsUsers.Value))
@@ -891,17 +897,19 @@ namespace FineUIPro.Web.PZHGL.GJSX
if (gjsx.User_Acceptance.Contains(this.CurrUser.UserId))
{//责任人的时候保存关键事项
//进展状态
string progressStatus = this.rblProgressStatus.SelectedValue;
if (progressStatus == "0")
{//持续跟踪
save("2");
}
else if (progressStatus == "1")
//string progressStatus = this.rblProgressStatus.SelectedValue;
string progressStatus = string.Empty;
OperateComplianceObligationsCSort(ref progressStatus);
if (progressStatus == "申请关闭")
{//申请关闭
save("3");
}
else if (progressStatus == "持续跟踪")
{//持续跟踪
save("2");
}
//save("3");
OperateComplianceObligationsCSort();
}
else if (gjsx.UserID.Contains(this.CurrUser.UserId) || gjsx.User_ReceiveID.Contains(this.CurrUser.UserId))
{//提出人、跟踪人审批责任人提出申请关闭请求
@@ -925,6 +933,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
Progress_detail = $"{(progressResult == "0" ? "同意" : "驳回")}申请关闭{(!string.IsNullOrWhiteSpace(progressReason) ? "：" : "")}{progressReason}",
Date = DateTime.Now,
Sort = GJSX_detail.Count,
ProgressStatus = "",
};
GJSXItemService.AddGJSXMX(detail);
}
@@ -1157,12 +1166,20 @@ namespace FineUIPro.Web.PZHGL.GJSX
#endregion
#region 关键事项
/// <summary>
/// 关键事项
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnNew_Click(object sender, EventArgs e)
{
jerqueSaveComplianceObligationsCList();
Model.GJSX_detail complianceObligationsC = new Model.GJSX_detail
{
Cuid = SQLHelper.GetNewID(typeof(Model.Solution_CQMSConstructSolutionApprove_Item))
Cuid = SQLHelper.GetNewID(typeof(Model.GJSX_detail)),
Progress_user = this.CurrUser.UserId,
ProgressStatus = "持续跟踪"
};
GJSX_detail.Add(complianceObligationsC);
this.Grid2.DataSource = GJSX_detail;
@@ -1202,7 +1219,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
/// <summary>
/// 关键事项进展明细
/// </summary>
private void OperateComplianceObligationsCSort()
private void OperateComplianceObligationsCSort(ref string progressStatus)
{
var list = Funs.DB.GJSX_detail.Where(x => x.GJSXID == txtGJSXID.Text).ToList();
if (list.Count > 0)
@@ -1211,25 +1228,29 @@ namespace FineUIPro.Web.PZHGL.GJSX
Funs.DB.SubmitChanges();
}
jerqueSaveComplianceObligationsCList();
foreach (Model.GJSX_detail coc in GJSX_detail)
{
coc.GJSXID = txtGJSXID.Text;
BLL.GJSXItemService.AddGJSXMX(coc);
progressStatus = coc.ProgressStatus;//== "持续跟踪" ? "0" : "1"
}
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);
}
//string progressStatus = this.rblProgressStatus.SelectedValue;
//string progressStatus = this.ddlProgressStatus.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);
//}
}
@@ -1247,6 +1268,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
Cuid = this.Grid2.Rows[i].DataKeys[0].ToString(),
Progress_user = values.Value<string>("Progress_user").ToString(),
Progress_detail = values.Value<string>("Progress_detail").ToString(),
ProgressStatus = values.Value<string>("ProgressStatus").ToString(),
Sort = i
};
if (!string.IsNullOrEmpty(values.Value<string>("Date").ToString()))
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.designer.cs
Generated
+36 -45
View File
@@ -194,51 +194,6 @@ namespace FineUIPro.Web.PZHGL.GJSX
/// </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>
@@ -329,6 +284,42 @@ namespace FineUIPro.Web.PZHGL.GJSX
/// </remarks>
protected global::FineUIPro.TextBox tbxEditorName;
/// <summary>
/// ddlProgressStatus 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlProgressStatus;
/// <summary>
/// ApproveForm 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form ApproveForm;
/// <summary>
/// rblProgressResult 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblProgressResult;
/// <summary>
/// txtProgressReason 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProgressReason;
/// <summary>
/// Toolbar1 控件。
/// </summary>