From 07130bd70238537f13976862a0e9451cb29bad25 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 29 Oct 2024 10:27:08 +0700
Subject: [PATCH 1/2] =?UTF-8?q?=E0=B8=88=E0=B8=B1=E0=B8=94=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99?=
 =?UTF-8?q?=E0=B9=88=E0=B8=87=E0=B8=95=E0=B8=B4=E0=B8=94=E0=B9=80=E0=B8=87?=
 =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99=E0=B9=84=E0=B8=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogCondition.vue            |  96 +++
 src/modules/19_condition/router.ts            |  14 +
 src/modules/19_condition/view/Main.vue        | 555 ++++++++++++++++++
 src/router/index.ts                           |   2 +
 4 files changed, 667 insertions(+)
 create mode 100644 src/modules/19_condition/components/DialogCondition.vue
 create mode 100644 src/modules/19_condition/router.ts
 create mode 100644 src/modules/19_condition/view/Main.vue

diff --git a/src/modules/19_condition/components/DialogCondition.vue b/src/modules/19_condition/components/DialogCondition.vue
new file mode 100644
index 000000000..6401d18f8
--- /dev/null
+++ b/src/modules/19_condition/components/DialogCondition.vue
@@ -0,0 +1,96 @@
+<script setup lang="ts">
+import { reactive } from "vue";
+import { useQuasar } from "quasar";
+
+import { useCounterMixin } from "@/stores/mixin";
+import config from "@/app.config";
+import http from "@/plugins/http";
+
+import DialogHeader from "@/components/DialogHeader.vue";
+
+const $q = useQuasar();
+const { showLoader, hideLoader, messageError, success, dialogConfirm } =
+  useCounterMixin();
+
+const modal = defineModel<boolean>("modal", { required: true });
+const props = defineProps({
+  fetchData: { type: Function, required: true },
+  dataCondition: { type: Object, required: true },
+});
+
+const formData = reactive({
+  isCondition: false,
+  conditionReason: "",
+});
+
+function onCloseDialog() {
+  modal.value = false;
+  formData.isCondition = false;
+  formData.conditionReason = "";
+}
+
+function onSubmit() {
+  dialogConfirm($q, async () => {
+    // showLoader();
+    // await http
+    //   .put(config.API.รอAPI, formData)
+    //   .then(async () => {
+    //     await props.fetchData?.();
+    //     onCloseDialog();
+    //     success($q, "บันทึกข้อมูลสำเร็จ");
+    //   })
+    //   .catch((err) => {
+    //     messageError($q, err);
+    //   })
+    //   .finally(() => {
+    //     hideLoader();
+    //   });
+  });
+}
+</script>
+
+<template>
+  <q-dialog v-model="modal" persistent>
+    <q-card style="min-width: 30vw">
+      <q-form greedy @submit.prevent @validation-success="onSubmit">
+        <DialogHeader
+          :tittle="`จัดการตำแหน่งติดเงื่อนไข`"
+          :close="onCloseDialog"
+        />
+        <q-separator />
+
+        <q-card-section>
+          <div class="row q--col-gutter-sm">
+            <div class="col-12">
+              <q-checkbox
+                color="primary"
+                keep-color
+                v-model="formData.isCondition"
+                label="ตำแหน่งติดเงื่อนไข
+"
+              />
+            </div>
+            <div class="col-12">
+              <q-input
+                dense
+                outlined
+                v-model="formData.conditionReason"
+                label="หมายเหตุ"
+                type="textarea"
+              />
+            </div>
+          </div>
+        </q-card-section>
+
+        <q-separator />
+        <q-card-actions align="right">
+          <q-btn label="บันทึก" color="secondary" type="submit"
+            ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
+          >
+        </q-card-actions>
+      </q-form>
+    </q-card>
+  </q-dialog>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/19_condition/router.ts b/src/modules/19_condition/router.ts
new file mode 100644
index 000000000..8a51b1869
--- /dev/null
+++ b/src/modules/19_condition/router.ts
@@ -0,0 +1,14 @@
+const mainView = () => import("@/modules/19_condition/view/Main.vue");
+
+export default [
+  {
+    path: "/position-condition",
+    name: "positionCondition",
+    component: mainView,
+    meta: {
+      Auth: true,
+      Key: "COMMAND",
+      Role: "STAFF",
+    },
+  },
+];
diff --git a/src/modules/19_condition/view/Main.vue b/src/modules/19_condition/view/Main.vue
new file mode 100644
index 000000000..6da1a888c
--- /dev/null
+++ b/src/modules/19_condition/view/Main.vue
@@ -0,0 +1,555 @@
+<script setup lang="ts">
+import { ref, onMounted, watch } from "vue";
+import { useQuasar } from "quasar";
+
+import { useCounterMixin } from "@/stores/mixin";
+import http from "@/plugins/http";
+import config from "@/app.config";
+
+import type { QTableProps } from "quasar";
+
+import LoadView from "@/components/LoadView.vue";
+import DialogCondition from "@/modules/19_condition/components/DialogCondition.vue";
+
+const $q = useQuasar();
+const { showLoader, hideLoader, messageError } = useCounterMixin();
+
+const isLoadTable = ref<boolean>(false);
+
+//Tree
+const activeId = ref<string>("");
+const filter = ref<string>("");
+const orgTreeId = ref<string>("");
+const nodeTree = ref<any[]>([]);
+const expanded = ref<string[]>([]);
+
+//Table
+const isAll = ref<boolean>(false);
+const keyword = ref<string>("");
+const page = ref<number>(1);
+const pageSize = ref<number>(10);
+const orgLevel = ref<number>(0);
+const totalPage = ref<number>(1);
+const totalRow = ref<number>(0);
+const modalCondition = ref<boolean>(false);
+const dataCondition = ref<any>();
+
+const rows = ref<any[]>([]);
+const pagination = ref({
+  page: 1,
+  rowsPerPage: 10,
+});
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: false,
+    field: "no",
+    format(val, row) {
+      return (page.value - 1) * pageSize.value + rows.value.indexOf(row) + 1;
+    },
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posMasterNo",
+    align: "left",
+    label: "ตำแหน่งเลขที่",
+    sortable: false,
+    field: "posMasterNo",
+    format(val, row) {
+      return row.isSit
+        ? `${row.orgShortname}${row.posMasterNo}(นั่งทับตำแหน่ง)`
+        : `${row.orgShortname}${row.posMasterNo}`;
+    },
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "profilePosition",
+    align: "left",
+    label: "ตำแหน่งในสายงาน",
+    field: "profilePosition",
+    sortable: false,
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "profilePostype",
+    align: "left",
+    label: "ประเภทตำแหน่ง",
+    sortable: false,
+    field: "profilePostype",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "profilePoslevel",
+    align: "left",
+    label: "ระดับตำแหน่ง",
+    sortable: false,
+    field: "profilePoslevel",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "positionIsSelected",
+    align: "left",
+    label: "คนครอง",
+    sortable: false,
+    field: "positionIsSelected",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+const columnsExpand = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: false,
+    field: "no",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "positionName",
+    align: "left",
+    label: "ตำแหน่งในสายงาน",
+    sortable: true,
+    field: "positionName",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "positionField",
+    align: "left",
+    label: "สายงาน",
+    sortable: true,
+    field: "positionField",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posTypeName",
+    align: "left",
+    label: "ประเภทตำเเหน่ง",
+    sortable: true,
+    field: "posTypeName",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posLevelName",
+    align: "left",
+    label: "ระดับตำแหน่ง",
+    sortable: true,
+    field: "posLevelName",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posExecutiveName",
+    align: "left",
+    label: "ตำแหน่งทางการบริหาร",
+    sortable: true,
+    field: "posExecutiveName",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "positionExecutiveField",
+    align: "left",
+    label: "ด้านทางการบริหาร",
+    sortable: true,
+    field: "positionExecutiveField",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "positionArea",
+    align: "left",
+    label: "ด้าน/สาขา",
+    sortable: true,
+    field: "positionArea",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+
+/**
+ * function เรียกข้อมูลโครงสร้าง แบบปัจุบัน
+ */
+async function fetchOrgActive() {
+  showLoader();
+  http
+    .get(config.API.activeOrganization)
+    .then(async (res) => {
+      const data = res.data.result;
+      if (data) {
+        activeId.value = data.activeId;
+        await fetchDataTree(data.activeId);
+      }
+    })
+    .catch((err) => {
+      messageError($q, err);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+/**
+ * function fetch ข้อมูลของ Tree
+ * @param id id โครงสร้าง
+ */
+async function fetchDataTree(id: string) {
+  showLoader();
+  await http
+    .get(config.API.orgByid(id))
+    .then((res) => {
+      const data = res.data.result;
+      nodeTree.value = data;
+    })
+    .catch((err) => {
+      messageError($q, err);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+function onSelectedOrgTree(data: any) {
+  orgTreeId.value = data.orgTreeId;
+  orgLevel.value = data.orgLevel;
+  fetchDataTable();
+}
+
+/**
+ * function fetch ข้อรายการตำแหน่ง
+ */
+async function fetchDataTable() {
+  rows.value = [];
+  isLoadTable.value = true;
+  await http
+    .post(config.API.orgPosMasterList, {
+      id: orgTreeId.value,
+      type: orgLevel.value,
+      isAll: isAll.value,
+      page: page.value,
+      pageSize: pageSize.value,
+      keyword: keyword.value,
+      revisionId: activeId.value,
+    })
+    .then(async (res) => {
+      const data = await res.data.result;
+      totalRow.value = data.total;
+      totalPage.value = Math.ceil(data.total / pageSize.value);
+      rows.value = data.data;
+    })
+    .catch((err) => {
+      messageError($q, err);
+    })
+    .finally(() => {
+      isLoadTable.value = false;
+    });
+}
+
+function onSearchDataTable() {
+  page.value = 1;
+  fetchDataTable();
+}
+
+function updatePagination(newPagination: any) {
+  pageSize.value = newPagination.rowsPerPage;
+}
+
+function onSetCondution(data: any) {
+  console.log(data);
+  dataCondition.value = data;
+  modalCondition.value = true;
+}
+
+watch(pageSize, () => {
+  onSearchDataTable();
+});
+
+onMounted(async () => {
+  await fetchOrgActive();
+});
+</script>
+
+<template>
+  <div class="toptitle text-dark col-12 row items-center">
+    จัดการตำแหน่งติดเงื่อนไข
+  </div>
+
+  <q-card>
+    <q-card-section :horizontal="$q.screen.gt.xs">
+      <!-- Tree -->
+      <q-card-section class="col-lg-3 col-md-4 col-xs-12 q-gutter-sm">
+        <div>
+          <q-input dense outlined v-model="filter" label="ค้นหา">
+            <template v-slot:append>
+              <q-icon
+                v-if="filter !== ''"
+                name="clear"
+                class="cursor-pointer"
+                @click="filter = ''"
+              />
+              <q-icon name="search" color="grey-5" />
+            </template>
+          </q-input>
+        </div>
+        <div class="bg-white tree-container q-pa-xs">
+          <q-tree
+            class="q-pa-sm q-gutter-sm"
+            dense
+            :nodes="nodeTree"
+            node-key="orgTreeId"
+            label-key="labelName"
+            :filter="filter"
+            no-results-label="ไม่พบข้อมูลที่ค้นหา"
+            no-nodes-label="ไม่มีข้อมูล"
+            v-model:expanded="expanded"
+          >
+            <template v-slot:default-header="prop">
+              <q-item
+                clickable
+                :active="orgTreeId == prop.node.orgTreeId"
+                @click.stop="onSelectedOrgTree(prop.node)"
+                active-class="my-list-link text-primary text-weight-medium"
+                class="row col-12 text-dark items-center q-py-xs q-pl-sm rounded-borders my-list"
+              >
+                <div>
+                  <div class="text-weight-medium">
+                    {{ prop.node.orgTreeName }}
+                  </div>
+                  <div class="text-weight-light text-grey-8">
+                    {{ prop.node.orgCode == null ? null : prop.node.orgCode }}
+                    {{
+                      prop.node.orgTreeShortName == null
+                        ? null
+                        : prop.node.orgTreeShortName
+                    }}
+                  </div>
+                </div>
+              </q-item>
+            </template>
+          </q-tree>
+        </div>
+      </q-card-section>
+      <q-separator :vertical="$q.screen.gt.xs" />
+
+      <!-- Table -->
+      <q-card-section
+        class="col-lg-9 col-md-8 col-xs-12 q-gutter-sm"
+        v-if="orgTreeId"
+      >
+        <div class="row col-12 q-gutter-sm">
+          <div class="row col-12">
+            <q-space />
+            <div class="row q-gutter-sm">
+              <q-checkbox
+                v-model="isAll"
+                label="แสดงตำแหน่งทั้งหมด"
+                color="primary"
+                keep-color
+                @update:model-value="onSearchDataTable"
+              />
+
+              <q-input
+                outlined
+                dense
+                v-model="keyword"
+                label="ค้นหา"
+                @keydown.enter.prevent="onSearchDataTable"
+              >
+                <template v-slot:append>
+                  <q-icon name="search" color="grey-5" />
+                </template>
+              </q-input>
+            </div>
+          </div>
+          <div class="col-12">
+            <d-table
+              ref="table"
+              :columns="columns"
+              :rows="rows"
+              :paging="true"
+              row-key="id"
+              flat
+              bordered
+              dense
+              :rows-per-page-options="[10, 25, 50, 100]"
+              :loading="isLoadTable"
+              v-model:pagination="pagination"
+              @update:pagination="updatePagination"
+            >
+              <template v-slot:header="props">
+                <q-tr :props="props">
+                  <q-th auto-width></q-th>
+                  <q-th auto-width></q-th>
+                  <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">
+                  <q-td auto-width>
+                    <q-btn
+                      flat
+                      color="edit"
+                      round
+                      dense
+                      icon="edit"
+                      @click.stop.pervent="onSetCondution(props.row)"
+                    />
+                  </q-td>
+                  <q-td auto-width>
+                    <q-btn
+                      flat
+                      color="primary"
+                      round
+                      dense
+                      @click="props.expand = !props.expand"
+                      :icon="props.expand ? 'mdi-menu-down' : 'mdi-menu-right'"
+                    />
+                  </q-td>
+
+                  <q-td
+                    v-for="col in props.cols"
+                    :key="col.name"
+                    :props="props"
+                  >
+                    <div>
+                      {{ col.value ? col.value : "-" }}
+                    </div>
+                  </q-td>
+                </q-tr>
+
+                <q-tr v-show="props.expand" :props="props">
+                  <q-td colspan="100%" class="bg-grey-1">
+                    <q-card flat bordered class="text-left q-ma-sm">
+                      <d-table
+                        flat
+                        :columns="columnsExpand"
+                        :rows="props.row.positions"
+                        table-class="text-grey-9"
+                        row-key="id"
+                        dense
+                        hide-bottom
+                        bordered
+                        separator="vertical"
+                        class="custom-header-table-expand"
+                      >
+                        <template v-slot:header="props">
+                          <q-tr :props="props" class="bg-grey-2">
+                            <q-th
+                              v-for="col in props.cols"
+                              :key="col.name"
+                              :props="props"
+                            >
+                              <span class="q-px-sm text-body2 text-black">{{
+                                col.label
+                              }}</span>
+                            </q-th>
+                          </q-tr>
+                        </template>
+                        <template v-slot:body="props">
+                          <q-tr :props="props">
+                            <q-td
+                              v-for="col in props.cols"
+                              :key="col.name"
+                              :props="props"
+                            >
+                              <div v-if="col.name == 'no'" class="text-body2">
+                                {{ props.rowIndex + 1 }}
+                              </div>
+                              <div
+                                v-else-if="col.name === 'posExecutiveName'"
+                                class="text-body2"
+                              >
+                                {{ col.value ? col.value : "-" }}
+                              </div>
+
+                              <div
+                                v-else-if="
+                                  col.name === 'positionExecutiveField'
+                                "
+                                class="text-body2"
+                              >
+                                {{ col.value ? col.value : "-" }}
+                              </div>
+
+                              <div
+                                v-else-if="col.name === 'positionArea'"
+                                class="text-body2"
+                              >
+                                {{ col.value ? col.value : "-" }}
+                              </div>
+
+                              <div v-else class="text-body2">
+                                {{ col.value }}
+                              </div>
+                            </q-td>
+                          </q-tr>
+                        </template>
+                      </d-table>
+                    </q-card>
+                  </q-td>
+                </q-tr>
+              </template>
+              <template v-slot:pagination="scope">
+                ทั้งหมด {{ totalRow }} รายการ
+                <q-pagination
+                  v-model="page"
+                  active-color="primary"
+                  color="dark"
+                  :max="totalPage"
+                  :max-pages="5"
+                  size="sm"
+                  boundary-links
+                  direction-links
+                  @update:model-value="fetchDataTable"
+                ></q-pagination>
+              </template>
+              <template v-slot:loading>
+                <LoadView />
+              </template>
+            </d-table>
+          </div>
+        </div>
+      </q-card-section>
+    </q-card-section>
+  </q-card>
+
+  <DialogCondition
+    v-model:modal="modalCondition"
+    :fetch-data="fetchDataTable"
+    :data-condition="dataCondition"
+  />
+</template>
+
+<style scoped>
+.tree-container {
+  overflow: auto;
+  height: 75vh;
+  border: 1px solid #e6e6e7;
+  border-radius: 10px;
+}
+
+.my-list-link {
+  color: rgb(118, 168, 222);
+  border-radius: 5px;
+  background: #a3d3fb48 !important;
+  font-weight: 600;
+  border: 1px solid rgba(175, 185, 196, 0.217);
+}
+</style>
diff --git a/src/router/index.ts b/src/router/index.ts
index 044391b25..40b972575 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -28,6 +28,7 @@ import ModuleDevelopment from "@/modules/15_development/router";
 import ModuleSupport from "@/modules/00_support/router";
 import ModuleActing from "@/modules/17_acting/router";
 import ModuleCommand from "@/modules/18_command/router";
+import ModulePositionCondition from "@/modules/19_condition/router";
 
 // TODO: ใช้หรือไม่?
 import { authenticated } from "@/plugins/auth";
@@ -76,6 +77,7 @@ const router = createRouter({
         ...ModuleSupport,
         ...ModuleActing,
         ...ModuleCommand,
+        ...ModulePositionCondition,
       ],
     },
     /**

From 8964ea708af4b21dccd92d0ff06b7d4b03449443 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 29 Oct 2024 11:07:52 +0700
Subject: [PATCH 2/2] Permission Command

---
 .../18_command/components/Main/TableMain.vue  | 36 +++++++++++++++----
 src/modules/18_command/views/lists.vue        |  6 ++--
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/modules/18_command/components/Main/TableMain.vue b/src/modules/18_command/components/Main/TableMain.vue
index 90d016522..a0b61a8fc 100644
--- a/src/modules/18_command/components/Main/TableMain.vue
+++ b/src/modules/18_command/components/Main/TableMain.vue
@@ -2,11 +2,12 @@
 import { onMounted, ref, watch } from "vue";
 import { useQuasar } from "quasar";
 
-import http from "@/plugins/http";
-import config from "@/app.config";
 import { useRouter } from "vue-router";
+import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
 import { useCommandListStore } from "@/modules/18_command/store/ListStore";
+import http from "@/plugins/http";
+import config from "@/app.config";
 
 import type { QTableProps } from "quasar";
 import type { Pagination } from "@/modules/18_command/interface/index/Main";
@@ -234,6 +235,18 @@ onMounted(() => {
             round
             color="secondary"
             icon="mdi-dots-horizontal-circle-outline"
+            v-if="
+              store.tabsMain === 'DRAFT' ||
+              store.tabsMain === 'PENDING' ||
+              store.tabsMain === 'CANCEL'
+                ? checkPermission($route)?.attrIsGet ||
+                  checkPermission($route)?.attrIsCreate ||
+                  checkPermission($route)?.attrIsDelete
+                : store.tabsMain === 'WAITING' || store.tabsMain === 'REPORTED'
+                ? checkPermission($route)?.attrIsGet ||
+                  checkPermission($route)?.attrIsCreate
+                : ''
+            "
           >
             <q-menu>
               <q-list dense style="min-width: 200px">
@@ -242,7 +255,9 @@ onMounted(() => {
                   v-if="
                     store.tabsMain !== 'WAITING' &&
                     store.tabsMain !== 'CANCEL' &&
-                    store.tabsMain !== 'REPORTED'
+                    store.tabsMain !== 'REPORTED' &&
+                    checkPermission($route)?.attrIsGet &&
+                    checkPermission($route)?.attrIsCreate
                   "
                   clickable
                   v-close-popup
@@ -263,6 +278,7 @@ onMounted(() => {
 
                 <!-- รายละเอียด -->
                 <q-item
+                  v-if="checkPermission($route)?.attrIsGet"
                   clickable
                   v-close-popup
                   @click.pervent="onRedirectToDetail('view', props.row.id)"
@@ -282,6 +298,7 @@ onMounted(() => {
 
                 <!-- ทำสำเนาคำสั่ง -->
                 <q-item
+                  v-if="checkPermission($route)?.attrIsCreate"
                   clickable
                   v-close-popup
                   @click.pervent="onCopy(props.row.id)"
@@ -303,7 +320,8 @@ onMounted(() => {
                   v-if="
                     store.tabsMain !== 'WAITING' &&
                     store.tabsMain !== 'CANCEL' &&
-                    store.tabsMain !== 'REPORTED'
+                    store.tabsMain !== 'REPORTED' &&
+                    checkPermission($route)?.attrIsDelete
                   "
                   clickable
                   v-close-popup
@@ -324,9 +342,12 @@ onMounted(() => {
 
                 <!-- ดึงไปทำคำสั่งใหม่ แสดงแค่ Tabs ยกเลิก -->
                 <q-item
+                  v-if="
+                    store.tabsMain === 'CANCEL' &&
+                    checkPermission($route)?.attrIsCreate
+                  "
                   clickable
                   v-close-popup
-                  v-if="store.tabsMain === 'CANCEL'"
                   @click.pervent="onReCommand(props.row.id)"
                 >
                   <q-item-section>
@@ -340,7 +361,10 @@ onMounted(() => {
                 <q-item
                   clickable
                   v-close-popup
-                  v-if="store.tabsMain === 'CANCEL'"
+                  v-if="
+                    store.tabsMain === 'CANCEL' &&
+                    checkPermission($route)?.attrIsDelete
+                  "
                   @click.pervent="onDeleteCommand(props.row.id)"
                 >
                   <q-item-section>
diff --git a/src/modules/18_command/views/lists.vue b/src/modules/18_command/views/lists.vue
index 3ee6af06e..c48fef0cf 100644
--- a/src/modules/18_command/views/lists.vue
+++ b/src/modules/18_command/views/lists.vue
@@ -2,10 +2,11 @@
 import { reactive, ref } from "vue";
 import { useQuasar } from "quasar";
 
-import http from "@/plugins/http";
-import config from "@/app.config";
+import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
 import { useCommandListStore } from "@/modules/18_command/store/ListStore";
+import http from "@/plugins/http";
+import config from "@/app.config";
 
 import type { ItemTabs } from "@/modules/18_command/interface/index/Main";
 import type { FormQuery } from "@/modules/18_command/interface/request/Main";
@@ -101,6 +102,7 @@ async function fetchListCommand() {
       </datepicker>
 
       <q-btn
+        v-if="checkPermission($route)?.attrIsCreate"
         flat
         round
         dense