diff --git a/src/components/customerOrg/customerOrgTree.vue b/src/components/customerOrg/customerOrgTree.vue index f3e4ea5..281eff2 100644 --- a/src/components/customerOrg/customerOrgTree.vue +++ b/src/components/customerOrg/customerOrgTree.vue @@ -29,7 +29,7 @@ import { mapState, mapMutations } from "vuex"; import { getapi, postapi, putapi, deletapi } from "@/api/api"; import { tcdate, deepCopy, reMadeOrgTree } from "../../utlis/proFunc"; -import { getTreePids,getTreeAllChildIdsById } from "../../utlis/tree"; +import { getTreePids, getTreeNode } from "../../utlis/tree"; export default { components: {}, @@ -96,12 +96,12 @@ export default { }, // 判断拖拽节点是否可以放置位置 - allowDrop(draggingNode, dropNode, type) { - if(type == 'inner') return false - if(!(!draggingNode.data.parentId && !dropNode.data.parentId)) return false - if(draggingNode.data.parentId != dropNode.data.parentId) return false - console.log('draggingNode, type', draggingNode, type) - console.log('dropNode, type', dropNode, type) + allowDrop(draggingNode, dropNode, type) { + if (type == 'inner') return false + if (!draggingNode.data.parentId && !dropNode.data.parentId) return true + if (draggingNode.data.parentId != dropNode.data.parentId) return false + // console.log('draggingNode, type', draggingNode, type) + // console.log('dropNode, type', dropNode, type) return true }, @@ -109,27 +109,25 @@ export default { nodeDrop(draggingNode, dropNode, dropType, ev) { //console.log('draggingNode.data.parentId', draggingNode.data.id,draggingNode.data.parentId); - let body = {itemList:[]} - let childrenIds = [] - if(draggingNode.data.parentId){ - childrenIds = getTreeAllChildIdsById(this.customerOrg.customerOrgTree,'treeChildren','id',draggingNode.data.parentId) - childrenIds.forEach((e,i) => { - this.customerOrg.customerOrgTree.forEach((e,i) => { - body.itemList.push({id:e,displayOrder:i}) - }); - }); - }else{ - this.customerOrg.customerOrgTree.forEach((e,i) => { - body.itemList.push({id:e.id,displayOrder:i}) + let body = { itemList: [] } + + if (draggingNode.data.parentId) { + let parentNode = getTreeNode(this.customerOrg.customerOrgTree, 'treeChildren', 'id', draggingNode.data.parentId) + parentNode.treeChildren.forEach((e, i) => { + body.itemList.push({ id: e.id, displayOrder: i }) + }); + } else { + this.customerOrg.customerOrgTree.forEach((e, i) => { + body.itemList.push({ id: e.id, displayOrder: i }) }); } - + // console.log('body',body) - putapi('/api/app/customerorg/updatesortmany',body) + putapi('/api/app/customerorg/updatesortmany', body) + - },