diff --git a/src/views/ebiz/attendance/Monthly.vue b/src/views/ebiz/attendance/Monthly.vue index cce747de4..2880d0d55 100644 --- a/src/views/ebiz/attendance/Monthly.vue +++ b/src/views/ebiz/attendance/Monthly.vue @@ -164,10 +164,17 @@ export default { this.text = '正常' } if (this.flagGo == '1') { + if(this.goWorkTime!==null){ + this.goWorkTime = this.goWorkTime.split(' ')[1] + } + if(this.offWorkTime!==null){ + this.offWorkTime = this.offWorkTime.split(' ')[1] + } this.text1 = '缺勤' } if (this.flagGo == '2') { - this.goWorkTime = this.goWorkTime.split(' ')[1] + console.log(this.goWorkTime) + // this.goWorkTime = this.goWorkTime.split(' ')[1] this.text1 = '迟到' } if (this.flagOff == '3') { @@ -224,7 +231,7 @@ export default { this.text1 = '缺勤' } if (this.flagGo == '2') { - this.offWorkTime = this.offWorkTime.split(' ')[1] + this.goWorkTime = this.goWorkTime.split(' ')[1] this.text1 = '迟到' } if (this.flagOff == '3') { diff --git a/src/views/ebiz/performance/AttendanceInfo.vue b/src/views/ebiz/performance/AttendanceInfo.vue index a828b1d8d..551407106 100644 --- a/src/views/ebiz/performance/AttendanceInfo.vue +++ b/src/views/ebiz/performance/AttendanceInfo.vue @@ -162,8 +162,8 @@ export default { parmas.code = this.list[i].code, parmas.date = this.dateTime parmas.mask = '1' - parmas.agentCode=this.data1[i].managerCode - parmas.Name = this.data1[i].name + parmas.agentCode=this.list[i].code + parmas.Name = this.list[i].name parmas.buName=this.unitName localStorage.parmas2 = JSON.stringify(parmas) this.$jump({ @@ -208,9 +208,6 @@ export default { console.log(res) if (res.result == 0) { this.list = res.content.list - for(let i=0;i