From d5b43e3769ae6573c585a24ef867e0bfcaf2b9e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=94=A6=E9=BA=9F=20=E7=8E=8B?= Date: Thu, 16 Jul 2026 17:17:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E6=8F=90=E7=A4=BA=E4=B8=8D=E9=98=BB?= =?UTF-8?q?=E5=A1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YLErpDAL/Modules/SystemModule/ApprovalProcessService.cs | 5 ----- YLErpWeb/wwwroot/Scripts/app/system/Approvalprocess.js | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/YLErpDAL/Modules/SystemModule/ApprovalProcessService.cs b/YLErpDAL/Modules/SystemModule/ApprovalProcessService.cs index 05bd4f0f..ae140dd0 100644 --- a/YLErpDAL/Modules/SystemModule/ApprovalProcessService.cs +++ b/YLErpDAL/Modules/SystemModule/ApprovalProcessService.cs @@ -172,11 +172,6 @@ namespace YLErp.Modules.SystemModule private void ChangeTradeProcess(List data, approvalprocess[] delList) { var trades = DbContext.trade.Where(x => x.ValidState == "Valid" && (x.TradeStatus == ConsTrade.审批中 || x.TradeStatus == ConsTrade.平仓待复核 || x.TradeStatus == ConsTrade.行权待复核 || x.TradeStatus == ConsTrade.互换待复核)).ToList(); - // 任何修改，只要存在审批中的交易，都提示 - if (trades != null && trades.Count > 0) - { - throw new ServiceException("审批页面存在未审批完的交易，不能修改审批流程！"); - } var noGroupData = data.Where(x => x.approvalGroupId == 0); var branch = data.Where(x => x.approvalGroupId != 0);//修改有分支 var groupId = UserBLL.GetApprovalProcessGroup(UserInfo.UserId); diff --git a/YLErpWeb/wwwroot/Scripts/app/system/Approvalprocess.js b/YLErpWeb/wwwroot/Scripts/app/system/Approvalprocess.js index 50dde0e8..cff6d111 100644 --- a/YLErpWeb/wwwroot/Scripts/app/system/Approvalprocess.js +++ b/YLErpWeb/wwwroot/Scripts/app/system/Approvalprocess.js @@ -669,7 +669,7 @@ var app = new Vue({ return; } if (thisObj.tradeItems != null && thisObj.tradeItems.length > 0) { - main.confirm("确认修改交易审批流程?", function () { + main.confirm("审批页面存在未审批完的交易，修改审批流程后这些交易需要重新审批，确认修改?", function () { main.post("/AccountOpeningProcess/AddProcess", { type: thisObj.tradeItems[0].Type, data: thisObj.tradeItems }, { async: false }).done( @@ -1391,7 +1391,7 @@ var app = new Vue({ } thisObj.stringifyAllTrigger(thisObj.closeItems); // 需求①：序列化触发条件 if (thisObj.closeItems != null && thisObj.closeItems.length > 0) { - main.confirm("确认修改交易了结审批流程?", function () { + main.confirm("审批页面存在未审批完的交易，修改审批流程后这些交易需要重新审批，确认修改?", function () { main.post("/AccountOpeningProcess/AddProcess", { type: "CloseProcess", data: thisObj.closeItems }, { async: false }).done(