|
|
@ -88,6 +88,12 @@ |
|
|
<el-option value="join-curr-project" :label="'已分配任务到项目【'+selProject.name+'】'" v-if="selProject && selProject.id"></el-option> |
|
|
<el-option value="join-curr-project" :label="'已分配任务到项目【'+selProject.name+'】'" v-if="selProject && selProject.id"></el-option> |
|
|
</el-select> |
|
|
</el-select> |
|
|
</el-row> |
|
|
</el-row> |
|
|
|
|
|
<el-row> |
|
|
|
|
|
<font class="more-label-font"> |
|
|
|
|
|
归属模块: |
|
|
|
|
|
</font> |
|
|
|
|
|
<span v-if="filters.func">{{ filters.func.name }} </span><el-button v-if="filters.func" @click="filters.func=null">清除</el-button><el-button @click="funcVisible=true">选择模块</el-button> |
|
|
|
|
|
</el-row> |
|
|
<el-row> |
|
|
<el-row> |
|
|
<font class="more-label-font"> |
|
|
<font class="more-label-font"> |
|
|
需求类型: |
|
|
需求类型: |
|
|
@ -385,7 +391,7 @@ |
|
|
|
|
|
|
|
|
<tag-dialog ref="tagDialog" :tagIds="filters.tags?filters.tags.map(i=>i.tagId):[]" :jump="true" @select-confirm="onTagSelected"> |
|
|
<tag-dialog ref="tagDialog" :tagIds="filters.tags?filters.tags.map(i=>i.tagId):[]" :jump="true" @select-confirm="onTagSelected"> |
|
|
</tag-dialog> |
|
|
</tag-dialog> |
|
|
<xm-group-dialog ref="xmGroupDialog" :isSelectSingleUser="true" :sel-project="selProject" :xm-product="filters.xmProduct" @user-confirm="onGroupUserSelect"> |
|
|
|
|
|
|
|
|
<xm-group-dialog ref="xmGroupDialog" :isSelectSingleUser="true" :sel-project="selProject" :xm-product="xmProductCpd" @user-confirm="onGroupUserSelect"> |
|
|
</xm-group-dialog> |
|
|
</xm-group-dialog> |
|
|
<el-drawer |
|
|
<el-drawer |
|
|
append-to-body |
|
|
append-to-body |
|
|
@ -399,6 +405,10 @@ |
|
|
:xm-product="filters.product" |
|
|
:xm-product="filters.product" |
|
|
></xm-epic-features-select> |
|
|
></xm-epic-features-select> |
|
|
</el-drawer> |
|
|
</el-drawer> |
|
|
|
|
|
|
|
|
|
|
|
<el-dialog append-to-body title="模块选择" :visible.sync="funcVisible" size="40%" top="20px" :close-on-click-modal="false"> |
|
|
|
|
|
<xm-func-select :show-select="true" class="padding-left padding-right" v-if="funcVisible" @select="onFuncSelected" :xm-product="xmProductCpd"></xm-func-select> |
|
|
|
|
|
</el-dialog> |
|
|
</section> |
|
|
</section> |
|
|
</template> |
|
|
</template> |
|
|
|
|
|
|
|
|
@ -426,6 +436,7 @@ |
|
|
import XmTableConfig from '@/views/xm/core/components/XmTableConfig';//修改界面 |
|
|
import XmTableConfig from '@/views/xm/core/components/XmTableConfig';//修改界面 |
|
|
import XmGroupDialog from '@/views/xm/core/xmGroup/XmGroupDialog';//修改界面 |
|
|
import XmGroupDialog from '@/views/xm/core/xmGroup/XmGroupDialog';//修改界面 |
|
|
import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; |
|
|
import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; |
|
|
|
|
|
import XmFuncSelect from '../xmFunc/XmFuncSelect' |
|
|
|
|
|
|
|
|
import XmEpicFeaturesSelect from "../xmMenu/XmEpicFeaturesSelect"; |
|
|
import XmEpicFeaturesSelect from "../xmMenu/XmEpicFeaturesSelect"; |
|
|
import XmMenuAgileKanbanUser from "../xmMenu/XmMenuAgileKanbanUser"; |
|
|
import XmMenuAgileKanbanUser from "../xmMenu/XmMenuAgileKanbanUser"; |
|
|
@ -471,6 +482,17 @@ |
|
|
key.pmenuId='' |
|
|
key.pmenuId='' |
|
|
} |
|
|
} |
|
|
return key.iterationId+key.projectId+key.productId+key.pmenuId |
|
|
return key.iterationId+key.projectId+key.productId+key.pmenuId |
|
|
|
|
|
}, |
|
|
|
|
|
xmProductCpd(){ |
|
|
|
|
|
if(this.filters.product && this.filters.product.id){ |
|
|
|
|
|
return this.filters.product |
|
|
|
|
|
} |
|
|
|
|
|
if(this.xmIteration && this.xmIteration.id){ |
|
|
|
|
|
return {id:this.xmIteration.productId,productName:this.xmIteration.productName} |
|
|
|
|
|
} |
|
|
|
|
|
if(this.parentMenu && this.parentMenu.menuId){ |
|
|
|
|
|
return {id:this.parentMenu.productId,productName:this.parentMenu.productName} |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
watch:{ |
|
|
watch:{ |
|
|
@ -494,6 +516,7 @@ |
|
|
filters: { |
|
|
filters: { |
|
|
key: '', |
|
|
key: '', |
|
|
product:null, |
|
|
product:null, |
|
|
|
|
|
func:null, |
|
|
mmUser:{}, |
|
|
mmUser:{}, |
|
|
iterationFilterType:'',//join、not-join、'' |
|
|
iterationFilterType:'',//join、not-join、'' |
|
|
taskFilterType:'',//join、not-join、'' |
|
|
taskFilterType:'',//join、not-join、'' |
|
|
@ -563,7 +586,8 @@ |
|
|
/**begin 自定义属性请在下面加 请加备注**/ |
|
|
/**begin 自定义属性请在下面加 请加备注**/ |
|
|
expandRowKeysCpd:[], |
|
|
expandRowKeysCpd:[], |
|
|
moreVisible:false, |
|
|
moreVisible:false, |
|
|
displayType:'table' |
|
|
|
|
|
|
|
|
displayType:'table', |
|
|
|
|
|
funcVisible:false, |
|
|
/**end 自定义属性请在上面加 请加备注**/ |
|
|
/**end 自定义属性请在上面加 请加备注**/ |
|
|
} |
|
|
} |
|
|
},//end data |
|
|
},//end data |
|
|
@ -663,6 +687,9 @@ |
|
|
if(this.filters.product){ |
|
|
if(this.filters.product){ |
|
|
params.productId=this.filters.product.id |
|
|
params.productId=this.filters.product.id |
|
|
} |
|
|
} |
|
|
|
|
|
if(this.filters.func){ |
|
|
|
|
|
params.funcId=this.filters.func.id |
|
|
|
|
|
} |
|
|
if(this.filters.status){ |
|
|
if(this.filters.status){ |
|
|
params.status=this.filters.status |
|
|
params.status=this.filters.status |
|
|
} |
|
|
} |
|
|
@ -1327,7 +1354,12 @@ |
|
|
Object.assign(this.editForm,params) |
|
|
Object.assign(this.editForm,params) |
|
|
}, |
|
|
}, |
|
|
onAddSubMenu(row){ |
|
|
onAddSubMenu(row){ |
|
|
} |
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
onFuncSelected(row){ |
|
|
|
|
|
this.filters.func=row |
|
|
|
|
|
this.funcVisible=false; |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
},//end methods |
|
|
},//end methods |
|
|
components: { |
|
|
components: { |
|
|
@ -1348,6 +1380,7 @@ |
|
|
XmIterationSelect, |
|
|
XmIterationSelect, |
|
|
MdpSelectUserXm, |
|
|
MdpSelectUserXm, |
|
|
XmMenuAgileKanbanUser, |
|
|
XmMenuAgileKanbanUser, |
|
|
|
|
|
XmFuncSelect, |
|
|
//在下面添加其它组件 |
|
|
//在下面添加其它组件 |
|
|
}, |
|
|
}, |
|
|
mounted() { |
|
|
mounted() { |
|
|
|