From bfee8e9cddc8dde1770ef854758e6b708f7e4566 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Mon, 5 Aug 2024 16:34:03 +0700
Subject: [PATCH] no message

---
 .../components/1_Complaint/MainPage.vue       |  8 ++-
 .../6_BasicInformation/Channel/MainPage.vue   |  8 +--
 .../6_BasicInformation/Director/MainPage.vue  | 13 ++---
 .../components/7_ListSuspend/DetailPage.vue   |  6 ++-
 .../components/7_ListSuspend/ListsPage.vue    | 40 +++++++++++---
 .../components/8_AppealComplain/EditPage.vue  |  4 +-
 .../components/8_AppealComplain/Form.vue      | 16 +++++-
 .../components/8_AppealComplain/MainPage.vue  | 53 +++++++++++++++++--
 src/modules/11_discipline/router.ts           | 24 +++++++++
 src/modules/14_KPI/views/list.vue             |  6 +--
 src/modules/14_KPI/views/round.vue            | 25 ++++++---
 11 files changed, 164 insertions(+), 39 deletions(-)

diff --git a/src/modules/11_discipline/components/1_Complaint/MainPage.vue b/src/modules/11_discipline/components/1_Complaint/MainPage.vue
index 5cedd0ea0..9fc124a94 100644
--- a/src/modules/11_discipline/components/1_Complaint/MainPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/MainPage.vue
@@ -12,6 +12,7 @@ import TableComplaint from "@/modules/11_discipline/components/1_Complaint/Table
 
 import config from "@/app.config";
 import http from "@/plugins/http";
+import { checkPermission } from "@/utils/permissions";
 
 const $q = useQuasar();
 const mixin = useCounterMixin();
@@ -129,7 +130,11 @@ onMounted(async () => {
           <template v-if="statusFilter !== 'ALL'" v-slot:append>
             <q-icon
               name="cancel"
-              @click.stop.prevent="(option = complainstStore.statusOptions),(statusFilter = 'ALL'), getList()"
+              @click.stop.prevent="
+                (option = complainstStore.statusOptions),
+                  (statusFilter = 'ALL'),
+                  getList()
+              "
               class="cursor-pointer"
             />
           </template>
@@ -137,6 +142,7 @@ onMounted(async () => {
       </div>
       <div>
         <q-btn
+          v-if="checkPermission($route)?.attrIsCreate"
           id="addComplaints"
           for="addComplaints"
           size="12px"
diff --git a/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue b/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue
index 1df0a12cc..cc92edf38 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue
@@ -8,6 +8,7 @@ import config from "@/app.config";
 import http from "@/plugins/http";
 import type { typeItem } from "@/modules/11_discipline/interface/response/channel";
 
+import { checkPermission } from "@/utils/permissions";
 const dataStore = useDisciplineChannelDataStore();
 const mixin = useCounterMixin();
 const { dialogRemove, showLoader, messageError, hideLoader, success } = mixin;
@@ -108,6 +109,7 @@ onMounted(() => {
     <div class="row col-12 q-col-gutter-sm q-mb-sm">
       <div>
         <q-btn
+        v-if="checkPermission($route)?.attrIsCreate"
           @click="clickAdd()"
           size="12px"
           flat
@@ -170,7 +172,7 @@ onMounted(() => {
       >
         <template v-slot:header="props">
           <q-tr :props="props">
-            <q-th auto-width />
+            <q-th auto-width v-if="checkPermission($route)?.attrIsDelete"/>
             <q-th v-for="col in props.cols" :key="col.name" :props="props">
               <span class="text-weight-medium">{{ col.label }}</span>
             </q-th>
@@ -178,7 +180,7 @@ onMounted(() => {
         </template>
         <template v-slot:body="props">
           <q-tr :props="props" class="cursor-pointer">
-            <q-td>
+            <q-td v-if="checkPermission($route)?.attrIsDelete">
               <q-btn
                 dense
                 size="12px"
@@ -195,7 +197,7 @@ onMounted(() => {
               v-for="col in props.cols"
               :key="col.name"
               :props="props"
-              @click="editPage(props.row)"
+              @click="checkPermission($route)?.attrIsUpdate ? editPage(props.row):''"
             >
               <div v-if="col.name === 'no'">
                 {{ props.rowIndex + 1 }}
diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue
index 91d6ff20f..7dafa4016 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue
@@ -8,6 +8,7 @@ import http from "@/plugins/http";
 import DialogTotal from "@/modules/11_discipline/components/6_BasicInformation/Director/DialogInvestigateTotal.vue";
 import type { DirectorRowsResponse } from "@/modules/11_discipline/interface/response/director";
 
+import { checkPermission } from "@/utils/permissions";
 const $q = useQuasar();
 const dataStore = useDisciplineDirectorDataStore();
 const mixin = useCounterMixin();
@@ -147,6 +148,7 @@ onMounted(() => {
     <div class="row col-12 q-col-gutter-sm q-mb-sm">
       <div>
         <q-btn
+        v-if="checkPermission($route)?.attrIsCreate"
           @click="$router.push(`/discipline/director/add`)"
           size="12px"
           flat
@@ -223,7 +225,7 @@ onMounted(() => {
         </template>
         <template v-slot:header="props">
           <q-tr :props="props">
-            <q-th auto-width />
+            <q-th auto-width v-if="checkPermission($route)?.attrIsDelete"/>
             <q-th v-for="col in props.cols" :key="col.name" :props="props">
               <span class="text-weight-medium">{{ col.label }}</span>
             </q-th>
@@ -231,7 +233,7 @@ onMounted(() => {
         </template>
         <template v-slot:body="props">
           <q-tr :props="props" class="cursor-pointer">
-            <q-td auto-width>
+            <q-td auto-width v-if="checkPermission($route)?.attrIsDelete">
               <q-btn
                 dense
                 size="12px"
@@ -257,7 +259,7 @@ onMounted(() => {
                   props.row.totalInvestigate > 0
                 "
                 class="text-blue"
-                @click="openDetail(props.row, 'investigate')"
+                @click="checkPermission($route)?.attrIsGet ? openDetail(props.row, 'investigate'):''"
               >
                 {{ props.row.totalInvestigate }}
               </div>
@@ -267,18 +269,17 @@ onMounted(() => {
                   props.row.totalDisciplinary > 0
                 "
                 class="text-blue"
-                @click="openDetail(props.row, 'disciplinary')"
+                @click="checkPermission($route)?.attrIsGet ? openDetail(props.row, 'disciplinary'):''"
               >
                 {{ props.row.totalDisciplinary }}
               </div>
               <div
                 v-else
-                @click="$router.push(`/discipline/director/${props.row.id}`)"
+                @click="checkPermission($route)?.attrIsUpdate ? $router.push(`/discipline/director/${props.row.id}`):''"
               >
                 {{ col.value ?? "-" }}
               </div>
             </q-td>
-
           </q-tr>
         </template>
       </d-table>
diff --git a/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue b/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue
index 4319246de..665769f2f 100644
--- a/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue
+++ b/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue
@@ -16,6 +16,7 @@ import type { DataProfile } from "@/modules/05_placement/interface/index/Main";
 import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
 import CardProfile from "@/components/CardProfile.vue";
 
+
 const modalPersonal = ref<boolean>(false);
 const personId = ref<string>("");
 /** use */
@@ -23,6 +24,7 @@ const dataStore = useDisciplineSuspendStore();
 const $q = useQuasar();
 const route = useRoute();
 const router = useRouter();
+const checkRoutePermission = ref<boolean>(route.name == 'disciplineDetailSuspend')
 const mixin = useCounterMixin();
 const dataId = route.params.id.toString();
 const {
@@ -330,10 +332,10 @@ onMounted(async () => {
     <q-form greedy @submit.prevent @validation-success="saveData">
       <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
         <div class="q-pl-sm text-weight-bold text-dark">
-          แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
+          {{ checkRoutePermission ? 'รายละเอียดข้อมูลบัญชีแนบท้าย':'แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย'}}
         </div>
         <q-space />
-        <div v-if="data.status !== 'DONE' && data.status !== 'REPORT'">
+        <div v-if="data.status !== 'DONE' && data.status !== 'REPORT'&& !checkRoutePermission">
           <div class="q-gutter-sm" v-if="!edit">
             <q-btn
               outline
diff --git a/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue b/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue
index 3e7da48f4..138f3b629 100644
--- a/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue
+++ b/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue
@@ -11,6 +11,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 
 import DialogSendToCommand from "@/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue";
+import { checkPermission } from "@/utils/permissions";
 
 /** use */
 const dataStore = useDisciplineSuspendStore();
@@ -251,6 +252,7 @@ onMounted(() => {
       <div class="col-12">
         <div class="row col-12">
           <q-btn
+            v-if="checkPermission($route)?.attrIsUpdate"
             @click="openModalOrder"
             size="14px"
             flat
@@ -324,6 +326,7 @@ onMounted(() => {
             </template>
             <template v-slot:header="props">
               <q-tr :props="props">
+                <q-th auto-width v-if="checkPermission($route)?.attrIsGet !== false || checkPermission($route)?.attrIsUpdate !== false"/>
                 <q-th v-for="col in props.cols" :key="col.name" :props="props">
                   <span class="text-weight-medium">{{ col.label }}</span>
                 </q-th>
@@ -332,12 +335,33 @@ onMounted(() => {
             </template>
             <template v-slot:body="props">
               <q-tr :props="props" class="cursor-pointer">
-                <q-td
-                  v-for="col in props.cols"
-                  :key="col.name"
-                  :props="props"
-                  @click="router.push(`/discipline-suspend/${props.row.id}`)"
-                >
+                <q-td auto-width v-if="checkPermission($route)?.attrIsGet !== false || checkPermission($route)?.attrIsUpdate !== false">
+                  <q-btn
+                    v-if="checkPermission($route)?.attrIsGet"
+                    @click="
+                      router.push(`/discipline-suspend-detail/${props.row.id}`)
+                    "
+                    size="14px"
+                    flat
+                    round
+                    color="info"
+                    icon="mdi-eye"
+                  >
+                    <q-tooltip>รายละเอียด</q-tooltip>
+                  </q-btn>
+                  <q-btn
+                    v-if="checkPermission($route)?.attrIsUpdate"
+                    @click="router.push(`/discipline-suspend/${props.row.id}`)"
+                    size="14px"
+                    flat
+                    round
+                    color="edit"
+                    icon="edit"
+                  >
+                    <q-tooltip>แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย</q-tooltip>
+                  </q-btn>
+                </q-td>
+                <q-td v-for="col in props.cols" :key="col.name" :props="props">
                   <div v-if="col.name === 'no'">
                     {{
                       (currentPage - 1) * Number(pagination.rowsPerPage) +
@@ -346,7 +370,9 @@ onMounted(() => {
                     }}
                   </div>
                   <div v-else-if="col.name === 'name'" class="table_ellipsis">
-                    {{ props.row.prefix ? props.row.prefix : "" }}{{ props.row.firstName ? props.row.firstName : "" }} {{ props.row.lastName ? props.row.lastName : "" }}
+                    {{ props.row.prefix ? props.row.prefix : ""
+                    }}{{ props.row.firstName ? props.row.firstName : "" }}
+                    {{ props.row.lastName ? props.row.lastName : "" }}
                   </div>
                   <div v-else-if="col.name === 'title'" class="table_ellipsis">
                     {{ props.row.title ? props.row.title : "-" }}
diff --git a/src/modules/11_discipline/components/8_AppealComplain/EditPage.vue b/src/modules/11_discipline/components/8_AppealComplain/EditPage.vue
index eb87d596a..fc0aa4a38 100644
--- a/src/modules/11_discipline/components/8_AppealComplain/EditPage.vue
+++ b/src/modules/11_discipline/components/8_AppealComplain/EditPage.vue
@@ -19,7 +19,7 @@ const { showLoader, messageError, hideLoader, dialogConfirm, success } = mixin;
 const route = useRoute();
 const router = useRouter();
 const id = ref<string>(route.params.id as string);
-
+const checkRoutePermission = ref<boolean>(route.name == 'appealComplainDetail')
 const historyStatusOb = reactive<HistoryStatusType>({
   status: "",
   createdFullName: "",
@@ -134,7 +134,7 @@ onMounted(() => {
         class="q-mr-sm"
         @click="router.push('/discipline-appealcomplain')"
       />
-      แก้ไขการอุทธรณ์/ร้องทุกข์
+      {{ checkRoutePermission ? `รายละเอียด`:`แก้ไข` }}การอุทธรณ์/ร้องทุกข์
     </div>
 
     <Form :on-submit="onSubmit" :data="data" :get-data="getData" />
diff --git a/src/modules/11_discipline/components/8_AppealComplain/Form.vue b/src/modules/11_discipline/components/8_AppealComplain/Form.vue
index cfe0f83df..9ec102dc8 100644
--- a/src/modules/11_discipline/components/8_AppealComplain/Form.vue
+++ b/src/modules/11_discipline/components/8_AppealComplain/Form.vue
@@ -17,10 +17,12 @@ import type {
   MyObjectAppealRef,
   HistoryStatusType,
 } from "@/modules/11_discipline/interface/response/appealComplain";
+import { checkPermission } from "@/utils/permissions";
 const isReadonly = ref<boolean>(false); // อ่านได้อย่างเดียว
 const mainStore = useDisciplineMainStore();
 const router = useRouter();
 const route = useRoute();
+const checkRoutePermission = ref<boolean>(route.name == "appealComplainDetail");
 /** รับ props มาจากหน้าหลัก */
 const props = defineProps({
   data: {
@@ -378,6 +380,7 @@ onMounted(() => {
                 <div class="row q-gutter-x-sm">
                   <div class="col-3">
                     <q-select
+                      :readonly="checkRoutePermission"
                       ref="typeRef"
                       :class="inputEdit(isReadonly)"
                       v-model="formData.type"
@@ -405,6 +408,7 @@ onMounted(() => {
                   </div>
                   <div class="col-3" v-if="isReadonly">
                     <q-select
+                      :readonly="checkRoutePermission"
                       ref="statusRef"
                       v-model="formData.status"
                       :class="inputEdit(isReadonly)"
@@ -528,6 +532,7 @@ onMounted(() => {
                 <div class="row col-12">
                   <div class="col-12" id="title">
                     <q-input
+                      :readonly="checkRoutePermission"
                       ref="titleRef"
                       dense
                       :class="inputEdit(isReadonly)"
@@ -545,6 +550,7 @@ onMounted(() => {
 
                 <div class="col-xs-12 col-sm-12" id="detail">
                   <q-input
+                    :readonly="checkRoutePermission"
                     ref="descriptionRef"
                     dense
                     :class="inputEdit(isReadonly)"
@@ -563,6 +569,7 @@ onMounted(() => {
                 <div class="row q-gutter-x-sm">
                   <div class="col-3">
                     <datepicker
+                      :readonly="checkRoutePermission"
                       menu-class-name="modalfix"
                       v-model="formData.year"
                       class="col-2"
@@ -578,6 +585,7 @@ onMounted(() => {
                       <template #trigger>
                         <q-input
                           dense
+                          :readonly="checkRoutePermission"
                           :class="inputEdit(isReadonly)"
                           outlined
                           :model-value="Number(formData.year) + 543"
@@ -599,6 +607,7 @@ onMounted(() => {
                   <div class="col-3">
                     <q-input
                       ref="caseTypeRef"
+                      :readonly="checkRoutePermission"
                       :class="inputEdit(isReadonly)"
                       v-model="formData.caseType"
                       dense
@@ -612,6 +621,7 @@ onMounted(() => {
                   <div class="col-3">
                     <q-input
                       ref="caseNumberRef"
+                      :readonly="checkRoutePermission"
                       :class="inputEdit(isReadonly)"
                       v-model="formData.caseNumber"
                       dense
@@ -642,6 +652,7 @@ onMounted(() => {
                 <div class="col-12 row">
                   <q-file
                     for="inputFiles"
+                    :readonly="checkRoutePermission"
                     class="col-12"
                     outlined
                     dense
@@ -696,6 +707,7 @@ onMounted(() => {
                         ><q-tooltip>ดาวน์โหลดไฟล์</q-tooltip></q-btn
                       >
                       <q-btn
+                        v-if="!checkRoutePermission"
                         size="12px"
                         flat
                         round
@@ -715,8 +727,8 @@ onMounted(() => {
               </div>
             </q-card>
           </div>
-          <div class="col-12"><q-separator /></div>
-          <div class="row col-12 q-pa-sm">
+          <div class="col-12" v-if="!checkRoutePermission"><q-separator /></div>
+          <div v-if="!checkRoutePermission" class="row col-12 q-pa-sm">
             <q-space />
             <q-btn id="onSubmit" type="submit" label="บันทึก" color="secondary"
               ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
diff --git a/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue b/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
index dad98cced..698055593 100644
--- a/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
+++ b/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
@@ -14,6 +14,8 @@ import DialogStatus from "@/modules/11_discipline/components/8_AppealComplain/di
 import config from "@/app.config";
 import http from "@/plugins/http";
 
+import { checkPermission } from "@/utils/permissions";
+
 const $q = useQuasar();
 const mixin = useCounterMixin();
 
@@ -201,6 +203,12 @@ watch(
   }
 );
 
+/** ไปยังหน้าเพิ่มข้อมูล */
+function redirectToPageDetail(id: string) {
+  dataStore.rowsAdd = [];
+  router.push(`/discipline-appealcomplain-detail/${id}`);
+}
+
 /** ไปยังหน้าเพิ่มข้อมูล */
 function redirectToPageadd() {
   dataStore.rowsAdd = [];
@@ -307,6 +315,7 @@ onMounted(async () => {
     <div class="row q-mb-sm q-col-gutter-sm">
       <div>
         <q-btn
+          v-if="checkPermission($route)?.attrIsCreate"
           id="addComplaints"
           for="addComplaints"
           size="12px"
@@ -424,7 +433,7 @@ onMounted(async () => {
                 <q-icon
                   name="cancel"
                   @click.stop.prevent="
-                    (optionType = type),((formData.type = 'ALL')), dataUpdate()
+                    (optionType = type), (formData.type = 'ALL'), dataUpdate()
                   "
                   class="cursor-pointer"
                 />
@@ -506,6 +515,13 @@ onMounted(async () => {
         </template>
         <template v-slot:header="props">
           <q-tr :props="props">
+            <q-th
+              auto-width
+              v-if="
+                checkPermission($route)?.attrIsGet !== false ||
+                checkPermission($route)?.attrIsUpdate !== false
+              "
+            ></q-th>
             <q-th
               v-for="col in props.cols"
               :key="col.name"
@@ -519,11 +535,38 @@ onMounted(async () => {
         <template v-slot:body="props">
           <q-tr :props="props" class="cursor-pointer">
             <q-td
-              v-for="col in props.cols"
-              :key="col.name"
-              :props="props"
-              @click="editPage(props.row.id)"
+              auto-width
+              v-if="
+                checkPermission($route)?.attrIsGet !== false ||
+                checkPermission($route)?.attrIsUpdate !== false
+              "
             >
+              <q-btn
+                v-if="checkPermission($route)?.attrIsGet"
+                id="addComplaints"
+                for="addComplaints"
+                size="12px"
+                flat
+                round
+                color="info"
+                icon="mdi-eye"
+                @click="redirectToPageDetail(props.row.id)"
+                ><q-tooltip>รายละเอียดการอุทธรณ์/ร้องทุกข์</q-tooltip></q-btn
+              >
+              <q-btn
+                v-if="checkPermission($route)?.attrIsUpdate"
+                id="addComplaints"
+                for="addComplaints"
+                size="12px"
+                flat
+                round
+                color="edit"
+                icon="edit"
+                @click="editPage(props.row.id)"
+                ><q-tooltip>แก้ไขการอุทธรณ์/ร้องทุกข์</q-tooltip></q-btn
+              >
+            </q-td>
+            <q-td v-for="col in props.cols" :key="col.name" :props="props">
               <div v-if="col.name == 'no'">
                 {{
                   (currentPage - 1) * Number(pagination.rowsPerPage) +
diff --git a/src/modules/11_discipline/router.ts b/src/modules/11_discipline/router.ts
index f4392b4f7..414ced8ae 100644
--- a/src/modules/11_discipline/router.ts
+++ b/src/modules/11_discipline/router.ts
@@ -64,6 +64,8 @@ const listSuspendMainPage = () =>
   import("@/modules/11_discipline/components/7_ListSuspend/ListsPage.vue");
 const suspendEditPage = () =>
   import("@/modules/11_discipline/components/7_ListSuspend/DetailPage.vue");
+const suspendDetailPage = () =>
+  import("@/modules/11_discipline/components/7_ListSuspend/DetailPage.vue");
 
 const appealComplain = () =>
   import("@/modules/11_discipline/components/8_AppealComplain/MainPage.vue");
@@ -71,6 +73,8 @@ const appealComplainAdd = () =>
   import("@/modules/11_discipline/components/8_AppealComplain/AddPage.vue");
 const appealComplainEdit = () =>
   import("@/modules/11_discipline/components/8_AppealComplain/EditPage.vue");
+const appealComplainDetail = () =>
+  import("@/modules/11_discipline/components/8_AppealComplain/EditPage.vue");
 
 const DetailPage = () => import("@/modules/10_order/components/Detail.vue");
 export default [
@@ -285,6 +289,16 @@ export default [
       Role: "STAFF",
     },
   },
+  {
+    path: "/discipline-suspend-detail/:id",
+    name: "disciplineDetailSuspend",
+    component: suspendDetailPage,
+    meta: {
+      Auth: true,
+      Key: "SYS_DISCIPLINE_SUSPENDED",
+      Role: "STAFF",
+    },
+  },
   {
     path: "/discipline-appealcomplain",
     name: "appealComplain",
@@ -315,6 +329,16 @@ export default [
       Role: "STAFF",
     },
   },
+  {
+    path: "/discipline-appealcomplain-detail/:id",
+    name: "appealComplainDetail",
+    component: appealComplainDetail,
+    meta: {
+      Auth: true,
+      Key: "SYS_DISCIPLINE_APPEAL",
+      Role: "STAFF",
+    },
+  },
 
   {
     path: "/discipline-order",
diff --git a/src/modules/14_KPI/views/list.vue b/src/modules/14_KPI/views/list.vue
index 995ad8929..e4915b676 100644
--- a/src/modules/14_KPI/views/list.vue
+++ b/src/modules/14_KPI/views/list.vue
@@ -10,7 +10,7 @@ import type { QTableProps } from "quasar";
 
 import { useCounterMixin } from "@/stores/mixin";
 import { useKpiDataStore } from "@/modules/14_KPI/store";
-
+import { checkPermission } from "@/utils/permissions";
 import DialogEvalute from "@/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue";
 const $q = useQuasar();
 const router = useRouter();
@@ -262,7 +262,7 @@ onMounted(async () => {
               @update:model-value="changRound"
               :disable="year === null"
             />
-            <q-btn round color="primary" flat icon="add" @click="onDialog()">
+            <q-btn v-if="checkPermission($route)?.attrIsCreate" round color="primary" flat icon="add" @click="onDialog()">
               <q-tooltip>เพิ่มผู้ประเมิน</q-tooltip>
             </q-btn>
             <!-- <q-select
@@ -342,7 +342,7 @@ onMounted(async () => {
                 <q-td
                   v-for="col in props.cols"
                   :key="col.id"
-                  @click="redirectViewDetail(props.row.id)"
+                  @click="checkPermission($route)?.attrIsUpdate ? redirectViewDetail(props.row.id):''"
                 >
                   <div v-if="col.name === 'name'">
                     {{
diff --git a/src/modules/14_KPI/views/round.vue b/src/modules/14_KPI/views/round.vue
index 4e4b9399b..378ab1224 100644
--- a/src/modules/14_KPI/views/round.vue
+++ b/src/modules/14_KPI/views/round.vue
@@ -27,6 +27,7 @@ import DialogHeader from "@/components/DialogHeader.vue";
  * importStore
  */
 import { useCounterMixin } from "@/stores/mixin";
+import { checkPermission } from "@/utils/permissions";
 
 /**
  * use
@@ -447,6 +448,7 @@ onMounted(() => {
           </template>
         </datepicker>
         <q-btn
+          v-if="checkPermission($route)?.attrIsCreate"
           flat
           round
           dense
@@ -507,21 +509,29 @@ onMounted(() => {
                 <q-menu>
                   <q-list style="min-width: 150px" dense>
                     <q-item
+                      v-if="props.row.isActive !== false && checkPermission($route)?.attrIsUpdate !== false"
                       clickable
                       v-close-popup
-                      v-for="items in props.row.isActive
-                        ? itemMenu
-                        : itemMenu.slice(1, 2)"
-                      @click="onClickAction(items.value, props.row.id)"
+                      @click="onClickAction('close', props.row.id)"
                     >
                       <q-item-section avatar>
-                        <q-icon :color="items.color" :name="items.icon" />
+                        <q-icon :color="'orange'" :name="'mdi-close'" />
                       </q-item-section>
-                      <q-item-section>{{ items.label }}</q-item-section>
+                      <q-item-section>ปิดรอบ</q-item-section>
+                    </q-item>
+                    <q-item
+                    v-if="checkPermission($route)?.attrIsDelete !== false"
+                      clickable
+                      v-close-popup
+                      @click="onClickAction('delete', props.row.id)"
+                    >
+                      <q-item-section avatar>
+                        <q-icon :color="'red'" :name="'delete'" />
+                      </q-item-section>
+                      <q-item-section>ลบรอบ</q-item-section>
                     </q-item>
                   </q-list>
                 </q-menu>
-                <q-tooltip>ดาวน์โหลด</q-tooltip>
               </q-btn>
             </q-td>
             <q-td v-for="col in props.cols" :key="col.name" :props="props">
@@ -529,7 +539,6 @@ onMounted(() => {
                 {{ col.value ? col.value : "-" }}
               </div>
             </q-td>
-
           </q-tr>
         </template>
         <template v-slot:pagination="scope">