diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
index 853b4415..474f51d3 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
@@ -92,7 +92,8 @@
                         EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="WeldTaskId,WeldJointId" EnableColumnLines="true" ForceFit="true"
                         AllowCellEditing="true" ClicksToEdit="1" DataIDField="WeldTaskId" AllowSorting="true" KeepCurrentSelection="true" AllowColumnLocking="true" 
                         SortField="WeldJointNum" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true"    	CheckBoxSelectOnly="true"
-                        AllowPaging="false" IsDatabasePaging="true" PageSize="10000" EnableTextSelection="True"  DisableUnselectableRows="true">
+                        AllowPaging="false" IsDatabasePaging="false" PageSize="10000" EnableTextSelection="True"  DisableUnselectableRows="true"
+                         EnableBigData="true"  >
                        
                         <Columns>
                             <f:RenderField HeaderText="焊口序号" ColumnID="WeldJointNum"
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
index e47fddea..90952190 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Web.UI.DataVisualization.Charting;
 
 namespace FineUIPro.Web.WeldingProcess.WeldingManage
 {
@@ -194,11 +195,12 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         private void BindGrid(List<Model.SpWeldingDailyItem> weldingDailyItem)
         {
             var aw = this.Grid1.SelectedRowIDArray;
-            DataTable dt = null;          
+            DataTable dt = null;
+            var task = new List<Model.View_HJGL_WeldingTask>();
+
             var list = from x in Funs.DB.View_HJGL_WeldingTask where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId select x;
             if (weldingDailyItem != null)
             {
-                var task = new List<Model.View_HJGL_WeldingTask>();
                 var weldJointIds = (from x in list
                                     where ( x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text)
                            && x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/) || x.WeldingDailyId == this.WeldingDailyId
@@ -217,12 +219,11 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                 {
                     task = task.Where(x => x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).ToList();
                 }
-                dt = this.LINQToDataTable(task);
+               // dt = this.LINQToDataTable(task);
             }
             else
             {
-                var task = new List<Model.View_HJGL_WeldingTask>();
-                var weldJointIds = (from x in list
+                 var weldJointIds = (from x in list
                                     where x.UnitWorkId == this.UnitWorkId && x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text)
                            && x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/
                                     select x).GroupBy(x => x.WeldJointId, (key, group) => group.First()).ToList();
@@ -239,15 +240,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                 {
                     task = task.Where(x => x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).ToList();
                 }
-                dt = this.LINQToDataTable(task);
+                //dt = this.LINQToDataTable(task);
             }
             // 2.获取当前分页数据
             //var table = this.GetPagedDataTable(GridNewDynamic, tb1);
-            Grid1.RecordCount = dt.Rows.Count;
+            // Grid1.RecordCount = dt.Rows.Count;
             // tb = GetFilteredTable(Grid1.FilteredData, tb);
-            var table = this.GetPagedDataTable(Grid1, dt);
-
-            Grid1.DataSource = table;
+            //var table = this.GetPagedDataTable(Grid1, dt);
+            Grid1.RecordCount = task.Count;
+            Grid1.DataSource = task;
             Grid1.DataBind();
 
             //for (int i = 0; i < this.Grid1.Rows.Count; i++)
@@ -265,14 +266,14 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
             //}
             if (weldingDailyItem != null)
             {
-                var task = (from x in Funs.DB.View_HJGL_WeldingTask
+                var Dailytask = (from x in Funs.DB.View_HJGL_WeldingTask
                            where x.WeldingDailyId == this.WeldingDailyId
                            select x).ToList();
                 if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim()))
                 {
-                    task = task.Where(x => x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).ToList();
+                    Dailytask = Dailytask.Where(x => x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).ToList();
                 }
-                var weldTaskIds = task.Select(x => x.WeldTaskId).ToArray();
+                var weldTaskIds = Dailytask.Select(x => x.WeldTaskId).ToArray();
                 this.Grid1.SelectedRowIDArray = weldTaskIds;
                 var a = this.Grid1.SelectedRowIDArray;
             }