From ece1203d84ea7629b9b35d51a913b423e97e106b Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Sun, 31 Mar 2024 09:02:33 +0700
Subject: [PATCH] =?UTF-8?q?UI=20=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=94=E0=B8=95=E0=B8=B2=E0=B8=A1=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=99=E0=B8=9C=E0=B8=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/FollowResult.vue               | 66 +++++++++++++++++++
 .../15_development/interface/request/Main.ts  | 12 ++--
 2 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/src/modules/15_development/components/FollowResult.vue b/src/modules/15_development/components/FollowResult.vue
index 1524ea790..60bcd886c 100644
--- a/src/modules/15_development/components/FollowResult.vue
+++ b/src/modules/15_development/components/FollowResult.vue
@@ -15,6 +15,10 @@ const formData = reactive<FormFollowResult>({
   indicators: "",
   target: "",
   calculation: "",
+  measuRement: "",
+  results: "",
+  obstacles: "",
+  suggestions: "",
 });
 
 const metricTypeOp = ref<DataOption[]>([
@@ -47,6 +51,9 @@ onMounted(() => {
 <template>
   <q-form greedy @submit.prevent @validation-success="onSubmit">
     <div class="row q-pa-md q-col-gutter-sm">
+      <div class="col-12">
+        <span class="text-weight-medium text-body1">ตัวชี้วัดความสำเร็จ</span>
+      </div>
       <div class="col-12 col-sm-6 col-md-4">
         <q-select
           dense
@@ -56,6 +63,7 @@ onMounted(() => {
           :options="metricTypeOp"
           option-label="name"
           option-value="id"
+          hide-bottom-space
           :rules="[
             (val:string) =>
               !!val || `${'กรุณากรอกประเภทตัวชี้วัด'}`,
@@ -68,6 +76,7 @@ onMounted(() => {
           outlined
           label="ตัวชี้วัด"
           v-model="formData.indicators"
+          hide-bottom-space
           :rules="[
             (val:string) =>
               !!val || `${'กรุณากรอกตัวชี้วัด'}`,
@@ -80,6 +89,7 @@ onMounted(() => {
           outlined
           label="เป้าหมาย"
           v-model="formData.target"
+          hide-bottom-space
           :rules="[
             (val:string) =>
               !!val || `${'กรุณากรอกเป้าหมาย'}`,
@@ -91,6 +101,7 @@ onMounted(() => {
           outlined
           dense
           v-model="formData.calculation"
+          hide-bottom-space
           label="วิธีการคำนวณ/เครื่องมือ"
           type="textarea"
           :rules="[
@@ -99,6 +110,61 @@ onMounted(() => {
           ]"
         />
       </div>
+      <div class="col-12">
+        <q-input
+          outlined
+          dense
+          v-model="formData.measuRement"
+          hide-bottom-space
+          label="ระยะเวลาวัดผล"
+          :rules="[
+            (val:string) =>
+              !!val || `${'กรุณากรอกระยะเวลาวัดผล'}`,
+          ]"
+        />
+      </div>
+      <div class="col-12">
+        <q-input
+          outlined
+          dense
+          v-model="formData.results"
+          hide-bottom-space
+          label="ผลการดำเนิน"
+          type="textarea"
+          :rules="[
+            (val:string) =>
+              !!val || `${'กรุณากรอกผลการดำเนิน'}`,
+          ]"
+        />
+      </div>
+      <div class="col-12">
+        <q-input
+          outlined
+          dense
+          v-model="formData.obstacles"
+          hide-bottom-space
+          label="ปัญหาอุปสรรค"
+          type="textarea"
+          :rules="[
+            (val:string) =>
+              !!val || `${'กรุณากรอกปัญหาอุปสรรค'}`,
+          ]"
+        />
+      </div>
+      <div class="col-12">
+        <q-input
+          outlined
+          dense
+          v-model="formData.suggestions"
+          hide-bottom-space
+          label="ข้อเสนอเเนะ"
+          type="textarea"
+          :rules="[
+            (val:string) =>
+              !!val || `${'กรุณากรอกข้อเสนอเเนะ'}`,
+          ]"
+        />
+      </div>
     </div>
 
     <q-separator />
diff --git a/src/modules/15_development/interface/request/Main.ts b/src/modules/15_development/interface/request/Main.ts
index e1b3d62f6..18b66d7a5 100644
--- a/src/modules/15_development/interface/request/Main.ts
+++ b/src/modules/15_development/interface/request/Main.ts
@@ -27,10 +27,14 @@ interface FormGroupRelate {
 }
 
 interface FormFollowResult {
-  metricType:string
-  indicators:string
-  target:string
-  calculation:string
+  metricType: string;
+  indicators: string;
+  target: string;
+  calculation: string;
+  measuRement: string;
+  results: string;
+  obstacles: string;
+  suggestions: string;
 }
 
 export type {