diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/StatPay_/StatPayEdit.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/StatPay_/StatPayEdit.cs index 8841bf1..bdf5439 100644 --- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/StatPay_/StatPayEdit.cs +++ b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/StatPay_/StatPayEdit.cs @@ -434,6 +434,8 @@ __DFContainer.getControl('Employee_ID').fill('',''); SetExceptionByRewardItemId(Dmo, itemId); _otherRewardGrid.DataBind(); } + + ClientScript.RegisterStartupScript(this.GetType(), "scl", "document.getElementById('addBtn').scrollIntoView();", true); }; }; _otherRewardGrid.Columns.Add(column); @@ -530,10 +532,11 @@ __DFContainer.getControl('Employee_ID').fill('',''); var detail = new StatPay_OtherReward(); Dmo.OtherRewardDetails.Add(detail); _otherRewardGrid.DataBind(); + ClientScript.RegisterStartupScript(this.GetType(), "scl", "document.getElementById('addBtn').scrollIntoView();", true); }; } - var sumBt = hPanel.Add(new TSButton("加载")); + var sumBt = hPanel.Add(new TSButton("加载") { ID = "addBtn", ClientIDMode = ClientIDMode.Static }); sumBt.Click += delegate { AddOtherReward(Dmo); diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/WeightBill_/WeightBillEdit.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/WeightBill_/WeightBillEdit.cs index 1250c4b..3b58e4b 100644 --- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/WeightBill_/WeightBillEdit.cs +++ b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/WeightBill_/WeightBillEdit.cs @@ -19,6 +19,8 @@ using BWP.B3SheepButcherManage.Utils; using BWP.B3ProduceUnitedInfos.NamedValueTemplate; using BWP.Web.Pages.B3CowButcherManage.Dialogs; using BWP.B3CowButcherManage; +using Forks.Utils; +using BWP.B3Frameworks.BO.MoneyTemplate; namespace BWP.Web.Pages.B3SheepButcherManage.Bills.WeightBill_ { @@ -194,7 +196,14 @@ __DFContainer.getControl('Employee_ID').fill('',''); { e.Control.Style["width"] = "160px"; }; - _weightGrid.Columns.Add(new DFEditGridColumn("AvgWeight")); + _weightGrid.Columns.EAdd(new DFEditGridColumn("AvgWeight") { SumMode = SumMode.Sum }).ComputeSumRowFunc = (list) => + { + var num = Dmo.WeighRecords.Sum(x => x.Number); + var weight = Dmo.WeighRecords.Sum(x => (x.Weight ?? 0).Value); + if (num != 0) + return (Money<二位小数>?)(weight / num); + return null; + }; _weightGrid.Columns.EAdd(new DFEditGridColumn("LiveColonyHouse_ID")).InitEditControl += (sender, e) => { e.Control.DataKind = B3ProduceUnitedInfos.B3ProduceUnitedInfosDataSources.活体圈舍;