From 8de6a1ee687c986240e1807e404ef4187842a19b Mon Sep 17 00:00:00 2001
From: "HDM58\\hdm58" <hdm58@qq.com>
Date: Wed, 21 Jun 2023 11:22:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E8=AF=B7=E5=81=87?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=9A=84=E6=97=B6=E9=95=BF=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/oa/view/approve/add_qingjia.html | 17 +++++++----------
 app/oa/view/approve/add_waichu.html  | 17 +++++++----------
 public/index.php                     |  2 +-
 3 files changed, 15 insertions(+), 21 deletions(-)

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__ . '/../');