Browse Source

优化任务责任人

master
陈裕财 5 years ago
parent
commit
27bb8d8bfb
  1. 4
      config/index.js
  2. 4
      src/api/xm/core/xmTask.js
  3. 7
      src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue
  4. 46
      src/views/xm/core/xmTask/XmTaskMng.vue

4
config/index.js

@ -11,7 +11,7 @@ module.exports = {
assetsSubDirectory: 'static',
assetsPublicPath: '/',
proxyTable: {
/**
'/api/m1/xm': {
target: 'http://localhost:7067',
changeOrigin: true,
@ -19,7 +19,7 @@ module.exports = {
'^/api/m1/xm': '/xm'
}
},
/**
'/api/m1/workflow': {
target: 'http://localhost:7080',
changeOrigin: true,

4
src/api/xm/core/xmTask.js

@ -44,6 +44,10 @@ export const batchSaveBudget = params => { return axios.post(`${base}/xm/core/xm
export const batchRelTasksWithMenu = params => { return axios.post(`${base}/xm/core/xmTask/batchRelTasksWithMenu`, params); };
export const setTaskCreateUser = params => { return axios.post(`${base}/xm/core/xmTask/setTaskCreateUser`, params); };

7
src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue

@ -1,11 +1,14 @@
<template>
<section>
<el-row class="app-container">
<el-col :span="20">
<el-col :span="16">
<el-button type="primary" @click="userConfirm">确认选择用户</el-button>
</el-col>
<el-col :span="4" class="hidden-sm-and-down">
<el-col :span="8" class="hidden-sm-and-down">
<el-tooltip content="黄色表示选中"><span class="addXmProjectGroupFormworkSquare"></span></el-tooltip>
<el-button @click="selectProjectVisible=true">切换项目</el-button>
{{this.filters.selProject?"当前项目:":""}}<el-tag type="primary" v-if="this.filters.selProject">{{this.filters.selProject.name}}</el-tag>
<el-tag v-else type="warning">未选择项目</el-tag>
</el-col>
</el-row>
<el-row class="app-container" v-loading="load.list" >

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

@ -77,9 +77,9 @@
</template>
</el-table-column>
<el-table-column v-if="!filters.selProject" prop="projectName" label="项目" min-width="120">
<el-table-column prop="projectName" label="项目" min-width="120">
<template slot="header" slot-scope="scope">
<template slot="header">
项目<el-button @click="showProjectList" icon="el-icon-search" circle size="mini"></el-button>
</template>
<template slot-scope="scope">
@ -96,6 +96,12 @@
<el-tag type= 'info' >{{parseFloat(scope.row.budgetCost/10000).toFixed(2)}},{{scope.row.budgetWorkload}}人时</el-tag>
</template>
</el-table-column>
<el-table-column sortable label="责任人" prop="createUserid" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
<el-link v-if="scope.row.createUserid!=null && scope.row.createUserid !='' " @click.stop="showGroupUserSelect(scope.row)">{{scope.row.createUsername}}</el-link>
<el-link type="warning" v-if="scope.row.createUsername==null || scope.row.createUsername ==''" @click.stop="showGroupUserSelect(scope.row)" >去设置</el-link>
</template>
</el-table-column>
<el-table-column sortable label="执行人" prop="exeUserids" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
<el-link v-if="scope.row.exeUsernames!=null && scope.row.exeUsernames !='' " @click.stop="showExecusers(scope.row)">{{scope.row.exeUsernames}}</el-link>
@ -232,9 +238,10 @@
</div>
<div class="exector extra">
<div class="field-label">任务负责人</div>
<el-tag v-if="editForm.executorUserid" style="margin-left:10px;border-radius:30px;" >{{editForm.executorUsername}}</el-tag>
<el-tag v-if="editForm.createUserid" style="margin-left:10px;border-radius:30px;" >{{editForm.createUsername}}</el-tag>
<el-tag v-else style="margin-left:10px;border-radius:30px;" >未设置</el-tag>
<el-button @click="showExecusers(editForm)">设置负责人</el-button> </div>
<el-button @click="showGroupUserSelect(editForm)">设置负责人</el-button>
</div>
<div class="exector extra">
<div class="field-label">任务执行人</div><el-tag style="margin-left:10px;border-radius:30px;" >{{editForm.exeUsernames}}</el-tag>
<el-button @click="showExecusers(editForm)">查看队员情况</el-button>
@ -325,6 +332,9 @@
<el-dialog append-to-body title="故事明细" :visible.sync="menuDetailVisible" width="80%" :close-on-click-modal="false">
<xm-menu-rich-detail :visible="menuDetailVisible" :reload="true" :xm-menu="{menuId:editForm.menuId,menuName:editForm.menuName}" ></xm-menu-rich-detail>
</el-dialog>
<el-dialog append-to-body title="选择负责人" :visible.sync="groupUserSelectVisible" width="80%" :close-on-click-modal="false">
<xm-project-group-select :visible="groupUserSelectVisible" :sel-project="selProject" :isSelectSingleUser="1" @user-confirm="groupUserSelectConfirm"></xm-project-group-select>
</el-dialog>
</section>
</template>
@ -333,7 +343,7 @@
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
import { listOption } from '@/api/mdp/meta/itemOption';//
import { getTask ,listXmTask,editXmTask,editRate, delXmTask, batchDelXmTask,batchImportTaskFromTemplate,batchSaveBudget } from '@/api/xm/core/xmTask';
import { getTask ,listXmTask,editXmTask,editRate, delXmTask, batchDelXmTask,batchImportTaskFromTemplate,batchSaveBudget,setTaskCreateUser} from '@/api/xm/core/xmTask';
import XmTaskAdd from './XmTaskAdd';//
import XmTaskEdit from './XmTaskEdit';//
import XmTaskMngBatch from './XmTaskMngBatch';//
@ -356,6 +366,7 @@
import XmMenuRichDetail from '../xmMenu/XmMenuRichDetail';
import XmGantt from '../components/xm-gantt';
import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
export default {
computed: {
@ -578,6 +589,7 @@
menuDetailVisible:false,
pickerOptions: util.pickerOptions(),
gstcVisible:false,
groupUserSelectVisible:false,//
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@ -1409,6 +1421,27 @@
this.filters.selProject=null;
this.getXmTasks()
},
showGroupUserSelect:function(task){
this.editForm=task;
this.groupUserSelectVisible=true;
},
groupUserSelectConfirm:function(users){
if( users==null || users.length==0 ){
this.groupUserSelectVisible=false;
return
}
this.editForm.createUserid=users[0].userid
this.editForm.createUsername=users[0].username
setTaskCreateUser(this.editForm).then(res=>{
var tips = res.data.tips;
if(tips.isOk){
this.$message.success("设置成功");
this.groupUserSelectVisible=false;
}else{
this.$message.error(tips.msg);
}
})
},
//
// dict sIdmenuId; ePmeuId menuId;
judgePmenuId(dict, sId, ePmeuId) {
@ -1465,7 +1498,8 @@
xmSkillMng,
skillMng,
xmProjectPhaseMng,
xmTaskTemplateMng, XmProjectList,xmExchangeMng,xmMenuSelect,XmMenuRichDetail,XmGantt,XmTaskMngBatch
xmTaskTemplateMng, XmProjectList,xmExchangeMng,xmMenuSelect,XmMenuRichDetail,XmGantt,XmTaskMngBatch,
XmProjectGroupSelect
//
},
mounted() {

Loading…
Cancel
Save