Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New
This commit is contained in:
@@ -68,7 +68,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
|
||||
{
|
||||
List<Model.SpWeldingDailyItem> GetWeldingDailyItem = BLL.WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId);
|
||||
this.BindGrid(GetWeldingDailyItem); // 初始化页面
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
this.BindGrid(null);
|
||||
@@ -220,7 +220,7 @@ 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
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user