|
|
@@ -635,6 +635,9 @@
|
|
|
<span v-if="scope.row.corpTime">{{scope.row.corpTime.startTime + '-' + scope.row.corpTime.endTime + '，' + scope.row.corpTime.workHours + 'h'}}</span>
|
|
|
<span v-else>暂无考勤记录</span>
|
|
|
</template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column fixed="right" label="已填工时" width="100">
|
|
|
+
|
|
|
</el-table-column>
|
|
|
<el-table-column fixed="right" prop="he" label="合计(h)" width="120">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -4267,7 +4270,7 @@
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
- getWeeklyCardTime(){
|
|
|
+ getWeeklyCardTime(){ //按周填报获取考勤信息
|
|
|
let dateStr = []
|
|
|
for(let i in this.zhoData){
|
|
|
dateStr.push(this.zhoData[i].zhoDataTime)
|
|
|
@@ -4297,7 +4300,6 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- console.log('can can need',this.zhoData);
|
|
|
}else{
|
|
|
this.$message({
|
|
|
message: res.msg,
|
|
|
@@ -4311,6 +4313,48 @@
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
+ getWeeklyFilledTime(){ //按周填报获取已填工时
|
|
|
+ let dateStr = []
|
|
|
+ for(let i in this.zhoData){
|
|
|
+ dateStr.push(this.zhoData[i].zhoDataTime)
|
|
|
+ }
|
|
|
+ this.http.post('/report/getWeeklyWorkTime',{
|
|
|
+ dateStr: JSON.stringify(dateStr)
|
|
|
+ },res => {
|
|
|
+ if(res.code == 'ok'){
|
|
|
+ // for(let i in res.data){
|
|
|
+ // let datei = '';
|
|
|
+ // if (this.user.timeType.showDdCardtime == 1) {
|
|
|
+ // datei = res.data[i].workDate.split('-');
|
|
|
+ // } else if (this.user.timeType.showCorpwxCardtime == 1) {
|
|
|
+ // datei = res.data[i].createDate.split('-');
|
|
|
+ // }
|
|
|
+ // for(let m in this.zhoData){
|
|
|
+ // let datem = new Date(this.zhoData[m].zhoDataTime)
|
|
|
+ // if(datei[0] == datem.getFullYear() && datei[1] == (datem.getMonth() + 1) && datei[2] == datem.getDate()){
|
|
|
+ // let item = {
|
|
|
+ // startTime: res.data[i].startTime,
|
|
|
+ // endTime: res.data[i].endTime,
|
|
|
+ // workHours: res.data[i].workHours
|
|
|
+ // }
|
|
|
+ // this.$set(this.zhoData[m],'corpTime',item)
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ console.log('can can need',this.zhoData);
|
|
|
+ }else{
|
|
|
+ this.$message({
|
|
|
+ message: res.msg,
|
|
|
+ type: 'error'
|
|
|
+ })
|
|
|
+ }
|
|
|
+ },err => {
|
|
|
+ this.$message({
|
|
|
+ message: err,
|
|
|
+ type: 'error'
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
selListqx(){
|
|
|
this.diasZho = false
|
|
|
this.selProjectList = []
|
|
|
@@ -4418,6 +4462,7 @@
|
|
|
}
|
|
|
if(this.zhoData.length && (this.user.timeType.showDdCardtime == 1 || this.user.timeType.showCorpwxCardtime == 1)){
|
|
|
this.getWeeklyCardTime()
|
|
|
+ // this.getWeeklyFilledTime()
|
|
|
}
|
|
|
},
|
|
|
zhoZhi(res, i) {
|
ggooalice