From 696ac168f0236b73e253fc44931fa9c4ee82d942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E5=86=B0=E5=86=B0?= <437394478@qq.com> Date: Fri, 31 Jul 2026 11:10:55 +0800 Subject: [PATCH] =?UTF-8?q?Changes=EF=BC=9A=E5=85=A8=E9=83=A8=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E6=88=90=E7=BB=AD=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YLErpWeb/App_Data/FunctionRight.xml | 2 +- YLErpWeb/Common/UserInfoRight.cs | 4 ++-- YLErpWeb/Controllers/SwapTrade2Controller.cs | 4 ++-- YLErpWeb/Views/SwapTrade2/header.cshtml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/YLErpWeb/App_Data/FunctionRight.xml b/YLErpWeb/App_Data/FunctionRight.xml index 397e458d..03ee9a6a 100644 --- a/YLErpWeb/App_Data/FunctionRight.xml +++ b/YLErpWeb/App_Data/FunctionRight.xml @@ -12,7 +12,7 @@ - + diff --git a/YLErpWeb/Common/UserInfoRight.cs b/YLErpWeb/Common/UserInfoRight.cs index 5db38dd8..cf0989bd 100644 --- a/YLErpWeb/Common/UserInfoRight.cs +++ b/YLErpWeb/Common/UserInfoRight.cs @@ -407,9 +407,9 @@ namespace YLErp.Web public bool 交易管理_交易新增 => HasRight("交易管理-交易新增"); /// - /// 交易管理-交易续做 + /// 交易管理-交易续作 /// - public bool 交易管理_交易续做 => HasRight("交易管理-交易续做"); + public bool 交易管理_交易续作 => HasRight("交易管理-交易续作"); /// /// 交易管理-交易编辑 diff --git a/YLErpWeb/Controllers/SwapTrade2Controller.cs b/YLErpWeb/Controllers/SwapTrade2Controller.cs index c8c78e65..699e370a 100644 --- a/YLErpWeb/Controllers/SwapTrade2Controller.cs +++ b/YLErpWeb/Controllers/SwapTrade2Controller.cs @@ -48,9 +48,9 @@ namespace YLErp.Web.Controllers public ActionResult TradeEdit(string enid, string renewEnid = null, bool isUseApproval = false) { ViewBag.isUseApproval = isUseApproval; - if (!string.IsNullOrWhiteSpace(renewEnid) && !CurUser.交易管理_交易续做) + if (!string.IsNullOrWhiteSpace(renewEnid) && !CurUser.交易管理_交易续作) { - return ShowError("没有续做交易权限"); + return ShowError("没有续作交易权限"); } // The new/renew flow uses the literal "0" to indicate that no trade exists yet. var intid = enid == "0" ? 0 : DecryptInt(enid); diff --git a/YLErpWeb/Views/SwapTrade2/header.cshtml b/YLErpWeb/Views/SwapTrade2/header.cshtml index 333c8915..54a70d94 100644 --- a/YLErpWeb/Views/SwapTrade2/header.cshtml +++ b/YLErpWeb/Views/SwapTrade2/header.cshtml @@ -157,7 +157,7 @@ { @MyControls.Btn("收益结算", string.Format("unWindLongShortSwap('{0}')", tradeModel.EncryptId)) } - @if (CurUser.交易管理_交易续做) + @if (CurUser.交易管理_交易续作) { @MyControls.Btn("续作", string.Format("renewTrade('{0}')", tradeModel.EncryptId)) }