只提示不阻塞

YLErpDAL/Modules/SystemModule/ApprovalProcessService.cs

@@ -172,11 +172,6 @@ namespace YLErp.Modules.SystemModule
         private void ChangeTradeProcess(List<ApprovalProcessAddRequest> 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);

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(