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/HSSE/CostGoods/CostManageEdit.aspx
+1 -2
View File
@@ -31,8 +31,7 @@
<Items> <Items>
<%--<f:TextBox ID="txtContractNum" runat="server" Label="合同号" MaxLength="50" FocusOnPageLoad="true"> <%--<f:TextBox ID="txtContractNum" runat="server" Label="合同号" MaxLength="50" FocusOnPageLoad="true">
</f:TextBox>--%> </f:TextBox>--%>
<f:DropDownList ID="drpContractNum" runat="server" Label="合同号" Required="true" ShowRedStar="true" EmptyText="-请选择-"> <f:TextBox runat="server" ID="txtContractNum" Label="合同号" ></f:TextBox>
</f:DropDownList>
<f:DatePicker ID="txtCostManageDate" runat="server" Label="日期" EnableEdit="false"> <f:DatePicker ID="txtCostManageDate" runat="server" Label="日期" EnableEdit="false">
</f:DatePicker> </f:DatePicker>
</Items> </Items>
SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx.cs
+5 -3
View File
@@ -52,7 +52,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
{ {
this.btnClose.OnClientClick = ActiveWindow.GetHideRefreshReference(); this.btnClose.OnClientClick = ActiveWindow.GetHideRefreshReference();
this.ProjectId = this.CurrUser.LoginProjectId; this.ProjectId = this.CurrUser.LoginProjectId;
BLL.ContractService.InitCompletedContractsDropDownList(this.ProjectId,this.drpContractNum); //BLL.ContractService.InitCompletedContractsDropDownList(this.ProjectId,this.drpContractNum);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, false); BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, false);
this.CostManageId = Request.Params["CostManageId"] ?? SQLHelper.GetNewID(); this.CostManageId = Request.Params["CostManageId"] ?? SQLHelper.GetNewID();
var costManage = BLL.CostManageService.GetCostManageById(this.CostManageId); var costManage = BLL.CostManageService.GetCostManageById(this.CostManageId);
@@ -68,7 +68,8 @@ namespace FineUIPro.Web.HSSE.CostGoods
{ {
this.drpUnit.SelectedValue = costManage.UnitId; this.drpUnit.SelectedValue = costManage.UnitId;
} }
this.drpContractNum.SelectedValue = costManage.ContractNum; //this.drpContractNum.SelectedValue = costManage.ContractNum;
this.txtContractNum.Text = costManage.ContractNum;
this.txtCostManageDate.Text = string.Format("{0:yyyy-MM-dd}", costManage.CostManageDate); this.txtCostManageDate.Text = string.Format("{0:yyyy-MM-dd}", costManage.CostManageDate);
} }
@@ -303,7 +304,8 @@ namespace FineUIPro.Web.HSSE.CostGoods
{ {
ProjectId = this.ProjectId, ProjectId = this.ProjectId,
UnitId = this.drpUnit.SelectedValue == Const._Null ? null : this.drpUnit.SelectedValue, UnitId = this.drpUnit.SelectedValue == Const._Null ? null : this.drpUnit.SelectedValue,
ContractNum = this.drpContractNum.SelectedValue, //ContractNum = this.drpContractNum.SelectedValue,
ContractNum = this.txtContractNum.Text.Trim(),
CostManageDate = Funs.GetNewDateTime(this.txtCostManageDate.Text.Trim()), CostManageDate = Funs.GetNewDateTime(this.txtCostManageDate.Text.Trim()),
States = BLL.Const.State_0, States = BLL.Const.State_0,
CompileMan = this.CurrUser.PersonId, CompileMan = this.CurrUser.PersonId,
SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx.designer.cs
Generated
+4 -6
View File
@@ -7,12 +7,10 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.CostGoods namespace FineUIPro.Web.HSSE.CostGoods {
{
public partial class CostManageEdit public partial class CostManageEdit {
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@@ -60,13 +58,13 @@ namespace FineUIPro.Web.HSSE.CostGoods
protected global::FineUIPro.DropDownList drpUnit; protected global::FineUIPro.DropDownList drpUnit;
/// <summary> /// <summary>
/// drpContractNum 控件。 /// txtContractNum 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpContractNum; protected global::FineUIPro.TextBox txtContractNum;
/// <summary> /// <summary>
/// txtCostManageDate 控件。 /// txtCostManageDate 控件。
SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx
+2 -1
View File
@@ -57,7 +57,8 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <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> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow runat="server"> <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(drpUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true);//施工
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpSupervisorUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_3, true);//监理 BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpSupervisorUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_3, true);//监理
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpNDEUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_5, true);//检测 BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpNDEUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_5, true);//检测
//合同编号 ////合同编号
this.drpContract.DataTextField = "ContractNum"; //this.drpContract.DataTextField = "ContractNum";
this.drpContract.DataValueField = "ContractId"; //this.drpContract.DataValueField = "ContractId";
this.drpContract.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId); //this.drpContract.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId);
this.drpContract.DataBind(); //this.drpContract.DataBind();
Funs.FineUIPleaseSelect(this.drpContract); //Funs.FineUIPleaseSelect(this.drpContract);
string UnitWorkId = Request.Params["UnitWorkId"]; string UnitWorkId = Request.Params["UnitWorkId"];
if (!string.IsNullOrEmpty(UnitWorkId)) if (!string.IsNullOrEmpty(UnitWorkId))
{ {
@@ -68,7 +68,7 @@ namespace FineUIPro.Web.ProjectData
} }
if (!string.IsNullOrEmpty(UnitWork.ContractId)) if (!string.IsNullOrEmpty(UnitWork.ContractId))
{ {
this.drpContract.SelectedValue = UnitWork.ContractId; this.txtContractId.Text = UnitWork.ContractId;
} }
this.txtMainItemCode.Text = UnitWork.MainItemCode; this.txtMainItemCode.Text = UnitWork.MainItemCode;
if (!string.IsNullOrEmpty(UnitWork.MainItemAndDesignProfessionalIds)) if (!string.IsNullOrEmpty(UnitWork.MainItemAndDesignProfessionalIds))
@@ -124,14 +124,15 @@ namespace FineUIPro.Web.ProjectData
{ {
UnitWork.Costs = Convert.ToDecimal(this.txtCosts.Text.Trim()); UnitWork.Costs = Convert.ToDecimal(this.txtCosts.Text.Trim());
} }
if (this.drpContract.SelectedValue != BLL.Const._Null) //if (this.drpContract.SelectedValue != BLL.Const._Null)
{ //{
UnitWork.ContractId = this.drpContract.SelectedValue; // UnitWork.ContractId = this.drpContract.SelectedValue;
} //}
else //else
{ //{
UnitWork.ContractId = null; // UnitWork.ContractId = null;
} //}
UnitWork.ContractId = this.txtContractId.Text.Trim();
UnitWork.MainItemCode = this.txtMainItemCode.Text.Trim(); UnitWork.MainItemCode = this.txtMainItemCode.Text.Trim();
if (!string.IsNullOrEmpty(hdMainItemAndDesignProfessionalIds.Text)) 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; protected global::FineUIPro.DropDownList drpNDEUnit;
/// <summary> /// <summary>
/// drpContract 控件。 /// txtContractId 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpContract; protected global::FineUIPro.TextBox txtContractId;
/// <summary> /// <summary>
/// txtMainItemCode 控件。 /// txtMainItemCode 控件。
SGGL/FineUIPro.Web/ProjectData/UnitWorkView.aspx
+2 -1
View File
@@ -65,7 +65,8 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <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> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow runat="server"> <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) if (!IsPostBack)
{ {
this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
//合同编号 ////合同编号
this.drpContract.DataTextField = "ContractNum"; //this.drpContract.DataTextField = "ContractNum";
this.drpContract.DataValueField = "ContractId"; //this.drpContract.DataValueField = "ContractId";
this.drpContract.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId); //this.drpContract.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId);
this.drpContract.DataBind(); //this.drpContract.DataBind();
Funs.FineUIPleaseSelect(this.drpContract); //Funs.FineUIPleaseSelect(this.drpContract);
string UnitWorkId = Request.Params["UnitWorkId"]; string UnitWorkId = Request.Params["UnitWorkId"];
if (!string.IsNullOrEmpty(UnitWorkId)) if (!string.IsNullOrEmpty(UnitWorkId))
{ {
@@ -48,9 +48,13 @@ namespace FineUIPro.Web.ProjectData
{ {
this.txtNDEUnit.Text = UnitService.GetUnitNameByUnitId(UnitWork.NDEUnit); this.txtNDEUnit.Text = UnitService.GetUnitNameByUnitId(UnitWork.NDEUnit);
} }
//if (!string.IsNullOrEmpty(UnitWork.ContractId))
//{
// this.drpContract.SelectedValue = UnitWork.ContractId;
//}
if (!string.IsNullOrEmpty(UnitWork.ContractId)) if (!string.IsNullOrEmpty(UnitWork.ContractId))
{ {
this.drpContract.SelectedValue = UnitWork.ContractId; this.txtContractId.Text = UnitWork.ContractId;
} }
this.txtMainItemCode.Text = UnitWork.MainItemCode; this.txtMainItemCode.Text = UnitWork.MainItemCode;
if (!string.IsNullOrEmpty(UnitWork.MainItemAndDesignProfessionalIds)) 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; protected global::FineUIPro.TextBox txtNDEUnit;
/// <summary> /// <summary>
/// drpContract 控件。 /// txtContractId 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpContract; protected global::FineUIPro.TextBox txtContractId;
/// <summary> /// <summary>
/// txtMainItemCode 控件。 /// txtMainItemCode 控件。