Commit graph

65 commits

Author SHA1 Message Date
AnandaTon
7c6cc819ca Merge branch 'develop' into anandadev 2023-06-14 16:11:10 +07:00
AnandaTon
cb52aec394 Pinia Store data positionPath 2023-06-14 16:10:58 +07:00
AnandaTon
c1b7b25981 Pinia Store data positionEmployee 2023-06-14 15:12:38 +07:00
watcharanondh
7fe5ba7bf5 Merge branch 'develop' into develop-champ 2023-06-13 15:44:13 +07:00
watcharanondh
94d8bb69f7 Edit isExpired in Vuex => Done 2023-06-13 15:42:55 +07:00
AnandaTon
293d8b7c6e storeData insignia,insigniaType 2023-06-13 15:07:18 +07:00
setthawutttty
b5069d1991 05 table ยังไม่สมบูณ 2023-06-13 13:08:03 +07:00
setthawutttty
89cec7bd6d Merge branch 'develop' into develop-tee 2023-06-13 12:59:00 +07:00
setthawutttty
8ba9a0c1db no message 2023-06-13 12:58:08 +07:00
setthawutttty
3b9754026a no message 2023-06-13 12:57:01 +07:00
setthawutttty
a42204e880 no message 2023-06-13 11:06:48 +07:00
watcharanondh
bdf1f7f0f7 Edit dialog details 2023-06-13 10:52:53 +07:00
watcharanondh
f331ee3339 Merge branch 'develop-champ' into develop 2023-06-13 10:02:22 +07:00
watcharanondh
8704c1ff39 dialog detail => Done 2023-06-13 01:15:17 +07:00
setthawutttty
b926bd27d6 response card top 2023-06-12 11:02:43 +07:00
Harid Promsri (Bright)
c098fdd976 plament detail page 2023-06-12 09:42:31 +07:00
watcharanondh
d6010bf0f1 Edit valiable and type 2023-06-12 09:11:22 +07:00
watcharanondh
377086ff28 Merge branch 'develop' into develop-champ 2023-06-09 17:37:59 +07:00
watcharanondh
27dcb7e4c2 edit Type in storeMain 2023-06-09 17:37:18 +07:00
Thanit Konmek
67e0f695c1 Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me 2023-06-09 17:17:07 +07:00
Thanit Konmek
3c76b56d21 แก้ไข prefix 2023-06-09 17:16:57 +07:00
watcharanondh
97a42825d6 Merge branch 'develop' into develop-champ 2023-06-09 15:42:53 +07:00
watcharanondh
0d213400e1 Fig filter ให้สัมพันธ์กัน 2023-06-09 15:42:06 +07:00
AnandaTon
19c2a8b2b0 แก้ pagination ของ TableHistory 2023-06-09 14:52:30 +07:00
AnandaTon
a5564cf99a Pagination เพิ่มใน TableView 2023-06-09 14:34:34 +07:00
Thanit Konmek
fe6c712a18 new loader 2023-06-09 14:25:41 +07:00
Thanit Konmek
fd7aae2f5d Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me 2023-06-09 11:40:06 +07:00
Thanit Konmek
6febfde058 pinia prefix 2023-06-09 11:39:54 +07:00
35cac51c72 Merge branch 'develop' into warunee-dev 2023-06-09 09:28:59 +07:00
8d1c124f46 Merge branch 'develop' into warunee-dev
# Conflicts:
#	src/modules/05_placement/components/PlacementTable.vue
#	src/modules/05_placement/router.ts
2023-06-09 09:28:33 +07:00
watcharanondh
cd504b05d2 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop 2023-06-09 09:19:12 +07:00
watcharanondh
e07e7ddf38 clean code 2023-06-09 09:17:41 +07:00
312642f8f6 update UI - แสดงรายชื่อผู้สอบผ่านในรอบของการสอบคัดเลือก/แข่งขันที่ได้จากระบบ
ปรับในส่วนของการแสดงผลข้อมูลให้ครบตาม design
ปรับให้เป็นหน้าฟอร์มกรณีอยู่ในโหมดแก้ไข
ปรับการแสดงสถานะและ Action ให้ถกต้อง
2023-06-08 18:24:09 +07:00
Harid Promsri (Bright)
f220685f3f Merge branch 'develop-Bright' into develop 2023-06-08 18:06:57 +07:00
Harid Promsri (Bright)
9e2ccfd6f9 placementtable page (detail) 2023-06-08 18:06:32 +07:00
watcharanondh
73bcd275b0 edit condition show props.row.ExamType == 1 2023-06-08 17:39:46 +07:00
watcharanondh
04c0f68134 add router กก. และสร้าง =>Done 2023-06-08 15:58:33 +07:00
watcharanondh
46ce39d4ac checkbox D 2023-06-08 15:05:21 +07:00
Harid Promsri (Bright)
7e6e8775fc Merge branch 'develop-Bright' into develop 2023-06-08 14:44:21 +07:00
Harid Promsri (Bright)
00eae3b3e2 placementTable page 2023-06-08 14:43:48 +07:00
watcharanondh
4aee623885 Merge branch 'develop' into develop-champ 2023-06-08 14:31:55 +07:00
watcharanondh
ccf9aa86ab รายการสอบแข่งขัน / คัดเลือก => Done 2023-06-08 14:31:25 +07:00
AnandaTon
ca633f848d add v-model pagination 2023-06-08 09:38:03 +07:00
setthawutttty
b958dfad20 Merge branch 'develop' into develop-tee 2023-06-07 20:42:01 +07:00
setthawutttty
cde1e9c135 05 popup 2023-06-07 20:41:35 +07:00
AnandaTon
0be28f93f6 comment table pagination 2023-06-07 17:07:25 +07:00
AnandaTon
b660dca315 Merge branch 'anandadev' into develop 2023-06-07 17:05:23 +07:00
AnandaTon
73034070f3 เพิ่ม pagination 2023-06-07 17:03:45 +07:00
setthawutttty
dc9291fad9 no message 2023-06-07 16:22:30 +07:00
setthawutttty
1d0f5bc8e7 Merge branch 'develop' into develop-tee 2023-06-07 16:09:00 +07:00