diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue index acbe7bdb..ce5c0f48 100644 --- a/src/views/xm/core/xmMenu/XmMenuMng.vue +++ b/src/views/xm/core/xmMenu/XmMenuMng.vue @@ -14,6 +14,9 @@ + + + @@ -472,6 +475,7 @@ dtype:'', priority:'', source:'', + dclasss:[], }, xmMenus: [],//查询结果 pageInfo:{//分页数据 @@ -497,7 +501,8 @@ {id:"7", name:"运行中"}, {id:"8", name:"已下线"}, {id:"9", name:"已删除"}, - ] + ], + dclass:[], },//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} addFormVisible: false,//新增xmMenu界面是否显示 @@ -636,6 +641,9 @@ if(this.filters.tags && this.filters.tags.length>0){ params.tagIdList=this.filters.tags.map(i=>i.tagId) } + if(this.filters.dclasss){ + params.dclasss=this.filters.dclasss + } return params; }, loadXmMenusLazy(tree, treeNode, resolve) { @@ -1324,8 +1332,8 @@ //在下面添加其它组件 }, mounted() { - initSimpleDicts("all",['menuStatus','demandSource','demandLvl','demandType','priority']).then(res=>{ - this.dicts=res.data.data; + initSimpleDicts("all",['menuStatus','demandSource','demandLvl','demandType','priority','dclass']).then(res=>{ + Object.assign(this.dicts,res.data.data) }) this.filters.product=this.xmProduct if(this.xmProduct && this.xmProduct.id){ diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index 7568fa42..80d09826 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -8,7 +8,9 @@ > - + + + @@ -1053,6 +1055,7 @@ export default { taskType: "", tags: [], taskState:'',//任务状态 + lvls:['1','2'], }, xmTasks: [], //查询结果 pageInfo: { @@ -1073,6 +1076,7 @@ export default { priority: [], xmTaskSettleSchemel: [], taskState:[], + xm_plan_lvl:[], }, //下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} addFormVisible: false, //新增xmTask界面是否显示 @@ -2294,6 +2298,9 @@ export default { if (this.filters.tags && this.filters.tags.length>0) { params.tagIdList = this.filters.tags.map(i=>i.tagId); } + if(this.queryScope=="planTask"||this.queryScope=='plan'){ + params.lvls=this.filters.lvls + } return params; }, loadXmTaskLazy(tree, treeNode, resolve) { @@ -2536,8 +2543,8 @@ export default { this.getXmTasks(); } this.tableHeight = this.source == 'GZT' ? this.tableHeight : util.calcTableMaxHeight(this.$refs.table.$el); - initSimpleDicts( "all", ["planType","taskType","priority","xmTaskSettleSchemel","priority","taskState" ]).then((res) => { - this.dicts = res.data.data; + initSimpleDicts( "all", ["planType","taskType","priority","xmTaskSettleSchemel","priority","taskState",'xm_plan_lvl' ]).then((res) => { + Object.assign(this.dicts,res.data.data) }); }); },