diff --git a/src/views/xm/core/xmFunc/XmFuncSelect.vue b/src/views/xm/core/xmFunc/XmFuncSelect.vue
index 1c08204a..fbe41029 100644
--- a/src/views/xm/core/xmFunc/XmFuncSelect.vue
+++ b/src/views/xm/core/xmFunc/XmFuncSelect.vue
@@ -36,6 +36,13 @@
+
+
+
+ 选择
+
+
+
@@ -67,7 +74,7 @@ export default {
components: {
XmFuncEdit,
},
- props:['visible','xmProduct'],
+ props:['visible','xmProduct','showSelect'],
computed: {
...mapGetters(['userInfo']),
@@ -286,7 +293,9 @@ export default {
this.$emit('row-click',null)
this.$refs.xmFuncTable.setCurrentRow();
},
-
+ select(row){
+ this.$emit('select',row)
+ },
loadDatasFirstCache(){
if(!this.xmProduct || !this.xmProduct.id){
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 54f2e34a..6e7ee424 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -139,6 +139,14 @@
+
+
+ {{ editForm.funcName }}
+ 设置
+
+
@@ -281,6 +289,9 @@
:xm-product="{id:editForm.productId,productName:editForm.productName}"
>
+
+
+
@@ -299,6 +310,7 @@
import XmTestCaseMng from '@/views/xm/core/xmTestCase/XmTestCaseMng';
import xmQuestionMng from "@/views/xm/core/xmQuestion/XmQuestionMng";
+ import XmFuncSelect from '../xmFunc/XmFuncSelect'
import XmEpicFeaturesSelect from "../xmMenu/XmEpicFeaturesSelect";
import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm'
@@ -420,6 +432,7 @@ import CommentArea from '../xmMenuComment/comment-area.vue';
activateTabPaneName:'4',
pmenuFormVisible:false,
parentMenuVisible:false,
+ funcVisible:false,
/**begin 在下面加自定义属性,记得补上面的一个逗号**/
@@ -540,6 +553,9 @@ import CommentArea from '../xmMenuComment/comment-area.vue';
}else if(fieldName==='startTime'){
params.startTime=$event.startTime
params.endTime=$event.endTime
+ }else if(fieldName==='funcId'){
+ params.funcId=$event.id
+ params.funcName=$event.name
}else{
if(typeof $event ==='string'){
params[fieldName]=$event
@@ -632,6 +648,15 @@ import CommentArea from '../xmMenuComment/comment-area.vue';
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
})
},
+
+ onFuncSelected(row){
+ this.editForm.funcId=row.id
+ this.editForm.funcName=row.name
+ this.funcVisible=false;
+ if(this.opType!=='add'){
+ this.editXmMenuSomeFields(this.editForm,'funcId',row)
+ }
+ },
},//end method
components: {
//在下面添加其它组件 'xm-menu-edit':XmMenuEdit
@@ -648,6 +673,7 @@ import CommentArea from '../xmMenuComment/comment-area.vue';
XmEpicFeaturesSelect,
xmQuestionMng,
CommentArea,
+ XmFuncSelect,
},
mounted() {