From 910d9fd9a262018d30d555953ad7c1cd7274540e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 20 Apr 2021 18:51:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmTask/XmTaskMng.vue          | 17 ++++++++++-------
 .../core/xmTestCaseExec/XmTestCaseExecMng.vue   |  4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index a6293930..bb06257c 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -244,14 +244,14 @@
 				<div class="exector extra">
 					<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-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 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>
+					<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 class="skill extra">
 					<div class="field-label">技能要求</div><el-tag   style="margin-left:10px;border-radius:30px;">{{editForm.taskSkillNames?editForm.taskSkillNames:'无'}}</el-tag>
@@ -774,16 +774,19 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
 			},
 
 			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;
-				}
+				} 
 				if(rate){
 					this.editForm.rate=rate
 				}
 				let params = {
 					id: this.editForm.id,
 					rate: this.editForm.rate,
+					projectId:this.editForm.projectId,
 					parentTaskid: this.editForm.parentTaskid,
 				}
 				if(this.editForm.rate==0){
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
index 0355ca86..11c8403c 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
@@ -100,8 +100,8 @@
 				 </el-table-column>
 				<el-table-column v-if="!batchEditVisible" label="操作" width="240" fixed="right">
 					<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>
 				</el-table-column>
 			</el-table>