โครงสร้างอัตรากำลัง

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-02-14 13:18:39 +07:00
parent 92aaccc791
commit 1d9d1e8798
6 changed files with 9 additions and 15 deletions

View file

@ -11,7 +11,7 @@ import type { DataTree } from "@/modules/02_organizationalNew/interface/index/or
/** importComponents*/ /** importComponents*/
import DialogAgency from "@/modules/02_organizationalNew/components/DialogFormAgency.vue"; 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 DialogSortAgency from "@/modules/02_organizationalNew/components/DialogSortAgency.vue";
import DialogHistory from "@/modules/02_organizationalNew/components/DialogHistory.vue"; import DialogHistory from "@/modules/02_organizationalNew/components/DialogHistory.vue";

View file

@ -17,7 +17,7 @@ import type { DataPosition } from "@/modules/02_organizationalNew/interface/inde
/** importComponents*/ /** importComponents*/
import DialogFormPosotion from "@/modules/02_organizationalNew/components/DialogFormPosition.vue"; 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 DialogSort from "@/modules/02_organizationalNew/components/DialogSortPosition.vue";
import DialogMovePos from "@/modules/02_organizationalNew/components/DialogMovePos.vue"; import DialogMovePos from "@/modules/02_organizationalNew/components/DialogMovePos.vue";
import DialogHistoryPos from "@/modules/02_organizationalNew/components/DialogHistoryPos.vue"; import DialogHistoryPos from "@/modules/02_organizationalNew/components/DialogHistoryPos.vue";

View file

@ -14,8 +14,8 @@ import type {
import type { FilterMaster } from "@/modules/02_organizationalNew/interface/request/organizational"; import type { FilterMaster } from "@/modules/02_organizationalNew/interface/request/organizational";
/** importComponents*/ /** importComponents*/
import TreeView from "@/modules/02_organizationalNew/components/mainTree.vue"; import TreeMain from "@/modules/02_organizationalNew/components/TreeMain.vue";
import TableView from "@/modules/02_organizationalNew/components/tableTree.vue"; import TreeTable from "@/modules/02_organizationalNew/components/TreeTable.vue";
/** importStore*/ /** importStore*/
import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational"; import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
@ -212,7 +212,7 @@ watch(
<q-card bordered class="col-12 row caedNone"> <q-card bordered class="col-12 row caedNone">
<div class="col-xs-12 col-sm-3 row"> <div class="col-xs-12 col-sm-3 row">
<div class="col-12 row no-wrap bg-grey-1"> <div class="col-12 row no-wrap bg-grey-1">
<TreeView <TreeMain
v-model:nodeTree="nodeTree" v-model:nodeTree="nodeTree"
v-model:nodeId="nodeId" v-model:nodeId="nodeId"
:fetchDataTree="fetchDataTree" :fetchDataTree="fetchDataTree"
@ -283,7 +283,7 @@ watch(
</div> </div>
</q-card> </q-card>
<TableView <TreeTable
v-if="nodeId !== ''" v-if="nodeId !== ''"
v-model:nodeTree="nodeTree" v-model:nodeTree="nodeTree"
v-model:orgLevel="orgLevel" v-model:orgLevel="orgLevel"

View file

@ -9,8 +9,8 @@ import type { DataOption } from "@/modules/02_organizationalNew/interface/index/
import type { OrgRevision } from "@/modules/02_organizationalNew/interface/response/organizational"; import type { OrgRevision } from "@/modules/02_organizationalNew/interface/response/organizational";
/** importComponents*/ /** importComponents*/
import ListView from "@/modules/02_organizationalNew/components/listView.vue"; import TreeView from "@/modules/02_organizationalNew/components/TreeView.vue";
import StructureView from "@/modules/02_organizationalNew/components/structureView.vue"; import StructureView from "@/modules/02_organizationalNew/components/StructureView.vue";
import DialogFormNewStructure from "@/modules/02_organizationalNew/components/DialogNewStructure.vue"; import DialogFormNewStructure from "@/modules/02_organizationalNew/components/DialogNewStructure.vue";
import DialogDateTime from "@/modules/02_organizationalNew/components/DialogFormDateTime.vue"; import DialogDateTime from "@/modules/02_organizationalNew/components/DialogFormDateTime.vue";
@ -311,15 +311,9 @@ onMounted(async () => {
</q-card-section> </q-card-section>
<q-separator /> <q-separator />
<q-card-section style="padding: 0px"> <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-panels v-model="store.statusView" animated>
<q-tab-panel name="list" style="padding: 0px"> <q-tab-panel name="list" style="padding: 0px">
<ListView <TreeView
v-if="store.statusView === 'list'" v-if="store.statusView === 'list'"
v-model:historyId="historyId" v-model:historyId="historyId"
v-model:count="count" v-model:count="count"