KPI

src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue

@@ -556,8 +556,8 @@ const title = computed(() => {
 
                 <q-card bordered flat class="q-mt-sm no-shadow bg-white col-12">
                   <div class="row q-px-md q-py-sm items-center bg-grey-1">
-                    <div class="col-4">ลำดับ/รหัสตัวชี้วัด</div>
-                    <div class="col-4">ชื่อตัวชี้วัด</div>
+                    <div class="col-5">ลำดับ/รหัสตัวชี้วัด</div>
+                    <div class="col-7">ชื่อตัวชี้วัด</div>
                   </div>
                   <q-separator />
 
@@ -574,11 +574,11 @@ const title = computed(() => {
                         @click="clickList(item.id)"
                       >
                         <q-item-section class="q-pa-none">
-                          <div class="row items-center" style="height: 50px">
-                            <div class="col-4">
+                          <div class="row items-center full-width ">
+                            <div class="col-5">
                               {{ item.including }}
                             </div>
-                            <div class="col-4">
+                            <div class="col-7">
                               {{ item.includingName }}
                             </div>
                           </div>
@@ -964,6 +964,7 @@ const title = computed(() => {
 .my-menu-link {
   background: #ebf9f7 !important;
   color: #1bb19ab8 !important;
+  border: 0;
 }
 .no-shadow {
   box-shadow: none !important;

src/modules/14_KPI/components/Tab/Dialog/04_FormCompetency.vue

@@ -277,12 +277,22 @@ watch(
   <q-dialog v-model="modal" persistent>
     <q-card class="col-12" style="width: 85%">
       <q-form greedy @submit.prevent @validation-success="onSubmit">
-        <DialogHeader :tittle="`เพิ่มสมรรถนะ`" :close="closeDialog" />
+        <DialogHeader
+          :tittle="
+            competencyType == 'HEAD' || competencyType == 'GROUP'
+              ? `รายละเอียดสมรรถนะ`
+              : `เพิ่มสมรรถนะ`
+          "
+          :close="closeDialog"
+        />
         <q-separator />
 
         <q-card-section class="q-pa-none scroll" style="max-height: 80vh">
           <div class="row">
-            <div class="bg-grey-1 q-pa-md col-3 row lineRight">
+            <div
+              v-if="competencyType != 'HEAD' && competencyType != 'GROUP'"
+              class="bg-grey-1 q-pa-md col-xs-12 col-md-3 row lineRight"
+            >
               <div class="col-12 q-col-gutter-sm fit">
                 <div class="col-12">
                   <q-select
@@ -362,7 +372,13 @@ watch(
               </div>
             </div>
 
-            <div class="col-9 q-pa-md q-col-gutter-sm">
+            <div
+              :class="
+                competencyType == 'HEAD' || competencyType == 'GROUP'
+                  ? `col-xs-12 col-md-12 q-pa-md q-col-gutter-sm`
+                  : `col-xs-12 col-md-9 q-pa-md q-col-gutter-sm`
+              "
+            >
               <span class="text-body2 text-weight-medium"
                 >รายละเอียดสมรรถนะ</span
               >

src/modules/14_KPI/components/Tab/Dialog/DialogCommentProgress.vue

@@ -655,6 +655,7 @@ watch(
 .my-menu-link {
   background: #ebf9f7 !important;
   color: #1bb19ab8 !important;
+  border: 0;
 }
 
 .q-btn-group--outline > .q-btn-item:not(:last-child):before {

src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue

@@ -271,34 +271,40 @@ function updateSelect() {
   search.value = "";
 }
 
-function getOrgOp() {
-  http
-    .get(config.API.Kpiorg)
-    .then((res) => {
-      const data = res.data.result;
-      evaluatorIdMainOp.value = data.caregiver.map((i: any) => ({
-        id: i.id,
-        name: `${i.prefix ? i.prefix : ""}${i.firstName ? i.firstName : ""} ${
-          i.lastName ? i.lastName : ""
-        }`,
-      }));
-      commanderIdMainOp.value = data.commander.map((i: any) => ({
-        id: i.id,
-        name: `${i.prefix ? i.prefix : ""}${i.firstName ? i.firstName : ""} ${
-          i.lastName ? i.lastName : ""
-        }`,
-      }));
-      commanderHighMainOp.value = data.chairman.map((i: any) => ({
-        id: i.id,
-        name: `${i.prefix ? i.prefix : ""}${i.firstName ? i.firstName : ""} ${
-          i.lastName ? i.lastName : ""
-        }`,
-      }));
-    })
-    .catch((e) => {
-      messageError($q, e);
-    })
-    .finally(() => {});
+function getOrgOp(check: boolean,id:string) {
+  if (check == false) {
+    http
+      .get(config.API.Kpiorg+`/${id}`)
+      .then((res) => {
+        const data = res.data.result;
+        evaluatorIdMainOp.value = data.caregiver.map((i: any) => ({
+          id: i.id,
+          name: `${i.prefix ? i.prefix : ""}${i.firstName ? i.firstName : ""} ${
+            i.lastName ? i.lastName : ""
+          }`,
+        }));
+        commanderIdMainOp.value = data.commander.map((i: any) => ({
+          id: i.id,
+          name: `${i.prefix ? i.prefix : ""}${i.firstName ? i.firstName : ""} ${
+            i.lastName ? i.lastName : ""
+          }`,
+        }));
+        commanderHighMainOp.value = data.chairman.map((i: any) => ({
+          id: i.id,
+          name: `${i.prefix ? i.prefix : ""}${i.firstName ? i.firstName : ""} ${
+            i.lastName ? i.lastName : ""
+          }`,
+        }));
+      })
+      .catch((e) => {
+        messageError($q, e);
+      })
+      .finally(() => {});
+  } else {
+    evaluatorIdMainOp.value = [];
+    commanderIdMainOp.value = [];
+    commanderHighMainOp.value = [];
+  }
 }
 
 function onSubmit() {
@@ -346,7 +352,6 @@ watch(
   (n) => {
     if (n == true) {
       fetchRoundOption();
-      getOrgOp();
     }
   }
 );
@@ -456,6 +461,7 @@ watch(
                             color="primary"
                             dense
                             v-model="props.selected"
+                            @click="getOrgOp(props.selected,props.row.id)"
                           />
                         </q-td>
                         <q-td