From cf6aae6bdd595bfd8c44b9a2b53c8dd6fe3916aa Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 9 May 2024 15:42:38 +0700
Subject: [PATCH] =?UTF-8?q?fix=20bug=20=E0=B8=82=E0=B9=89=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=AB=E0=B8=A5=E0=B8=B1=E0=B8=81?=
 =?UTF-8?q?=20=E0=B8=95=E0=B8=B1=E0=B8=A7=E0=B8=8A=E0=B8=B5=E0=B9=89?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B1=E0=B8=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Indicators/indicatorByPlan/IndicatorByPlan.vue   |  7 +------
 .../Indicators/indicatorByRole/DetailView.vue        | 12 +++---------
 src/modules/01_metadataNew/interface/request/Main.ts |  4 ++--
 src/modules/01_metadataNew/views/indicatorByPlan.vue |  1 -
 src/modules/01_metadataNew/views/indicatorByRole.vue |  5 +----
 5 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/modules/01_metadataNew/components/Indicators/indicatorByPlan/IndicatorByPlan.vue b/src/modules/01_metadataNew/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
index 17085061c..bf1a832c1 100644
--- a/src/modules/01_metadataNew/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
+++ b/src/modules/01_metadataNew/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
@@ -298,7 +298,6 @@ onMounted(() => {
             autoApply
             year-picker
             :enableTimePicker="false"
-            @update:modelValue="planData.period = ''"
           >
             <template #year="{ year }">{{ year + 543 }}</template>
             <template #year-overlay-value="{ value }">{{
@@ -326,10 +325,7 @@ onMounted(() => {
                     v-if="year"
                     name="cancel"
                     class="cursor-pointer"
-                    @click.stop.prevent="
-                      year = 0;
-                      planData.period = '';
-                    "
+                    @click.stop.prevent="year = 0"
                   />
                 </template>
               </q-input>
@@ -339,7 +335,6 @@ onMounted(() => {
         <div class="col-2">
           <q-select
             ref="inputRef"
-            :readonly="year == 0"
             dense
             outlined
             v-model="planData.period"
diff --git a/src/modules/01_metadataNew/components/Indicators/indicatorByRole/DetailView.vue b/src/modules/01_metadataNew/components/Indicators/indicatorByRole/DetailView.vue
index 6bb1ebec5..e5745f813 100644
--- a/src/modules/01_metadataNew/components/Indicators/indicatorByRole/DetailView.vue
+++ b/src/modules/01_metadataNew/components/Indicators/indicatorByRole/DetailView.vue
@@ -46,7 +46,6 @@ const form = reactive<FormDataRole>({
   meaning: "", //นิยามหรือความหมาย
   formula: "", //สูตรคำนวณ
   documentInfoEvidence: "", //ข้อมูลเอกสารหลักฐาน
-
   node: null,
   nodeId: null,
   orgRevisionId: null,
@@ -125,7 +124,7 @@ function onSubmit() {
     : config.API.kpiRoleMainList;
 
   const body = {
-    year: form.year == 0 ? null:form.year?.toString(),
+    year: form.year == 0 ? null : form.year?.toString(),
     position: form.position, //ตำแหน่ง
     period: form.round, //รอบการประเมิน(เมษา->APR, ตุลา->OCT)
     includingName: form.includingName, //ชื่อตัวชี้วัด
@@ -184,7 +183,7 @@ function getDetail() {
       form.weight = data.weight;
       form.meaning = data.meaning;
       form.formula = data.formula;
-      form.documentInfoEvidence = data.documentInfoEvidence
+      form.documentInfoEvidence = data.documentInfoEvidence;
 
       formScore.score1 = data.achievement1;
       formScore.score2 = data.achievement2;
@@ -321,7 +320,6 @@ onMounted(() => {
               autoApply
               year-picker
               :enableTimePicker="false"
-              @update:model-value="form.round = ''"
             >
               <template #year="{ year }">{{ year + 543 }}</template>
               <template #year-overlay-value="{ value }">{{
@@ -350,10 +348,7 @@ onMounted(() => {
                       v-if="form.year"
                       name="cancel"
                       class="cursor-pointer"
-                      @click.stop.prevent="
-                        form.year = 0;
-                        form.round = '';
-                      "
+                      @click.stop.prevent="form.year = 0"
                     />
                   </template>
                 </q-input>
@@ -362,7 +357,6 @@ onMounted(() => {
           </div>
           <div class="col-2">
             <q-select
-              :readonly="form.year == 0"
               dense
               outlined
               v-model="form.round"
diff --git a/src/modules/01_metadataNew/interface/request/Main.ts b/src/modules/01_metadataNew/interface/request/Main.ts
index e2f30f210..613163525 100644
--- a/src/modules/01_metadataNew/interface/request/Main.ts
+++ b/src/modules/01_metadataNew/interface/request/Main.ts
@@ -28,14 +28,14 @@ interface FormDataRole {
   includingName: string;
   target: string;
   unit: string;
-  weight: number | null;
+  weight: string;
   meaning: string;
   formula: string;
   documentInfoEvidence: string;
   node: number | null;
   nodeId: string | null;
   orgRevisionId: string | null;
-  date: [null, null];
+  date?: [null, null];
 }
 
 interface FormCompetency {
diff --git a/src/modules/01_metadataNew/views/indicatorByPlan.vue b/src/modules/01_metadataNew/views/indicatorByPlan.vue
index fcda07998..08e87530c 100644
--- a/src/modules/01_metadataNew/views/indicatorByPlan.vue
+++ b/src/modules/01_metadataNew/views/indicatorByPlan.vue
@@ -325,7 +325,6 @@ onMounted(async () => {
               dense
               outlined
               v-model="nodeData.round"
-              :model-value="nodeData.round === '' ? 'ทั้งหมด' : nodeData.round"
               :options="roundOp"
               label="รอบการประเมิน"
               option-label="name"
diff --git a/src/modules/01_metadataNew/views/indicatorByRole.vue b/src/modules/01_metadataNew/views/indicatorByRole.vue
index 6e0dc1a90..c226989ab 100644
--- a/src/modules/01_metadataNew/views/indicatorByRole.vue
+++ b/src/modules/01_metadataNew/views/indicatorByRole.vue
@@ -338,9 +338,7 @@ onMounted(async () => {
           autoApply
           year-picker
           :enableTimePicker="false"
-          @update:model-value="
-            (formFilter.page = 1), (formFilter.round = ''), fetchList()
-          "
+          @update:model-value="(formFilter.page = 1), fetchList()"
         >
           <template #year="{ year }">{{ year + 543 }}</template>
           <template #year-overlay-value="{ value }">{{
@@ -382,7 +380,6 @@ onMounted(async () => {
           dense
           outlined
           v-model="formFilter.round"
-          :model-value="formFilter.round === '' ? 'ทั้งหมด' : formFilter.round"
           :options="roundOp"
           label="รอบการประเมิน"
           option-label="name"