mkm/dev_oa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化：请假流程的时长计算。

Browse Source
This commit is contained in:
HDM58\hdm58 2023-06-21 11:22:07 +08:00
parent a4d7bd0f80
commit 8de6a1ee68
3 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/oa/view/approve/add_qingjia.html
View File

@ -151,16 +151,13 @@ function calculateWorkHours() {
const hour = date.getHours(); const hour = date.getHours();
if (!isWeekend(dayOfWeek)) { if (!isWeekend(dayOfWeek)) {
if (dayOfWeek === startDay && hour < START_HOUR) { if (hour >= START_HOUR && hour < END_HOUR) {
continue; if (hour < START_BREAK_HOUR || hour >= END_BREAK_HOUR) {
} else if (dayOfWeek === endDay && hour >= END_HOUR) { console.log(totalHours);
break; totalHours += 1;
} else if (hour >= START_HOUR && hour < END_HOUR) { }
if (hour < START_BREAK_HOUR || hour >= END_BREAK_HOUR) { }
totalHours += 1; }
}
}
}
} }
return totalHours; return totalHours;
} }

17
app/oa/view/approve/add_waichu.html
View File

@ -126,16 +126,13 @@ function calculateWorkHours() {
const hour = date.getHours(); const hour = date.getHours();
if (!isWeekend(dayOfWeek)) { if (!isWeekend(dayOfWeek)) {
if (dayOfWeek === startDay && hour < START_HOUR) { if (hour >= START_HOUR && hour < END_HOUR) {
continue; if (hour < START_BREAK_HOUR || hour >= END_BREAK_HOUR) {
} else if (dayOfWeek === endDay && hour >= END_HOUR) { console.log(totalHours);
break; totalHours += 1;
} else if (hour >= START_HOUR && hour < END_HOUR) { }
if (hour < START_BREAK_HOUR || hour >= END_BREAK_HOUR) { }
totalHours += 1; }
}
}
}
} }
return totalHours; return totalHours;
} }

2
public/index.php
View File

@ -18,7 +18,7 @@ require __DIR__ . '/../vendor/autoload.php';
define('CMS_VERSION','4.50.31'); define('CMS_VERSION','4.50.31');
// 定义Layui版本号 // 定义Layui版本号
define('LAYUI_VERSION','2.8.6'); define('LAYUI_VERSION','2.8.8');
// 定义项目目录 // 定义项目目录
define('CMS_ROOT', __DIR__ . '/../'); define('CMS_ROOT', __DIR__ . '/../');