diff --git a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayEdit.cs b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayEdit.cs index b7af8cc..3d4f5b5 100644 --- a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayEdit.cs +++ b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayEdit.cs @@ -126,7 +126,7 @@ __DFContainer.setValue('PriceBill_ID',''); editor.CanDeleteFunc = detail => CanSave; editor.IsEditableFunc = (field, detail) => { - return CanSave && field.Name == "Number"; + return CanSave ;//&& field.Name == "Number"; }; _costDetail = titlePanel.EAdd(new DFEditGrid(editor) { Width = Unit.Percentage(100) }); _costDetail.Columns.Add(new DFEditGridColumn("SubKillProductLine_Name")); diff --git a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayList.cs b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayList.cs index ad2c19b..74d8aa3 100644 --- a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayList.cs +++ b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayList.cs @@ -19,6 +19,7 @@ namespace BWP.Web.Pages.B3SubstituteKill.Bills.StatPay_ config.Add("Employee_ID"); config.Add("Date"); config.Add("Supplier_ID"); + config.Add("SourceBillID"); })); } @@ -32,8 +33,14 @@ namespace BWP.Web.Pages.B3SubstituteKill.Bills.StatPay_ AddDFBrowseGridColumn(grid, "Employee_Name"); AddDFBrowseGridColumn(grid, "Date"); AddDFBrowseGridColumn(grid, "Supplier_Name"); + AddDFBrowseGridColumn(grid, "SourceBillType"); + AddDFBrowseGridColumn(grid, "SourceBillID"); AddDFBrowseGridColumn(grid, "Remark"); } } + + public override bool EnableBatchCheck { + get { return CheckDefaultRole("批量审核",false); } + } } } diff --git a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayList.xml b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayList.xml index 4a07e34..046e5e7 100644 --- a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayList.xml +++ b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayList.xml @@ -66,6 +66,14 @@ + + + + + + + + diff --git a/B3SubstituteKill/BL/Bills/StatPay/StatPayBL.cs b/B3SubstituteKill/BL/Bills/StatPay/StatPayBL.cs index 38e616e..d3d8a71 100644 --- a/B3SubstituteKill/BL/Bills/StatPay/StatPayBL.cs +++ b/B3SubstituteKill/BL/Bills/StatPay/StatPayBL.cs @@ -23,12 +23,22 @@ namespace BWP.B3SubstituteKill.BL { dmo.PriceBill_ID = null; if (dmo.Date.HasValue && dmo.Supplier_ID.HasValue) + { dmo.PriceBill_ID = SupplierRpc.GetPriceBillID(dmo.Supplier_ID.Value, dmo.Date.Value); + } } + + foreach (var d in dmo.CostDetails) + { d.Money = d.Price * d.Number; + + } + foreach (var d in dmo.CallbackPayDetails) + { d.Money = d.Price * d.Number; + } dmo.ReceiveMoney = dmo.CostDetails.CostMoney - dmo.CallbackPayDetails.CallbackPayMoney; base.beforeSave(dmo); } diff --git a/WebFolder/config/Plugins/B3SubstituteKill.plugin b/WebFolder/config/Plugins/B3SubstituteKill.plugin index 77fde1e..3d8e402 100644 --- a/WebFolder/config/Plugins/B3SubstituteKill.plugin +++ b/WebFolder/config/Plugins/B3SubstituteKill.plugin @@ -123,6 +123,7 @@ +