diff --git a/YLErpDAL/Modules/SystemModule/ClientEditConfigService.cs b/YLErpDAL/Modules/SystemModule/ClientEditConfigService.cs index cea557cc..a2868852 100644 --- a/YLErpDAL/Modules/SystemModule/ClientEditConfigService.cs +++ b/YLErpDAL/Modules/SystemModule/ClientEditConfigService.cs @@ -192,8 +192,15 @@ namespace YLErp.Modules.SystemModule { if (item.Key == nameof(Client.AppropriatenessDegree)) { continue; } _config.selects[item.Key] = yldic.GetList(item.Value, false); + if (item.Key == "meta_ClientTagDesc") + { + _config.selects[item.Key].ToList().ForEach(O => + { + O.Text = O.Value; + }); + } //行业字段比较特殊,KeyValue需要保持一致; - if (item.Key == nameof(Client.BusinessType) || item.Key == nameof(Client.ProtocolSignVersion)) + if (item.Key == nameof(Client.BusinessType) || item.Key == nameof(Client.ProtocolSignVersion) || item.Key == "meta_ClientTag") { _config.selects[item.Key].ToList().ForEach(O => { @@ -255,7 +262,7 @@ namespace YLErp.Modules.SystemModule return null; } - public static FormEditField GetFormEditFieldByLabel(IEnumerable FormEditFields,string label) + public static FormEditField GetFormEditFieldByLabel(IEnumerable FormEditFields, string label) { if (FormEditFields != null) { diff --git a/YLErpWeb/App_Data/FunctionRight.xml b/YLErpWeb/App_Data/FunctionRight.xml index 61c05dfc..33f79ba4 100644 --- a/YLErpWeb/App_Data/FunctionRight.xml +++ b/YLErpWeb/App_Data/FunctionRight.xml @@ -143,10 +143,12 @@ + + diff --git a/YLErpWeb/App_Data/Menus.txt b/YLErpWeb/App_Data/Menus.txt index 689f0137..a24c4bdd 100644 --- a/YLErpWeb/App_Data/Menus.txt +++ b/YLErpWeb/App_Data/Menus.txt @@ -66,6 +66,7 @@ {Name:"簿记账户组",Rights:["系统管理-资产单元"],Url:"assetunit/assetunitgroupList"}, {Name:"对冲账户",Rights:["系统管理-对冲账户"],Url:"exchange_account/exchange_accountList"}, {Name:"审批流程",Rights:["系统管理-审批流程"],Url:"AccountOpeningProcess/Index"}, + {Name:"数据字典",Rights:["系统管理-数据字典"],Url:"System/Dictionary"}, {Name:"基础缓存",Rights:["系统管理-基础缓存"],Url:"System/ResetCache"}, {Name:"标签管理",Rights:["系统管理-标签管理"],Url:"Tag/Index"}, {Name:"做市账户",Rights:["系统管理-做市账户"],Url:"TrsAccountManage/Index"} diff --git a/YLErpWeb/Controllers/clientController.cs b/YLErpWeb/Controllers/clientController.cs index b7bbab95..29bb697a 100644 --- a/YLErpWeb/Controllers/clientController.cs +++ b/YLErpWeb/Controllers/clientController.cs @@ -2955,6 +2955,12 @@ namespace YLErp.Web.Controllers model.editConfig.lists["bankcardList"] = GetBankcards(model.client.id, isApproval); } + //银行卡 + if (model.editConfig.sections.Any(n => n.tabId == "meta_ClientTag")) + { + model.editConfig.lists["bankcardList"] = GetBankcards(model.client.id, isApproval); + } + //客户人员信息管理 if (model.editConfig.sections.Any(n => n.tabId == "dutys")) { diff --git a/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js b/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js index 4f4837ad..96e1064b 100644 --- a/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js +++ b/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js @@ -1680,7 +1680,15 @@ $(function () { $("#LicenseValidTime").show(); $("#clickLongOrShortLicense").text("长期"); } - + $("[name=meta_ClientTagDesc]").prop("disabled", "disabled"); + $("[name=meta_ClientTag]").change(() => { + $("[name=meta_ClientTagDesc]").get(0).selectedIndex = $('[name=meta_ClientTag] option:selected').index() + page.client.meta_ClientTagDesc = $("[name=meta_ClientTagDesc]").val(); + }); + if (!page.isNewClient) { + $("[name=meta_ClientTag]").val(page.client.MetaDic.ClientTag); + $("[name=meta_ClientTag]").change(); + } createTopVue(); if (!pageData.isGuoJun) { $(".showmore").mouseenter(//进入元素 @@ -1715,7 +1723,7 @@ $(function () { input.attr('type', 'text'); $(this).addClass("glyphicon-eye-open"); $(this).removeClass("glyphicon-eye-close"); - + } else { input.attr('type', 'password'); $(this).removeClass("glyphicon-eye-open");