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/DataImport/DrawingImport.aspx
+4 -4
View File
@@ -41,8 +41,8 @@
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="数据"
TitleToolTip="数据" AutoScroll="true">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据" ForceFit="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId"
AllowSorting="true" SortField="DataImportId" SortDirection="ASC" OnSort="Grid1_Sort"
EnableCheckBoxSelect="true" EnableMultiSelect="false" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick"
@@ -118,7 +118,7 @@
Layout="Fit" ShowHeader="false" RegionSplitWidth="20px" BodyPadding="1px" Height="400px" IconFont="PlusCircle" Title="历史记录"
TitleToolTip="历史记录" AutoScroll="true">
<Items>
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录"
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录" ForceFit="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId"
AllowSorting="true" SortField="Version" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true" EnableMultiSelect="false"
@@ -160,7 +160,7 @@
</Items>
</f:Panel>
<f:Window ID="Window1" Title="基本信息" Hidden="true" EnableIFrame="true" EnableMaximize="true" EnableDrag="true"
Target="Parent" EnableResize="true" runat="server" IsModal="false" OnClose="Window1_Close" ConstrainSize="true" AutoScroll="true"
Target="Parent" EnableResize="true" runat="server" IsModal="false" OnClose="Window1_Close" ConstrainSize="true" AutoScroll="true" CloseAction="HidePostBack"
Width="700px" Height="300px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx
+1 -1
View File
@@ -30,7 +30,7 @@
</f:FormRow>--%>
<f:FormRow>
<Items>
<f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" LabelWidth="140px"></f:TextArea>
<f:TextArea ID="txtRemark" runat="server" Label="更新原因" LabelAlign="Right" AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" LabelWidth="140px"></f:TextArea>
<f:Button ID="btnAttachUrl_Remark" Text="上传附件" ToolTip="附件" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Remark_Click" ValidateForms="SimpleForm1">
</f:Button>
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx.cs
+2 -1
View File
@@ -106,7 +106,8 @@ namespace FineUIPro.Web.HJGL.DataImport
ShowNotify(result, MessageBoxIcon.Warning);
}
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
// PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
}
SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx
+4 -4
View File
@@ -41,7 +41,7 @@
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="数据"
TitleToolTip="数据" AutoScroll="true">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据" ForceFit="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId"
AllowSorting="true" SortField="DataImportId" SortDirection="ASC" OnSort="Grid1_Sort"
@@ -78,7 +78,7 @@
</f:RenderField>
<f:RenderField HeaderText="类型" ColumnID="FileType"
DataField="FileType" SortField="FileType" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="90px">
TextAlign="Left" Width="50px">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String"
HeaderText="专业" HeaderTextAlign="Center" TextAlign="Right">
@@ -118,7 +118,7 @@
Layout="Fit" ShowHeader="false" RegionSplitWidth="20px" BodyPadding="1px" Height="400px" IconFont="PlusCircle" Title="历史记录"
TitleToolTip="历史记录" AutoScroll="true">
<Items>
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录"
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录" ForceFit="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId"
AllowSorting="true" SortField="Version" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true" EnableMultiSelect="false"
@@ -160,7 +160,7 @@
</Items>
</f:Panel>
<f:Window ID="Window1" Title="基本信息" Hidden="true" EnableIFrame="true" EnableMaximize="true" EnableDrag="true"
Target="Parent" EnableResize="true" runat="server" IsModal="false" OnClose="Window1_Close" ConstrainSize="true" AutoScroll="true"
Target="Parent" EnableResize="true" runat="server" IsModal="false" OnClose="Window1_Close" ConstrainSize="true" AutoScroll="true" CloseAction="HidePostBack"
Width="700px" Height="300px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
SGGL/FineUIPro.Web/HJGL/DataImport/TDMImportEdit.aspx
+1 -1
View File
@@ -31,7 +31,7 @@
</f:FormRow>--%>
<f:FormRow>
<Items>
<f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" LabelWidth="140px"></f:TextArea>
<f:TextArea ID="txtRemark" runat="server" Label="更新原因" LabelAlign="Right" AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" LabelWidth="140px"></f:TextArea>
<f:Button ID="btnAttachUrl_Remark" Text="上传附件" ToolTip="附件" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Remark_Click" ValidateForms="SimpleForm1">
</f:Button>
SGGL/FineUIPro.Web/HJGL/DataImport/TDMImportEdit.aspx.cs
+2 -1
View File
@@ -104,7 +104,8 @@ namespace FineUIPro.Web.HJGL.DataImport
ShowNotify(result, MessageBoxIcon.Warning);
}
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
// PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}