Merge branch 'develop' into devTee

# Conflicts:
#	src/modules/08_KPI/components/Tab/Dialog/04_FormCompetency.vue

src/modules/08_KPI/components/Tab/01_Assessment.vue

@@ -16,13 +16,20 @@ import { useKpiDataStore } from "@/modules/08_KPI/store";
 
 import type { ListCriteria } from "@/modules/08_KPI/interface/request/index";
 
-const score = defineModel("score", { type: Number, default: 0 });
+const indicatorScore = defineModel("indicatorScore", {
+  type: Number,
+  default: 0,
+});
+const competencyScore = defineModel("competencyScore", {
+  type: Number,
+  default: 0,
+});
 const dataListCriteria = ref<ListCriteria[]>([]);
 
 const modalCriteria = ref<boolean>(false);
 const $q = useQuasar();
 const route = useRoute();
-const { showLoader, hideLoader, messageError } = useCounterMixin();
+const { hideLoader, messageError } = useCounterMixin();
 const store = useKpiDataStore();
 
 const evaluationId = ref<string>(route.params.id.toString());
@@ -37,7 +44,6 @@ const totalResults3 = ref<number>(0);
 // const resultWork = ref<number>(0);
 
 function fetchListPlanned() {
-  showLoader();
   http
     .get(config.API.kpiAchievement("planned") + `?id=${evaluationId.value}`)
     .then((res) => {
@@ -64,14 +70,10 @@ function fetchListPlanned() {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
     });
 }
 
 function fetchListRole() {
-  showLoader();
   http
     .get(config.API.kpiAchievement("role") + `?id=${evaluationId.value}`)
     .then((res) => {
@@ -98,14 +100,10 @@ function fetchListRole() {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
     });
 }
 
 function fetchAssigned() {
-  showLoader();
   http
     .get(config.API.kpiAchievement("special") + `?id=${evaluationId.value}`)
     .then((res) => {
@@ -133,17 +131,16 @@ function fetchAssigned() {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
     });
 }
 
 function onInfo() {
   modalCriteria.value = true;
 }
+
 const resultWork = computed(() => {
   const total = totalResults1.value + totalResults2.value + totalResults3.value;
+  indicatorScore.value = total;
   return total.toFixed(2);
 });
 
@@ -156,9 +153,6 @@ function getCriteria() {
     })
     .catch((e) => {
       messageError($q, e);
-    })
-    .finally(() => {
-      hideLoader();
     });
 }
 
@@ -194,6 +188,9 @@ onMounted(() => {
   fetchListPlanned();
   fetchListRole();
   fetchAssigned();
+  setTimeout(() => {
+    hideLoader();
+  }, 1000);
 });
 </script>
 
@@ -268,7 +265,18 @@ onMounted(() => {
         </q-btn>
       </div>
 
-      <Competency v-model:dataListCriteria="dataListCriteria" />
+      <Competency
+        v-model:dataListCriteria="dataListCriteria"
+        v-model:competencyScore="competencyScore"
+      />
+
+      <div class="row text-body2 text-weight-bold justify-center">
+        <span
+          >สรุปผลการประเมินสมรรถนะ (คะแนนเต็ม
+          {{ store.dataEvaluation.capacityPoint }} คะแนน)</span
+        >
+        <div class="text-primary q-pl-md">{{ competencyScore }}</div>
+      </div>
     </div>
   </q-scroll-area>
 

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

@@ -44,7 +44,7 @@ const formDetail = reactive<any>({
   includingName: "",
   including: "",
   target: "",
-  unit: null,
+  unit: "",
   weight: null,
   achievement1: "",
   achievement2: "",
@@ -59,6 +59,7 @@ const formDetail = reactive<any>({
   strategy: null,
   strategyId: "",
   strategyName: "",
+  documentInfoEvidence: "",
 });
 
 function fetchIndicators() {
@@ -219,7 +220,7 @@ function onSubmit() {
 
       const formBody = {
         target: formDetail.target,
-        unit: Number(formDetail.unit),
+        unit: formDetail.unit,
         weight: Number(formDetail.weight),
         meaning: formDetail.meaning,
         formula: formDetail.formula,
@@ -305,12 +306,8 @@ watch(
 
                 <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 class="col-4">ลำดับ/รหัสตัวชี้วัด</div>
-                      <span>รหัสตัวชี้วัด</span>
+                    <div class="col-4">ชื่อตัวชี้วัด</div>
-                    </div>
-                    <div class="col-4">
-                      <span>ชื่อตัวชี้วัด</span>
-                    </div>
                   </div>
                   <q-separator />
 
@@ -363,7 +360,7 @@ watch(
                       </div>
 
                       <div class="col-12 row">
-                        <div class="col-4 text-grey-6">รหัสตัวชี้วัด</div>
+                        <div class="col-4 text-grey-6">ลำดับ/รหัสตัวชี้วัด</div>
                         <div class="col-8">{{ formDetail.including }}</div>
                       </div>
                       <div class="col-12 row">
@@ -399,7 +396,6 @@ watch(
                               (val) => !!val || `${'กรุณากรอกหน่วยนับ'}`,
                             ]"
                             hide-bottom-space
-                            mask="#"
                             reverse-fill-mask
                           />
                         </div>
@@ -490,6 +486,19 @@ watch(
                     class="inputgreen"
                   />
                 </div>
+
+                <div class="col-12">
+                  <q-input
+                    v-model="formDetail.documentInfoEvidence"
+                    label="ข้อมูลเอกสารหลักฐาน"
+                    type="textarea"
+                    outlined
+                    dense
+                    :rules="[(val:string) => !!val || `${'กรุณากรอกข้อมูลเอกสารหลักฐาน'}`,]"
+                    hide-bottom-space
+                    class="inputgreen"
+                  />
+                </div>
               </div>
             </div>
           </div>

src/modules/08_KPI/components/Tab/Dialog/03_FormIndicatorSpecial.vue

@@ -33,7 +33,7 @@ const formData = reactive<FormDataAssigned>({
   including: "", //รหัสตัวชี้วัด
   includingName: "", //ชื่อตัวชี้วัด
   target: "", //ค่าเป้าหมาย
-  unit: null, //หน่วยนับ
+  unit: "", //หน่วยนับ
   weight: null, //น้ำหนัก (ร้อยละ)
   meaning: "", //นิยามหรือความหมายของตัวชี้วัด
   formula: "", //สูตรคำนวณ
@@ -80,7 +80,7 @@ function closeDialog() {
   formData.including = "";
   formData.includingName = "";
   formData.target = "";
-  formData.unit = null;
+  formData.unit = "";
   formData.achievement1 = "";
   formData.achievement2 = "";
   formData.achievement3 = "";
@@ -95,7 +95,7 @@ function onSubmit() {
   dialogConfirm($q, async () => {
     showLoader();
     formData.weight = Number(formData.weight);
-    formData.unit = Number(formData.unit);
+    formData.unit = formData.unit;
     formData.kpiUserEvaluationId = store.dataEvaluation.id;
 
     try {
@@ -140,11 +140,11 @@ watch(
               <q-input
                 outlined
                 v-model="formData.including"
-                label="รหัสตัวชี้วัด"
+                label="ลำดับ/รหัสตัวชี้วัด"
                 bg-color="white"
                 dense
                 class="inputgreen"
-                :rules="[(val) => !!val || `${'กรุณากรอกรหัสตัวชี้วัด'}`]"
+                :rules="[(val) => !!val || `${'กรุณากรอกลำดับ/รหัสตัวชี้วัด'}`]"
                 hide-bottom-space
                 lazy-rules
               />
@@ -182,7 +182,6 @@ watch(
                 :rules="[(val:string) => !!val || `${'กรุณากรอกหน่วยนับ'}`,]"
                 hide-bottom-space
                 class="inputgreen"
-                mask="#"
                 reverse-fill-mask
                 lazy-rules
               />

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

@@ -29,7 +29,8 @@ const pagination = ref({
   page: 1,
   rowsPerPage: 20,
 });
-const weight = ref<number | null>(null);
+
+const weight = ref<number>(100);
 const mixin = useCounterMixin();
 const {
   showLoader,
@@ -150,7 +151,7 @@ function closeDialog() {
   formDetail.definition = "";
   formDetail.criteria = "";
   idProps.value = null;
-  weight.value = null;
+  // weight.value = null;
   expectedLevel.value = null;
 
   dataListCapacityDetails.value = [];
@@ -402,6 +403,7 @@ watch(
                       <div class="col-4 text-grey-6">น้ำหนัก (ร้อยละ)</div>
                       <div class="col-8">
                         <q-input
+                          readonly
                           v-model="weight"
                           dense
                           outlined
@@ -413,11 +415,9 @@ watch(
                         />
                       </div>
                       <div class="col-4 text-grey-6">ระดับที่คาดหวัง</div>
-                      <div
+                      <div class="col-8">
-                        v-if="type == 'HEAD' || type == 'GROUP'"
-                        class="col-8"
-                      >
                         <q-select
+                          :readonly="type == 'HEAD' || type == 'GROUP'"
                           v-model="expectedLevel"
                           :options="expectedLevelOp"
                           dense
@@ -429,7 +429,7 @@ watch(
                           class="inputgreen"
                         />
                       </div>
-                      <div v-else>
+                      <!-- <div v-else>
                         <q-input
                           v-model="expectedLevel"
                           dense
@@ -439,7 +439,7 @@ watch(
                           hide-bottom-space
                           class="inputgreen"
                         />
-                      </div>
+                      </div> -->
                     </div>
                   </q-card>
                 </div>

src/modules/08_KPI/components/Tab/TabMain.vue

@@ -11,26 +11,37 @@ import File from "@/modules/08_KPI/components/Tab/05_File.vue";
 
 const store = useKpiDataStore();
 const route = useRoute();
-const isReadonly = <boolean>(route.name === "KPIEditEvaluator" ? true : false);
+const isReadonly = ref<boolean>(route.name === "KPIEditEvaluator" ? true : false);
-const score = defineModel("score", { type: Number, default: 0 });
+const step = ref<number>(1); // 1 = จัดทำข้อตกลง, 2 = รายงานความก้าวหน้า, 3 = รายงานผลสำเร็จของงาน
-
+const indicatorScore = defineModel("indicatorScore", {
+  type: Number,
+  default: 0,
+});
+const competencyScore = defineModel("competencyScore", {
+  type: Number,
+  default: 0,
+});
 const itemsTab = ref<any>([
   {
     name: "1",
-    label: "ผู้ขอรับการประเมิน",
+    label: "จัดทำแบบฟอร์มการประเมิน",
   },
   {
     name: "2",
-    label: "ผู้ประเมิน",
+    label: "รายงานความก้าวหน้า",
   },
   {
     name: "3",
-    label: "ผู้บังคับบัญชาเหนือขึ้นไป",
+    label: "รายงานผลสำเร็จของงาน",
-  },
-  {
-    name: "4",
-    label: "ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง",
   },
+  // {
+  //   name: "3",
+  //   label: "ผู้บังคับบัญชาเหนือขึ้นไป",
+  // },
+  // {
+  //   name: "4",
+  //   label: "ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง",
+  // },
   {
     name: "5",
     label: "ไฟล์เอกสาร",
@@ -57,14 +68,15 @@ const splitterModel = ref<number>(12);
           :icon="tab.icon"
           :label="tab.label"
         /> -->
-        <q-tab name="1" label="ผู้ขอรับการประเมิน" />
+        <q-tab name="1" label="จัดทำข้อตกลง" />
-        <q-tab name="2" label="ผู้ประเมิน"> </q-tab>
+        <q-tab name="2" label="รายงานความก้าวหน้า" :disable="step < 2" />
-        <q-tab name="3" label="ผู้บังคับบัญชา">
+        <q-tab name="3" label="รายงานผลสำเร็จของงาน" :disable="step < 3" />
+        <!-- <q-tab name="3" label="ผู้บังคับบัญชา">
           <div class="text-caption">เหนือขึ้นไป</div>
         </q-tab>
         <q-tab name="4" label="ผู้บังคับบัญชา">
           <div class="text-caption">เหนือขึ้นไปอีกชั้นหนึ่ง</div>
-        </q-tab>
+        </q-tab> -->
         <q-tab name="5" label="ไฟล์เอกสาร" />
       </q-tabs>
     </template>
@@ -84,7 +96,11 @@ const splitterModel = ref<number>(12);
           :name="tab.name"
           class="q-pa-none"
         >
-          <Assessment v-if="store.tabMain === '1'" v-model:score="score" />
+          <Assessment
+            v-if="store.tabMain === '1'"
+            v-model:indicatorScore="indicatorScore"
+            v-model:competencyScore="competencyScore"
+          />
           <Evaluator v-if="store.tabMain === '2'" :type="'evaluator'" />
           <Evaluator v-if="store.tabMain === '3'" :type="'commander'" />
           <Evaluator v-if="store.tabMain === '4'" :type="'commanderHigh'" />

src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue

@@ -204,7 +204,7 @@ watch(
             <q-tooltip>เพิ่มข้อมูล</q-tooltip>
           </q-btn>
         </div>
-        <div class="col-auto">
+        <!-- <div class="col-auto">
           <q-btn
             v-if="!isReadonly"
             flat
@@ -217,7 +217,7 @@ watch(
           >
             <q-tooltip>ประเมิน</q-tooltip>
           </q-btn>
-        </div>
+        </div> -->
       </div>
     </q-card-section>
     <q-separator />

src/modules/08_KPI/components/Tab/Topic/02_Competency.vue

@@ -18,6 +18,10 @@ import type {
 const dataListCriteria = defineModel<ListCriteria[]>("dataListCriteria", {
   required: true,
 });
+const competencyScore = defineModel("competencyScore", {
+  type: Number,
+  default: 0,
+});
 
 const sortedDataListCriteria = computed(() => {
   return dataListCriteria.value.sort((a, b) => a.level - b.level);
@@ -111,10 +115,9 @@ function onAdd(type: string) {
 
 const rows = ref<any>([]);
 const lists = ref<any>([]);
-const resultEvaluation = ref<string | 0>(0);
+// const resultEvaluation = ref<string | 0>(0);
 
 function getData(type: string) {
-  showLoader();
   http
     .get(config.API.kpiUserCapacity + `?id=${id.value}&type=${type}`)
     .then(async (res) => {
@@ -158,11 +161,9 @@ function getData(type: string) {
           weightAvg != 0
             ? (resultAvg / weightAvg) * store.dataEvaluation.capacityPoint
             : 0;
-        resultEvaluation.value = sum.toFixed(2);
+        // resultEvaluation.value = sum.toFixed(2);
+        competencyScore.value = sum;
       }
-      // end cal summary
-
-      hideLoader();
     });
 }
 
@@ -238,7 +239,7 @@ onMounted(() => {
           </div>
 
           <q-space />
-          <q-btn
+          <!-- <q-btn
             v-if="!isReadonly"
             flat
             round
@@ -249,7 +250,7 @@ onMounted(() => {
             @click="onEvaluate(item.id)"
           >
             <q-tooltip>ประเมิน</q-tooltip>
-          </q-btn>
+          </q-btn> -->
         </div>
       </q-card-section>
       <q-card-section class="q-pa-sm">
@@ -358,14 +359,6 @@ onMounted(() => {
     v-model:dataListCriteria="dataListCriteria"
     :get-data="getData"
   />
-
-  <div class="row text-body2 text-weight-bold justify-center">
-    <span
-      >สรุปผลการประเมินสมรรถนะ (คะแนนเต็ม
-      {{ store.dataEvaluation.capacityPoint }} คะแนน)</span
-    >
-    <div class="text-primary q-pl-md">{{ resultEvaluation }}</div>
-  </div>
 </template>
 
 <style scoped>

src/modules/08_KPI/interface/request/index.ts

@@ -15,7 +15,7 @@ interface FormDataAssigned {
   including: string;
   includingName: string;
   target: string;
-  unit: number | null;
+  unit: string;
   weight: number | null;
   achievement1: string;
   achievement2: string;

src/modules/08_KPI/views/form.vue

@@ -49,6 +49,8 @@ const commanderHighMainOp = ref<DataOptions[]>([]);
 const evaluatorId = ref<any>(null);
 const commanderId = ref<any>(null);
 const commanderHighId = ref<any>(null);
+const indicatorScore = ref<number>(0);
+const competencyScore = ref<number>(0);
 
 const formProfile = reactive<FormProfile>({
   fullName: "",
@@ -64,7 +66,6 @@ const formProfile = reactive<FormProfile>({
 const router = useRouter();
 
 function fetchEvaluation() {
-  showLoader();
   http
     .get(config.API.kpiEvaluation + `/${id.value}`)
     .then((res) => {
@@ -82,14 +83,13 @@ function fetchEvaluation() {
     })
     .catch((e) => {
       messageError($q, e);
-    })
-    .finally(() => {
-      hideLoader();
     });
+  // .finally(() => {
+  //   hideLoader();
+  // });
 }
 
 function getProfile() {
-  showLoader();
   http
     .get(config.API.profilePosition())
     .then((res) => {
@@ -105,14 +105,13 @@ function getProfile() {
     })
     .catch((e) => {
       messageError($q, e);
-    })
-    .finally(() => {
-      hideLoader();
     });
+  // .finally(() => {
+  //   hideLoader();
+  // });
 }
 
 async function fetchProfile(id: string) {
-  showLoader();
   await http
     .get(
       config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, `profile-${id}`)
@@ -122,9 +121,6 @@ async function fetchProfile(id: string) {
     })
     .catch(() => {
       // profilePicture.value = avatar;
-    })
-    .finally(() => {
-      hideLoader();
     });
 }
 
@@ -250,9 +246,10 @@ watch(
       } else {
         scoreTotal.value = true;
       }
-    } else {
-      console.log(2);
     }
+    // else {
+    //   console.log(2);
+    // }
   }
 );
 
@@ -295,8 +292,9 @@ async function getAll() {
   await getOrgOp();
 }
 
-onMounted(() => {
+onMounted(async () => {
-  getAll();
+  showLoader();
+  await getAll();
 });
 </script>
 
@@ -344,7 +342,7 @@ onMounted(() => {
                   }}</span>
                   <q-space />
                   <div class="q-gutter-x-sm">
-                    <q-btn
+                    <!-- <q-btn
                       v-if="!isReadonly"
                       unelevated
                       round
@@ -355,7 +353,7 @@ onMounted(() => {
                       @click="modalScore = true"
                     >
                       <q-tooltip>แก้ไขคะแนนเต็ม</q-tooltip>
-                    </q-btn>
+                    </q-btn> -->
                     <q-btn
                       v-if="!isReadonly"
                       unelevated
@@ -440,7 +438,7 @@ onMounted(() => {
                     <div class="column">
                       <span class="text-grey-6">คะแนนประเมิน</span>
                       <span class="text-weight-medium text-primary">{{
-                        formProfile.score
+                        (indicatorScore + competencyScore).toFixed(2)
                       }}</span>
                     </div>
                   </div>
@@ -451,7 +449,10 @@ onMounted(() => {
         </q-card>
 
         <q-card class="q-mt-md rounded">
-          <TabMain />
+          <TabMain
+            v-model:indicatorScore="indicatorScore"
+            v-model:competencyScore="competencyScore"
+          />
         </q-card>
       </div>
     </div>
@@ -603,7 +604,7 @@ onMounted(() => {
         </q-card-section>
         <q-separator />
         <q-card-actions class="bg-white row justify-between">
-          <div class="col-8 text-center text-red text-bold">
+          <div class="col-8 text-red q-px-sm">
             <span v-if="scoreTotal == true"
               >คะแนนเต็มรวมกันต้องเท่ากับ 100 คะแนน</span
             >