From 1d9d1e879861231deff3b2ba8c5ef8bcaa5432c3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 14 Feb 2024 13:18:39 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=AD=E0=B8=B1=E0=B8=95?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{PositionDetail.vue => DialogPositionDetail.vue} |  0
 ...StructureDetail.vue => DialogStructureDetail.vue} |  0
 .../components/{mainTree.vue => TreeMain.vue}        |  2 +-
 .../components/{tableTree.vue => TreeTable.vue}      |  2 +-
 .../components/{listView.vue => TreeView.vue}        |  8 ++++----
 src/modules/02_organizationalNew/views/main.vue      | 12 +++---------
 6 files changed, 9 insertions(+), 15 deletions(-)
 rename src/modules/02_organizationalNew/components/{PositionDetail.vue => DialogPositionDetail.vue} (100%)
 rename src/modules/02_organizationalNew/components/{StructureDetail.vue => DialogStructureDetail.vue} (100%)
 rename src/modules/02_organizationalNew/components/{mainTree.vue => TreeMain.vue} (99%)
 rename src/modules/02_organizationalNew/components/{tableTree.vue => TreeTable.vue} (99%)
 rename src/modules/02_organizationalNew/components/{listView.vue => TreeView.vue} (97%)

diff --git a/src/modules/02_organizationalNew/components/PositionDetail.vue b/src/modules/02_organizationalNew/components/DialogPositionDetail.vue
similarity index 100%
rename from src/modules/02_organizationalNew/components/PositionDetail.vue
rename to src/modules/02_organizationalNew/components/DialogPositionDetail.vue
diff --git a/src/modules/02_organizationalNew/components/StructureDetail.vue b/src/modules/02_organizationalNew/components/DialogStructureDetail.vue
similarity index 100%
rename from src/modules/02_organizationalNew/components/StructureDetail.vue
rename to src/modules/02_organizationalNew/components/DialogStructureDetail.vue
diff --git a/src/modules/02_organizationalNew/components/mainTree.vue b/src/modules/02_organizationalNew/components/TreeMain.vue
similarity index 99%
rename from src/modules/02_organizationalNew/components/mainTree.vue
rename to src/modules/02_organizationalNew/components/TreeMain.vue
index 732cd0314..060f51504 100644
--- a/src/modules/02_organizationalNew/components/mainTree.vue
+++ b/src/modules/02_organizationalNew/components/TreeMain.vue
@@ -11,7 +11,7 @@ import type { DataTree } from "@/modules/02_organizationalNew/interface/index/or
 
 /** importComponents*/
 import DialogAgency from "@/modules/02_organizationalNew/components/DialogFormAgency.vue";
-import DialogStructureDetail from "@/modules/02_organizationalNew/components/StructureDetail.vue";
+import DialogStructureDetail from "@/modules/02_organizationalNew/components/DialogStructureDetail.vue";
 import DialogSortAgency from "@/modules/02_organizationalNew/components/DialogSortAgency.vue";
 import DialogHistory from "@/modules/02_organizationalNew/components/DialogHistory.vue";
 
diff --git a/src/modules/02_organizationalNew/components/tableTree.vue b/src/modules/02_organizationalNew/components/TreeTable.vue
similarity index 99%
rename from src/modules/02_organizationalNew/components/tableTree.vue
rename to src/modules/02_organizationalNew/components/TreeTable.vue
index df21ce9ed..327ae0d14 100644
--- a/src/modules/02_organizationalNew/components/tableTree.vue
+++ b/src/modules/02_organizationalNew/components/TreeTable.vue
@@ -17,7 +17,7 @@ import type { DataPosition } from "@/modules/02_organizationalNew/interface/inde
 
 /** importComponents*/
 import DialogFormPosotion from "@/modules/02_organizationalNew/components/DialogFormPosition.vue";
-import DialogPositionDetail from "@/modules/02_organizationalNew/components/PositionDetail.vue";
+import DialogPositionDetail from "@/modules/02_organizationalNew/components/DialogPositionDetail.vue";
 import DialogSort from "@/modules/02_organizationalNew/components/DialogSortPosition.vue";
 import DialogMovePos from "@/modules/02_organizationalNew/components/DialogMovePos.vue";
 import DialogHistoryPos from "@/modules/02_organizationalNew/components/DialogHistoryPos.vue";
diff --git a/src/modules/02_organizationalNew/components/listView.vue b/src/modules/02_organizationalNew/components/TreeView.vue
similarity index 97%
rename from src/modules/02_organizationalNew/components/listView.vue
rename to src/modules/02_organizationalNew/components/TreeView.vue
index 1e6ba514e..770e778a1 100644
--- a/src/modules/02_organizationalNew/components/listView.vue
+++ b/src/modules/02_organizationalNew/components/TreeView.vue
@@ -14,8 +14,8 @@ import type {
 import type { FilterMaster } from "@/modules/02_organizationalNew/interface/request/organizational";
 
 /** importComponents*/
-import TreeView from "@/modules/02_organizationalNew/components/mainTree.vue";
-import TableView from "@/modules/02_organizationalNew/components/tableTree.vue";
+import TreeMain from "@/modules/02_organizationalNew/components/TreeMain.vue";
+import TreeTable from "@/modules/02_organizationalNew/components/TreeTable.vue";
 
 /** importStore*/
 import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
@@ -212,7 +212,7 @@ watch(
     <q-card bordered class="col-12 row caedNone">
       <div class="col-xs-12 col-sm-3 row">
         <div class="col-12 row no-wrap bg-grey-1">
-          <TreeView
+          <TreeMain
             v-model:nodeTree="nodeTree"
             v-model:nodeId="nodeId"
             :fetchDataTree="fetchDataTree"
@@ -283,7 +283,7 @@ watch(
                 </div>
               </q-card>
 
-              <TableView
+              <TreeTable
                 v-if="nodeId !== ''"
                 v-model:nodeTree="nodeTree"
                 v-model:orgLevel="orgLevel"
diff --git a/src/modules/02_organizationalNew/views/main.vue b/src/modules/02_organizationalNew/views/main.vue
index b46eae627..35476a291 100644
--- a/src/modules/02_organizationalNew/views/main.vue
+++ b/src/modules/02_organizationalNew/views/main.vue
@@ -9,8 +9,8 @@ import type { DataOption } from "@/modules/02_organizationalNew/interface/index/
 import type { OrgRevision } from "@/modules/02_organizationalNew/interface/response/organizational";
 
 /** importComponents*/
-import ListView from "@/modules/02_organizationalNew/components/listView.vue";
-import StructureView from "@/modules/02_organizationalNew/components/structureView.vue";
+import TreeView from "@/modules/02_organizationalNew/components/TreeView.vue";
+import StructureView from "@/modules/02_organizationalNew/components/StructureView.vue";
 import DialogFormNewStructure from "@/modules/02_organizationalNew/components/DialogNewStructure.vue";
 import DialogDateTime from "@/modules/02_organizationalNew/components/DialogFormDateTime.vue";
 
@@ -311,15 +311,9 @@ onMounted(async () => {
         </q-card-section>
         <q-separator />
         <q-card-section style="padding: 0px">
-          <!-- <ListView
-            v-if="store.statusView === 'list'"
-            v-model:historyId="historyId"
-            v-model:count="count"
-          />
-          <StructureView v-if="store.statusView === 'tree'" /> -->
           <q-tab-panels v-model="store.statusView" animated>
             <q-tab-panel name="list" style="padding: 0px">
-              <ListView
+              <TreeView
                 v-if="store.statusView === 'list'"
                 v-model:historyId="historyId"
                 v-model:count="count"