diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue index ef796386..6659c692 100644 --- a/src/views/xm/core/xmMenu/XmMenuAdd.vue +++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue @@ -49,6 +49,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -261,6 +282,7 @@ }, proposerSelectVisible:false, mmUserSelectVisible:false, + dateRanger:[], /**begin 在下面加自定义属性,记得补上面的一个逗号**/ /**end 在上面加自定义属性**/ @@ -294,6 +316,11 @@ if(params.remark=='作为 ,我需要 ,以便我能够 。'){ params.remark="" } + + if(this.dateRanger.length>1){ + params.startTime=this.dateRanger[0] + params.endTime=this.dateRanger[1] + } addXmMenu(params).then((res) => { this.load.add=false var tips=res.data.tips; @@ -351,7 +378,7 @@ }, mounted() { - initSimpleDicts('all',['demandSource','demandLvl','demandType','priority'] ).then(res=>{ + initSimpleDicts('all',['demandSource','demandLvl','demandType','priority','menuStatus'] ).then(res=>{ this.dicts=res.data.data; }) this.addForm=Object.assign(this.addForm, this.xmMenu); diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue index ca1bc833..ea02312b 100644 --- a/src/views/xm/core/xmMenu/XmMenuEdit.vue +++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue @@ -60,7 +60,13 @@ - + + + + + + + @@ -245,7 +251,10 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; }, 'visible':function(visible) { if(visible==true){ - //从新打开页面时某些数据需要重新加载,可以在这里添加 + if(this.editForm.startTime && this.editForm.endTime){ + this.dateRanger.push(this.editForm.startTime) + this.dateRanger.push(this.editForm.endTime) + } } }, 'editForm.mactWorkload':function(val,oldVal){ @@ -314,6 +323,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; ] }, tagSelectVisible:false, + dateRanger:[], /**begin 在下面加自定义属性,记得补上面的一个逗号**/ /**end 在上面加自定义属性**/ @@ -337,6 +347,10 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; this.$confirm('确认提交吗?', '提示', {}).then(() => { this.load.edit=true let params = Object.assign({}, this.editForm); + if(this.dateRanger.length>1){ + params.startTime=this.dateRanger[0] + params.endTime=this.dateRanger[1] + } editXmMenu(params).then((res) => { this.load.edit=false var tips=res.data.tips; @@ -414,6 +428,10 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; this.dicts=res.data.data; }) this.editForm=Object.assign(this.editForm, this.xmMenu); + if(this.editForm.startTime && this.editForm.endTime){ + this.dateRanger.push(this.editForm.startTime) + this.dateRanger.push(this.editForm.endTime) + } /**在下面写其它函数***/ }//end mounted