From 603c0aca38eb0c9a1723cb26b0e39701d109941e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 10 Aug 2022 00:03:09 +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

---
 .../xm/core/components/XmProductSelect.vue    |  4 +--
 .../xm/core/components/XmProjectSelect.vue    | 30 ++++++++++---------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/views/xm/core/components/XmProductSelect.vue b/src/views/xm/core/components/XmProductSelect.vue
index 64812405..10033f69 100644
--- a/src/views/xm/core/components/XmProductSelect.vue
+++ b/src/views/xm/core/components/XmProductSelect.vue
@@ -89,7 +89,7 @@
               <el-button @click="setFiltersPmUserAsMySelf()">我的</el-button>
             </el-row>
             <el-row>
-              <el-button type="primary" style="float:right;" @click="searchXmProducts"
+              <el-button type="primary" style="float:right;" @click="searchXmProducts" icon="el-icon-search"
                 >查询</el-button
               >
             </el-row>
@@ -97,7 +97,7 @@
           <el-button
             type="text"
             slot="reference" 
-            @click="moreVisible = !moreVisible"
+            @click="moreVisible = !moreVisible" icon="el-icon-search"
             >更多条件</el-button
           >
         </el-popover>
diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue
index 3d249b92..15bdbf9b 100644
--- a/src/views/xm/core/components/XmProjectSelect.vue
+++ b/src/views/xm/core/components/XmProjectSelect.vue
@@ -29,13 +29,16 @@
               >创建项目</el-button>
                 <el-popover
                   placement="top-start"
-                  title=""
+                  title="更多条件、操作"
                   width="400"
                   v-model="moreVisible"
                   trigger="manual"
                 >
+                <el-button type="text" icon="el-icon-close" @click="moreVisible = false" style="float:right;margin-top:-40px;"
+                        >关闭</el-button
+                      >
                   <el-row>
-                    <el-col :span="24" style="padding-top: 5px">
+                    <el-row>
                       <font class="more-label-font">项目编号:</font>
                       <el-input
                         v-model="filters.id"
@@ -44,9 +47,9 @@
                         @keyup.enter.native="searchXmProjects"
                       >
                       </el-input>
-                    </el-col>
+                    </el-row>
 
-                    <el-col :span="24" style="padding-top: 5px">
+                    <el-row>
                       <font class="more-label-font">创建时间:</font>
                       <el-date-picker
                         v-model="dateRanger"
@@ -60,9 +63,9 @@
                         :default-time="['00:00:00', '23:59:59']"
                         :picker-options="pickerOptions"
                       ></el-date-picker>
-                    </el-col>
+                    </el-row>
 
-                    <el-col :span="24" style="padding-top: 5px">
+                    <el-row>
                       <font class="more-label-font"> 项目名称: </font>
                       <el-input
                         v-model="filters.key"
@@ -70,8 +73,8 @@
                         placeholder="输入项目名字关键字"
                       >
                       </el-input>
-                    </el-col>
-                    <el-col :span="24" style="padding-top: 5px">
+                    </el-row>
+                    <el-row>
                       <font class="more-label-font"> 项目经理: </font>
                       <el-tag
                         v-if="filters.pmUser"
@@ -86,19 +89,18 @@
                       <el-button @click="setFiltersPmUserAsMySelf()"
                         >我的</el-button
                       >
-                    </el-col>
-                    <el-col :span="24" style="padding-top: 5px">
-                      <el-button type="text" @click="moreVisible = false"
-                        >关闭</el-button
-                      ><el-button type="primary" @click="searchXmProjects"
+                    </el-row>
+                    <el-row>
+                      <el-button type="primary" @click="searchXmProjects" style="float:right;"
                         >查询</el-button
                       >
-                    </el-col>
+                    </el-row>
                   </el-row>
                   <el-button
                     type="text"
                     slot="reference"
                     @click="moreVisible = !moreVisible" 
+                    icon="el-icon-search"
                     >更多条件</el-button
                   >
                 </el-popover>