diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue index f053a0f9..09d035cd 100644 --- a/src/views/xm/core/xmIteration/XmIterationMng.vue +++ b/src/views/xm/core/xmIteration/XmIterationMng.vue @@ -1,10 +1,18 @@ @@ -168,6 +180,7 @@ import XmIterationMng from '../xmIteration/XmIterationSelect';//修改界面 import XmProductStateMng from '../xmProductState/XmProductStateMng';//修改界面 + import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; export default { props:['selProject'], @@ -184,7 +197,8 @@ filters: { key: '', queryScope:'compete',//compete/branchId/''/productId - id:'',//产品编号 + id:'',//产品编号 + pmUser:null,//产品经理 }, xmProducts: [],//查询结果 pageInfo:{//分页数据 @@ -212,6 +226,7 @@ }, iterationVisible:false, productStateVisible:false, + selectFiltersPmUserVisible:false, tableHeight:300, dateRanger: [ util.formatDate.format(beginDate, "yyyy-MM-dd"), @@ -311,6 +326,9 @@ if(this.selProject){ params.projectId=this.selProject.id } + if(this.filters.pmUser){ + params.pmUserid=this.filters.pmUser.userid + } this.load.list = true; listXmProductWithState(params).then((res) => { var tips=res.data.tips; @@ -419,8 +437,26 @@ }, /**begin 自定义函数请在下面加**/ - - + clearFiltersPmUser:function(){ + this.filters.pmUser=null; + this.searchXmProducts(); + }, + selectFiltersPmUser(){ + this.selectFiltersPmUserVisible=true; + }, + onFiltersPmUserSelected(users){ + if(users && users.length>0){ + this.filters.pmUser=users[0] + }else{ + this.filters.pmUser=null; + } + this.selectFiltersPmUserVisible=false; + this.searchXmProducts(); + }, + setFiltersPmUserAsMySelf(){ + this.filters.pmUser=this.userInfo; + this.searchXmProducts(); + }, /**end 自定义函数请在上面加**/ },//end methods @@ -429,6 +465,7 @@ 'xm-product-edit':XmProductEdit, XmIterationMng, XmProductStateMng, + UsersSelect, //在下面添加其它组件 }, mounted() { @@ -449,6 +486,6 @@ .more-label-font{ text-align:center; float:left; - padding-top:10px; + padding-top:5px; } \ No newline at end of file diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue index 1014d095..4feb94fc 100644 --- a/src/views/xm/core/xmProduct/XmProductSelect.vue +++ b/src/views/xm/core/xmProduct/XmProductSelect.vue @@ -52,6 +52,14 @@ + + + 产品经理: + + {{filters.pmUser.username}} + 选责任人 + 我的 + 查询 @@ -71,6 +79,10 @@ + + + + @@ -80,6 +92,7 @@ //import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 import { listXmProductWithState } from '@/api/xm/core/xmProduct'; import { mapGetters } from 'vuex' + import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; export default { @@ -98,6 +111,7 @@ key: '', queryScope:'compete', id:'',//产品编号 + pmUser:null,//产品经理 }, xmProducts: [],//查询结果 pageInfo:{//分页数据 @@ -125,6 +139,7 @@ }, iterationVisible:false, productStateVisible:false, + selectFiltersPmUserVisible:false, tableHeight:300, dateRanger: [ util.formatDate.format(beginDate, "yyyy-MM-dd"), @@ -234,10 +249,32 @@ selectedProduct:function(row){ this.$emit('selected',row); }, - + + /**begin 自定义函数请在下面加**/ + clearFiltersPmUser:function(){ + this.filters.pmUser=null; + this.searchXmProducts(); + }, + selectFiltersPmUser(){ + this.selectFiltersPmUserVisible=true; + }, + onFiltersPmUserSelected(users){ + if(users && users.length>0){ + this.filters.pmUser=users[0] + }else{ + this.filters.pmUser=null; + } + this.selectFiltersPmUserVisible=false; + this.searchXmProducts(); + }, + setFiltersPmUserAsMySelf(){ + this.filters.pmUser=this.userInfo; + this.searchXmProducts(); + }, },//end methods components: { + UsersSelect, //在下面添加其它组件 }, mounted() { @@ -257,6 +294,6 @@ .more-label-font{ text-align:center; float:left; - padding-top:10px; + padding-top:5px; } \ No newline at end of file diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue index 5c90b617..ef063c47 100644 --- a/src/views/xm/core/xmProject/XmProjectMng.vue +++ b/src/views/xm/core/xmProject/XmProjectMng.vue @@ -843,6 +843,6 @@ .more-label-font{ text-align:center; float:left; - padding-top:10px; + padding-top:5px; } \ No newline at end of file diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue index 47bc70e4..c3d23fca 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue @@ -893,6 +893,6 @@ .more-label-font{ text-align:center; float:left; - padding-top:10px; + padding-top:5px; } \ No newline at end of file diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index 60113d6f..59b741b3 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -1903,7 +1903,7 @@ small{ .more-label-font{ text-align:center; float:left; - padding-top:10px; + padding-top:5px; } \ No newline at end of file diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue index 79388f4a..5e7bc8a6 100644 --- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue +++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue @@ -792,6 +792,6 @@ .more-label-font{ text-align:center; float:left; - padding-top:10px; + padding-top:5px; } \ No newline at end of file