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

20231023危大工程清单分部分项修改为基础信息中分部分项设置

Browse Source
This commit is contained in:
杨红卫
2023-10-23 16:05:02 +08:00
parent 33d515c36a
commit f409a4cca2
9 changed files with 162 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx
+1 -1
View File
@@ -85,7 +85,7 @@
</f:Panel>
<f:Window ID="Window1" Title="危大工程清单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1200px" Height="650px">
Width="1300px" Height="650px" Maximized="true">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEdit.aspx
+8 -8
View File
@@ -37,7 +37,7 @@
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" ClicksToEdit="1"
DataIDField="LargerHazardListItemId" DataKeyNames="LargerHazardListItemId"
SortDirection="ASC" AllowSorting="true" SortField="SortIndex" ForceFit="true"
Height="400px" EnableColumnLines="true" EnableRowDoubleClickEvent="true"
EnableColumnLines="true" EnableRowDoubleClickEvent="true" Height="600px"
OnRowDoubleClick="Grid1_RowDoubleClick">
<Columns>
<f:RenderField Width="50px" ColumnID="SortIndex" DataField="SortIndex"
@@ -49,17 +49,17 @@
<f:RenderField Width="150px" ColumnID="UnitWorkName" DataField="UnitWorkName"
FieldType="String" HeaderText="单位工程" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="PackageContent" DataField="PackageContent"
FieldType="String" HeaderText="分部分项</br>工程名称" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="150px" ColumnID="SpecialSchemeTypeName" DataField="SpecialSchemeTypeName"
FieldType="String" HeaderText="分部分项工程名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="WorkPackageSize" DataField="WorkPackageSize"
FieldType="String" HeaderText="分部分项</br>工程规模" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="分部分项工程规模" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="ExpectedTime" DataField="ExpectedTime"
FieldType="String" HeaderText="预计施工起止时间" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="IsArgumentName" DataField="IsArgumentName"
FieldType="String" HeaderText="是否需要</br>专家论证" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="120px" ColumnID="IsArgumentName" DataField="IsArgumentName"
FieldType="String" HeaderText="是否需要专家论证" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="WorkStatesName" DataField="WorkStatesName"
FieldType="String" HeaderText="作业状态" TextAlign="Left" HeaderTextAlign="Center">
@@ -96,8 +96,8 @@
</Toolbars>
</f:Form>
<f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="1024px" OnClose="Window1_Close"
Height="600px">
Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="1200px" OnClose="Window1_Close"
Height="500px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server"
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx
+6 -6
View File
@@ -21,19 +21,19 @@
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="90% 10%">
<%-- <f:FormRow ColumnWidths="90% 10%">
<Items>
<f:Label runat="server" ID="txtWorkPackageId" Label="分部分项工程名称" ShowRedStar="true"></f:Label>
<f:TextBox runat="server" ID="hdWorkPackageId" Hidden="true"></f:TextBox>
<f:Button ID="btSearch" ToolTip="选择" Icon="SystemSearch" runat="server" OnClick="btSearch_Click">
</f:Button>
</Items>
</f:FormRow>
</f:FormRow>--%>
<f:FormRow>
<Items>
<%-- <f:DropDownList ID="drpWorkPackageId" runat="server" Label="分部分项</br>工程名称" EnableEdit="true"
<f:DropDownList ID="drpWorkPackageId" runat="server" Label="分部分项工程名称" EnableEdit="true"
Required="true" ShowRedStar="true">
</f:DropDownList>--%>
</f:DropDownList>
<f:TextBox ID="txtWorkPackageSize" runat="server" Label="分部分项工程规模" MaxLength="500">
</f:TextBox>
</Items>
@@ -80,10 +80,10 @@
</f:Toolbar>
</Toolbars>
</f:Form>
<f:Window ID="Window1" Title="WBS" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<%-- <f:Window ID="Window1" Title="WBS" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Self" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="800px" Height="650px">
</f:Window>
</f:Window>--%>
</form>
</body>
</html>
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.cs
+27 -27
View File
@@ -51,7 +51,7 @@ namespace FineUIPro.Web.HSSE.Solution
//单位工程
BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
//分部分项
// BLL.SpecialSchemeTypeService.InitSpecialSchemeTypeDropDownList(this.drpWorkPackageId, true);
BLL.SpecialSchemeTypeService.InitSpecialSchemeTypeDropDownList(this.drpWorkPackageId, true);
//是否需要专家论证
BLL.ConstValue.InitConstValueRadioButtonList(this.rblIsArgument, ConstValue.Group_0001, "False");
//作业状态
@@ -70,14 +70,14 @@ namespace FineUIPro.Web.HSSE.Solution
{
this.drpUnitWorkId.SelectedValue = getItem.UnitWorkId;
}
//if (!string.IsNullOrEmpty(getItem.WorkPackageId))
//{
// this.drpWorkPackageId.SelectedValue = getItem.WorkPackageId;
//}
if (!string.IsNullOrEmpty(getItem.WorkPackageId))
{
this.drpWorkPackageId.SelectedValue = getItem.WorkPackageId;
}
this.txtWorkPackageSize.Text = getItem.WorkPackageSize;
this.hdWorkPackageId.Text = getItem.WorkPackageId;
this.txtWorkPackageId.Text = getItem.PackageContent;
//this.hdWorkPackageId.Text = getItem.WorkPackageId;
//this.txtWorkPackageId.Text = getItem.PackageContent;
this.txtExpectedStartTime.Text = string.Format("{0:yyyy-MM-dd}", getItem.ExpectedStartTime);
this.txtExpectedEndTime.Text = string.Format("{0:yyyy-MM-dd}", getItem.ExpectedEndTime);
@@ -125,13 +125,13 @@ namespace FineUIPro.Web.HSSE.Solution
ExpectedEndTime = Funs.GetNewDateTime(this.txtExpectedEndTime.Text),
IsArgument = Convert.ToBoolean(this.rblIsArgument.SelectedValue),
WorkStates = this.rbWorkStates.SelectedValue ?? "1",
WorkPackageId = this.hdWorkPackageId.Text,
WorkPackageName = this.txtWorkPackageId.Text,
//WorkPackageId = this.hdWorkPackageId.Text,
//WorkPackageName = this.txtWorkPackageId.Text,
};
//if (this.drpWorkPackageId.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpWorkPackageId.SelectedValue))
//{
// newItem.WorkPackageId = this.drpWorkPackageId.SelectedValue;
//}
if (this.drpWorkPackageId.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpWorkPackageId.SelectedValue))
{
newItem.WorkPackageId = this.drpWorkPackageId.SelectedValue;
}
if (this.drpUnitWorkId.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue))
{
newItem.UnitWorkId = this.drpUnitWorkId.SelectedValue;
@@ -157,20 +157,20 @@ namespace FineUIPro.Web.HSSE.Solution
}
#endregion
protected void btSearch_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdWorkPackageId.ClientID)
+ Window1.GetShowReference(String.Format("~/DigData/ShowProjectWBS.aspx?levle={0}", 3, "选择WBS - ")));
}
//protected void btSearch_Click(object sender, EventArgs e)
//{
// PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdWorkPackageId.ClientID)
// + Window1.GetShowReference(String.Format("~/DigData/ShowProjectWBS.aspx?levle={0}", 3, "选择WBS - ")));
//}
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
var getReturnValues = Funs.GetStrListByStr(this.hdWorkPackageId.Text,'&');
if (getReturnValues.Count() > 1)
{
this.hdWorkPackageId.Text = getReturnValues[0].ToString();
this.txtWorkPackageId.Text = getReturnValues[1].ToString();
}
}
//protected void Window1_Close(object sender, WindowCloseEventArgs e)
//{
// var getReturnValues = Funs.GetStrListByStr(this.hdWorkPackageId.Text,'&');
// if (getReturnValues.Count() > 1)
// {
// this.hdWorkPackageId.Text = getReturnValues[0].ToString();
// this.txtWorkPackageId.Text = getReturnValues[1].ToString();
// }
//}
}
}
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.designer.cs
Generated
+2 -29
View File
@@ -60,31 +60,13 @@ namespace FineUIPro.Web.HSSE.Solution
protected global::FineUIPro.DropDownList drpUnitWorkId;
/// <summary>
/// txtWorkPackageId 控件。
/// drpWorkPackageId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtWorkPackageId;
/// <summary>
/// hdWorkPackageId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox hdWorkPackageId;
/// <summary>
/// btSearch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btSearch;
protected global::FineUIPro.DropDownList drpWorkPackageId;
/// <summary>
/// txtWorkPackageSize 控件。
@@ -184,14 +166,5 @@ namespace FineUIPro.Web.HSSE.Solution
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
}
}
SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListView.aspx
+8 -8
View File
@@ -35,28 +35,28 @@
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" ClicksToEdit="1"
DataIDField="LargerHazardListItemId" DataKeyNames="LargerHazardListItemId"
SortDirection="ASC" AllowSorting="true" SortField="SortIndex" ForceFit="true"
Height="400px" EnableColumnLines="true">
Height="600px" EnableColumnLines="true">
<Columns>
<f:RenderField Width="50px" ColumnID="SortIndex" DataField="SortIndex"
FieldType="String" HeaderText="序号" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="ProjectName" DataField="ProjectName"
<f:RenderField Width="100px" ColumnID="ProjectName" DataField="ProjectName"
FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="145px" ColumnID="UnitWorkName" DataField="UnitWorkName"
<f:RenderField Width="150px" ColumnID="UnitWorkName" DataField="UnitWorkName"
FieldType="String" HeaderText="单位工程" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="145px" ColumnID="PackageContent" DataField="PackageContent"
FieldType="String" HeaderText="分部分项</br>工程名称" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="150px" ColumnID="SpecialSchemeTypeName" DataField="SpecialSchemeTypeName"
FieldType="String" HeaderText="分部分项工程名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="WorkPackageSize" DataField="WorkPackageSize"
FieldType="String" HeaderText="分部分项</br>工程规模" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="分部分项工程规模" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="ExpectedTime" DataField="ExpectedTime"
FieldType="String" HeaderText="预计施工起止时间" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="IsArgumentName" DataField="IsArgumentName"
FieldType="String" HeaderText="是否需要</br>专家论证" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="120px" ColumnID="IsArgumentName" DataField="IsArgumentName"
FieldType="String" HeaderText="是否需要专家论证" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="WorkStatesName" DataField="WorkStatesName"
FieldType="String" HeaderText="作业状态" TextAlign="Left" HeaderTextAlign="Center">