diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue index 4b5db248..f9891a15 100644 --- a/src/views/xm/core/xmMenu/XmMenuEdit.vue +++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue @@ -37,12 +37,13 @@ - - {{parentMenu.seqNo}}     {{parentMenu.menuName}} - - + 无归属需求池 + + + {{editForm.pmenuName?editForm.pmenuName:editForm.pmenuId}} + diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue index dadd0b39..4aa77344 100644 --- a/src/views/xm/core/xmMenu/XmMenuMng.vue +++ b/src/views/xm/core/xmMenu/XmMenuMng.vue @@ -2,7 +2,6 @@
- @@ -61,6 +60,8 @@ 需求 + + 批量修改 更换上级 删除 @@ -164,7 +165,7 @@ {{scope.row.ctime}} - + @@ -195,7 +196,7 @@ - + @@ -248,9 +249,10 @@ - - + + + @@ -313,7 +315,7 @@ xmMenusTreeData() { let xmMenus = JSON.parse(JSON.stringify(this.xmMenus || [])); - let xmMenusTreeData = treeTool.translateDataToTree(xmMenus,"pmenuId","id"); + let xmMenusTreeData = treeTool.translateDataToTree(xmMenus,"pmenuId","menuId"); return xmMenusTreeData; }, isPmUser(){ diff --git a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue index d3ba253c..7670ae57 100644 --- a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue +++ b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue @@ -1,117 +1,16 @@