feat: add delete is OWNER

2026-05-29 10:12:16 +07:00 · 2026-05-29 10:12:16 +07:00 · 21401ed519
commit 21401ed519
parent aa3d41b7b3
6 changed files with 174 additions and 45 deletions
--- a/src/modules/05_placement/store.ts
+++ b/src/modules/05_placement/store.ts
@ -10,25 +10,25 @@ 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[] };
-    certicate: { columns: String[] };
-    train: { columns: String[] };
-    insignia: { columns: String[] };
-    coined: { columns: String[] };
-    assessment: { columns: String[] };
-    salary: { columns: String[] };
-    discipline: { columns: String[] };
-    leave: { columns: String[] };
-    talent: { columns: String[] };
-    work: { columns: String[] };
-    record: { columns: String[] };
-    other: { columns: String[] };
-    document: { columns: String[] };
-  }
+interface profile {
+  main: { columns: String[] };
+  education: { columns: String[] };
+  certicate: { columns: String[] };
+  train: { columns: String[] };
+  insignia: { columns: String[] };
+  coined: { columns: String[] };
+  assessment: { columns: String[] };
+  salary: { columns: String[] };
+  discipline: { columns: String[] };
+  leave: { columns: String[] };
+  talent: { columns: String[] };
+  work: { columns: String[] };
+  record: { columns: String[] };
+  other: { columns: String[] };
+  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,
  };
 });
+interface placementOrder {
+  mappingPosition: { columns: String[] };
+}
 export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
-  interface placementOrder {
-    mappingPosition: { columns: String[] };
-  }
  const placementOrderData = ref<placementOrder>({
    mappingPosition: { columns: [] },
  });
@ -369,6 +369,8 @@ export const useTransferDataStore = defineStore("transferDataStore", () => {
  ]);
  const statusOp = ref<DataOptions[]>(statusMainOp.value);

+  const statusDelete = ["REPORT", "WAITING", "DONE"];
+
  const statusText = (val: string) => {
    switch (val) {
      case "WAITTING":
@ -438,5 +440,6 @@ export const useTransferDataStore = defineStore("transferDataStore", () => {
    statusOp,
    statusMainOp,
    filterOption,
+    statusDelete,
  };
 });
--- a/src/modules/05_placement/views/02_transferMain.vue
+++ b/src/modules/05_placement/views/02_transferMain.vue
@ -2,7 +2,7 @@
 import { ref, onMounted, computed } from "vue";
 import { useQuasar } from "quasar";

-import { useRouter } from "vue-router";
+import { useRouter, useRoute } from "vue-router";
 import {
  checkPermission,
  checkPermissionList,
@ -20,11 +20,19 @@ 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 { date2Thai, messageError, showLoader, hideLoader, onSearchDataTable } =
-  mixin;
+const {
+  date2Thai,
+  messageError,
+  showLoader,
+  hideLoader,
+  onSearchDataTable,
+  dialogRemove,
+  success,
+} = mixin;

 const modal = ref<boolean>(false); //ส่งไปออกคำสั่ง
 const dataTransfer = ref<ResponseData[]>([]); //ช่อมูลรายการขอโอน
@ -141,6 +149,15 @@ const visibleColumns = ref<string[]>([
  "createdAt",
 ]);

+const isPermissionDelete = computed(() => {
+  return (status: string) => {
+    return (
+      checkPermission(route)?.attrOwnership === "OWNER" &&
+      !store.statusDelete.includes(status)
+    );
+  };
+});
+
 /** ฟังก์ชันดึงข้อมูรายการขอโอน*/
 async function fetchData() {
  showLoader();
@ -194,6 +211,21 @@ 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 เพื่อดึงข้อมูลรายการขอโอน
@ -337,6 +369,18 @@ 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'">
--- a/src/modules/05_placement/views/03_receiveMain.vue
+++ b/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.receiveDataId(id))
+      .delete(config.API.receiveData() + `/admin/${id}`)
      .then(async () => {
        await fecthlistRecevice();
        await success($q, "ลบข้อมูลสำเร็จ");
@ -606,8 +606,10 @@ onMounted(async () => {

                        <q-item
                          v-if="
-                            checkPermission($route)?.attrIsDelete &&
+                            checkPermission($route)?.attrOwnership ===
+                              'OWNER' &&
                            props.row.status !== 'REPORT' &&
+                            props.row.status !== 'WAITING' &&
                            props.row.status !== 'DONE'
                          "
                          clickable
--- a/src/modules/06_retirement/components/02_resign/Table.vue
+++ b/src/modules/06_retirement/components/02_resign/Table.vue
@ -33,7 +33,8 @@ const {
  showLoader,
  hideLoader,
  onSearchDataTable,
-  findOrgName,
+  dialogRemove,
+  success,
 } = mixin;

 /** Table */
@ -257,6 +258,21 @@ 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;
@ -308,7 +324,11 @@ onMounted(async () => {
            color="primary"
            icon="mdi-account-arrow-right"
          >
-            <q-tooltip>{{ `ส่งไปออกคำสั่ง${stroeResign.mainTabs == '2'?"ยกเลิกการ":''}ลาออก` }}</q-tooltip>
+            <q-tooltip>{{
+              `ส่งไปออกคำสั่ง${
+                stroeResign.mainTabs == "2" ? "ยกเลิกการ" : ""
+              }ลาออก`
+            }}</q-tooltip>
          </q-btn>
        </div>
        <q-space />
@ -393,6 +413,26 @@ 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
--- a/src/modules/06_retirement/components/03_resignEmp/Table.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/Table.vue
@ -27,8 +27,15 @@ const stroeResign = useDataStore();
 const { statusText } = stroe;
 const router = useRouter();
 const mixin = useCounterMixin();
-const { messageError, date2Thai, showLoader, hideLoader, onSearchDataTable } =
-  mixin;
+const {
+  messageError,
+  date2Thai,
+  showLoader,
+  hideLoader,
+  onSearchDataTable,
+  dialogRemove,
+  success,
+} = mixin;

 /** Table */
 const rows = ref<ResponseItems[]>([]);
@ -129,7 +136,7 @@ const columns = ref<QTableProps["columns"]>([
    sortable: true,
    field: "status",
    format(val, row) {
-      return stroeResign.mainTabs === "1"
+      return stroeResign.mainTabsEMP === "1"
        ? statusText(row.status)
        : statusText(row.status, "อนุญาต");
    },
@ -252,6 +259,21 @@ 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;
@ -391,6 +413,26 @@ 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
--- a/src/modules/09_leave/components/05_Leave/TableList.vue
+++ b/src/modules/09_leave/components/05_Leave/TableList.vue
@ -10,11 +10,11 @@ import { useCounterMixin } from "@/stores/mixin";
 import http from "@/plugins/http";
 import config from "@/app.config";

-const q = useQuasar();
+const $q = useQuasar();
 const leaveStore = useLeavelistDataStore();
 const route = useRoute();
 const router = useRouter();
-const { showLoader, hideLoader, messageError, dialogRemove } =
+const { showLoader, hideLoader, messageError, dialogRemove, success } =
  useCounterMixin();

 const total = defineModel<number>("total", { required: true });
@ -49,7 +49,8 @@ const isPermissionDelete = computed(() => {
  return (status: string) => {
    return (
      checkPermission(route)?.attrOwnership === "OWNER" &&
-      !leaveStore.statusDelete.includes(status)
+      !leaveStore.statusDelete.includes(status) &&
+      leaveStore.tabMenu === "1"
    );
  };
 });
@ -281,17 +282,14 @@ function getStatusColor(statusText: string) {
 }

 function handleDelete(id: string) {
-  dialogRemove(q, async () => {
+  dialogRemove($q, async () => {
    try {
      showLoader();
-      const API =
-        leaveStore.tabMenu === "1"
-          ? config.API.leaveList()
-          : config.API.leaveListDelete();
-      await http.delete(API + `/${id}`);
+      await http.delete(config.API.leaveList() + `/${id}`);
      await props.getList?.();
+      success($q, "ลบข้อมูลสำเร็จ");
    } catch (error) {
-      messageError(q, error);
+      messageError($q, error);
    } finally {
      hideLoader();
    }
@ -356,7 +354,7 @@ onMounted(() => {
            color="red"
            @click.prevent="handleDelete(props.row.id)"
          >
-            <q-tooltip>รายละเอียด</q-tooltip>
+            <q-tooltip>ลบข้อมูล</q-tooltip>
          </q-btn>
        </q-td>
        <q-td