Merge branch 'develop' into dev

fix:Display_notify
2026-01-16 10:53:24 +07:00 · 2026-01-16 10:52:27 +07:00
1 changed files with 5 additions and 2 deletions
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@ -385,7 +385,7 @@ async function getCheck() {
  }

  showLoader()
-  const isSeminar = endTimeAfternoon.value === '14:30' ? 'Y' : 'N'
+  const isSeminar = model.value === 'ไปประชุม / อบรม / สัมมนา' ? 'Y' : 'N'

  await http
    .get(config.API.checkoutCheck + `/${isSeminar}`)
@ -401,7 +401,10 @@ async function getCheck() {
          new Intl.DateTimeFormat('en-US', options).format(
            new Date(res.data.result.serverTime)
          ) ?? ''
-        const endTimeAfternoonVal = endTimeAfternoon.value ?? ''
+        const endTimeAfternoonVal =
+          new Intl.DateTimeFormat('en-US', options).format(
+            new Date(res.data.result.endTime)
+          ) ?? ''

        // dialog ยืนยันการลงเวลาออกงาน
        dialogConfirm(
Author	SHA1	Message	Date
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	a7bfc21a12	Merge branch 'develop' into dev All checks were successful Build & Deploy on Dev / build (push) Successful in 2m14s Details	2026-01-16 10:53:24 +07:00
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	159f0803f2	fix:Display_notify	2026-01-16 10:52:27 +07:00