From 55111ed1265e1282b27a1b627bb8aebe37251c59 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Wed, 8 May 2024 17:10:39 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=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=E0=B8=95=E0=B8=B2=E0=B8=A1=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Indicators/indicatorByRole/DetailView.vue |  1 +
 .../01_metadataNew/views/indicatorByRole.vue  | 79 +++++++++++++++++--
 2 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/src/modules/01_metadataNew/components/Indicators/indicatorByRole/DetailView.vue b/src/modules/01_metadataNew/components/Indicators/indicatorByRole/DetailView.vue
index 478d7e32d..6bb1ebec5 100644
--- a/src/modules/01_metadataNew/components/Indicators/indicatorByRole/DetailView.vue
+++ b/src/modules/01_metadataNew/components/Indicators/indicatorByRole/DetailView.vue
@@ -184,6 +184,7 @@ function getDetail() {
       form.weight = data.weight;
       form.meaning = data.meaning;
       form.formula = data.formula;
+      form.documentInfoEvidence = data.documentInfoEvidence
 
       formScore.score1 = data.achievement1;
       formScore.score2 = data.achievement2;
diff --git a/src/modules/01_metadataNew/views/indicatorByRole.vue b/src/modules/01_metadataNew/views/indicatorByRole.vue
index c05e97ed2..6c08428b5 100644
--- a/src/modules/01_metadataNew/views/indicatorByRole.vue
+++ b/src/modules/01_metadataNew/views/indicatorByRole.vue
@@ -84,10 +84,17 @@ const roundOp = ref<DataOption[]>([
 
 function fetchList() {
   http
-    .get(
-      config.API.kpiRoleMainList +
-        `?page=${formFilter.page}&pageSize=${formFilter.pageSize}&period=${formFilter.round}&position=${formFilter.position}&keyword=${formFilter.keyword}&year=${formFilter.year}`
-    )
+    .post(config.API.kpiRoleMainList + `/search`, {
+      // ?page=${formFilter.page}&pageSize=${formFilter.pageSize}&period=${formFilter.round}&position=${formFilter.position}&keyword=${formFilter.keyword}&year=${formFilter.year}
+      keyword: formFilter.keyword,
+      position: formFilter.position,
+      period: formFilter.round,
+      node: 0,
+      nodeId: "",
+      year: formFilter.year?.toString(),
+      pageSize: formFilter.pageSize,
+      page: formFilter.page,
+    })
     .then((res) => {
       const data = res.data.result.data;
       total.value = res.data.result.total;
@@ -218,9 +225,57 @@ onMounted(async () => {
     รายการตัวชี้วัดตามตำแหน่ง
   </div>
   <q-card flat bordered class="q-pa-md">
-    <q-toolbar class="q-pa-none">
+    <div class="row q-mb-sm">
+      <div class="col-12 row q-mb-sm" v-if="!$q.screen.gt.md">
+        <q-select
+          dense
+          :model-value="formFilter.position"
+          label="ตำแหน่ง"
+          outlined
+          emit-value
+          map-options
+          fill-input
+          hide-selected
+          hide-bottom-space
+          option-label="name"
+          option-value="id"
+          class="inputgreen"
+          :options="positionOp"
+          use-input
+          @input-value="setModel"
+          @filter="(inputValue:any,doneFn:Function) => filterOption(inputValue, doneFn) "
+          @update:model-value="fetchList"
+        >
+          <template v-slot:no-option>
+            <q-item>
+              <q-item-section class="text-grey"> ไม่มีข้อมูล </q-item-section>
+            </q-item>
+          </template>
+          <template v-if="formFilter.position" v-slot:append>
+            <q-icon
+              name="cancel"
+              @click.stop.prevent="
+                formFilter.position = '';
+                fetchList();
+              "
+              class="cursor-pointer"
+            />
+          </template>
+        </q-select>
+        <q-btn
+          flat
+          round
+          dense
+          icon="add"
+          color="primary"
+          @click="onClickAddOrView()"
+        >
+          <q-tooltip>เพิ่ม</q-tooltip>
+        </q-btn>
+      </div>
       <div class="row q-gutter-sm">
         <q-select
+        v-if="$q.screen.gt.md"
           dense
           :model-value="formFilter.position"
           label="ตำแหน่ง"
@@ -320,6 +375,7 @@ onMounted(async () => {
           dense
           outlined
           v-model="formFilter.round"
+          :model-value="formFilter.round === '' ? 'ทั้งหมด' : formFilter.round"
           class="inputgreen"
           :options="roundOp"
           label="รอบการประเมิน"
@@ -329,10 +385,19 @@ onMounted(async () => {
           map-options
           @update:model-value="fetchList"
           style="width: 160px"
-        />
+        >
+        <template v-if="formFilter.round" v-slot:append>
+            <q-icon
+              name="cancel"
+              @click.stop.prevent="(formFilter.round = ''), fetchList()"
+              class="cursor-pointer"
+            />
+          </template>
+      </q-select>
       </div>
 
       <q-btn
+      v-if="$q.screen.gt.md"
         flat
         round
         dense
@@ -381,7 +446,7 @@ onMounted(async () => {
           style="min-width: 150px"
         />
       </div>
-    </q-toolbar>
+    </div>
 
     <div class="col-12">
       <d-table