diff --git a/app/oa/view/approve/add_qingjia.html b/app/oa/view/approve/add_qingjia.html index e906fbd..b22f14d 100644 --- a/app/oa/view/approve/add_qingjia.html +++ b/app/oa/view/approve/add_qingjia.html @@ -151,16 +151,13 @@ function calculateWorkHours() { const hour = date.getHours(); if (!isWeekend(dayOfWeek)) { - if (dayOfWeek === startDay && hour < START_HOUR) { - continue; - } else if (dayOfWeek === endDay && hour >= END_HOUR) { - break; - } else if (hour >= START_HOUR && hour < END_HOUR) { - if (hour < START_BREAK_HOUR || hour >= END_BREAK_HOUR) { - totalHours += 1; - } - } - } + if (hour >= START_HOUR && hour < END_HOUR) { + if (hour < START_BREAK_HOUR || hour >= END_BREAK_HOUR) { + console.log(totalHours); + totalHours += 1; + } + } + } } return totalHours; } diff --git a/app/oa/view/approve/add_waichu.html b/app/oa/view/approve/add_waichu.html index 5169b12..b5d7dc4 100644 --- a/app/oa/view/approve/add_waichu.html +++ b/app/oa/view/approve/add_waichu.html @@ -126,16 +126,13 @@ function calculateWorkHours() { const hour = date.getHours(); if (!isWeekend(dayOfWeek)) { - if (dayOfWeek === startDay && hour < START_HOUR) { - continue; - } else if (dayOfWeek === endDay && hour >= END_HOUR) { - break; - } else if (hour >= START_HOUR && hour < END_HOUR) { - if (hour < START_BREAK_HOUR || hour >= END_BREAK_HOUR) { - totalHours += 1; - } - } - } + if (hour >= START_HOUR && hour < END_HOUR) { + if (hour < START_BREAK_HOUR || hour >= END_BREAK_HOUR) { + console.log(totalHours); + totalHours += 1; + } + } + } } return totalHours; } diff --git a/public/index.php b/public/index.php index fb17c0a..f93d4b3 100644 --- a/public/index.php +++ b/public/index.php @@ -18,7 +18,7 @@ require __DIR__ . '/../vendor/autoload.php'; define('CMS_VERSION','4.50.31'); // 定义Layui版本号 -define('LAYUI_VERSION','2.8.6'); +define('LAYUI_VERSION','2.8.8'); // 定义项目目录 define('CMS_ROOT', __DIR__ . '/../');