调整了部分页面的查询条件

入库明细状态增加校验,
前端增加loading,禁用按钮,空提交检测
This commit is contained in:
zhougf committed 2024-05-29 00:19:43 +08:00
1 parent 40a6810713
commit 6897508f8d
26 files changed
+227 -106

No files matched your search

@@ -26,27 +26,28 @@ namespace HHWMS.Web
protected override IEnumerable<IGridColumn<InventoryTransaction_View>> InitGridHeader()
{
return new List<GridColumn<InventoryTransaction_View>>{
this.MakeGridHeader(x => x.ZoneCode),
this.MakeGridHeader(x => x.Type),
this.MakeGridHeader(x => x.ContainerCode),
this.MakeGridHeader(x => x.LocationCode),
this.MakeGridHeader(x => x.MaterialCode),
this.MakeGridHeader(x => x.MaterialType),
this.MakeGridHeader(x => x.MaterialName),
this.MakeGridHeader(x => x.MaterialSpec),
this.MakeGridHeader(x => x.MaterialUnit),
this.MakeGridHeader(x => x.Batch),
this.MakeGridHeader(x => x.ZoneCode,120),
this.MakeGridHeader(x => x.BillType,120),
this.MakeGridHeader(x => x.Type,230),
this.MakeGridHeader(x => x.ContainerCode).SetHide(),
this.MakeGridHeader(x => x.LocationCode,150),
this.MakeGridHeader(x => x.MaterialCode,120),
this.MakeGridHeader(x => x.MaterialType,120),
this.MakeGridHeader(x => x.MaterialName,120),
this.MakeGridHeader(x => x.MaterialSpec,120),
this.MakeGridHeader(x => x.MaterialUnit,120),
this.MakeGridHeader(x => x.Batch,120),
this.MakeGridHeader(x => x.Lot),
this.MakeGridHeader(x => x.ManufactureDate),
this.MakeGridHeader(x => x.ExpirationDate),
this.MakeGridHeader(x => x.CompanyCode),
this.MakeGridHeader(x => x.ManufactureDate).SetHide(),
this.MakeGridHeader(x => x.ExpirationDate).SetHide(),
this.MakeGridHeader(x => x.CompanyCode).SetHide(),
this.MakeGridHeader(x => x.SupplierCode),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.BillType),
this.MakeGridHeader(x => x.SourceCode),
this.MakeGridHeader(x => x.BillCode),
this.MakeGridHeader(x => x.BillDetailId),
this.MakeGridHeader(x => x.Status),
this.MakeGridHeader(x => x.Status).SetHide(),
this.MakeGridHeader(x => x.CreateTime,200),
this.MakeGridHeaderAction(width: 200)
};
}
@@ -93,6 +94,7 @@ namespace HHWMS.Web
BillCode = x.BillCode,
BillDetailId = x.BillDetailId,
Status = x.Status,
CreateTime = x.CreateTime
})
.OrderBy(x => x.ID);
return query;
@@ -14,7 +14,7 @@ namespace HHWMS.Web
{
[Display(Name = "Task.ZoneCode")]
public String ZoneCode { get; set; }
[Display(Name = "InventoryTransaction.Type")]
[Display(Name = "Inventory.UniqueCode")]
public String Type { get; set; }
[Display(Name = "Task.ContainerCode")]
public String ContainerCode { get; set; }