From 56bed12b371def93c34bd52b825dfcbda9b6c935 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, 9 Aug 2022 23:57:22 +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/XmIterationSelect.vue  | 28 +++++++--------
 .../xm/core/components/XmProductSelect.vue    | 36 +++++++++----------
 2 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/src/views/xm/core/components/XmIterationSelect.vue b/src/views/xm/core/components/XmIterationSelect.vue
index af7fc688..acf765b9 100644
--- a/src/views/xm/core/components/XmIterationSelect.vue
+++ b/src/views/xm/core/components/XmIterationSelect.vue
@@ -21,16 +21,17 @@
 					>创建迭代</el-button>&nbsp;&nbsp;
 				<el-popover 
 					placement="top-start"
-					title=""
+					title="更多条件、操作"
 					v-model="moreVisible"
 					width="400"
 					trigger="manual" >
+					<el-button  type="text" style="float:right;margin-top:-40px;"  @click="moreVisible=false" icon="el-icon-close">关闭</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"   placeholder="输入迭代编号">  
 							</el-input> 
-						</el-col>
-						<el-col  :span="24"  style="padding-top:5px;">
+						</el-row>
+						<el-row>
 							<font class="more-label-font">上线时间:</font>
 							<el-date-picker 
 								v-model="dateRangerOnline"
@@ -44,14 +45,13 @@
 								:default-time="['00:00:00','23:59:59']"
 								:picker-options="pickerOptions"
 							></el-date-picker>
-						</el-col>
-						<el-col :span="24" style="padding-top:5px;">
+						</el-row>
+						<el-row>
 								<font class="more-label-font">迭代名称:</font><el-input  v-model="filters.key"  placeholder="模糊查询"></el-input>
-						</el-col> 
-						<el-col :span="24" style="padding-top:5px;">
-							<el-button  type="text"   @click="moreVisible=false">关闭</el-button>
-							<el-button  type="primary" icon="el-icon-search" @click="searchXmIterations">查询</el-button>
-						</el-col> 
+						</el-row> 
+						<el-row> 
+							<el-button style="float:right;" type="primary" icon="el-icon-search" @click="searchXmIterations">查询</el-button>
+						</el-row> 
 					</el-row>
 					<el-button type="text" slot="reference" @click="moreVisible=!moreVisible"  icon="el-icon-search">更多条件</el-button>
 				</el-popover>
@@ -424,11 +424,7 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .more-label-font{
-  	text-align:center;
-  	float:left;
-  	padding-top:5px; 
-  }
+ 
   .font-class{
 	  color: rgba(116, 85, 85, 0.493);
   }
diff --git a/src/views/xm/core/components/XmProductSelect.vue b/src/views/xm/core/components/XmProductSelect.vue
index 70ab9545..64812405 100644
--- a/src/views/xm/core/components/XmProductSelect.vue
+++ b/src/views/xm/core/components/XmProductSelect.vue
@@ -29,13 +29,16 @@
               >创建产品</el-button>&nbsp;&nbsp;
         <el-popover
           placement="top-start"
-          title=""
+          title="更多条件、操作"
           width="400"
           v-model="moreVisible"
           trigger="manual"
         >
+        
+              <el-button type="text" style="float:right;margin-top:-40px;" @click="moreVisible = false" icon="el-icon-close"
+                >关闭</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="searchXmProducts"
               >
               </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"
@@ -84,14 +87,12 @@
                 >选责任人</el-button
               >
               <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="searchXmProducts"
+            </el-row>
+            <el-row>
+              <el-button type="primary" style="float:right;" @click="searchXmProducts"
                 >查询</el-button
               >
-            </el-col>
+            </el-row>
           </el-row>
           <el-button
             type="text"
@@ -544,12 +545,7 @@ export default {
   },
 };
 </script>
-<style scoped>
-.more-label-font {
-  text-align: center;
-  float: left;
-  padding-top: 5px;
-}
+<style scoped> 
 .align-right {
   float: right;
 }