Browse Source

优化界面

master
陈裕财 5 years ago
parent
commit
910d9fd9a2
  1. 15
      src/views/xm/core/xmTask/XmTaskMng.vue
  2. 4
      src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue

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

@ -244,14 +244,14 @@
<div class="exector extra"> <div class="exector extra">
<div class="field-label">任务负责人</div> <div class="field-label">任务负责人</div>
<el-tag v-if="editForm.createUserid" style="margin-left:10px;border-radius:30px;" >{{editForm.createUsername}}</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="showGroupUserSelect(editForm)">设置负责人</el-button>
<el-tag v-else style="margin-left:10px;border-radius:30px;" icon="el-icon-right" >未设置</el-tag>
<el-button @click="showGroupUserSelect(editForm)" icon="el-icon-setting">设置负责人</el-button>
</div> </div>
<div class="exector extra"> <div class="exector extra">
<div class="field-label">任务执行人</div><el-tag style="margin-left:10px;border-radius:30px;" >{{editForm.exeUsernames}}</el-tag> <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>
<el-button @click="showExecusers(editForm)" icon="el-icon-s-data">查看队员情况</el-button>
<el-button type="primary" @click="toJoin">我要加入</el-button>
<el-button type="primary" @click="toJoin" icon="el-icon-plus">我要加入</el-button>
</div> </div>
<div class="skill extra"> <div class="skill extra">
<div class="field-label">技能要求</div><el-tag style="margin-left:10px;border-radius:30px;">{{editForm.taskSkillNames?editForm.taskSkillNames:'无'}}</el-tag> <div class="field-label">技能要求</div><el-tag style="margin-left:10px;border-radius:30px;">{{editForm.taskSkillNames?editForm.taskSkillNames:'无'}}</el-tag>
@ -774,8 +774,10 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
}, },
editProgress(rate) { editProgress(rate) {
if(this.userInfo.userid!=this.editForm.executorUserid){
this.$message({ message: "你不是该任务的主负责人,不能更新进度", type: 'error' });
var isCreate=this.userInfo.userid==this.editForm.createUserid
var isExec=this.userInfo.userid==this.editForm.executorUserid
if( !isCreate && !isExec ){
this.$message({ message: "你不是该任务的执行人、主负责人,不能更新进度", type: 'error' });
return; return;
} }
if(rate){ if(rate){
@ -784,6 +786,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
let params = { let params = {
id: this.editForm.id, id: this.editForm.id,
rate: this.editForm.rate, rate: this.editForm.rate,
projectId:this.editForm.projectId,
parentTaskid: this.editForm.parentTaskid, parentTaskid: this.editForm.parentTaskid,
} }
if(this.editForm.rate==0){ if(this.editForm.rate==0){

4
src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue

@ -100,8 +100,8 @@
</el-table-column> </el-table-column>
<el-table-column v-if="!batchEditVisible" label="操作" width="240" fixed="right"> <el-table-column v-if="!batchEditVisible" label="操作" width="240" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button type="warning" @click="showAddBug(scope.row,scope.$index)">登记bug</el-button>
<el-button type="success" @click="showBugs(scope.row,scope.$index)">bug列表</el-button>
<el-button type="warning" @click="showAddBug(scope.row,scope.$index)" icon="el-icon-plus">登记bug</el-button>
<el-button type="success" @click="showBugs(scope.row,scope.$index)" icon="el-icon-s-data">bug列表</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

Loading…
Cancel
Save