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

1

Browse Source
This commit is contained in:
高飞
2025-07-15 10:35:23 +08:00
parent 26c74aa8b3
commit 060acdf073
9 changed files with 76 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx
+2 -1
View File
@@ -57,7 +57,8 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpContract" Label="对应合同编号" LabelWidth="150px"></f:DropDownList>
<%--<f:DropDownList runat="server" ID="drpContract" Label="对应合同编号" LabelWidth="150px"></f:DropDownList>--%>
<f:TextBox runat="server" ID="txtContractId" Label="对应合同编号" LabelWidth="150px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow runat="server">
SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.cs
+16 -15
View File
@@ -30,12 +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);
////合同编号
//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))
{
@@ -68,7 +68,7 @@ namespace FineUIPro.Web.ProjectData
}
if (!string.IsNullOrEmpty(UnitWork.ContractId))
{
this.drpContract.SelectedValue = UnitWork.ContractId;
this.txtContractId.Text = UnitWork.ContractId;
}
this.txtMainItemCode.Text = UnitWork.MainItemCode;
if (!string.IsNullOrEmpty(UnitWork.MainItemAndDesignProfessionalIds))
@@ -124,14 +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;
}
//if (this.drpContract.SelectedValue != BLL.Const._Null)
//{
// UnitWork.ContractId = this.drpContract.SelectedValue;
//}
//else
//{
// UnitWork.ContractId = null;
//}
UnitWork.ContractId = this.txtContractId.Text.Trim();
UnitWork.MainItemCode = this.txtMainItemCode.Text.Trim();
if (!string.IsNullOrEmpty(hdMainItemAndDesignProfessionalIds.Text))
{
SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.designer.cs
Generated
+2 -2
View File
@@ -103,13 +103,13 @@ namespace FineUIPro.Web.ProjectData {
protected global::FineUIPro.DropDownList drpNDEUnit;
/// <summary>
/// drpContract 控件。
/// txtContractId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpContract;
protected global::FineUIPro.TextBox txtContractId;
/// <summary>
/// txtMainItemCode 控件。
SGGL/FineUIPro.Web/ProjectData/UnitWorkView.aspx
+2 -1
View File
@@ -65,7 +65,8 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpContract" Label="对应合同编号" LabelWidth="150px" Readonly="true"></f:DropDownList>
<%--<f:DropDownList runat="server" ID="drpContract" Label="对应合同编号" LabelWidth="150px" Readonly="true"></f:DropDownList>--%>
<f:TextBox runat="server" ID="txtContractId" Label="对应合同编号" LabelWidth="150px" Readonly="true"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow runat="server">
SGGL/FineUIPro.Web/ProjectData/UnitWorkView.aspx.cs
+11 -7
View File
@@ -10,12 +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);
////合同编号
//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))
{
@@ -48,9 +48,13 @@ namespace FineUIPro.Web.ProjectData
{
this.txtNDEUnit.Text = UnitService.GetUnitNameByUnitId(UnitWork.NDEUnit);
}
//if (!string.IsNullOrEmpty(UnitWork.ContractId))
//{
// this.drpContract.SelectedValue = UnitWork.ContractId;
//}
if (!string.IsNullOrEmpty(UnitWork.ContractId))
{
this.drpContract.SelectedValue = UnitWork.ContractId;
this.txtContractId.Text = UnitWork.ContractId;
}
this.txtMainItemCode.Text = UnitWork.MainItemCode;
if (!string.IsNullOrEmpty(UnitWork.MainItemAndDesignProfessionalIds))
SGGL/FineUIPro.Web/ProjectData/UnitWorkView.aspx.designer.cs
Generated
+2 -2
View File
@@ -103,13 +103,13 @@ namespace FineUIPro.Web.ProjectData {
protected global::FineUIPro.TextBox txtNDEUnit;
/// <summary>
/// drpContract 控件。
/// txtContractId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpContract;
protected global::FineUIPro.TextBox txtContractId;
/// <summary>
/// txtMainItemCode 控件。