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

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

Browse Source
This commit is contained in:
毕文静
2024-04-19 10:13:49 +08:00
parent 016ea897dc 8f650add98
commit 9b5866fabd
24 changed files with 1898 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx
+6 -1
View File
@@ -42,7 +42,12 @@
</f:FormRow>
<f:FormRow>
<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"
LabelAlign="right">
</f:DatePicker>
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs
+4 -4
View File
@@ -75,8 +75,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
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);
@@ -192,7 +192,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
designChangeOrder.IssuedDate = Funs.GetNewDateTime(this.txtIssuedDate.Text);
designChangeOrder.ApprovalDate = Funs.GetNewDateTime(this.txtApprovalDate.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))
{
designChangeOrder.AuditMan = drpAudit.SelectedValue;
@@ -273,7 +273,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
designChangeOrder.IssuedDate = Funs.GetNewDateTime(this.txtIssuedDate.Text);
designChangeOrder.ApprovalDate = Funs.GetNewDateTime(this.txtApprovalDate.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))
{
designChangeOrder.AuditMan = drpAudit.SelectedValue;
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.designer.cs
Generated
+2 -2
View File
@@ -114,13 +114,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive
protected global::FineUIPro.DatePicker txtApprovalDate;
/// <summary>
/// txtImplementationFrontState 控件。
/// drpImplementationFrontState 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtImplementationFrontState;
protected global::FineUIPro.DropDownList drpImplementationFrontState;
/// <summary>
/// txtCompleteDate 控件。