ปรับข้อความรอบประเมิน

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

@@ -75,14 +75,14 @@ const formDetail = reactive<any>({
   strategyId: "",
   strategyName: "",
   documentInfoEvidence: "",
-  startDate:null,
+  startDate: null,
-  endDate:null
+  endDate: null,
 });
 
 /** Option  รอบการประเมิน*/
 const roundOp = ref<DataOption[]>([
-  { id: "APR", name: "รอบเมษายน" },
+  { id: "APR", name: "รอบที่ 1 เมษายน" },
-  { id: "OCT", name: "รอบตุลาคม" },
+  { id: "OCT", name: "รอบที่ 2 ตุลาคม" },
 ]);
 
 function fetchListPlan() {
@@ -125,8 +125,8 @@ function fetchListPlanByid(id: string) {
       formDetail.achievement5 = data.achievement5;
       formDetail.documentInfoEvidence = data.documentInfoEvidence;
 
-      formDetail.startDate = data.startDate
+      formDetail.startDate = data.startDate;
-      formDetail.endDate = data.endDate
+      formDetail.endDate = data.endDate;
 
       listCheckID.value = data.kpiPlanId;
     })
@@ -178,8 +178,8 @@ function fetchRoleByid(id: string) {
       formDetail.achievement4 = data.achievement4;
       formDetail.achievement5 = data.achievement5;
       formDetail.documentInfoEvidence = data.documentInfoEvidence;
-      formDetail.startDate = data.startDate
+      formDetail.startDate = data.startDate;
-      formDetail.endDate = data.endDate
+      formDetail.endDate = data.endDate;
 
       listCheckID.value = data.kpiRoleId;
       // clickList(data.kpiRoleId, true);
@@ -240,8 +240,8 @@ function fetchspecialByid(id: string) {
       formDetail.formula = data.formula;
       formDetail.meaning = data.meaning;
       formDetail.documentInfoEvidence = data.documentInfoEvidence;
-      formDetail.startDate = data.startDate
+      formDetail.startDate = data.startDate;
-      formDetail.endDate = data.endDate
+      formDetail.endDate = data.endDate;
     })
     .catch((err) => {
       messageError($q, err);
@@ -326,8 +326,8 @@ function closeDialog() {
   formDetail.strategy = "";
   formDetail.strategyId = "";
   formDetail.documentInfoEvidence = "";
-  formDetail.startDate = null
+  formDetail.startDate = null;
-  formDetail.endDate = null
+  formDetail.endDate = null;
 
   formFilter.isAll = false;
   formFilter.keyword = "";
@@ -574,7 +574,7 @@ const title = computed(() => {
                         @click="clickList(item.id)"
                       >
                         <q-item-section class="q-pa-none">
-                          <div class="row items-center full-width ">
+                          <div class="row items-center full-width">
                             <div class="col-5">
                               {{ item.including }}
                             </div>
@@ -875,7 +875,9 @@ const title = computed(() => {
                         outlined
                         class="inputgreen"
                         :model-value="
-                          formDetail.startDate ? date2Thai(formDetail.startDate) : null
+                          formDetail.startDate
+                            ? date2Thai(formDetail.startDate)
+                            : null
                         "
                         :label="`${'ช่วงเวลาเริ่มต้น'}`"
                         hide-bottom-space
@@ -919,7 +921,9 @@ const title = computed(() => {
                         outlined
                         class="inputgreen"
                         :model-value="
-                          formDetail.endDate ? date2Thai(formDetail.endDate) : null
+                          formDetail.endDate
+                            ? date2Thai(formDetail.endDate)
+                            : null
                         "
                         :label="`${'ช่วงเวลาสิ้นสุด'}`"
                         hide-bottom-space

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

@@ -177,9 +177,9 @@ function fetchRoundOption() {
         id: e.id,
         name:
           e.durationKPI === "OCT"
-            ? "รอบตุลาคม"
+            ? "รอบที่ 2 ตุลาคม"
             : e.durationKPI === "APR"
-            ? "รอบเมษายน"
+            ? "รอบที่ 1 เมษายน"
             : "",
         isClosed: !e.isActive,
       }));
@@ -271,10 +271,10 @@ function updateSelect() {
   search.value = "";
 }
 
-function getOrgOp(check: boolean,id:string) {
+function getOrgOp(check: boolean, id: string) {
   if (check == false) {
     http
-      .get(config.API.Kpiorg+`/${id}`)
+      .get(config.API.Kpiorg + `/${id}`)
       .then((res) => {
         const data = res.data.result;
         evaluatorIdMainOp.value = data.caregiver.map((i: any) => ({
@@ -461,7 +461,7 @@ watch(
                             color="primary"
                             dense
                             v-model="props.selected"
-                            @click="getOrgOp(props.selected,props.row.id)"
+                            @click="getOrgOp(props.selected, props.row.id)"
                           />
                         </q-td>
                         <q-td

src/modules/14_KPI/views/list.vue

@@ -11,7 +11,7 @@ import type { QTableProps } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import { useKpiDataStore } from "@/modules/14_KPI/store";
 
-import DialogEvalute from '@/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue'
+import DialogEvalute from "@/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue";
 const $q = useQuasar();
 const router = useRouter();
 const store = useKpiDataStore();
@@ -25,7 +25,7 @@ const rows = ref<any[]>([]);
 
 const year = ref<number | null>(new Date().getFullYear());
 
-const modalDialog = ref<boolean>(false)
+const modalDialog = ref<boolean>(false);
 const round = ref<string>("");
 const roundOp = ref<DataOption[]>([]);
 
@@ -106,9 +106,9 @@ function fetchRoundOption() {
           id: e.id,
           name:
             e.durationKPI === "OCT"
-              ? "รอบตุลาคม"
+              ? "รอบที่ 2 ตุลาคม"
               : e.durationKPI === "APR"
-              ? "รอบเมษายน"
+              ? "รอบที่ 1 เมษายน"
               : "",
         }));
 
@@ -195,8 +195,8 @@ watch(
   }
 );
 
-function onDialog(){
+function onDialog() {
-  modalDialog.value = true
+  modalDialog.value = true;
 }
 onMounted(async () => {
   fetchRoundOption();
@@ -374,12 +374,9 @@ onMounted(async () => {
     </div>
   </div>
 
-
+  <DialogEvalute v-model:modal="modalDialog" />
-  <DialogEvalute 
-  v-model:modal="modalDialog"/>
 </template>
 
-
 <style scoped lang="scss">
 .icon-color {
   color: #4154b3;

src/modules/14_KPI/views/report.vue

@@ -105,9 +105,9 @@ function fetchRoundOption() {
           id: e.id,
           name:
             e.durationKPI === "OCT"
-              ? "รอบตุลาคม"
+              ? "รอบที่ 2 ตุลาคม"
               : e.durationKPI === "APR"
-              ? "รอบเมษายน"
+              ? "รอบmuj 1 เมษายน"
               : "",
         }));
         roundOp.value = list;