调整了部分页面的查询条件
入库明细状态增加校验, 前端增加loading,禁用按钮,空提交检测
This commit is contained in:
1 parent
40a6810713
commit
6897508f8d
26 files changed
+227
-106
No files matched your search
+2
@@ -12,7 +12,9 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class TaskDetailHistorySearcher : BaseSearcher
|
||||
{
|
||||
[Display(Name = "Task.TaskNo")]
|
||||
public List<ComboSelectListItem> AllTaskHeaders { get; set; }
|
||||
[Display(Name = "Task.TaskNo")]
|
||||
public int? TaskHeaderId { get; set; }
|
||||
[Display(Name = "Inventory.UniqueCode")]
|
||||
public String UniqueCode { get; set; }
|
||||
|
||||
@@ -55,6 +55,7 @@ namespace HHWMS.Web
|
||||
public override IOrderedQueryable<TaskDetail_View> GetSearchQuery()
|
||||
{
|
||||
var query = DC.Set<TaskDetail>()
|
||||
.CheckEqual(Searcher.TaskHeaderId,x => x.TaskHeaderId)
|
||||
.CheckContain(Searcher.UniqueCode, x=>x.UniqueCode)
|
||||
.CheckContain(Searcher.MaterialCode, x=>x.MaterialCode)
|
||||
.CheckContain(Searcher.FromLocation, x=>x.FromLocation)
|
||||
|
||||
@@ -12,6 +12,8 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class TaskDetailSearcher : BaseSearcher
|
||||
{
|
||||
[Display(Name = "Task.TaskNo")]
|
||||
public List<ComboSelectListItem> AllTaskHeaders { get; set; }
|
||||
[Display(Name = "Inventory.UniqueCode")]
|
||||
public String UniqueCode { get; set; }
|
||||
|
||||
@@ -24,10 +26,10 @@ namespace HHWMS.Web
|
||||
public String FromLocation { get; set; }
|
||||
[Display(Name = "Task.ToLocation")]
|
||||
public String ToLocation { get; set; }
|
||||
|
||||
|
||||
protected override void InitVM()
|
||||
{
|
||||
AllTaskHeaders = DC.Set<TaskHeader>().GetSelectListItems(Wtm, y => y.TaskNo);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
+8
-6
@@ -33,16 +33,17 @@ namespace HHWMS.Web
|
||||
{
|
||||
return new List<GridColumn<TaskHeaderHistory_View>>{
|
||||
this.MakeGridHeader(x => x.ZoneCode),
|
||||
this.MakeGridHeader(x => x.TaskNo),
|
||||
this.MakeGridHeader(x => x.TaskType),
|
||||
this.MakeGridHeader(x => x.FromLocation),
|
||||
this.MakeGridHeader(x => x.ToLocation),
|
||||
this.MakeGridHeader(x => x.TaskNo).SetWidth(220),
|
||||
this.MakeGridHeader(x => x.TaskType,150),
|
||||
this.MakeGridHeader(x => x.FromLocation,150),
|
||||
this.MakeGridHeader(x => x.ToLocation,150),
|
||||
this.MakeGridHeader(x => x.Station),
|
||||
this.MakeGridHeader(x => x.ContainerCode),
|
||||
this.MakeGridHeader(x => x.ContainerCode,150),
|
||||
this.MakeGridHeader(x => x.RoadWay).SetHide(),
|
||||
this.MakeGridHeader(x => x.Priority).SetHide(),
|
||||
this.MakeGridHeader(x => x.Status),
|
||||
this.MakeGridHeader(x => x.Status,150),
|
||||
this.MakeGridHeader(x => x.ErrorMsg),
|
||||
this.MakeGridHeader(x => x.CreateTime,220),
|
||||
this.MakeGridHeaderAction(width: 200)
|
||||
};
|
||||
}
|
||||
@@ -72,6 +73,7 @@ namespace HHWMS.Web
|
||||
Priority = x.Priority,
|
||||
Status = x.Status,
|
||||
ErrorMsg = x.ErrorMsg,
|
||||
CreateTime = x.CreateTime
|
||||
})
|
||||
.OrderBy(x => x.ID);
|
||||
return query;
|
||||
|
||||
@@ -68,6 +68,7 @@ namespace HHWMS.Web
|
||||
this.MakeGridHeader(x => x.Status, 150),
|
||||
this.MakeGridHeader(x => x.CreateTime, 150).SetHide(),
|
||||
this.MakeGridHeader(x => x.ErrorMsg, 150).SetHide(),
|
||||
this.MakeGridHeader(x => x.CreateTime,220),
|
||||
this.MakeGridHeaderAction(width: 200)
|
||||
};
|
||||
}
|
||||
@@ -97,6 +98,7 @@ namespace HHWMS.Web
|
||||
Priority = x.Priority,
|
||||
Status = x.Status,
|
||||
ErrorMsg = x.ErrorMsg,
|
||||
CreateTime = x.CreateTime
|
||||
})
|
||||
.OrderByDescending(x => x.ID);
|
||||
return query;
|
||||
|
||||
Reference in new issue
Block a user