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-07-11 18:07:04 +08:00
parent cf027d4abe
commit fd3b00ed44
21 changed files with 456 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx
+2 -2
View File
@@ -71,7 +71,7 @@
<Items>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="预计施工" ID="txtExpectedTime" LabelWidth="130px">
</f:DatePicker>
<f:NumberBox runat="server" ID="txtTrainPersonNum" NoDecimal="true" NoNegative="true" Label="培训人数" LabelWidth="130px"></f:NumberBox>
<f:NumberBox runat="server" ID="txtTrainPersonNum" NoDecimal="true" NoNegative="true" Label="培训人数" LabelWidth="130px" Required="true" ShowRedStar="true"></f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
@@ -81,7 +81,7 @@
<f:ListItem Text="作业中" Value="2"/>
<f:ListItem Text="已关闭" Value="3"/>
</f:DropDownList>
<f:NumberBox runat="server" ID="txtOperativesNum" NoDecimal="true" NoNegative="true" Label="作业人员数" LabelWidth="130px"></f:NumberBox>
<f:NumberBox runat="server" ID="txtOperativesNum" NoDecimal="true" NoNegative="true" Label="作业人员数" LabelWidth="130px" Required="true" ShowRedStar="true"></f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx
+2 -2
View File
@@ -44,7 +44,7 @@
<f:RadioButtonList ID="rblIsSuperLargerHazard" runat="server" Label="超危大工程" LabelWidth="100px" Required="true" ShowRedStar="true">
</f:RadioButtonList>
<f:NumberBox runat="server" ID="txtTrainPersonNum" NoDecimal="true" NoNegative="true" Label="培训人次" LabelWidth="100px"></f:NumberBox>
<f:NumberBox runat="server" ID="txtTrainPersonNum" NoDecimal="true" NoNegative="true" Label="培训人次" LabelWidth="100px" Required="true" ShowRedStar="true"></f:NumberBox>
<f:DropDownList ID="drpStates" runat="server" Label="状态" LabelAlign="Right">
<f:ListItem Text="审批完成" Value="1" />
<f:ListItem Text="作业中" Value="2" />
@@ -55,7 +55,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox runat="server" ID="txtOperativesNum" NoDecimal="true" NoNegative="true" Label="作业人员数" LabelWidth="100px"></f:NumberBox>
<f:NumberBox runat="server" ID="txtOperativesNum" NoDecimal="true" NoNegative="true" Label="作业人员数" LabelWidth="100px" Required="true" ShowRedStar="true"></f:NumberBox>
<f:Label runat="server" ID="txtOperativesNum1"></f:Label>
<f:Label runat="server" ID="txtOperativesNum2"></f:Label>
</Items>
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
+7
View File
@@ -741,6 +741,13 @@ namespace FineUIPro.Web.PZHGL.GJSX
return;
}
////勾选邮件即时通知责任人，先判断责任人是否已维护邮箱
//if (this.Date_CompleteDate.Text == "")
//{
// Alert.ShowInParent("请选择要求完成日期！", MessageBoxIcon.Warning);
// return;
//}
string EditType = Request.Params["EditType"];
string ID = Request.Params["ID"];
SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx
+14 -2
View File
@@ -80,14 +80,26 @@
<Items>
<f:Label ID="txtUnitName" runat="server" Hidden="true">
</f:Label>
<f:Label ID="txtQuarter" runat="server">
<f:Label ID="txtQuarter" runat="server" LabelWidth="130px">
</f:Label>
<f:Label ID="txtCompileDate" runat="server">
<f:Label ID="txtCompileDate" runat="server" LabelWidth="130px">
</f:Label>
<f:Label ID="lbHandleMan" runat="server">
</f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="Label1" runat="server" Hidden="true">
</f:Label>
<f:Label ID="txtKeyWorkNum" runat="server" Label="重点工作任务数" LabelWidth="130px">
</f:Label>
<f:Label ID="txtKeyWorkOKNum" runat="server" Label="重点工作完成数" LabelWidth="130px">
</f:Label>
<f:Label ID="txtKeyWorkOKRate" runat="server" Label="综合完成率">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Grid ID="Grid1" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.cs
+15
View File
@@ -62,6 +62,9 @@ namespace FineUIPro.Web.ZHGL.Information
txtUnitName.Text = string.Empty;
txtQuarter.Text = string.Empty;
txtCompileDate.Text = string.Empty;
txtKeyWorkNum.Text = string.Empty;
txtKeyWorkOKNum.Text = string.Empty;
txtKeyWorkOKRate.Text = string.Empty;
this.lbHandleMan.Text = string.Empty;
Grid1.DataSource = null;
Grid1.DataBind();
@@ -105,6 +108,18 @@ namespace FineUIPro.Web.ZHGL.Information
this.ActionWorkLedgerId = report.ActionWorkLedgerId;
txtUnitName.Text = "单位：" + report.UnitName;
txtQuarter.Text = "季度：" + report.Quarters;
if (report.KeyWorkNum != null)
{
txtKeyWorkNum.Text = report.KeyWorkNum.ToString();
}
if (report.KeyWorkOKNum != null)
{
txtKeyWorkOKNum.Text = report.KeyWorkOKNum.ToString();
}
if (!string.IsNullOrEmpty(report.KeyWorkOKRate))
{
txtKeyWorkOKRate.Text = report.KeyWorkOKRate;
}
if (report.HandleState == BLL.Const.HandleState_1 || report.UpState == BLL.Const.UpState_3)
{
this.lbHandleMan.Hidden = true;
SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.designer.cs
Generated
+36
View File
@@ -228,6 +228,42 @@ namespace FineUIPro.Web.ZHGL.Information {
/// </remarks>
protected global::FineUIPro.Label lbHandleMan;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// txtKeyWorkNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtKeyWorkNum;
/// <summary>
/// txtKeyWorkOKNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtKeyWorkOKNum;
/// <summary>
/// txtKeyWorkOKRate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtKeyWorkOKRate;
/// <summary>
/// Grid1 控件。
/// </summary>
SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx
+9
View File
@@ -27,6 +27,15 @@
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox runat="server" ID="txtKeyWorkNum" Label="重点工作任务数" NoDecimal="true" LabelWidth="130px" NoNegative="true" Required="true" ShowRedStar="true" AutoPostBack="true" OnTextChanged="txtKeyWorkNum_TextChanged"></f:NumberBox>
<f:NumberBox runat="server" ID="txtKeyWorkOKNum" Label="重点工作完成数" NoDecimal="true" LabelWidth="130px" NoNegative="true" Required="true" ShowRedStar="true" AutoPostBack="true" OnTextChanged="txtKeyWorkNum_TextChanged"></f:NumberBox>
<f:TextBox ID="txtKeyWorkOKRate" runat="server" Label="综合完成率" Readonly="true">
</f:TextBox>
<f:Label runat="server"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" runat="server"
SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.cs
+27
View File
@@ -99,6 +99,18 @@ namespace FineUIPro.Web.ZHGL.Information
{
this.dpkCompileDate.Text = string.Format("{0:yyyy-MM-dd}", ActionWorkLedger.ReportDate);
}
if (ActionWorkLedger.KeyWorkNum != null)
{
this.txtKeyWorkNum.Text = ActionWorkLedger.KeyWorkNum.ToString();
}
if (ActionWorkLedger.KeyWorkOKNum != null)
{
this.txtKeyWorkOKNum.Text = ActionWorkLedger.KeyWorkOKNum.ToString();
}
if (!string.IsNullOrEmpty(ActionWorkLedger.KeyWorkOKRate))
{
this.txtKeyWorkOKRate.Text = ActionWorkLedger.KeyWorkOKRate;
}
}
}
else
@@ -237,6 +249,9 @@ namespace FineUIPro.Web.ZHGL.Information
}
ActionWorkLedger.YearId = Funs.GetNewIntOrZero(this.ddlYearId.SelectedValue);
ActionWorkLedger.Quarter = Funs.GetNewIntOrZero(this.ddlQuarter.SelectedValue);
ActionWorkLedger.KeyWorkNum = Funs.GetNewIntOrZero(this.txtKeyWorkNum.Text.Trim());
ActionWorkLedger.KeyWorkOKNum = Funs.GetNewIntOrZero(this.txtKeyWorkOKNum.Text.Trim());
ActionWorkLedger.KeyWorkOKRate = this.txtKeyWorkOKRate.Text.Trim();
if (string.IsNullOrEmpty(this.ActionWorkLedgerId))
{
this.ActionWorkLedgerId = SQLHelper.GetNewID(typeof(Model.Information_ActionWorkLedger)); ActionWorkLedger.ActionWorkLedgerId = this.ActionWorkLedgerId;
@@ -530,5 +545,17 @@ namespace FineUIPro.Web.ZHGL.Information
}
}
#endregion
protected void txtKeyWorkNum_TextChanged(object sender, EventArgs e)
{
decimal keyWorkNum = Funs.GetNewDecimalOrZero(this.txtKeyWorkNum.Text.Trim());
decimal keyWorkOKNum = Funs.GetNewDecimalOrZero(this.txtKeyWorkOKNum.Text.Trim());
string rate = string.Empty;
if (keyWorkNum > 0)
{
rate = (decimal.Round(keyWorkOKNum / keyWorkNum, 4) * 100).ToString("0.##") + "%";
}
this.txtKeyWorkOKRate.Text = rate;
}
}
}
SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.designer.cs
Generated
+27
View File
@@ -75,6 +75,33 @@ namespace FineUIPro.Web.ZHGL.Information {
/// </remarks>
protected global::FineUIPro.DatePicker dpkCompileDate;
/// <summary>
/// txtKeyWorkNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtKeyWorkNum;
/// <summary>
/// txtKeyWorkOKNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtKeyWorkOKNum;
/// <summary>
/// txtKeyWorkOKRate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtKeyWorkOKRate;
/// <summary>
/// Grid1 控件。
/// </summary>
SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs
+96 -6
View File
@@ -82,7 +82,7 @@ namespace FineUIPro.Web.ZHGL.Information
if (report.UpState == BLL.Const.UpState_3)
{
this.btnSave.Hidden = true;
this.btnUpdata.Hidden = true;
//this.btnUpdata.Hidden = true;
}
drpMonth.SelectedValue = report.Month.ToString();
drpYear.SelectedValue = report.Year.ToString();
@@ -329,6 +329,7 @@ namespace FineUIPro.Web.ZHGL.Information
string code = CNCECHSSEWebService.UpMillionsMonthlyReport(report.MillionsMonthlyReportId, this.CurrUser);
if (code == "1")
{
//WorkflowTodoitemsService.DoneWorkflow_TodoItems(report.MillionsMonthlyReportId, this.CurrUser.UserId);//完成当前人待办
ShowNotify("同步成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
return;
@@ -348,21 +349,100 @@ namespace FineUIPro.Web.ZHGL.Information
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ReportSubmit.aspx?Type=MillionsMonthlyReport&Id={0}", report.MillionsMonthlyReportId, "编辑 - ")));
}
else if (type == "add")
{
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
return;
}
}
protected void btnSave_Click(object sender, EventArgs e)
{
Save("add");
string err = AuditData();
if (string.IsNullOrEmpty(err))
{
Save("add");
}
else
{
ShowNotify(err, MessageBoxIcon.Warning);
}
}
protected void btnUpdata_Click(object sender, EventArgs e)
{
Save("updata");
string err = AuditData();
if (string.IsNullOrEmpty(err))
{
Save("updata");
}
else
{
ShowNotify(err, MessageBoxIcon.Warning);
}
}
protected void btnSubmit_Click(object sender, EventArgs e)
{
Save("submit");
string err = AuditData();
if (string.IsNullOrEmpty(err))
{
Save("submit");
}
else
{
ShowNotify(err, MessageBoxIcon.Warning);
}
}
private string AuditData()
{
string err = string.Empty;
Model.SGGLDB db = Funs.DB;
var reports = from x in db.Information_MillionsMonthlyReport
where x.FillingDate < DateTime.Now
orderby x.FillingDate descending
select x;
if (!string.IsNullOrEmpty(this.MillionsMonthlyReportId))
{
reports = from x in reports
where x.MillionsMonthlyReportId != this.MillionsMonthlyReportId
orderby x.FillingDate descending
select x;
}
var reportIds = reports.Select(x => x.MillionsMonthlyReportId).Take(3).ToList();
//var items = from x in db.Information_MillionsMonthlyReportItem
// where reportIds.Contains(x.MillionsMonthlyReportId)
// select new { x.Name, x.TotalWorkNum };
var items = from x in db.Information_MillionsMonthlyReportItem
where reportIds.Contains(x.MillionsMonthlyReportId)
select new { x.Name, x.TotalWorkNum };
foreach (JObject mergedRow in Grid1.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
if (!string.IsNullOrEmpty(values["Name"].ToString()) && !string.IsNullOrEmpty(values["TotalWorkNum"].ToString()))
{
string name = values.Value<string>("Name");
decimal d = values.Value<decimal>("TotalWorkNum");
var list = items.Where(x => x.Name == name);
decimal a = 0;
if (list.Count() > 0)
{
foreach (var item in list)
{
a += item.TotalWorkNum ?? 0;
}
}
decimal b = a / list.Count();
if (d > b * 5)
{
err = name + "的总工时数超过前三个月平均值5倍，请核对后重新录入！";
break;
}
}
}
return err;
}
#endregion
@@ -813,10 +893,10 @@ namespace FineUIPro.Web.ZHGL.Information
};
items.Add(item2);
var projects = (from x in Funs.DB.Base_Project
where projectIds.Contains(x.ProjectId)
where projectIds.Contains(x.ProjectId) && (x.IsDelete == null || x.IsDelete == false)
select x).ToList();
if (this.CurrUser.UnitId == BLL.Const.UnitId_CWCEC)
if (this.CurrUser.UnitId == CommonService.GetThisUnitId())
{
projects = BLL.ProjectService.GetProjectWorkList();
}
@@ -924,6 +1004,16 @@ namespace FineUIPro.Web.ZHGL.Information
Grid1.DataSource = items;
Grid1.DataBind();
}
protected void drpDate_SelectedIndexChanged(object sender, EventArgs e)
{
items.Clear();
GetNewItems(drpYear.SelectedValue, drpMonth.SelectedValue);
Grid1.DataSource = items;
Grid1.DataBind();
}
#endregion
#region 获取按钮权限
SGGL/FineUIPro.Web/common/Menu_HSSE.xml
+1 -1
View File
@@ -73,7 +73,7 @@
<TreeNode id="7B272C3F-39D2-496D-A87C-E2C89A20E4EF" Text="HSE巡检统计(图表)" NavigateUrl="HSSE/HiddenInspection/RiskAnalysisChart.aspx"></TreeNode>
<TreeNode id="4E312813-1A2E-4AF7-8106-9210A6E83926" Text="隐患整改统计" NavigateUrl="HSSE/Check/RectifyNoticesStatistics.aspx"></TreeNode>
<TreeNode id="5DC49905-6A1C-4353-A06C-D9D1A8D6B6F9" Text="隐患排查与治理统计" NavigateUrl="HSSE/Check/HiddenTroubleManager.aspx"></TreeNode>
<TreeNode id="09E6A03F-65C8-4FAC-9659-7A0B56D8CC19" Text="指挥调度中心" NavigateUrl="ZHDD/ZHDD.aspx"></TreeNode>
<TreeNode id="09E6A03F-65C8-4FAC-9659-7A0B56D8CC19" Text="智慧巡检" NavigateUrl="ZHDD/ZHDD.aspx"></TreeNode>
</TreeNode>
<TreeNode id="5309E7E0-395E-4F11-8F5E-D52E11526A2A" Text="HSE会议" NavigateUrl=""><TreeNode id="DFB56743-17BA-40BA-82EA-FCB9B0DBFAFF" Text="安全领导小组会议" NavigateUrl="HSSE/Meeting/SafetyLeaderGroupMeeting.aspx"></TreeNode>
<TreeNode id="5236B1D9-8B57-495E-8644-231DF5D066CE" Text="HSE周例会" NavigateUrl="HSSE/Meeting/WeekMeeting.aspx"></TreeNode>
SGGL/FineUIPro.Web/common/Menu_JDGL.xml
+5 -2
View File
@@ -20,7 +20,7 @@
<TreeNode id="43A118BC-0A81-42F1-B008-829D40CFE625" Text="供应商信息" NavigateUrl="CLGL/Supplier.aspx"></TreeNode>
</TreeNode>
</TreeNode>
<TreeNode id="858E83E9-ADE5-452E-BD65-82D8DFF872C0" Text="工作包及检测点" NavigateUrl="JDGL/WBS/WBSSetAudit.aspx"></TreeNode>
<TreeNode id="5E34DEB4-10E6-4964-B91A-4C1A978677DB" Text="施工进度" NavigateUrl=""><TreeNode id="858E83E9-ADE5-452E-BD65-82D8DFF872C0" Text="分部、工作项及费用清单裁剪" NavigateUrl="JDGL/WBS/WBSSetAudit.aspx"></TreeNode>
<TreeNode id="82E1EB3B-3589-4C32-9C20-40125CE6EAB4" Text="设备材料分类" NavigateUrl=""><TreeNode id="F2BC1293-8639-4BD6-8759-648BCF6346E9" Text="设备材料大类" NavigateUrl="JDGL/WBS/EquipmentMaterialBigType.aspx"></TreeNode>
<TreeNode id="D00B3C53-2972-4D24-B88F-B38880D4A24F" Text="设备材料分类" NavigateUrl="JDGL/WBS/EquipmentMaterialType.aspx"></TreeNode>
</TreeNode>
@@ -29,8 +29,11 @@
<TreeNode id="59AAE0F0-2DB6-4065-B304-7E2C56EC3E5D" Text="赢得值曲线" NavigateUrl="JDGL/CostAnalysis/EarnedValueCurve.aspx"></TreeNode>
<TreeNode id="D1FC6ACA-C789-401C-B9FB-3A96FFE4C8AC" Text="进度报表" NavigateUrl="JDGL/CostAnalysis/JDReport.aspx"></TreeNode>
<TreeNode id="9CAF311E-C234-4DA4-B235-D4E478FBD80E" Text="里程碑" NavigateUrl="JDGL/WBS/MilePost.aspx"></TreeNode>
<TreeNode id="94287B92-7E96-4B90-BC6F-DAF30AE3B314" Text="月度计划情况" NavigateUrl="JDGL/Check/MonthPlan.aspx"></TreeNode>
</TreeNode>
<TreeNode id="AF2EBE09-739A-4618-9925-44D5C8B94C84" Text="施工计划" NavigateUrl=""><TreeNode id="94287B92-7E96-4B90-BC6F-DAF30AE3B314" Text="月度计划情况" NavigateUrl="JDGL/Check/MonthPlan.aspx"></TreeNode>
<TreeNode id="56A54B4B-BBA3-4249-9FFC-3A60DAC79059" Text="周进度计划" NavigateUrl="JDGL/Check/WeekPlan.aspx"></TreeNode>
</TreeNode>
<TreeNode id="1BCD283A-F33C-488C-8FCA-F7B7B9C1A003" Text="施工人力" NavigateUrl=""></TreeNode>
<TreeNode id="92CBD072-20F8-45B1-9D17-6F7494DD2020" Text="数据导入" NavigateUrl=""><TreeNode id="F3AA42B3-5776-4992-A625-1216C579FEDE" Text="项目进度情况" NavigateUrl="JDGL/Check/ProgressCompletion.aspx"></TreeNode>
<TreeNode id="2AE9D982-A499-497F-8F54-ADDA5856887E" Text="工程量完成情况" NavigateUrl="JDGL/Check/QuantityCompletion.aspx"></TreeNode>
<TreeNode id="82E513B9-1A6F-495A-A633-EBC89CE5273A" Text="低温储罐完成情况" NavigateUrl="JDGL/Check/LowTankCompletion.aspx"></TreeNode>