Merge branch 'develop' into devTee

2024-08-13 10:26:10 +07:00 · 2024-08-13 10:26:10 +07:00 · dd38cd0034
commit dd38cd0034
parent 232b5cf60d 6cd73e0e9b
18 changed files with 422 additions and 301 deletions
--- a/src/components/Dialogs/PopupPersonalNew.vue
+++ b/src/components/Dialogs/PopupPersonalNew.vue
@ -22,7 +22,7 @@ const retireDate = ref<Date>();
 const { showLoader, hideLoader, messageError, date2Thai } = mixin;

 const isEmployee = defineModel("isEmployee", { type: String });
-const empType = ref<string>("");
+const empType = ref<string>("officer");
 /** props*/
 const props = defineProps({
  id: {
@ -95,7 +95,12 @@ function calculateAge(birthDate: Date | null) {
 async function fetchInformation(id: string) {
  showLoader();
  await http
-    .get(config.API.orgProfileById(id, empType.value))
+    .get(
+      config.API.orgProfileById(
+        id,
+        `${empType.value == "employee" ? `-${empType.value}` : ""}`
+      )
+    )
    .then((res) => {
      const data = res.data.result;
      imformation.prefix = data.prefix ? data.prefix : "-";
@ -128,7 +133,12 @@ async function fetchInformation(id: string) {
 async function fetchProfileGov(id: string) {
  showLoader();
  await http
-    .get(config.API.profileNewGovernmentById(id, empType.value))
+    .get(
+      config.API.profileNewGovernmentById(
+        id,
+        `${empType.value == "employee" ? `-${empType.value}` : ""}`
+      )
+    )
    .then((res) => {
      const data = res.data.result;
      goverment.oc = data.org !== "" ? data.org : "-";
@ -155,7 +165,7 @@ async function fetchProfileGov(id: string) {
 }

 function redirecToRegistry() {
-  router.push(`/registry-officer${empType.value}/${props.id}`);
+  router.push(`/registry-${empType.value}/${props.id}`);
  modal.value = false;
 }

@ -168,8 +178,8 @@ watch(
        empType.value =
          route.name === "appoint-employee-detail" ||
          isEmployee.value == "EMPLOYEE"
-            ? "-employee"
-            : "";
+            ? "employee"
+            : "officer";

        fetchInformation(props.id);
        fetchProfileGov(props.id);
--- a/src/modules/03_recruiting/views/03_editor/index.vue
+++ b/src/modules/03_recruiting/views/03_editor/index.vue
@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { QTableProps } from "quasar";
 import { checkPermission } from "@/utils/permissions";
-import { ref, onMounted } from "vue";
+import { ref, onMounted, nextTick } from "vue";
 import type {
  WebType,
  AddressWeb,
@ -398,9 +398,11 @@ const fetchData = async () => {
      address.value.code = data.zipCode;
      if (data.bannerImg) {
        imageUrl.value = data.bannerImg.detail;
+        checkFileBanner();
      }
      if (data.logoImg) {
        imageUrlLogo.value = data.logoImg.detail;
+        checkFileLogo();
      }
      address.value.provinceId = data.provinceId;
      address.value.districtId = data.districtId;
@ -634,6 +636,26 @@ const clickImage = () => {
  }
 };

+const checkLogoExits = ref<boolean>(false);
+const checkFileLogo = async () => {
+  try {
+    const response = await fetch(imageUrlLogo.value, { method: "GET" });
+    checkLogoExits.value = response.ok;
+  } catch (error) {
+    checkLogoExits.value = false;
+  }
+};
+
+const checkBannerExits = ref<boolean>(false);
+const checkFileBanner = async () => {
+  try {
+    const response = await fetch(imageUrl.value, { method: "GET" });
+    checkBannerExits.value = response.ok;
+  } catch (error) {
+    checkBannerExits.value = false;
+  }
+};
+
 const uploadImageLogo = (e: any) => {
  let input = e.target.files;
  if (input.length > 0) {
@ -667,6 +689,7 @@ const getClass = (val: boolean) => {
  };
 };
 </script>
+
 <template>
  <div class="toptitle text-dark col-12 row items-center">
    ตั้งค่าเว็บไซต์ระบบสรรหา
@ -691,7 +714,7 @@ const getClass = (val: boolean) => {
              <q-img
                class="rounded-borders"
                :src="
-                  imageUrlLogo !== null
+                  imageUrlLogo !== null && checkLogoExits
                    ? imageUrlLogo
                    : 'https://cdn.quasar.dev/img/image-src.png'
                "
@ -727,7 +750,7 @@ const getClass = (val: boolean) => {
              <q-img
                class="rounded-borders full-width"
                :src="
-                  imageUrl !== null
+                  imageUrl !== null && checkBannerExits
                    ? imageUrl
                    : 'https://cdn.quasar.dev/img/image-src.png'
                "
--- a/src/modules/05_placement/components/AppointEmployee/Main.vue
+++ b/src/modules/05_placement/components/AppointEmployee/Main.vue
@ -710,14 +710,7 @@ function onSave(data: any) {
                    </q-menu>
                  </q-btn>
                </q-td>
-                <q-td
-                  v-for="col in props.cols"
-                  :key="col.name"
-                  :props="props"
-                  @click="
-                    checkPermission($route)?.attrIsGet && nextPage(props.row.id)
-                  "
-                >
+                <q-td v-for="col in props.cols" :key="col.name" :props="props">
                  <div v-if="col.name == 'no'">
                    {{ props.rowIndex + 1 }}
                  </div>
--- a/src/modules/06_retirement/components/ExitInterview/EditQuestion.vue
+++ b/src/modules/06_retirement/components/ExitInterview/EditQuestion.vue
@ -277,7 +277,7 @@ const putData = () => {
      messageError($q, e);
    })
    .finally(async () => {
-      router.push(`/exit-Interview`);
+      router.push(`/retirement/exit-interview`);
    });
 };
 </script>
--- a/src/modules/06_retirement/components/ExitInterview/exitMain.vue
+++ b/src/modules/06_retirement/components/ExitInterview/exitMain.vue
@ -296,7 +296,7 @@ const openModalCalendar = (rows: any) => {
              color="blue-9"
              icon="mdi-square-edit-outline"
              outline
-              @click="$router.push('/retirement/exit-Interview/edit-question')"
+              @click="$router.push('/retirement/exit-interview/edit-question')"
              ><span class="q-pl-sm">แก้ไขคำถาม</span></q-btn
            >
          </div>
@ -374,7 +374,7 @@ const openModalCalendar = (rows: any) => {
                  :props="props"
                  @click="
                    router.push(
-                      `/retirement/exit-Interview/questionnair/${props.row.id}`
+                      `/retirement/exit-interview/questionnair/${props.row.id}`
                    )
                  "
                >
@ -385,7 +385,7 @@ const openModalCalendar = (rows: any) => {
                  :props="props"
                  @click="
                    router.push(
-                      `/retirement/exit-Interview/questionnair/${props.row.id}`
+                      `/retirement/exit-interview/questionnair/${props.row.id}`
                    )
                  "
                >
@ -396,7 +396,7 @@ const openModalCalendar = (rows: any) => {
                  :props="props"
                  @click="
                    router.push(
-                      `/retirement/exit-Interview/questionnair/${props.row.id}`
+                      `/retirement/exit-interview/questionnair/${props.row.id}`
                    )
                  "
                >
@ -407,7 +407,7 @@ const openModalCalendar = (rows: any) => {
                  :props="props"
                  @click="
                    router.push(
-                      `/retirement/exit-Interview/questionnair/${props.row.id}`
+                      `/retirement/exit-interview/questionnair/${props.row.id}`
                    )
                  "
                >
@ -418,7 +418,7 @@ const openModalCalendar = (rows: any) => {
                  :props="props"
                  @click="
                    router.push(
-                      `/retirement/exit-Interview/questionnair/${props.row.id}`
+                      `/retirement/exit-interview/questionnair/${props.row.id}`
                    )
                  "
                >
@ -429,7 +429,7 @@ const openModalCalendar = (rows: any) => {
                  :props="props"
                  @click="
                    router.push(
-                      `/retirement/exit-Interview/questionnair/${props.row.id}`
+                      `/retirement/exit-interview/questionnair/${props.row.id}`
                    )
                  "
                >
@ -440,7 +440,7 @@ const openModalCalendar = (rows: any) => {
                  :props="props"
                  @click="
                    router.push(
-                      `/retirement/exit-Interview/questionnair/${props.row.id}`
+                      `/retirement/exit-interview/questionnair/${props.row.id}`
                    )
                  "
                >
@ -452,7 +452,7 @@ const openModalCalendar = (rows: any) => {
                  :props="props"
                  @click="
                    router.push(
-                      `/retirement/exit-Interview/questionnair/${props.row.id}`
+                      `/retirement/exit-interview/questionnair/${props.row.id}`
                    )
                  "
                >
@ -465,7 +465,7 @@ const openModalCalendar = (rows: any) => {
                  :props="props"
                  @click="
                    router.push(
-                      `/retirement/exit-Interview/questionnair/${props.row.id}`
+                      `/retirement/exit-interview/questionnair/${props.row.id}`
                    )
                  "
                >
@ -478,7 +478,7 @@ const openModalCalendar = (rows: any) => {
                  :props="props"
                  @click="
                    router.push(
-                      `/retirement/exit-Interview/questionnair/${props.row.id}`
+                      `/retirement/exit-interview/questionnair/${props.row.id}`
                    )
                  "
                >
--- a/src/modules/06_retirement/components/ExitInterview/exitRegistry.vue
+++ b/src/modules/06_retirement/components/ExitInterview/exitRegistry.vue
@ -278,7 +278,7 @@ const putData = () => {
      messageError($q, e);
    })
    .finally(async () => {
-      router.push(`/exit-Interview`);
+      router.push(`/retirement/exit-interview`);
    });
 };
 </script>
--- a/src/modules/06_retirement/router.ts
+++ b/src/modules/06_retirement/router.ts
@ -83,7 +83,7 @@ export default [
    },
  },
  {
-    path: "/retirement/exit-Interview",
+    path: "/retirement/exit-interview",
    name: "exit-Interview",
    component: exitInterviewMain,
    meta: {
@ -93,7 +93,7 @@ export default [
    },
  },
  {
-    path: "/retirement/exit-Interview/questionnair/:id",
+    path: "/retirement/exit-interview/questionnair/:id",
    name: "exit-Interview-details",
    component: exitInterviewDetails,
    meta: {
@ -103,7 +103,7 @@ export default [
    },
  },
  {
-    path: "/retirement/exit-Interview/edit-question",
+    path: "/retirement/exit-interview/edit-question",
    name: "ExitInterviewEditQuestion",
    component: exitInterviewEditQuestion,
    meta: {
--- a/src/modules/13_salary/components/SalaryRound/DialogForm.vue
+++ b/src/modules/13_salary/components/SalaryRound/DialogForm.vue
@ -96,10 +96,18 @@ function onSubmit() {
 function inputEdit(val: boolean) {
  return {
    "full-width cursor-pointer inputgreen ": val,
-    "full-width cursor-pointer inputgreen": !val,
+    "full-width cursor-pointer ": !val,
  };
 }

+function onUpdatePeriod(val: string) {
+  if (val === "SPECIAL") {
+    isActive.value = true;
+  } else {
+    isActive.value = false;
+  }
+}
+
 /** callbackFunction ทำการ fetch ข้อมูลไฟล์เมื่อเปิด Dialog*/
 watch(
  () => modal.value,
@ -137,6 +145,7 @@ watch(
          <div class="q-gutter-y-sm">
            <datepicker
              :readonly="isRead"
+              :class="inputEdit(!isRead)"
              menu-class-name="modalfix"
              v-model="year"
              class="col-2"
@ -152,9 +161,9 @@ watch(
              <template #trigger>
                <q-input
                  :readonly="isRead"
+                  :class="inputEdit(!isRead)"
                  ref="yearRef"
                  dense
-                  :class="inputEdit(isReadonly)"
                  hide-bottom-space
                  outlined
                  :model-value="year === 0 ? null : Number(year) + 543"
@ -176,7 +185,7 @@ watch(
            <q-select
              :readonly="isRead"
              ref="periodRef"
-              :class="inputEdit(isReadonly)"
+              :class="inputEdit(!isRead)"
              v-model="period"
              label="รอบการขึ้นเงินเดือน"
              dense
@ -189,6 +198,7 @@ watch(
              lazy-rules
              :rules="[(val) => !!val || `${'กรุณาเลือกรอบการขึ้นเงินเดือน'}`]"
              hide-bottom-space
+              @update:model-value="onUpdatePeriod"
            />
            <datepicker
              :readonly="isRead"
@ -212,7 +222,7 @@ watch(
                  ref="effectiveDateRef"
                  outlined
                  dense
-                  :class="inputEdit(isReadonly)"
+                  :class="inputEdit(!isRead)"
                  :readonly="isRead"
                  hide-bottom-space
                  :model-value="
@ -246,6 +256,7 @@ watch(
                    type="checkbox"
                    v-model="isActive"
                    :readonly="isRead"
+                    :disabled="period === 'SPECIAL'"
                  />
                  <span class="control"></span>
                </label>
--- a/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeChart.vue
+++ b/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeChart.vue
@ -26,6 +26,8 @@ const {

 /** props*/
 const modal = defineModel<boolean>("modal", { required: true });
+const activeType = defineModel<string>("activeType", { required: true });
+
 const props = defineProps({
  isStatusEdit: { type: Boolean, required: true },
  data: { type: Object, required: true },
@ -65,7 +67,7 @@ function fetchSalaryDetail(id: string) {
      formData.startDate = data.startDate;
      formData.endDate = data.endDate;
      formData.details = data.details;
-      isReadonly.value = data.isActive ? true : false;
+      isReadonly.value = activeType.value === "view" ? true : data.isActive;
    })
    .catch((err) => {
      messageError($q, err);
@ -84,9 +86,9 @@ function onSubmit() {
        ? config.API.salaryEmployeeChart
        : config.API.salaryEmployeeChartByid(props.data.id);
      await http[!props.isStatusEdit ? "post" : "put"](url, formData);
-      success($q, "บันทีกข้อมูลสำเร็จ");
-      props.fetchData?.();
+      await props.fetchData?.();
      closeDialog();
+      success($q, "บันทีกข้อมูลสำเร็จ");
    } catch (err) {
      messageError($q, err);
    } finally {
@ -150,7 +152,9 @@ const getClass = (val: boolean) => {
      <q-form greedy @submit.prevent @validation-success="onSubmit">
        <Header
          :tittle="
-            props.isStatusEdit
+            props.isStatusEdit && activeType === 'view'
+              ? 'รายละเอียด'
+              : props.isStatusEdit
              ? 'แก้ไขผังบัญชีค่าจ้างลูกจ้างประจำ'
              : 'เพิ่มผังบัญชีค่าจ้างลูกจ้างประจำ'
          "
@ -359,12 +363,8 @@ const getClass = (val: boolean) => {
          </div>
        </q-card-section>
        <q-separator />
-        <q-card-actions align="right">
-          <q-btn
-            label="บันทึก"
-            color="secondary"
-            type="submit"
-            :disable="isReadonly"
+        <q-card-actions align="right" v-if="!isReadonly">
+          <q-btn label="บันทึก" color="secondary" type="submit"
            ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
          >
        </q-card-actions>
--- a/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeRate.vue
+++ b/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeRate.vue
@ -117,6 +117,19 @@ watch(
    }
  }
 );
+
+const isReadonly = ref<boolean>(false);
+
+/**
+ * class จัดรูปแบบแสดงระหว่างข้อมูลที่แก้ไขหรือแสดงเฉยๆ
+ * @param val ข้อมูล input สำหรับแก้ไขหรือไม่
+ */
+const getClass = (val: boolean) => {
+  return {
+    "full-width inputgreen cursor-pointer": val,
+    "full-width cursor-pointer": !val,
+  };
+};
 </script>

 <template>
@ -135,6 +148,8 @@ watch(
            <div class="row col-xs-12 col-md-12 q-col-gutter-sm">
              <div class="col-12">
                <q-input
+                  :readonly="isReadonly"
+                  :class="getClass(!isReadonly)"
                  ref="salaryNoRef"
                  dense
                  outlined
@ -154,6 +169,8 @@ watch(

              <div class="col-12">
                <q-input
+                  :readonly="isReadonly"
+                  :class="getClass(!isReadonly)"
                  ref="salaryMonthRef"
                  dense
                  outlined
@ -172,6 +189,8 @@ watch(

              <div class="col-12">
                <q-input
+                  :readonly="isReadonly"
+                  :class="getClass(!isReadonly)"
                  ref="salaryDayRef"
                  dense
                  outlined
--- a/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeUpload.vue
+++ b/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeUpload.vue
@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ref, watch } from "vue";
+import { checkPermission } from "@/utils/permissions";
 import { useQuasar } from "quasar";
 import axios from "axios";
 import http from "@/plugins/http";
@ -207,7 +208,12 @@ watch(
            <div class="col-xs-12 col-md-3">
              <div class="row col-12 q-col-gutter-y-sm">
                <div class="col-12 row">
-                  <div v-if="!props.isActive" class="full-width">
+                  <div
+                    v-if="
+                      !props.isActive && checkPermission($route)?.attrIsUpdate
+                    "
+                    class="full-width"
+                  >
                    <q-file
                      class="col-12"
                      outlined
@ -260,7 +266,12 @@ watch(
                              <q-tooltip>ดาวน์โหลดไฟล์</q-tooltip>
                            </q-btn>
                          </div>
-                          <div v-if="!props.isActive">
+                          <div
+                            v-if="
+                              !props.isActive &&
+                              checkPermission($route)?.attrIsUpdate
+                            "
+                          >
                            <q-btn
                              dense
                              flat
--- a/src/modules/13_salary/components/salaryEmployeeChart/DialogFormCriteria.vue
+++ b/src/modules/13_salary/components/salaryEmployeeChart/DialogFormCriteria.vue
@ -22,6 +22,7 @@ const { dialogConfirm, showLoader, hideLoader, messageError, success } =

 /** props*/
 const modal = defineModel<boolean>("modal", { required: true });
+const actionsType = defineModel<string>("actionsType", { default: "" });
 const isEdit = defineModel<boolean>("isStatusEdit", { required: true });
 const props = defineProps({
  data: {
@ -39,6 +40,7 @@ const groupOldOp = ref<DataOptions[]>([]);
 const groupOldOpMain = ref<DataOptions[]>([]);
 const posLevelOp = ref<any[]>([]);
 const posNameListOp = ref<DataListOptions[]>([]);
+const isReadonly = ref<boolean>(false);

 const formData = reactive<any>({
  id: "",
@ -104,10 +106,10 @@ function onSubmit() {
      ? config.API.salaryFormula()
      : config.API.salaryFormulaById(formData.id);
    await http[!isEdit.value ? "post" : "put"](url, body)
-      .then(() => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
+      .then(async () => {
+        await props.getDataMain?.();
        closeDialog();
-        props.getDataMain?.();
+        await success($q, "บันทึกข้อมูลสำเร็จ");
      })
      .catch((e) => {
        messageError($q, e);
@ -120,7 +122,6 @@ function onSubmit() {

 /** ดึงข้อมูล กลุ่มงาน */
 function getPosType() {
-  showLoader();
  http
    .get(config.API.salaryEmployeePosType())
    .then((res) => {
@ -134,9 +135,6 @@ function getPosType() {
    })
    .catch((e) => {
      messageError($q, e);
-    })
-    .finally(() => {
-      hideLoader();
    });
 }

@ -145,7 +143,6 @@ function getPosName() {
  if (formData.posType) {
    formData.posName = "";
    formData.posLevel = "";
-    showLoader();
    http
      .get(config.API.salaryEmployeePositionType(formData.posType.name))
      .then((res) => {
@ -162,9 +159,6 @@ function getPosName() {
      })
      .catch((e) => {
        messageError($q, e);
-      })
-      .finally(() => {
-        hideLoader();
      });
  }
 }
@ -238,26 +232,37 @@ function getSalaryGroup() {

 /** function fetch ข้อมูลหลักเกณฑ์ */
 function getDataEdit() {
-  http.get(config.API.salaryFormula() + `/${formData.id}`).then(async (res) => {
-    const data = res.data.result;
-    formData.posType = posTypeOp.value.find((a: any) => a.id == data.posTypeId);
-    formData.posName = data.position;
-    getPosNameEdit();
-    setTimeout(() => {
-      getPosLevelEdit();
-      formData.posLevel = posLevelOp.value.find(
-        (item: any) => item.id == data.posLevelId
+  showLoader();
+  http
+    .get(config.API.salaryFormula() + `/${formData.id}`)
+    .then(async (res) => {
+      const data = res.data.result;
+      formData.posType = posTypeOp.value.find(
+        (a: any) => a.id == data.posTypeId
      );
-      formData.reson = data.details;
-      formData.rateOldMin = data.salaryMin;
-      formData.groupOld = groupOldOp.value.filter((b: any) =>
-        data.salaryEmployeeMinIds.includes(b.id)
-      );
-      formData.rateMaxOld = data.salary;
-      formData.groupRateHigh = data.salaryEmployeeId;
-      formData.rateHighMax = data.salaryMax;
-    }, 200);
-  });
+      formData.posName = data.position;
+      getPosNameEdit();
+      setTimeout(() => {
+        getPosLevelEdit();
+        formData.posLevel = posLevelOp.value.find(
+          (item: any) => item.id == data.posLevelId
+        );
+        formData.reson = data.details;
+        formData.rateOldMin = data.salaryMin;
+        formData.groupOld = groupOldOp.value.filter((b: any) =>
+          data.salaryEmployeeMinIds.includes(b.id)
+        );
+        formData.rateMaxOld = data.salary;
+        formData.groupRateHigh = data.salaryEmployeeId;
+        formData.rateHighMax = data.salaryMax;
+      }, 200);
+    })
+    .catch(() => {})
+    .finally(() => {
+      setTimeout(() => {
+        hideLoader();
+      }, 1500);
+    });
 }
 watch(
  () => modal.value,
@ -267,8 +272,11 @@ watch(
      getSalaryGroup();

      if (isEdit.value) {
+        isReadonly.value = actionsType.value === "view" ? true : false;
        formData.id = props.data?.id ? props.data.id : null;
        getDataEdit();
+      } else {
+        isReadonly.value = false;
      }
    }
  }
@ -328,7 +336,13 @@ const getClass = (val: boolean) => {
    <q-card class="col-12" style="width: 80%">
      <q-form greedy @submit.prevent @validation-success="onSubmit">
        <Header
-          :tittle="isEdit ? 'แก้ไขหลักเกณฑ์' : 'เพิ่มหลักเกณฑ์'"
+          :tittle="
+            isEdit && actionsType === 'view'
+              ? 'รายละเอียด'
+              : isEdit
+              ? 'แก้ไขหลักเกณฑ์'
+              : 'เพิ่มหลักเกณฑ์'
+          "
          :close="closeDialog"
        />
        <q-separator />
@ -338,7 +352,8 @@ const getClass = (val: boolean) => {
              <div class="col-4">
                <q-select
                  ref="posTypeRef"
-                  :class="getClass(true)"
+                  :class="getClass(!isReadonly)"
+                  :readonly="isReadonly"
                  dense
                  outlined
                  v-model="formData.posType"
@ -366,9 +381,9 @@ const getClass = (val: boolean) => {
              <div class="col-4">
                <q-select
                  ref="posNameRef"
-                  :class="getClass(true)"
+                  :class="getClass(!isReadonly)"
+                  :readonly="isReadonly || formData.posType"
                  dense
-                  :readonly="formData.posType"
                  outlined
                  v-model="formData.posName"
                  label="ตำแหน่ง"
@ -394,8 +409,8 @@ const getClass = (val: boolean) => {
              </div>
              <div class="col-4">
                <q-select
-                  :readonly="formData.posName"
-                  :class="getClass(true)"
+                  :class="getClass(!isReadonly)"
+                  :readonly="isReadonly || formData.posName"
                  ref="posLevelRef"
                  dense
                  outlined
@ -419,20 +434,23 @@ const getClass = (val: boolean) => {
                </q-select>
              </div>

-              <div class="col-8">
+              <div class="col-12">
                <q-input
-                  :class="getClass(true)"
+                  :class="getClass(!isReadonly)"
+                  :readonly="isReadonly"
                  dense
                  outlined
                  v-model="formData.reson"
                  label="หมายเหตุ"
+                  type="textarea"
                />
              </div>

              <div class="col-12 text-bold">อัตราค่าจ้าง</div>
              <div class="col-4">
                <q-input
-                  :class="getClass(true)"
+                  :class="getClass(!isReadonly)"
+                  :readonly="isReadonly"
                  ref="rateOldMinRef"
                  dense
                  outlined
@ -449,7 +467,8 @@ const getClass = (val: boolean) => {
              </div>
              <div class="col-4">
                <q-select
-                  :class="getClass(true)"
+                  :class="getClass(!isReadonly)"
+                  :readonly="isReadonly"
                  ref="groupOldRef"
                  dense
                  outlined
@ -481,7 +500,8 @@ const getClass = (val: boolean) => {
              </div>
              <div class="col-4">
                <q-input
-                  :class="getClass(true)"
+                  :class="getClass(!isReadonly)"
+                  :readonly="isReadonly"
                  ref="rateMaxOldRef"
                  dense
                  outlined
@ -503,7 +523,8 @@ const getClass = (val: boolean) => {
              </div>
              <div class="col-4">
                <q-select
-                  :class="getClass(true)"
+                  :class="getClass(!isReadonly)"
+                  :readonly="isReadonly"
                  ref="groupRateHighRef"
                  dense
                  outlined
@ -533,7 +554,8 @@ const getClass = (val: boolean) => {
              </div>
              <div class="col-4">
                <q-input
-                  :class="getClass(true)"
+                  :class="getClass(!isReadonly)"
+                  :readonly="isReadonly"
                  ref="rateHighMaxRef"
                  dense
                  outlined
--- a/src/modules/13_salary/components/salaryEmployeeChart/TabCriteria.vue
+++ b/src/modules/13_salary/components/salaryEmployeeChart/TabCriteria.vue
@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted, watch } from "vue";
+import { checkPermission } from "@/utils/permissions";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useQuasar } from "quasar";
@ -142,6 +143,7 @@ const formFilter = reactive({

 const modalForm = ref<boolean>(false);
 const isStatusEdit = ref<boolean>(false);
+const actionsType = ref<string>("");
 const dataRow = ref<ListData>();

 const posTypeOpMain = ref<DataOption[]>([]);
@ -213,7 +215,8 @@ function getData() {
 * เปิด dialog แก้ไขหลักเกณฑ์
 * @param params
 */
-function editPopup(params: ListData) {
+function editPopup(params: ListData, type: string) {
+  actionsType.value = type;
  modalForm.value = true;
  isStatusEdit.value = true;
  dataRow.value = params;
@ -330,7 +333,14 @@ onMounted(() => {
        </template>
      </q-select>
    </div>
-    <q-btn flat round dense icon="add" @click="() => (modalForm = true)">
+    <q-btn
+      v-if="checkPermission($route)?.attrIsCreate"
+      flat
+      round
+      dense
+      icon="add"
+      @click="() => (modalForm = true)"
+    >
      <q-tooltip>เพิ่ม </q-tooltip>
    </q-btn>
    <q-space />
@ -388,39 +398,43 @@ onMounted(() => {
    </template>
    <template v-slot:body="props">
      <q-tr :props="props" class="cursor-pointer">
-        <q-td>
+        <q-td auto-width>
          <q-btn
+            v-if="checkPermission($route)?.attrIsGet"
            flat
+            round
            dense
-            icon="mdi-dots-vertical"
-            class="q-pa-none q-ml-xs"
-            color="grey-13"
-            size="12px"
+            icon="mdi-eye"
+            color="info"
+            @click="editPopup(props.row, 'view')"
          >
-            <q-menu>
-              <q-list dense style="min-width: 200px">
-                <q-item clickable v-close-popup>
-                  <q-item-section>
-                    <div class="row items-center" @click="editPopup(props.row)">
-                      <q-icon color="edit" size="17px" name="edit" />
-                      <div class="q-pl-md">แก้ไขข้อมูล</div>
-                    </div>
-                  </q-item-section>
-                </q-item>
-                <q-item
-                  clickable
-                  v-close-popup
-                  @click.stop="onClickDelete(props.row.id)"
-                >
-                  <q-item-section>
-                    <div class="row items-center">
-                      <q-icon color="red" size="17px" name="delete" />
-                      <div class="q-pl-md">ลบ</div>
-                    </div>
-                  </q-item-section>
-                </q-item>
-              </q-list>
-            </q-menu>
+            <q-tooltip>รายละเอียด</q-tooltip>
+          </q-btn>
+          <q-btn
+            v-if="
+              checkPermission($route)?.attrIsGet &&
+              checkPermission($route)?.attrIsUpdate
+            "
+            flat
+            round
+            dense
+            icon="edit"
+            color="edit"
+            @click="editPopup(props.row, 'edit')"
+          >
+            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+          </q-btn>
+
+          <q-btn
+            v-if="checkPermission($route)?.attrIsDelete"
+            flat
+            round
+            dense
+            icon="mdi-delete"
+            color="red"
+            @click.stop="onClickDelete(props.row.id)"
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
          </q-btn>
        </q-td>
        <q-td v-for="col in props.cols" :key="col.name" :props="props">
@ -447,8 +461,6 @@ onMounted(() => {
          </div>
          <div v-else>{{ col.value != "" ? col.value : "-" }}</div>
        </q-td>
-
-
      </q-tr>
    </template>
    <template v-slot:pagination="scope">
@ -472,6 +484,7 @@ onMounted(() => {
    v-model:isStatusEdit="isStatusEdit"
    :data="dataRow"
    :get-data-Main="getData"
+    :actionsType="actionsType"
  />
 </template>

--- a/src/modules/13_salary/components/salaryEmployeeChart/TabStructure.vue
+++ b/src/modules/13_salary/components/salaryEmployeeChart/TabStructure.vue
@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted, watch } from "vue";
+import { checkPermission } from "@/utils/permissions";
 import { useQuasar } from "quasar";
 import { useRouter } from "vue-router";
 import http from "@/plugins/http";
@ -7,10 +8,7 @@ import config from "@/app.config";

 /** importType*/
 import type { QTableProps } from "quasar";
-import type {
-  ItemsMenu,
-  NewPagination,
-} from "@/modules/13_salary/interface/index/Main";
+import type { NewPagination } from "@/modules/13_salary/interface/index/Main";
 import type { FormFilter } from "@/modules/13_salary/interface/request/EmployeeChart";
 import type { EmployeeSalary } from "@/modules/13_salary/interface/response/salaryEmployeeChart";

@ -43,6 +41,7 @@ const totalList = ref<number>(0);

 const modalDialogEmployeeChart = ref<boolean>(false);
 const isStatusEdit = ref<boolean>(false);
+const activeType = ref<string>("");
 const dataRow = ref<EmployeeSalary>();

 /** ข้อมูล Table*/
@ -92,34 +91,6 @@ const visibleColumns = ref<string[]>([
  "isActive",
 ]);

-/** List Mune*/
-const itemMenu = ref<ItemsMenu[]>([
-  {
-    label: "แก้ไข",
-    icon: "edit",
-    color: "edit",
-    type: "edit",
-  },
-  {
-    label: "เอกสารอ้างอิง",
-    icon: "mdi-file-document-outline",
-    color: "teal",
-    type: "upload",
-  },
-  {
-    label: "อัตราค่าจ้าง",
-    icon: "mdi-format-list-bulleted-triangle",
-    color: "secondary",
-    type: "salaryRate",
-  },
-  {
-    label: "คัดลอก",
-    icon: "content_copy",
-    color: "blue-6",
-    type: "copy",
-  },
-]);
-
 /** function fetch ข้แมูลรายาการผังบัญชีค่าจ้างลูกจ้างประจำ */
 function fetchListChart() {
  showLoader();
@ -141,38 +112,39 @@ function fetchListChart() {
    });
 }

-/**
- * function เลือกเมนู
- * @param type ประเทภเมนู
- * @param data ข้อมูลผังบัญชีค่าจ้างลูกจ้างประจำ
- */
-function onClickAction(type: string, data: EmployeeSalary) {
-  switch (type) {
-    case "edit":
-      onEdit(data);
-      break;
-    case "upload":
-      onUpload(data.id, data.isActive);
-      break;
-    case "salaryRate":
-      onSalaryRate(data.id);
-      break;
-    case "copy":
-      onCoppy(data.id);
-      break;
-    default:
-      break;
-  }
-}
+// /**
+//  * function เลือกเมนู
+//  * @param type ประเทภเมนู
+//  * @param data ข้อมูลผังบัญชีค่าจ้างลูกจ้างประจำ
+//  */
+// function onClickAction(type: string, data: EmployeeSalary) {
+//   switch (type) {
+//     case "edit":
+//       onEdit(data);
+//       break;
+//     case "upload":
+//       onUpload(data.id, data.isActive);
+//       break;
+//     case "salaryRate":
+//       onSalaryRate(data.id);
+//       break;
+//     case "copy":
+//       onCoppy(data.id);
+//       break;
+//     default:
+//       break;
+//   }
+// }

 /**
 *  function openDialog แก้ไขผังบัญชีค่าจ้างลูกจ้างประจำ
 * @param data ข้อมูลผังบัญชีค่าจ้างลูกจ้างประจำ
 */
-function onEdit(data: EmployeeSalary) {
-  modalDialogEmployeeChart.value = true;
+function onEdit(data: EmployeeSalary, type: string) {
+  activeType.value = type;
  isStatusEdit.value = true;
  dataRow.value = data;
+  modalDialogEmployeeChart.value = true;
 }

 const modalDialogUpload = ref<boolean>(false);
@ -205,9 +177,9 @@ function onSalaryRate(id: string) {
 function onCoppy(id: string) {
  http
    .post(config.API.salaryEmployeeChartCopy, { id: id })
-    .then(() => {
-      fetchListChart();
-      success($q, "คัดลอกข้อมูลสำเร็จ");
+    .then(async () => {
+      await fetchListChart();
+      await success($q, "คัดลอกข้อมูลสำเร็จ");
    })
    .catch((err) => {
      messageError($q, err);
@ -222,9 +194,9 @@ function onClickDelete(id: string) {
  dialogRemove($q, () => {
    http
      .delete(config.API.salaryEmployeeChartByid(id))
-      .then(() => {
-        fetchListChart();
-        success($q, "ลบข้อมูลสำเร็จ");
+      .then(async () => {
+        await fetchListChart();
+        await success($q, "ลบข้อมูลสำเร็จ");
      })
      .catch((err) => {
        messageError($q, err);
@ -273,7 +245,14 @@ onMounted(() => {
 </script>
 <template>
  <q-toolbar class="text-primary" style="padding: 0px">
-    <q-btn flat round dense icon="add" @click="onClickAdd()">
+    <q-btn
+      v-if="checkPermission($route)?.attrIsCreate"
+      flat
+      round
+      dense
+      icon="add"
+      @click="onClickAdd()"
+    >
      <q-tooltip>เพิ่ม </q-tooltip>
    </q-btn>
    <q-space />
@ -330,43 +309,121 @@ onMounted(() => {
      <q-tr :props="props" class="cursor-pointer">
        <q-td>
          <q-btn
+            v-if="
+              checkPermission($route)?.attrIsGet ||
+              checkPermission($route)?.attrIsCreate ||
+              (checkPermission($route)?.attrIsDelete &&
+                props.row.isActive == false)
+            "
            flat
            dense
-            icon="mdi-dots-vertical"
-            class="q-pa-none q-ml-xs"
-            color="grey-13"
-            size="12px"
+            color="secondary"
+            icon="mdi-dots-horizontal-circle-outline"
+            round
          >
            <q-menu>
              <q-list dense style="min-width: 200px">
+                <!-- อัตราเงินเดือน -->
                <q-item
-                  v-for="(item, index) in itemMenu"
-                  :key="index"
+                  v-if="checkPermission($route)?.attrIsGet"
                  clickable
                  v-close-popup
-                  @click.stop="onClickAction(item.type, props.row)"
+                  @click.stop="onSalaryRate(props.row.id)"
                >
                  <q-item-section>
                    <div class="row items-center">
                      <q-icon
-                        :color="item.color"
-                        size="17px"
-                        :name="item.icon"
+                        color="secondary"
+                        size="xs"
+                        name="mdi-format-list-bulleted-triangle"
                      />
-                      <div class="q-pl-md">{{ item.label }}</div>
+                      <div class="q-pl-md">อัตราเงินเดือน</div>
                    </div>
                  </q-item-section>
                </q-item>
+
+                <!-- เอกสารอ้างอิง -->
                <q-item
-                  v-if="props.row.isActive == false"
+                  v-if="checkPermission($route)?.attrIsGet"
+                  clickable
+                  v-close-popup
+                  @click.stop="onUpload(props.row.id, props.row.isActive)"
+                >
+                  <q-item-section>
+                    <div class="row items-center">
+                      <q-icon
+                        color="teal"
+                        size="xs"
+                        name="mdi-file-document-outline"
+                      />
+                      <div class="q-pl-md">เอกสารอ้างอิง</div>
+                    </div>
+                  </q-item-section>
+                </q-item>
+
+                <!-- รายละเอียด -->
+                <q-item
+                  v-if="checkPermission($route)?.attrIsGet"
+                  clickable
+                  v-close-popup
+                  @click.stop="onEdit(props.row, 'view')"
+                >
+                  <q-item-section>
+                    <div class="row items-center">
+                      <q-icon color="info" size="xs" name="mdi-eye" />
+                      <div class="q-pl-md">รายละเอียด</div>
+                    </div>
+                  </q-item-section>
+                </q-item>
+
+                <!-- แก้ไข -->
+                <q-item
+                  v-if="
+                    checkPermission($route)?.attrIsUpdate &&
+                    checkPermission($route)?.attrIsGet &&
+                    !props.row.isActive
+                  "
+                  clickable
+                  v-close-popup
+                  @click.stop="onEdit(props.row, 'edit')"
+                >
+                  <q-item-section>
+                    <div class="row items-center">
+                      <q-icon color="edit" size="xs" name="edit" />
+                      <div class="q-pl-md">แก้ไข</div>
+                    </div>
+                  </q-item-section>
+                </q-item>
+
+                <!-- คัดลอก -->
+                <q-item
+                  v-if="checkPermission($route)?.attrIsCreate"
+                  clickable
+                  v-close-popup
+                  @click.stop="onCoppy(props.row.id)"
+                >
+                  <q-item-section>
+                    <div class="row items-center">
+                      <q-icon color="blue-6" size="xs" name="content_copy" />
+                      <div class="q-pl-md">คัดลอก</div>
+                    </div>
+                  </q-item-section>
+                </q-item>
+
+                <!-- ลบข้อมูล -->
+                <q-item
+                  v-if="
+                    props.row.isActive == false &&
+                    checkPermission($route)?.attrIsDelete
+                  "
                  clickable
                  v-close-popup
                  @click.stop="onClickDelete(props.row.id)"
                >
                  <q-item-section>
                    <div class="row items-center">
-                      <q-icon color="red" size="17px" name="delete" />
-                      <div class="q-pl-md">ลบ</div>
+                      <q-icon color="red" size="xs" name="delete" />
+                      <div class="q-pl-md">ลบข้อมูล</div>
                    </div>
                  </q-item-section>
                </q-item>
@ -390,7 +447,6 @@ onMounted(() => {
          </div>
          <div v-else>{{ col.value ? col.value : "-" }}</div>
        </q-td>
-
      </q-tr>
    </template>
    <template v-slot:pagination="scope">
@ -414,6 +470,7 @@ onMounted(() => {
    :isStatusEdit="isStatusEdit"
    :data="dataRow as EmployeeSalary"
    :fetchData="fetchListChart"
+    :activeType="activeType"
  />

  <DialogEmployeeUpload
--- a/src/modules/13_salary/views/salaryEmployeeChart.vue
+++ b/src/modules/13_salary/views/salaryEmployeeChart.vue
@ -32,14 +32,14 @@ const store = useSalaryEmployeeChartDataStore();
    <q-separator />

    <q-tab-panels v-model="store.mainTab" animated>
-      <q-tab-panel name="structure">
-        <div class="q-pa-sm">
+      <q-tab-panel name="structure" class="q-pt-none">
+        <div class="q-pa-xs">
          <TabStructure />
        </div>
      </q-tab-panel>

-      <q-tab-panel name="criteria">
-        <div class="q-pa-sm">
+      <q-tab-panel name="criteria" class="q-pt-none">
+        <div class="q-pa-xs">
          <TabCriteris />
        </div>
      </q-tab-panel>
--- a/src/modules/13_salary/views/salaryEmployeeRate.vue
+++ b/src/modules/13_salary/views/salaryEmployeeRate.vue
@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted, watch } from "vue";
+import { checkPermission } from "@/utils/permissions";
 import { useQuasar } from "quasar";
 import { useRouter, useRoute } from "vue-router";
 import http from "@/plugins/http";
@ -145,20 +146,6 @@ const modalDialogEmployeeRate = ref<boolean>(false);
 const isStatusEdit = ref<boolean>(false);
 const dataRow = ref<EmployeeRateSalary>();

-function onClickAction(type: string, data: EmployeeRateSalary) {
-  switch (type) {
-    case "edit":
-      onEdit(data);
-      break;
-    case "delete":
-      onDelete(data.id);
-      break;
-
-    default:
-      break;
-  }
-}
-
 function onEdit(data: EmployeeRateSalary) {
  modalDialogEmployeeRate.value = true;
  isStatusEdit.value = true;
@ -186,11 +173,6 @@ function onClickAdd() {
  isStatusEdit.value = false;
 }

-function filterFn() {
-  formFilter.page = 1;
-  fetchSalalyEmployeeRate();
-}
-
 function updatePage(val: number) {
  formFilter.page = val;
  fetchSalalyEmployeeRate();
@ -243,12 +225,19 @@ onMounted(async () => {
        class="q-mr-sm"
        @click="router.go(-1)"
      />
-      อัตราค่าจ้างของ กลุ่มที่ {{ groupSalary }}
+      อัตราค่าจ้างของกลุ่มที่ {{ groupSalary }}
    </div>
  </div>
  <q-card flat bordered class="q-pa-md">
    <q-toolbar class="text-primary" style="padding: 0px">
-      <q-btn v-if="!isActive" flat round dense icon="add" @click="onClickAdd">
+      <q-btn
+        v-if="!isActive && checkPermission($route)?.attrIsUpdate"
+        flat
+        round
+        dense
+        icon="add"
+        @click="onClickAdd"
+      >
        <q-tooltip>เพิ่ม </q-tooltip>
      </q-btn>
      <q-space />
@ -259,34 +248,6 @@ onMounted(async () => {
        color="blue"
        @click="clickDownload()"
      />
-      <!-- <q-input
-        borderless
-        dense
-        outlined
-        v-model="formFilter.keyword"
-        @keydown.enter.pervrnt="filterFn"
-        placeholder="ค้นหา"
-      >
-        <template v-slot:append>
-          <q-icon name="search" />
-        </template>
-      </q-input>
-      <q-select
-        for="#select"
-        v-model="visibleColumns"
-        multiple
-        outlined
-        dense
-        options-dense
-        :display-value="$q.lang.table.columns"
-        emit-value
-        map-options
-        :options="columns"
-        option-value="name"
-        options-cover
-        style="min-width: 150px"
-        class="col-xs-12 col-sm-3 col-md-2 q-ml-sm"
-      /> -->
    </q-toolbar>
    <div class="col-12">
      <d-table
@ -314,41 +275,28 @@ onMounted(async () => {
          <q-tr :props="props" class="cursor-pointer">
            <q-td v-if="!isActive">
              <q-btn
+                v-if="!isActive && checkPermission($route)?.attrIsUpdate"
                flat
+                round
                dense
-                icon="mdi-dots-vertical"
-                class="q-pa-none q-ml-xs"
-                color="grey-13"
-                size="12px"
+                v-for="(item, index) in itemMenu"
+                :key="index"
+                :color="item.color"
+                :icon="item.icon"
+                @click.stop="
+                  item.type === 'edit'
+                    ? onEdit(props.row)
+                    : item.type === 'delete'
+                    ? onDelete(props.row.id)
+                    : null
+                "
              >
-                <q-menu>
-                  <q-list dense style="min-width: 200px">
-                    <q-item
-                      v-for="(item, index) in itemMenu"
-                      :key="index"
-                      clickable
-                      v-close-popup
-                      @click.stop="onClickAction(item.type, props.row)"
-                    >
-                      <q-item-section>
-                        <div class="row items-center">
-                          <q-icon
-                            :color="item.color"
-                            size="17px"
-                            :name="item.icon"
-                          />
-                          <div class="q-pl-md">{{ item.label }}</div>
-                        </div>
-                      </q-item-section>
-                    </q-item>
-                  </q-list>
-                </q-menu>
+                <q-tooltip>{{ item.label }}</q-tooltip>
              </q-btn>
            </q-td>
            <q-td v-for="col in props.cols" :key="col.name" :props="props">
              {{ col.value ? col.value : "-" }}
            </q-td>
-
          </q-tr>
        </template>
        <template v-slot:pagination="scope">
--- a/src/modules/13_salary/views/salaryRate.vue
+++ b/src/modules/13_salary/views/salaryRate.vue
@ -176,17 +176,18 @@ function onClickSalaryRate(type: string, data: SalaryRate | null) {
 }

 function onClickDelete(id: string) {
-  dialogRemove($q, async () => {
-    await http
+  dialogRemove($q, () => {
+    showLoader();
+    http
      .delete(config.API.salaryRateListByid(id))
-      .then(() => {
-        success($q, "ลบข้อมูลสำเร็จ");
+      .then(async () => {
+        await fetchListSalalyRate();
+        await success($q, "ลบข้อมูลสำเร็จ");
      })
      .catch((err) => {
        messageError($q, err);
      })
      .finally(() => {
-        fetchListSalalyRate();
        hideLoader();
      });
  });
--- a/src/modules/13_salary/views/salaryRound.vue
+++ b/src/modules/13_salary/views/salaryRound.vue
@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { ref, watch, onMounted } from "vue";
 import { useSalaryDataStore } from "@/modules/13_salary/store/SalaryStore";
+import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
 import config from "@/app.config";
 import http from "@/plugins/http";
@ -294,11 +295,10 @@ onMounted(async () => {
          </template>
        </datepicker>
      </div>
-      <div>
+      <div v-if="checkPermission($route)?.attrIsCreate">
        <q-btn
          id="addComplaints"
          for="addComplaints"
-          size="12px"
          flat
          round
          color="primary"
@ -370,19 +370,28 @@ onMounted(async () => {
          </q-tr>
        </template>
        <template v-slot:body="props">
-          <q-tr :props="props" class="cursor-pointer">
-            <q-td>
+          <q-tr :props="props">
+            <q-td auto-width>
              <q-btn
+                v-if="
+                  checkPermission($route)?.attrIsGet ||
+                  (checkPermission($route)?.attrIsUpdate &&
+                    props.row.isClose !== true) ||
+                  (checkPermission($route)?.attrIsDelete &&
+                    props.row.revisionId == null) ||
+                  (checkPermission($route)?.attrIsGet &&
+                    checkPermission($route)?.attrIsUpdate)
+                "
                flat
                dense
-                icon="mdi-dots-vertical"
-                class="q-pa-none q-ml-xs"
-                color="grey-13"
-                size="12px"
+                color="secondary"
+                icon="mdi-dots-horizontal-circle-outline"
+                round
              >
                <q-menu>
                  <q-list dense style="min-width: 200px">
                    <q-item
+                      v-if="checkPermission($route)?.attrIsGet"
                      clickable
                      v-close-popup
                      @click.stop="
@ -397,14 +406,14 @@ onMounted(async () => {
                            color="edit"
                            size="17px"
                            :name="
-                              props.row.revisionId !== null
+                              props.row.revisionId !== null || !checkPermission($route)?.attrIsUpdate
                                ? 'mdi-eye-outline'
                                : 'edit'
                            "
                          />
                          <div class="q-pl-md">
                            {{
-                              props.row.revisionId !== null
+                              props.row.revisionId !== null || !checkPermission($route)?.attrIsUpdate
                                ? "ดูข้อมูล"
                                : "แก้ไขข้อมูล"
                            }}
@ -417,7 +426,8 @@ onMounted(async () => {
                      v-if="
                        props.row.isClose === false &&
                        props.row.isActive === true &&
-                        props.row.revisionId !== null
+                        props.row.revisionId !== null &&
+                        checkPermission($route)?.attrIsUpdate
                      "
                      clickable
                      v-close-popup
@ -435,7 +445,10 @@ onMounted(async () => {
                      </q-item-section>
                    </q-item>
                    <q-item
-                      v-if="props.row.revisionId == null"
+                      v-if="
+                        props.row.revisionId == null &&
+                        checkPermission($route)?.attrIsDelete
+                      "
                      clickable
                      v-close-popup
                      @click.stop="deleteData(props.row.id)"