diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index c51bafb3..73b8718c 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -13,11 +13,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
index 37b9fa63..b0452b6f 100644
--- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
+++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
@@ -1,11 +1,14 @@
-
-
-
-
-
-
-
+
+
+
+
+
+ {{filters.product?filters.product.productName:'选择产品模板'}}
+
查询
确认选择
@@ -35,17 +38,7 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -55,10 +48,8 @@
import treeTool from '@/common/js/treeTool';//全局公共库
//import Sticky from '@/components/Sticky' // 粘性header组件
//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
- import { listXmMenu, delXmMenuTemplate, batchDelXmMenuTemplate,batchEditXmMenuTemplate } from '@/api/xm/core/xmMenu';
- import XmMenuTemplateAdd from './XmMenuTemplateAdd';//新增界面
- import XmMenuTemplateEdit from './XmMenuTemplateEdit';//修改界面
- import XmProductTemplateMng from '../xmProductTemplate/XmProductTemplateMng';//新增界面
+ import { listXmMenu, delXmMenuTemplate, batchDelXmMenuTemplate,batchEditXmMenuTemplate } from '@/api/xm/core/xmMenu';
+ import XmProductTplMng from '../xmProduct/XmProductTplMng';//新增界面
import { mapGetters } from 'vuex'
@@ -218,7 +209,7 @@
selsChange: function (sels) {
this.sels = sels;
},
- onProductSelected:function(product){
+ onProductRowClick:function(product){
this.filters.product=product
this.getXmMenuTemplates()
},
@@ -286,24 +277,16 @@
},
},//end methods
- components: {
- 'xm-menu-template-add':XmMenuTemplateAdd,
- 'xm-menu-template-edit':XmMenuTemplateEdit,
- XmProductTemplateMng,
+ components: {
+ XmProductTplMng,
//在下面添加其它组件
},
mounted() {
this.$nextTick(() => {
- this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
- this.getXmMenuTemplates();
- });
- // 阻止默认行为
- document.body.ondrop = function (event) {
- event.preventDefault();
- event.stopPropagation();
- };
- this.rowDrop();
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
+ this.getXmMenuTemplates();
+ });
}
}
diff --git a/src/views/xm/core/xmProduct/XmProductTplMng.vue b/src/views/xm/core/xmProduct/XmProductTplMng.vue
index 2a6c47b3..dadeca7a 100644
--- a/src/views/xm/core/xmProduct/XmProductTplMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductTplMng.vue
@@ -255,7 +255,7 @@
params.orderBy= orderBys.join(",")
}
if(this.filters.key){
- params.key=this.filters.key
+ params.key='%'+this.filters.key+'%'
}
if(this.filters.isMy=='1'){
params.assistantUserid=this.userInfo.userid
diff --git a/src/views/xm/core/xmProject/XmProjectTplMng.vue b/src/views/xm/core/xmProject/XmProjectTplMng.vue
index 2495fde6..c3cccf37 100644
--- a/src/views/xm/core/xmProject/XmProjectTplMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectTplMng.vue
@@ -198,10 +198,8 @@
count:this.pageInfo.count,
};
if(this.filters.key!==""){
- //params.xxx=this.filters.key
- }else{
- //params.xxx=xxxxx
- }
+ params.key='%'+this.filters.key+'%';
+ }
if(this.dateRanger&&this.dateRanger.length==2){
@@ -240,33 +238,7 @@
},
menuFilter(params) {
- const key = this.menukey;
- const userid = this.userInfo.userid;
- if( this.dataScope=='all' && key == "compete"){
- params.compete = userid;
- }else if( this.dataScope!='all' && (key == "compete" || key=="all")){
- params.compete = userid;
- } else if(key == "leader"){ //负责人
- params.pgTypeIds=['nbxmjl']
- params.userid=userid
- }
- else if(key == "moniter"){ //监控人
- params.pgTypeIds=['yyz','xmzl']
- params.userid=userid
- }
- else if(key == "approver"){ //审批人
- params.pgTypeIds=['nbxmjl','xmzk','nbldz']
- params.userid=userid
- }
- else if(key == "create"){
- params.createUserid = userid;
- }else if(key=="myFocus"){
- params.myFocus="1"
- params.userid=userid
- }else if(key.indexOf("myExecuserStatus")>=0){
- params.userid=userid
- params.myExecuserStatus=key.substring("myExecuserStatus".length)
- }
+
return params;
},
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 58abf642..7a144a84 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -888,6 +888,7 @@
:is-select-menu="true"
:multi="true"
:xm-product="filters.product"
+ :sel-project="filters.selProject"
@menus-selected="onSelectedMenus"
>
@@ -904,6 +905,7 @@
:multi="true"
@menus-selected="onSelectedStory"
:xm-product="filters.product"
+ :sel-project="filters.selProject"
>
@@ -1594,7 +1596,7 @@ export default {
});
return false;
}else if(this.ptype==='1'){
- if( !this.xmProduct && this.xmProduct.id){
+ if( !this.filters.product && this.filters.product.id){
this.$notify({
showClose: true,
message: "请先选择产品",