Commit graph

2515 commits

Author SHA1 Message Date
setthawutttty
7b943de397 Merge branch 'develop' into devTee
# Conflicts:
#	src/modules/01_metadataNew/views/personal.vue
2024-02-02 11:23:14 +07:00
setthawutttty
a48282c1cb tab ข้อมูลตำแหน่ง 2024-02-02 11:21:51 +07:00
ed3b23ba42 remove padding tab ในข้อมูลบุคคล 2024-02-02 11:02:55 +07:00
setthawutttty
23a6b3b39a Merge branch 'develop' into devTee 2024-02-02 10:05:18 +07:00
setthawutttty
74e204b5cc ปิด pop up เเล้วดึงข้อมูลใหม่ 2024-02-02 10:04:58 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
7112e60b69 ปรับ filter เพิ่มอัตรากำลัง 2024-02-02 09:26:13 +07:00
5741c3a815 ปรับแก้ไขอัตรกำลัง 2024-02-01 18:40:17 +07:00
setthawutttty
e997e096dc Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop 2024-02-01 18:00:13 +07:00
setthawutttty
f9051ac1b9 Tab 2024-02-01 17:59:51 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
85dc590a75 Merge branch 'nice_dev' into develop 2024-02-01 17:52:49 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
704b224775 validate formPosition 2024-02-01 17:52:34 +07:00
9d1fd29a97 เพิ่มข้อมูลหลักบุคคล และตำแหน่ง 2024-02-01 17:43:39 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
cb56eb25af แก้ไขคำผืด ประเมิน 2024-02-01 16:13:30 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e945bb6da5 Merge branch 'nice_dev' into develop 2024-02-01 16:01:52 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e69db49a3f API แก้ไขอัตรากำลัง 2024-02-01 16:01:35 +07:00
setthawutttty
94976daa5d เผยแพร่ข้อมูล 2024-02-01 14:46:13 +07:00
98bef466d6 Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop 2024-02-01 14:37:38 +07:00
76cd4e170b ปรับแสดงการเผยแพร่โครงสร้าง 2024-02-01 14:32:59 +07:00
setthawutttty
5313d78c01 Merge branch 'develop' into devTee 2024-02-01 14:32:44 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
039d4081d6 filter keyword 2024-02-01 14:31:22 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
c7aa139d74 table position 2024-02-01 14:14:50 +07:00
setthawutttty
d771d1fbad Merge branch 'develop' into devTee 2024-02-01 13:53:17 +07:00
setthawutttty
804c841f96 no message 2024-02-01 13:52:57 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
ff3c5e3ef0 Merge branch 'nice_dev' into develop
# Conflicts:
#	src/api/02_organizational/api.organization.ts
#	src/modules/02_organizationalNew/components/tableTree.vue
#	src/modules/02_organizationalNew/store/organizational.ts
2024-02-01 13:51:49 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
1a33f55c6e API Position 2024-02-01 13:46:05 +07:00
setthawutttty
0cda16d094 Merge branch 'develop' into devTee 2024-02-01 13:45:31 +07:00
setthawutttty
41a40a8fc4 pop up จัดลำดับตำแหน่ง 2024-02-01 13:45:08 +07:00
574b6dd354 แก้ฟังก์ชั่นลบโครงสร้าง 2024-02-01 11:16:32 +07:00
c73e8d5d23 ปรับ layout และ validate เพิ่มหน่วยงาน 2024-02-01 10:54:52 +07:00
f28d50aa48 ปรับ layout 2024-02-01 10:43:49 +07:00
ea1f76125a ปรับโครงสร้าง 2024-02-01 10:32:34 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
dd9239ac25 ปรับการ fetch ข้อมูล tree 2024-02-01 09:27:56 +07:00
c7ea4e0e5b updated 2024-01-31 18:20:28 +07:00
764078488c Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop 2024-01-31 18:06:35 +07:00
340cfae704 updated 2024-01-31 18:06:23 +07:00
setthawutttty
f78b2dc4db Merge branch 'develop' into devTee 2024-01-31 17:54:53 +07:00
setthawutttty
7e3ddc3fa0 แก้ date2thai 2024-01-31 17:54:34 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b1ad65cf5e Merge branch 'nice_dev' into develop 2024-01-31 17:44:24 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
cf92aaae0a เพิ่มอัตรากำลัง 2024-01-31 17:44:07 +07:00
setthawutttty
f38acf3eaa Merge branch 'develop' into devTee
# Conflicts:
#	src/api/02_organizational/api.organization.ts
#	src/modules/02_organizationalNew/interface/index/Main.ts
2024-01-31 17:28:55 +07:00
setthawutttty
0b4011437c API ดูประวัติโครงสร้าง 2024-01-31 17:27:12 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b2c8dd6eed Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop 2024-01-31 17:01:03 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
aa46396728 โครงสร้างอัตรากำลัง 2024-01-31 16:59:28 +07:00
setthawutttty
80b40ead85 แก้รูปไม่ขึ้น 2024-01-31 16:23:21 +07:00
setthawutttty
3eb1a41bdb pop up จัดลำดับการแสดงผล 2024-01-31 16:10:07 +07:00
setthawutttty
950b958a2e Merge branch 'develop' into devTee 2024-01-31 15:33:53 +07:00
setthawutttty
9355b54882 no message 2024-01-31 15:33:22 +07:00
5fc78f8090 example search tree 2024-01-31 15:32:35 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
c90d5902f3 Merge branch 'nice_dev' into develop 2024-01-31 12:02:57 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
ad8cf4553a load 2024-01-31 12:02:11 +07:00