แก้ไข id ดูข้อมูลทะเบียนประวัติ เมนูรายชื่อผู้ถูกพักราชการ

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="
+              :options="dataStore.offenseDetailsOps"
-                          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)"
+              :class="getClass(edit)"
-                :outlined="edit"
+              :outlined="edit"
-                dense
+              dense
-                readonly
+              readonly
-                :borderless="!edit"
+              :borderless="!edit"
-                v-model="data.disciplinaryFaultLevel"
+              v-model="data.disciplinaryFaultLevel"
-                hide-bottom-space
+              hide-bottom-space
-                :label="`${'ระดับโทษความผิด'}`"
+              :label="`${'ระดับโทษความผิด'}`"
-              />
+            />
           </div>
           <div class="col-12">
             <q-input

src/modules/11_discipline/interface/response/suspend.ts

@@ -1,78 +1,74 @@
-interface listData{
+interface listData {
-        id: string
+  id: string;
-        citizenId: string
+  citizenId: string;
-        prefix: string
+  prefix: string;
-        firstName: string
+  firstName: string;
-        lastName: string
+  lastName: string;
-        organization: string
+  organization: string;
-        position: string
+  position: string;
-        posNo: string
+  posNo: string;
-        positionLevel: string
+  positionLevel: string;
-        salary: number
+  salary: number;
-        status: string
+  status: string;
-        descriptionSuspend: string
+  descriptionSuspend: string;
-        startDateSuspend: Date,
+  startDateSuspend: Date;
-        endDateSuspend: Date,
+  endDateSuspend: Date;
-        title: string
+  title: string;
-        offenseDetails: string
+  offenseDetails: string;
-        disciplinaryFaultLevel: string
+  disciplinaryFaultLevel: string;
-        disciplinaryCaseFault: string
+  disciplinaryCaseFault: string;
 }
 
-interface dataType{
+interface dataType {
-        id: string
+  id: string;
-        citizenId: string
+  citizenId: string;
-        name:string
+  name: string;
-        prefix: string
+  prefix: string;
-        firstName: string
+  firstName: string;
-        lastName: string
+  lastName: string;
-        organization: string
+  organization: string;
-        position: string
+  position: string;
-        posNo: string
+  posNo: string;
-        positionLevel: string
+  positionLevel: string;
-        salary: number
+  salary: number;
-        status: string
+  status: string;
-        statusEn: string
+  statusEn: string;
-        descriptionSuspend: string
+  descriptionSuspend: string;
-        dateTotal:string
+  dateTotal: string;
-        startDateSuspend: Date,
+  startDateSuspend: Date;
-        endDateSuspend: Date,
+  endDateSuspend: Date;
-        title: string
+  title: string;
-        offenseDetails: string
+  offenseDetails: string;
-        disciplinaryFaultLevel: string
+  disciplinaryFaultLevel: string;
-        disciplinaryCaseFault: string
+  disciplinaryCaseFault: string;
 }
 
-interface dataDetail{
+interface dataDetail {
-    id: string
+  id: string;
-    citizenId: string
+  personId: string;
-    avataPath:string
+  citizenId: string;
-    name:string
+  avataPath: string;
-    prefix: string
+  name: string;
-    firstName: string
+  prefix: string;
-    lastName: string
+  firstName: string;
-    organization: string
+  lastName: string;
-    position: string
+  organization: string;
-    posNo: string
+  position: string;
-    positionLevel: string
+  posNo: string;
-    salary: number
+  positionLevel: string;
-    status: string
+  salary: number;
-    descriptionSuspend: string
+  status: string;
-    startDateSuspend: Date|null
+  descriptionSuspend: string;
-    endDateSuspend: Date|null
+  startDateSuspend: Date | null;
-    title: string
+  endDateSuspend: Date | null;
-    offenseDetails: string
+  title: string;
-    disciplinaryFaultLevel: string
+  offenseDetails: string;
-    disciplinaryCaseFault: string
+  disciplinaryFaultLevel: string;
+  disciplinaryCaseFault: string;
 }
 
 interface DataOption {
-    id:string
+  id: string;
-    name:string
+  name: string;
 }
-export type {
+export type { listData, dataType, dataDetail, DataOption };
-    listData,
-    dataType,
-    dataDetail,
-    DataOption
-}

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 [
   {