合并最新

SGGL/FineUIPro.Web/HJGL/DataIn/DataInTable.aspx

@@ -19,10 +19,6 @@
 
     
 <style type="text/css">
- 
-	
-	 
-       
             /*定义父容器*/
             .content{
             width: 550px;
@@ -56,7 +52,9 @@
                         <f:CheckBox ID="ckUpdate" runat="server" Text="更新导入"></f:CheckBox>
                         <f:Button ID="btnSave" runat="server" Text="保存" ToolTip="审核保存" Icon="SystemSave" OnClick="btnSave_Click"></f:Button>
                         <f:Button ID="btnRefresh" runat="server"  ClientIDMode="Static" Text="刷新"  Icon="SystemSave" OnClick="btnRefresh_Click" Hidden="true"></f:Button>
-
+                        <f:Button ID="btnD" runat="server" Icon="Delete" Text="删除重复焊口" ToolTip="删除临时表中同管线下重复焊口" ConfirmText="删除临时表中重复管线焊口？"
+                            ConfirmTarget="Top" OnClick="btnD_Click">
+                        </f:Button>
                         <f:Button ID="btnAllDelete" runat="server" Icon="Delete" Text="删除记录" ToolTip="删除当前人所有临时导入记录" ConfirmText="删除当前人所有临时导入记录？"
                             ConfirmTarget="Top" OnClick="btnAllDelete_Click">
                         </f:Button>
@@ -248,11 +246,7 @@
                         <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
                         </f:ToolbarText>
                         <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                            <f:ListItem Text="10" Value="10" />
-                            <f:ListItem Text="15" Value="15" Selected="true" />
-                            <f:ListItem Text="20" Value="20" />
-                            <f:ListItem Text="25" Value="25" />
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">                          
                         </f:DropDownList>
                         <f:Label Label="错误记录数" runat="server" ID="lbDataCout" CssClass="Label" LabelAlign="right" LabelWidth="120px"></f:Label>
                     </PageItems>
@@ -261,7 +255,7 @@
         </f:Panel>
         <f:Window ID="Window1" Title="数据信息" Hidden="true" EnableIFrame="true"
             EnableMaximize="true" Target="Top" EnableResize="true" runat="server"
-            IsModal="true" Width="1200px" Height="600px">
+            IsModal="true" Width="1200px" Height="620px">
         </f:Window>
          <f:Window ID="Window2"   Hidden="true"  runat="server"    MinHeight="30px"
              Target="Parent"  ShowHeader="false"  BodyPadding="0" Margin="0"