From 7c7edc2a809887f3ec71429e65516d56999434e3 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Wed, 6 Dec 2023 16:25:12 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=20id=20=E0=B8=94=E0=B8=B9=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=B9=E0=B8=A5=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B4=20=E0=B9=80=E0=B8=A1=E0=B8=99=E0=B8=B9?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B8=96=E0=B8=B9=E0=B8=81=E0=B8=9E?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=81=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{OutRegistry.vue => DetailPage.vue}       |  26 ++--
 .../{DismissOrder.vue => ListsPage.vue}       |   0
 .../interface/response/suspend.ts             | 136 +++++++++---------
 src/modules/11_discipline/router.ts           |   4 +-
 4 files changed, 81 insertions(+), 85 deletions(-)
 rename src/modules/11_discipline/components/7_ListSuspend/{OutRegistry.vue => DetailPage.vue} (97%)
 rename src/modules/11_discipline/components/7_ListSuspend/{DismissOrder.vue => ListsPage.vue} (100%)

diff --git a/src/modules/11_discipline/components/7_ListSuspend/OutRegistry.vue b/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue
similarity index 97%
rename from src/modules/11_discipline/components/7_ListSuspend/OutRegistry.vue
rename to src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue
index c74a2df5d..8cf2217ad 100644
--- a/src/modules/11_discipline/components/7_ListSuspend/OutRegistry.vue
+++ b/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue
@@ -45,6 +45,7 @@ const reason = ref<string>("");
 
 const data = reactive<dataDetail>({
   id: "",
+  personId: "",
   citizenId: "",
   avataPath: "",
   name: "",
@@ -83,6 +84,7 @@ const getData = async () => {
       console.log(res.data.result);
       const dataGet = res.data.result;
       data.id = dataGet.id;
+      data.personId = dataGet.personId;
       data.citizenId = dataGet.citizenId;
       data.name = `${dataGet.prefix}${dataGet.firstName} ${dataGet.lastName}`;
       data.prefix = dataGet.prefix;
@@ -210,7 +212,7 @@ const getClass = (val: boolean) => {
         icon-right="mdi-open-in-new"
         class="q-px-sm"
         label="ดูข้อมูลทะเบียนประวัติ"
-        @click="router.push(`/registry/${data.id}`)"
+        @click="router.push(`/registry/${data.personId}`)"
       />
     </div>
     <div class="col-12"><q-separator /></div>
@@ -508,9 +510,7 @@ const getClass = (val: boolean) => {
               dense
               readonly
               v-model="data.offenseDetails"
-              :options="
-                          dataStore.offenseDetailsOps
-                        "
+              :options="dataStore.offenseDetailsOps"
               label="ผลการสืบสวน"
               emit-value
               map-options
@@ -528,15 +528,15 @@ const getClass = (val: boolean) => {
           </div>
           <div class="col-4">
             <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                readonly
-                :borderless="!edit"
-                v-model="data.disciplinaryFaultLevel"
-                hide-bottom-space
-                :label="`${'ระดับโทษความผิด'}`"
-              />
+              :class="getClass(edit)"
+              :outlined="edit"
+              dense
+              readonly
+              :borderless="!edit"
+              v-model="data.disciplinaryFaultLevel"
+              hide-bottom-space
+              :label="`${'ระดับโทษความผิด'}`"
+            />
           </div>
           <div class="col-12">
             <q-input
diff --git a/src/modules/11_discipline/components/7_ListSuspend/DismissOrder.vue b/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue
similarity index 100%
rename from src/modules/11_discipline/components/7_ListSuspend/DismissOrder.vue
rename to src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue
diff --git a/src/modules/11_discipline/interface/response/suspend.ts b/src/modules/11_discipline/interface/response/suspend.ts
index e4ada0030..4cb0e8f47 100644
--- a/src/modules/11_discipline/interface/response/suspend.ts
+++ b/src/modules/11_discipline/interface/response/suspend.ts
@@ -1,78 +1,74 @@
-interface listData{
-        id: string
-        citizenId: string
-        prefix: string
-        firstName: string
-        lastName: string
-        organization: string
-        position: string
-        posNo: string
-        positionLevel: string
-        salary: number
-        status: string
-        descriptionSuspend: string
-        startDateSuspend: Date,
-        endDateSuspend: Date,
-        title: string
-        offenseDetails: string
-        disciplinaryFaultLevel: string
-        disciplinaryCaseFault: string
+interface listData {
+  id: string;
+  citizenId: string;
+  prefix: string;
+  firstName: string;
+  lastName: string;
+  organization: string;
+  position: string;
+  posNo: string;
+  positionLevel: string;
+  salary: number;
+  status: string;
+  descriptionSuspend: string;
+  startDateSuspend: Date;
+  endDateSuspend: Date;
+  title: string;
+  offenseDetails: string;
+  disciplinaryFaultLevel: string;
+  disciplinaryCaseFault: string;
 }
 
-interface dataType{
-        id: string
-        citizenId: string
-        name:string
-        prefix: string
-        firstName: string
-        lastName: string
-        organization: string
-        position: string
-        posNo: string
-        positionLevel: string
-        salary: number
-        status: string
-        statusEn: string
-        descriptionSuspend: string
-        dateTotal:string
-        startDateSuspend: Date,
-        endDateSuspend: Date,
-        title: string
-        offenseDetails: string
-        disciplinaryFaultLevel: string
-        disciplinaryCaseFault: string
+interface dataType {
+  id: string;
+  citizenId: string;
+  name: string;
+  prefix: string;
+  firstName: string;
+  lastName: string;
+  organization: string;
+  position: string;
+  posNo: string;
+  positionLevel: string;
+  salary: number;
+  status: string;
+  statusEn: string;
+  descriptionSuspend: string;
+  dateTotal: string;
+  startDateSuspend: Date;
+  endDateSuspend: Date;
+  title: string;
+  offenseDetails: string;
+  disciplinaryFaultLevel: string;
+  disciplinaryCaseFault: string;
 }
 
-interface dataDetail{
-    id: string
-    citizenId: string
-    avataPath:string
-    name:string
-    prefix: string
-    firstName: string
-    lastName: string
-    organization: string
-    position: string
-    posNo: string
-    positionLevel: string
-    salary: number
-    status: string
-    descriptionSuspend: string
-    startDateSuspend: Date|null
-    endDateSuspend: Date|null
-    title: string
-    offenseDetails: string
-    disciplinaryFaultLevel: string
-    disciplinaryCaseFault: string
+interface dataDetail {
+  id: string;
+  personId: string;
+  citizenId: string;
+  avataPath: string;
+  name: string;
+  prefix: string;
+  firstName: string;
+  lastName: string;
+  organization: string;
+  position: string;
+  posNo: string;
+  positionLevel: string;
+  salary: number;
+  status: string;
+  descriptionSuspend: string;
+  startDateSuspend: Date | null;
+  endDateSuspend: Date | null;
+  title: string;
+  offenseDetails: string;
+  disciplinaryFaultLevel: string;
+  disciplinaryCaseFault: string;
 }
 
 interface DataOption {
-    id:string
-    name:string
+  id: string;
+  name: string;
 }
-export type {
-    listData,
-    dataType,
-    dataDetail,
-    DataOption
-}
\ No newline at end of file
+export type { listData, dataType, dataDetail, DataOption };
diff --git a/src/modules/11_discipline/router.ts b/src/modules/11_discipline/router.ts
index 2e26a1b13..5d0395e4a 100644
--- a/src/modules/11_discipline/router.ts
+++ b/src/modules/11_discipline/router.ts
@@ -64,9 +64,9 @@ const resultEditPage = () =>
 
 // รายชื่อผู้ถูกพักราชการ
 const listSuspendMainPage = () =>
-  import("@/modules/11_discipline/components/7_ListSuspend/DismissOrder.vue");
+  import("@/modules/11_discipline/components/7_ListSuspend/ListsPage.vue");
 const suspendEditPage = () =>
-  import("@/modules/11_discipline/components/7_ListSuspend/OutRegistry.vue");
+  import("@/modules/11_discipline/components/7_ListSuspend/DetailPage.vue");
 
 export default [
   {