diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index c63ab221..c7520f6b 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -437,7 +437,7 @@ {{item.name}} - + @@ -454,7 +454,7 @@ {{item.name}} - + @@ -1625,33 +1625,28 @@ export default { .catch((err) => (this.load.del = false)); }); }, - rowClick: function (row) { - this.editForm = row; - if (row.startTime && row.endTime) { - this.budgetDateRanger = [row.startTime, row.endTime]; - } else { - this.budgetDateRanger = []; - } - if (row.actStartTime && row.actEndTime) { - this.actDateRanger = [row.actStartTime, row.actEndTime]; - } else { - this.actDateRanger = []; - } + rowClick: function (row) { + this.editForm = row; + this.editFormBak=Object.assign({},row) // this.$emit('row-click',row,);// @row-click="rowClick" }, showDrawer: function (row) { this.editFormVisible = true; - this.editForm = row; - + this.editForm = row; + this.editFormBak=Object.assign({},row) // this.$emit('row-click',row,);// @row-click="rowClick" }, isEmpty(str) { return str == null || "" == str; + }, + selectVisible(row,visible){ + if(visible==true){ + this.rowClick(row); + } }, - showExecusers(row) { this.editForm = row; this.execUserVisible = true; @@ -2395,6 +2390,7 @@ export default { Object.assign(row,params) } }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/xmTaskWorkload/XmTaskWorkloadRecord.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue index 9e040477..1a56f200 100644 --- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue +++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue @@ -69,8 +69,11 @@ props:['xmTask','visible'], watch: { - 'xmTask':function() { - this.initData() + 'xmTask':{ + handler(){ + this.initData() + } + }, 'visible':function(visible) { if(visible==true){ @@ -105,7 +108,8 @@ saveSubmit: function () { }, initData: function(){ - this.editForm=this.xmTask + this.editForm=Object.assign({},this.xmTask) + this.editFormBak=Object.assign({},this.editForm) }, editXmTaskSomeFields(row,fieldName,$event){ @@ -130,6 +134,7 @@ //Object.assign(row,params) this.$emit("edit-xm-task-some-fields",params); }else{ + this.editForm=Object.assign(this.editForm,this.editFormBak) this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'}) } }) @@ -140,7 +145,8 @@ if(tips.isOk){ if(res.data.data.length>0){ Object.assign(this.xmTask,res.data.data[0]) - Object.assign(this.editForm,this.xmTask) + Object.assign(this.editForm,this.xmTask) + Object.assign(this.editFormBak,this.xmTask) this.$emit('submit',this.editForm) } }