修改材料编码库导入功能，焊口台账增加焊接日期筛选

2026-08-31 15:11:03 +08:00
parent ad6ef33ce2
commit ffb9c2a95c
9 changed files with 97 additions and 82 deletions
@@ -58,7 +58,7 @@
                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口台账总览"
                                    EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="WeldJointId"
                                    ClicksToEdit="2" DataIDField="WeldJointId" AllowSorting="true" EnableCheckBoxSelect="true"
-                                    SortField="WeldJointCode" OnSort="Grid1_Sort" OnRowClick="Grid1_RowClick" EnableRowClickEvent="true"
+                                    SortField="WeldJointCode" OnSort="Grid1_Sort"  EnableRowClickEvent="true"
                                    OnPageIndexChange="Grid1_PageIndexChange"  EnableTextSelection="True"  AllowPaging="true" IsDatabasePaging="true" PageSize="15"    >
                                    <Toolbars>
                                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
@@ -73,6 +73,9 @@
                                                    <f:ListItem Text="已完成" Value="已完成" />
                                                    <f:ListItem Text="未完成" Value="未完成" />
                                                </f:DropDownList>
+                                                <f:DatePicker ID="txtWeldingDate" runat="server" Label="焊接日期" LabelAlign="Right"
+                                                    LabelWidth="90px" Width="220px"   AutoShowClearIcon="true">
+                                                </f:DatePicker>
                                                <f:ToolbarFill ID="ToolbarFill2" runat="server">
                                                </f:ToolbarFill>
                                                <f:Button ID="BtnAnalyse" Text="查询"  Icon="SystemSearch"