From abfa776631b6964020f827dcda2fafd9b7cad0e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Wed, 10 Aug 2022 14:59:37 +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 --- .../xm/core/xmIteration/XmIterationMng.vue | 56 +++++---- src/views/xm/core/xmMenu/XmMenuMng.vue | 28 ++--- .../xm/core/xmQuestion/XmQuestionMng.vue | 114 ++++-------------- src/views/xm/core/xmTask/XmPhase.vue | 20 +-- src/views/xm/core/xmTask/XmTaskMng.vue | 22 ++-- 5 files changed, 78 insertions(+), 162 deletions(-) diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue index 518e6231..ca8edfbc 100644 --- a/src/views/xm/core/xmIteration/XmIterationMng.vue +++ b/src/views/xm/core/xmIteration/XmIterationMng.vue @@ -42,25 +42,38 @@ v-on:click="searchXmIterations" icon="el-icon-search" > - - 查询条件 - - + + + + 关闭 + + + + + 迭代名称: + + - - + 上线时间: - - - 迭代名称: - - + + 查询 - - - + + 关闭 - + 导出 汇总进度 - - - - 标签条件: - 标签 - {{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个 - - + 责任人: @@ -78,6 +71,12 @@ + + + 标签条件: + 标签 + {{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个 + @@ -161,8 +160,7 @@ 查询 - - + @@ -816,14 +814,10 @@ this.getXmMenus() }, onIterationSelected:function(iteration){ - this.filters.iteration=iteration - this.xmMenus=[] - this.getXmMenus() + this.filters.iteration=iteration }, onIterationClearSelect:function(){ - this.filters.iteration=null - this.xmMenus=[] - this.getXmMenus() + this.filters.iteration=null }, //删除xmMenu handleDel: function (row,index) { diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue index 97fbd30f..2f296be3 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue @@ -32,40 +32,18 @@ trigger="manual" > 关闭 + 导出 - - - 变更历史: - 曾经由执行人 - {{filters.hisHandler.username}} - 我 - 变更状态为 - - {{b.name}} - - 的缺陷 - - - - - - 需求: - 需求 - {{filters.menus[0].menuName.substr(0,5)}}等({{filters.menus.length}})个 - + 创建者: - 选择创建人 - {{filters.createUser.username}} - 我的 + 指派给: - 选择被指派人 - {{filters.handlerUsername}} - 我的 + 需求: @@ -76,18 +54,18 @@ 缺陷编号: - + 优先级: - + {{b.name}} 解决方案: - + {{b.name}} @@ -124,8 +102,7 @@ 查询 - - + @@ -239,7 +216,7 @@ - + @@ -260,6 +237,7 @@ import xmMenuSelect from '../xmMenu/XmMenuSelect'; import XmGroupDialog from '../xmGroup/XmGroupDialog'; import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect'; + import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index"; import XmProductSelect from '@/views/xm/core/components/XmProductSelect';//修改界面 import TagDialog from '@/views/mdp/arc/tag/TagDialog.vue'; @@ -297,14 +275,13 @@ bugStatus:'', priority:'', solution:'', - bugSeverity:'', - handlerUserid:'', - handlerUsername:'', + bugSeverity:'', + handlerUser:{}, selProject:null, menus:[], product:null, - createUser:null, - hisHandler:null, + createUser:{}, + hisHandler:{}, hisHandleStatus:null, tags:[], id:'', @@ -458,8 +435,8 @@ if( this.filters.bugSeverity!=null && this.filters.bugSeverity!=""){ params.bugSeverity=this.filters.bugSeverity } - if( this.filters.handlerUserid!=null && this.filters.handlerUserid!=""){ - params.handlerUserid=this.filters.handlerUserid + if( this.filters.handlerUser!=null && this.filters.handlerUser.userid){ + params.handlerUserid=this.filters.handlerUser.userid } if(this.filters.menus && this.filters.menus.length==1){ params.menuId=this.filters.menus[0].menuId @@ -473,7 +450,7 @@ if(this.filters.createUser){ params.createUserid=this.filters.createUser.userid; } - if(this.filters.hisHandler){ + if(this.filters.hisHandler && this.filters.hisHandler.userid){ if(this.filters.hisHandleStatus){ params.hisHandlerUserid=this.filters.hisHandler.userid; }else{ @@ -486,7 +463,7 @@ params.id=this.filters.id } if(this.filters.hisHandleStatus){ - if(this.filters.hisHandler){ + if(this.filters.hisHandler&& this.filters.hisHandler.userid){ params.hisHandleStatus=this.filters.hisHandleStatus }else{ this.$notify({position:'bottom-left',showClose:true,message: "请选择曾经的执行人", type: 'error' }); @@ -572,8 +549,7 @@ }, clearFiltersMenu(menu){ var index=this.filters.menus.findIndex(i=>i.menuId==menu.menuId) - this.filters.menus.splice(index,1); - this.searchXmQuestions(); + this.filters.menus.splice(index,1); }, clearFiltersTag(tag){ var index=this.filters.tags.findIndex(i=>i.tagId==tag.tagId) @@ -860,19 +836,8 @@ }else if(option.action=='editHandlerUserid'){ this.editXmQuestionSomeFields(option.data,"handlerUserid",groupUsers) return; - }else{ - if(groupUsers==null || groupUsers.length==0){ - this.filters.handlerUserid='' - this.filters.handlerUsername=''; - }else{ - var user=groupUsers[0] - this.filters.handlerUserid=user.userid - this.filters.handlerUsername=user.username - } - } - - this.selectUserVisible=false - this.searchXmQuestions(); + } + this.selectUserVisible=false }, onProjectConfirm:function(project){ @@ -959,43 +924,12 @@ this.filters.selProject=null this.nextAction="" this.searchXmQuestions() - }, - clearCreateUser(){ - this.filters.createUser=null; - this.searchXmQuestions(); - this.nextAction="" - }, - clearHandler(){ - - this.filters.handlerUserid='' - this.filters.handlerUsername=''; - this.searchXmQuestions(); - this.nextAction="" - }, - clearHisHandler(){ - - this.filters.hisHandler=null - this.searchXmQuestions(); - this.nextAction="" - }, + }, handleCommand(command) { if(command.type=='sendToProcessApprova'){ this.sendToProcessApprova(command.data,command.bizKey); } - }, - setFiltersHandlerAsMySelf(){ - this.filters.handlerUserid=this.userInfo.userid; - this.filters.handlerUsername=this.userInfo.username; - this.searchXmQuestions(); - }, - setFiltersCreateUserAsMySelf(){ - this.filters.createUser=this.userInfo - this.searchXmQuestions(); - }, - setFiltersHisHandlerAsMySelf(){ - this.filters.hisHandler=this.userInfo - this.searchXmQuestions(); - }, + }, getBadge(row){ var msg=""; if(row.bugStatus=='closed'){ @@ -1115,7 +1049,7 @@ components: { 'xm-question-add':XmQuestionAdd, 'xm-question-edit':XmQuestionEdit, - XmGroupDialog,XmProjectSelect,xmMenuSelect,XmProductSelect, TagDialog + XmGroupDialog,XmProjectSelect,xmMenuSelect,XmProductSelect, TagDialog,MdpSelectUserXm, //在下面添加其它组件 }, mounted() { diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue index 38b7c284..792d6b14 100644 --- a/src/views/xm/core/xmTask/XmPhase.vue +++ b/src/views/xm/core/xmTask/XmPhase.vue @@ -57,27 +57,11 @@ icon="el-icon-plus" title="新建计划" > - - - - + diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index 97ed18ad..4e544634 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -85,8 +85,7 @@ >关闭 - - + 显示方式: @@ -95,7 +94,15 @@ 表格 - + + + 责任人: + + + + 执行人: + + 产品: @@ -115,14 +122,6 @@ >选需求 - - 责任人: - - - - 执行人: - - 技能: 查询 - 更多