Commit graph

68 commits

Author SHA1 Message Date
a646ad3d6d fix bug send profileId to registry 2023-08-19 13:36:39 +07:00
AnandaTon
ea4d4a1632 Currency input 2023-08-18 15:12:14 +07:00
cf75412206 currency 2023-08-18 14:29:09 +07:00
AnandaTon
5c8593cf4b Currency input 2023-08-18 14:04:31 +07:00
AnandaTon
392d5a5943 แก้ api delete 2023-08-17 12:01:02 +07:00
setthawutttty
b66dfe0142 Merge branch 'develop' into dev-tee 2023-08-16 17:35:50 +07:00
setthawutttty
d06b45ccdb เเก้คำ ประกาศเกษียณอายุราชการ 2023-08-16 17:35:28 +07:00
Tanyalak
a0e3007221 Merge branch 'working' into develop 2023-08-16 17:17:59 +07:00
AnandaTon
9ab5d441e2 api ปลดออก ไล่ออก ให้ออก
เพิ่ม form / q dialogmassage delete
2023-08-16 17:12:32 +07:00
Tanyalak
06c3d36c7a Merge branch 'develop' into working
# Conflicts:
#	src/interface/request/main/main.ts
#	src/modules/08_registryEmployee/router.ts
#	src/modules/08_registryEmployee/views/Main.vue
2023-08-16 17:06:58 +07:00
Tanyalak
df2dd3aa25 ปรับ css เพิ่มเติม 2023-08-16 17:01:57 +07:00
AnandaTon
17e62cbac1 Merge branch 'develop' into anandadev 2023-08-15 20:39:35 +07:00
AnandaTon
4dfe222a85 ui/api ไล่ออก ปลดออก ให้ออก 2023-08-15 17:44:33 +07:00
Thanit Konmek
265bc77553 แก้ไขการลา 2023-08-14 16:45:23 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
742fda67f6 no message 2023-08-09 14:50:01 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
c3e0c41e80 ผูก API ระบบลาออก 2023-08-09 14:46:46 +07:00
ca44ebd1b7 ปรับการแสดงผลเสียชีวิต 2023-08-08 18:11:39 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
c51f66c808 api ถึงแก่กรรม 2023-08-08 16:50:50 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
eaec5470c4 เพิ่ม disabled button ตกลง ของการเพิ่มประกาศ 2023-08-08 09:09:44 +07:00
5400518678 แก้ไขสถานะการลาออก 2023-08-07 22:56:05 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
995a09c1f5 no message 2023-08-07 18:12:26 +07:00
d5ee366ea2 แก้ condition แสดง action ต่างๆ ของเกษียณ 2023-08-07 17:40:57 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e103b9faef API รับโอน 2023-08-07 16:22:10 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
97bb5a279c แก้ไขการแสดง button 2023-08-07 15:05:05 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
c21a95f486 แก้ไข retirement 2023-08-07 13:17:59 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b3bfe6a4b9 api retirement 2023-08-07 11:06:04 +07:00
Thanit Konmek
b663eedb09 แก้ไข loader 2023-08-04 10:04:59 +07:00
d1f1ba817c popup เหตุผลแก้ไขเกษียณ 2023-07-28 17:25:26 +07:00
3dd5e53597 update type ประกาศเกษียณ 2023-07-28 16:54:08 +07:00
Tanyalak
4bdbd6c0bc Merge branch 'develop' into working
# Conflicts:
#	src/modules/06_retirement/components/ListRetirement/TableList.vue
2023-07-27 18:25:08 +07:00
Tanyalak
fef791f4b8 Merge branch 'develop' into working / ปรับ ui เกษียณ 2023-07-27 18:14:09 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
9796c301cb Form Evaluate,Saveresult 2023-07-27 16:59:07 +07:00
4c9d1cf6bb fix bug add 2023-07-26 01:06:35 +07:00
d035692f44 test & update 2023-07-26 00:57:05 +07:00
97b5e63813 update เกษียณ + ปิด route หน้ารายละเอียดถึงแก่กรรม 2023-07-25 21:14:52 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
d08b3625f3 Merge branch 'nice_dev' into develop 2023-07-25 18:28:14 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
d6c2fbbc8d no message 2023-07-25 18:28:05 +07:00
1084f4bde2 fix bug display & popup confirm เกษียณ 2023-07-25 18:13:44 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
626e6023c3 no message 2023-07-25 18:04:11 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
1484c9288d Merge branch 'develop' into nice_dev
# Conflicts:
#	src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
#	src/modules/06_retirement/router.ts
2023-07-25 14:13:03 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
00f81dba34 no message 2023-07-25 14:11:16 +07:00
6c4f1f4d37 update route 2023-07-25 11:38:17 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a24e2298c0 Merge branch 'develop' into nice_dev 2023-07-25 11:01:49 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a8dc849917 no message 2023-07-25 11:01:31 +07:00
setthawutttty
5e8940852b Merge branch 'develop' into dev-tee 2023-07-25 10:54:33 +07:00
setthawutttty
c28de1d33c no message 2023-07-25 10:54:15 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
befd2db27b Merge branch 'nice_dev' into develop 2023-07-25 10:03:34 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
1b6157165a no message 2023-07-25 10:03:28 +07:00
setthawutttty
cd683d2296 no message 2023-07-25 09:32:45 +07:00
setthawutttty
707d3f13a2 Merge branch 'develop' into dev-tee
# Conflicts:
#	src/api/06_retirement/api.retirement.ts
2023-07-25 09:25:32 +07:00