diff --git a/src/views/xm/core/components/XmIterationSelect.vue b/src/views/xm/core/components/XmIterationSelect.vue
index f5c1adde..032e29de 100644
--- a/src/views/xm/core/components/XmIterationSelect.vue
+++ b/src/views/xm/core/components/XmIterationSelect.vue
@@ -26,6 +26,8 @@
width="500"
trigger="manual" >
关闭
+
+
迭代编号:
@@ -436,4 +438,12 @@
.align-right{
float: right;
}
+.title {
+
+ height: 32px;
+ line-height: 32px;
+ text-align: left;
+ float: left;
+ min-width: 100px;
+}
diff --git a/src/views/xm/core/components/XmProductSelect.vue b/src/views/xm/core/components/XmProductSelect.vue
index 1b52d32b..ae6774cd 100644
--- a/src/views/xm/core/components/XmProductSelect.vue
+++ b/src/views/xm/core/components/XmProductSelect.vue
@@ -38,6 +38,8 @@
关闭
+
+
产品编号:
-
+
+ icon="el-icon-s-opportunity"
+ >
+
+
{{
editForm && editForm.id ? editForm.productName : "选择产品"
- }}
+
+
@@ -519,4 +523,12 @@ export default {
.align-right {
float: right;
}
+.title {
+
+ height: 32px;
+ line-height: 32px;
+ text-align: left;
+ float: left;
+ min-width: 100px;
+}
diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue
index 770ab1e9..c808009e 100644
--- a/src/views/xm/core/components/XmProjectSelect.vue
+++ b/src/views/xm/core/components/XmProjectSelect.vue
@@ -38,6 +38,8 @@
>关闭
+
+
项目编号:
{{
+ >
+
+ {{
editForm && editForm.id ? editForm.name : "选择项目"
- }}
+ }}
+
@@ -522,4 +524,12 @@ export default {
.align-right {
float: right;
}
+.title {
+
+ height: 32px;
+ line-height: 32px;
+ text-align: left;
+ float: left;
+ min-width: 100px;
+}
diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index 48d84a04..51c5f9f6 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
@@ -3,10 +3,9 @@
-
-
-
-
+
+
@@ -130,17 +129,12 @@
-
-
-
-
+
-
-
-
+
@@ -275,8 +269,7 @@
selectFiltersMmUserVisible:false,
maxTableHeight:300,
dateRanger: [ ],
- pickerOptions: util.getPickerOptions('datarange'),
- productVisible:false,
+ pickerOptions: util.getPickerOptions('datarange'),
tagSelectVisible:false,
fieldTagVisible:false,
parentMenuVisible:false,
@@ -531,16 +524,17 @@
this.sels = sels;
},
onProductSelected:function(product){
- this.filters.product=product
- this.productVisible=false;
+ this.filters.product=product
this.xmMenus=[]
this.getXmMenus()
+ this.$emit('product-selected',product)
},
onProductClearSelect:function(){
- this.filters.product=null
- this.productVisible=false;
+ this.filters.product=null
this.xmMenus=[]
- this.getXmMenus()
+ this.pageInfo.total=0;
+ //this.getXmMenus()
+ this.$emit('product-clear')
},
onIterationSelected:function(iteration){
this.filters.iteration=iteration
@@ -777,34 +771,7 @@
}
this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
}).catch( err => this.load.edit=false );
- },
- onGroupUserSelect(users,option){
- this.editXmMenuSomeFields(option.data,"mmUserid",users);
- },
- clearFiltersMmUser:function(){
- this.filters.mmUser=null;
- this.searchXmMenus();
- },
- selectFiltersMmUser(){
- this.selectFiltersMmUserVisible=true;
- },
- onFiltersMmUserSelected(users){
-
- if(users && users.length>0){
- this.filters.mmUser=users[0]
- }else{
- this.filters.mmUser=null;
- }
- this.selectFiltersMmUserVisible=false;
- this.searchXmMenus();
- },
- setFiltersMmUserAsMySelf(){
- this.filters.mmUser=this.userInfo;
- this.searchXmMenus();
- },
- toSelectProduct(){
- this.productVisible=true;
- },
+ },
searchSubMenus(row,index){
this.pageInfo.count=true;
this.searchXmMenus();
@@ -1011,10 +978,7 @@
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){
- this.productVisible=false;
- }
+ this.filters.product=this.xmProduct
if(this.xmIteration && this.xmIteration.id){
this.filters.iterationFilterType='join-curr-iteration'
diff --git a/src/views/xm/core/xmMenu/XmMenuBox.vue b/src/views/xm/core/xmMenu/XmMenuBox.vue
index c0b48d2a..5900f5f7 100644
--- a/src/views/xm/core/xmMenu/XmMenuBox.vue
+++ b/src/views/xm/core/xmMenu/XmMenuBox.vue
@@ -2,10 +2,12 @@