From 408a3bf8b3d2751bdf6ed93600e0e8a72b18c823 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 17 Apr 2024 17:17:05 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9F=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=94=E0=B9=8C=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4=20=E0=B8=A2=E0=B9=89=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=AA=E0=B8=A1=E0=B8=A3=E0=B8=A3=E0=B8=96=E0=B8=99?=
 =?UTF-8?q?=E0=B8=B0=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B8=95=E0=B8=B1=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=8A=E0=B8=B5=E0=B9=89=E0=B8=A7=E0=B8=B1=E0=B8=94=E0=B9=84?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=AD=E0=B8=A2=E0=B8=B9=E0=B9=88=E0=B8=A0=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A2=E0=B9=83=E0=B8=95=E0=B9=89=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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/interface/request/main/main.ts            | 52 +++++++++----------
 .../components/indicatorByPlan/DetailView.vue |  2 +-
 .../components/indicatorByRole/DetailView.vue |  2 +-
 src/modules/14_KPI/views/indicatorByPlan.vue  |  2 +-
 src/modules/14_KPI/views/indicatorByRole.vue  |  2 +-
 .../components/historyEmployee/AddPage.vue    |  4 +-
 .../15_development/interface/request/Main.ts  |  4 +-
 src/views/MainLayout.vue                      | 15 ++++--
 8 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index c40be23d4..2c9f74d10 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -84,6 +84,31 @@ const menuList = readonly<any[]>([
         label: "ข้อมูลเครื่องราชอิสริยาภรณ์",
         path: "masterInsignia",
       },
+      {
+        key: 3.6,
+        label: "ตัวชี้วัด",
+        role: "evaluateKPI",
+        children: [
+          {
+            key: 3.61,
+            label: "ตามแผน",
+            path: "KPIIndicatorByPlan",
+            role: "evaluateKPI",
+          },
+          {
+            key: 3.62,
+            label: "ตามตำแหน่ง",
+            path: "KPIIndicatorByRole",
+            role: "evaluateKPI",
+          },
+        ],
+      },
+      {
+        key: 3.7,
+        label: "สมรรถนะ",
+        path: "KPICompetency",
+        role: "evaluateKPI",
+      },
     ],
   },
   {
@@ -685,32 +710,7 @@ const menuList = readonly<any[]>([
         path: "KPIRound",
         role: "evaluateKPI",
       },
-      {
-        key: 13.2,
-        label: "ตัวชี้วัด",
-        role: "evaluateKPI",
-        children: [
-          {
-            key: 13.21,
-            label: "ตามแผนปฏิบัติราชการประจำปี",
-            path: "KPIIndicatorByPlan",
-            role: "evaluateKPI",
-          },
-          {
-            key: 13.22,
-            label: "ตามหน้าที่ความรับผิดชอบ",
-            path: "KPIIndicatorByRole",
-            role: "evaluateKPI",
-          },
-        ]    
-      },
-      {
-        key: 13.3,
-        label: "สมรรถนะ",
-        path: "KPICompetency",
-        role: "evaluateKPI",
-      },
-    ]
+    ],
   },
   {
     key: 14,
diff --git a/src/modules/14_KPI/components/indicatorByPlan/DetailView.vue b/src/modules/14_KPI/components/indicatorByPlan/DetailView.vue
index 1ff6f96ed..a420bcf47 100644
--- a/src/modules/14_KPI/components/indicatorByPlan/DetailView.vue
+++ b/src/modules/14_KPI/components/indicatorByPlan/DetailView.vue
@@ -34,7 +34,7 @@ onMounted(() => {});
       color="primary"
       @click="router.go(-1)"
     />
-    {{ `${title}คัวชี้วัดตามแผนปฏิบัติราชการประจำปี` }}
+    {{ `${title}ตัวชี้วัดตามแผนฯ` }}
   </div>
 </template>
 
diff --git a/src/modules/14_KPI/components/indicatorByRole/DetailView.vue b/src/modules/14_KPI/components/indicatorByRole/DetailView.vue
index 80b8efaa2..be5955b11 100644
--- a/src/modules/14_KPI/components/indicatorByRole/DetailView.vue
+++ b/src/modules/14_KPI/components/indicatorByRole/DetailView.vue
@@ -34,7 +34,7 @@ onMounted(() => {});
       color="primary"
       @click="router.go(-1)"
     />
-    {{ `${title}คัวชี้วัดตามหน้าที่ความรับผิดชอบ` }}
+    {{ `${title}ตัวชี้วัดตามตำแหน่ง` }}
   </div>
 </template>
 
diff --git a/src/modules/14_KPI/views/indicatorByPlan.vue b/src/modules/14_KPI/views/indicatorByPlan.vue
index 287b0ba3e..a5d583777 100644
--- a/src/modules/14_KPI/views/indicatorByPlan.vue
+++ b/src/modules/14_KPI/views/indicatorByPlan.vue
@@ -108,7 +108,7 @@ onMounted(() => {
 
 <template>
   <div class="toptitle text-dark col-12 row items-center">
-    ตามแผนปฏิบัติราชการประจำปี
+    รายการตัวชี้วัดตามแผนฯ
   </div>
   <q-card flat bordered class="q-pa-md">
     <q-toolbar class="q-pa-none">
diff --git a/src/modules/14_KPI/views/indicatorByRole.vue b/src/modules/14_KPI/views/indicatorByRole.vue
index 1e7d13264..0b2bbffbf 100644
--- a/src/modules/14_KPI/views/indicatorByRole.vue
+++ b/src/modules/14_KPI/views/indicatorByRole.vue
@@ -108,7 +108,7 @@ onMounted(() => {
 
 <template>
   <div class="toptitle text-dark col-12 row items-center">
-    ตามหน้าที่ความรับผิดชอบ
+    รายการตัวชี้วัดตามตำแหน่ง
   </div>
   <q-card flat bordered class="q-pa-md">
     <q-toolbar class="q-pa-none">
diff --git a/src/modules/15_development/components/historyEmployee/AddPage.vue b/src/modules/15_development/components/historyEmployee/AddPage.vue
index 0e0c88088..4a6868b7b 100644
--- a/src/modules/15_development/components/historyEmployee/AddPage.vue
+++ b/src/modules/15_development/components/historyEmployee/AddPage.vue
@@ -59,8 +59,8 @@ const formMainProject = reactive<FormAddHistoryProject>({
   totalTraining: "", //รวมระยะเวลาในการฝึกอบรม
   location: "", //สถานที่ไปศึกษาดูงาน
   topic: "", //หัวข้อการไปศึกษาดูงาน
-  studyStart: "", //วันเริ่มต้นการศึกษาดูงาน
-  studyEnd: "", //วันสิ้นสุดการศึกษาดูงาน
+  // studyStart: "", //วันเริ่มต้นการศึกษาดูงาน
+  // studyEnd: "", //วันสิ้นสุดการศึกษาดูงาน
   organizingTraining: "", //หน่วยงานที่รับผิดชอบจัดการอบรม
 });
 
diff --git a/src/modules/15_development/interface/request/Main.ts b/src/modules/15_development/interface/request/Main.ts
index 91934dd33..9becd25ac 100644
--- a/src/modules/15_development/interface/request/Main.ts
+++ b/src/modules/15_development/interface/request/Main.ts
@@ -134,8 +134,8 @@ interface FormAddHistoryProject {
   totalTraining: string;
   location: string;
   topic: string;
-  studyStart: string;
-  studyEnd: string;
+  // studyStart: string;
+  // studyEnd: string;
   organizingTraining: string;
   [key: string]: any;
 }
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index c7a2c685a..bd573aca9 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -741,7 +741,6 @@ watch(
                     menuItem.key == 9 ||
                     menuItem.key == 11 ||
                     menuItem.key == 12 ||
-                    menuItem.key == 13 ||
                     menuItem.key == 14
                   "
                 >
@@ -923,7 +922,11 @@ watch(
                 </template>
 
                 <!-- เมนูย่อย 2 ชั้น (สรรหา) -->
-                <div v-if="menuItem.key == 5 || menuItem.key == 11 || menuItem.key == 13">
+                <div
+                  v-if="
+                    menuItem.key == 5 || menuItem.key == 11 || menuItem.key == 3
+                  "
+                >
                   <div v-for="(subMenu, i) in menuItem.children" :key="i">
                     <q-expansion-item
                       switch-toggle-side
@@ -936,8 +939,12 @@ watch(
                         subMenu.key !== 11.3 &&
                         subMenu.key !== 11.4 &&
                         subMenu.key !== 11.5 &&
-                        subMenu.key !== 13.1 &&
-                        subMenu.key !== 13.3
+                        subMenu.key !== 3.1 &&
+                        subMenu.key !== 3.2 &&
+                        subMenu.key !== 3.3 &&
+                        subMenu.key !== 3.4 &&
+                        subMenu.key !== 3.5 &&
+                        subMenu.key !== 3.7
                       "
                       class="expan2"
                       dense