#TRS-ZS-608 浙商TRS-客户保证金报送

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<FormEditField> FormEditFields,string label)
+        public static FormEditField GetFormEditFieldByLabel(IEnumerable<FormEditField> FormEditFields, string label)
         {
             if (FormEditFields != null)
             {

YLErpWeb/App_Data/FunctionRight.xml

@@ -143,10 +143,12 @@
 		<FunctionSub Name="审批流程" Title="审批流程"></FunctionSub>
 		<FunctionSub Name="对冲账户管理" Title="对冲账户管理" Type="Operate" Note="是否有权限修改对冲账户信息"></FunctionSub>
 		<FunctionSub Name="审批流程管理" Title="审批流程管理" Type="Operate" Note="是否有权限修改审批流程"></FunctionSub>
+    <FunctionSub Name="数据字典管理" Title="数据字典管理" Type="Operate" Note="是否有权限修改数据字典"></FunctionSub>
 		<FunctionSub Name="资产单元" Title="簿记账户"></FunctionSub>
 		<FunctionSub Name="簿记账户修改" Type="Operate" Title="簿记账户修改"></FunctionSub>
 		<FunctionSub Name="簿记账户新增" Type="Operate" Title="簿记账户新增"></FunctionSub>
 		<FunctionSub Name="对冲账户" Title="对冲账户"></FunctionSub>
+    <FunctionSub Name="数据字典" Title="数据字典"></FunctionSub>
 		<FunctionSub Name="基础缓存" Title="基础缓存"></FunctionSub>
 		<FunctionSub Name="标签管理" Title="标签管理"></FunctionSub>
 		<FunctionSub Name="标签编辑权限" Title="标签编辑权限" Type="Operate" Note="在标签管理和交易上创建新标签、删除标签、修改标签"></FunctionSub>

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"}

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"))
             {

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");