diff --git a/src/api/14_KPI/api.KPI.ts b/src/api/14_KPI/api.KPI.ts
index 32658f12a..2788e2a11 100644
--- a/src/api/14_KPI/api.KPI.ts
+++ b/src/api/14_KPI/api.KPI.ts
@@ -33,11 +33,12 @@ export default {
   kpiEvaluation,
   kpiEvaluationUser,
   kpiPlan,
-  kpiPlanById: (id: string) => `${kpiPlan}/${id}`,
+  kpiPlanById: (id: string) => `${kpiPlan}/edit/${id}`,
 
   /** role */
   kpiRole,
   kpiRoleMainList: `${KPI}/role`,
+  kpiRoleMainEdit: `${KPI}/role/edit`,
 
   kpiSpecial,
   kpiCapacity,
diff --git a/src/modules/01_masterdata/components/Indicators/Assignment/DetailView.vue b/src/modules/01_masterdata/components/Indicators/Assignment/DetailView.vue
index 1d88483f7..f45c8b9ea 100644
--- a/src/modules/01_masterdata/components/Indicators/Assignment/DetailView.vue
+++ b/src/modules/01_masterdata/components/Indicators/Assignment/DetailView.vue
@@ -65,7 +65,7 @@ const roundOp = ref<DataOption[]>([
 function fetchspecialByid(id: string) {
   showLoader();
   http
-    .get(config.API.kpiSpecial + `/${id}`)
+    .get(config.API.kpiSpecial + `/edit/${id}`)
     .then((res) => {
       console.log(res);
       const data = res.data.result;
diff --git a/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue b/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
index be528f976..ef25438ce 100644
--- a/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
+++ b/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
@@ -127,7 +127,7 @@ function selectAgency() {
 /** บันทึกข้อมูล */
 function onSubmit() {
   const url = id.value
-    ? config.API.kpiRoleMainList + `/${id.value}`
+    ? config.API.kpiRoleMainEdit + `/${id.value}`
     : config.API.kpiRoleMainList;
 
   const body = {
@@ -177,7 +177,7 @@ function onSubmit() {
 function getDetail() {
   showLoader();
   http
-    .get(config.API.kpiRoleMainList + `/${id.value}`)
+    .get(config.API.kpiRoleMainEdit + `/${id.value}`)
     .then((res) => {
       const data = res.data.result;
       form.position = data.position;
diff --git a/src/modules/01_masterdata/components/competency/01ListCompetency.vue b/src/modules/01_masterdata/components/competency/01ListCompetency.vue
index 3a30c98ef..c9ba262d5 100644
--- a/src/modules/01_masterdata/components/competency/01ListCompetency.vue
+++ b/src/modules/01_masterdata/components/competency/01ListCompetency.vue
@@ -78,7 +78,7 @@ async function fetchList() {
   await http
     .get(
       config.API.kpiCapacity +
-        `?page=${formQuery.page}&pageSize=${formQuery.pageSize}&keyword=${formQuery.keyword}&type=${store.competencyTypeVal}`
+        `/edit?page=${formQuery.page}&pageSize=${formQuery.pageSize}&keyword=${formQuery.keyword}&type=${store.competencyTypeVal}`
     )
     .then(async (res) => {
       total.value = res.data.result.total;
diff --git a/src/modules/01_masterdata/components/competency/Forms/Main.vue b/src/modules/01_masterdata/components/competency/Forms/Main.vue
index 778cc5158..7361b086c 100644
--- a/src/modules/01_masterdata/components/competency/Forms/Main.vue
+++ b/src/modules/01_masterdata/components/competency/Forms/Main.vue
@@ -37,7 +37,7 @@ const formData = reactive({
 function fetchDetail() {
   showLoader();
   http
-    .get(config.API.kpiCapacity + `/${competencyId.value}`)
+    .get(config.API.kpiCapacity + `/edit/${competencyId.value}`)
     .then((res) => {
       const data = res.data.result;
       formData.competencyType = data.type;
diff --git a/src/modules/01_masterdata/views/Assignment.vue b/src/modules/01_masterdata/views/Assignment.vue
index c149e9ca9..3eee03ee3 100644
--- a/src/modules/01_masterdata/views/Assignment.vue
+++ b/src/modules/01_masterdata/views/Assignment.vue
@@ -92,7 +92,7 @@ function fetchList() {
   showLoader();
   formFilter.year = formFilter.year ? formFilter.year.toString() : null;
   http
-    .post(config.API.kpiSpecial + `/search`, formFilter)
+    .post(config.API.kpiSpecial + `/search-edit`, formFilter)
     .then((res: ResAssignment) => {
       maxPage.value = Math.ceil(res.data.result.total / formFilter.pageSize);
       totalList.value = res.data.result.total;
@@ -115,7 +115,7 @@ function onClickDelete(id: string) {
   dialogRemove($q, () => {
     showLoader();
     http
-      .delete(config.API.kpiSpecial + `/${id}`)
+      .delete(config.API.kpiSpecial + `/edit/${id}`)
       .then(() => {
         fetchList();
         success($q, "ลบข้อมูลสำเร็จ");
diff --git a/src/modules/01_masterdata/views/Strategic.vue b/src/modules/01_masterdata/views/Strategic.vue
index 722c4a28b..ddca8652c 100644
--- a/src/modules/01_masterdata/views/Strategic.vue
+++ b/src/modules/01_masterdata/views/Strategic.vue
@@ -154,7 +154,7 @@ function onSubmit() {
     };
     try {
       const method = isStatusEdit.value ? "patch" : "post";
-      await http[method](config.API.devStrategy, formData);
+      await http[method](config.API.devStrategy+`/edit`, formData);
       fetchDataTree();
       success($q, "บันทึกข้อมูลสำเร็จ");
     } catch (err) {
diff --git a/src/modules/01_masterdata/views/indicatorByPlan.vue b/src/modules/01_masterdata/views/indicatorByPlan.vue
index e7bc4eabc..1eb1cc2b4 100644
--- a/src/modules/01_masterdata/views/indicatorByPlan.vue
+++ b/src/modules/01_masterdata/views/indicatorByPlan.vue
@@ -72,7 +72,7 @@ function fetchList() {
   if (nodeData.nodeId) {
     showLoader();
     http
-      .post(config.API.kpiPlan + `/search`, {
+      .post(config.API.kpiPlan + `/search-edit`, {
         isAll: isAll.value,
         keyword: nodeData.keyword,
         node: nodeData.node ? nodeData.node : 0,
diff --git a/src/modules/01_masterdata/views/indicatorByRole.vue b/src/modules/01_masterdata/views/indicatorByRole.vue
index da61fc132..c8128e116 100644
--- a/src/modules/01_masterdata/views/indicatorByRole.vue
+++ b/src/modules/01_masterdata/views/indicatorByRole.vue
@@ -102,7 +102,7 @@ const roundOp = ref<DataOption[]>([
 
 function fetchList() {
   http
-    .post(config.API.kpiRoleMainList + `/search`, {
+    .post(config.API.kpiRoleMainList + `/search-edit`, {
       // ?page=${formFilter.page}&pageSize=${formFilter.pageSize}&period=${formFilter.round}&position=${formFilter.position}&keyword=${formFilter.keyword}&year=${formFilter.year}
       keyword: formFilter.keyword,
       position: formFilter.position,
@@ -141,7 +141,7 @@ function onClickDelete(id: number) {
   dialogRemove($q, () => {
     showLoader();
     http
-      .delete(config.API.kpiRoleMainList + `/${id}`)
+      .delete(config.API.kpiRoleMainEdit + `/${id}`)
       .then(() => {
         success($q, "ลบข้อมูลสำเร็จ");
         fetchList();
diff --git a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
index ac0a79ff6..003059f92 100644
--- a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
@@ -94,7 +94,7 @@ function fetchListPlan() {
 
   showLoader();
   http
-    .post(config.API.kpiPlan + `/search`, formFilter)
+    .post(config.API.kpiPlan + `/search-edit`, formFilter)
     .then((res) => {
       listTarget.value = res.data.result.data;
       maxPage.value = Math.ceil(res.data.result.total / formFilter.pageSize);
@@ -148,7 +148,7 @@ function fetchListRole() {
   formFilter.position = store.dataProfile.position;
 
   http
-    .post(config.API.kpiRole + `/search`, formFilter)
+    .post(config.API.kpiRole + `/search-edit`, formFilter)
     .then((res) => {
       listTarget.value = res.data.result.data;
       maxPage.value = Math.ceil(res.data.result.total / formFilter.pageSize);
@@ -208,7 +208,7 @@ function fetchListSpecial() {
 
   showLoader();
   http
-    .post(config.API.kpiSpecial + `/search`, body)
+    .post(config.API.kpiSpecial + `/search-edit`, body)
     .then((res) => {
       listTarget.value = res.data.result.data;
       maxPage.value = Math.ceil(res.data.result.total / formFilter.pageSize);
diff --git a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
index 88c3e9b15..fbb6337c6 100644
--- a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
@@ -677,9 +677,9 @@ watch(
         </q-card-section>
         <q-separator />
         <q-card-actions align="right" class="bg-white text-teal">
-          
           <q-space />
-          <div  class="text-red q-px-sm">
+
+          <div v-if="isRoundClose" class="text-red q-px-sm">
             รอบการประเมินนี้ปิดแล้ว
           </div>
           <q-btn