提交施工日志修改
This commit is contained in:
@@ -303,6 +303,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
|
||||
this.txtCQMSTomorrowPlanRemark.Text = log.CQMSTomorrowPlanRemark;
|
||||
var persons = BLL.ConstructionLogPersonService.GetConstructionLogPersonsByConstructionLogId(ConstructionLogId);
|
||||
List<string> unitWorkList = Funs.GetStrListByStr(log.UnitWorks, ',');
|
||||
ChangeText();
|
||||
List<Model.ConstructionLogPersonItem> personItems = new List<Model.ConstructionLogPersonItem>();
|
||||
if (persons.Count > 0)
|
||||
{
|
||||
@@ -622,7 +623,6 @@ namespace FineUIPro.Web.PZHGL.InformationProject
|
||||
}
|
||||
}
|
||||
}
|
||||
this.txtState.Text = string.Empty;
|
||||
this.txtRemark.Text = string.Empty;
|
||||
this.txtHSETodaySummary.Text = string.Empty;
|
||||
this.txtHSETodaySummaryRemark.Text = string.Empty;
|
||||
@@ -657,7 +657,6 @@ namespace FineUIPro.Web.PZHGL.InformationProject
|
||||
this.drpContractNo.SelectedIndex = 0;
|
||||
this.drpUnitWork.SelectedIndex = 0;
|
||||
this.drpProfessional.SelectedIndex = 0;
|
||||
this.txtState.Text = string.Empty;
|
||||
this.txtRemark.Text = string.Empty;
|
||||
this.txtHSETodaySummary.Text = string.Empty;
|
||||
this.txtHSETodaySummaryRemark.Text = string.Empty;
|
||||
@@ -926,7 +925,22 @@ namespace FineUIPro.Web.PZHGL.InformationProject
|
||||
/// <param name="e"></param>
|
||||
protected void Window1_Close(object sender, WindowCloseEventArgs e)
|
||||
{
|
||||
ChangeText();
|
||||
}
|
||||
|
||||
private void ChangeText()
|
||||
{
|
||||
var workEfficiencys = from x in Funs.DB.ZHGL_ConstructionLogWorkEfficiency
|
||||
where x.ConstructionLogId == this.tvControlItem.SelectedNodeID
|
||||
select x;
|
||||
if (workEfficiencys.Count() > 0)
|
||||
{
|
||||
this.btnWorkEfficiency.Text = "已填报";
|
||||
}
|
||||
else
|
||||
{
|
||||
this.btnWorkEfficiency.Text = "未填报";
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
@@ -1249,5 +1263,41 @@ namespace FineUIPro.Web.PZHGL.InformationProject
|
||||
{
|
||||
TextNew();
|
||||
}
|
||||
|
||||
protected void btnWorkEfficiency_Click(object sender, EventArgs e)
|
||||
{
|
||||
string contractNo = string.Empty;
|
||||
foreach (var item in this.drpContractNo.SelectedValueArray)
|
||||
{
|
||||
if (item != BLL.Const._Null)
|
||||
{
|
||||
contractNo += item + ",";
|
||||
}
|
||||
}
|
||||
if (!string.IsNullOrEmpty(contractNo))
|
||||
{
|
||||
contractNo = contractNo.Substring(0, contractNo.Length - 1);
|
||||
}
|
||||
string professional = string.Empty;
|
||||
foreach (var item in this.drpProfessional.SelectedValueArray)
|
||||
{
|
||||
if (item != BLL.Const._Null)
|
||||
{
|
||||
professional += item + ",";
|
||||
}
|
||||
}
|
||||
if (!string.IsNullOrEmpty(professional))
|
||||
{
|
||||
professional = professional.Substring(0, professional.Length - 1);
|
||||
}
|
||||
if (!string.IsNullOrEmpty(contractNo) && !string.IsNullOrEmpty(professional))
|
||||
{
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConstructionLogWorkEfficiency.aspx?ConstructionLogId={0}&contractNo={1}&professional={2}&WorkPostId={3}&MachineId={4}&View=View", this.ConstructionLogId, contractNo, professional, hdWorkPostId.Text, hdMachineId.Text, "导入 - ")));
|
||||
}
|
||||
else
|
||||
{
|
||||
Alert.ShowInTop("请选择合同编号和专业工程!", MessageBoxIcon.Warning);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user