From ba9ad96b9ae643f9e0eaf1740b3ccfda184c7060 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, 19 Jul 2022 00:43:07 +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/xmMenu/XmEpicFeatures.vue |  6 +-----
 src/views/xm/core/xmTask/XmPhase.vue        | 15 +++++----------
 src/views/xm/core/xmTask/XmPhaseSelect.vue  |  5 +++--
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index 26c8d4d8..13624168 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
@@ -56,11 +56,7 @@
 									>
 								</el-col>
 							</el-row> 
-							<el-row>
-							<el-col :span="24" style="padding-top: 5px" v-if="editForm && editForm.menuId">
-								<font class="more-label-font">当前选中的史诗、特性:</font> 
-								<el-tag closable @close="unselectRow()">{{editForm.menuName}}</el-tag>  
-							</el-col>  
+							<el-row> 
 							<el-col :span="24" style="padding-top: 5px"> 
 							
 								<el-button type="primary"  @click="showParentMenu" icon="el-icon-top" title="更换上级">更换上级</el-button> 
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 344f20ad..5eb3e3db 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -9,9 +9,8 @@
           
           <span style="float:left;"> 
            <xm-project-select style="display:inline;" v-if="!selProject||!selProject.id" :auto-select="isTaskCenter?false:true"  :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null"  @row-click="onProjectRowClick" @clear="onProjectClear" ></xm-project-select>
-           <el-input style="width:120px;" v-model="filters.key" placeholder="名称模糊查询"  class="hidden-md-and-down" clearable></el-input>
-           <el-button icon="el-icon-search" @click="searchXmTasks()"></el-button>  
-          <el-popover
+           <el-input style="width:60%;" v-model="filters.key" placeholder="名称 按回车"  class="hidden-md-and-down" clearable @keyup.enter.native="searchXmTasks()"></el-input>
+           <el-popover
             placement="top-start"
             title="选择创建计划/任务的方式"
             width="300"
@@ -93,11 +92,7 @@
 									>
 								</el-col>
 							</el-row> 
-            <el-row>
-              <el-col :span="24" style="padding-top: 5px" v-if="editForm && editForm.id">
-                <font class="more-label-font">当前选中的计划:</font> 
-                <el-tag closable @close="unselectRow()">{{editForm.name}}</el-tag>  
-              </el-col> 
+            <el-row> 
               <el-col :span="24" style="padding-top: 5px">
                 <font class="more-label-font">产品:</font
                 > <xm-product-select :auto-select="false" :link-project-id="filters.selProject && filters.selProject.id?filters.selProject.id:null" @row-click="onProductSelected" @clear="onProductClearSelect"></xm-product-select>
@@ -196,13 +191,13 @@
                 width="50" 
               >
               </el-table-column> 
-              <el-table-column
-                sortable
+              <el-table-column 
                 prop="name"
                 class-name="title" 
                 label="计划名称"
                 min-width="300"
               > 
+              <template slot="header">计划名称 &nbsp;<el-button type="text" @click="unselectRow()">清除选中的行</el-button></template>
                 <template slot-scope="scope">
                   <!--
                   <div    class="icon" :style="{backgroundColor:  scope.row.ntype==='1'?'#E6A23C':'#409EFF'}">
diff --git a/src/views/xm/core/xmTask/XmPhaseSelect.vue b/src/views/xm/core/xmTask/XmPhaseSelect.vue
index 9a8402e5..23ede5f9 100644
--- a/src/views/xm/core/xmTask/XmPhaseSelect.vue
+++ b/src/views/xm/core/xmTask/XmPhaseSelect.vue
@@ -38,14 +38,15 @@
                 fixed="left"
               >
               </el-table-column> 
-              <el-table-column
-                sortable
+              <el-table-column 
                 prop="name"
                 class-name="title"
                 fixed="left"
                 label="计划名称"
                 min-width="300" show-overflow-tooltip
               >
+              
+              <template slot="header">计划名称 &nbsp;<el-button type="text" @click="unselectRow()">清除选中的行</el-button></template>
                 <template slot-scope="scope">
                   <div    class="icon" :style="{backgroundColor:  scope.row.ntype==='1'?'#E6A23C':'#409EFF'}">
 									<i :class="scope.row.ntype==='1'?'el-icon-odometer':'el-icon-s-operation'" ></i>