Bladeren bron

商邀第五步默认显示文件上传按钮

Lyyyi 1 maand geleden
bovenliggende
commit
1e99182569
1 gewijzigde bestanden met toevoegingen van 22 en 7 verwijderingen
  1. 22 7
      OASystem/OASystem.Infrastructure/Repositories/Groups/ProcessOverviewRepository.cs

+ 22 - 7
OASystem/OASystem.Infrastructure/Repositories/Groups/ProcessOverviewRepository.cs

@@ -62,7 +62,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         Grp_ProcessNode.Create(2, "报批邀请函资料准备",oaNode2Tips, ProcessStatus.InProgress, false,false,false,currUserId),
                         Grp_ProcessNode.Create(3, "获得批件","提供完整的报批全套资源。",ProcessStatus.InProgress, false,false,false, currUserId ),
                         Grp_ProcessNode.Create(4, "对接公务",oaNode4Tips,ProcessStatus.InProgress, false,false,false, currUserId),
-                        Grp_ProcessNode.Create(5, "参与翻译对接","",ProcessStatus.InProgress, false,false,false, currUserId),
+                        Grp_ProcessNode.Create(5, "参与翻译对接","",ProcessStatus.InProgress, false,false,true, currUserId),
                         Grp_ProcessNode.Create(6, "商邀文案配合","",ProcessStatus.InProgress, false,false,false, currUserId),
                         Grp_ProcessNode.Create(7, "票据上传(相关票据)",oaNode7Tips,ProcessStatus.InProgress, false,false,true, currUserId),
                     }));
@@ -338,14 +338,29 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     {
                         var isLastNode = index == totalNodes - 1;
                         var isSecondLastNode = index == totalNodes - 2;
+                        var isFifthStep = index == 4; 
 
-                        /* 计算按钮状态
-                         * 1 所有流程节点最后一步骤显示上传按钮
-                         * 2 机票流程倒数第二步骤显示上传按钮
-                         * 3 费用结算流程第一步骤显示协助按钮
-                         */
+                        // 计算按钮状态
                         bool isEnaAssistBtn = p.ProcessType == GroupProcessType.FeeSettle && n.NodeOrder == 1;
-                        bool isEnaFileUpBtn = isLastNode || (p.ProcessType == GroupProcessType.AirTicket && isSecondLastNode);
+
+                        // 文件上传按钮启用规则
+                        bool isEnaFileUpBtn = false;
+
+                        // 规则1:商邀流程第5步启用上传按钮
+                        if (p.ProcessType == GroupProcessType.Invitation && isFifthStep)
+                        {
+                            isEnaFileUpBtn = true;
+                        }
+                        // 规则2:机票流程倒数第二步启用上传按钮
+                        else if (p.ProcessType == GroupProcessType.AirTicket && isSecondLastNode)
+                        {
+                            isEnaFileUpBtn = true;
+                        }
+                        // 规则3:默认流程节点最后一步启用上传按钮
+                        else if (isLastNode)
+                        {
+                            isEnaFileUpBtn = true;
+                        }
 
                         // 处理签证子节点
                         List<VisaProcessNode> visaSubNodes = new();