diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs index 9e58f9a..a5f3738 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs @@ -226,6 +226,7 @@ namespace BWP.Web.Pages.B3YunKen.Bill var temp = new JoinAlias(typeof(TempPackage)); var temp2 = new JoinAlias(typeof(TempPackage2)); var dom = new DQueryDom(goods); + OrganizationUtil.RegisterOrganizationQueryTable(dom); dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(goods, "ID"), "Goods_ID")); dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(goods, "Name"), "产品")); if (configured) @@ -264,7 +265,7 @@ namespace BWP.Web.Pages.B3YunKen.Bill dom.RegisterQueryTable(typeof(TempPackage), new[] { "Goods_ID" }, GetTempDom()); dom.From.AddJoin(JoinType.Left, new DQDmoSource(temp), DQCondition.EQ(temp, "Goods_ID", goods, "ID")); dom.Where.Conditions.Add(DQCondition.IsNull(DQExpression.Field(temp, "Goods_ID"))); - } + } if (!string.IsNullOrEmpty(_goodsDfc.Value)) { dom.Where.Conditions.Add(DQCondition.EQ("ID", _goodsDfc.Value)); @@ -324,8 +325,8 @@ namespace BWP.Web.Pages.B3YunKen.Bill { dom.Where.Conditions.Add(DQCondition.EQ(acc, "ID", _accountingUnitDfc.Value)); } - //AuthorizeUtil.AddOrganizationAuthorising(dom, new KeyValuePair("acc", "Organization_ID")); - //OrganizationUtil.AddOrganizationLimit(dom, typeof(AccountingUnit), acc); + //AuthorizeUtil.AddOrganizationAuthorising(dom, new KeyValuePair("acc", "Organization_ID")); + OrganizationUtil.AddOrganizationLimit(dom, typeof(AccountingUnit), acc); return dom; } diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs index c73a23d..d54a2b1 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs @@ -5,6 +5,8 @@ using System.Linq; using System.Text; using BWP.Web.Layout; using TSingSoft.WebControls2; +using BWP.Web.Utils; +using BWP.B3Sale.Utils; namespace BWP.Web.Pages.B3YunKen.Overlays { @@ -33,6 +35,18 @@ namespace BWP.Web.Pages.B3YunKen.Overlays config.Add("Carrier_ID"); } + protected override void OverrideSaleKindId(LayoutManager layoutManager, AutoLayoutConfig config) + { + layoutManager.Add("SaleKind_ID", QueryCreator.DFChoiceBox(mDFInfo.Fields["SaleKind_ID"], B3SaleDataSources.销售类型)); + config.Add("SaleKind_ID"); + } + + public override void AppToUI() + { + base.AppToUI(); + mDFContainer.MakeReadonly("SaleKind_ID",!CheckDefaultRole("编辑销售类型")); + } + protected override void AddLayOutManagerScript(LayoutManager layoutPanel) { base.AddLayOutManagerScript(layoutPanel);