From 53ab49cb5ed5a7ffd4aca2e710eb7b25a85202fd Mon Sep 17 00:00:00 2001 From: liyh Date: Tue, 30 Jul 2024 11:58:39 +0800 Subject: [PATCH] =?UTF-8?q?Punch=5FType=E6=94=B9=E4=B8=BA=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E6=A1=86=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx | 7 +++++-- SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.cs | 4 ++-- .../Transfer/PunchlistFromEdit.aspx.designer.cs | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx index b1cb418d..8183ad5c 100644 --- a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx +++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx @@ -60,8 +60,11 @@ - - + + + + + diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.cs index 1dd548ca..7a8ab639 100644 --- a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.cs @@ -64,7 +64,7 @@ namespace FineUIPro.Web.Transfer else this.ddlIsEng.SelectedValue = "N"; this.ddlIsMatI.SelectedValue = TransferPunchlistFrom.IsMatI ?? ""; - this.txtPunch_Type.Text = TransferPunchlistFrom.Punch_Type; + this.txtPunch_Type.SelectedValue = TransferPunchlistFrom.Punch_Type ?? ""; if (TransferPunchlistFrom.Required_Date != null) this.txtRequired_Date.Text = Convert.ToDateTime(TransferPunchlistFrom.Required_Date).ToString("yyyy-MM-dd"); this.txtAction_By.Text = TransferPunchlistFrom.Action_By; @@ -163,7 +163,7 @@ namespace FineUIPro.Web.Transfer Disc = this.txtDisc.Text.Trim(), IsEng = this.ddlIsEng.SelectedValue == "Y" ? true : false, IsMatI = this.ddlIsMatI.SelectedValue, - Punch_Type = this.txtPunch_Type.Text.Trim(), + Punch_Type = this.txtPunch_Type.SelectedValue, Required_Date = Funs.GetNewDateTime(this.txtRequired_Date.Text), Action_By = this.txtAction_By.Text.Trim(), PIC = this.txtPIC.Text.Trim(), diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.designer.cs index 58d3720b..dd9a5818 100644 --- a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.designer.cs @@ -129,7 +129,7 @@ namespace FineUIPro.Web.Transfer /// 自动生成的字段。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtPunch_Type; + protected global::FineUIPro.DropDownList txtPunch_Type; /// /// txtRequired_Date 控件。