From 05d19419e76b5d7513d5f3de34eefea853b9e58a Mon Sep 17 00:00:00 2001 From: Kittapath Date: Tue, 28 Mar 2023 14:51:48 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=A7=E0=B8=A1=E0=B8=82=E0=B9=89?= =?UTF-8?q?=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=AA=E0=B8=A1=E0=B8=B1?= =?UTF-8?q?=E0=B8=84=E0=B8=B6=E0=B8=A3=E0=B8=AA=E0=B8=AD=E0=B8=9A=E0=B9=84?= =?UTF-8?q?=E0=B8=A7=E0=B9=89=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B9=80?= =?UTF-8?q?=E0=B8=94=E0=B8=B5=E0=B8=A2=E0=B8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Table.vue | 2 +- src/modules/01_exam/components/Conference.vue | 11 +- src/modules/01_exam/components/ExamForm.vue | 101 +++++----- .../components/Form/{Profile => }/Address.vue | 78 ++++---- .../01_exam/components/Form/Career.vue | 2 +- .../01_exam/components/Form/Document.vue | 4 +- .../01_exam/components/Form/Education.vue | 2 +- .../components/Form/{Profile => }/Family.vue | 124 ++++++------- .../Form/{Profile => }/Information.vue | 174 +++++++++--------- .../Form/{Profile => }/Occupation.vue | 99 +++++----- .../01_exam/components/Form/Profile.vue | 29 ++- 11 files changed, 341 insertions(+), 285 deletions(-) rename src/modules/01_exam/components/Form/{Profile => }/Address.vue (81%) rename src/modules/01_exam/components/Form/{Profile => }/Family.vue (72%) rename src/modules/01_exam/components/Form/{Profile => }/Information.vue (74%) rename src/modules/01_exam/components/Form/{Profile => }/Occupation.vue (75%) diff --git a/src/components/Table.vue b/src/components/Table.vue index f55a9dc..90fc6b8 100644 --- a/src/components/Table.vue +++ b/src/components/Table.vue @@ -95,7 +95,7 @@ import type { Pagination } from '@/modules/01_exam/interface/index/Main' const attrs = ref(useAttrs()) const table = ref(null) const filterRef = ref(null) -const editBtn = ref(false) +const editBtn = ref(true) const initialPagination = ref({ // descending: false, rowsPerPage: 0 diff --git a/src/modules/01_exam/components/Conference.vue b/src/modules/01_exam/components/Conference.vue index ea7ceee..eb81f3e 100644 --- a/src/modules/01_exam/components/Conference.vue +++ b/src/modules/01_exam/components/Conference.vue @@ -78,14 +78,19 @@ จะไม่ดำเนินการอื่นใดแตกต่างจากที่ระบุในวัตถุประสงค์เว้นแต่มีกฏหมายบัญญัติให้กระทำหรือมีหนังสือร้องขอที่สามารถปฏิบัติได้ตามกฏหมาย เช่น เพื่อความจำเป็นในการป้องกันด้านสุขภาพและโรคติดต่ออันตราย

+ - - + + + @@ -104,6 +109,8 @@ const props = defineProps({ }) const fullname = ref('') +const acceptTermOfUse = ref(false) + /** * ดิงชื่อผู้ใช้งานจาก keycloak */ diff --git a/src/modules/01_exam/components/ExamForm.vue b/src/modules/01_exam/components/ExamForm.vue index 0a75d0d..caae140 100644 --- a/src/modules/01_exam/components/ExamForm.vue +++ b/src/modules/01_exam/components/ExamForm.vue @@ -1,7 +1,8 @@ - + -->
+
- --> +
@@ -113,8 +121,8 @@ const props = defineProps({ const $q = useQuasar() const mixin = useCounterMixin() //เรียกฟังก์ชันกลาง const { modalConfirm, modalError, success } = mixin -const tab = ref('profile') -const splitterModel = ref(90) +// const tab = ref('profile') +// const splitterModel = ref(90) const loader = ref(false) const statusEdit = ref(false) const acceptTermOfUse = ref(false) @@ -154,36 +162,35 @@ const saveForm = async () => { }) } -const clickPreview = (val: string) => { - console.log(val) - switch (val) { - case 'profile': - return (tab.value = 'profile') - case 'education': - return (tab.value = 'profile') - case 'career': - return (tab.value = 'education') - case 'document': - return (tab.value = 'career') - default: - return (tab.value = 'profile') - } -} +// const clickPreview = (val: string) => { +// switch (val) { +// case 'profile': +// return (tab.value = 'profile') +// case 'education': +// return (tab.value = 'profile') +// case 'career': +// return (tab.value = 'education') +// case 'document': +// return (tab.value = 'career') +// default: +// return (tab.value = 'profile') +// } +// } -const clickNext = (val: string) => { - switch (val) { - case 'profile': - return (tab.value = 'education') - case 'education': - return (tab.value = 'career') - case 'career': - return (tab.value = 'document') - case 'document': - return (tab.value = 'profile') - default: - return (tab.value = 'profile') - } -} +// const clickNext = (val: string) => { +// switch (val) { +// case 'profile': +// return (tab.value = 'education') +// case 'education': +// return (tab.value = 'career') +// case 'career': +// return (tab.value = 'document') +// case 'document': +// return (tab.value = 'profile') +// default: +// return (tab.value = 'profile') +// } +// } diff --git a/src/modules/01_exam/components/Form/Profile/Address.vue b/src/modules/01_exam/components/Form/Address.vue similarity index 81% rename from src/modules/01_exam/components/Form/Profile/Address.vue rename to src/modules/01_exam/components/Form/Address.vue index c685e03..5d3b6ca 100644 --- a/src/modules/01_exam/components/Form/Profile/Address.vue +++ b/src/modules/01_exam/components/Form/Address.vue @@ -17,27 +17,27 @@
- +
@@ -110,7 +110,7 @@ val="1" label="ใช่" dense - :disable="!edit" + :disable="!(status == 'register' || status == 'rejectRegister')" />
diff --git a/src/modules/01_exam/components/Form/Career.vue b/src/modules/01_exam/components/Form/Career.vue index d11bd33..a54cea9 100644 --- a/src/modules/01_exam/components/Form/Career.vue +++ b/src/modules/01_exam/components/Form/Career.vue @@ -1,6 +1,6 @@