2022.4.13新增出差管理

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,19 +1,19 @@
 var path = require('path')
 
 //  var ip = '127.0.0.1'
-// var ip = '192.168.2.36'
+var ip = '192.168.2.20'
 // var ip = '47.100.37.243' 
 
-var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+// 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
-        }
-    } 
-}
+// 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

@@ -154,11 +154,6 @@ router.beforeEach((to, from, next) => {
                     console.log("user",user)
                     console.log(filterRouter)
                     var arr = []
-                    // for(var p in filterRouter){
-                    //     if(filterRouter[p].name == "出差管理"){
-                    //         arr.push(filterRouter[p])
-                    //     }
-                    // }
                     for(var i in user.moduleList) {
                         for(var s in filterRouter) {
                             if(user.moduleList[i].children.length > 0) {

fhKeeper/formulahousekeeper/timesheet/src/permissions.js

@@ -51,6 +51,13 @@ const StringUtil = {
         leaveProcess : false, // 请假流程设置 // 
         leaveAnnual : false, // 年假管理 //
 
+        // 出差模块
+        awayOfficeFil : false, // 出差填报 // 
+        awayOfficeAudit : false, // 出差审核 //
+        awayOfficeAll : false, // 查看全部出差 //
+        awayOfficeStatistical : false, // 出差统计 //
+        awayOfficeProcess : false, // 出差流程设置 // 
+
         // 费用报销
         costFil : false, // 费用填报 //
         costAudit : false, // 费用审核 //
@@ -107,6 +114,11 @@ const StringUtil = {
         arr[i] == '查看全部报销单' ? obj.costAll = true : ''
         arr[i] == '审核全员日报' ? obj.projectReportReview = true : ''
         arr[i] == '设置财务审核人' ? obj.setFinanceAuditor = true : ''
+        arr[i] == '出差填报' ? obj.awayOfficeFil = true : ''
+        arr[i] == '出差审核' ? obj.awayOfficeAudit = true : ''
+        arr[i] == '查看全部出差' ? obj.awayOfficeAll = true : ''
+        arr[i] == '出差统计' ? obj.awayOfficeStatistical = true : ''
+        arr[i] == '出差流程设置' ? obj.awayOfficeProcess = true : ''
     }
 
     return obj

fhKeeper/formulahousekeeper/timesheet/src/routes.js

@@ -66,7 +66,7 @@ import leave from './views/leave/list';
 import customData from './views/project/custom_data';
 
 // 出差
-// import awayOffice from './views/awayOffice/awayOffice';
+import awayOffice from './views/awayOffice/awayOffice';
 
 // 研究中心
 // import research from './views/research/list';
@@ -268,16 +268,16 @@ export const allRouters = [//组织架构
             { path: '/leave', component: leave, name: '请假管理' }
         ]
     },
-    // {
-    //     path: '/',
-    //     component: Home,
-    //     name: '出差管理',
-    //     iconCls: 'iconfont firerock-iconwj-qjd',
-    //     leaf: true,
-    //     children: [
-    //         { path: '/awayOffice', component: awayOffice, name: '出差管理' }
-    //     ]
-    // }, 
+    {
+        path: '/',
+        component: Home,
+        name: '出差管理',
+        iconCls: 'iconfont firerock-iconwj-qjd',
+        leaf: true,
+        children: [
+            { path: '/awayOffice', component: awayOffice, name: '出差管理' }
+        ]
+    }, 
     {
         path: '/',
         component: Home,

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

@@ -100,6 +100,7 @@
                     res => {
                     this.listLoading = false;
                     if (res.code == "ok") {
+                        console.log("项目列表",this.desktopList);
                         this.desktopList = res.data;
                     } else {
                         this.$message({

fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -821,7 +821,7 @@ export default {
             },
 
     getSettings() {
-                this.http.post('/audit-workflow-setting/get',{deptId: this.depData.id},
+                this.http.post('/audit-workflow-setting/get',{deptId: this.depData.id,type: 1},
                     res => {
                         this.listLoading = false;
                         if (res.code == "ok") {
@@ -896,7 +896,7 @@ export default {
             },
     editNodeDialog(index, item) {
                 //检查是否可编辑
-                this.http.post('/audit-workflow-setting/checkNodeInUse',{auditDeptId: item.auditDeptId, deptId: this.depData.id},
+                this.http.post('/audit-workflow-setting/checkNodeInUse',{auditDeptId: item.auditDeptId, deptId: this.depData.id,type: 1},
                     res => {
                         this.listLoading = false;
                         if (res.code == "ok") {
@@ -947,7 +947,7 @@ export default {
                 this.dataArray.splice(this.sindex, 1);
             },
     submitInsert() {
-                this.http.post('/audit-workflow-setting/add',{json:JSON.stringify(this.dataArray), deptId: this.depData.id},
+                this.http.post('/audit-workflow-setting/add',{json:JSON.stringify(this.dataArray), deptId: this.depData.id, type:1},
                             res => {
                                 this.listLoading = false;
                                 if (res.code == "ok") {

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1594,6 +1594,7 @@
                 },
                 res => {
                     if (res.code == "ok") {
+                        console.log("维度",res.data);
                         this.yonghuUser = res.data
                     } 
                 },
@@ -2295,6 +2296,7 @@
                 },
                 res => {
                     if (res.code == "ok") {
+                        console.log("维度数据",res.data);
                         this.workForm.domains[index].wuduList = res.data
                         // this.workForm = this.workForm
                         this.$forceUpdate()
@@ -3073,7 +3075,7 @@
                     this.listLoading = false;
                     if (res.code == "ok") {
                         this.projectList = res.data;
-                        // console.log("项目列表",this.projectList);
+                        console.log("项目列表",this.projectList);
                     } else {
                         this.$message({
                             message: res.msg,