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

20220918 焊接修改

Browse Source
This commit is contained in:
李鹏飞
2022-09-18 23:22:47 +08:00
parent 8f3c0fd9ba
commit 01ce3c0381
18 changed files with 1322 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx
+1 -1
View File
@@ -14,7 +14,7 @@
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="包装管理台账" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="PackagingManageId" AllowCellEditing="true"
runat="server" BoxFlex="1" DataKeyNames="PackagingManageId" AllowCellEditing="true" ForceFit="true"
ClicksToEdit="2" DataIDField="PackagingManageId" AllowSorting="true" SortField="PackagingCode"
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" EnableColumnLines="true"
PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange"
SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs
+2 -1
View File
@@ -29,6 +29,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
HJGL_PipelineComponentService.InitPipelineDownList(drpPipelineComponentCode, this.CurrUser.LoginProjectId, false);
HJGL_PackagingmanageService.InitPipelineDownList(txtPackagingCode, this.CurrUser.LoginProjectId, false);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
if (!string.IsNullOrEmpty(PackagingManageId))
{
var model = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
@@ -43,7 +44,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
}
}
else
{
{btnSave.Hidden = false;
txtPackagingCode.Text = ProjectService.GetProjectCodeByProjectId(this.CurrUser.LoginProjectId)+"-"+ string.Format("{0:yyyyMMdd}", DateTime.Now)+"-";
}
SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageView.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="明细" EnableCollapse="true"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="明细" EnableCollapse="true" ForceFit="true"
runat="server" BoxFlex="1" DataKeyNames="PipelineComponentId" AllowCellEditing="true"
ClicksToEdit="2" DataIDField="PipelineComponentId" AllowSorting="true" SortField="PipelineComponentCode"
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" EnableColumnLines="true"
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx
+3 -3
View File
@@ -43,11 +43,11 @@
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnNew" Text="新增" Icon="Add" runat="server" OnClick="btnNew_Click">
<f:Button ID="btnNew" Text="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Hidden="true">
</f:Button>
<f:Button ID="btnImportQRCode" Text="二维码导入" ToolTip="二维码导入" Icon="PackageIn" runat="server" OnClick="btnImportQRCode_Click">
<f:Button ID="btnImportQRCode" Text="导入二维码信息" ToolTip="导入二维码信息" Icon="PackageIn" runat="server" OnClick="btnImportQRCode_Click">
</f:Button>
<f:Button ID="btnBatchAdd" Text="批量增加" Icon="TableAdd"
<f:Button ID="btnBatchAdd" Text="批量增加" Icon="TableAdd" Hidden="true"
runat="server" OnClick="btnBatchAdd_Click">
</f:Button>
<f:Button ID="btnPrint" runat="server" Icon="Printer" EnableAjax="false" Text="打印" ToolTip="打印" OnClick="btnPrint_Click"></f:Button>
SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx
+8 -8
View File
@@ -12,27 +12,27 @@
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true" Hidden="true"
Layout="HBox" EnableCollapse="true" Width="300" Title="组织机构" TitleToolTip="组织机构"
Layout="HBox" EnableCollapse="true" Width="300" Title="示意图" TitleToolTip="示意图"
ShowBorder="true" ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Items>
<f:Tree ID="trSafetyOrganization" EnableCollapse="true" ShowHeader="false" ShowBorder="false"
EnableIcons="true" Title="组织机构" OnNodeCommand="trSafetyOrganization_NodeCommand"
EnableIcons="true" Title="示意图" OnNodeCommand="trSafetyOrganization_NodeCommand"
AutoLeafIdentification="true" AutoScroll="true" runat="server" EnableTextSelection="True"
EnableSingleClickExpand="true">
</f:Tree>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="安全组织机构"
TitleToolTip="安全组织机构" AutoScroll="true">
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="堆场规划示意图"
TitleToolTip="堆场规划示意图" AutoScroll="true">
<Items>
<f:SimpleForm ID="SimpleForm1" IsFluid="true" BodyPadding="10px" EnableCollapse="false"
ShowBorder="true" Title="应急流程图" ShowHeader="true" runat="server">
ShowBorder="true" Title="堆场规划示意图" ShowHeader="true" runat="server">
<Tools>
<f:Tool runat="server" ID="btnDeleteItem" Icon="Delete" Text="删除应急流程图" EnablePostBack="true" OnClick="btnDelete_Click">
<f:Tool runat="server" ID="btnDeleteItem" Icon="Delete" Text="删除示意图" EnablePostBack="true" OnClick="btnDelete_Click">
</f:Tool>
<f:Tool runat="server" ID="btnNewItem" IconFont="_Upload" Text="上传应急流程图" EnablePostBack="false">
<f:Tool runat="server" ID="btnNewItem" IconFont="_Upload" Text="上传示意图" EnablePostBack="false">
<Listeners>
<f:Listener Event="click" Handler="onUploadClick" />
</Listeners>
@@ -42,7 +42,7 @@
</Tools>
<Items>
<f:FileUpload runat="server" ID="filePhoto" ShowRedStar="false" ShowEmptyLabel="true" LabelWidth="0"
ButtonText="上传应急流程图" ButtonOnly="true" Required="false" ButtonIcon="ImageAdd" Hidden="true"
ButtonText="上传堆场规划示意图" ButtonOnly="true" Required="false" ButtonIcon="ImageAdd" Hidden="true"
AutoPostBack="true" OnFileSelected="filePhoto_FileSelected">
</f:FileUpload>