From f395ae40d6c952125031a1fea880cc854ec9723c Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 2 Sep 2024 14:48:23 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=B3?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=20=3D=3D>=20=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B1=E0=B8=9A=20route.meta.Key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dialogs/DialogOrgSelectOneStep.vue        |  1 -
 .../10_order/components/step/step03.vue       | 42 +++++++------------
 src/modules/10_order/router.ts                |  6 +--
 3 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/src/components/Dialogs/DialogOrgSelectOneStep.vue b/src/components/Dialogs/DialogOrgSelectOneStep.vue
index 12e44f743..6fbf932c1 100644
--- a/src/components/Dialogs/DialogOrgSelectOneStep.vue
+++ b/src/components/Dialogs/DialogOrgSelectOneStep.vue
@@ -234,7 +234,6 @@ async function getActive() {
     .get(config.API.activeOrganization)
     .then(async (res) => {
       const data = res.data.result;
-
       formActive.activeId = data.activeId;
       formActive.activeName = data.activeName;
       formActive.draftId = data.draftId;
diff --git a/src/modules/10_order/components/step/step03.vue b/src/modules/10_order/components/step/step03.vue
index 58ffe69a2..d9996cef3 100644
--- a/src/modules/10_order/components/step/step03.vue
+++ b/src/modules/10_order/components/step/step03.vue
@@ -47,7 +47,9 @@ const mixin = useCounterMixin(); //เรียกฟังก์ชันกล
 const { dialogRemove, messageError, showLoader, hideLoader, success } = mixin;
 
 const route = useRoute();
-const checkRoutePermisson = ref<boolean>(route.name == "disciplineOrderDatailOnly");
+const checkRoutePermisson = ref<boolean>(
+  route.name == "disciplineOrderDatailOnly"
+);
 const myForm = ref<QForm | null>(null);
 const filterRef = ref<QInput>();
 const filter = ref<string>("");
@@ -256,7 +258,6 @@ const clickClose = async () => {
 };
 // เปิด popup เพิ่มข้อมูล
 const clickAdd = async () => {
-  await nodeTree();
   selected.value = "";
   rowsModal.value = [];
   selectedModal.value = [];
@@ -269,29 +270,7 @@ const clickAdd = async () => {
 const clickDelete = (id: string) => {
   dialogRemove($q, () => deleteData(id));
 };
-// โหลดโครงสร้าง tree
-const nodeTree = async () => {
-  showLoader();
-  await http
-    .get(config.API.profileOrganizRoot)
-    .then((res) => {
-      const data = res.data.result;
-      nodesTree.value = data;
-      if (data.length > 0) {
-        expanded.value = [data[0].id];
-      }
-    })
-    .catch((e) => {
-      messageError($q, e);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-};
-// เลือกหน่วยงาน
-const onSelected = async (id: string) => {
-  await listModal(id);
-};
+
 // ลบข้อมูลรายชื่อ
 const deleteData = async (id: string) => {
   await http
@@ -365,7 +344,14 @@ const fetchOrder = async (id: string) => {
   <q-card>
     <q-card-section>
       <div class="col-12 row q-py-sm items-center">
-        <q-btn v-if="!checkRoutePermisson" flat round color="primary" @click="clickAdd" icon="mdi-plus">
+        <q-btn
+          v-if="!checkRoutePermisson"
+          flat
+          round
+          color="primary"
+          @click="clickAdd"
+          icon="mdi-plus"
+        >
           <q-tooltip>เพิ่มข้อมูล</q-tooltip>
         </q-btn>
         <q-space />
@@ -429,7 +415,7 @@ const fetchOrder = async (id: string) => {
             <q-tr :props="props" class="cursor-pointer">
               <q-td auto-width>
                 <q-btn
-                v-if="!checkRoutePermisson"
+                  v-if="!checkRoutePermisson"
                   dense
                   size="12px"
                   flat
@@ -496,7 +482,7 @@ const fetchOrder = async (id: string) => {
       </q-form>
     </q-card-section>
 
-    <q-separator v-if="!checkRoutePermisson"/>
+    <q-separator v-if="!checkRoutePermisson" />
     <q-card-actions align="right" v-if="!checkRoutePermisson">
       <q-btn
         outline
diff --git a/src/modules/10_order/router.ts b/src/modules/10_order/router.ts
index 34b147be8..41240a30f 100644
--- a/src/modules/10_order/router.ts
+++ b/src/modules/10_order/router.ts
@@ -8,7 +8,7 @@ export default [
     component: MainOrder,
     meta: {
       Auth: true,
-      Key: [10],
+      Key: "COMMAND",
       Role: "order",
     },
   },
@@ -18,7 +18,7 @@ export default [
     component: DetailPage,
     meta: {
       Auth: true,
-      Key: [10],
+      Key: "COMMAND",
       Role: "order",
     },
   },
@@ -28,7 +28,7 @@ export default [
     component: DetailPage,
     meta: {
       Auth: true,
-      Key: [10],
+      Key: "COMMAND",
       Role: "order",
     },
   },