From 015b861340e68328c8cf8f6922f22cd8e77dc750 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 9 Aug 2024 15:24:11 +0700
Subject: [PATCH 1/3] edit permission of placement pass

---
 src/modules/05_placement/components/Main.vue  |  29 ++--
 .../components/PersonalDetail/Detail.vue      |   7 +
 .../PersonalDetail/Information/Document.vue   | 134 +-----------------
 .../PersonalDetail/Information/top.vue        |  14 +-
 .../components/PersonalList/Table.vue         |  76 ++++++----
 5 files changed, 98 insertions(+), 162 deletions(-)

diff --git a/src/modules/05_placement/components/Main.vue b/src/modules/05_placement/components/Main.vue
index 35394cc6d..9cfde991a 100644
--- a/src/modules/05_placement/components/Main.vue
+++ b/src/modules/05_placement/components/Main.vue
@@ -539,15 +539,28 @@ onMounted(async () => {
               direction-links
             ></q-pagination>
           </template>
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th auto-width />
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.label }}
+              </q-th>
+            </q-tr>
+          </template>
           <template v-slot:body="props">
-            <q-tr
-              :props="props"
-              class="cursor-pointer"
-              @click="
-                checkPermission($route)?.attrIsGet &&
-                  redirectToPage(props.row.id)
-              "
-            >
+            <q-tr :props="props">
+              <q-td auto-width>
+                <q-icon
+                  v-if="checkPermission($route)?.attrIsList"
+                  name="mdi-eye"
+                  size="sm"
+                  color="info"
+                  class="cursor-pointer"
+                  @click="() => redirectToPage(props.row.id)"
+                >
+                  <q-tooltip>รายละเอียด</q-tooltip>
+                </q-icon>
+              </q-td>
               <q-td key="id" :props="props">
                 {{ props.rowIndex + 1 }}
               </q-td>
diff --git a/src/modules/05_placement/components/PersonalDetail/Detail.vue b/src/modules/05_placement/components/PersonalDetail/Detail.vue
index e492e8315..d66ac41aa 100644
--- a/src/modules/05_placement/components/PersonalDetail/Detail.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Detail.vue
@@ -37,6 +37,7 @@ import type {
 } from "@/modules/05_placement/interface/index/Main";
 
 import type { Information } from "@/modules/05_placement/components/PersonalDetail/profileType";
+import { checkPermission } from "@/utils/permissions";
 
 const $q = useQuasar(); // show dialog
 const router = useRouter();
@@ -100,6 +101,9 @@ const EducationData = ref<Education[]>([]);
 const FamilyData = ref<Family>(FamilyDataDefualt);
 const AddressData = ref<Address>(AddressDataDefualt);
 const CertificateData = ref<Certificate[]>([]);
+const isEdit = ref<boolean>(
+  checkPermission(route)?.attrIsUpdate ? true : false
+);
 
 const guidCheck = (id: string) => {
   if (id == "00000000-0000-0000-0000-000000000000") {
@@ -472,6 +476,7 @@ onMounted(async () => {
   await fetchPerson();
 });
 </script>
+
 <template>
   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8 row q-pb-sm">
     <div class="header-text">
@@ -559,11 +564,13 @@ onMounted(async () => {
           v-model:statusEdit="statusEdit"
           :fetch="fetchData"
           :datainformation="storePersonal.dataMain"
+          :is-edit="isEdit"
         />
       </div>
     </q-card>
   </div>
 </template>
+
 <style lang="scss" scoped>
 .header-text {
   font-size: 24px;
diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Document.vue b/src/modules/05_placement/components/PersonalDetail/Information/Document.vue
index aa1b157f8..bffeafc85 100644
--- a/src/modules/05_placement/components/PersonalDetail/Information/Document.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/Document.vue
@@ -20,6 +20,10 @@ const props = defineProps({
     type: Boolean,
     required: true,
   },
+  isEdit: {
+    type: Boolean,
+    required: false,
+  },
   notiNoEdit: {
     type: Function,
     default: () => console.log("not function"),
@@ -323,7 +327,7 @@ onMounted(async () => {
     />
     <q-card class="row col-12">
       <div class="row col-12 q-col-gutter-y-sm q-pa-sm">
-        <div class="col-12 row">
+        <div v-if="isEdit" class="col-12 row">
           <q-file
             for="inputFiles"
             class="col-12"
@@ -394,136 +398,10 @@ onMounted(async () => {
           </q-list>
         </div>
 
-        <div class="col-12" v-else>
+        <div class="col-12 q-mt-xs" v-else>
           <q-card class="q-pa-md" bordered> ไม่มีรายการเอกสาร </q-card>
         </div>
       </div>
     </q-card>
-    <!-- โค้ดเก่า -->
-    <!-- <div class="row col-12 q-pt-sm">
-      <q-card bordered flat class="full-width">
-        <q-list separator>
-          <q-item v-for="file in files" :key="file.key" class="q-my-xs">
-            <q-item-section>
-              <q-item-label class="full-width ellipsis">
-                {{ file.fileName }}
-              </q-item-label>
-
-              <q-item-label caption> </q-item-label>
-            </q-item-section>
-            <q-item-section top side>
-              <div class="row col-12">
-                <q-btn
-                  class="gt-xs"
-                  size="12px"
-                  flat
-                  dense
-                  round
-                  color="blue"
-                  icon="mdi-download-outline"
-                  @click="downloadData(file.pathName)"
-                >
-                  <q-tooltip>ดาวน์โหลดเอกสารหลักฐาน</q-tooltip>
-                </q-btn>
-                <q-btn
-                  class="gt-xs"
-                  size="12px"
-                  flat
-                  dense
-                  round
-                  color="red"
-                  icon="mdi-delete-outline"
-                  v-show="edit"
-                  @click="deleteData(file.docId)"
-                >
-                  <q-tooltip>ลบเอกสารหลักฐาน</q-tooltip>
-                </q-btn>
-              </div>
-            </q-item-section>
-          </q-item>
-        </q-list>
-      </q-card>
-      <q-input
-        v-if="edit"
-        class="q-mt-sm col-12 q-pb-xs"
-        outlined
-        dense
-        lazy-rules
-        v-model="name"
-        hide-bottom-space
-        :rules="[(val) => !!val || `${'กรุณากรอกชื่อเอกสาร'}`]"
-        :label="`${'ชื่อเอกสาร'}`"
-      />
-      <q-uploader
-        v-if="edit"
-        color="gray"
-        type="file"
-        flat
-        @factory="uploadData"
-        ref="uploader"
-        class="full-width"
-        text-color="white"
-        :max-size="10000000"
-        accept=".jpg,.png,.pdf,.csv,.docx,.doc"
-        bordered
-        @added="fileAdd"
-      >
-        <template v-slot:header="scope">
-          <div class="row no-wrap items-center q-pa-sm q-gutter-xs">
-            <q-btn
-              v-if="scope.queuedFiles.length > 0"
-              icon="clear_all"
-              @click="scope.removeQueuedFiles"
-              round
-              dense
-              flat
-            >
-              <q-tooltip>ลบทั้งหมด</q-tooltip>
-            </q-btn>
-            <q-btn
-              v-if="scope.uploadedFiles.length > 0"
-              icon="done_all"
-              @click="scope.removeUploadedFiles"
-              round
-              dense
-              flat
-            >
-              <q-tooltip>ลบไฟล์ที่อัปโหลด</q-tooltip>
-            </q-btn>
-            <q-spinner v-if="scope.isUploading" class="q-uploader__spinner" />
-            <div class="col">
-              <div class="q-uploader__title">
-                {{ "[ไฟล์ jpg,png,pdf,csv,docx ขนาดไม่เกิน 10MB]" }}
-              </div>
-              <div class="q-uploader__subtitle">
-                {{ scope.uploadSizeLabel }} / {{ scope.uploadProgressLabel }}
-              </div>
-            </div>
-            <q-btn
-              v-if="scope.canAddFiles"
-              type="a"
-              icon="add_box"
-              @click="scope.pickFiles"
-              round
-              dense
-              flat
-            >
-              <q-uploader-add-trigger />
-              <q-tooltip>เลือกไฟล์</q-tooltip>
-            </q-btn>
-            <q-btn
-              v-if="scope.isUploading"
-              icon="clear"
-              @click="scope.abort"
-              round
-              dense
-              flat
-            >
-              <q-tooltip>ยกเลิกการอัปโหลด</q-tooltip>
-            </q-btn>
-          </div>
-        </template>
-      </q-uploader>
-    </div> -->
   </q-card>
 </template>
diff --git a/src/modules/05_placement/components/PersonalDetail/Information/top.vue b/src/modules/05_placement/components/PersonalDetail/Information/top.vue
index cde69edac..78d9bb98e 100644
--- a/src/modules/05_placement/components/PersonalDetail/Information/top.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/top.vue
@@ -1,5 +1,11 @@
 <!-- ส่วนหัวของ ข้อมูลส่วนตัว และ ที่อยู่ -->
 <script setup lang="ts">
+import { checkPermission } from "@/utils/permissions";
+import { ref } from "vue";
+import { useRoute } from "vue-router";
+
+const route = useRoute();
+
 const props = defineProps({
   header: {
     type: String,
@@ -56,6 +62,9 @@ const props = defineProps({
 });
 
 const emit = defineEmits(["update:edit"]);
+const isEdit = ref<boolean>(
+  checkPermission(route)?.attrIsUpdate ? true : false
+);
 
 const updateEdit = (value: any) => {
   emit("update:edit", value);
@@ -83,6 +92,7 @@ const add = () => {
   props.add();
 };
 </script>
+
 <template>
   <div class="flex items-center">
     <div class="flex items-center">
@@ -100,7 +110,7 @@ const add = () => {
         {{ header }}
       </div>
     </div>
-    <div class="q-gutter-sm q-mx-sm" v-if="addData == false">
+    <div class="q-gutter-sm q-mx-sm" v-if="addData == false && isEdit">
       <q-btn
         size="12px"
         v-if="!edit"
@@ -136,7 +146,7 @@ const add = () => {
         <q-tooltip>บันทึกข้อมูล</q-tooltip>
       </q-btn>
     </div>
-    <div class="q-pl-sm" v-else>
+    <div class="q-pl-sm" v-else-if="isEdit">
       <q-btn
         size="12px"
         flat
diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index 483fcc225..76107942b 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -651,7 +651,8 @@ function savelist() {
         await http
           .put(config.API.putPosition(examId), personal_selected.value)
           .then(() => {
-            success($q, "บันทึกสำเร็จ");
+            modaladdlist.value = false;
+            success($q, "ส่งรายชื่อไปยังหน่วยงานสำเร็จ");
           })
           .catch((e: any) => {
             messageError($q, e);
@@ -791,22 +792,38 @@ onMounted(async () => {
             <q-btn
               v-if="
                 props.row.statusId !== 'CONTAIN' &&
-                checkPermission($route)?.attrIsUpdate
+                (checkPermission($route)?.attrIsGet ||
+                  checkPermission($route)?.attrIsUpdate)
               "
-              icon="mdi-dots-vertical"
-              size="12px"
-              color="grey-7"
               flat
-              round
               dense
+              color="secondary"
+              icon="mdi-dots-horizontal-circle-outline"
+              round
             >
               <q-menu transition-show="jump-down" transition-hide="jump-up">
                 <q-list dense style="min-width: 180px">
+                  <q-item
+                    v-if="checkPermission($route)?.attrIsGet"
+                    clickable
+                    v-close-popup
+                    @click="selectData(props.row.personalId, props.row.draft)"
+                  >
+                    <q-item-section
+                      style="min-width: 0px"
+                      avatar
+                      class="q-py-sm"
+                    >
+                      <q-icon color="info" size="xs" name="mdi-eye" />
+                    </q-item-section>
+                    <q-item-section>รายละเอียด</q-item-section>
+                  </q-item>
                   <q-item
                     v-if="
                       props.row.nodeName !== null &&
                       props.row.statusId !== 'CONTAIN' &&
-                      props.row.statusId !== 'DISCLAIM'
+                      props.row.statusId !== 'DISCLAIM' &&
+                      checkPermission($route)?.attrIsUpdate
                     "
                     clickable
                     v-close-popup
@@ -834,7 +851,8 @@ onMounted(async () => {
                     v-if="
                       roleAdmin &&
                       props.row.draft === 'รอส่งตัว' &&
-                      props.row.nodeName !== null
+                      props.row.nodeName !== null &&
+                      checkPermission($route)?.attrIsUpdate
                     "
                     clickable
                     v-close-popup
@@ -858,7 +876,8 @@ onMounted(async () => {
                       props.row.bmaOfficer !== 'บุคคลภายนอก' &&
                       roleAdmin &&
                       props.row.draft !== 'ส่งตัวแล้ว' &&
-                      props.row.statusId !== 'DISCLAIM'
+                      props.row.statusId !== 'DISCLAIM' &&
+                      checkPermission($route)?.attrIsUpdate
                     "
                     clickable
                     v-close-popup
@@ -888,7 +907,8 @@ onMounted(async () => {
                     v-if="
                       roleAdmin &&
                       props.row.draft !== 'ส่งตัวแล้ว' &&
-                      props.row.statusId !== 'DISCLAIM'
+                      props.row.statusId !== 'DISCLAIM' &&
+                      checkPermission($route)?.attrIsUpdate
                     "
                     clickable
                     v-close-popup
@@ -921,7 +941,8 @@ onMounted(async () => {
                       props.row.bmaOfficer !== 'บุคคลภายนอก' &&
                       roleAdmin &&
                       props.row.draft !== 'ส่งตัวแล้ว' &&
-                      props.row.statusId !== 'DISCLAIM'
+                      props.row.statusId !== 'DISCLAIM' &&
+                      checkPermission($route)?.attrIsUpdate
                     "
                     clickable
                     v-close-popup
@@ -948,7 +969,8 @@ onMounted(async () => {
                       props.row.bmaOfficer !== 'บุคคลภายนอก' &&
                       roleAdmin &&
                       props.row.draft !== 'ส่งตัวแล้ว' &&
-                      props.row.statusId !== 'DISCLAIM'
+                      props.row.statusId !== 'DISCLAIM' &&
+                      checkPermission($route)?.attrIsUpdate
                     "
                     clickable
                     v-close-popup
@@ -972,7 +994,11 @@ onMounted(async () => {
 
                   <q-separator />
                   <q-item
-                    v-if="roleAdmin && props.row.statusId === 'UN-CONTAIN'"
+                    v-if="
+                      roleAdmin &&
+                      props.row.statusId === 'UN-CONTAIN' &&
+                      checkPermission($route)?.attrIsUpdate
+                    "
                     clickable
                     v-close-popup
                     @click="editDetail(props.row, 'deferment')"
@@ -994,7 +1020,8 @@ onMounted(async () => {
                   <q-item
                     v-else-if="
                       props.row.deferment === true &&
-                      props.row.statusId != 'DISCLAIM'
+                      props.row.statusId != 'DISCLAIM' &&
+                      checkPermission($route)?.attrIsGet
                     "
                     clickable
                     v-close-popup
@@ -1018,7 +1045,8 @@ onMounted(async () => {
                   <q-item
                     v-if="
                       props.row.statusId === 'UN-CONTAIN' ||
-                      props.row.statusId === 'PREPARE-CONTAIN'
+                      (props.row.statusId === 'PREPARE-CONTAIN' &&
+                        checkPermission($route)?.attrIsUpdate)
                     "
                     clickable
                     v-close-popup
@@ -1039,7 +1067,10 @@ onMounted(async () => {
                   </q-item>
 
                   <q-item
-                    v-else-if="props.row.statusId === 'DISCLAIM'"
+                    v-else-if="
+                      props.row.statusId === 'DISCLAIM' &&
+                      checkPermission($route)?.attrIsGet
+                    "
                     clickable
                     v-close-popup
                     @click="editDetail(props.row, 'disclaimInfo')"
@@ -1061,13 +1092,7 @@ onMounted(async () => {
               </q-menu>
             </q-btn>
           </q-td>
-          <q-td
-            v-for="col in props.cols"
-            :key="col.name"
-            :props="props"
-            @click="selectData(props.row.personalId, props.row.draft)"
-            class="cursor-pointer"
-          >
+          <q-td v-for="col in props.cols" :key="col.name" :props="props">
             <template v-if="col.name === 'no'">
               {{ props.rowIndex + 1 }}
             </template>
@@ -1500,7 +1525,10 @@ onMounted(async () => {
         </d-table>
       </q-card-section>
       <q-separator />
-      <q-card-actions align="right">
+      <q-card-actions
+        v-if="checkPermission($route)?.attrIsUpdate"
+        align="right"
+      >
         <q-btn
           label="ส่งรายชื่อ"
           @click="savelist"

From 44a6ef192b2ce04255b7f4e2835de62a415db676 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 9 Aug 2024 15:38:20 +0700
Subject: [PATCH 2/3] =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99?=
 =?UTF-8?q?=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99=20=3D>=20permissi?=
 =?UTF-8?q?on=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=9C=E0=B8=B1=E0=B8=87=E0=B8=9A=E0=B8=B1=E0=B8=8D=E0=B8=8A?=
 =?UTF-8?q?=E0=B8=B5=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94?=
 =?UTF-8?q?=E0=B8=B7=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/SalaryChart/DialogFormMain.vue |   8 +-
 .../components/SalaryChart/DialogUpload.vue   |  15 +-
 src/modules/13_salary/views/salaryChart.vue   | 168 +++++++++++-------
 src/modules/13_salary/views/salaryRate.vue    |  59 +++---
 src/modules/13_salary/views/salaryRound.vue   |   4 +-
 5 files changed, 146 insertions(+), 108 deletions(-)

diff --git a/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue b/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue
index e04e1dc0e..437b332a8 100644
--- a/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue
+++ b/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue
@@ -69,6 +69,8 @@ const title = computed(() => {
       ? "เพิ่มผังบัญชีเงินเดือน"
       : props.typeAction === "edit"
       ? "แก้ไขผังบัญชีเงินเดือน"
+      : props.typeAction === "view"
+      ? "รายละเอียด"
       : "บัญชีเงินเดือน";
 
   return name;
@@ -131,7 +133,7 @@ function fetchSalaryDetail(id: string) {
       formData.endDate = data.endDate;
       formData.details = data.details;
       formData.isSpecial = data.isSpecial;
-      isReadonly.value = data.isActive;
+      isReadonly.value = props.typeAction === 'view'? true: data.isActive;
     })
     .catch((err) => {
       messageError($q, err);
@@ -150,7 +152,7 @@ watch(
     if (modal.value) {
       await fetchPosType();
 
-      if (props.typeAction === "edit") {
+      if (props.typeAction === "edit" || props.typeAction === "view") {
         showLoader();
         setTimeout(() => {
           if (props.data) {
@@ -522,7 +524,7 @@ const getClass = (val: boolean) => {
         </q-card-section>
 
         <q-separator />
-        <q-card-actions align="right">
+        <q-card-actions align="right" v-if="!isReadonly">
           <q-btn label="บันทึก" color="secondary" type="submit"
             ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
           >
diff --git a/src/modules/13_salary/components/SalaryChart/DialogUpload.vue b/src/modules/13_salary/components/SalaryChart/DialogUpload.vue
index 0ea51e619..a19cf1edd 100644
--- a/src/modules/13_salary/components/SalaryChart/DialogUpload.vue
+++ b/src/modules/13_salary/components/SalaryChart/DialogUpload.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ref, reactive, watch } from "vue";
+import { checkPermission } from "@/utils/permissions";
 import { useQuasar } from "quasar";
 import axios from "axios";
 import http from "@/plugins/http";
@@ -238,7 +239,7 @@ watch(
 
 <template>
   <q-dialog v-model="modal" persistent>
-    <q-card class="col-12" style="width: 80%">
+    <q-card class="col-12" style="width: 40%">
       <Header :tittle="`อัปโหลดเอกสารอ้างอิง`" :close="closeDialog" />
       <q-separator />
       <q-card-section class="scroll" style="max-height: 70vh">
@@ -249,7 +250,10 @@ watch(
                 <div class="col-12 row">
                   <div v-if="!props.isActive" class="full-width">
                     <q-file
-                      v-if="props.typeAction === 'edit'"
+                      v-if="
+                        props.typeAction === 'edit' &&
+                        checkPermission($route)?.attrIsUpdate
+                      "
                       class="col-12"
                       outlined
                       dense
@@ -301,7 +305,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
diff --git a/src/modules/13_salary/views/salaryChart.vue b/src/modules/13_salary/views/salaryChart.vue
index 41ce0dd21..6165df8c1 100644
--- a/src/modules/13_salary/views/salaryChart.vue
+++ b/src/modules/13_salary/views/salaryChart.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ref, onMounted, reactive, 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 {
-  NewPagination,
-  ItemsMenu,
-} from "@/modules/13_salary/interface/index/Main";
+import type { NewPagination } from "@/modules/13_salary/interface/index/Main";
 import type { Salary } from "@/modules/13_salary/interface/response/Main";
 import type { FormQuerySalary } from "@/modules/13_salary/interface/request/Main";
 import DialogFormUpload from "@/modules/13_salary/components/SalaryChart/DialogUpload.vue";
@@ -82,34 +80,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",
-  },
-]);
-
 /** queryString*/
 const formQuery = reactive<FormQuerySalary>({
   page: 1, //*หน้า
@@ -259,7 +229,14 @@ onMounted(() => {
 
   <q-card flat bordered class="q-pa-md">
     <div class="col-12 row text-primary">
-      <q-btn flat round dense icon="add" @click="onClickSalary('add', null)">
+      <q-btn
+        v-if="checkPermission($route)?.attrIsCreate"
+        flat
+        round
+        dense
+        icon="add"
+        @click="onClickSalary('add', null)"
+      >
         <q-tooltip>เพิ่มผังบัญชีเงินเดือน </q-tooltip>
       </q-btn>
       <q-space />
@@ -318,60 +295,130 @@ onMounted(() => {
           </q-tr>
         </template>
         <template v-slot:body="props">
-          <q-tr :props="props" class="cursor-pointer">
+          <q-tr :props="props">
             <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="onClickSalaryRate(props.row.id)"
+                    >
+                      <q-item-section>
+                        <div class="row items-center">
+                          <q-icon
+                            color="secondary"
+                            size="xs"
+                            name="mdi-format-list-bulleted-triangle"
+                          />
+                          <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="
-                        item.type === 'edit'
-                          ? onClickSalary('edit', props.row)
-                          : item.type === 'salaryRate'
-                          ? onClickSalaryRate(props.row.id)
-                          : item.type === 'upload'
-                          ? onClickUpload(
-                              'edit',
-                              props.row.id,
-                              props.row.isActive
-                            )
-                          : item.type === 'copy'
-                          ? onClickCoppy(props.row.id)
-                          : null
+                        onClickUpload('edit', props.row.id, props.row.isActive)
                       "
                     >
                       <q-item-section>
                         <div class="row items-center">
                           <q-icon
-                            :color="item.color"
-                            size="17px"
-                            :name="item.icon"
+                            color="teal"
+                            size="xs"
+                            name="mdi-file-document-outline"
                           />
-                          <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="onClickSalary('view', props.row)"
+                    >
+                      <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="onClickSalary('edit', props.row)"
+                    >
+                      <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="onClickCoppy(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>
@@ -415,7 +462,6 @@ onMounted(() => {
                 {{ col.value ? col.value : "-" }}
               </div>
             </q-td>
-
           </q-tr>
         </template>
         <template v-slot:pagination="scope">
diff --git a/src/modules/13_salary/views/salaryRate.vue b/src/modules/13_salary/views/salaryRate.vue
index 83e2a44b9..56bba6f83 100644
--- a/src/modules/13_salary/views/salaryRate.vue
+++ b/src/modules/13_salary/views/salaryRate.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ref, onMounted, reactive, watch } from "vue";
+import { checkPermission } from "@/utils/permissions";
 import { useQuasar } from "quasar";
 import { useRouter, useRoute } from "vue-router";
 import http from "@/plugins/http";
@@ -240,13 +241,13 @@ watch([() => formQuery.page, () => formQuery.pageSize], async () => {
         class="q-mr-sm"
         @click="router.go(-1)"
       />
-      อัตราเงินเดือนของ {{ posType }}
+      อัตราเงินเดือนของ{{ posType }}
     </div>
   </div>
   <q-card flat bordered class="q-pa-md">
     <div class="col-12 row">
       <q-btn
-        v-if="!isActive"
+        v-if="!isActive && checkPermission($route)?.attrIsUpdate"
         flat
         round
         dense
@@ -283,52 +284,33 @@ watch([() => formQuery.page, () => formQuery.pageSize], async () => {
       >
         <template v-slot:header="props">
           <q-tr :props="props">
-            <q-th auto-width v-if="!isActive"></q-th>
+            <q-th auto-width />
             <q-th v-for="col in props.cols" :key="col.name" :props="props">
               <span class="text-weight-medium">{{ col.label }}</span>
             </q-th>
           </q-tr>
         </template>
         <template v-slot:body="props">
-          <q-tr :props="props" class="cursor-pointer">
-            <q-td v-if="!isActive">
+          <q-tr :props="props">
+            <q-td auto-width>
               <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'
+                    ? onClickSalaryRate('edit', props.row)
+                    : item.type === 'delete'
+                    ? onClickDelete(props.row.id)
+                    : null
+                "
               >
-                <q-menu>
-                  <q-list dense style="min-width: 150px">
-                    <q-item
-                      v-for="(item, index) in itemMenu"
-                      :key="index"
-                      clickable
-                      v-close-popup
-                      @click.stop="
-                        item.type === 'edit'
-                          ? onClickSalaryRate('edit', props.row)
-                          : item.type === 'delete'
-                          ? onClickDelete(props.row.id)
-                          : null
-                      "
-                    >
-                      <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
@@ -384,7 +366,6 @@ watch([() => formQuery.page, () => formQuery.pageSize], async () => {
                 {{ col.value ? col.value.toLocaleString() : "-" }}
               </div>
             </q-td>
-
           </q-tr>
         </template>
         <template v-slot:pagination="scope">
diff --git a/src/modules/13_salary/views/salaryRound.vue b/src/modules/13_salary/views/salaryRound.vue
index 2ea284e27..c5c77cc1b 100644
--- a/src/modules/13_salary/views/salaryRound.vue
+++ b/src/modules/13_salary/views/salaryRound.vue
@@ -416,7 +416,8 @@ onMounted(async () => {
                     <q-item
                       v-if="
                         props.row.isClose === false &&
-                        props.row.isActive === true
+                        props.row.isActive === true &&
+                        props.row.revisionId !== null
                       "
                       clickable
                       v-close-popup
@@ -488,7 +489,6 @@ onMounted(async () => {
                 {{ col.value ?? "-" }}
               </div>
             </q-td>
-
           </q-tr>
         </template>
       </d-table>

From d62a7e536cbc1ff4a54e2a4b3c8594b8abe13da6 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 9 Aug 2024 15:38:30 +0700
Subject: [PATCH 3/3] no message

---
 .../components/SalaryChart/DialogFormRate.vue | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/modules/13_salary/components/SalaryChart/DialogFormRate.vue b/src/modules/13_salary/components/SalaryChart/DialogFormRate.vue
index b1df17224..eb47b489a 100644
--- a/src/modules/13_salary/components/SalaryChart/DialogFormRate.vue
+++ b/src/modules/13_salary/components/SalaryChart/DialogFormRate.vue
@@ -16,7 +16,6 @@ import Header from "@/components/DialogHeader.vue";
 import { useCounterMixin } from "@/stores/mixin";
 
 /** use*/
-
 const $q = useQuasar();
 const route = useRoute();
 const { dialogConfirm, showLoader, hideLoader, messageError, success } =
@@ -39,6 +38,7 @@ const props = defineProps({
   },
 });
 
+const isReadonly = ref<boolean>(false);
 const salaryId = ref<string>(route.params.id.toString());
 const formData = reactive<FormSalaryRate>({
   salaryId: "",
@@ -170,6 +170,17 @@ watch(
     }
   }
 );
+
+/**
+ * class จัดรูปแบบแสดงระหว่างข้อมูลที่แก้ไขหรือแสดงเฉยๆ
+ * @param val ข้อมูล input สำหรับแก้ไขหรือไม่
+ */
+const getClass = (val: boolean) => {
+  return {
+    "full-width inputgreen cursor-pointer": val,
+    "full-width cursor-pointer": !val,
+  };
+};
 </script>
 
 <template>
@@ -184,6 +195,8 @@ watch(
             <div class="row col-xs-12 col-md-12 q-col-gutter-sm">
               <div class="col-6">
                 <q-input
+                  :readonly="isReadonly"
+                  :class="getClass(!isReadonly)"
                   ref="salaryRef"
                   dense
                   outlined
@@ -201,6 +214,8 @@ watch(
               </div>
               <div class="col-6">
                 <q-input
+                  :readonly="isReadonly"
+                  :class="getClass(!isReadonly)"
                   ref="salaryHalfRef"
                   dense
                   outlined
@@ -215,6 +230,8 @@ watch(
               </div>
               <div class="col-6">
                 <q-input
+                  :readonly="isReadonly"
+                  :class="getClass(!isReadonly)"
                   ref="salaryHalfSpecialRef"
                   dense
                   outlined
@@ -228,6 +245,8 @@ watch(
               </div>
               <div class="col-6">
                 <q-input
+                  :readonly="isReadonly"
+                  :class="getClass(!isReadonly)"
                   ref="salaryFullRef"
                   dense
                   outlined
@@ -242,6 +261,8 @@ watch(
               </div>
               <div class="col-6">
                 <q-input
+                  :readonly="isReadonly"
+                  :class="getClass(!isReadonly)"
                   ref="salaryFullSpecialRef"
                   dense
                   outlined
@@ -255,6 +276,8 @@ watch(
               </div>
               <div class="col-6">
                 <q-input
+                  :readonly="isReadonly"
+                  :class="getClass(!isReadonly)"
                   ref="salaryFullHalfRef"
                   dense
                   outlined
@@ -269,6 +292,8 @@ watch(
               </div>
               <div class="col-6">
                 <q-input
+                  :readonly="isReadonly"
+                  :class="getClass(!isReadonly)"
                   ref="salaryFullHalfSpecialRef"
                   dense
                   outlined