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 1/2] =?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 2/2] 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