质量月报修改
This commit is contained in:
parent
1c14fbc61b
commit
d1e5badc5b
|
@ -0,0 +1,2 @@
|
||||||
|
update Comprehensive_DesignChangeOrder set ImplementationFrontState='已完成' where ImplementationFrontState like'%完成%';
|
||||||
|
update Comprehensive_DesignChangeOrder set ImplementationFrontState='实施中' where ImplementationFrontState !='已完成';
|
|
@ -42,7 +42,12 @@
|
||||||
</f:FormRow>
|
</f:FormRow>
|
||||||
<f:FormRow>
|
<f:FormRow>
|
||||||
<Items>
|
<Items>
|
||||||
<f:TextBox ID="txtImplementationFrontState" runat="server" Label="执行情况" MaxLength="50" LabelAlign="right"></f:TextBox>
|
<%--<f:TextBox ID="txtImplementationFrontState" runat="server" Label="执行情况" MaxLength="50" LabelAlign="right"></f:TextBox>--%>
|
||||||
|
<f:DropDownList ID="drpImplementationFrontState" runat="server" Label="执行情况" LabelAlign="right">
|
||||||
|
<f:ListItem Value="实施中" Text="实施中" Selected="true"/>
|
||||||
|
<f:ListItem Value="已完成" Text="已完成"/>
|
||||||
|
</f:DropDownList>
|
||||||
|
|
||||||
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="施工完成日期" ID="txtCompleteDate" LabelWidth="120px"
|
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="施工完成日期" ID="txtCompleteDate" LabelWidth="120px"
|
||||||
LabelAlign="right">
|
LabelAlign="right">
|
||||||
</f:DatePicker>
|
</f:DatePicker>
|
||||||
|
|
|
@ -75,8 +75,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||||
{
|
{
|
||||||
this.txtCompleteDate.Text = string.Format("{0:yyyy-MM-dd}", designChangeOrder.CompleteDate);
|
this.txtCompleteDate.Text = string.Format("{0:yyyy-MM-dd}", designChangeOrder.CompleteDate);
|
||||||
}
|
}
|
||||||
this.txtImplementationFrontState.Text = designChangeOrder.ImplementationFrontState;
|
//this.txtImplementationFrontState.Text = designChangeOrder.ImplementationFrontState;
|
||||||
|
this.drpImplementationFrontState.SelectedValue= designChangeOrder.ImplementationFrontState;
|
||||||
|
|
||||||
|
|
||||||
var currApprove = DesignChangeOrderApproveService.GetCurrentApprove(designChangeOrder.DesignChangeOrderId);
|
var currApprove = DesignChangeOrderApproveService.GetCurrentApprove(designChangeOrder.DesignChangeOrderId);
|
||||||
|
@ -192,7 +192,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||||
designChangeOrder.IssuedDate = Funs.GetNewDateTime(this.txtIssuedDate.Text);
|
designChangeOrder.IssuedDate = Funs.GetNewDateTime(this.txtIssuedDate.Text);
|
||||||
designChangeOrder.ApprovalDate = Funs.GetNewDateTime(this.txtApprovalDate.Text);
|
designChangeOrder.ApprovalDate = Funs.GetNewDateTime(this.txtApprovalDate.Text);
|
||||||
designChangeOrder.CompleteDate = Funs.GetNewDateTime(this.txtCompleteDate.Text);
|
designChangeOrder.CompleteDate = Funs.GetNewDateTime(this.txtCompleteDate.Text);
|
||||||
designChangeOrder.ImplementationFrontState = this.txtImplementationFrontState.Text.Trim();
|
designChangeOrder.ImplementationFrontState = this.drpImplementationFrontState.SelectedValue;
|
||||||
if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
|
if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
|
||||||
{
|
{
|
||||||
designChangeOrder.AuditMan = drpAudit.SelectedValue;
|
designChangeOrder.AuditMan = drpAudit.SelectedValue;
|
||||||
|
@ -273,7 +273,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||||
designChangeOrder.IssuedDate = Funs.GetNewDateTime(this.txtIssuedDate.Text);
|
designChangeOrder.IssuedDate = Funs.GetNewDateTime(this.txtIssuedDate.Text);
|
||||||
designChangeOrder.ApprovalDate = Funs.GetNewDateTime(this.txtApprovalDate.Text);
|
designChangeOrder.ApprovalDate = Funs.GetNewDateTime(this.txtApprovalDate.Text);
|
||||||
designChangeOrder.CompleteDate = Funs.GetNewDateTime(this.txtCompleteDate.Text);
|
designChangeOrder.CompleteDate = Funs.GetNewDateTime(this.txtCompleteDate.Text);
|
||||||
designChangeOrder.ImplementationFrontState = this.txtImplementationFrontState.Text.Trim();
|
designChangeOrder.ImplementationFrontState = this.drpImplementationFrontState.SelectedValue;
|
||||||
if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
|
if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
|
||||||
{
|
{
|
||||||
designChangeOrder.AuditMan = drpAudit.SelectedValue;
|
designChangeOrder.AuditMan = drpAudit.SelectedValue;
|
||||||
|
|
|
@ -114,13 +114,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||||
protected global::FineUIPro.DatePicker txtApprovalDate;
|
protected global::FineUIPro.DatePicker txtApprovalDate;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// txtImplementationFrontState 控件。
|
/// drpImplementationFrontState 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <remarks>
|
/// <remarks>
|
||||||
/// 自动生成的字段。
|
/// 自动生成的字段。
|
||||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.TextBox txtImplementationFrontState;
|
protected global::FineUIPro.DropDownList drpImplementationFrontState;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// txtCompleteDate 控件。
|
/// txtCompleteDate 控件。
|
||||||
|
|
|
@ -684,8 +684,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
checkStatisc.TotalCheckNum = totalManagementList.Count();
|
checkStatisc.TotalCheckNum = totalManagementList.Count();
|
||||||
checkStatisc.OKNum = managementList.Count(x => x.ApprovalDate != null);
|
checkStatisc.OKNum = managementList.Count(x => x.ApprovalDate != null);
|
||||||
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ApprovalDate != null);
|
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ApprovalDate != null);
|
||||||
checkStatisc.OneOKRate = managementList.Count(x => x.Status == "3").ToString(); //当期完成数
|
checkStatisc.OneOKRate = managementList.Count(x => x.ImplementationFrontState == "已完成").ToString(); //当期完成数
|
||||||
checkStatisc.TotalOneOKRate = totalManagementList.Count(x => x.Status == "3").ToString(); //累计完成数
|
checkStatisc.TotalOneOKRate = totalManagementList.Count(x => x.ImplementationFrontState == "已完成").ToString(); //累计完成数
|
||||||
|
|
||||||
StatisticsList.Add(checkStatisc);
|
StatisticsList.Add(checkStatisc);
|
||||||
Quantity1Sum += checkStatisc.CheckNum;
|
Quantity1Sum += checkStatisc.CheckNum;
|
||||||
|
|
|
@ -830,8 +830,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
checkStatisc.TotalCheckNum = totalManagementList.Count();
|
checkStatisc.TotalCheckNum = totalManagementList.Count();
|
||||||
checkStatisc.OKNum = managementList.Count(x => x.ApprovalDate != null);
|
checkStatisc.OKNum = managementList.Count(x => x.ApprovalDate != null);
|
||||||
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ApprovalDate != null);
|
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ApprovalDate != null);
|
||||||
checkStatisc.OneOKRate = managementList.Count(x => x.Status == "3").ToString(); //当期完成数
|
checkStatisc.OneOKRate = managementList.Count(x => x.ImplementationFrontState == "已完成").ToString(); //当期完成数
|
||||||
checkStatisc.TotalOneOKRate = totalManagementList.Count(x => x.Status == "3").ToString(); //累计完成数
|
checkStatisc.TotalOneOKRate = totalManagementList.Count(x => x.ImplementationFrontState == "已完成").ToString(); //累计完成数
|
||||||
|
|
||||||
StatisticsList.Add(checkStatisc);
|
StatisticsList.Add(checkStatisc);
|
||||||
Quantity1Sum += checkStatisc.CheckNum;
|
Quantity1Sum += checkStatisc.CheckNum;
|
||||||
|
|
Binary file not shown.
|
@ -1,6 +1,6 @@
|
||||||
PK
|
PK
|
||||||
|