Commit graph

261 commits

Author SHA1 Message Date
Thanit Konmek
5bfdd3cc2a Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me 2023-07-14 01:00:37 +07:00
Thanit Konmek
d400ba26ed api บรรจุ 2023-07-14 01:00:24 +07:00
Kittapath
0dc4e93291 edit crlf to lf 2023-07-13 23:27:43 +07:00
ee29b596f0 fix bug redirect personal detail 2023-07-13 17:41:21 +07:00
f09d1e9557 Merge branch 'develop' into warunee-dev 2023-07-13 17:32:34 +07:00
b2446316fc fix bug filter contain status 2023-07-13 17:32:05 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
4225b6bd06 check disable 2023-07-13 17:30:16 +07:00
88c2368fa8 Merge branch 'develop' into warunee-dev 2023-07-13 17:28:01 +07:00
016eeee205 fix display data 2023-07-13 17:27:30 +07:00
Thanit Konmek
79d864bc01 Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me
# Conflicts:
#	src/api/05_placement/api.placement.ts
#	src/api/index.ts
2023-07-13 16:17:57 +07:00
Thanit Konmek
b29c6ca262 api รายละเอียดบรรจุ 2023-07-13 16:15:58 +07:00
Kittapath
aec3cb49de set file build image harbor 2023-07-13 15:48:18 +07:00
96e1931e10 fix bug run build 2023-07-13 14:33:04 +07:00
0a74df75bc - rename folder personal list
- add filter status contain ของหน่วยงาน
2023-07-13 14:20:28 +07:00
Kittapath
37b3fa9f0c set api placement connect server 2023-07-13 12:30:57 +07:00
Kittapath
dbd67bbd7e Merge branch 'develop' into work 2023-07-13 12:14:40 +07:00
Kittapath
d8299f8d7d แก้api placement 2023-07-13 12:13:19 +07:00
Thanit Konmek
4854a01b7a Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me
# Conflicts:
#	src/modules/05_placement/components/Main.vue
2023-07-13 10:51:58 +07:00
Thanit Konmek
f9fac262ef แก้ไขบัค 2023-07-13 10:50:12 +07:00
3ff2461ec4 edit filter column 2023-07-13 10:11:13 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
3a5d855ec8 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop 2023-07-13 09:55:02 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
9a2bb7eb05 Merge branch 'nice_dev' into develop 2023-07-13 09:47:58 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
8139ddd0cd แก้ filter 2023-07-13 09:47:48 +07:00
Thanit Konmek
a2ac793131 Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me 2023-07-13 09:46:47 +07:00
Thanit Konmek
2149f2ae5e แก้ไข stepภ ที่หาย 2023-07-13 09:46:15 +07:00
Thanit Konmek
e00ed7a224 commit แก้ไข step4 2023-07-13 09:43:09 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
d8ded17dd9 Merge branch 'nice_dev' into develop 2023-07-13 09:41:44 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
c4761461cc แก้ไข filter 2023-07-13 09:41:14 +07:00
7481794fad fix url change data personal 2023-07-13 09:38:48 +07:00
Thanit Konmek
3230b5e8c4 Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me
# Conflicts:
#	src/api/05_placement/api.placement.ts
#	src/api/index.ts
#	src/modules/05_placement/components/pass/Table.vue
2023-07-13 09:14:47 +07:00
Thanit Konmek
211ee33310 ต่อ api บรรจุ 2023-07-13 09:10:43 +07:00
Kittapath
d536d280e1 Merge branch 'develop' into work 2023-07-13 09:01:16 +07:00
Kittapath
3b80198220 ต่อuiโครงสร้างลูกจ้าง 2023-07-13 09:00:38 +07:00
bbddbb8776 fix redirect step 3 close popup 2023-07-12 22:06:08 +07:00
baa32a47f7 change api tree json 2023-07-12 21:38:16 +07:00
a719fede02 บันทึกข้อมูลเลือกหน่วยงานที่รับบรรจุ 2023-07-12 21:25:24 +07:00
setthawutttty
4f5ec8f595 Merge branch 'dev-chiangmai' into tee 2023-07-12 17:27:25 +07:00
setthawutttty
32605e0426 เคลียข้อมูลใน input หลังจากกด save 2023-07-12 17:26:26 +07:00
926428192f fix bug & remove const/import not use 2023-07-12 17:21:27 +07:00
f0e3343093 update condition expiredAccount 2023-07-12 17:03:15 +07:00
3daf6ffedf Merge branch 'dev-chiangmai' into warunee-dev 2023-07-12 16:57:14 +07:00
3aa9b68b23 update by req 2023-07-12 16:56:52 +07:00
setthawutttty
ab72432c1a active Stat card 2023-07-12 16:50:01 +07:00
71884b950f update api index 2023-07-12 15:07:59 +07:00
8eee779e14 รวมหน้าบรรจุ 2023-07-12 14:50:35 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
5533f0512d แก้ไข filter 2023-07-12 14:43:17 +07:00
34a82cf5ec Merge branch 'dev-chiangmai' into warunee-dev
# Conflicts:
#	src/api/05_placement/api.placement.ts
2023-07-12 11:37:22 +07:00
04160ad2fa Merge branch 'develop' into warunee-dev 2023-07-12 11:35:23 +07:00
9f799f22dc เลือกหน่วยงานที่ต้องการบรรจุ 2023-07-12 11:34:51 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
593576a7e6 Merge branch 'dev-chiangmai' of https://github.com/Frappet/bma-ehr-frontend into dev-chiangmai
# Conflicts:
#	src/api/05_placement/api.placement.ts
#	src/modules/05_placement/components/pass/TableDetail.vue
2023-07-11 18:04:54 +07:00