diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue index 972d6c8b..6ef569c6 100644 --- a/src/views/xm/core/xmMenu/XmMenuEdit.vue +++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue @@ -5,7 +5,7 @@ - + @@ -168,7 +168,20 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; computed: { ...mapGetters([ 'userInfo','roles' - ]) + ]), + calcMenuCurrStep(){ + var menuStatus= this.dicts.menuStatus + if(!menuStatus){ + return 1; + }else{ + var status=menuStatus.findIndex(i=>this.editForm.status==i.id) + if(status>=0){ + return status+1; + }else{ + return 1; + } + } + } }, props:['xmMenu','visible','parentMenu','product'], watch: { @@ -183,7 +196,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; }, data() { return { - dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} + //dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, add: false, del: false, edit: false },//查询中... editFormRules: { menuId: [ @@ -318,7 +331,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; mounted() { - initSimpleDicts('all',['demandSource','demandLvl','demandType','priority'] ).then(res=>{ + initSimpleDicts('all',['demandSource','demandLvl','demandType','priority','menuStatus'] ).then(res=>{ this.dicts=res.data.data; }) this.editForm=Object.assign(this.editForm, this.xmMenu); diff --git a/src/views/xm/core/xmMenu/XmMenuOverview.vue b/src/views/xm/core/xmMenu/XmMenuOverview.vue index 0545b004..9c96146e 100644 --- a/src/views/xm/core/xmMenu/XmMenuOverview.vue +++ b/src/views/xm/core/xmMenu/XmMenuOverview.vue @@ -5,15 +5,8 @@
- - - - - - - - - + +
@@ -237,7 +230,7 @@