|
|
@@ -2017,7 +2017,6 @@
|
|
|
console.log('进一')
|
|
|
for(let m in domains[i].worktimeList){
|
|
|
if(domains[i].worktimeList[m].startTime && domains[i].worktimeList[m].endTime){
|
|
|
- // hours += this.getHour(domains[i].worktimeList[m].startTime, domains[i].worktimeList[m].endTime)
|
|
|
let selectionTime = this.getHour(domains[i].worktimeList[m].startTime, domains[i].worktimeList[m].endTime)
|
|
|
let subtractedData = 0
|
|
|
console.log(selectionTime)
|
|
|
@@ -2034,7 +2033,6 @@
|
|
|
}
|
|
|
}else{
|
|
|
if(this.user.timeType.type == 2){
|
|
|
- console.log('进2')
|
|
|
if(domains[i].startTime && domains[i].endTime){
|
|
|
// let selectionTime = this.getHourMinutes(domains[i].startTime, domains[i].endTime)
|
|
|
let selectionTime = this.getHour(domains[i].startTime, domains[i].endTime)
|
|
|
@@ -2050,7 +2048,6 @@
|
|
|
// hours += this.getHour(domains[i].startTime, domains[i].endTime)
|
|
|
}
|
|
|
}else{
|
|
|
- console.log('进3')
|
|
|
hours += domains[i].workingTime ? parseFloat(domains[i].workingTime) : 0
|
|
|
}
|
|
|
}
|
|
|
@@ -6050,8 +6047,13 @@
|
|
|
this.isDraft = isDraft;
|
|
|
this.$refs.workForm.validate(valid => {
|
|
|
if (valid) {
|
|
|
-
|
|
|
- if(this.totalReportHours < this.user.timeType.allday){
|
|
|
+ var timesHours = 0
|
|
|
+ if(this.reportTimeType.multiWorktime == 1) {
|
|
|
+ timesHours = this.totalReportHours
|
|
|
+ } else {
|
|
|
+ timesHours = jsTime
|
|
|
+ }
|
|
|
+ if(timesHours < this.user.timeType.allday){
|
|
|
this.$confirm('当日工时不足' + this.user.timeType.allday.toFixed(1) + '小时，是否确定提交?', '提示', {
|
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消',
|
Lijy