再次提交

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -42,14 +42,14 @@ module.exports = {
         //   target: 'http://' + ip + ':10010',
         //   pathRewrite: {'^api': '/'}
         // }
-        '/api/permission': {    
-            target: 'http://'+ ip +':2022',
-            secure: true,
-            changeOrigin: true,
-            pathRewrite: {
-                '^/api': '/' 
-            }
-        },
+        // '/api/permission': {    
+        //     target: 'http://'+ ip +':2022',
+        //     secure: true,
+        //     changeOrigin: true,
+        //     pathRewrite: {
+        //         '^/api': '/' 
+        //     }
+        // },
 
         '/api': {    
             target: 'http://'+ ip +':10010',

fhKeeper/formulahousekeeper/timesheet/src/main.js

@@ -57,11 +57,11 @@ import 'nprogress/nprogress.css'
 
 var addRouFlag = false; 
 //角色权限对应关系
-var userModules = [{role:0, modules:["工时报告","专业审核","部门审核","自动计时","费用报销","待办任务", "项目管理", "请假管理"]},
-            {role:3, modules:["工时报告","工时成本统计","自定义数值统计","项目报表服务","费用报销","待办任务","项目管理","请假管理"]},
-            {role:4, modules:["财务核算成本", "费用报销", "待办任务","组织架构","请假管理"]},
-            {role:5, modules:["工时报告","自动计时","费用报销", "待办任务","项目管理","专业管理","请假管理"]},
-            {role:6, modules:["工时报告","工时成本统计","自定义数值统计","财务核算成本","项目报表服务","费用报销","待办任务","项目管理","请假管理"]},];
+var userModules = [{role:0, modules:["工时报告","专业审核","部门审核","自动计时","费用报销","待办任务", "项目管理", "请假管理", "审批流设置"]},
+            {role:3, modules:["工时报告","工时成本统计","自定义数值统计","项目报表服务","费用报销","待办任务","项目管理","请假管理", "审批流设置"]},
+            {role:4, modules:["财务核算成本", "费用报销", "待办任务","组织架构","请假管理", "审批流设置"]},
+            {role:5, modules:["工时报告","自动计时","费用报销", "待办任务","项目管理","专业管理","请假管理", "审批流设置"]},
+            {role:6, modules:["工时报告","工时成本统计","自定义数值统计","财务核算成本","项目报表服务","费用报销","待办任务","项目管理","请假管理", "审批流设置"]},];
 
 // var userModules = [{role:0, modules:["工时报告","专业审核","部门审核","自动计时","费用报销","待办任务", "项目管理", "请假管理","组织架构"]},
 //             {role:3, modules:["工时报告","工时成本统计","项目报表服务","费用报销","待办任务","项目管理","请假管理","组织架构"]},
@@ -149,21 +149,36 @@ router.beforeEach((to, from, next) => {
                     // }
 
                     // 更据当前登录的权限来显示模块
+                    console.log(user.moduleList)
+                    console.log(filterRouter)
                     var arr = []
                     for(var i in user.moduleList) {
-                        if(user.moduleList[i].isMenu) {
-                            for(var s in filterRouter) {
-                                if(filterRouter[s].name == '审批流设置') {
-                                    console.log(user.moduleList[i].name, '-----', filterRouter[s].name)
+                        for(var s in filterRouter) {
+                            if(user.moduleList[i].children.length > 0) {
+                                if(user.moduleList[i].name == filterRouter[s].name) {
+                                    console.log(user.moduleList[i].name)
+                                    var arrList = user.moduleList[i].children
+                                    var ddList = filterRouter[s].children
+                                    var list = []
+                                    for(var j in arrList) {
+                                        for(var d in ddList) {
+                                            if(arrList[j].name == ddList[d].name) {
+                                                list.push(ddList[d])
+                                            }
+                                        }
+                                    }
+                                    filterRouter[s].children = list
+                                    arr.push(filterRouter[s])
                                 }
+                            } else {
                                 if(user.moduleList[i].name == filterRouter[s].name) {
                                     arr.push(filterRouter[s])
                                 }
-                            } 
+                            }
+                            
                         } 
                     }
-                    console.log(arr, '来的数据', filterRouter)
-
+                    console.log(arr, '')
                     getRoutes = arr;
 
                     //同步企业微信考勤打卡的情况下，根据深圳赛元微电子的要求，屏蔽项目报告审核模块