Commit graph

285 commits

Author SHA1 Message Date
Kittapath
885b5198a7 no message 2024-03-29 14:02:07 +07:00
Kittapath
dfa0fda87a Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-29 12:01:08 +07:00
Kittapath
621bbdb967 15 per รวม point 2024-03-29 12:00:41 +07:00
Bright
fbe018c211 no message 2024-03-29 11:27:56 +07:00
Bright
79f9c1637d no message 2024-03-29 11:12:45 +07:00
Kittapath
877207412a migrate 2024-03-29 10:34:52 +07:00
7a32ce6d81 Merge branch 'develop' into adiDev 2024-03-28 18:17:15 +07:00
f57510c23f backup 2024-03-28 18:15:40 +07:00
Bright
4f1d2f6c62 emp2-(04, 06, 08, 10, 12, 14, 16, 18, 19, 20, 22, 24) 2024-03-28 17:21:32 +07:00
Kittapath
7280da0b05 แสดงกลุ่มทั้งหมดในdashboard 2024-03-28 16:57:13 +07:00
Kittapath
acbc71c2e6 no message 2024-03-28 14:39:55 +07:00
Kittapath
1d2c817044 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-28 11:44:37 +07:00
Kittapath
1899969901 migrate db 2024-03-28 10:29:16 +07:00
09433a80bd fix report emp2-02 2024-03-28 10:26:34 +07:00
Kittapath
4ff04f0dc5 เพิ่มตวแปรnullค้นหา dashboard 2024-03-27 17:08:28 +07:00
Kittapath
fc90b1ff4a Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-27 16:41:13 +07:00
Kittapath
76f42d1a96 dashboard เงินเดือน 2024-03-27 16:39:45 +07:00
1a9b60dc7b Merge branch 'develop' into adiDev 2024-03-27 16:01:04 +07:00
7a6f594580 emp2-02 2024-03-27 16:00:02 +07:00
Bright
478cd7f083 gov-(04-05) กรองเกษียณและไม่เกษียณ 2024-03-27 15:30:41 +07:00
Kittapath
94d0412e21 แก้เปอรเซรนเงนพิเศษ 2024-03-27 12:11:09 +07:00
Kittapath
a6fb4c28f1 แก้บัคค้นหาเกณลูกจ้าง 2024-03-27 10:32:33 +07:00
Kittapath
e1e16cabc7 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-26 23:08:44 +07:00
Kittapath
d3160162df ค้นหาเกณลูกจ้าง 2024-03-26 23:07:39 +07:00
df264107d1 Merge branch 'develop' into adiDev 2024-03-26 17:00:06 +07:00
0c5da1e97c report emp2-01 2024-03-26 16:59:14 +07:00
Kittapath
43ae1b5b07 หาสถานะรอบที่active 2024-03-26 10:30:02 +07:00
Kittapath
426583bcdb Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-26 10:28:55 +07:00
Kittapath
ec4cf9015f ค้นหารอบตามปี 2024-03-26 10:28:40 +07:00
Bright
53945853c9 fix ค้นหารายการหลักเกณฑ์ 2024-03-26 09:53:28 +07:00
Bright
04d746bb18 thai num 2024-03-25 16:36:41 +07:00
Bright
2e273262de no message 2024-03-25 16:29:35 +07:00
Bright
b17a55da72 isNext 2024-03-25 16:28:48 +07:00
Bright
e05e6c625e emp1-09 2024-03-25 15:57:38 +07:00
Kittapath
9d6992e4e1 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop
# Conflicts:
#	src/controllers/ReportController.ts
2024-03-22 18:04:20 +07:00
Kittapath
8c0589fedd set api เงินเดือนลูกจ่างรอบตุลา 2024-03-22 18:02:51 +07:00
Bright
db910ec9f9 gov1-03 & gov2-03 ปรับ Group1,2 2024-03-22 17:44:56 +07:00
Bright
4ee6991bbe แก้ข้อความ error 2024-03-22 15:48:19 +07:00
Kittapath
6fad0f10a3 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-22 12:32:33 +07:00
Kittapath
bacac6c931 แก้report ลูกจ้างเลื่อนขั้นเงินเดือนพิเศษ 2024-03-22 12:32:17 +07:00
Bright
511970f61a ปรับ gov1-03 2024-03-22 12:04:57 +07:00
Kittapath
f4c6831c0b เก็บเงินพิเศษลูกจ้าง 2024-03-22 11:31:56 +07:00
Kittapath
9449a1f989 เลื่อนเงินเดือนลูกจ้าง 2024-03-21 22:59:53 +07:00
Bright
d3dd7012a1 gov2-03 2024-03-21 18:18:50 +07:00
Kittapath
af8ee9f6b6 migrate db 2024-03-21 16:57:18 +07:00
Kittapath
1fd8586c74 emp1 4 5 6 7 12 13 15 16 2024-03-21 16:34:30 +07:00
Kittapath
3c00aa7ac2 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-21 15:29:56 +07:00
Kittapath
727119a9b0 emp 01-03 2024-03-21 15:29:39 +07:00
Bright
376da1aa75 gov1-03 2024-03-21 14:17:21 +07:00
Bright
e49c4a9a55 ปรับ paging 2024-03-21 10:33:18 +07:00