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

修改专项检查

Browse Source
This commit is contained in:
高飞
2023-09-05 14:45:18 +08:00
parent 02e9796323
commit f7e17a792a
13 changed files with 440 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs
+38 -1
View File
@@ -119,6 +119,9 @@ namespace FineUIPro.Web.HSSE.Check
{ "UnitName", "" },
{ "Unqualified", "" },
{ "CheckItemName", "" },
//增加检查项内容和日期
{ "CheckItemSetContent", "" },
{ "Rectification_Date", "" },
{ "CompleteStatusName", "" },
{ "HandleStepStr", "" },
{ "HiddenHazardTypeName", "" },
@@ -309,7 +312,9 @@ namespace FineUIPro.Web.HSSE.Check
CheckSpecialId = this.CheckSpecialId,
CheckContent = values.Value<string>("CheckItemName"),
Unqualified = values.Value<string>("Unqualified"),
// WorkArea = values.Value<string>("WorkArea"),
CheckItemSetContent = values.Value<string>("CheckItemSetContent"),
Rectification_Date= values.Value<DateTime>("Rectification_Date"),
// WorkArea = values.Value<string>("WorkArea"),
};
var getUnit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitName == values.Value<string>("UnitName"));
if (getUnit != null)
@@ -372,7 +377,14 @@ namespace FineUIPro.Web.HSSE.Check
if (getCheckItem != null)
{
newDetail.CheckItem = getCheckItem.CheckItemSetId;
//插入检查项内容id
var getCheckItemSet = Funs.DB.Technique_CheckItemDetail.FirstOrDefault(x => x.CheckItemSetId == getCheckItem.CheckItemSetId && x.CheckContent == newDetail.CheckItemSetContent);
if (getCheckItemSet != null)
{
newDetail.CheckItemSetId = getCheckItemSet.CheckItemDetailId;
}
}
newDetail.SortIndex = rowIndex;
Check_CheckSpecialDetailService.AddCheckSpecialDetail(newDetail);
detailLists.Add(newDetail);
@@ -472,6 +484,9 @@ namespace FineUIPro.Web.HSSE.Check
{
this.drpSupCheckItemSet.Items.Clear();
this.drpCheckItem.Items.Clear();
//检查项内容清空
this.drpCheckItemDetail.Items.Clear();
if (this.rbType.SelectedValue == "1")
{
this.drpSupCheckItemSet.SelectedIndex = 0;
@@ -484,14 +499,36 @@ namespace FineUIPro.Web.HSSE.Check
Technique_CheckItemSetService.InitCheckItemSetDropDownList(this.drpSupCheckItemSet, "2", "0", false);
this.drpSupCheckItemSet.SelectedIndex = 0;
Technique_CheckItemSetService.InitCheckItemSetNameDropDownList(this.drpCheckItem, "2", this.drpSupCheckItemSet.SelectedValue, false);
//加载检查项内容下拉
var getCheckItem = Funs.DB.Technique_CheckItemSet.FirstOrDefault(x => x.SupCheckItem == this.drpSupCheckItemSet.SelectedValue && x.CheckItemName == this.drpCheckItem.SelectedValue);
var checkItemSetId = getCheckItem.CheckItemSetId;
Technique_CheckItemDetailService.InitCheckItemDetailDropDownList(this.drpCheckItemDetail, checkItemSetId, false);
}
this.drpCheckItem.SelectedValue = null;
this.drpCheckItemDetail.SelectedValue = null;
}
protected void drpCheckItem_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpCheckItemDetail.Items.Clear();
this.drpCheckItem.SelectedValueArray = Funs.RemoveDropDownListNull(this.drpCheckItem.SelectedValueArray);
if (!string.IsNullOrEmpty(this.drpCheckItem.SelectedValue))
{
//加载检查项内容下拉
var getCheckItem = Funs.DB.Technique_CheckItemSet.
FirstOrDefault(x => x.SupCheckItem == this.drpSupCheckItemSet.SelectedValue && x.CheckItemName == this.drpCheckItem.SelectedValue);
var checkItemSetId = getCheckItem.CheckItemSetId;
Technique_CheckItemDetailService.InitCheckItemDetailDropDownList(this.drpCheckItemDetail, checkItemSetId, false);
}
}
protected void drpCheckItemDetail_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpCheckItemDetail.SelectedValueArray = Funs.RemoveDropDownListNull(this.drpCheckItemDetail.SelectedValueArray);
}
protected void Grid1_Sort(object sender, GridSortEventArgs e)