diff --git a/YLErpWeb/App_Data/FunctionRight.xml b/YLErpWeb/App_Data/FunctionRight.xml
index 0b194a6d..c67ce79e 100644
--- a/YLErpWeb/App_Data/FunctionRight.xml
+++ b/YLErpWeb/App_Data/FunctionRight.xml
@@ -153,7 +153,6 @@
-
diff --git a/YLErpWeb/App_Data/Menus.txt b/YLErpWeb/App_Data/Menus.txt
index 966c67f1..065acb1d 100644
--- a/YLErpWeb/App_Data/Menus.txt
+++ b/YLErpWeb/App_Data/Menus.txt
@@ -71,7 +71,8 @@
{Name:"机构账号设置",Rights:["客户管理-机构账号设置"],Url:"v3/client/account"},
//R1 三层级(2026-08-24):客户默认模板绑定入口恢复——二级(client_margin_template)生效的必需配置页;
//原下线理由"保证金模板在交易页直接选择"只覆盖交易级,客户/全局兜底落地后不再成立
- {Name:"客户预付金配置",Rights:["客户管理-客户预付金配置"],Url:"client_margin_template/client_margin_templateList"},
+ //入口迁移(2026-08-27):客户预付金配置从"客户管理"下线,降级为"数据管理-预付金模板V2"(margin_template_v2List)的第四个tab
+ //{Name:"客户预付金配置",Rights:["客户管理-客户预付金配置"],Url:"client_margin_template/client_margin_templateList"},
]
},
{Name:"互换簿记预设",Rights:["互换簿记预设"],Icon:"menu-icon iconfour"
diff --git a/YLErpWeb/Controllers/client_margin_templateController.cs b/YLErpWeb/Controllers/client_margin_templateController.cs
index 9fbe5f99..0b500568 100644
--- a/YLErpWeb/Controllers/client_margin_templateController.cs
+++ b/YLErpWeb/Controllers/client_margin_templateController.cs
@@ -6,13 +6,14 @@ namespace YLErp.Web.Controllers
{
public class client_margin_templateController : BaseController
{
- [MyAuthorize("客户管理-客户预付金配置")]
+ //入口迁移(2026-08-27):页面降级为"数据管理-预付金模板V2"第四个tab,权限归并到宿主页
+ [MyAuthorize("基础参数管理-预付金模板V2")]
public ActionResult client_margin_templateList()
{
return View();
}
- [MyAuthorize("客户管理-客户预付金配置")]
+ [MyAuthorize("基础参数管理-预付金模板V2")]
public ActionResult client_margin_templateEdit(int id)
{
var marginTemplates = yldb.margin_template_v2.Where(x => x.IsDefault && x.IsForClient && x.IsValid == true).ToList();
diff --git a/YLErpWeb/Views/client_margin_template/client_margin_templateList.cshtml b/YLErpWeb/Views/client_margin_template/client_margin_templateList.cshtml
index 4084cc33..ef88d0d7 100644
--- a/YLErpWeb/Views/client_margin_template/client_margin_templateList.cshtml
+++ b/YLErpWeb/Views/client_margin_template/client_margin_templateList.cshtml
@@ -1,6 +1,7 @@
@using YLErp.Enums;
@{
- ViewBag.Title = "交易预付金模板列表";
+ ViewBag.Title = "预付金模板V2";
+ ViewBag.Menu = "数据管理-预付金模板V2";
Layout = "~/Views/Shared/_MainLayout.cshtml";
}
@@ -160,4 +161,24 @@
导出
+
+
@Html.Raw(JqGridSimple.OutTable())
\ No newline at end of file
diff --git a/YLErpWeb/Views/margin_template_v2/margin_template_v2ClientList.cshtml b/YLErpWeb/Views/margin_template_v2/margin_template_v2ClientList.cshtml
index cd3100ff..161fb33e 100644
--- a/YLErpWeb/Views/margin_template_v2/margin_template_v2ClientList.cshtml
+++ b/YLErpWeb/Views/margin_template_v2/margin_template_v2ClientList.cshtml
@@ -191,6 +191,9 @@
客户预付金
+
+ 客户预付金配置
+
diff --git a/YLErpWeb/Views/margin_template_v2/margin_template_v2DefaultList.cshtml b/YLErpWeb/Views/margin_template_v2/margin_template_v2DefaultList.cshtml
index 680712c7..2e841f0c 100644
--- a/YLErpWeb/Views/margin_template_v2/margin_template_v2DefaultList.cshtml
+++ b/YLErpWeb/Views/margin_template_v2/margin_template_v2DefaultList.cshtml
@@ -195,6 +195,9 @@
客户预付金
+
+ 客户预付金配置
+
diff --git a/YLErpWeb/Views/margin_template_v2/margin_template_v2List.cshtml b/YLErpWeb/Views/margin_template_v2/margin_template_v2List.cshtml
index 5d6e7b82..24eb54e4 100644
--- a/YLErpWeb/Views/margin_template_v2/margin_template_v2List.cshtml
+++ b/YLErpWeb/Views/margin_template_v2/margin_template_v2List.cshtml
@@ -195,6 +195,9 @@
客户预付金
+
+ 客户预付金配置
+