diff --git a/src/api/02_organizational/api.organization.ts b/src/api/02_organizational/api.organization.ts index 25824895e..db44353f9 100644 --- a/src/api/02_organizational/api.organization.ts +++ b/src/api/02_organizational/api.organization.ts @@ -22,5 +22,7 @@ export default { orgPosType: `${orgPos}/type`, orgPosLevel: `${orgPos}/level`, orgPosMaster: `${orgPos}/master`, + orgPosMasterList: `${orgPos}/master/list`, + orgPosSort: `${orgPos}/sort`, organizationShortName: `${organization}/sort`, }; diff --git a/src/modules/02_organizationalNew/components/DialogSortPosition.vue b/src/modules/02_organizationalNew/components/DialogSortPosition.vue new file mode 100644 index 000000000..210ad2c89 --- /dev/null +++ b/src/modules/02_organizationalNew/components/DialogSortPosition.vue @@ -0,0 +1,144 @@ + + diff --git a/src/modules/02_organizationalNew/components/mainTree.vue b/src/modules/02_organizationalNew/components/mainTree.vue index 52a465362..b85ffa7cc 100644 --- a/src/modules/02_organizationalNew/components/mainTree.vue +++ b/src/modules/02_organizationalNew/components/mainTree.vue @@ -100,6 +100,8 @@ const type = ref(0); const orgId = ref(""); const updateSelected = (id: string, level: number) => { + store.treeId = id; + store.level = level; if (id === nodeId.value) { nodeId.value = ""; } else { diff --git a/src/modules/02_organizationalNew/components/tableTree.vue b/src/modules/02_organizationalNew/components/tableTree.vue index abd7f7097..d50bcdf1a 100644 --- a/src/modules/02_organizationalNew/components/tableTree.vue +++ b/src/modules/02_organizationalNew/components/tableTree.vue @@ -8,10 +8,12 @@ import type { ListMenu } from "@/modules/02_organizationalNew/interface/index/Ma /** importComponents*/ import DialogFormPosotion from "@/modules/02_organizationalNew/components/DialogFormPosition.vue"; import DialogPositionDetail from "@/modules/02_organizationalNew/components/PositionDetail.vue"; - +import DialogSort from "@/modules/02_organizationalNew/components/DialogSortPosition.vue"; /** importStore*/ import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational"; +const dataSort = ref>([]); +const modalSort = ref(false); const showAllData = ref(false); const orgLevel = defineModel("orgLevel", {}); const treeId = defineModel("treeId", {}); @@ -129,6 +131,10 @@ const dialogDetail = ref(false); function onClickViewDetail() { dialogDetail.value = !dialogDetail.value; } + +function onClickSort() { + modalSort.value = true; +} diff --git a/src/modules/02_organizationalNew/store/organizational.ts b/src/modules/02_organizationalNew/store/organizational.ts index 57f4b7eb2..febebebc6 100644 --- a/src/modules/02_organizationalNew/store/organizational.ts +++ b/src/modules/02_organizationalNew/store/organizational.ts @@ -11,6 +11,8 @@ export const useOrganizational = defineStore("organizationalStore", () => { const dataActive = ref(); const activeId = ref(); const draftId = ref(); + const treeId = ref(); + const level = ref(); function fetchDataActive(data: DataActive) { activeId.value = data.activeId; draftId.value = data.draftId; @@ -57,5 +59,7 @@ export const useOrganizational = defineStore("organizationalStore", () => { convertType, draftId, activeId, + treeId, + level }; });