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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2023-10-27 09:00:28 +08:00
parent bf856b7ab7 6ce7440549
commit bc4d37f37f
16 changed files with 244 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx
+4
View File
@@ -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="展开全部">
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs
+15 -25
View File
@@ -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
{
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.designer.cs
Generated
+9
View File
@@ -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>
SGGL/FineUIPro.Web/CQMS/WBS/SelectUnit.aspx
+38
View File
@@ -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>
SGGL/FineUIPro.Web/CQMS/WBS/SelectUnit.aspx.cs
+67
View File
@@ -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());
}
}
}
SGGL/FineUIPro.Web/CQMS/WBS/SelectUnit.aspx.designer.cs
Generated
+87
View File
@@ -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;
}
}
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+8
View File
@@ -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>
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx
+2 -2
View File
@@ -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>
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs
+1 -1
View File
@@ -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();
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx
+2 -2
View File
@@ -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>
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx.cs
+1 -1
View File
@@ -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();
SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx
+2 -2
View File
@@ -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>
SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs
+1 -1
View File
@@ -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();
SGGL/FineUIPro.Web/ProjectData/UnitWork.aspx
+1 -1
View File
@@ -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"
SGGL/FineUIPro.Web/ProjectData/UnitWork.aspx.cs
+1 -1
View File
@@ -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));