From 6646f8f6f4f9b79b44834332c9bfa3a34491747a Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Fri, 5 Jan 2024 15:24:22 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=A7=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=99=E0=B8=B1=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/1_Complaint/Form.vue           | 27 ++++++-----
 .../components/2_InvestigateFacts/Form.vue    | 46 ++++++++++--------
 .../3_InvestigateDisciplinary/Form.vue        | 48 ++++++++++---------
 .../components/4_Result/EditPage.vue          |  1 +
 .../components/4_Result/Form.vue              |  5 ++
 .../6_BasicInformation/Director/Form.vue      |  5 +-
 .../components/8_AppealComplain/MainPage.vue  | 26 ++++++++--
 .../store/AppealComplainStore.ts              |  1 +
 src/modules/11_discipline/store/main.ts       |  1 -
 9 files changed, 98 insertions(+), 62 deletions(-)

diff --git a/src/modules/11_discipline/components/1_Complaint/Form.vue b/src/modules/11_discipline/components/1_Complaint/Form.vue
index a75cdbfef..647c3c0b8 100644
--- a/src/modules/11_discipline/components/1_Complaint/Form.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Form.vue
@@ -497,6 +497,7 @@ onMounted(() => {
                       >
                         <template v-slot:header="props">
                           <q-tr :props="props">
+                                                      <q-th auto-width></q-th>
                             <q-th
                               v-for="col in props.cols"
                               :key="col.name"
@@ -512,6 +513,15 @@ onMounted(() => {
                         </template>
                         <template v-slot:body="props">
                           <q-tr :props="props" class="cursor-pointer">
+                          <td>
+                            <router-link
+                              target="_blank"
+                              :to="`/registry/${props.row.personId}`"
+                              ><q-icon name="info" color="info" size="sm"
+                                ><q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
+                              </q-icon></router-link
+                            >
+                          </td>
                             <q-td
                               v-for="col in props.cols"
                               :key="col.name"
@@ -520,24 +530,17 @@ onMounted(() => {
                               <div v-if="col.name == 'no'">
                                 {{ props.rowIndex + 1 }}
                               </div>
-                              <div v-else-if="col.name == 'info'">
-                                <router-link
-                                  target="_blank"
-                                  :to="`/registry/${props.row.personId}`"
-                                  ><q-icon name="info" color="info" size="sm"
-                                    ><q-tooltip
-                                      >ดูข้อมูลในทะเบียนประวัติ</q-tooltip
-                                    >
-                                  </q-icon></router-link
-                                >
-                                {{ col.value }}
-                              </div>
                               <div
                                 v-else-if="col.name === 'organization'"
                                 class="table_ellipsis"
                               >
                                 {{ props.row.organization }}
                               </div>
+                              <div
+                                v-else-if="col.name === 'salary'"
+                              >
+                              {{ props.row.salary.toLocaleString() }}
+                              </div>
                               <div v-else>
                                 {{ col.value }}
                               </div>
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index 33bf1a240..20a450e6f 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -298,17 +298,17 @@ watch(props.data, async () => {
     );
 
     const dataMap = props.data.directors.map((item: any) => ({
-      id: item.id ? item.id:'-',
-      directorId: item.directorId ? item.directorId:'-',
+      id: item.id ? item.id : "-",
+      directorId: item.directorId ? item.directorId : "-",
       name: `${item.prefix}${item.firstName} ${item.lastName}`,
-      prefix: item.prefix ? item.prefix:'-',
-      firstName: item.firstName ? item.firstName:'-',
-      lastName: item.lastName ? item.lastName:'-',
-      position: item.position ? item.position:'-',
-      email: item.email ? item.email:'-',
-      phone: item.phone ? item.phone:'-',
-      commandNo: item.commandNo ? item.commandNo:'-',
-      duty: item.duty ? item.duty:'-',
+      prefix: item.prefix ? item.prefix : "-",
+      firstName: item.firstName ? item.firstName : "-",
+      lastName: item.lastName ? item.lastName : "-",
+      position: item.position ? item.position : "-",
+      email: item.email ? item.email : "-",
+      phone: item.phone ? item.phone : "-",
+      commandNo: item.commandNo ? item.commandNo : "-",
+      duty: item.duty ? item.duty : "-",
       check: "props",
     }));
 
@@ -741,6 +741,7 @@ onMounted(async () => {
                       >
                         <template v-slot:header="props">
                           <q-tr :props="props">
+                            <q-th auto-width></q-th>
                             <q-th
                               v-for="col in props.cols"
                               :key="col.name"
@@ -756,6 +757,17 @@ onMounted(async () => {
                         </template>
                         <template v-slot:body="props">
                           <q-tr :props="props" class="cursor-pointer">
+                            <td>
+                              <router-link
+                                target="_blank"
+                                :to="`/registry/${props.row.personId}`"
+                                ><q-icon name="info" color="info" size="sm"
+                                  ><q-tooltip
+                                    >ดูข้อมูลในทะเบียนประวัติ</q-tooltip
+                                  >
+                                </q-icon></router-link
+                              >
+                            </td>
                             <q-td
                               v-for="col in props.cols"
                               :key="col.name"
@@ -764,23 +776,15 @@ onMounted(async () => {
                               <div v-if="col.name == 'no'">
                                 {{ props.rowIndex + 1 }}
                               </div>
-                              <div v-else-if="col.name == 'info'">
-                                <router-link
-                                  target="_blank"
-                                  :to="`/registry/${props.row.personId}`"
-                                  ><q-icon name="info" color="info" size="sm"
-                                    ><q-tooltip
-                                      >ดูข้อมูลในทะเบียนประวัติ</q-tooltip
-                                    >
-                                  </q-icon></router-link
-                                >
-                              </div>
                               <div
                                 v-else-if="col.name === 'organization'"
                                 class="table_ellipsis"
                               >
                                 {{ props.row.organization }}
                               </div>
+                              <div v-else-if="col.name === 'salary'">
+                                {{ props.row.salary.toLocaleString() }}
+                              </div>
                               <div v-else>
                                 {{ col.value }}
                               </div>
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index 29e1a6488..2d515bf06 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -328,17 +328,17 @@ async function fetchDatadetail() {
     );
     /** MAP รายชื่อกรรมการ หน้าหลัก */
     const dataMap = props.data.director.map((item: any) => ({
-      idRaw: item.id ? item.id:'-',
-      id: item.directorId ? item.directorId:'-',
+      idRaw: item.id ? item.id : "-",
+      id: item.directorId ? item.directorId : "-",
       name: `${item.prefix}${item.firstName} ${item.lastName}`,
-      prefix: item.prefix ? item.prefix:'-',
-      firstName: item.firstName ? item.firstName:'-',
-      lastName: item.lastName ? item.lastName:'-',
-      position: item.position ? item.position:'-',
-      email: item.email ? item.email:'-',
-      phone: item.phone ? item.phone:'-',
-      duty: item.duty ? item.duty:'-',
-      commandNo: item.commandNo ? item.commandNo:'-',
+      prefix: item.prefix ? item.prefix : "-",
+      firstName: item.firstName ? item.firstName : "-",
+      lastName: item.lastName ? item.lastName : "-",
+      position: item.position ? item.position : "-",
+      email: item.email ? item.email : "-",
+      phone: item.phone ? item.phone : "-",
+      duty: item.duty ? item.duty : "-",
+      commandNo: item.commandNo ? item.commandNo : "-",
       check: "props",
     }));
 
@@ -540,7 +540,7 @@ function emitPerson(data: PersonsArray[]) {
 }
 
 function openEditDirector(data: any) {
-  console.log(data)
+  console.log(data);
   editDirectorId.value = data.idRaw;
   modalEditDirector.value = true;
   dutyVal.value = data.duty;
@@ -766,6 +766,7 @@ onMounted(async () => {
                       >
                         <template v-slot:header="props">
                           <q-tr :props="props">
+                            <q-th auto-width></q-th>
                             <q-th
                               v-for="col in props.cols"
                               :key="col.name"
@@ -781,6 +782,17 @@ onMounted(async () => {
                         </template>
                         <template v-slot:body="props">
                           <q-tr :props="props" class="cursor-pointer">
+                            <td>
+                              <router-link
+                                target="_blank"
+                                :to="`/registry/${props.row.personId}`"
+                                ><q-icon name="info" color="info" size="sm"
+                                  ><q-tooltip
+                                    >ดูข้อมูลในทะเบียนประวัติ</q-tooltip
+                                  >
+                                </q-icon></router-link
+                              >
+                            </td>
                             <q-td
                               v-for="col in props.cols"
                               :key="col.name"
@@ -789,23 +801,15 @@ onMounted(async () => {
                               <div v-if="col.name == 'no'">
                                 {{ props.rowIndex + 1 }}
                               </div>
-                              <div v-else-if="col.name == 'info'">
-                                <router-link
-                                  target="_blank"
-                                  :to="`/registry/${props.row.personId}`"
-                                  ><q-icon name="info" color="info" size="sm"
-                                    ><q-tooltip
-                                      >ดูข้อมูลในทะเบียนประวัติ</q-tooltip
-                                    >
-                                  </q-icon></router-link
-                                >
-                              </div>
                               <div
                                 v-else-if="col.name === 'organization'"
                                 class="table_ellipsis"
                               >
                                 {{ props.row.organization }}
                               </div>
+                              <div v-else-if="col.name === 'salary'">
+                                {{ props.row.salary.toLocaleString() }}
+                              </div>
                               <div v-else>
                                 {{ col.value }}
                               </div>
diff --git a/src/modules/11_discipline/components/4_Result/EditPage.vue b/src/modules/11_discipline/components/4_Result/EditPage.vue
index 4ad583078..58ea31e4c 100644
--- a/src/modules/11_discipline/components/4_Result/EditPage.vue
+++ b/src/modules/11_discipline/components/4_Result/EditPage.vue
@@ -65,6 +65,7 @@ const dataInvestigatefacts = reactive<FormInvestigateFact>({
   organizationId: "",
   persons: [],
   investigationExtendHistory: [],
+  isDisciplinary:false
 });
 
 const personObjComplaint = reactive<ArrayPerson>({
diff --git a/src/modules/11_discipline/components/4_Result/Form.vue b/src/modules/11_discipline/components/4_Result/Form.vue
index 053f3a011..4941f3509 100644
--- a/src/modules/11_discipline/components/4_Result/Form.vue
+++ b/src/modules/11_discipline/components/4_Result/Form.vue
@@ -379,6 +379,11 @@ function closeDetail() {
                             >
                               {{ props.row.organization }}
                             </div>
+                            <div
+                                v-else-if="col.name === 'salary'"
+                              >
+                              {{ props.row.salary.toLocaleString() }}
+                              </div>
                             <div v-else>
                               {{ col.value }}
                             </div>
diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
index 6072fcf60..9b2bd5f0b 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
@@ -314,7 +314,7 @@ function returnDetail(data: any) {
     <q-card bordered>
       <div class="col-12 row q-pa-md">
         <div class="row col-12 q-col-gutter-md">
-          <div class="row col-12" v-if="data === null">
+          <div class="row col-12 q-col-gutter-sm" v-if="data === null">
             <div class="row col-12 q-col-gutter-sm items-start">
               <div class="col-12 col-sm-6 col-md-3">
                 <q-select
@@ -337,6 +337,7 @@ function returnDetail(data: any) {
                   v-model="search"
                   outlined
                   clearable
+                  hide-bottom-space
                   dense
                   label="คำค้น"
                   :rules="[(val) => !!val || `กรุณากรอกคำค้น`]"
@@ -354,6 +355,8 @@ function returnDetail(data: any) {
                 </q-btn>
               </div>
             </div>
+
+
             <div class="col-12">
               <d-table
                 ref="table"
diff --git a/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue b/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
index 1215a77bf..859f6d7e0 100644
--- a/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
+++ b/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
@@ -59,6 +59,7 @@ const visibleColumns = ref<string[]>([
   "citizenId",
   "caseType",
   "caseNumber",
+  "description",
   "lastUpdatedAt",
   "status",
 ]);
@@ -136,6 +137,17 @@ const columns = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
+  {
+    name: "description",
+    align: "left",
+    label: "รายละเอียด",
+    sortable: true,
+    field: "description",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
   {
     name: "lastUpdatedAt",
     align: "left",
@@ -185,10 +197,8 @@ function editPage(id: string) {
   router.push(`/discipline-appealcomplain/${id}`);
 }
 function filterFn() {
-
-    console.log("enter", filterKeyword.value);
-    getData();
-
+  console.log("enter", filterKeyword.value);
+  getData();
 }
 
 function close() {
@@ -440,7 +450,13 @@ onMounted(async () => {
                   1
                 }}
               </div>
-              <div>
+              <div
+                v-else-if="col.name === 'description'"
+                class="table_ellipsis"
+              >
+                {{ props.row.description }}
+              </div>
+              <div v-else>
                 {{ col.value }}
               </div>
             </q-td>
diff --git a/src/modules/11_discipline/store/AppealComplainStore.ts b/src/modules/11_discipline/store/AppealComplainStore.ts
index b2b329734..82c84d1c2 100644
--- a/src/modules/11_discipline/store/AppealComplainStore.ts
+++ b/src/modules/11_discipline/store/AppealComplainStore.ts
@@ -70,6 +70,7 @@ export const useAppealComplainStore = defineStore(
                 status: statusTothai(e.status)
             }));
             rows.value = dataList;
+            console.log(rows.value)
         }
         function getRow(data: RowAddList[]) {
             if (data) {
diff --git a/src/modules/11_discipline/store/main.ts b/src/modules/11_discipline/store/main.ts
index b7df02016..ce0066f3a 100644
--- a/src/modules/11_discipline/store/main.ts
+++ b/src/modules/11_discipline/store/main.ts
@@ -109,7 +109,6 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
 
   /** หัวข้อที่เเสดงในตารางผู้ถูกร้องเรียน */
   const visibleColumnsRespondent = ref<string[]>([
-    "info",
     "no",
     "idcard",
     "name",