diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/PriceBill_DetailAdjust.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/PriceBill_DetailAdjust.cs index 6e639b5..cc00d15 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/PriceBill_DetailAdjust.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/PriceBill_DetailAdjust.cs @@ -111,13 +111,13 @@ namespace BWP.Web.Pages.B3YunKen.Bill layoutManager.Add("PriceClass_ID", new SimpleLabel("价格分类"), mQueryContainer.AddLink(new ChoiceBoxMultiSelectLink(_priceClass, s => long.Parse(s)), "PriceClass_ID")); layoutManager["PriceClass_ID"].NotAutoAddToContainer = true; - if (string.IsNullOrEmpty(saleConfig.PriceClassId)) { + layoutManager.Add("AccountingUnit_ID", new SimpleLabel("会计单位"), mQueryContainer.AddLink(new ChoiceBoxMultiSelectLink(QueryCreator.DFChoiceBoxEnableMultiSelection(mDFInfo.Fields["AccountingUnit_ID"], B3FrameworksConsts.DataSources.授权会计单位全部), s => long.Parse(s)), "AccountingUnit_ID")); layoutManager["AccountingUnit_ID"].NotAutoAddToContainer = true; - } else { + layoutManager.Add("BrandItem_ID", new SimpleLabel("品牌项"), mQueryContainer.AddLink(new ChoiceBoxMultiSelectLink(QueryCreator.DFChoiceBoxEnableMultiSelection(mDFInfo.Fields["BrandItem_ID"], B3UnitedInfosConsts.DataSources.品牌项), s => long.Parse(s)), "BrandItem_ID")); layoutManager["BrandItem_ID"].NotAutoAddToContainer = true; - } + vPanel.Add(layoutManager.CreateLayout()); HLayoutPanel hPanel = new HLayoutPanel() { Align = HorizontalAlign.Center }; TSButton qButton = new TSButton("开始查询"); @@ -184,15 +184,12 @@ namespace BWP.Web.Pages.B3YunKen.Bill var main = dom.From.RootSource.Alias; var detail = JoinAlias.Create("detail"); var priceTemp = new JoinAlias("priTemp", typeof(PriceBillTemp)); - if (string.IsNullOrEmpty(saleConfig.PriceClassId)) { PriceBillTemp.Regiester(dom); PriceBillTemp.AddJoin(dom, priceTemp); var auu = new JoinAlias("auu", typeof(AccountingUnit)); dom.From.AddJoin(JoinType.Left, new DQDmoSource(auu), DQCondition.EQ(priceTemp, "AccountingUnit_ID", auu, "ID")); dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(auu, "Name"), "会计单位")); - } else { dom.Columns.Add(DQSelectColumn.Field("BrandItem_Name",main)); - } foreach (var field in detailFields)