修改组织架构的成本填报

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -4,18 +4,19 @@ var path = require('path')
 // var ip = '192.168.2.36'
 
  
-// var ip = '47.100.37.243'
+var ip = '47.100.37.243'
 // var ip = '192.168.2.34'
 
-var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
-for (var i in ifaces) {
-    for (var j in ifaces[i]) {
-        var val = ifaces[i][j]
-        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
-            ip = val.address
-        }
-    }
-}
+// var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+
+// for (var i in ifaces) {
+//     for (var j in ifaces[i]) {
+//         var val = ifaces[i][j]
+//         if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+//             ip = val.address
+//         }
+//     }
+// }
 
 module.exports = {
   build: {

fhKeeper/formulahousekeeper/timesheet/src/main.js

@@ -57,6 +57,12 @@ var userModules = [{role:0, 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:["工时报告","工时成本统计","财务核算成本","项目报表服务","费用报销","待办任务","项目管理",,"组织架构","请假管理"]},];
 router.beforeEach((to, from, next) => {
     NProgress.start();
     if (to.path == '/register') {

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -374,7 +374,8 @@
                     name: [{ required: true, message: "请输入姓名", trigger: "blur" }],
                     // phone: [{ required: true, message: "请输入电话", trigger: "blur" }],
                     role: [{ required: true, message: "请选择角色", trigger: "blur" }],
-                    cost: [{ required: true, message: "请输入成本", trigger: "blur" }]
+                    cost: [{ required: true, message: "请输入成本", trigger: "blur" }],
+                    monthCost:[{ required: true, message: "请输入月成本", trigger: "blur" }]
                 },
 
                 dialogVisible1: false,