Browse Source

优化

master
陈裕财 4 years ago
parent
commit
d8544265e1
  1. 24
      src/views/xm/core/xmTask/XmTaskMng.vue
  2. 12
      src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue

24
src/views/xm/core/xmTask/XmTaskMng.vue

@ -437,7 +437,7 @@
<el-button style="display:block;" :type="item.className" plain round v-for="(item,index) in formatterTaskStateDicts(scope.row.taskState)" :key="index">{{item.name}}</el-button>
</div>
<span class="cell-bar">
<el-select v-model="scope.row.taskState" placeholder="任务状态" style="display:block;" @change="editXmTaskSomeFields(scope.row,'taskState',$event)">
<el-select @visible-change="selectVisible(scope.row,$event)" v-model="scope.row.taskState" placeholder="任务状态" style="display:block;" @change="editXmTaskSomeFields(scope.row,'taskState',$event)">
<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.taskState" :key="index"></el-option>
</el-select>
</span>
@ -454,7 +454,7 @@
<el-button style="display:block;" :type="item.className" plain round v-for="(item,index) in formatterPriorityDicts(scope.row.level)" :key="index">{{item.name}}</el-button>
</div>
<span class="cell-bar">
<el-select v-model="scope.row.level" placeholder="优先级" style="display:block;" @change="editXmTaskSomeFields(scope.row,'level',$event)">
<el-select @visible-change="selectVisible(scope.row,$event)" v-model="scope.row.level" placeholder="优先级" style="display:block;" @change="editXmTaskSomeFields(scope.row,'level',$event)">
<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.priority" :key="index"></el-option>
</el-select>
</span>
@ -1627,16 +1627,7 @@ export default {
},
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 = [];
}
this.editFormBak=Object.assign({},row)
// this.$emit('row-click',row,);// @row-click="rowClick"
},
@ -1644,14 +1635,18 @@ export default {
this.editFormVisible = true;
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'})
}
})

12
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'})
}
})
@ -141,6 +146,7 @@
if(res.data.data.length>0){
Object.assign(this.xmTask,res.data.data[0])
Object.assign(this.editForm,this.xmTask)
Object.assign(this.editFormBak,this.xmTask)
this.$emit('submit',this.editForm)
}
}

Loading…
Cancel
Save