From 64f60eead952d7b3a4f6eace8ee9076efae10fee Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 18 Feb 2025 11:38:13 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9B=E0=B8=A5=E0=B8=B5=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=20id=20=E0=B9=80=E0=B8=9B=E0=B9=87=E0=B8=99?=
 =?UTF-8?q?=20id=20card?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Indicators/indicatorByRole/DetailView.vue |  3 +--
 .../components/detail/Other/03_Document7.vue  | 21 +++++++++++++------
 src/modules/04_registryPerson/store.ts        |  2 ++
 .../04_registryPerson/views/detailView.vue    |  1 +
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue b/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
index 185d947c9..efc700d16 100644
--- a/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
+++ b/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
@@ -280,7 +280,7 @@ onMounted(() => {
             <q-select
               :readonly="checkRoute"
               dense
-              :model-value="form.position"
+              v-model="form.position"
               label="ตำแหน่งในสายงาน"
               outlined
               emit-value
@@ -295,7 +295,6 @@ onMounted(() => {
               class="inputgreen"
               :options="positionOp"
               use-input
-              @input-value="setModel"
               @filter="(inputValue:any,doneFn:Function) => filterOption(inputValue, doneFn) "
             >
               <template v-slot:no-option>
diff --git a/src/modules/04_registryPerson/components/detail/Other/03_Document7.vue b/src/modules/04_registryPerson/components/detail/Other/03_Document7.vue
index c7c69e9cb..fc13b2e8e 100644
--- a/src/modules/04_registryPerson/components/detail/Other/03_Document7.vue
+++ b/src/modules/04_registryPerson/components/detail/Other/03_Document7.vue
@@ -8,10 +8,11 @@ import { useRoute } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
-
+import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
 import type { ArrayFileList } from "@/modules/04_registryPerson/interface/index/document";
 
 const $q = useQuasar();
+const storeRegistry = useRegistryNewDataStore();
 const route = useRoute();
 const mixin = useCounterMixin();
 const {
@@ -43,10 +44,18 @@ async function getData() {
   showLoader();
   await http
     .get(
-      config.API.file("ระบบทะเบียนประวัติ", "เอกสารหลักฐานเพิ่มเติม", profileId.value)
+      config.API.file(
+        "ระบบทะเบียนประวัติ",
+        "เอกสารหลักฐานเพิ่มเติม",
+        storeRegistry.citizenId
+      )
     )
     .then((res) => {
-        console.log("ระบบทะเบียนประวัติ", "เอกสารหลักฐานเพิ่มเติม", profileId.value)
+      console.log(
+        "ระบบทะเบียนประวัติ",
+        "เอกสารหลักฐานเพิ่มเติม",
+        storeRegistry.citizenId
+      );
       fileList.value = res.data;
     })
     .catch((e) => {
@@ -74,7 +83,7 @@ function clickUpload(file: any) {
           config.API.file(
             "ระบบทะเบียนประวัติ",
             "เอกสารหลักฐานเพิ่มเติม",
-            profileId.value
+            storeRegistry.citizenId
           ),
           {
             replace: false,
@@ -136,7 +145,7 @@ function downloadFile(fileName: string) {
       config.API.fileByFile(
         "ระบบทะเบียนประวัติ",
         "เอกสารหลักฐานเพิ่มเติม",
-        profileId.value,
+        storeRegistry.citizenId,
         fileName
       )
     )
@@ -164,7 +173,7 @@ function deleteFile(fileName: string) {
         config.API.fileByFile(
           "ระบบทะเบียนประวัติ",
           "เอกสารหลักฐานเพิ่มเติม",
-          profileId.value,
+          storeRegistry.citizenId,
           fileName
         )
       )
diff --git a/src/modules/04_registryPerson/store.ts b/src/modules/04_registryPerson/store.ts
index 21ef6f2ca..73587c996 100644
--- a/src/modules/04_registryPerson/store.ts
+++ b/src/modules/04_registryPerson/store.ts
@@ -20,6 +20,7 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
     { id: "perm", name: "ลูกจ้างประจำ" },
     // { id: "temp", name: "ลูกจ้างชั่วคราว" },
   ]);
+  const citizenId = ref<string>('')
   const posTypeOps = ref<DataOption[]>([]);
   const posTypeMain = ref<DataType[]>([]);
   const posLevelOps = ref<DataOption[]>([]);
@@ -147,5 +148,6 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
     convertTypeRetired,
     retireTypeOps,
     retireTypeEmpOps,
+    citizenId
   };
 });
diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue
index f7220737b..e5c04cad3 100644
--- a/src/modules/04_registryPerson/views/detailView.vue
+++ b/src/modules/04_registryPerson/views/detailView.vue
@@ -364,6 +364,7 @@ async function fetchDataPersonal() {
     .get(config.API.registryNewByProfileId(profileId.value, empType.value))
     .then(async (res) => {
       formDetail.value = await res.data.result;
+      storeRegistry.citizenId = res.data.result.citizenId;
       storeRegistry.isLeave = res.data.result.isLeave;
 
       if (res.data.result.leaveReason) {