Commit graph

7492 commits

Author SHA1 Message Date
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
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
000f6d183c fix: title by issue #2156 ปรับระดับชั้นงาน-ย้ายลูกจ้าง (ข้อความเมนูไม่เหมือนกัน) 2026-01-28 16:11:56 +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
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
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a320fea116 fix(request-edit):send_citizenId
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m53s
2026-01-22 10:27:32 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
6f40ee330c fix:function_calculateAge 2026-01-21 16:16:00 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
8867829211 fix:formatDate
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m56s
2026-01-21 13:14:33 +07:00
99bba05167 add command code 20 (คำสั่งย้ายแยกจากแต่งตั้งย้าย)
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m47s
2026-01-21 11:08:26 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
89f832bbeb fix(registry):checkPermissionList_EMP
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m45s
2026-01-20 15:22:32 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
d13a2231ba fix(resign):organizationPositionOld
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m31s
2026-01-20 14:46:01 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a8a832238d fix(registry-officer):checkPermissionList
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m51s
2026-01-20 13:59:31 +07:00
42a450ef43 Merge branch 'develop' of github.com:Frappet/hrms-mgt into develop
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m0s
* 'develop' of github.com:Frappet/hrms-mgt:
  fix:send_Date
2026-01-20 11:49:28 +07:00
dd4f7bd936 fix leave: case request deputy 2026-01-20 11:48:54 +07:00
5fcaf09529
Merge pull request #1535 from Frappet/fix/dialogtransfer
fix:send_Date
2026-01-20 11:48:05 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
82eac261f4 fix:send_Date 2026-01-20 10:29:25 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e61f97faaf fix(leave):display_dateLeave
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m10s
2026-01-19 11:13:29 +07:00
b591883db2
Merge pull request #1534 from Frappet/feat/registry
All checks were successful
Build & Deploy on Dev / build (push) Successful in 10m2s
feat
2026-01-19 10:29:08 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
99cba9f3bd fix:API 2026-01-16 16:00:24 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
6ebe2c4d4d fix: body add-approver
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m9s
2026-01-16 10:35:37 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
6aa8a61b40 feat 2026-01-16 09:49:12 +07:00
1dc9693348 disabled sort time special
All checks were successful
Build & Deploy on Dev / build (push) Successful in 4m9s
2026-01-13 18:45:32 +07:00
a0c023fc0f 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 3m34s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt:
  search tree report by dna
  rollback search search report
2026-01-11 21:44:35 +07:00
d9687c2d09 Merge branch 'develop' into dev
* develop:
  fix:reset rows
2026-01-11 21:44:30 +07:00
kittapath
c46aa520d4 search tree report by dna
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m34s
2026-01-11 15:14:48 +07:00
kittapath
0c768e3626 rollback search search report
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m6s
2026-01-09 19:25:37 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
9e0ee02fa3 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 2m52s
2026-01-09 12:02:54 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
3ef16ef7ec Merge branch 'develop' into dev 2026-01-09 12:02:47 +07:00