页面修改

Edu.Module.Course/StudentBillModule.cs

@@ -554,8 +554,7 @@ namespace Edu.Module.Course
         /// <summary>
         /// 添加拷贝审核节点
         /// </summary>
-        /// <param name="backModel">员工id</param>
-
+        /// <param name="backModel">退课单据实体</param>
         /// <param name="modelNext">审核关联</param>
         private bool InsertAuditRelevanceNext(RB_Student_BackClass backModel, RB_Student_BackRelevance_ViewModel modelNext)
         {
@@ -612,6 +611,7 @@ namespace Edu.Module.Course
                             }
                         }
                     }
+                    //以前的存入的数据
                     //empList = Common.ConvertHelper.StringToList(auditRelevance.ToAuditId);
                     InsertBatcheAuditRecord(empList, backModel.BackId, auditRelevance);
                 }
@@ -675,8 +675,9 @@ namespace Edu.Module.Course
 
             obj.Add(new
             {
-                NodeName = "发起人",
-                AduitStatus = 2,
+                NodeName = "制单人",
+                AduitStatus = "发起",
+                
                 SubList = new List<object>()
                 {
                    new{
@@ -696,7 +697,8 @@ namespace Edu.Module.Course
                     {
                         AduitName = UserReidsCache.GetUserLoginInfo(qitem.AuditEmId)?.AccountName ?? "",
                         Description = qitem.Description,
-                        CreateTime = Common.ConvertHelper.FormatTime(qitem.UpdateTime)
+                        CreateTime = Common.ConvertHelper.FormatTime(qitem.UpdateTime),
+                        AuditStatus = qitem.AuditStatus.ToName()
                     })
                 }); 
             }

Edu.Module.System/MenuModule.cs

@@ -184,7 +184,8 @@ namespace Edu.Module.System
                             MenuUrl = fItem.MenuUrl,
                             MenuIcon = fItem.MenuIcon,
                             ParentId = 0,
-                            SubList = new List<MenuTree_ViewModel>()
+                            MenuType = 1,
+                            SubList = new List<MenuTree_ViewModel>(),
                         };
                         //二级菜单
                         var secondLevelList = list.Where(qitem => qitem.MenuLevel == 2 && qitem.ParentId == fItem.MenuId).ToList();
@@ -199,6 +200,7 @@ namespace Edu.Module.System
                                     MenuUrl = sItem.MenuUrl,
                                     MenuIcon = sItem.MenuIcon,
                                     ParentId = fItem.MenuId,
+                                    MenuType = 1,
                                     SubList = new List<MenuTree_ViewModel>()
                                 };
                                 //三级菜单
@@ -214,6 +216,7 @@ namespace Edu.Module.System
                                             MenuName = tItem.MenuName,
                                             MenuUrl = tItem.MenuUrl,
                                             MenuIcon = tItem.MenuIcon,
+                                            MenuType = 1,
                                             SubList = new List<MenuTree_ViewModel>()
                                         });
                                     }

Edu.Module.System/RoleModule.cs

@@ -221,26 +221,41 @@ namespace Edu.Module.System
             {
                 foreach (var item in menuList)
                 {
-                    item.MenuType = 1;
                     item.IsChecked = rolePermissionList?.Where(qitem => qitem.Menu_Id == item.MenuId)?.Count() > 0;          
-                    //item.FunctionSubList = actionList?.Where(qitem => qitem.MenuId == item.MenuId)?.ToList() ?? new List<RB_Menu_Function_ViewModel>();
                     if (item.SubList != null && item.SubList.Count > 0)
                     {
                         foreach (var subItem in item.SubList)
                         {
-                            subItem.MenuType = 1;
                             subItem.IsChecked = rolePermissionList?.Where(qitem => qitem.Menu_Id == subItem.MenuId)?.Count() > 0;
+                            var secondActionList = actionList?.Where(qitem => qitem.MenuId == subItem.MenuId)?.ToList() ?? new List<RB_Menu_Function_ViewModel>();
+                            if (secondActionList != null && secondActionList.Count > 0)
+                            {
+                                foreach (var aItem in secondActionList)
+                                {
+                                    var actionModel = new MenuTree_ViewModel()
+                                    {
+                                        MenuName = aItem?.FunctionName + "【F】",
+                                        ParentId = item.MenuId,
+                                        MenuIcon = "",
+                                        MenuType = 2,
+                                        MenuUrl = "",
+                                        MenuId = aItem.Id,
+                                        SubList = new List<MenuTree_ViewModel>()
+                                    };
+                                    actionModel.IsChecked = roleFunctionList?.Where(qitem => qitem.Action_Id == aItem.Id)?.Count() > 0;
+                                    subItem.SubList.Add(actionModel);
+                                }
+                            }
                             if (subItem.SubList != null && subItem.SubList.Count > 0)
                             {
-                                foreach (var childItem in subItem.SubList)
+                                foreach (var childItem in subItem.SubList.Where(qitem=>qitem.MenuType==1))
                                 {
-                                    childItem.MenuType = 1;
                                     childItem.IsChecked = rolePermissionList?.Where(qitem => qitem.Menu_Id == childItem.MenuId)?.Count() > 0;
                                     childItem.SubList = new List<MenuTree_ViewModel>();
                                     var subActionList = actionList?.Where(qitem => qitem.MenuId == childItem.MenuId)?.ToList() ?? new List<RB_Menu_Function_ViewModel>();
                                     if (subActionList != null && subActionList.Count > 0)
                                     {
-                                        foreach (var actionItem in actionList)
+                                        foreach (var actionItem in subActionList)
                                         {
                                             var actionModel = new MenuTree_ViewModel()
                                             {