From c2a1648d70fb0f994e41cd7d953b5c90991cc8cc Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 21 May 2024 11:58:23 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B8=9E?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=92=E0=B8=99=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../15_development/components/FollowResult.vue | 10 +++++++---
 .../15_development/components/Target.vue       |  5 ++++-
 src/modules/15_development/views/MainPage.vue  | 18 +++++++++---------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/modules/15_development/components/FollowResult.vue b/src/modules/15_development/components/FollowResult.vue
index 61f601bf5..21de47a1a 100644
--- a/src/modules/15_development/components/FollowResult.vue
+++ b/src/modules/15_development/components/FollowResult.vue
@@ -435,11 +435,14 @@ onMounted(() => {
   <q-dialog v-model="modalDialog" persistent>
     <q-card style="width: 900px; max-width: 80vw">
       <q-form greedy @submit.prevent @validation-success="onSubmitIndicators">
-        <DialogHeader :tittle="'เพิ่มตัวชี้วัด'" :close="closeDialog" />
+        <DialogHeader
+          :tittle="isEdit ? 'แก้ไขตัวชี้วัด' : 'เพิ่มตัวชี้วัด'"
+          :close="closeDialog"
+        />
         <q-separator />
         <q-card-section class="q-pt-none">
           <div class="row q-pa-md q-col-gutter-sm">
-            <div class="col-4">
+            <div class="col-6">
               <q-select
                 dense
                 outlined
@@ -450,6 +453,7 @@ onMounted(() => {
                 option-value="name"
                 emit-value
                 map-options
+                class="inputgreen"
                 hide-bottom-space
                 :rules="[
                   (val:string) =>
@@ -474,7 +478,7 @@ onMounted(() => {
               />
             </div>
 
-            <div class="col-4">
+            <div class="col-2">
               <q-input
                 dense
                 outlined
diff --git a/src/modules/15_development/components/Target.vue b/src/modules/15_development/components/Target.vue
index 7d9ecbd02..753c27b3b 100644
--- a/src/modules/15_development/components/Target.vue
+++ b/src/modules/15_development/components/Target.vue
@@ -1200,7 +1200,10 @@ onMounted(() => {
   <q-dialog v-model="modalRelate" persistent>
     <q-card style="width: 400px">
       <q-form greedy @submit.prevent @validation-success="onSubmitRelate">
-        <DialogHeader tittle="เพิ่มผู้เกี่ยวข้อง" :close="onClickCloseDialog" />
+        <DialogHeader
+          :tittle="isEdit ? 'แก้ไขผู้เกี่ยวข้อง' : 'เพิ่มผู้เกี่ยวข้อง'"
+          :close="onClickCloseDialog"
+        />
         <q-separator />
         <q-card-section class="q-p-sm">
           <div class="row col-12 q-col-gutter-md">
diff --git a/src/modules/15_development/views/MainPage.vue b/src/modules/15_development/views/MainPage.vue
index a9aa7777c..669275d68 100644
--- a/src/modules/15_development/views/MainPage.vue
+++ b/src/modules/15_development/views/MainPage.vue
@@ -37,9 +37,7 @@ const filter = ref<string>("");
 const filterMain = ref<string>("");
 const splitterModel = ref<number>(60);
 const modal = ref<boolean>(false);
-const projectName = ref<string>("");
-const orgName = ref<string>("");
-const year = ref<number>(0);
+
 /** หัวตาราง */
 const rows = ref<ResListProject[]>([]); // ข้อมูลรายการ
 const columns = ref<QTableProps["columns"]>([
@@ -64,16 +62,16 @@ const columns = ref<QTableProps["columns"]>([
   },
 
   {
-    name: "org",
+    name: "root",
     align: "left",
     label: "หน่วยงานที่รับผิดชอบ",
     sortable: true,
-    field: "org",
+    field: "root",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px ; width:45% ",
   },
 ]);
-const visibleColumns = ref<string[]>(["year", "projectName", "org"]);
+const visibleColumns = ref<string[]>(["year", "projectName", "root"]);
 
 const statusOpt = ref<DataOption[]>([
   { id: "ONGOING", name: "กำลังดำเนินการ" },
@@ -168,9 +166,11 @@ function onDownload() {
 /** function ปิด Dialog เพิ่มโครงการ/หลักสูตรการฝึกอบรม*/
 function closeDialog() {
   modal.value = false;
-  year.value = 0;
-  orgName.value = "";
-  projectName.value = "";
+
+  formProject.year = null;
+  formProject.projectName = "";
+  formProject.orgRevisionId = "";
+  formProject.nodeId = "";
 }
 
 /** dialog submit */