From 431bb50ca22bea52462e6fedbc3bdbd7e973bb50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 11 Mar 2022 22:38:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmIteration/XmIterationSelect.vue      | 8 +++++---
 .../core/xmIterationLink/XmIterationLinkForProduct.vue   | 2 +-
 .../core/xmIterationLink/XmIterationLinkForProject.vue   | 2 +-
 src/views/xm/core/xmProduct/XmProductSelect.vue          | 6 +++++-
 .../xmProductProjectLink/XmProductProjectLinkMng.vue     | 2 +-
 src/views/xm/core/xmProject/XmProjectSelect.vue          | 9 ++++++++-
 6 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationSelect.vue b/src/views/xm/core/xmIteration/XmIterationSelect.vue
index 055458c4..4cbcdbbb 100644
--- a/src/views/xm/core/xmIteration/XmIterationSelect.vue
+++ b/src/views/xm/core/xmIteration/XmIterationSelect.vue
@@ -5,7 +5,8 @@
 			<el-table ref="table" :height="maxTableHeight" :data="xmIterationTreeData" row-key="id"  default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
    				<el-table-column prop="iterationName" label="迭代名称" >
 					<template slot="header" slot-scope="scope">
-					迭代名称 <el-popover v-if=" !menuId && !productId"
+					迭代名称 <el-button type="text" @click="clearSelectIteration">清空所选</el-button>
+					<el-popover v-if=" !menuId && !productId"
 						placement="top-start"
 						title=""
 						width="400"
@@ -256,8 +257,7 @@
 			//选择行xmIteration
 			selsChange: function (sels) {
 				this.sels = sels;
-			},
-			 
+			},  
 			rowClick: function(row, event, column){
 				this.editForm=row
 				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
@@ -308,6 +308,8 @@
 
 			clearSelectIteration(){
 				this.editForm=this.editFormInit
+				
+				this.$refs.table.setCurrentRow();
 				this.$emit('clear-select',null );//  @row-click="rowClick"
 			},
 			fieldChange:function(row,fieldName){
diff --git a/src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue b/src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue
index 79c2ae48..a07110cc 100644
--- a/src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue
+++ b/src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue
@@ -15,7 +15,7 @@
  				<el-table-column prop="cusername" label="操作者" min-width="80" ></el-table-column> 
 				<el-table-column label="操作" width="120" fixed="right"> 
 					<template scope="scope">
- 						<el-button type="danger" @click="handleDel(scope.row,scope.$index)" icon="el-icon-delete" >移出</el-button>
+ 						<el-button type="danger" @click="handleDel(scope.row,scope.$index)" icon="el-icon-delete" v-loading="load.del">移出</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
diff --git a/src/views/xm/core/xmIterationLink/XmIterationLinkForProject.vue b/src/views/xm/core/xmIterationLink/XmIterationLinkForProject.vue
index 2b1155ec..d7fc4182 100644
--- a/src/views/xm/core/xmIterationLink/XmIterationLinkForProject.vue
+++ b/src/views/xm/core/xmIterationLink/XmIterationLinkForProject.vue
@@ -15,7 +15,7 @@
  				<el-table-column prop="cusername" label="操作者" min-width="80" ></el-table-column> 
 				<el-table-column label="操作" width="120" fixed="right"> 
 					<template scope="scope">
- 						<el-button type="danger" @click="handleDel(scope.row,scope.$index)" icon="el-icon-delete" >移出</el-button>
+ 						<el-button type="danger" @click="handleDel(scope.row,scope.$index)" icon="el-icon-delete" v-loading="load.del">移出</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
index 24545d96..46b1e489 100644
--- a/src/views/xm/core/xmProduct/XmProductSelect.vue
+++ b/src/views/xm/core/xmProduct/XmProductSelect.vue
@@ -8,7 +8,7 @@
 				<el-table-column  v-if="isSelectProduct==true"  label="产品代号" prop="code" min-width="100" show-overflow-tooltip >  </el-table-column>
 				  <el-table-column prop="productName"  label="产品名称"    show-overflow-tooltip> 
 					 <template slot="header" slot-scope="scope"> 
-						 产品名称 
+						 产品名称 <el-button type="text" @click="clearSelect">清空所选</el-button>
 						 <el-popover
 							placement="top-start"
 							title=""
@@ -311,6 +311,10 @@
 					return 'success-row';
 				}
 				return '';
+			},
+			clearSelect(){
+				this.$refs.table.setCurrentRow();
+				this.$emit("clear-select");
 			}
 		},//end methods
 		components: {  
diff --git a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
index 19aab44c..3a68bd84 100644
--- a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
+++ b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
@@ -13,7 +13,7 @@
 				<el-table-column prop="cusername" label="操作者" min-width="80" ></el-table-column>
  				<el-table-column label="操作" width="120" fixed="right"> 
 					<template scope="scope">
- 						<el-button type="danger" @click="handleDel(scope.row,scope.$index)" icon="el-icon-delete">移出</el-button>
+ 						<el-button type="danger" @click="handleDel(scope.row,scope.$index)" icon="el-icon-delete" v-loading="load.del">移出</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
diff --git a/src/views/xm/core/xmProject/XmProjectSelect.vue b/src/views/xm/core/xmProject/XmProjectSelect.vue
index 86e75c6b..b6f51020 100644
--- a/src/views/xm/core/xmProject/XmProjectSelect.vue
+++ b/src/views/xm/core/xmProject/XmProjectSelect.vue
@@ -3,6 +3,9 @@
 		<el-row class="page-main padding-left">   
 			<el-table ref="table" border :height="maxTableHeight"  stripe :data="xmProjects"  highlight-current-row v-loading="load.list"  @selection-change="selsChange" @row-click="rowClick" style="width: 100%;" >
  				<el-table-column prop="name" label="项目名称" >
+					 <template slot="header">
+						 项目名称 <el-button type="text" @click="clearSelect">清空所选</el-button>
+					 </template>
 					 <template slot-scope="scope">
 						 {{scope.row.name}}&nbsp;&nbsp;
 						 <font   :color="scope.row.totalProgress==100?'green':'#FF8C00'">{{parseInt(scope.row.totalProgress)}}%</font>
@@ -161,7 +164,11 @@
 				this.$emit('project-confirm',this.editForm);
 			}
 			/**end 自定义函数请在上面加**/
-			
+			,
+			clearSelect(){
+				this.$refs.table.setCurrentRow();
+				this.$emit("clear-select");
+			}
 		},//end methods
 		components: {