From 4174a839f5eda233bb3fa21b6c4cca17934e164c Mon Sep 17 00:00:00 2001
From: AnandaTon <ananda@frappet.com>
Date: Thu, 26 Oct 2023 13:41:56 +0700
Subject: [PATCH] =?UTF-8?q?UI=20-=20=E0=B8=AA=E0=B8=AD=E0=B8=9A=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=99=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1=E0=B8=9C?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=94=E0=B8=97=E0=B8=B2=E0=B8=87=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

ปรับเลือกกรรมการ 1 คน
ปรับให้ขนาดพอดี
แก้ไข format วันที่
---
 .../3_InvestigateDisciplinary/Dialogbody.vue  | 68 +++----------------
 .../3_InvestigateDisciplinary/MainPage.vue    | 14 ++--
 .../store/InvestigateDisStore.ts              |  5 +-
 3 files changed, 21 insertions(+), 66 deletions(-)

diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Dialogbody.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Dialogbody.vue
index 69dac2586..c2ffc570c 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Dialogbody.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Dialogbody.vue
@@ -111,32 +111,13 @@ const checkSelected = computed(() => {
 const saveDirector = () => {
   dialogConfirm(
     $q,
-    () => Ordersave(),
+    () => DirectorSave(),
     "ยืนยันเพิ่มรายชื่อกรรมการ",
     "ต้องการยืนยันเพิ่มรายชื่อกรรมการ?"
   );
 };
 //ส่งไปออกคำสั่ง
-const Ordersave = async () => {
-  //   const id = selected.value.map((r) => r.id);
-  //   const body = {
-  //     id,
-  //   };
-  //   showLoader();
-  //   await http
-  //     .post(config.API.transferReport, body)
-  //     .then((res: any) => {
-  //       success($q, "ส่งไปออกคำสั่งสำเร็จ");
-  //       props.closeModal?.();
-  //     })
-  //     .catch((e) => {
-  //       messageError($q, e);
-  //     })
-  //     .finally(async () => {
-  //       props.getData?.();
-  //       hideLoader();
-  //     });
-};
+const DirectorSave = async () => {};
 
 const emit = defineEmits(["update:filterKeyword2", "update:selected"]);
 const updateInput = (value: any) => {
@@ -158,7 +139,7 @@ watchEffect(() => {
       <DialogHeader title="เลือกรายชื่อกรรมการ" :close="clickClose" />
       <q-separator />
       <q-card-section class="q-pt-none">
-        <div class="row justify-end">
+        <div>
           <div>
             <q-toolbar style="padding: 0">
               <q-input
@@ -170,7 +151,7 @@ watchEffect(() => {
                 :model-value="filterKeyword2"
                 @update:model-value="updateInput"
                 placeholder="ค้นหารายชื่อ"
-                style="width: 850px; max-width: auto"
+                style="max-width: 100%"
               >
                 <template v-slot:append>
                   <q-icon v-if="filterKeyword2 == ''" name="search" />
@@ -182,21 +163,6 @@ watchEffect(() => {
                   />
                 </template>
               </q-input>
-              <!-- <q-select
-                v-model="visibleColumns2"
-                multiple
-                outlined
-                dense
-                options-dense
-                :display-value="$q.lang.table.columns"
-                emit-value
-                map-options
-                :options="columns2"
-                option-value="name"
-                options-cover
-                style="min-width: 150px"
-                class="gt-xs q-ml-sm"
-              /> -->
             </q-toolbar>
           </div>
         </div>
@@ -205,7 +171,7 @@ watchEffect(() => {
           :columns="columns2"
           :rows="rows2"
           :filter="filterKeyword2"
-          row-key="id"
+          row-key="nameDirector"
           :visible-columns="visibleColumns2"
           selection="single"
           v-model:selected="selected"
@@ -229,26 +195,12 @@ watchEffect(() => {
                   v-model="props.selected"
                 />
               </q-td>
-              <q-td key="no" :props="props">
-                {{ props.rowIndex + 1 }}
-              </q-td>
-              <q-td key="nameDirector" :props="props">
-                {{ props.row.nameDirector }}
-              </q-td>
-              <q-td key="position" :props="props">
-                {{ props.row.position }}
-              </q-td>
-              <q-td key="duty" :props="props">
-                {{ props.row.duty }}
-              </q-td>
-              <q-td key="email" :props="props">
-                <div class="table_ellipsis">
-                  {{ props.row.email }}
+              <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                <div v-if="col.name == 'no'">
+                  {{ props.rowIndex + 1 }}
                 </div>
-              </q-td>
-              <q-td key="telephone" :props="props">
-                <div class="table_ellipsis">
-                  {{ props.row.telephone }}
+                <div v-else>
+                  {{ col.value }}
                 </div>
               </q-td>
             </q-tr>
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
index 8c7415201..9c37939f6 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
@@ -26,7 +26,7 @@ onMounted(async () => {
       fault: "1",
       penaltyLevel: "7",
       caseFault: "ทุจริตในหน้าที่",
-      dateInvestigate: "1 ธ.ค. 2565",
+      dateInvestigate: "2023-12-01",
       status: "0",
       active: "2",
     },
@@ -36,7 +36,7 @@ onMounted(async () => {
       fault: "1",
       penaltyLevel: "7",
       caseFault: "ทุจริตในหน้าที่",
-      dateInvestigate: "30 พ.ย. 2565",
+      dateInvestigate: "2023-11-30",
       status: "0",
       active: "0",
     },
@@ -46,7 +46,7 @@ onMounted(async () => {
       fault: "2",
       penaltyLevel: "1",
       caseFault: "พบการทุจริต",
-      dateInvestigate: "14 ก.ย. 2565",
+      dateInvestigate: "2023-09-14",
       status: "1",
       active: "1",
     },
@@ -56,7 +56,7 @@ onMounted(async () => {
       fault: "2",
       penaltyLevel: "1",
       caseFault: "พูดจาไม่สุภาพกับผู้บังคับบัญชา",
-      dateInvestigate: "11 ส.ค. 2565",
+      dateInvestigate: "2023-08-11",
       status: "0",
       active: "1",
     },
@@ -92,10 +92,10 @@ const clickAdd = () => {
         <template #columns="props">
           <q-tr :props="props" class="cursor-pointer">
             <q-td v-for="col in props.cols" :key="col.name" :props="props">
-              <q-td v-if="col.name == 'no'">
+              <div v-if="col.name == 'no'">
                 {{ props.rowIndex + 1 }}
-              </q-td>
-              <div>
+              </div>
+              <div v-else>
                 {{ col.value }}
               </div>
             </q-td>
diff --git a/src/modules/11_discipline/store/InvestigateDisStore.ts b/src/modules/11_discipline/store/InvestigateDisStore.ts
index 5c6e9ab1f..ec423e3ba 100644
--- a/src/modules/11_discipline/store/InvestigateDisStore.ts
+++ b/src/modules/11_discipline/store/InvestigateDisStore.ts
@@ -6,6 +6,9 @@ import type {
   DataOption,
   directorType,
 } from "@/modules/11_discipline/interface/index/Main";
+import { useCounterMixin } from "@/stores/mixin";
+const mixin = useCounterMixin();
+const { date2Thai } = mixin;
 
 export const useInvestigateDisStore = defineStore(
   "DisciplineInvestigateDis",
@@ -34,7 +37,7 @@ export const useInvestigateDisStore = defineStore(
         fault: convertFault(e.fault),
         penaltyLevel: convertPenaltyLevel(e.penaltyLevel),
         caseFault: e.caseFault,
-        dateInvestigate: e.dateInvestigate,
+        dateInvestigate: date2Thai(new Date(e.dateInvestigate)),
         status: convertSatatus(e.status),
         active: activeStatus(e.active),
       }));