Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -2,17 +2,17 @@ var path = require('path')
 
 //  var ip = '127.0.0.1'
 // var ip = '192.168.2.15'
-var ip = '192.168.2.39'
+// var ip = '192.168.2.39'
 
-// 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/http.js

@@ -87,7 +87,7 @@ export default {
                                 flgs = 0
                             }, 12000)
                         }
-
+                        exception(false)
                     } else {
                         exception(error)
                     }

fhKeeper/formulahousekeeper/timesheet/src/views/Login.vue

@@ -287,6 +287,7 @@
                         this.http.post(this.port.manage.login, this.ruleForm , res => {
                             this.logining = false;
                             if (res.code == "ok") {
+                                console.log('执行')
                                 if(res.data.moduleList.length == 0){
                                     this.$message({
                                         message: '请联系管理员为\u3000' + res.data.roleName + '\u3000分配权限',
@@ -308,12 +309,14 @@
                                     }
                                 }
                             } else {
+                                this.logining = false;
                                 this.$message({
                                     message: res.msg,
                                     type: 'error'
                                 });
                             }
                         }, error => {
+                            console.log('执行1')
                             this.logining = false;
                             this.$message({
                                 message: error,

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

@@ -1847,22 +1847,62 @@
                 }
                 this.jsTime = quanbu
                 let worktime = this.jsTime
+
+                // 自动计算加班时长
                 if(this.isBatch != 0){
                     worktime = this.jsTime / this.jsDay
                 }
                 if(this.user.timeType.fillOvertime && domain){
-                    for(let di in spl){
+                    let isover = false
+                    let alltime = 0
+                    let allover = 0     //此处alltime同上面的worktime
+                    for(let d in spl){
+                        if(spl[d].isOvertime){
+                            isover = true
+                            allover += spl[d].overtimeHours*1
+                        }
+                        alltime += spl[d].workingTime*1
+                    }
+                    if(domain.overtimeHours){
+                        allover = allover - domain.overtimeHours
+                    }
+                    if(worktime*1 > this.user.timeType.allday){
+                        if(isover){
+                            if(alltime > (allover + this.user.timeType.allday)){
+                                    this.$set(domain,'isOvertime',true)
+                                    this.$set(domain,'overtimeHours',worktime - this.user.timeType.allday - allover)
+                            }else{
+                                this.$set(domain,'isOvertime',false)
+                                this.$set(domain,'overtimeHours',null)
+                                if(alltime < (allover + this.user.timeType.allday)){
+                                    let overtime = allover + this.user.timeType.allday - alltime
+                                    for(let pi in spl){
+                                        if(spl[pi].overtimeHours){
+                                            if((overtime - spl[pi].overtimeHours*1) > 0){
+                                                overtime = overtime - spl[pi].overtimeHours*1
+                                                this.$set(spl[pi],'isOvertime',false)
+                                                this.$set(spl[pi],'overtimeHours',null)
+                                            }else if((overtime - spl[pi].overtimeHours*1) < 0){
+                                                this.$set(spl[pi],'overtimeHours',spl[pi].overtimeHours*1 - overtime)
+                                                break
+                                            }else{
+                                                this.$set(spl[pi],'isOvertime',false)
+                                                this.$set(spl[pi],'overtimeHours',null)
+                                                break
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }else{
+                            this.$set(domain,'isOvertime',true)
+                            this.$set(domain,'overtimeHours',worktime - this.user.timeType.allday)
+                        }
+                    }else{
+                        for(let di in spl){
                             this.$set(spl[di],'isOvertime',false)
                             this.$set(spl[di],'overtimeHours',null)
                         }
-                    if(worktime*1 > this.user.timeType.allday){
-                        this.$set(domain,'isOvertime',true)
-                        this.$set(domain,'overtimeHours',worktime - this.user.timeType.allday)
-                        // domain.overtimeHours = domain.workingTime - this.user.timeType.allday
-                        
-                    }else {
-                        this.$set(domain,'isOvertime',false)
-                        this.$set(domain,'overtimeHours',null)
                     }
                     
                 }