From 2cec81510087ca3d385f5b04c39e4866651bd878 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 18 Mar 2025 13:44:54 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9B=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/interface/Main.ts                             |  3 +++
 .../06_evaluate/components/EvaluateStepMain.vue   |  1 +
 src/modules/06_evaluate/components/ExpertPage.vue | 15 +++++++++++++--
 src/stores/data.ts                                |  5 +++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/interface/Main.ts b/src/interface/Main.ts
index 6c3f1f5..a24e4a0 100644
--- a/src/interface/Main.ts
+++ b/src/interface/Main.ts
@@ -9,6 +9,9 @@ interface ProfileData {
   posLevelName: string;
   posNo: string;
   profileId: string;
+  citizenId?: string;
+  salary?: number|null;
+  birthDate?: string;
 }
 
 interface InformationData {
diff --git a/src/modules/06_evaluate/components/EvaluateStepMain.vue b/src/modules/06_evaluate/components/EvaluateStepMain.vue
index c35f763..fcecc82 100644
--- a/src/modules/06_evaluate/components/EvaluateStepMain.vue
+++ b/src/modules/06_evaluate/components/EvaluateStepMain.vue
@@ -790,6 +790,7 @@ onMounted(async () => {
               />
               <q-btn
                 v-if="
+                  downloadFileRef &&
                   store.step >= store.currentStep &&
                   store.step == 6 &&
                   store.statusUpload
diff --git a/src/modules/06_evaluate/components/ExpertPage.vue b/src/modules/06_evaluate/components/ExpertPage.vue
index 50d51ef..cdf4bf9 100644
--- a/src/modules/06_evaluate/components/ExpertPage.vue
+++ b/src/modules/06_evaluate/components/ExpertPage.vue
@@ -6,11 +6,13 @@ import { useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
+import { useDataStore } from "@/stores/data";
 
 import type { FormCommandSe } from "@/modules/06_evaluate/interface/evalute";
 
 const $q = useQuasar();
 const router = useRouter();
+const dataPerson = useDataStore();
 const mixin = useCounterMixin();
 const { dialogConfirm, messageError, showLoader, hideLoader } = mixin;
 
@@ -28,9 +30,19 @@ const formData = reactive<FormCommandSe>({
  */
 function onSubmit() {
   dialogConfirm($q, () => {
+    const body = {
+      ...formData,
+      citizenId: dataPerson.formData.citizenId,
+      prefix: dataPerson.formData.prefix,
+      fullName: `${dataPerson.formData.prefix}${dataPerson.formData.firstName} ${dataPerson.formData.lastName}`,
+      position: dataPerson.formData.position,
+      salary: dataPerson.formData.salary?.toString(),
+      posNo: dataPerson.formData.posNo,
+      birthDate: dataPerson.formData.birthDate,
+    };
     showLoader();
     http
-      .post(config.API.evaluationExpertise, formData)
+      .post(config.API.evaluationExpertise, body)
       .then((res) => {
         router.push(`/evaluate/detail/expertise/${res.data.result.id}`);
       })
@@ -89,7 +101,6 @@ onMounted(() => {
           <div>ประเมินเชี่ยวชาญ</div>
         </div>
       </div>
-
       <div class="col-xs-12 col-sm-12 col-md-11 row q-col-gutter-md">
         <div class="col-12">
           <q-card bordered>
diff --git a/src/stores/data.ts b/src/stores/data.ts
index cc2fe19..b8fe9fc 100644
--- a/src/stores/data.ts
+++ b/src/stores/data.ts
@@ -25,6 +25,8 @@ export const useDataStore = defineStore("dataMain", () => {
     posExecutiveName: "",
     posTypeName: "",
     posLevelName: "",
+    salary: null,
+    birthDate: '',
     posNo: "",
   });
   const count = ref<number>(0);
@@ -102,6 +104,9 @@ export const useDataStore = defineStore("dataMain", () => {
     formData.firstName = data.firstName;
     formData.lastName = data.lastName;
     formData.position = data.position;
+    formData.salary = data.salary;
+    formData.citizenId = data.citizenId;
+    formData.birthDate = data.birthDate;
     formData.posTypeName = data.posTypeName;
     formData.posExecutiveName = data.posExecutiveName;
     formData.posLevelName = data.posLevelName;