src/components/DialogHeader.vue

@@ -9,8 +9,6 @@
       round
       dense
       @click="close"
-      @keydown.enter.prevent
-      @keydown.space.prevent
       style="color: #ff8080; background-color: #ffdede"
     />
   </q-toolbar>

src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue

@@ -866,8 +866,7 @@ onMounted(() => {
                     outlined
                     dense
                     :model-value="date2Thai(formData.dateEnd)"
-                    clearable
+                    :rules="[(val:string) => !!val || `${'กรุณาเลือก วันที่สิ้นสุด'}`]"
-                    @clear="formData.dateEnd = null"
                     hide-bottom-space
                     :label="`${'วันที่สิ้นสุด'}`"
                   >

src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue

@@ -589,7 +589,7 @@ onMounted(() => {
 
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-select
-                :readonly="checkPermission($route)?.attrOwnership !== 'OWNER'"
+                readonly
                 dense
                 outlined
                 use-input
@@ -641,7 +641,7 @@ onMounted(() => {
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
-                :readonly="checkPermission($route)?.attrOwnership !== 'OWNER'"
+                readonly
                 dense
                 outlined
                 lazy-rules
@@ -653,7 +653,7 @@ onMounted(() => {
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
-                :readonly="checkPermission($route)?.attrOwnership !== 'OWNER'"
+                readonly
                 dense
                 outlined
                 lazy-rules
@@ -722,7 +722,7 @@ onMounted(() => {
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-select
-                :readonly="checkPermission($route)?.attrOwnership !== 'OWNER'"
+                readonly
                 dense
                 outlined
                 use-input

src/modules/05_placement/components/Help-Government/HelpGovernmentDetail.vue

@@ -316,10 +316,9 @@ onMounted(() => {
                       :model-value="
                         dateEnd !== null ? date2Thai(dateEnd) : null
                       "
+                      :rules="edit ? [(val:string) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]:[]"
                       hide-bottom-space
                       :label="`${'ถึงวันที่'}`"
-                      clearable
-                      @clear="dateEnd = null"
                     >
                       <template v-slot:prepend>
                         <q-icon

src/modules/05_placement/store.ts

@@ -10,6 +10,7 @@ import type {
 } from "@/modules/05_placement/interface/request/Main";
 import type { FormOrderPlacementMainData } from "@/modules/05_placement/interface/request/Main";
 
+export const useProfileDataStore = defineStore("profilePlacenent", () => {
   interface profile {
     main: { columns: String[] };
     education: { columns: String[] };
@@ -28,7 +29,6 @@ interface profile {
     document: { columns: String[] };
   }
 
-export const useProfileDataStore = defineStore("profilePlacenent", () => {
   const birthDate = ref<Date>(new Date());
   const retireText = ref<string | null>(null);
   const changeRetireText = (val: string | null) => {
@@ -87,15 +87,15 @@ export const useProfileDataStore = defineStore("profilePlacenent", () => {
     changeRetireText,
   };
 });
-interface placement {
-  mappingPosition: { columns: String[] };
-}
 export const usePlacementDataStore = defineStore("placement", () => {
   const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
   const tabsMain = ref<string>("probation");
   const isOfficer = ref<boolean | null>(null);
   const isStaff = ref<boolean | null>(null);
   const { hideLoader } = mixin;
+  interface placement {
+    mappingPosition: { columns: String[] };
+  }
   const placementData = ref<placement>({
     mappingPosition: { columns: [] },
   });
@@ -218,10 +218,10 @@ export const usePlacementDataStore = defineStore("placement", () => {
     isStaff,
   };
 });
+export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
   interface placementOrder {
     mappingPosition: { columns: String[] };
   }
-export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
   const placementOrderData = ref<placementOrder>({
     mappingPosition: { columns: [] },
   });
@@ -369,8 +369,6 @@ export const useTransferDataStore = defineStore("transferDataStore", () => {
   ]);
   const statusOp = ref<DataOptions[]>(statusMainOp.value);
 
-  const statusDelete = ["REPORT", "WAITING", "DONE"];
-
   const statusText = (val: string) => {
     switch (val) {
       case "WAITTING":
@@ -440,6 +438,5 @@ export const useTransferDataStore = defineStore("transferDataStore", () => {
     statusOp,
     statusMainOp,
     filterOption,
-    statusDelete,
   };
 });

src/modules/05_placement/views/02_transferMain.vue

@@ -2,7 +2,7 @@
 import { ref, onMounted, computed } from "vue";
 import { useQuasar } from "quasar";
 
-import { useRouter, useRoute } from "vue-router";
+import { useRouter } from "vue-router";
 import {
   checkPermission,
   checkPermissionList,
@@ -20,19 +20,11 @@ import DialogOrders from "@/modules/05_placement/components/Transfer/DialogOrder
 
 const $q = useQuasar();
 const router = useRouter();
-const route = useRoute();
 const mixin = useCounterMixin();
 const store = useTransferDataStore();
 const { statusText, filterOption } = useTransferDataStore();
-const {
+const { date2Thai, messageError, showLoader, hideLoader, onSearchDataTable } =
-  date2Thai,
+  mixin;
-  messageError,
-  showLoader,
-  hideLoader,
-  onSearchDataTable,
-  dialogRemove,
-  success,
-} = mixin;
 
 const modal = ref<boolean>(false); //ส่งไปออกคำสั่ง
 const dataTransfer = ref<ResponseData[]>([]); //ช่อมูลรายการขอโอน
@@ -149,15 +141,6 @@ const visibleColumns = ref<string[]>([
   "createdAt",
 ]);
 
-const isPermissionDelete = computed(() => {
-  return (status: string) => {
-    return (
-      checkPermission(route)?.attrOwnership === "OWNER" &&
-      !store.statusDelete.includes(status)
-    );
-  };
-});
-
 /** ฟังก์ชันดึงข้อมูรายการขอโอน*/
 async function fetchData() {
   showLoader();
@@ -211,21 +194,6 @@ function onSearch() {
   );
 }
 
-function handleDelete(id: string) {
-  dialogRemove($q, async () => {
-    try {
-      showLoader();
-      await http.delete(config.API.transfer + `/admin/${id}`);
-      await fetchData();
-      success($q, "ลบข้อมูลสำเร็จ");
-    } catch (error) {
-      messageError($q, error);
-    } finally {
-      hideLoader();
-    }
-  });
-}
-
 /**
  * ทำงานเมื่อ Components ถูกเรียกใช้งาน
  * จะเรียกใช้ fetchData เพื่อดึงข้อมูลรายการขอโอน
@@ -369,18 +337,6 @@ onMounted(async () => {
                 >
                   <q-tooltip>รายละเอียด</q-tooltip>
                 </q-btn>
-
-                <q-btn
-                  v-if="isPermissionDelete(props.row.status)"
-                  flat
-                  round
-                  dense
-                  icon="mdi-delete"
-                  color="red"
-                  @click.prevent="handleDelete(props.row.id)"
-                >
-                  <q-tooltip>ลบข้อมูล</q-tooltip>
-                </q-btn>
               </q-td>
               <q-td v-for="col in props.cols" :key="col.id">
                 <div v-if="col.name === 'no'">

src/modules/05_placement/views/03_receiveMain.vue

@@ -313,7 +313,7 @@ function openDelete(id: string) {
   dialogRemove($q, async () => {
     showLoader();
     await http
-      .delete(config.API.receiveData() + `/admin/${id}`)
+      .delete(config.API.receiveDataId(id))
       .then(async () => {
         await fecthlistRecevice();
         await success($q, "ลบข้อมูลสำเร็จ");
@@ -606,10 +606,8 @@ onMounted(async () => {
 
                         <q-item
                           v-if="
-                            checkPermission($route)?.attrOwnership ===
+                            checkPermission($route)?.attrIsDelete &&
-                              'OWNER' &&
                             props.row.status !== 'REPORT' &&
-                            props.row.status !== 'WAITING' &&
                             props.row.status !== 'DONE'
                           "
                           clickable

src/modules/05_placement/views/04_helpGovernmentMain.vue

@@ -236,7 +236,8 @@ function openModalOrder() {
         item.status == "APPROVE") &&
       item.organizationPositionOld &&
       item.organization &&
-      item.dateStart
+      item.dateStart &&
+      item.dateEnd
   );
   rows2.value = row;
   rows2Data.value = row;

src/modules/06_retirement/components/02_resign/Table.vue

@@ -33,8 +33,7 @@ const {
   showLoader,
   hideLoader,
   onSearchDataTable,
-  dialogRemove,
+  findOrgName,
-  success,
 } = mixin;
 
 /** Table */
@@ -258,21 +257,6 @@ function onSearch() {
   );
 }
 
-function handleDelete(id: string) {
-  dialogRemove($q, async () => {
-    try {
-      showLoader();
-      await http.delete(config.API.listResign() + `/admin/${id}`);
-      await fecthlist();
-      success($q, "ลบข้อมูลสำเร็จ");
-    } catch (error) {
-      messageError($q, error);
-    } finally {
-      hideLoader();
-    }
-  });
-}
-
 /**Hook */
 onMounted(async () => {
   status.value = stroeResign.formQurey.status;
@@ -324,11 +308,7 @@ onMounted(async () => {
             color="primary"
             icon="mdi-account-arrow-right"
           >
-            <q-tooltip>{{
+            <q-tooltip>{{ `ส่งไปออกคำสั่ง${stroeResign.mainTabs == '2'?"ยกเลิกการ":''}ลาออก` }}</q-tooltip>
-              `ส่งไปออกคำสั่ง${
-                stroeResign.mainTabs == "2" ? "ยกเลิกการ" : ""
-              }ลาออก`
-            }}</q-tooltip>
           </q-btn>
         </div>
         <q-space />
@@ -413,26 +393,6 @@ onMounted(async () => {
                 >
                   <q-tooltip>แก้ไขข้อมูล</q-tooltip>
                 </q-btn>
-
-                <q-btn
-                  v-if="
-                    checkPermission($route)?.attrOwnership === 'OWNER' &&
-                    props.row.status !== 'REPORT' &&
-                    props.row.status !== 'WAITING' &&
-                    props.row.status !== 'DONE' &&
-                    props.row.status !== 'CANCELING' &&
-                    props.row.status !== 'CANCEL' &&
-                    stroeResign.mainTabs === '1'
-                  "
-                  flat
-                  dense
-                  round
-                  color="red"
-                  icon="delete"
-                  @click.prevent="handleDelete(props.row.id)"
-                >
-                  <q-tooltip>ลบข้อมูล</q-tooltip>
-                </q-btn>
               </q-td>
               <q-td v-for="col in props.cols" :key="col.id">
                 <div

src/modules/06_retirement/components/03_resignEmp/Table.vue

@@ -27,15 +27,8 @@ const stroeResign = useDataStore();
 const { statusText } = stroe;
 const router = useRouter();
 const mixin = useCounterMixin();
-const {
+const { messageError, date2Thai, showLoader, hideLoader, onSearchDataTable } =
-  messageError,
+  mixin;
-  date2Thai,
-  showLoader,
-  hideLoader,
-  onSearchDataTable,
-  dialogRemove,
-  success,
-} = mixin;
 
 /** Table */
 const rows = ref<ResponseItems[]>([]);
@@ -136,7 +129,7 @@ const columns = ref<QTableProps["columns"]>([
     sortable: true,
     field: "status",
     format(val, row) {
-      return stroeResign.mainTabsEMP === "1"
+      return stroeResign.mainTabs === "1"
         ? statusText(row.status)
         : statusText(row.status, "อนุญาต");
     },
@@ -259,21 +252,6 @@ function onSearch() {
   );
 }
 
-function handleDelete(id: string) {
-  dialogRemove($q, async () => {
-    try {
-      showLoader();
-      await http.delete(config.API.listResignEMP() + `/admin/${id}`);
-      await fecthlist();
-      success($q, "ลบข้อมูลสำเร็จ");
-    } catch (error) {
-      messageError($q, error);
-    } finally {
-      hideLoader();
-    }
-  });
-}
-
 /**Hook */
 onMounted(async () => {
   statusEMP.value = stroeResign.formQureyEMP.status;
@@ -413,26 +391,6 @@ onMounted(async () => {
                 >
                   <q-tooltip>แก้ไขข้อมูล</q-tooltip>
                 </q-btn>
-
-                <q-btn
-                  v-if="
-                    checkPermission($route)?.attrOwnership === 'OWNER' &&
-                    props.row.status !== 'REPORT' &&
-                    props.row.status !== 'WAITING' &&
-                    props.row.status !== 'DONE' &&
-                    props.row.status !== 'CANCELING' &&
-                    props.row.status !== 'CANCEL' &&
-                    stroeResign.mainTabsEMP === '1'
-                  "
-                  flat
-                  dense
-                  round
-                  color="red"
-                  icon="delete"
-                  @click.prevent="handleDelete(props.row.id)"
-                >
-                  <q-tooltip>ลบข้อมูล</q-tooltip>
-                </q-btn>
               </q-td>
               <q-td v-for="col in props.cols" :key="col.id">
                 <div

src/modules/09_leave/components/05_Leave/TableList.vue

@@ -1,59 +1,17 @@
 <script setup lang="ts">
-import { ref, onMounted, computed } from "vue";
+import { ref, onMounted, watch } from "vue";
-import { useQuasar } from "quasar";
 import type { QTableProps } from "quasar";
-import { useRouter, useRoute } from "vue-router";
+import { useRouter } from "vue-router";
 
 import { checkPermission } from "@/utils/permissions";
 import { useLeavelistDataStore } from "@/modules/09_leave/stores/LeaveStore";
-import { useCounterMixin } from "@/stores/mixin";
-import http from "@/plugins/http";
-import config from "@/app.config";
 
-const $q = useQuasar();
 const leaveStore = useLeavelistDataStore();
-const route = useRoute();
 const router = useRouter();
-const { showLoader, hideLoader, messageError, dialogRemove, success } =
-  useCounterMixin();
 
 const total = defineModel<number>("total", { required: true });
 const totalList = defineModel<number>("totalList", { required: true });
 const pagination = defineModel<any>("pagination", { required: true });
-const props = defineProps({
-  getList: Function,
-  rows: {
-    type: Object,
-    require: true,
-  },
-  page: {
-    type: Number,
-    require: true,
-  },
-  rowsPerPage: {
-    type: Number,
-    require: true,
-  },
-  maxPage: {
-    type: Number,
-    require: true,
-  },
-  totalList: {
-    type: Number,
-    require: true,
-  },
-  dataToobar: Object,
-});
-
-const isPermissionDelete = computed(() => {
-  return (status: string) => {
-    return (
-      checkPermission(route)?.attrOwnership === "OWNER" &&
-      !leaveStore.statusDelete.includes(status) &&
-      leaveStore.tabMenu === "1"
-    );
-  };
-});
 
 /** ข้อมูลหัวตาราง รายการลา */
 const columnsLeave = ref<QTableProps["columns"]>([
@@ -254,6 +212,31 @@ const visibleReject = ref<string[]>([
   "status",
 ]);
 
+const props = defineProps({
+  getList: Function,
+  rows: {
+    type: Object,
+    require: true,
+  },
+  page: {
+    type: Number,
+    require: true,
+  },
+  rowsPerPage: {
+    type: Number,
+    require: true,
+  },
+  maxPage: {
+    type: Number,
+    require: true,
+  },
+  totalList: {
+    type: Number,
+    require: true,
+  },
+  dataToobar: Object,
+});
+
 /** ไปหน้ารายละเอียด */
 function redirectToDetail(id: string) {
   const routePrefix = leaveStore.tabMenu === "1" ? "/leave" : "/leave-reject";
@@ -281,21 +264,6 @@ function getStatusColor(statusText: string) {
   return statusMap[statusText.toUpperCase()] ?? "";
 }
 
-function handleDelete(id: string) {
-  dialogRemove($q, async () => {
-    try {
-      showLoader();
-      await http.delete(config.API.leaveList() + `/${id}`);
-      await props.getList?.();
-      success($q, "ลบข้อมูลสำเร็จ");
-    } catch (error) {
-      messageError($q, error);
-    } finally {
-      hideLoader();
-    }
-  });
-}
-
 /** Hook*/
 onMounted(() => {
   if (leaveStore.tabMenu === "1") {
@@ -345,17 +313,6 @@ onMounted(() => {
           >
             <q-tooltip>รายละเอียด</q-tooltip>
           </q-btn>
-          <q-btn
-            v-if="isPermissionDelete(props.row.statusText)"
-            flat
-            round
-            dense
-            icon="mdi-delete"
-            color="red"
-            @click.prevent="handleDelete(props.row.id)"
-          >
-            <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
         </q-td>
         <q-td
           v-for="col in props.cols"

src/modules/09_leave/stores/LeaveStore.ts

@@ -44,8 +44,6 @@ export const useLeavelistDataStore = defineStore("leave", () => {
 
   const leaveType = ref<LeaveType[]>([]);
 
-  const statusDelete = ["APPROVE", "DELETING", "DELETE"];
-
   /**
    * ฟังก์ชั่น fetchListLeave
    * @param data รับข้อมูลจาก Page
@@ -266,6 +264,5 @@ export const useLeavelistDataStore = defineStore("leave", () => {
     leaveTypeOption,
     leaveTypeList,
     fetchKeycloakPosition,
-    statusDelete,
   };
 });