diff --git a/src/common/js/treeTool.js b/src/common/js/treeTool.js index 394d0f1d..f0c54a60 100644 --- a/src/common/js/treeTool.js +++ b/src/common/js/treeTool.js @@ -53,11 +53,21 @@ export default { const { tree, treeNode, resolve } = maps.get(parentId) if (tree) { // 重新执行父节点加载子级操作 var oldDatas=lazyTreeNodeMap[parentId] - lazyTreeNodeMap[parentId]=[] loadChildren(tree, treeNode, resolve,oldDatas,opType) } } + }, + clearOpType: function(table,maps,parentId,parentIdName,loadChildren) { + var lazyTreeNodeMap=table.store.states.lazyTreeNodeMap + if (maps.get(parentId)) { + const { tree, treeNode, resolve } = maps.get(parentId) + if (tree) { // 重新执行父节点加载子级操作 + var oldDatas=lazyTreeNodeMap[parentId] + loadChildren(tree, treeNode, resolve,oldDatas,"clearOpType") + } + } + }, /** * 将类表数据转换为如下树状结构的数据 diff --git a/src/views/xm/core/xmTask/XmTaskGantt.vue b/src/views/xm/core/xmTask/XmTaskGantt.vue index f7f141a6..da476f4a 100644 --- a/src/views/xm/core/xmTask/XmTaskGantt.vue +++ b/src/views/xm/core/xmTask/XmTaskGantt.vue @@ -6,7 +6,7 @@ :usePreColumn="true" :checkSource="true" :useRealTime="true" - :treeProps="{children: 'children', hasChildren: 'hasChildren',pid:'parentTaskid',pre:'preTaskid'}" + :treeProps="{children: 'children', hasChildren: 'childrenCnt',pid:'parentTaskid',pre:'preTaskid'}" row-key="id"> diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue index 2690f8d9..d913c71c 100644 --- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue +++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue @@ -117,11 +117,13 @@ :ref="'task_' + scope.$index" :data-task-id="scope.row.id" > + i.opType=='add'||i.opType=='addSub') + addOrSub.forEach(i=>{ + treeTool.clearOpType(this.$refs.table,this.maps,i.parentTaskid,'parentTaskid',this.loadXmTaskLazy); + }) + this.valueChangeRows = []; + this.xmTasks=[] this.getXmTasks(); } this.$message({ @@ -1610,6 +1618,11 @@ export default { resolve(addSub) return; } + if(opType=='clearOpType'){ + oldDatas.forEach(i=>i.opType="") + resolve(oldDatas) + return; + } var params = { parentTaskid: tree.id }; params = this.getParams(params); params.isTop = "";