From 7282270a1c5b95f71b59c078dff179568d301a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Thu, 9 Jun 2022 11:30:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xm/core/xmMenu/XmEpicFeatures.vue | 16 +++++++++------- src/views/xm/core/xmMenu/XmMenuAdd.vue | 5 +++-- src/views/xm/core/xmMenu/XmMenuMng.vue | 4 ++-- src/views/xm/core/xmMenu/XmMenuSelect.vue | 2 +- src/views/xm/core/xmPhase/XmPhaseForProduct.vue | 2 +- src/views/xm/core/xmPhase/XmPhaseMng.vue | 2 +- src/views/xm/core/xmTask/XmPhase.vue | 2 +- src/views/xm/core/xmTask/XmTaskMng.vue | 8 ++++---- 8 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue index 680fb34d..5e4516d4 100644 --- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue +++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue @@ -103,12 +103,12 @@ - + - + @@ -453,7 +453,8 @@ }, //显示新增界面 XmMenu xm_project_menu showAdd: function (dclass) { - this.addForm={...this.addFormInit} + debugger; + Object.assign(this.addForm,this.addFormInit) if(this.filters.product && this.filters.product.id){ this.parentMenu=null; this.addForm.productId=this.filters.product.id @@ -494,6 +495,7 @@ this.addForm.iterationName=this.filters.iteration.iterationName this.addFormVisible = true; } + this.addForm.dclass=(parseInt(row.dclass)+1)+""; this.addFormVisible=true }, showProdcutAdd:function(){ @@ -507,7 +509,7 @@ if(this.parentMenu){ this.parentMenu.childrenCnt=this.parentMenu.childrenCnt?this.parentMenu.childrenCnt+1:1; } - treeTool.reloadAllChildren(this.$refs.table,this.maps,[row,{...this.parentMenu}],'pmenuId',this.loadXmMenusLazy) + //treeTool.reloadAllChildren(this.$refs.table,this.maps,[row,{...this.parentMenu}],'pmenuId',this.loadXmMenusLazy) this.parentMenu=null; @@ -580,7 +582,7 @@ if( tips.isOk ){ this.pageInfo.count=true; this.getXmMenus(); - treeTool.reloadAllChildren(this.$refs.table,this.maps,this.sels,'pmenuId',this.loadXmMenusLazy) + //treeTool.reloadAllChildren(this.$refs.table,this.maps,this.sels,'pmenuId',this.loadXmMenusLazy) } this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); @@ -699,7 +701,7 @@ if(tips.isOk){ this.getXmMenus() if(this.parentMenu && this.parentMenu.menuId){ - treeTool.reloadAllChildren(this.$refs.table,this.maps,this.parentMenu.menuId,'pmenuId',this.loadXmMenusLazy) + //treeTool.reloadAllChildren(this.$refs.table,this.maps,this.parentMenu.menuId,'pmenuId',this.loadXmMenusLazy) } }else{ this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); @@ -846,7 +848,7 @@ if(tips.isOk){ this.searchXmMenus(); var rows=[...this.sels,{menuId:'',pmenuId:menu.menuId}] - treeTool.reloadAllChildren(this.$refs.table,this.maps,rows,'pmenuId',this.loadXmMenusLazy) + //treeTool.reloadAllChildren(this.$refs.table,this.maps,rows,'pmenuId',this.loadXmMenusLazy) } this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'}) }) diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue index b870cc80..419e3571 100644 --- a/src/views/xm/core/xmMenu/XmMenuAdd.vue +++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue @@ -125,6 +125,7 @@ ]), calcMenuLabel(){ + debugger; var params={label:'用户故事',icon:'el-icon-document',color:' rgb(79, 140, 255)'}; if(this.addForm.dclass==='1'){ params={label:'史诗',icon:'el-icon-s-promotion',color:'rgb(255, 153, 51)'}; @@ -165,7 +166,7 @@ //新增界面数据 项目需求表 addForm: { menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'0',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:'',seqNo:'1',mmUserid:'',mmUsername:'',ntype:'0',childrenCnt:0,sinceVersion:'', - proposerId:'',proposerName:'',dlvl:'0',dtype:'0',priority:'0',source:'1' + proposerId:'',proposerName:'',dlvl:'0',dtype:'0',priority:'0',source:'1',dclass:'3', }, proposerSelectVisible:false, mmUserSelectVisible:false, @@ -262,7 +263,7 @@ this.addForm.mmUserid=this.userInfo.userid this.addForm.mmUsername=this.userInfo.username this.addForm.remark="作为 ，我需要 ，以便我能够 。" - if(this.parentMenu){ + if(this.parentMenu && this.parentMenu.menuId){ if(this.parentMenu.childrenCnt){ this.addForm.seqNo=this.parentMenu.seqNo+"."+(this.parentMenu.childrenCnt+1) }else{ diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue index 6bc4f360..080a5c09 100644 --- a/src/views/xm/core/xmMenu/XmMenuMng.vue +++ b/src/views/xm/core/xmMenu/XmMenuMng.vue @@ -339,12 +339,12 @@ - + - + diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue index f503b9c6..48a908a0 100644 --- a/src/views/xm/core/xmMenu/XmMenuSelect.vue +++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue @@ -419,7 +419,7 @@ import XmEpicFeatures from './XmEpicFeaturesSelect.vue'; }, reloadChildren(rows){ - treeTool.reloadAllChildren(this.$refs.table,this.maps,rows,'pmenuId',this.loadMenusLazy) + //treeTool.reloadAllChildren(this.$refs.table,this.maps,rows,'pmenuId',this.loadMenusLazy) }, //获取列表 XmMenu xm_project_menu getXmMenus() { diff --git a/src/views/xm/core/xmPhase/XmPhaseForProduct.vue b/src/views/xm/core/xmPhase/XmPhaseForProduct.vue index 2fdda48d..57dc2dc4 100644 --- a/src/views/xm/core/xmPhase/XmPhaseForProduct.vue +++ b/src/views/xm/core/xmPhase/XmPhaseForProduct.vue @@ -603,7 +603,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; if( tips.isOk ){ this.pageInfo.count=true; this.searchXmPhases() - treeTool.reloadAllChildren(this.$refs.table,this.maps,phases,'parentPhaseId',this.loadXmPhaseLazy) + //treeTool.reloadAllChildren(this.$refs.table,this.maps,phases,'parentPhaseId',this.loadXmPhaseLazy) } this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); diff --git a/src/views/xm/core/xmPhase/XmPhaseMng.vue b/src/views/xm/core/xmPhase/XmPhaseMng.vue index 47b69840..ccf4abdb 100644 --- a/src/views/xm/core/xmPhase/XmPhaseMng.vue +++ b/src/views/xm/core/xmPhase/XmPhaseMng.vue @@ -638,7 +638,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; if( tips.isOk ){ this.pageInfo.count=true; this.searchXmPhases() - treeTool.reloadAllChildren(this.$refs.table,this.maps,phases,'parentPhaseId',this.loadXmPhaseLazy) + //treeTool.reloadAllChildren(this.$refs.table,this.maps,phases,'parentPhaseId',this.loadXmPhaseLazy) } this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue index 392ab3fe..417a4a72 100644 --- a/src/views/xm/core/xmTask/XmPhase.vue +++ b/src/views/xm/core/xmTask/XmPhase.vue @@ -1143,7 +1143,7 @@ export default { this.searchXmTasks(); var rows=[...this.sels,{id:'xxxxx',parentTaskid:task.id}] - treeTool.reloadAllChildren(this.$refs.table,this.maps,rows,'parentTaskid',this.loadXmTaskLazy) + //treeTool.reloadAllChildren(this.$refs.table,this.maps,rows,'parentTaskid',this.loadXmTaskLazy) } this.$notify({ showClose: true, diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index c0e432db..a97463e0 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -1322,7 +1322,7 @@ export default { var tips=res.data.tips; if(tips.isOk){ this.getXmTasks(); - treeTool.reloadAllChildren(this.$refs.table,this.maps,this.sels,'parentTaskid',this.loadXmTaskLazy) + //treeTool.reloadAllChildren(this.$refs.table,this.maps,this.sels,'parentTaskid',this.loadXmTaskLazy) } this.$notify({ showClose: true, @@ -1574,7 +1574,7 @@ export default { if (tips.isOk) { this.pageInfo.count = true; this.searchXmTasks() - treeTool.reloadAllChildren(this.$refs.table,this.maps,this.sels,'parentTaskid',this.loadXmTaskLazy) + //treeTool.reloadAllChildren(this.$refs.table,this.maps,this.sels,'parentTaskid',this.loadXmTaskLazy) } this.$notify({ showClose: true, @@ -2386,7 +2386,7 @@ export default { this.searchXmTasks(); var rows=[...this.sels,{id:'xxxxx',parentTaskid:task.id}] - treeTool.reloadAllChildren(this.$refs.table,this.maps,rows,'parentTaskid',this.loadXmTaskLazy) + //treeTool.reloadAllChildren(this.$refs.table,this.maps,rows,'parentTaskid',this.loadXmTaskLazy) } this.$notify({ showClose: true, @@ -2470,7 +2470,7 @@ export default { onTaskWorkloadSubmit(){ this.taskWorkloadVisible=false; this.searchXmTasks(); - treeTool.reloadAllChildren(this.$refs.table,this.maps,[this.editForm],'parentTaskid',this.loadXmTaskLazy) + //treeTool.reloadAllChildren(this.$refs.table,this.maps,[this.editForm],'parentTaskid',this.loadXmTaskLazy) }, showWorkload(row){ this.editForm=row