Commit graph

51 commits

Author SHA1 Message Date
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
setthawutttty
b40bd12492 หน้าเเรกประกาศเกษียณ 2023-07-25 09:23:39 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
ecbd8f5518 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop
# Conflicts:
#	src/api/06_retirement/api.retirement.ts
2023-07-25 09:11:36 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a5917e6f6d Merge branch 'develop' into nice_dev 2023-07-25 09:06:32 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a50ac34978 no message 2023-07-25 09:04:49 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
ebf15d6918 แก้ไข router retirement 2023-07-24 18:14:25 +07:00
setthawutttty
3e626d48e1 โครง get (ยังไม่เสร็จ) ประกาศเกษียณ 2023-07-24 17:38:57 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
5d2fdf254d no message 2023-07-24 16:01:11 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
5e70fd7c70 no message 2023-07-24 15:29:33 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
4d369dbad7 Merge branch 'nice_dev' into develop
# Conflicts:
#	src/modules/05_placement/components/PersonalList/Table.vue
#	src/modules/06_retirement/router.ts
2023-07-24 15:27:45 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
6f40ad3de8 ui พ้นราชการ 2023-07-24 15:26:22 +07:00
setthawutttty
ac4fb71f09 ui ลาออก ถึงเเก่กรรม 2023-07-24 13:19:14 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
1782765dba เพิ่ม button back 2023-07-17 16:13:18 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
57e46133ef เพิ่มลิงค์ 2023-07-17 16:00:29 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
d62883f5a1 Merge branch 'develop' into nice_dev
# Conflicts:
#	src/modules/07_insignia/router.ts
2023-07-17 14:59:24 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
18d9947936 Ui เครื่องราช 2023-07-17 14:56:08 +07:00
Tanyalak
332e61599b ปรับ css ระบบทะเบียนประวัติลูกจ้าง,พ้นจากราชการ 2023-07-14 15:38:09 +07:00
AnandaTon
0257929816 Ui ประกาศเกษียณอายุราชการ 2023-07-14 13:13:01 +07:00