From bf52fabe575938c365563f1dcd854b2a04b90e6b 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, 10 Feb 2023 00:05:59 +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/components/XmProjectSelect.vue     | 12 +++---------
 .../xm/core/xmProject/XmProjectForLinkComplex.vue    |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue
index b4cbc600..8256d82b 100644
--- a/src/views/xm/core/components/XmProjectSelect.vue
+++ b/src/views/xm/core/components/XmProjectSelect.vue
@@ -13,15 +13,7 @@
           @click="refreshSelect"
           title="重新从后台刷新数据回来"
           >刷新</el-button
-        >&nbsp;&nbsp;
-        <el-button
-          v-if="editForm && editForm.id"
-          type="text"
-          icon="el-icon-circle-close"
-          @click="clearSelect"
-          title="清空当前选中的项目"
-          >取消选中状态&nbsp;&nbsp;</el-button
-        >
+        > 
 		<el-button
               @click="addProjectVisible = true"
               icon="el-icon-plus"
@@ -170,6 +162,8 @@
             </template>
             <template slot-scope="scope">
              <div class="icon" style="background-color:#ffd04b"><i class="el-icon-odometer" ></i></div><font>{{ scope.row.name }}</font>
+             <el-button type="text" size="mini" circle plain v-if="editForm&&editForm.id==scope.row.id" @click.stop="clearSelect()" title="取消选中状态" icon="el-icon-circle-close"></el-button>
+
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
index 7d9f6dc0..f60d5e13 100644
--- a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
@@ -14,7 +14,7 @@
               >
               <template v-slot:title="{project}">
                 <h4 href="#"><div style="max-width:15vw;" class="res-text hidden-md-and-down"><i style="font-size:16px;" class="el-icon-sort"></i> {{project && project.id?project.name:'请选择一个项目'}}</div></h4>
-                <h4 href="#"><div style="max-width:19vw;" class="res-text hidden-lg-and-up"><i style="font-size:16px;" class="el-icon-sort"></i> {{project & project.id ?project.name:'请选择一个项目'}}</div></h4>
+                <h4 href="#"><div style="max-width:19vw;" class="res-text hidden-lg-and-up"><i style="font-size:16px;" class="el-icon-sort"></i> {{project && project.id ?project.name:'请选择一个项目'}}</div></h4>
               </template>
             </xm-project-select> 
           </el-row>