Commit graph

7965 commits

Author SHA1 Message Date
e1969db62e fix: active act org level 0 only 2026-02-02 17:20:57 +07:00
67066797fd Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m42s
* develop:
  add: บันทึกรักษาการในตำแหน่ง (owner only)
2026-02-02 17:06:03 +07:00
81fcb1253f add: บันทึกรักษาการในตำแหน่ง (owner only) 2026-02-02 17:05:47 +07:00
57a28a2b8d Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 5m55s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt:
  fix:test build
2026-01-31 12:56:56 +07:00
8d4a9d8c72 Merge branch 'develop' into dev
* develop:
  fix: convertCommandCodeName columns commandCode
  test
  fix:default profileAvatar
  fix:show btn delete avatar active
  fix: approveCheck
  fix: statusCheck PENDING
  fix(leave):approveCheck logic for commander approval status
2026-01-31 12:56:50 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
72f3cdcdc0 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m48s
2026-01-30 18:08:18 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
28fa6fbaf7 fix: convertCommandCodeName columns commandCode 2026-01-30 17:55:09 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
6676113c2c Merge branch 'develop' into dev
Some checks failed
Build & Deploy on Dev / build (push) Failing after 10s
# Conflicts:
#	src/modules/04_registryPerson/views/listView.vue
2026-01-30 17:41:41 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
444a150fd2 test 2026-01-30 17:41:09 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e80e4d6dfd fix:test build
Some checks failed
Build & Deploy on Dev / build (push) Failing after 1m47s
2026-01-30 17:35:23 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
0252d7d7f2 Merge branch 'develop' into dev
Some checks failed
Build & Deploy on Dev / build (push) Failing after 2m14s
2026-01-30 15:53:19 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
af588e0e54 fix:default profileAvatar 2026-01-30 15:52:46 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
0ca65c44a2 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m6s
2026-01-30 14:52:27 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
2fc2625699 fix:show btn delete avatar active 2026-01-30 14:51:39 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a0628caf74 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m21s
2026-01-30 10:26:51 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
802e63da13 fix: approveCheck 2026-01-30 10:25:43 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
00304b3bc8 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m53s
2026-01-30 09:41:43 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
6280ab2e17 fix: statusCheck PENDING 2026-01-30 09:41:24 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
aff177e2f1 fix(leave):approveCheck logic for commander approval status 2026-01-30 09:29:31 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
3e568267ba fix:btn position 2026-01-29 14:58:29 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
ffce0164b4 fix: img 2026-01-29 14:56:51 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
c6c1fe93c1 fix:interface 2026-01-29 14:07:54 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
9c9fb561b5 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m58s
2026-01-29 12:03:27 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b82b489a8b fix: disabled organization view 2026-01-29 12:03:08 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
aa75c8c882 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 6m46s
2026-01-29 10:39:10 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a0a9c7e2e6 fix(indicator-plan):fix nodeDnaId 2026-01-29 10:25:25 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a79a5858b6 feat:page issues 2026-01-28 18:25:18 +07:00
000f6d183c fix: title by issue #2156 ปรับระดับชั้นงาน-ย้ายลูกจ้าง (ข้อความเมนูไม่เหมือนกัน) 2026-01-28 16:11:56 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
8b303f7b0d fix:org name 2026-01-28 13:23:30 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
f770fb6f0f fix:path upload 2026-01-28 13:18:29 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
56ee35ba8b Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m49s
2026-01-28 11:46:56 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
4a0d38104c fix(timestamp):clear_rowData 2026-01-28 11:46:24 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a6dc8dd00f fix 2026-01-28 11:41:28 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
20f9c73b91 fix: max-file-size="5000000" 2026-01-28 11:32:19 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
d558f826f6 feat:issue 2026-01-28 11:25:50 +07:00
8683cda9d5 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m54s
* develop:
  ปิดปุ่มแก้ไข และเพิ่มของประวัติตำแหน่ง เงินเดือน แก้ได้แค่ owner เท่านั้น
2026-01-27 17:07:22 +07:00
ccff49ba38 ปิดปุ่มแก้ไข และเพิ่มของประวัติตำแหน่ง เงินเดือน แก้ได้แค่ owner เท่านั้น 2026-01-27 17:06:24 +07:00
d9fbf4711c Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt:
2026-01-27 17:05:40 +07:00
cfc6eb781a Merge branch 'develop' into dev
* develop:
  fix(leave):dislplay_columns_leaveTotal
2026-01-27 17:05:30 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
71c8c1bbc3 Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m26s
2026-01-27 09:41:52 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
9f670bbef5 Merge branch 'develop' into dev 2026-01-27 09:41:45 +07:00
NiceY2T
0078dff1af
Merge pull request #1537 from Frappet:fix/leave
fix(leave):dislplay_columns_leaveTotal
2026-01-27 09:41:21 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
bd80a0fb4f fix(leave):dislplay_columns_leaveTotal 2026-01-27 09:39:28 +07:00
7557956e83 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m51s
* develop:
  disabled public org
2026-01-23 09:50:31 +07:00
894462e2b7 disabled public org 2026-01-23 09:50:19 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
5a86f78061 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m7s
# Conflicts:
#	src/stores/mixin.ts
2026-01-22 16:51:22 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
f44076670f fix(calculateDurationYmd):moment(endDate).startOf("day").add(1, "day"); 2026-01-22 16:47:52 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
15fcfe8054 fix(calculateDurationYmd):moment(endDate).startOf("day").add(1, "days");
Some checks failed
Build & Deploy on Dev / build (push) Has been cancelled
2026-01-22 16:45:43 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
8e1e5044c7 fix(development-scholarship):display_guarantorPosition
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m31s
2026-01-22 14:15:43 +07:00
b7c33cf25c
Merge pull request #1536 from Frappet/fix/calculateAge
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m41s
fix:function_calculateAge
2026-01-22 10:38:24 +07:00