修改进度报表及试车管理

This commit is contained in:
2023-06-19 10:20:55 +08:00
parent 78baadfb7f
commit 966843abbe
39 changed files with 3685 additions and 4335 deletions
@@ -57,6 +57,10 @@
SortField="EquipmentMaterialBigTypeName" FieldType="String" HeaderText="名称" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="300px" ColumnID="CnProfessionName" DataField="CnProfessionName"
SortField="CnProfessionName" FieldType="String" HeaderText="专业" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Remark" DataField="Remark"
SortField="Remark" FieldType="String" HeaderText="备注" TextAlign="Center"
HeaderTextAlign="Center">
@@ -42,7 +42,7 @@ namespace FineUIPro.Web.JDGL.WBS
protected DataTable BindData()
{
string strSql = @"select EquipmentMaterialBigTypeId,EquipmentMaterialBigTypeCode,EquipmentMaterialBigTypeName,Remark from [dbo].[WBS_EquipmentMaterialBigType] where 1=1 ";
string strSql = @"select EquipmentMaterialBigTypeId,EquipmentMaterialBigTypeCode,EquipmentMaterialBigTypeName,Remark,CnProfessionName from [dbo].[WBS_EquipmentMaterialBigType] a left join WBS_CnProfessionInit b on a.CnProfessionId=b.CnProfessionId where 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtEquipmentMaterialBigTypeCode.Text.Trim()))
@@ -27,6 +27,11 @@
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpCnProfession" LabelWidth="110px" Label="专业" Required="true" ShowRedStar="true"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtRemark" runat="server" Label="备注"
@@ -15,6 +15,7 @@ namespace FineUIPro.Web.JDGL.WBS
if (!IsPostBack)
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
BLL.CnProfessionInitService.InitCnProfessionInitDropDownList(drpCnProfession, true);
string EquipmentMaterialBigTypeId = Request.Params["EquipmentMaterialBigTypeId"];
if (!string.IsNullOrEmpty(EquipmentMaterialBigTypeId))
{
@@ -24,6 +25,10 @@ namespace FineUIPro.Web.JDGL.WBS
{
this.txtEquipmentMaterialBigTypeCode.Text = EquipmentMaterialBigType.EquipmentMaterialBigTypeCode;
this.txtEquipmentMaterialBigTypeName.Text = EquipmentMaterialBigType.EquipmentMaterialBigTypeName;
if (EquipmentMaterialBigType.CnProfessionId != null)
{
this.drpCnProfession.SelectedValue = EquipmentMaterialBigType.CnProfessionId.ToString();
}
this.txtRemark.Text = EquipmentMaterialBigType.Remark;
}
}
@@ -33,6 +38,11 @@ namespace FineUIPro.Web.JDGL.WBS
protected void btnSave_Click(object sender, EventArgs e)
{
if (this.drpCnProfession.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择专业!", MessageBoxIcon.Warning);
return;
}
SaveData(true);
}
@@ -42,6 +52,7 @@ namespace FineUIPro.Web.JDGL.WBS
Model.WBS_EquipmentMaterialBigType EquipmentMaterialBigType = new Model.WBS_EquipmentMaterialBigType();
EquipmentMaterialBigType.EquipmentMaterialBigTypeCode = this.txtEquipmentMaterialBigTypeCode.Text.Trim();
EquipmentMaterialBigType.EquipmentMaterialBigTypeName = this.txtEquipmentMaterialBigTypeName.Text.Trim();
EquipmentMaterialBigType.CnProfessionId = Funs.GetNewInt(this.drpCnProfession.SelectedValue);
EquipmentMaterialBigType.Remark = this.txtRemark.Text.Trim();
if (!string.IsNullOrEmpty(EquipmentMaterialBigTypeId))
{
@@ -57,6 +57,15 @@ namespace FineUIPro.Web.JDGL.WBS {
/// </remarks>
protected global::FineUIPro.TextBox txtEquipmentMaterialBigTypeName;
/// <summary>
/// drpCnProfession 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCnProfession;
/// <summary>
/// txtRemark 控件。
/// </summary>
@@ -27,6 +27,11 @@
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpCnProfession" LabelWidth="110px" Label="专业" Required="true" ShowRedStar="true" Readonly="true"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtRemark" runat="server" Label="备注"
@@ -16,6 +16,7 @@ namespace FineUIPro.Web.JDGL.WBS
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
string EquipmentMaterialBigTypeId = Request.Params["EquipmentMaterialBigTypeId"];
BLL.CnProfessionInitService.InitCnProfessionInitDropDownList(drpCnProfession, true);
if (!string.IsNullOrEmpty(EquipmentMaterialBigTypeId))
{
@@ -24,6 +25,10 @@ namespace FineUIPro.Web.JDGL.WBS
{
this.txtEquipmentMaterialBigTypeCode.Text = EquipmentMaterialBigType.EquipmentMaterialBigTypeCode;
this.txtEquipmentMaterialBigTypeName.Text = EquipmentMaterialBigType.EquipmentMaterialBigTypeName;
if (EquipmentMaterialBigType.CnProfessionId != null)
{
this.drpCnProfession.SelectedValue = EquipmentMaterialBigType.CnProfessionId.ToString();
}
this.txtRemark.Text = EquipmentMaterialBigType.Remark;
}
}
@@ -57,6 +57,15 @@ namespace FineUIPro.Web.JDGL.WBS {
/// </remarks>
protected global::FineUIPro.TextBox txtEquipmentMaterialBigTypeName;
/// <summary>
/// drpCnProfession 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCnProfession;
/// <summary>
/// txtRemark 控件。
/// </summary>