From 4ca5b7dbfe44d424d56d586ed69a813c380508ee Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 19 Dec 2024 11:05:10 +0700
Subject: [PATCH 1/2] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20ui?=
 =?UTF-8?q?=20=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=9D=E0=B8=B6=E0=B8=81=E0=B8=AD=E0=B8=9A=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=94=E0=B8=B9=E0=B8=87=E0=B8=B2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/history/AddPage.vue            | 111 ++++++++++++++++--
 .../components/historyEmployee/AddPage.vue    | 108 +++++++++++++++--
 .../15_development/interface/index/Main.ts    |   7 ++
 3 files changed, 201 insertions(+), 25 deletions(-)

diff --git a/src/modules/15_development/components/history/AddPage.vue b/src/modules/15_development/components/history/AddPage.vue
index f431bad62..b4d185c0e 100644
--- a/src/modules/15_development/components/history/AddPage.vue
+++ b/src/modules/15_development/components/history/AddPage.vue
@@ -1,12 +1,14 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted } from "vue";
-import { useRoute, useRouter } from "vue-router";
 import { useQuasar } from "quasar";
 
+import { useRoute, useRouter } from "vue-router";
+import { useCounterMixin } from "@/stores/mixin";
 import http from "@/plugins/http";
 import config from "@/app.config";
-import { useCounterMixin } from "@/stores/mixin";
 
+import type { QTableProps } from "quasar";
+import type { DataTrainingTopics } from "@/modules/15_development/interface/index/Main";
 import type {
   FormAddHistory,
   FormAddHistoryProject,
@@ -55,9 +57,36 @@ const formMainProject = reactive<FormAddHistoryProject>({
   organizingTraining: "", //หน่วยงานที่รับผิดชอบจัดการอบรม
 });
 
-function getClass() {
-  return "inputgreen";
-}
+const rows = ref<DataTrainingTopics[]>([]);
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "topicAcademic",
+    align: "left",
+    label: "หัวข้อ/ประเด็นการฝึกอบรม ศึกษาดูงาน",
+    sortable: false,
+    field: "topicAcademic",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "addressAcademic",
+    align: "left",
+    label: "สถานที่ฝึกอบรม ศึกษาดูงาน",
+    sortable: true,
+    field: "addressAcademic",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "province",
+    align: "left",
+    label: "จังหวัด",
+    sortable: false,
+    field: "province",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
 
 /** ดึงข้อมูล */
 async function fetchData() {
@@ -94,6 +123,7 @@ async function fetchData() {
       formMainProject.organizingTraining = data.org ? data.org : null;
       dateOrder.value = data.dateOrder;
       order.value = data.order;
+      rows.value = data.academic
     })
     .catch((e) => {
       messageError($q, e);
@@ -123,7 +153,7 @@ onMounted(async () => {
       class="q-mr-sm"
       @click="router.go(-1)"
     />
-    <span> ประวัติการฝึกอบรม/ดูงานของข้าราชการกรุงเทพมหานครสามัญ </span>
+    <span> ประวัติการฝึกอบรม/ดูงาน ข้าราชการกรุงเทพมหานครสามัญ </span>
   </div>
   <q-card flat bordered>
     <q-card-section>
@@ -240,6 +270,15 @@ onMounted(async () => {
                 </div>
               </div>
               <div class="row col-12">
+                <div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
+                  หน่วยงานที่รับผิดชอบ
+                </div>
+
+                <div class="col-12 col-sm-12 col-md-7">
+                  {{ formMainProject.organizingTraining ?? "-" }}
+                </div>
+              </div>
+              <!-- <div class="row col-12">
                 <div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
                   หัวข้อการไปฝึกอบรม/ศึกษาดูงาน
                 </div>
@@ -256,7 +295,7 @@ onMounted(async () => {
                 <div class="col-12 col-sm-12 col-md-7">
                   {{ formMainProject.location ?? "-" }}
                 </div>
-              </div>
+              </div> -->
             </div>
           </div>
           <div class="col-6">
@@ -296,7 +335,7 @@ onMounted(async () => {
                   {{ formMainProject.totalTraining ?? "-" }}
                 </div>
               </div>
-              <div class="row col-12">
+              <!-- <div class="row col-12">
                 <div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
                   หน่วยงานที่รับผิดชอบ
                 </div>
@@ -304,12 +343,60 @@ onMounted(async () => {
                 <div class="col-12 col-sm-12 col-md-7">
                   {{ formMainProject.organizingTraining ?? "-" }}
                 </div>
-              </div>
+              </div> -->
             </div>
           </div>
         </div>
       </q-card>
 
+      <!--card หัวข้อและสถานที่ไปฝึกอบรม ศึกษาดูงาน -->
+      <q-card flat bordered class="q-mt-md" style="border: 1px solid #d6dee1">
+        <div class="col-12 text-weight-bold bg-grey-1 q-py-sm q-px-md">
+          หัวข้อและสถานที่ไปฝึกอบรม ศึกษาดูงาน
+        </div>
+        <div class="col-12"><q-separator /></div>
+        <div class="row q-pa-md q-col-gutter-md">
+          <div class="col-12">
+            <d-table
+              :columns="columns"
+              :rows="rows"
+              row-key="id"
+              flat
+              bordered
+              :paging="true"
+              dense
+              :rows-per-page-options="[10, 25, 50, 100]"
+            >
+              <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"
+                    :props="props"
+                  >
+                    <span class="text-weight-medium">{{ col.label }}</span>
+                  </q-th>
+                </q-tr>
+              </template>
+              <template v-slot:body="props">
+                <q-tr :props="props">
+                  <q-td
+                    v-for="col in props.cols"
+                    :key="col.name"
+                    :props="props"
+                  >
+                    <div class="table_ellipsis2">
+                      {{ col.value ?? "-" }}
+                    </div>
+                  </q-td>
+                </q-tr>
+              </template>
+            </d-table>
+          </div>
+        </div>
+      </q-card>
+
       <div class="row q-col-gutter-sm q-mt-md">
         <div class="col-3">
           <q-input
@@ -318,10 +405,9 @@ onMounted(async () => {
             v-model="order"
             dense
             outlined
-            :class="getClass()"
             hide-bottom-space
-            :rules="[(val:string) => !!val || `${'กรุณากรอกเลขที่คำสั่ง/เลขที่หนังสืออนุมัติ'}`,]"
           />
+          <!-- :rules="[(val:string) => !!val || `${'กรุณากรอกเลขที่คำสั่ง/เลขที่หนังสืออนุมัติ'}`,]" -->
         </div>
         <div class="col-3">
           <datepicker
@@ -340,15 +426,14 @@ onMounted(async () => {
             <template #year-overlay-value="{ value }">
               {{ parseInt(value + 543) }}
             </template>
+            <!-- :rules="[(val:string) => !!val || `${'กรุณากรอกคำสั่งลงวันที่/หนังสืออนุมัติลงวันที่'}`,]" -->
             <template #trigger>
               <q-input
                 readonly
                 outlined
                 dense
-                :class="getClass()"
                 hide-bottom-space
                 :model-value="dateOrder != null ? date2Thai(dateOrder) : null"
-                :rules="[(val:string) => !!val || `${'กรุณากรอกคำสั่งลงวันที่/หนังสืออนุมัติลงวันที่'}`,]"
                 label="คำสั่งลงวันที่/หนังสืออนุมัติลงวันที่"
               >
                 <template v-slot:prepend>
diff --git a/src/modules/15_development/components/historyEmployee/AddPage.vue b/src/modules/15_development/components/historyEmployee/AddPage.vue
index 07f0048c4..245832fdd 100644
--- a/src/modules/15_development/components/historyEmployee/AddPage.vue
+++ b/src/modules/15_development/components/historyEmployee/AddPage.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted } from "vue";
-import { useRoute, useRouter } from "vue-router";
 import { useQuasar } from "quasar";
 
+import { useRoute, useRouter } from "vue-router";
+import { useCounterMixin } from "@/stores/mixin";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -11,9 +12,10 @@ import type {
   FormAddHistoryEmployee,
   FormAddHistoryProject,
 } from "@/modules/15_development/interface/request/Main";
+import type { QTableProps } from "quasar";
+import type { DataTrainingTopics } from "@/modules/15_development/interface/index/Main";
 
 /** importStore*/
-import { useCounterMixin } from "@/stores/mixin";
 
 /** use*/
 const $q = useQuasar();
@@ -57,10 +59,36 @@ const formMainProject = reactive<FormAddHistoryProject>({
   organizingTraining: "", //หน่วยงานที่รับผิดชอบจัดการอบรม
 });
 
-/** class  */
-function getClass() {
-  return "inputgreen";
-}
+const rows = ref<DataTrainingTopics[]>([]);
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "topicAcademic",
+    align: "left",
+    label: "หัวข้อ/ประเด็นการฝึกอบรม ศึกษาดูงาน",
+    sortable: false,
+    field: "topicAcademic",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "addressAcademic",
+    align: "left",
+    label: "สถานที่ฝึกอบรม ศึกษาดูงาน",
+    sortable: true,
+    field: "addressAcademic",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "province",
+    align: "left",
+    label: "จังหวัด",
+    sortable: false,
+    field: "province",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
 
 /** ดึงข้อมูล */
 function fetchDataDetail() {
@@ -106,6 +134,7 @@ function fetchDataDetail() {
 
       dateOrder.value = data.dateOrder;
       order.value = data.order;
+      rows.value = data.academic;
     })
     .catch((e) => {
       messageError($q, e);
@@ -135,7 +164,7 @@ onMounted(() => {
       class="q-mr-sm"
       @click="router.go(-1)"
     />
-    <span> ประวัติฝึกอบรม/ดูงานลูกจ้าง </span>
+    <span> ประวัติฝึกอบรม/ดูงาน ลูกจ้าง </span>
   </div>
   <q-card flat bordered>
     <q-card-section>
@@ -243,6 +272,15 @@ onMounted(() => {
                 </div>
               </div>
               <div class="row col-12">
+                <div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
+                  หน่วยงานที่รับผิดชอบ
+                </div>
+
+                <div class="col-12 col-sm-12 col-md-7">
+                  {{ formMainProject.organizingTraining ?? "-" }}
+                </div>
+              </div>
+              <!-- <div class="row col-12">
                 <div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
                   หัวข้อการไปฝึกอบรม/ศึกษาดูงาน
                 </div>
@@ -259,7 +297,7 @@ onMounted(() => {
                 <div class="col-12 col-sm-12 col-md-7">
                   {{ formMainProject.location ?? "-" }}
                 </div>
-              </div>
+              </div> -->
             </div>
           </div>
           <div class="col-6">
@@ -299,7 +337,7 @@ onMounted(() => {
                   {{ formMainProject.totalTraining ?? "-" }}
                 </div>
               </div>
-              <div class="row col-12">
+              <!-- <div class="row col-12">
                 <div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
                   หน่วยงานที่รับผิดชอบ
                 </div>
@@ -307,12 +345,60 @@ onMounted(() => {
                 <div class="col-12 col-sm-12 col-md-7">
                   {{ formMainProject.organizingTraining ?? "-" }}
                 </div>
-              </div>
+              </div> -->
             </div>
           </div>
         </div>
       </q-card>
 
+      <!--card  หัวข้อและสถานที่ไปฝึกอบรม ศึกษาดูงาน-->
+      <q-card flat bordered class="q-mt-md" style="border: 1px solid #d6dee1">
+        <div class="col-12 text-weight-bold bg-grey-1 q-py-sm q-px-md">
+          หัวข้อและสถานที่ไปฝึกอบรม ศึกษาดูงาน
+        </div>
+        <div class="col-12"><q-separator /></div>
+        <div class="row q-pa-md q-col-gutter-md">
+          <div class="col-12">
+            <d-table
+              :columns="columns"
+              :rows="rows"
+              row-key="id"
+              flat
+              bordered
+              :paging="true"
+              dense
+              :rows-per-page-options="[10, 25, 50, 100]"
+            >
+              <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"
+                    :props="props"
+                  >
+                    <span class="text-weight-medium">{{ col.label }}</span>
+                  </q-th>
+                </q-tr>
+              </template>
+              <template v-slot:body="props">
+                <q-tr :props="props">
+                  <q-td
+                    v-for="col in props.cols"
+                    :key="col.name"
+                    :props="props"
+                  >
+                    <div class="table_ellipsis2">
+                      {{ col.value ?? "-" }}
+                    </div>
+                  </q-td>
+                </q-tr>
+              </template>
+            </d-table>
+          </div>
+        </div>
+      </q-card>
+
       <div class="row q-col-gutter-sm q-mt-md">
         <div class="col-3">
           <q-input
@@ -321,7 +407,6 @@ onMounted(() => {
             v-model="order"
             dense
             outlined
-            :class="getClass()"
             hide-bottom-space
             :rules="[(val:string) => !!val || `${'กรุณากรอกเลขที่คำสั่ง/เลขที่หนังสืออนุมัติ'}`,]"
           />
@@ -348,7 +433,6 @@ onMounted(() => {
                 readonly
                 outlined
                 dense
-                :class="getClass()"
                 hide-bottom-space
                 :model-value="dateOrder != null ? date2Thai(dateOrder) : null"
                 :rules="[(val:string) => !!val || `${'กรุณากรอกคำสั่งลงวันที่/หนังสืออนุมัติลงวันที่'}`,]"
diff --git a/src/modules/15_development/interface/index/Main.ts b/src/modules/15_development/interface/index/Main.ts
index ebf9e863b..2bc51e713 100644
--- a/src/modules/15_development/interface/index/Main.ts
+++ b/src/modules/15_development/interface/index/Main.ts
@@ -166,6 +166,12 @@ interface DataItemsDevelopment {
   label: string;
 }
 
+interface DataTrainingTopics {
+  topicAcademic: "";
+  addressAcademic: "";
+  province: "";
+}
+
 export type {
   DataOption,
   DataOptionCheckBox,
@@ -181,4 +187,5 @@ export type {
   PersonData,
   StrategyNode,
   DataItemsDevelopment,
+  DataTrainingTopics,
 };

From e79f3465fdab0946c9ae949786a2f909d581d5aa Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 19 Dec 2024 13:09:58 +0700
Subject: [PATCH 2/2] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9D?=
 =?UTF-8?q?=E0=B8=B6=E0=B8=81=E0=B8=AD=E0=B8=9A=E0=B8=A3=E0=B8=A1/?=
 =?UTF-8?q?=E0=B8=94=E0=B8=B9=E0=B8=87=E0=B8=B2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/15_development/components/history/AddPage.vue      | 1 -
 .../15_development/components/historyEmployee/AddPage.vue      | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/modules/15_development/components/history/AddPage.vue b/src/modules/15_development/components/history/AddPage.vue
index b4d185c0e..8231a4055 100644
--- a/src/modules/15_development/components/history/AddPage.vue
+++ b/src/modules/15_development/components/history/AddPage.vue
@@ -369,7 +369,6 @@ 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"
diff --git a/src/modules/15_development/components/historyEmployee/AddPage.vue b/src/modules/15_development/components/historyEmployee/AddPage.vue
index 245832fdd..59edfd83f 100644
--- a/src/modules/15_development/components/historyEmployee/AddPage.vue
+++ b/src/modules/15_development/components/historyEmployee/AddPage.vue
@@ -164,7 +164,7 @@ onMounted(() => {
       class="q-mr-sm"
       @click="router.go(-1)"
     />
-    <span> ประวัติฝึกอบรม/ดูงาน ลูกจ้าง </span>
+    <span> ประวัติการฝึกอบรม/ดูงาน ลูกจ้าง </span>
   </div>
   <q-card flat bordered>
     <q-card-section>
@@ -371,7 +371,6 @@ 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"