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

修改移交

Browse Source
This commit is contained in:
潘鸿锋
2024-08-09 10:48:15 +08:00
parent cc639f4cab
commit 8c3bd0fe80
65 changed files with 1335 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs
+17 -14
View File
@@ -59,10 +59,11 @@ namespace FineUIPro.Web.Transfer
ddlBuildingdecoration.SelectedValue = model.Buildingdecoration;
ddlEquipment.SelectedValue = model.Equipment;
ddlInstrument.SelectedValue = model.Instrument;
ddlElectrical.SelectedValue = model.Electrical;
ddlFireFighting.SelectedValue = model.FireFighting;
//ddlInstrument.SelectedValue = model.Instrument;
//ddlElectrical.SelectedValue = model.Electrical;
//ddlFireFighting.SelectedValue = model.FireFighting;
ddlHVAC.SelectedValue = model.HVAC;
txtDescriptions.Text = model.Descriptions;
}
}
}
@@ -82,10 +83,11 @@ namespace FineUIPro.Web.Transfer
Buildingdecoration = ddlBuildingdecoration.SelectedValue,
Equipment = ddlEquipment.SelectedValue,
Instrument = ddlInstrument.SelectedValue,
Electrical = ddlElectrical.SelectedValue,
FireFighting = ddlFireFighting.SelectedValue,
//Instrument = ddlInstrument.SelectedValue,
//Electrical = ddlElectrical.SelectedValue,
//FireFighting = ddlFireFighting.SelectedValue,
HVAC = ddlHVAC.SelectedValue,
Descriptions= txtDescriptions.Text
};
@@ -96,16 +98,16 @@ namespace FineUIPro.Web.Transfer
listObj.Add(model.Buildingdecoration);
listObj.Add(model.Equipment);
listObj.Add(model.Instrument);
listObj.Add(model.Electrical);
listObj.Add(model.FireFighting);
//listObj.Add(model.Instrument);
//listObj.Add(model.Electrical);
//listObj.Add(model.FireFighting);
listObj.Add(model.HVAC);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 8)
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
{
model.FINAL_Status = "Completed";
} //如果全是Not Start 就是 Not Start
else if (listObj.Where(x => x == "Not Start").ToList().Count == 8)
else if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
{
model.FINAL_Status = "Not Start";
}
@@ -131,11 +133,12 @@ namespace FineUIPro.Web.Transfer
newModel.Buildingdecoration = ddlBuildingdecoration.SelectedValue;
newModel.Equipment = ddlEquipment.SelectedValue;
newModel.Instrument = ddlInstrument.SelectedValue;
newModel.Electrical = ddlElectrical.SelectedValue;
newModel.FireFighting = ddlFireFighting.SelectedValue;
//newModel.Instrument = ddlInstrument.SelectedValue;
//newModel.Electrical = ddlElectrical.SelectedValue;
//newModel.FireFighting = ddlFireFighting.SelectedValue;
newModel.HVAC = ddlHVAC.SelectedValue;
newModel.FINAL_Status = model.FINAL_Status;
newModel.Descriptions = txtDescriptions.Text;
}
}
else