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-08-30 14:52:46 +08:00
parent 991eb07f0b ac7aec1717
commit 690a06fa47
44 changed files with 3677 additions and 2890 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx
+4
View File
@@ -59,8 +59,12 @@
<f:ListItem Text="新增口" Value="新增口" />
<f:ListItem Text="修改口" Value="修改口" />
</f:DropDownList>
<f:DropDownList ID="drpUnit" runat="server" Required="true" ShowRedStar="true"
Label="工艺规程编制单位" LabelAlign="Right" LabelWidth="180px">
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSelectColumn" Text="选择显示列" Icon="ShapesManySelect"
runat="server" OnClick="btnSelectColumn_Click">
</f:Button>
SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
+2 -1
View File
@@ -18,6 +18,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
Funs.FineUIPleaseSelect(DropTwoJointType, "请选择");
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true);
this.InitTreeMenu();//加载树
}
@@ -471,7 +472,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
foreach (var jot in jotList)
{
List<Model.View_HJGL_WPQ> wpqList = BLL.WPQListServiceService.GetMatchWPQ(jot, this.CurrUser.LoginProjectId);
List<Model.View_HJGL_WPQ> wpqList = BLL.WPQListServiceService.GetMatchWPQ(jot, this.CurrUser.LoginProjectId, drpUnit.SelectedValue);
if (wpqList != null)
{
Model.HJGL_WeldJoint newJot = WeldJointService.GetWeldJointByWeldJointId(jot.WeldJointId);
SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.designer.cs
Generated
+9
View File
@@ -140,6 +140,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.DropDownList DropTwoJointType;
/// <summary>
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx
+4
View File
@@ -70,6 +70,10 @@
<f:RadioItem Value="1" Text="未录入"/>
<f:RadioItem Value="2" Text="已录入"/>
</f:RadioButtonList>
<f:DropDownList ID="drpUnit" runat="server" Required="true" ShowRedStar="true"
Label="工艺规程编制单位" LabelAlign="Right" LabelWidth="180px">
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs
+3 -1
View File
@@ -16,6 +16,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
if (!IsPostBack)
{
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true);
this.InitTreeMenu();
}
}
@@ -367,7 +369,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
foreach (var jot in jotList)
{
List<Model.View_HJGL_WPQ> wpqList =BLL.WPQListServiceService.GetMatchWPQ(jot,this.CurrUser.LoginProjectId);
List<Model.View_HJGL_WPQ> wpqList =BLL.WPQListServiceService.GetMatchWPQ(jot,this.CurrUser.LoginProjectId, drpUnit.SelectedValue);
if (wpqList != null)
{
Model.HJGL_WeldJoint newJot = new Model.HJGL_WeldJoint();
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.designer.cs
Generated
+9
View File
@@ -140,6 +140,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.RadioButtonList rbInput;
/// <summary>
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>