From eb32bd38020b72656e0821fd9d7db66014fb23a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Wed, 18 May 2022 22:54:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E8=BE=91=E9=9C=80?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xm/core/xmMenu/XmMenuEdit.vue | 47 +++++++++---------------- src/views/xm/core/xmMenu/XmMenuMng.vue | 19 +++++++--- src/views/xm/core/xmTask/XmTaskMng.vue | 1 + 3 files changed, 32 insertions(+), 35 deletions(-) diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue index 8bccb49a..947da267 100644 --- a/src/views/xm/core/xmMenu/XmMenuEdit.vue +++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue @@ -65,7 +65,7 @@ - + @@ -250,13 +250,10 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; if(this.reload==true){ this.searchXmMenus(); }else{ - this.editForm = {...this.xmMenu}; - if(this.editForm.startTime && this.editForm.endTime){ - this.dateRanger=[] - this.dateRanger.push(this.editForm.startTime) - this.dateRanger.push(this.editForm.endTime) - } + this.editForm = {...this.xmMenu}; } + + this.editFormBak=Object.assign({},this.editForm) } }, 'editForm.actWorkload':function(val,oldVal){ @@ -305,7 +302,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; //新增界面数据 项目需求表 editForm: { menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:'',seqNo:'1',mmUserid:'',mmUsername:'',ntype:'0',childrenCnt:0,sinceVersion:'', - proposerId:'',proposerName:'',dlvl:'',dtype:'',priority:'',source:'',calcType:'1',actWorkload:0,actAt:0,finishRate:0,ctime:'',dclass:'1' + proposerId:'',proposerName:'',dlvl:'',dtype:'',priority:'',source:'',calcType:'1',actWorkload:0,actAt:0,finishRate:0,ctime:'',dclass:'1',startTime:'',endTime:'' }, proposerSelectVisible:false, mmUserSelectVisible:false, @@ -324,8 +321,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; {id:"9", name:"已删除"}, ] }, - tagSelectVisible:false, - dateRanger:[], + tagSelectVisible:false, subWorkItemNum:-1, activateTabPaneName:'1' /**begin 在下面加自定义属性,记得补上面的一个逗号**/ @@ -348,11 +344,7 @@ 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] - } + let params = Object.assign({}, this.editForm); editXmMenu(params).then((res) => { this.load.edit=false var tips=res.data.tips; @@ -440,8 +432,8 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; params.mmUserid=$event[0].userid params.mmUsername=$event[0].username }else if(fieldName==='startTime'){ - params.startTime=$event[0] - params.endTime=$event[1] + params.startTime=$event.startTime + params.endTime=$event.endTime }else{ if(typeof $event ==='string'){ params[fieldName]=$event @@ -450,15 +442,17 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; } } - editXmMenuSomeFields(params).then(res=>{ + editXmMenuSomeFields(params).then(res=>{ var tips = res.data.tips; if(tips.isOk){ Object.assign(row,params) + Object.assign(this.editFormBak,row) this.$emit("edit-fields",params); if(fieldName==='remark'||fieldName==='link'){ this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'}) } - }else{ + }else{ + Object.assign(this.editForm,this.editFormBak) this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'}) } }) @@ -471,12 +465,8 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; let callback= (res)=>{ var tips=res.data.tips; if(tips.isOk){ - this.editForm=res.data.data[0] - if(this.editForm.startTime && this.editForm.endTime){ - this.dateRanger=[] - this.dateRanger.push(this.editForm.startTime) - this.dateRanger.push(this.editForm.endTime) - } + this.editForm=res.data.data[0] + this.editFormBak=Object.assign({},this.editForm) }else{ this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } @@ -502,11 +492,8 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; initSimpleDicts('all',['demandSource','demandLvl','demandType','priority','menuStatus'] ).then(res=>{ 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) - } + this.editForm=Object.assign(this.editForm, this.xmMenu); + this.editFormBak=Object.assign({},this.editForm) if(this.reload==true){ this.searchXmMenus(); } diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue index ce5c0f48..9adc9016 100644 --- a/src/views/xm/core/xmMenu/XmMenuMng.vue +++ b/src/views/xm/core/xmMenu/XmMenuMng.vue @@ -218,7 +218,7 @@ {{item.name}} - + @@ -230,7 +230,7 @@ {{item.name}} - + @@ -242,7 +242,7 @@ {{formaterByDicts(scope.row,'dtype',scope.row.dtype)}} - + @@ -254,7 +254,7 @@ {{formaterByDicts(scope.row,'source',scope.row.source)}} - + @@ -266,7 +266,7 @@ {{formaterByDicts(scope.row,'dlvl',scope.row.dlvl)}} - + @@ -543,6 +543,11 @@ } },//end data methods: { + selectVisible(row,visible){ + if(visible){ + this.rowClick(row) + } + }, handleSizeChange(pageSize) { this.pageInfo.pageSize=pageSize; this.getXmMenus(); @@ -847,6 +852,8 @@ }, rowClick: function(row, event, column){ + this.editForm=row + this.editFormBak=Object.assign({},row) this.$emit('row-click',row, event, column);// @row-click="rowClick" }, handleExport() { @@ -1229,7 +1236,9 @@ }else{ Object.assign(row,params) } + Object.assign(this.editFormBak,row) }else{ + Object.assign(this.editForm,this.editFormBak) this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'}) } }) diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index c7520f6b..d474547b 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -2389,6 +2389,7 @@ export default { }else{ Object.assign(row,params) } + Object.assign(this.editFormBak,this.editForm) }else{ Object.assign(this.editForm,this.editFormBak) this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})