|
|
@ -232,15 +232,8 @@ |
|
|
|
|
|
|
|
|
<div class="tool-bar"> |
|
|
<div class="tool-bar"> |
|
|
<span class="u-btn"> |
|
|
<span class="u-btn"> |
|
|
<el-tooltip v-if="scope.row.ntype==='1'" :content=" '新建任务'"> |
|
|
|
|
|
<el-button :style="{backgroundColor:'#409EFF'}" @click="showSubAdd( scope.row,scope.$index,'0')" icon="el-icon-plus" title="新建任务" circle plain size="mini"> </el-button> |
|
|
|
|
|
</el-tooltip> |
|
|
|
|
|
<el-tooltip v-if="scope.row.ntype==='1'" :content=" '新建计划'"> |
|
|
|
|
|
<el-button :style="{backgroundColor: '#E6A23C'}" @click="showSubAdd( scope.row,scope.$index,'1')" icon="el-icon-plus" title="新建计划" circle plain size="mini"> </el-button> |
|
|
|
|
|
</el-tooltip> |
|
|
|
|
|
|
|
|
|
|
|
<el-tooltip v-if="scope.row.ntype==='0'" :content=" '编辑任务'"> |
|
|
<el-tooltip v-if="scope.row.ntype==='0'" :content=" '编辑任务'"> |
|
|
<el-button :style="{backgroundColor: '#409EFF'}" @click="showEdit( scope.row,scope.$index)" icon="el-icon-edit" title="编辑任务" circle plain size="mini"> </el-button> |
|
|
|
|
|
|
|
|
<el-button @click="showDrawer( scope.row,scope.$index)" icon="el-icon-edit" title="编辑任务" circle plain size="mini"> </el-button> |
|
|
</el-tooltip> |
|
|
</el-tooltip> |
|
|
</span> |
|
|
</span> |
|
|
</div> |
|
|
</div> |
|
|
@ -536,7 +529,6 @@ |
|
|
:close-on-click-modal="false" |
|
|
:close-on-click-modal="false" |
|
|
> |
|
|
> |
|
|
<xm-task-edit |
|
|
<xm-task-edit |
|
|
:xm-project="currentProject" |
|
|
|
|
|
:xm-task="editForm" |
|
|
:xm-task="editForm" |
|
|
:visible="editFormVisible" |
|
|
:visible="editFormVisible" |
|
|
@cancel="editFormVisible = false" |
|
|
@cancel="editFormVisible = false" |
|
|
@ -559,6 +551,24 @@ |
|
|
@select-confirm="onTaskSkillsSelected" |
|
|
@select-confirm="onTaskSkillsSelected" |
|
|
></skill-mng> |
|
|
></skill-mng> |
|
|
</el-drawer> |
|
|
</el-drawer> |
|
|
|
|
|
|
|
|
|
|
|
<el-drawer |
|
|
|
|
|
:title="'任务' + currTaskName + '的执行人'" |
|
|
|
|
|
:visible.sync="execUserVisible" |
|
|
|
|
|
:size="650" |
|
|
|
|
|
append-to-body |
|
|
|
|
|
:close-on-click-modal="false" |
|
|
|
|
|
> |
|
|
|
|
|
<xm-execuser-mng |
|
|
|
|
|
:visible="execUserVisible" |
|
|
|
|
|
:xm-task="editForm" |
|
|
|
|
|
:is-my="isMy" |
|
|
|
|
|
@after-add-submit="afterExecuserSubmit" |
|
|
|
|
|
@after-edit-submit="afterExecuserSubmit" |
|
|
|
|
|
@after-delete-submit="afterExecuserSubmit" |
|
|
|
|
|
ref="execuserMng" |
|
|
|
|
|
></xm-execuser-mng> |
|
|
|
|
|
</el-drawer> |
|
|
<el-drawer |
|
|
<el-drawer |
|
|
:title="'技能条件'" |
|
|
:title="'技能条件'" |
|
|
:visible.sync="showSkillSearchVisible" |
|
|
:visible.sync="showSkillSearchVisible" |
|
|
@ -792,6 +802,7 @@ export default { |
|
|
budgetDateRanger: [], |
|
|
budgetDateRanger: [], |
|
|
actDateRanger: [], |
|
|
actDateRanger: [], |
|
|
taskWorkloadVisible:false, |
|
|
taskWorkloadVisible:false, |
|
|
|
|
|
execUserVisible:false, |
|
|
}; |
|
|
}; |
|
|
}, //end data |
|
|
}, //end data |
|
|
methods: { |
|
|
methods: { |
|
|
@ -1381,18 +1392,32 @@ export default { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
}, |
|
|
}, |
|
|
|
|
|
showExecusers(row) { |
|
|
|
|
|
this.editForm = row; |
|
|
|
|
|
this.execUserVisible = true; |
|
|
|
|
|
}, |
|
|
onTaskWorkloadSubmit(){ |
|
|
onTaskWorkloadSubmit(){ |
|
|
this.taskWorkloadVisible=false; |
|
|
this.taskWorkloadVisible=false; |
|
|
this.searchXmTasks(); |
|
|
this.searchXmTasks(); |
|
|
treeTool.reloadAllChildren(this.$refs.table,this.maps,[this.editForm],'parentTaskid',this.loadXmTaskLazy) |
|
|
|
|
|
}, |
|
|
}, |
|
|
showWorkload(row){ |
|
|
showWorkload(row){ |
|
|
this.editForm=row |
|
|
this.editForm=row |
|
|
this.taskWorkloadVisible=true; |
|
|
this.taskWorkloadVisible=true; |
|
|
} |
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
afterEditSubmit() { |
|
|
|
|
|
this.editFormVisible = false; |
|
|
|
|
|
var row=this.editForm |
|
|
|
|
|
this.getXmTasks() |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
afterExecEditSubmit() { |
|
|
|
|
|
var row=this.editForm |
|
|
|
|
|
this.getXmTasks() |
|
|
|
|
|
}, |
|
|
/**end 自定义函数请在上面加**/ |
|
|
/**end 自定义函数请在上面加**/ |
|
|
}, //end methods |
|
|
}, //end methods |
|
|
components: { |
|
|
components: { |
|
|
|
|
|
xmExecuserMng, |
|
|
xmSkillMng, |
|
|
xmSkillMng, |
|
|
XmTaskEdit, |
|
|
XmTaskEdit, |
|
|
skillMng, |
|
|
skillMng, |
|
|
|