|
|
bf6473cf28
|
update package bma-org-chart
|
2023-07-25 18:06:52 +07:00 |
|
setthawutttty
|
d46a12b4ca
|
Merge branch 'develop' into dev-tee
|
2023-07-25 17:24:53 +07:00 |
|
setthawutttty
|
0df46c7866
|
ui ขอโอน
|
2023-07-25 17:24:35 +07:00 |
|
|
|
79e73101cb
|
fix menu
|
2023-07-25 17:10:29 +07:00 |
|
setthawutttty
|
5416bd05b5
|
Merge branch 'develop' into dev-tee
|
2023-07-25 16:35:28 +07:00 |
|
setthawutttty
|
b1b4959523
|
no message
|
2023-07-25 16:35:08 +07:00 |
|
|
|
69525bf3a3
|
fix role menu
|
2023-07-25 16:27:45 +07:00 |
|
setthawutttty
|
bd8cd47601
|
Merge branch 'develop' into dev-tee
# Conflicts:
# src/modules/05_placement/router.ts
|
2023-07-25 15:44:35 +07:00 |
|
setthawutttty
|
47399c4496
|
no message
|
2023-07-25 15:42:30 +07:00 |
|
|
|
879a4c0671
|
Merge branch 'develop' into warunee-dev
|
2023-07-25 14:34:26 +07:00 |
|
Kittapath
|
af8aa5b334
|
Merge branch 'develop' into work
|
2023-07-25 14:30:49 +07:00 |
|
Kittapath
|
28d851f247
|
ค้นหาข้อมูลทะเบียนประวัติ เพิ่มฟิว
|
2023-07-25 14:30:29 +07:00 |
|
|
|
6827ec819a
|
Merge branch 'develop' into warunee-dev
|
2023-07-25 14:28:04 +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 |
|
|
|
59bbbb0be0
|
- แก้ link เมนู ออกจากราชการในหน้าทะเบียนประวัติ
- ui คำสั่งช่วยราชการ/ส่งตัวกลับ
|
2023-07-25 12:11:35 +07:00 |
|
|
|
6c4f1f4d37
|
update route
|
2023-07-25 11:38:17 +07:00 |
|
|
|
9a06a8f5b9
|
add menu คำสั่งช่วยราชการ/ส่งตัวกลับ
|
2023-07-25 11:14:55 +07:00 |
|
|
|
69d130bdd8
|
Merge branch 'develop' into warunee-dev
|
2023-07-25 11:05:18 +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
|
576dbf9fbe
|
Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop
|
2023-07-25 09:33:25 +07:00 |
|
setthawutttty
|
cd683d2296
|
no message
|
2023-07-25 09:32:45 +07:00 |
|
AnandaTon
|
37722a0916
|
แก้เมนูออกคำสั่ง
|
2023-07-25 09:27:52 +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 |
|
|
|
9b5b77a304
|
Merge branch 'develop' into warunee-dev
|
2023-07-25 09:23:18 +07:00 |
|
AnandaTon
|
8066a92c33
|
Merge branch 'anandadev' into develop
|
2023-07-25 09:20:19 +07:00 |
|
|
|
a37b989525
|
Merge branch 'develop' into warunee-dev
|
2023-07-25 09:13:29 +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 |
|
|
|
672d014936
|
Merge branch 'develop' into warunee-dev
|
2023-07-25 07:14:53 +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 |
|
|
|
fd280ddabf
|
Merge branch 'develop' into warunee-dev
|
2023-07-24 17:16:13 +07:00 |
|
AnandaTon
|
5d20d4f279
|
ui เพิ่ม เพิ่มข้อมูลทะเบียนประวัติลูกจ้าง // api
|
2023-07-24 17:11:12 +07:00 |
|
|
|
03619ab42a
|
Merge branch 'develop' into warunee-dev
|
2023-07-24 16:09:26 +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 |
|
