From c1dd93652d1b5ba3f65124c2ae5782ea84344e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AC=B4=E6=94=BF=20=E6=97=B6?= Date: Thu, 7 Aug 2025 11:33:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?#TRS-ZS-608=20=E6=B5=99=E5=95=86TRS-?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=9D=E8=AF=81=E9=87=91=E6=8A=A5=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/Scripts/app/client/clientEditV2.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js b/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js index de691d22..b54755d9 100644 --- a/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js +++ b/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js @@ -1512,6 +1512,20 @@ function createTopVue() { if (!_.trim(client.Name)) { return main.alert("客户名称 必须填写"); } + if (!_.trim(client.meta_MainProtocolType)) { + return main.alert("主协议类型 必须填写"); + } + if (!_.trim(client.meta_OrganizationType)) { + return main.alert("交易对手方类型 必须填写"); + } + if (!_.trim(client.meta_ClientTag)) { + return main.alert("交易对手方标识 必须填写"); + } + if (client.meta_OrganizationType === "14" || client.meta_OrganizationType === "15") { + return main.alert("LEI编码 必须填写"); + } else { + return main.alert("统一社会信用代码 必须填写"); + } if (page.fnameSet.has("EvaluateDate") && client.EvaluateDate && ! /^[0-9]{4}-[0-1]?[0-9]{1}-[0-3]?[0-9]{1}$/.test(client.EvaluateDate)) { return main.message("请输入正确的评估日期格式"); From f4ef47e6542d5e0c9623aba02913699218149ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AC=B4=E6=94=BF=20=E6=97=B6?= Date: Thu, 7 Aug 2025 11:46:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?#TRS-ZS-608=20=E6=B5=99=E5=95=86TRS-?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=9D=E8=AF=81=E9=87=91=E6=8A=A5=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js b/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js index b54755d9..4f4837ad 100644 --- a/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js +++ b/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js @@ -1522,9 +1522,13 @@ function createTopVue() { return main.alert("交易对手方标识 必须填写"); } if (client.meta_OrganizationType === "14" || client.meta_OrganizationType === "15") { - return main.alert("LEI编码 必须填写"); + if (!_.trim(client.LEICode)) { + return main.alert("LEI编码 必须填写"); + } } else { - return main.alert("统一社会信用代码 必须填写"); + if (!_.trim(client.CounterpartyCode)) { + return main.alert("统一社会信用代码 必须填写"); + } } if (page.fnameSet.has("EvaluateDate") && client.EvaluateDate && ! /^[0-9]{4}-[0-1]?[0-9]{1}-[0-3]?[0-9]{1}$/.test(client.EvaluateDate)) { From 49c97fa7b83d5e997b485b16920ea2530270df89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AC=B4=E6=94=BF=20=E6=97=B6?= Date: Fri, 8 Aug 2025 16:03:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?#TRS-ZS-608=20=E6=B5=99=E5=95=86TRS-?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=9D=E8=AF=81=E9=87=91=E6=8A=A5=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/SystemModule/ClientEditConfigService.cs | 11 +++++++++-- YLErpWeb/App_Data/FunctionRight.xml | 2 ++ YLErpWeb/App_Data/Menus.txt | 1 + YLErpWeb/Controllers/clientController.cs | 6 ++++++ YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js | 12 ++++++++++-- 5 files changed, 28 insertions(+), 4 deletions(-) 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");