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 |
|
AnandaTon
|
8066a92c33
|
Merge branch 'anandadev' into develop
|
2023-07-25 09:20:19 +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 |
|
AnandaTon
|
bb7b0c37d1
|
เพิ่มเมนู Probation
|
2023-07-24 17:47:24 +07:00 |
|
setthawutttty
|
cf0fad18ef
|
Merge branch 'develop' into dev-tee
|
2023-07-24 17:40:33 +07:00 |
|
setthawutttty
|
3e626d48e1
|
โครง get (ยังไม่เสร็จ) ประกาศเกษียณ
|
2023-07-24 17:38:57 +07:00 |
|
AnandaTon
|
b7ee12468a
|
แก้ tap ข้างขวาใน addEmployee
|
2023-07-24 17:29:21 +07:00 |
|
AnandaTon
|
5d20d4f279
|
ui เพิ่ม เพิ่มข้อมูลทะเบียนประวัติลูกจ้าง // api
|
2023-07-24 17:11:12 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
5d2fdf254d
|
no message
|
2023-07-24 16:01:11 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
440b6523c8
|
no message
|
2023-07-24 15:37:59 +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 |
|
Thanit Konmek
|
1e51577963
|
Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me
|
2023-07-24 14:42:02 +07:00 |
|
Thanit Konmek
|
1a4163e76a
|
ทะเบียนประวัติลูกจ้าง popup กำหนดตำแหน่ง
|
2023-07-24 14:41:52 +07:00 |
|
setthawutttty
|
b6fd446e73
|
no message
|
2023-07-24 13:26:27 +07:00 |
|
setthawutttty
|
6dd84473b6
|
no message
|
2023-07-24 13:20:02 +07:00 |
|
setthawutttty
|
ac4fb71f09
|
ui ลาออก ถึงเเก่กรรม
|
2023-07-24 13:19:14 +07:00 |
|
|
|
17e4dba176
|
update process probation
|
2023-07-24 09:28:49 +07:00 |
|
Kittapath
|
1b4465bf36
|
Merge branch 'develop' into work
|
2023-07-22 23:13:37 +07:00 |
|
Kittapath
|
41b8c39045
|
no message
|
2023-07-22 23:13:04 +07:00 |
|
|
|
6e15c59bde
|
update style send placement popup
|
2023-07-21 17:13:48 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
1951d23eab
|
Merge branch 'nice_dev' into develop
|
2023-07-21 16:38:10 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
14e1394128
|
no message
|
2023-07-21 16:38:02 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
6a68e7f05c
|
Merge branch 'nice_dev' into develop
|
2023-07-21 15:31:17 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
c13df46549
|
เพิ่มเมนูย่อย retirement
|
2023-07-21 15:30:54 +07:00 |
|
AnandaTon
|
79b9239cb9
|
Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop
|
2023-07-21 15:16:02 +07:00 |
|
AnandaTon
|
b95e363042
|
แก้ icon
|
2023-07-21 15:15:50 +07:00 |
|
setthawutttty
|
7ee8387d42
|
Merge branch 'develop' into dev-tee
|
2023-07-21 15:10:18 +07:00 |
|
setthawutttty
|
cf7a653160
|
copy ออกคำสั่ง => /resign-order
|
2023-07-21 15:08:37 +07:00 |
|
AnandaTon
|
cecb277d8a
|
ui เพิ่ม เมนูย่อยทะเบียนประะวัติโปรไฟล์
|
2023-07-21 15:05:25 +07:00 |
|
setthawutttty
|
59cdff8851
|
Merge branch 'develop' into dev-tee
# Conflicts:
# src/modules/05_placement/router.ts
|
2023-07-21 14:44:12 +07:00 |
|
setthawutttty
|
f41c0ba653
|
ui หน้าฟอร์มมอบหมายงาน
|
2023-07-21 14:42:18 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
e62d78ccb1
|
Merge branch 'nice_dev' into develop
|
2023-07-21 14:25:27 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
701355ed57
|
expanded tree
|
2023-07-21 14:25:01 +07:00 |
|
Kittapath
|
2dd7d8988f
|
Merge branch 'develop' into work
|
2023-07-21 14:21:35 +07:00 |
|
Kittapath
|
4547e3ea34
|
ui ค้นหาทะเบียนประวัติ
|
2023-07-21 14:21:19 +07:00 |
|
Tanyalak
|
696ab7c4b2
|
ปรับ drawer เมนูย่อยเพิ่มเติม
|
2023-07-21 13:57:47 +07:00 |
|
AnandaTon
|
81a57354b5
|
Merge branch 'anandadev' into develop
|
2023-07-21 12:22:36 +07:00 |
|
AnandaTon
|
c44585a8b4
|
api รายชื่อลูกจ้างชั่วคราว
|
2023-07-21 12:22:14 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
ad26c94921
|
Merge branch 'nice_dev' into develop
|
2023-07-21 11:44:38 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
01c10f48b9
|
แก้ไข status draft
|
2023-07-21 11:43:55 +07:00 |
|
|
|
4d6b0d809c
|
Merge branch 'develop' into warunee-dev
|
2023-07-21 11:42:53 +07:00 |
|
|
|
47909bf034
|
update filter tree selected
|
2023-07-21 11:41:53 +07:00 |
|
Tanyalak
|
640bde71be
|
แก้ router ระบบบรรจุ
|
2023-07-21 10:27:51 +07:00 |
|
