From fd1b08461ad95462151fa483ae6f9b43316f4d61 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Fri, 7 Apr 2023 17:59:48 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9A=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=84=20=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6?=
 =?UTF-8?q?=E0=B8=81=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/01_exam/components/ExamPayment.vue    | 11 ++++++-----
 src/modules/01_exam/components/Form/Career.vue    |  4 ++--
 src/modules/01_exam/components/Form/Education.vue |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/modules/01_exam/components/ExamPayment.vue b/src/modules/01_exam/components/ExamPayment.vue
index 25d18d0..81d3eb5 100644
--- a/src/modules/01_exam/components/ExamPayment.vue
+++ b/src/modules/01_exam/components/ExamPayment.vue
@@ -65,7 +65,7 @@
                         </div> -->
                         <div>
                           <span class="text-weight-medium">ยอดสุทธิ (บาท) :</span>
-                          <span class="text-blue q-pl-sm text-bold">200.00</span>
+                          <span class="text-blue q-pl-sm text-bold">{{ fee }}</span>
                         </div>
                       </div>
                       <div class="col-12 text-grey-6 q-mt-xl">
@@ -154,7 +154,7 @@
                     </div>
                     <div>
                       <span class="text-weight-medium">ยอดสุทธิ (บาท) :</span>
-                      <span class="text-blue q-pl-sm text-bold">200.00</span>
+                      <span class="text-blue q-pl-sm text-bold">{{ fee }}</span>
                     </div>
                     <q-btn
                       color="blue"
@@ -266,16 +266,16 @@ const props = defineProps({
 
 const $q = useQuasar()
 const mixin = useCounterMixin() //เรียกฟังก์ชันกลาง
-const { success } = mixin
+const { success, modalError } = mixin
 const rejectMessage = ref<string>('กรุณาจ่ายเงินให้ครบตามจำนวน')
 const img = ref<string>('@/assets/krungthai.png')
 const fileData = ref<any>()
 const loader = ref<boolean>(false)
-const pay = ref(null)
 const route = useRoute()
 const examId = ref<string>(route.params.id.toString())
 const positionId = ref<string>(route.params.positionId.toString())
 const bank = ref<any>([])
+const fee = ref<number>()
 const filePayment = ref<File[]>([])
 const fileDataUpload = ref<File>()
 
@@ -297,7 +297,8 @@ const fetchPaymentExam = async () => {
     .get(config.API.periodExamPayment(examId.value))
     .then((res) => {
       const data = res.data.result
-      bank.value = data
+      bank.value = data.bankExam
+      fee.value = data.fee
     })
     .catch(() => {})
     .finally(async () => {
diff --git a/src/modules/01_exam/components/Form/Career.vue b/src/modules/01_exam/components/Form/Career.vue
index 44976ae..14183ce 100644
--- a/src/modules/01_exam/components/Form/Career.vue
+++ b/src/modules/01_exam/components/Form/Career.vue
@@ -384,7 +384,7 @@ const clickDeleteRow = async () => {
   if (rawItem.value != null) {
     loader.value = true
     await http
-      .delete(config.API.candidateCareer(rawItem.value.id))
+      .delete(config.API.candidateCareer(rawItem.value.id,""))
       .then(() => {
         success($q, 'ลบข้อมูลสำเร็จ')
       })
@@ -461,7 +461,7 @@ const saveData = async () => {
 const editData = async () => {
   loader.value = true
   await http
-    .put(config.API.candidateCareer(id.value), {
+    .put(config.API.candidateCareer(id.value,""), {
       name: location.value,
       position: position.value,
       salary: salary.value,
diff --git a/src/modules/01_exam/components/Form/Education.vue b/src/modules/01_exam/components/Form/Education.vue
index 2ccd744..3320986 100644
--- a/src/modules/01_exam/components/Form/Education.vue
+++ b/src/modules/01_exam/components/Form/Education.vue
@@ -410,7 +410,7 @@ const clickDeleteRow = async () => {
   if (rawItem.value != null) {
     loader.value = true
     await http
-      .delete(config.API.candidateEducation(rawItem.value.id))
+      .delete(config.API.candidateEducation(rawItem.value.id, ''))
       .then(() => {
         success($q, 'ลบข้อมูลสำเร็จ')
       })
@@ -487,7 +487,7 @@ const saveData = async () => {
 const editData = async () => {
   loader.value = true
   await http
-    .put(config.API.candidateEducation(id.value), {
+    .put(config.API.candidateEducation(id.value,""), {
       educationLevelId: educationLevelId.value,
       major: major.value,
       scores: scores.value,