From 6ab1a862d6fa5a2276e6cc186389901ed934ba88 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Sun, 19 Mar 2023 00:43:28 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=8A=E0=B9=87=E0=B8=84=E0=B8=84?= =?UTF-8?q?=E0=B9=88=E0=B8=B2=E0=B8=81=E0=B9=88=E0=B8=AD=E0=B8=99=E0=B9=80?= =?UTF-8?q?=E0=B8=9B=E0=B8=A5=E0=B8=B5=E0=B9=88=E0=B8=A2=E0=B8=99=20tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DialogFooter.vue | 116 +++++++++--------- src/components/Table.vue | 13 +- src/components/top.vue | 6 + src/modules/01_exam/components/Document.vue | 10 -- src/modules/01_exam/components/ExamDetail.vue | 19 +++ .../01_exam/components/ExamFinished.vue | 17 ++- src/modules/01_exam/components/ExamForm.vue | 113 ++++++++++++++--- .../01_exam/components/ExamPayment.vue | 96 ++++++++++----- .../01_exam/components/{ => Form}/Career.vue | 14 ++- .../{OtherFile.vue => Form/Document.vue} | 37 +++++- .../components/{ => Form}/Education.vue | 15 ++- .../01_exam/components/Form/Profile.vue | 86 +++++++++++++ .../components/{ => Form/Profile}/Address.vue | 32 +++-- .../components/{ => Form/Profile}/Family.vue | 31 ++++- .../{ => Form/Profile}/Information.vue | 33 +++-- .../{ => Form/Profile}/Occupation.vue | 31 ++++- src/modules/01_exam/components/Profile.vue | 57 --------- src/modules/01_exam/views/ExamDetail.vue | 64 +++++----- 18 files changed, 547 insertions(+), 243 deletions(-) delete mode 100644 src/modules/01_exam/components/Document.vue rename src/modules/01_exam/components/{ => Form}/Career.vue (98%) rename src/modules/01_exam/components/{OtherFile.vue => Form/Document.vue} (73%) rename src/modules/01_exam/components/{ => Form}/Education.vue (98%) create mode 100644 src/modules/01_exam/components/Form/Profile.vue rename src/modules/01_exam/components/{ => Form/Profile}/Address.vue (96%) rename src/modules/01_exam/components/{ => Form/Profile}/Family.vue (95%) rename src/modules/01_exam/components/{ => Form/Profile}/Information.vue (96%) rename src/modules/01_exam/components/{ => Form/Profile}/Occupation.vue (94%) delete mode 100644 src/modules/01_exam/components/Profile.vue diff --git a/src/components/DialogFooter.vue b/src/components/DialogFooter.vue index 8975b2b..3855e85 100644 --- a/src/components/DialogFooter.vue +++ b/src/components/DialogFooter.vue @@ -19,108 +19,110 @@ :color="!next ? 'grey-7' : 'public'" /> - - แก้ไขข้อมูล - -
+
- ยกเลิก - - - บันทึก + แก้ไขข้อมูล +
+ + ยกเลิก + + + บันทึก + +
diff --git a/src/components/Table.vue b/src/components/Table.vue index 7620a0a..4329748 100644 --- a/src/components/Table.vue +++ b/src/components/Table.vue @@ -6,13 +6,14 @@ :header="name" :icon="icon" :add="checkAdd" - :addData="true" :history="false" v-if="nameHeader" /> - - เพิ่มข้อมูล - +
+ + เพิ่มข้อมูล + +
@@ -102,6 +103,10 @@ const props = defineProps({ inputvisible: Array, editvisible: Boolean, nameHeader: Boolean, + addData: { + type: Boolean, + defualt: true + }, edit: { type: Function, default: () => console.log('not function') diff --git a/src/components/top.vue b/src/components/top.vue index 4d8e9c3..87144c1 100644 --- a/src/components/top.vue +++ b/src/components/top.vue @@ -88,6 +88,10 @@ const props = defineProps({ cancel: { type: Function, default: () => console.log('not function') + }, + changeBtn: { + type: Function, + default: () => console.log('not function') } }) @@ -99,11 +103,13 @@ const updateEdit = (value: any) => { const ClickEdit = () => { updateEdit(!props.edit) + props.changeBtn() } const ClickCancel = () => { updateEdit(!props.edit) props.cancel() + props.changeBtn() } const save = () => { diff --git a/src/modules/01_exam/components/Document.vue b/src/modules/01_exam/components/Document.vue deleted file mode 100644 index 3f0b923..0000000 --- a/src/modules/01_exam/components/Document.vue +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/src/modules/01_exam/components/ExamDetail.vue b/src/modules/01_exam/components/ExamDetail.vue index 4741ff6..171b13a 100644 --- a/src/modules/01_exam/components/ExamDetail.vue +++ b/src/modules/01_exam/components/ExamDetail.vue @@ -52,6 +52,10 @@ จะต้องเป็นชื่อที่ตรงกับบัตรประจำตัวประชาชน
+ +
+ +
@@ -59,6 +63,17 @@ import { ref } from 'vue' import { useCounterMixin } from '@/stores/mixin' +const props = defineProps({ + fetchStep: { + type: Function, + default: () => console.log('not function') + }, + step: { + type: Number, + required: true + } +}) + const mixin = useCounterMixin() const { date2Thai } = mixin const exam = ref({ @@ -78,6 +93,10 @@ const exam = ref({ } ] }) + +const applyCandidate = () => { + props.fetchStep() +} diff --git a/src/modules/01_exam/components/ExamFinished.vue b/src/modules/01_exam/components/ExamFinished.vue index 8fe7cad..1ab0a06 100644 --- a/src/modules/01_exam/components/ExamFinished.vue +++ b/src/modules/01_exam/components/ExamFinished.vue @@ -62,14 +62,25 @@ - - + diff --git a/src/modules/01_exam/components/ExamPayment.vue b/src/modules/01_exam/components/ExamPayment.vue index 1bf88ac..f9c6496 100644 --- a/src/modules/01_exam/components/ExamPayment.vue +++ b/src/modules/01_exam/components/ExamPayment.vue @@ -1,5 +1,5 @@ diff --git a/src/modules/01_exam/components/Address.vue b/src/modules/01_exam/components/Form/Profile/Address.vue similarity index 96% rename from src/modules/01_exam/components/Address.vue rename to src/modules/01_exam/components/Form/Profile/Address.vue index d8e3842..1a0811c 100644 --- a/src/modules/01_exam/components/Address.vue +++ b/src/modules/01_exam/components/Form/Profile/Address.vue @@ -15,6 +15,7 @@ :history="true" :addData="addData" :cancel="cancelData" + :changeBtn="changeBtn" />
@@ -254,19 +255,23 @@ const props = defineProps({ statusEdit: { type: Boolean, required: true + }, + notiNoEdit: { + type: Function, + default: () => console.log('not function') + }, + step: { + type: Number, + required: true } }) const emit = defineEmits(['update:statusEdit']) -watch(edit, (count: boolean, prevCount: boolean) => { - if (props.statusEdit == true) { - edit.value = false - emit('update:statusEdit', count) - } -}) - onMounted(() => { + if (props.step !== 2) { + addData.value = false + } // fetchProvince() // fetchDistrict(addressData.value.provinceId, '1') // fetchDistrict(addressData.value.provinceIdC, '2') @@ -280,6 +285,19 @@ const saveData = async () => { }) } +const changeBtn = async () => { + if (edit.value == true) { + if (props.statusEdit === true) { + edit.value = false + props.notiNoEdit() + } else { + emit('update:statusEdit', true) + } + } else { + emit('update:statusEdit', false) + } +} + const selectProvince = (e: string, name: string) => { if (name == '1') { addressData.value.districtId = '' diff --git a/src/modules/01_exam/components/Family.vue b/src/modules/01_exam/components/Form/Profile/Family.vue similarity index 95% rename from src/modules/01_exam/components/Family.vue rename to src/modules/01_exam/components/Form/Profile/Family.vue index 67197d2..e804fb7 100644 --- a/src/modules/01_exam/components/Family.vue +++ b/src/modules/01_exam/components/Form/Profile/Family.vue @@ -8,6 +8,7 @@ :save="saveData" :addData="addData" :cancel="cancelData" + :changeBtn="changeBtn" />
@@ -270,7 +271,7 @@ diff --git a/src/modules/01_exam/views/ExamDetail.vue b/src/modules/01_exam/views/ExamDetail.vue index 0620bed..e315967 100644 --- a/src/modules/01_exam/views/ExamDetail.vue +++ b/src/modules/01_exam/views/ExamDetail.vue @@ -7,42 +7,58 @@
+ - - + + - - + + - + - - + +
-