合并最新

2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
@@ -26,6 +26,11 @@
                                </f:DropDownList>
                                <f:DropDownList ID="drpCNProfessional" runat="server" Label="专业" LabelAlign="Right" EnableEdit="true" LabelWidth="110px">
                                </f:DropDownList>
+                                <f:DropDownList ID="drpState" runat="server" Label="状态" LabelAlign="Right" LabelWidth="110px">
+                                    <f:ListItem Text="编制" Value="1" />
+                                    <f:ListItem Text="待审批" Value="2" />
+                                    <f:ListItem Text="审批完成" Value="3" />
+                                </f:DropDownList>
                                <f:DatePicker runat="server" Label="验收日期" ID="txtStarTime" LabelAlign="Right"
                                    LabelWidth="100px" Width="220px">
                                </f:DatePicker>
@@ -81,6 +86,13 @@
                                 
                            </ItemTemplate>
                        </f:TemplateField>
+                        <f:TemplateField ColumnID="UserName" Width="55px" HeaderText="确认人" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="False">
+                            <ItemTemplate>
+                                <asp:Label ID="Label3" runat="server" Text='<%# ConvertUserName(Eval("InspectionId"))  %>'></asp:Label>
+                                 
+                            </ItemTemplate>
+                        </f:TemplateField>
                            <f:WindowField TextAlign="Center" Width="80px" WindowID="WindowAtt" 
                        Text="审批列表" ToolTip="审批列表" DataIFrameUrlFields="InspectionId" DataIFrameUrlFormatString="./InspectionManagementApproveList.aspx?InspectionId={0}"/>