lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改施工日志

Browse Source
This commit is contained in:
高飞
2023-09-22 14:09:58 +08:00
parent 1cacd53725
commit 764455acd9
38 changed files with 3031 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ProjectData/UnitWork.aspx
+1 -1
View File
@@ -114,7 +114,7 @@
</f:Panel>
<f:Window ID="Window1" Title="单位工程" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="850px" Height="500px">
Width="850px" Height="600px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>
SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx
+12
View File
@@ -55,6 +55,18 @@
<f:DropDownList runat="server" ID="drpNDEUnit" Label="检测单位" LabelWidth="150px"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpContract" Label="对应合同编号" LabelWidth="150px"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow runat="server">
<Items>
<f:TextBox ID="txtMainItemCode" runat="server" Label="对应合同主项编号"
MaxLength="50" LabelWidth="150px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="95% 4% 1%">
<Items>
<f:Label runat="server" ID="txtMainItemAndDesignProfessional" Label="对应主项及设计专业" LabelWidth="150px"></f:Label>
SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.cs
+20 -1
View File
@@ -30,6 +30,12 @@ namespace FineUIPro.Web.ProjectData
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true);//施工
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpSupervisorUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_3, true);//监理
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpNDEUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_5, true);//检测
//合同编号
this.drpContract.DataTextField = "ContractNum";
this.drpContract.DataValueField = "ContractId";
this.drpContract.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId);
this.drpContract.DataBind();
Funs.FineUIPleaseSelect(this.drpContract);
string UnitWorkId = Request.Params["UnitWorkId"];
if (!string.IsNullOrEmpty(UnitWorkId))
{
@@ -60,6 +66,11 @@ namespace FineUIPro.Web.ProjectData
{
this.drpNDEUnit.SelectedValue = UnitWork.NDEUnit;
}
if (!string.IsNullOrEmpty(UnitWork.ContractId))
{
this.drpContract.SelectedValue = UnitWork.ContractId;
}
this.txtMainItemCode.Text = UnitWork.MainItemCode;
if (!string.IsNullOrEmpty(UnitWork.MainItemAndDesignProfessionalIds))
{
this.hdMainItemAndDesignProfessionalIds.Text = UnitWork.MainItemAndDesignProfessionalIds;
@@ -113,6 +124,15 @@ namespace FineUIPro.Web.ProjectData
{
UnitWork.Costs = Convert.ToDecimal(this.txtCosts.Text.Trim());
}
if (this.drpContract.SelectedValue != BLL.Const._Null)
{
UnitWork.ContractId = this.drpContract.SelectedValue;
}
else
{
UnitWork.ContractId = null;
}
UnitWork.MainItemCode = this.txtMainItemCode.Text.Trim();
if (!string.IsNullOrEmpty(hdMainItemAndDesignProfessionalIds.Text))
{
UnitWork.MainItemAndDesignProfessionalIds = hdMainItemAndDesignProfessionalIds.Text;
@@ -132,7 +152,6 @@ namespace FineUIPro.Web.ProjectData
{
UnitWork.UnitWorkId = SQLHelper.GetNewID();
BLL.UnitWorkService.AddUnitWork(UnitWork);
}
ShowNotify("提交成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.designer.cs
Generated
+18
View File
@@ -102,6 +102,24 @@ namespace FineUIPro.Web.ProjectData {
/// </remarks>
protected global::FineUIPro.DropDownList drpNDEUnit;
/// <summary>
/// drpContract 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpContract;
/// <summary>
/// txtMainItemCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMainItemCode;
/// <summary>
/// txtMainItemAndDesignProfessional 控件。
/// </summary>
SGGL/FineUIPro.Web/ProjectData/UnitWorkView.aspx
+12
View File
@@ -63,6 +63,18 @@
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpContract" Label="对应合同编号" LabelWidth="150px" Readonly="true"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow runat="server">
<Items>
<f:TextBox ID="txtMainItemCode" runat="server" Label="对应合同主项编号"
MaxLength="50" LabelWidth="150px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label runat="server" ID="txtMainItemAndDesignProfessional" Label="对应主项及设计专业" LabelWidth="150px"></f:Label>
SGGL/FineUIPro.Web/ProjectData/UnitWorkView.aspx.cs
+11
View File
@@ -10,6 +10,12 @@ namespace FineUIPro.Web.ProjectData
if (!IsPostBack)
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
//合同编号
this.drpContract.DataTextField = "ContractNum";
this.drpContract.DataValueField = "ContractId";
this.drpContract.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId);
this.drpContract.DataBind();
Funs.FineUIPleaseSelect(this.drpContract);
string UnitWorkId = Request.Params["UnitWorkId"];
if (!string.IsNullOrEmpty(UnitWorkId))
{
@@ -42,6 +48,11 @@ namespace FineUIPro.Web.ProjectData
{
this.txtNDEUnit.Text = UnitService.GetUnitNameByUnitId(UnitWork.NDEUnit);
}
if (!string.IsNullOrEmpty(UnitWork.ContractId))
{
this.drpContract.SelectedValue = UnitWork.ContractId;
}
this.txtMainItemCode.Text = UnitWork.MainItemCode;
if (!string.IsNullOrEmpty(UnitWork.MainItemAndDesignProfessionalIds))
{
this.txtMainItemAndDesignProfessional.Text = UnitWorkService.GetMainItemAndDesignProfessionalName(UnitWork.MainItemAndDesignProfessionalIds, CurrUser.LoginProjectId);
SGGL/FineUIPro.Web/ProjectData/UnitWorkView.aspx.designer.cs
Generated
+18
View File
@@ -102,6 +102,24 @@ namespace FineUIPro.Web.ProjectData {
/// </remarks>
protected global::FineUIPro.TextBox txtNDEUnit;
/// <summary>
/// drpContract 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpContract;
/// <summary>
/// txtMainItemCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMainItemCode;
/// <summary>
/// txtMainItemAndDesignProfessional 控件。
/// </summary>