Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New
This commit is contained in:
commit
bc4d37f37f
|
|
@ -114,6 +114,10 @@
|
|||
</f:Panel>
|
||||
</Items>
|
||||
</f:Panel>
|
||||
<f:Window ID="Window1" Title="选择设计交底单位" Hidden="true" EnableIFrame="true" EnableMaximize="true"
|
||||
Target="Self" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
|
||||
Width="600px" Height="300px">
|
||||
</f:Window>
|
||||
<f:Menu ID="Menu1" runat="server">
|
||||
<f:MenuButton ID="btnMenuMore" OnClick="btnMenuMore_Click" EnablePostBack="true" runat="server" Icon="ZoomIn"
|
||||
Text="展开全部">
|
||||
|
|
|
|||
|
|
@ -190,6 +190,15 @@ namespace FineUIPro.Web.CQMS.WBS
|
|||
}
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
/// 关闭窗口
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void Window1_Close(object sender, WindowCloseEventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 发起设计交底(树节点)
|
||||
/// </summary>
|
||||
|
|
@ -213,21 +222,12 @@ namespace FineUIPro.Web.CQMS.WBS
|
|||
join y in Funs.DB.WBS_WorkPackage on x.UnitWorkId equals y.UnitWorkId
|
||||
where y.WorkPackageId == this.trWBS.SelectedNodeID
|
||||
select x).FirstOrDefault();
|
||||
Model.Technical_TechnicalDisclose technicalDisclose = new Model.Technical_TechnicalDisclose();
|
||||
technicalDisclose.TechnicalDiscloseId = SQLHelper.GetNewID();
|
||||
technicalDisclose.ProjectId = this.CurrUser.LoginProjectId;
|
||||
string unitWorkId = string.Empty;
|
||||
if (unitWork != null)
|
||||
{
|
||||
technicalDisclose.UnitId = unitWork.UnitId;
|
||||
technicalDisclose.UnitWorkId = unitWork.UnitWorkId;
|
||||
unitWorkId = unitWork.UnitWorkId;
|
||||
}
|
||||
technicalDisclose.DataId = this.trWBS.SelectedNodeID;
|
||||
technicalDisclose.DiscloseName = this.trWBS.SelectedNode.Text;
|
||||
technicalDisclose.State = "0"; //未交底
|
||||
technicalDisclose.CompileMan = this.CurrUser.PersonId;
|
||||
technicalDisclose.CompileDate = DateTime.Now;
|
||||
BLL.CQMS_TechnicalDiscloseService.AddTechnicalDisclose(technicalDisclose);
|
||||
ShowNotify("发起成功!", MessageBoxIcon.Success);
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SelectUnit.aspx?UnitWorkId={0}&DataId={1}", unitWorkId, this.trWBS.SelectedNodeID, "导入 - ")));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -279,22 +279,12 @@ namespace FineUIPro.Web.CQMS.WBS
|
|||
join y in Funs.DB.WBS_WorkPackage on x.UnitWorkId equals y.UnitWorkId
|
||||
where y.WorkPackageId == this.trWBS.SelectedNodeID
|
||||
select x).FirstOrDefault();
|
||||
var controlItemAndCycle = BLL.ControlItemAndCycleService.GetControlItemAndCycleById(id);
|
||||
Model.Technical_TechnicalDisclose technicalDisclose = new Model.Technical_TechnicalDisclose();
|
||||
technicalDisclose.TechnicalDiscloseId = SQLHelper.GetNewID();
|
||||
technicalDisclose.ProjectId = this.CurrUser.LoginProjectId;
|
||||
string unitWorkId = string.Empty;
|
||||
if (unitWork != null)
|
||||
{
|
||||
technicalDisclose.UnitId = unitWork.UnitId;
|
||||
technicalDisclose.UnitWorkId = unitWork.UnitWorkId;
|
||||
unitWorkId = unitWork.UnitWorkId;
|
||||
}
|
||||
technicalDisclose.DataId = id;
|
||||
technicalDisclose.DiscloseName = controlItemAndCycle.ControlItemContent;
|
||||
technicalDisclose.State = "0"; //未交底
|
||||
technicalDisclose.CompileMan = this.CurrUser.PersonId;
|
||||
technicalDisclose.CompileDate = DateTime.Now;
|
||||
BLL.CQMS_TechnicalDiscloseService.AddTechnicalDisclose(technicalDisclose);
|
||||
ShowNotify("发起成功!", MessageBoxIcon.Success);
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SelectUnit.aspx?UnitWorkId={0}&DataId={1}", unitWorkId, id, "导入 - ")));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -165,6 +165,15 @@ namespace FineUIPro.Web.CQMS.WBS {
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList ddlPageSize;
|
||||
|
||||
/// <summary>
|
||||
/// Window1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window Window1;
|
||||
|
||||
/// <summary>
|
||||
/// Menu1 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SelectUnit.aspx.cs" Inherits="FineUIPro.Web.CQMS.WBS.SelectUnit" %>
|
||||
|
||||
<!DOCTYPE html>
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head runat="server">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<title></title>
|
||||
</head>
|
||||
<body>
|
||||
<form id="form1" runat="server">
|
||||
<f:PageManager ID="PageManager1" runat="server" />
|
||||
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
|
||||
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
|
||||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:DropDownList runat="server" ID="drpUnit" Label="单位名称" LabelWidth="150px" ShowRedStar="true"></f:DropDownList>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
</Rows>
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
|
||||
<Items>
|
||||
<f:HiddenField ID="hdCheckerId" runat="server">
|
||||
</f:HiddenField>
|
||||
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1"
|
||||
OnClick="btnSave_Click" Text="发起">
|
||||
</f:Button>
|
||||
<f:Button ID="btnClose" EnablePostBack="false" runat="server" Icon="SystemClose" Text="关闭">
|
||||
</f:Button>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
</f:Form>
|
||||
</form>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,67 @@
|
|||
using BLL;
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using Model;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.WBS
|
||||
{
|
||||
public partial class SelectUnit : PageBase
|
||||
{
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
if (!IsPostBack)
|
||||
{
|
||||
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
|
||||
string UnitWorkId = Request.Params["UnitWorkId"];
|
||||
Model.WBS_UnitWork unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(UnitWorkId);
|
||||
if (unitWork != null)
|
||||
{
|
||||
BLL.UnitService.InitUnitDropDownListByUnitIds(this.drpUnit, unitWork.UnitId, true);//单位
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected void btnSave_Click(object sender, EventArgs e)
|
||||
{
|
||||
SaveData(true);
|
||||
}
|
||||
|
||||
private void SaveData(bool b)
|
||||
{
|
||||
if (this.drpUnit.SelectedValue == BLL.Const._Null)
|
||||
{
|
||||
ShowNotify("请选择单位名称!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
Model.Technical_TechnicalDisclose technicalDisclose = new Model.Technical_TechnicalDisclose();
|
||||
technicalDisclose.TechnicalDiscloseId = SQLHelper.GetNewID();
|
||||
technicalDisclose.ProjectId = this.CurrUser.LoginProjectId;
|
||||
technicalDisclose.UnitId = this.drpUnit.SelectedValue;
|
||||
technicalDisclose.UnitWorkId = Request.Params["UnitWorkId"];
|
||||
string dataId = Request.Params["DataId"];
|
||||
technicalDisclose.DataId = dataId;
|
||||
string discloseName = string.Empty;
|
||||
Model.WBS_WorkPackage workPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(dataId);
|
||||
if (workPackage != null)
|
||||
{
|
||||
discloseName = workPackage.PackageContent;
|
||||
}
|
||||
else
|
||||
{
|
||||
var controlItemAndCycle = BLL.ControlItemAndCycleService.GetControlItemAndCycleById(dataId);
|
||||
if (controlItemAndCycle != null)
|
||||
{
|
||||
discloseName= controlItemAndCycle.ControlItemContent;
|
||||
}
|
||||
}
|
||||
technicalDisclose.DiscloseName = discloseName;
|
||||
technicalDisclose.State = "0"; //未交底
|
||||
technicalDisclose.CompileMan = this.CurrUser.PersonId;
|
||||
technicalDisclose.CompileDate = DateTime.Now;
|
||||
BLL.CQMS_TechnicalDiscloseService.AddTechnicalDisclose(technicalDisclose);
|
||||
ShowNotify("发起成功!", MessageBoxIcon.Success);
|
||||
PageContext.RegisterStartupScript(ActiveWindow.GetHideReference());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,87 @@
|
|||
//------------------------------------------------------------------------------
|
||||
// <自动生成>
|
||||
// 此代码由工具生成。
|
||||
//
|
||||
// 对此文件的更改可能导致不正确的行为,如果
|
||||
// 重新生成代码,则所做更改将丢失。
|
||||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.CQMS.WBS {
|
||||
|
||||
|
||||
public partial class SelectUnit {
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
||||
|
||||
/// <summary>
|
||||
/// PageManager1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.PageManager PageManager1;
|
||||
|
||||
/// <summary>
|
||||
/// SimpleForm1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form SimpleForm1;
|
||||
|
||||
/// <summary>
|
||||
/// drpUnit 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpUnit;
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar1;
|
||||
|
||||
/// <summary>
|
||||
/// hdCheckerId 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.HiddenField hdCheckerId;
|
||||
|
||||
/// <summary>
|
||||
/// btnSave 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnSave;
|
||||
|
||||
/// <summary>
|
||||
/// btnClose 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnClose;
|
||||
}
|
||||
}
|
||||
|
|
@ -485,6 +485,7 @@
|
|||
<Content Include="CQMS\WBS\ControlItemInitSet.aspx" />
|
||||
<Content Include="CQMS\WBS\ControlItemProjectEdit.aspx" />
|
||||
<Content Include="CQMS\WBS\ProjectControlItemInitSet.aspx" />
|
||||
<Content Include="CQMS\WBS\SelectUnit.aspx" />
|
||||
<Content Include="CQMS\WBS\WorkPackageInitEdit.aspx" />
|
||||
<Content Include="CQMS\WBS\WorkPackageProjectEdit.aspx" />
|
||||
<Content Include="CQMS\WBS\WorkPackageSet1.aspx" />
|
||||
|
|
@ -7346,6 +7347,13 @@
|
|||
<Compile Include="CQMS\WBS\ProjectControlItemInitSet.aspx.designer.cs">
|
||||
<DependentUpon>ProjectControlItemInitSet.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="CQMS\WBS\SelectUnit.aspx.cs">
|
||||
<DependentUpon>SelectUnit.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="CQMS\WBS\SelectUnit.aspx.designer.cs">
|
||||
<DependentUpon>SelectUnit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="CQMS\WBS\WorkPackageInitEdit.aspx.cs">
|
||||
<DependentUpon>WorkPackageInitEdit.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
</Items>
|
||||
</f:Panel>
|
||||
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true" BoxConfigAlign="StretchMax"
|
||||
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="施工日志录入"
|
||||
Layout="Fit" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="施工日志录入"
|
||||
TitleToolTip="施工日志录入" AutoScroll="true">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right">
|
||||
|
|
@ -80,7 +80,7 @@
|
|||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:DropDownList ID="drpContractNo" runat="server" Label="合同编号" LabelAlign="Right" EnableEdit="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" Required="true" ShowRedStar="true" LabelWidth="120px" AutoPostBack="true" OnSelectedIndexChanged="drpContractNo_SelectedIndexChanged"></f:DropDownList>
|
||||
<f:DropDownList ID="drpContractNo" runat="server" Label="合同名称" LabelAlign="Right" EnableEdit="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" Required="true" ShowRedStar="true" LabelWidth="120px" AutoPostBack="true" OnSelectedIndexChanged="drpContractNo_SelectedIndexChanged"></f:DropDownList>
|
||||
<f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程" LabelAlign="Right" EnableEdit="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" Required="true" ShowRedStar="true" LabelWidth="120px" AutoPostBack="true" OnSelectedIndexChanged="drpUnitWork_SelectedIndexChanged"></f:DropDownList>
|
||||
<f:DropDownList ID="drpProfessional" runat="server" Label="专业工程" LabelAlign="Right" EnableEdit="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" Required="true" ShowRedStar="true" LabelWidth="120px"></f:DropDownList>
|
||||
</Items>
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
|
|||
this.drpProfessional.DataBind();
|
||||
Funs.FineUIPleaseSelect(this.drpProfessional);
|
||||
//合同编号
|
||||
this.drpContractNo.DataTextField = "ContractNum";
|
||||
this.drpContractNo.DataTextField = "ContractName";
|
||||
this.drpContractNo.DataValueField = "ContractId";
|
||||
this.drpContractNo.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId);
|
||||
this.drpContractNo.DataBind();
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
</Items>
|
||||
</f:Panel>
|
||||
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true" BoxConfigAlign="StretchMax"
|
||||
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="施工日志录入"
|
||||
Layout="Fit" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="施工日志录入"
|
||||
TitleToolTip="施工日志录入" AutoScroll="true">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right" Hidden="true">
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:DropDownList ID="drpContractNo" runat="server" Label="合同编号" LabelAlign="Right" Readonly="true" EnableEdit="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" Required="true" ShowRedStar="true" LabelWidth="120px" AutoPostBack="true" OnSelectedIndexChanged="drpContractNo_SelectedIndexChanged"></f:DropDownList>
|
||||
<f:DropDownList ID="drpContractNo" runat="server" Label="合同名称" LabelAlign="Right" Readonly="true" EnableEdit="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" Required="true" ShowRedStar="true" LabelWidth="120px" AutoPostBack="true" OnSelectedIndexChanged="drpContractNo_SelectedIndexChanged"></f:DropDownList>
|
||||
<f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程" LabelAlign="Right" Readonly="true" EnableEdit="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" Required="true" ShowRedStar="true" LabelWidth="120px" AutoPostBack="true" OnSelectedIndexChanged="drpUnitWork_SelectedIndexChanged"></f:DropDownList>
|
||||
<f:DropDownList ID="drpProfessional" runat="server" Label="专业工程" LabelAlign="Right" Readonly="true" EnableEdit="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" Required="true" ShowRedStar="true" LabelWidth="120px"></f:DropDownList>
|
||||
</Items>
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
|
|||
this.drpProfessional.DataBind();
|
||||
Funs.FineUIPleaseSelect(this.drpProfessional);
|
||||
//合同编号
|
||||
this.drpContractNo.DataTextField = "ContractNum";
|
||||
this.drpContractNo.DataTextField = "ContractName";
|
||||
this.drpContractNo.DataValueField = "ContractId";
|
||||
this.drpContractNo.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId);
|
||||
this.drpContractNo.DataBind();
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
</Items>
|
||||
</f:Panel>
|
||||
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true" BoxConfigAlign="StretchMax"
|
||||
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="施工日志录入"
|
||||
Layout="Fit" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="施工日志录入"
|
||||
TitleToolTip="施工日志录入" AutoScroll="true">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right">
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:DropDownList ID="drpContractNo" runat="server" Label="合同编号" LabelAlign="Right" EnableEdit="true" Readonly="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" Required="true" ShowRedStar="true" LabelWidth="120px" AutoPostBack="true" OnSelectedIndexChanged="drpContractNo_SelectedIndexChanged"></f:DropDownList>
|
||||
<f:DropDownList ID="drpContractNo" runat="server" Label="合同名称" LabelAlign="Right" EnableEdit="true" Readonly="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" Required="true" ShowRedStar="true" LabelWidth="120px" AutoPostBack="true" OnSelectedIndexChanged="drpContractNo_SelectedIndexChanged"></f:DropDownList>
|
||||
<f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程" LabelAlign="Right" EnableEdit="true" Readonly="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" Required="true" ShowRedStar="true" LabelWidth="120px" AutoPostBack="true" OnSelectedIndexChanged="drpUnitWork_SelectedIndexChanged"></f:DropDownList>
|
||||
<f:DropDownList ID="drpProfessional" runat="server" Label="专业工程" LabelAlign="Right" EnableEdit="true" Readonly="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" Required="true" ShowRedStar="true" LabelWidth="120px"></f:DropDownList>
|
||||
</Items>
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
|
|||
this.drpProfessional.DataBind();
|
||||
Funs.FineUIPleaseSelect(this.drpProfessional);
|
||||
//合同编号
|
||||
this.drpContractNo.DataTextField = "ContractNum";
|
||||
this.drpContractNo.DataTextField = "ContractName";
|
||||
this.drpContractNo.DataValueField = "ContractId";
|
||||
this.drpContractNo.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId);
|
||||
this.drpContractNo.DataBind();
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
SortField="UnitWorkName" FieldType="String" HeaderText="单位工程名称" TextAlign="Center"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="ProjectType" DataField="ProjectType" SortField="ProjectType"
|
||||
<f:RenderField Width="100px" ColumnID="ProjectTypeName" DataField="ProjectTypeName" SortField="ProjectTypeName"
|
||||
FieldType="String" HeaderText="所属工程" TextAlign="Center" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="建安工程费(万元)" ColumnID="Costs" DataField="Costs"
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ namespace FineUIPro.Web.ProjectData
|
|||
|
||||
protected DataTable ChecklistData()
|
||||
{
|
||||
string strSql = @"select * from [dbo].[WBS_UnitWork] AS UnitWork where ProjectId=@ProjectId ";
|
||||
string strSql = @"select *,case ProjectType when '1' then '建筑工程' else '安装工程' end as ProjectTypeName from [dbo].[WBS_UnitWork] AS UnitWork where ProjectId=@ProjectId ";
|
||||
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
|
||||
|
|
|
|||
|
|
@ -33137,8 +33137,6 @@ namespace Model
|
|||
|
||||
private EntitySet<HJGL_PC_PurgingCleaning> _HJGL_PC_PurgingCleaning;
|
||||
|
||||
private EntitySet<HJGL_Pipeline> _HJGL_Pipeline;
|
||||
|
||||
private EntitySet<HJGL_RepairRecord> _HJGL_RepairRecord;
|
||||
|
||||
private EntitySet<HJGL_HotProess_Trust> _HJGL_HotProess_Trust;
|
||||
|
|
@ -33297,8 +33295,6 @@ namespace Model
|
|||
|
||||
private EntitySet<WBS_UnitWork> _WBS_UnitWork_Base_Unit_SupervisorUnit;
|
||||
|
||||
private EntitySet<WBS_UnitWork> _WBS_UnitWork_Base_Unit_Unit;
|
||||
|
||||
private EntitySet<ZHGL_ConstructionMonthReportSubCost> _ZHGL_ConstructionMonthReportSubCost;
|
||||
|
||||
#region 可扩展性方法定义
|
||||
|
|
@ -33398,7 +33394,6 @@ namespace Model
|
|||
this._HJGL_LV_LeakVacuum = new EntitySet<HJGL_LV_LeakVacuum>(new Action<HJGL_LV_LeakVacuum>(this.attach_HJGL_LV_LeakVacuum), new Action<HJGL_LV_LeakVacuum>(this.detach_HJGL_LV_LeakVacuum));
|
||||
this._HJGL_MaterialManage = new EntitySet<HJGL_MaterialManage>(new Action<HJGL_MaterialManage>(this.attach_HJGL_MaterialManage), new Action<HJGL_MaterialManage>(this.detach_HJGL_MaterialManage));
|
||||
this._HJGL_PC_PurgingCleaning = new EntitySet<HJGL_PC_PurgingCleaning>(new Action<HJGL_PC_PurgingCleaning>(this.attach_HJGL_PC_PurgingCleaning), new Action<HJGL_PC_PurgingCleaning>(this.detach_HJGL_PC_PurgingCleaning));
|
||||
this._HJGL_Pipeline = new EntitySet<HJGL_Pipeline>(new Action<HJGL_Pipeline>(this.attach_HJGL_Pipeline), new Action<HJGL_Pipeline>(this.detach_HJGL_Pipeline));
|
||||
this._HJGL_RepairRecord = new EntitySet<HJGL_RepairRecord>(new Action<HJGL_RepairRecord>(this.attach_HJGL_RepairRecord), new Action<HJGL_RepairRecord>(this.detach_HJGL_RepairRecord));
|
||||
this._HJGL_HotProess_Trust = new EntitySet<HJGL_HotProess_Trust>(new Action<HJGL_HotProess_Trust>(this.attach_HJGL_HotProess_Trust), new Action<HJGL_HotProess_Trust>(this.detach_HJGL_HotProess_Trust));
|
||||
this._HSSE_Hazard_HazardRegister = new EntitySet<HSSE_Hazard_HazardRegister>(new Action<HSSE_Hazard_HazardRegister>(this.attach_HSSE_Hazard_HazardRegister), new Action<HSSE_Hazard_HazardRegister>(this.detach_HSSE_Hazard_HazardRegister));
|
||||
|
|
@ -33478,7 +33473,6 @@ namespace Model
|
|||
this._Unqualified_WorkContact = new EntitySet<Unqualified_WorkContact>(new Action<Unqualified_WorkContact>(this.attach_Unqualified_WorkContact), new Action<Unqualified_WorkContact>(this.detach_Unqualified_WorkContact));
|
||||
this._WBS_UnitWork = new EntitySet<WBS_UnitWork>(new Action<WBS_UnitWork>(this.attach_WBS_UnitWork), new Action<WBS_UnitWork>(this.detach_WBS_UnitWork));
|
||||
this._WBS_UnitWork_Base_Unit_SupervisorUnit = new EntitySet<WBS_UnitWork>(new Action<WBS_UnitWork>(this.attach_WBS_UnitWork_Base_Unit_SupervisorUnit), new Action<WBS_UnitWork>(this.detach_WBS_UnitWork_Base_Unit_SupervisorUnit));
|
||||
this._WBS_UnitWork_Base_Unit_Unit = new EntitySet<WBS_UnitWork>(new Action<WBS_UnitWork>(this.attach_WBS_UnitWork_Base_Unit_Unit), new Action<WBS_UnitWork>(this.detach_WBS_UnitWork_Base_Unit_Unit));
|
||||
this._ZHGL_ConstructionMonthReportSubCost = new EntitySet<ZHGL_ConstructionMonthReportSubCost>(new Action<ZHGL_ConstructionMonthReportSubCost>(this.attach_ZHGL_ConstructionMonthReportSubCost), new Action<ZHGL_ConstructionMonthReportSubCost>(this.detach_ZHGL_ConstructionMonthReportSubCost));
|
||||
OnCreated();
|
||||
}
|
||||
|
|
@ -34496,19 +34490,6 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Pipeline_Base_Unit", Storage="_HJGL_Pipeline", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")]
|
||||
public EntitySet<HJGL_Pipeline> HJGL_Pipeline
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._HJGL_Pipeline;
|
||||
}
|
||||
set
|
||||
{
|
||||
this._HJGL_Pipeline.Assign(value);
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_RepairRecord_Base_Unit", Storage="_HJGL_RepairRecord", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")]
|
||||
public EntitySet<HJGL_RepairRecord> HJGL_RepairRecord
|
||||
{
|
||||
|
|
@ -35536,19 +35517,6 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_UnitWork_Base_Unit_Unit", Storage="_WBS_UnitWork_Base_Unit_Unit", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")]
|
||||
public EntitySet<WBS_UnitWork> WBS_UnitWork_Base_Unit_Unit
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._WBS_UnitWork_Base_Unit_Unit;
|
||||
}
|
||||
set
|
||||
{
|
||||
this._WBS_UnitWork_Base_Unit_Unit.Assign(value);
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ZHGL_ConstructionMonthReportSubCost_Base_Unit", Storage="_ZHGL_ConstructionMonthReportSubCost", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")]
|
||||
public EntitySet<ZHGL_ConstructionMonthReportSubCost> ZHGL_ConstructionMonthReportSubCost
|
||||
{
|
||||
|
|
@ -36074,18 +36042,6 @@ namespace Model
|
|||
entity.Base_Unit = null;
|
||||
}
|
||||
|
||||
private void attach_HJGL_Pipeline(HJGL_Pipeline entity)
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
entity.Base_Unit = this;
|
||||
}
|
||||
|
||||
private void detach_HJGL_Pipeline(HJGL_Pipeline entity)
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
entity.Base_Unit = null;
|
||||
}
|
||||
|
||||
private void attach_HJGL_RepairRecord(HJGL_RepairRecord entity)
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
|
|
@ -37034,18 +36990,6 @@ namespace Model
|
|||
entity.SupervisorUnit = null;
|
||||
}
|
||||
|
||||
private void attach_WBS_UnitWork_Base_Unit_Unit(WBS_UnitWork entity)
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
entity.Unit = this;
|
||||
}
|
||||
|
||||
private void detach_WBS_UnitWork_Base_Unit_Unit(WBS_UnitWork entity)
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
entity.Unit = null;
|
||||
}
|
||||
|
||||
private void attach_ZHGL_ConstructionMonthReportSubCost(ZHGL_ConstructionMonthReportSubCost entity)
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
|
|
@ -93296,8 +93240,6 @@ namespace Model
|
|||
|
||||
private EntityRef<Base_Project> _Base_Project;
|
||||
|
||||
private EntityRef<Base_Unit> _Base_Unit;
|
||||
|
||||
private EntitySet<HJGL_Pipeline_Component> _HJGL_Pipeline_Component;
|
||||
|
||||
private EntityRef<WBS_UnitWork> _WBS_UnitWork;
|
||||
|
|
@ -93396,7 +93338,6 @@ namespace Model
|
|||
this._Base_PipingClass = default(EntityRef<Base_PipingClass>);
|
||||
this._Base_PressurePipingClass = default(EntityRef<Base_PressurePipingClass>);
|
||||
this._Base_Project = default(EntityRef<Base_Project>);
|
||||
this._Base_Unit = default(EntityRef<Base_Unit>);
|
||||
this._HJGL_Pipeline_Component = new EntitySet<HJGL_Pipeline_Component>(new Action<HJGL_Pipeline_Component>(this.attach_HJGL_Pipeline_Component), new Action<HJGL_Pipeline_Component>(this.detach_HJGL_Pipeline_Component));
|
||||
this._WBS_UnitWork = default(EntityRef<WBS_UnitWork>);
|
||||
this._HJGL_PipeLineMat = new EntitySet<HJGL_PipeLineMat>(new Action<HJGL_PipeLineMat>(this.attach_HJGL_PipeLineMat), new Action<HJGL_PipeLineMat>(this.detach_HJGL_PipeLineMat));
|
||||
|
|
@ -93495,7 +93436,7 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(300)")]
|
||||
public string UnitId
|
||||
{
|
||||
get
|
||||
|
|
@ -93506,10 +93447,6 @@ namespace Model
|
|||
{
|
||||
if ((this._UnitId != value))
|
||||
{
|
||||
if (this._Base_Unit.HasLoadedOrAssignedValue)
|
||||
{
|
||||
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
|
||||
}
|
||||
this.OnUnitIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._UnitId = value;
|
||||
|
|
@ -94380,40 +94317,6 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Pipeline_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
|
||||
public Base_Unit Base_Unit
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Base_Unit.Entity;
|
||||
}
|
||||
set
|
||||
{
|
||||
Base_Unit previousValue = this._Base_Unit.Entity;
|
||||
if (((previousValue != value)
|
||||
|| (this._Base_Unit.HasLoadedOrAssignedValue == false)))
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
if ((previousValue != null))
|
||||
{
|
||||
this._Base_Unit.Entity = null;
|
||||
previousValue.HJGL_Pipeline.Remove(this);
|
||||
}
|
||||
this._Base_Unit.Entity = value;
|
||||
if ((value != null))
|
||||
{
|
||||
value.HJGL_Pipeline.Add(this);
|
||||
this._UnitId = value.UnitId;
|
||||
}
|
||||
else
|
||||
{
|
||||
this._UnitId = default(string);
|
||||
}
|
||||
this.SendPropertyChanged("Base_Unit");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Pipeline_Component_HJGL_Pipeline", Storage="_HJGL_Pipeline_Component", ThisKey="PipelineId", OtherKey="PipelineId", DeleteRule="NO ACTION")]
|
||||
public EntitySet<HJGL_Pipeline_Component> HJGL_Pipeline_Component
|
||||
{
|
||||
|
|
@ -271716,7 +271619,7 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(300)")]
|
||||
public string UnitId
|
||||
{
|
||||
get
|
||||
|
|
@ -273246,7 +273149,7 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(300)")]
|
||||
public string UnitId
|
||||
{
|
||||
get
|
||||
|
|
@ -275011,7 +274914,7 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(300)")]
|
||||
public string UnitId
|
||||
{
|
||||
get
|
||||
|
|
@ -297084,8 +296987,6 @@ namespace Model
|
|||
|
||||
private EntityRef<Base_Unit> _SupervisorUnit;
|
||||
|
||||
private EntityRef<Base_Unit> _Unit;
|
||||
|
||||
private EntitySet<WBS_WorkPackage> _WBS_WorkPackage;
|
||||
|
||||
#region 可扩展性方法定义
|
||||
|
|
@ -297162,7 +297063,6 @@ namespace Model
|
|||
this._Solution_LargerHazardListItem = new EntitySet<Solution_LargerHazardListItem>(new Action<Solution_LargerHazardListItem>(this.attach_Solution_LargerHazardListItem), new Action<Solution_LargerHazardListItem>(this.detach_Solution_LargerHazardListItem));
|
||||
this._Base_Unit = default(EntityRef<Base_Unit>);
|
||||
this._SupervisorUnit = default(EntityRef<Base_Unit>);
|
||||
this._Unit = default(EntityRef<Base_Unit>);
|
||||
this._WBS_WorkPackage = new EntitySet<WBS_WorkPackage>(new Action<WBS_WorkPackage>(this.attach_WBS_WorkPackage), new Action<WBS_WorkPackage>(this.detach_WBS_WorkPackage));
|
||||
OnCreated();
|
||||
}
|
||||
|
|
@ -297247,7 +297147,7 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(300)")]
|
||||
public string UnitId
|
||||
{
|
||||
get
|
||||
|
|
@ -297258,10 +297158,6 @@ namespace Model
|
|||
{
|
||||
if ((this._UnitId != value))
|
||||
{
|
||||
if (this._Unit.HasLoadedOrAssignedValue)
|
||||
{
|
||||
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
|
||||
}
|
||||
this.OnUnitIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._UnitId = value;
|
||||
|
|
@ -297947,40 +297843,6 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_UnitWork_Base_Unit_Unit", Storage="_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
|
||||
public Base_Unit Unit
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Unit.Entity;
|
||||
}
|
||||
set
|
||||
{
|
||||
Base_Unit previousValue = this._Unit.Entity;
|
||||
if (((previousValue != value)
|
||||
|| (this._Unit.HasLoadedOrAssignedValue == false)))
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
if ((previousValue != null))
|
||||
{
|
||||
this._Unit.Entity = null;
|
||||
previousValue.WBS_UnitWork_Base_Unit_Unit.Remove(this);
|
||||
}
|
||||
this._Unit.Entity = value;
|
||||
if ((value != null))
|
||||
{
|
||||
value.WBS_UnitWork_Base_Unit_Unit.Add(this);
|
||||
this._UnitId = value.UnitId;
|
||||
}
|
||||
else
|
||||
{
|
||||
this._UnitId = default(string);
|
||||
}
|
||||
this.SendPropertyChanged("Unit");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_WorkPackage_WBS_UnitWork", Storage="_WBS_WorkPackage", ThisKey="UnitWorkId", OtherKey="UnitWorkId", DeleteRule="NO ACTION")]
|
||||
public EntitySet<WBS_WorkPackage> WBS_WorkPackage
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue