From 3a7143ab7a248fa356fa4f0bb7ed96c0c97fe309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 9 Feb 2023 23:57:52 +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/xmFunc/XmFuncSelect.vue | 33 +++++++++++------------
 src/views/xm/core/xmTask/XmPhase.vue      |  7 ++---
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/views/xm/core/xmFunc/XmFuncSelect.vue b/src/views/xm/core/xmFunc/XmFuncSelect.vue
index b446f354..746d2923 100644
--- a/src/views/xm/core/xmFunc/XmFuncSelect.vue
+++ b/src/views/xm/core/xmFunc/XmFuncSelect.vue
@@ -12,28 +12,25 @@
 			<el-table ref="xmFuncTable"  element-loading-text="努力加载中" element-loading-spinner="el-icon-loading"  :data="xmFuncsTreeData" :max-height="maxTableHeight" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;" current-row-key="id" row-key="id" :tree-props="{children: 'children'}" >
 				 
                 <el-table-column prop="name" label="模块" min-width="150" > 
-								<template slot="header"> 模块 &nbsp;<slot name="title-bar"></slot><el-button type="text" @click="unselectRow()">取消选中状态</el-button></template>
+								<template slot="header"> 模块 &nbsp;<slot name="title-bar"></slot> </template>
 								<template slot-scope="scope">
 									 
 									<span> {{scope.row.name}}</span> 
- 									 <div class="tool-bar"> 
-                                        <el-popover :open-delay=500
-                                            placement="top-start"
-                                            title="增删改"
-                                            width="400"
-                                            trigger="hover">
-                                            
-                                            <el-button  type="primary"  @click.stop="showSubAdd( scope.row,scope.$index)" icon="el-icon-plus" title="新建子模块" >新建子模块 </el-button>
-                                            <el-button      @click.stop="showEdit( scope.row,scope.$index )" icon="el-icon-edit" title="编辑">编辑</el-button> 
-                                            <el-button type="danger" v-loading="load.del" @click="handleDel(scope.row,scope.$index)"   icon="el-icon-delete"  >删除</el-button>
-  
-                                            <el-button slot="reference" icon="el-icon-setting" @click.stop></el-button>
-                                        </el-popover>
-                                                    
+ 
+                                    <el-popover class="tool-bar" :open-delay=500
+                                        placement="top-start"
+                                        title="增删改"
+                                        width="400"
+                                        trigger="hover">
+                                        
+                                        <el-button  type="primary"  @click.stop="showSubAdd( scope.row,scope.$index)" icon="el-icon-plus" title="新建子模块" >新建子模块 </el-button>
+                                        <el-button      @click.stop="showEdit( scope.row,scope.$index )" icon="el-icon-edit" title="编辑">编辑</el-button> 
+                                        <el-button type="danger" v-loading="load.del" @click="handleDel(scope.row,scope.$index)"   icon="el-icon-delete"  >删除</el-button>
+
+                                        <el-button type="text" size="mini" circle plain slot="reference" icon="el-icon-setting" @click.stop></el-button>
+                                    </el-popover> 
+                                    <el-button type="text" size="mini" circle plain v-if="editForm&&editForm.id==scope.row.id" @click.stop="unselectRow()" title="取消选中状态" icon="el-icon-circle-close"></el-button>
 
-                                            
-                                         
-									</div>
   								</template> 
 							</el-table-column> 
                             <template v-if="showSelect">
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 2fb07617..fcded8cc 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -130,11 +130,8 @@
               > 
               <template slot="header"> 
 									<div style="display:flex;">
-										<div style="text-align: center;line-height: 32px;">计划名称</div>
-										&nbsp;&nbsp;
-										<el-button type="text" class="hidden-lg-and-up" icon="el-icon-circle-close" @click="unselectRow()" title="取消选中状态">取消选中状态</el-button>
-										<el-button type="text" class="hidden-md-and-down" icon="el-icon-circle-close" @click="unselectRow()" title="取消选中状态">取消选中状态</el-button>
-										<el-input v-if=" !selProject || !selProject.id" v-model="filters.key" style="width:50%;margin-left: auto;"  placeholder="名称模糊查询"  clearable></el-input>  
+										<div style="text-align: center;line-height: 32px;">计划名称</div> 
+ 										<el-input v-if=" !selProject || !selProject.id" v-model="filters.key" style="width:50%;margin-left: auto;"  placeholder="名称模糊查询"  clearable></el-input>  
 									</div>
               </template>
                 <template slot-scope="scope">