From 0c4899929251047126fce63afd076a1eb860fca7 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 00:49:35 +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 --- .../xmIterationMenu/XmIterationMenuMng.vue | 10 +++---- .../xm/core/xmMenu/XmEpicFeaturesSelect.vue | 13 +++++++--- src/views/xm/core/xmMenu/XmMenuMng.vue | 2 +- src/views/xm/core/xmMenu/XmMenuSelect.vue | 14 +++++----- src/views/xm/core/xmProject/XmProjectInfo.vue | 1 + src/views/xm/core/xmTask/XmPhase.vue | 26 +++---------------- 6 files changed, 25 insertions(+), 41 deletions(-) diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue index debceffa..724c87c8 100644 --- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue +++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue @@ -218,9 +218,7 @@ this.load.del=false; var tips=res.data.tips; if(tips.isOk){ - this.pageInfo.count=true; - - this.$refs.menusSelect.reloadChildren([row]); + this.pageInfo.count=true; this.getXmIterationMenus(); } this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); @@ -243,8 +241,7 @@ batchDelXmIterationMenu(params).then((res) => { this.load.del=false; var tips=res.data.tips; - if( tips.isOk ){ - this.$refs.menusSelect.reloadChildren(this.sels); + if( tips.isOk ){ this.pageInfo.count=true; this.getXmIterationMenus(); } @@ -269,8 +266,7 @@ this.menuVisible=false var tips = res.data.tips if(tips.isOk){ - this.getXmIterationMenus() - this.$refs.menusSelect.reloadChildren(menus); + this.getXmIterationMenus() } this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }) diff --git a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue index bde0426c..91cdaf3c 100644 --- a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue +++ b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue @@ -276,6 +276,9 @@ params.productId=this.filters.product.id } params=this.getParams(params); + if(!params.productId){ + return; + } let callback= (res)=>{ var tips=res.data.tips; if(tips.isOk){ @@ -302,13 +305,13 @@ this.filters.product=product this.xmMenus=[] this.getXmMenus() - this.$emit("prodcut-select",product) + this.$emit("product-select",product) }, onProductClearSelect:function(){ this.filters.product=null this.xmMenus=[] this.getXmMenus() - this.$emit("prodcut-select",null) + this.$emit("product-select",null) }, select(row){ this.$emit("select",row) @@ -323,8 +326,12 @@ params={label:'用户故事',icon:'el-icon-document',color:' rgb(79, 140, 255)'}; } return params; - }, + }, + rowClick: function(row, event, column){ + this.editForm=row + this.$emit('row-click',row, event, column);// @row-click="rowClick" + }, },//end methods components: { XmProductSelect, diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue index efe04fba..6bc4f360 100644 --- a/src/views/xm/core/xmMenu/XmMenuMng.vue +++ b/src/views/xm/core/xmMenu/XmMenuMng.vue @@ -854,7 +854,7 @@ this.editForm=row this.editFormBak=Object.assign({},row) this.$emit('row-click',row, event, column);// @row-click="rowClick" - }, + }, handleExport() { this.downloadLoading = true const pageNum = this.pageInfo.pageNum; diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue index 50bef6c3..f503b9c6 100644 --- a/src/views/xm/core/xmMenu/XmMenuSelect.vue +++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue @@ -2,11 +2,11 @@
- + - - - + + + @@ -138,8 +138,8 @@ 确认 - - + + @@ -162,7 +162,7 @@ diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue index 21c667e7..190f8ca5 100644 --- a/src/views/xm/core/xmProject/XmProjectInfo.vue +++ b/src/views/xm/core/xmProject/XmProjectInfo.vue @@ -33,6 +33,7 @@ 计划 + 任务 diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue index fd9fa476..392ab3fe 100644 --- a/src/views/xm/core/xmTask/XmPhase.vue +++ b/src/views/xm/core/xmTask/XmPhase.vue @@ -605,18 +605,11 @@ export default { }else if(this.queryScope==='task'){ params.ntype="0" } - - if(this.ptype==='1' && !this.isTaskCenter){ - if(!params.productId){ - this.$notify.warning("请先选中产品") - return; - } - }else if(this.ptype==='0' && !this.isTaskCenter){ + if(!params.projectId){ this.$notify.warning("请先选中项目") return; } - } //params.ptype=this.ptype getTask(params) @@ -799,27 +792,14 @@ export default { }, rowClick: function (row) { this.editForm = row; - this.editFormBak=Object.assign({},row) + this.editFormBak=Object.assign({},row) this.$emit('row-click',row,);// @row-click="rowClick" - }, - - showDrawer: function (row) { - this.editFormVisible = true; - - this.editForm = row; - this.editFormBak=Object.assign({},row) - // this.$emit('row-click',row,);// @row-click="rowClick" }, selectVisible(row,visible){ if(visible==true){ this.rowClick(row); } - }, - showExecusers(row) { - this.editForm = row; - this.execUserVisible = true; - }, - + }, showSkill(row) { this.editForm = row; this.skillVisible = true;