From e596c46780b0e309fd81ae96833d98d2479d3fd5 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:38:35 +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/XmProjectSelect.vue    |   7 +-
 src/views/xm/core/xmProduct/XmProductMng.vue  | 100 ++++++++++--------
 src/views/xm/core/xmProject/XmProjectMng.vue  |  64 ++++++-----
 3 files changed, 84 insertions(+), 87 deletions(-)

diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue
index 15bdbf9b..cc795758 100644
--- a/src/views/xm/core/components/XmProjectSelect.vue
+++ b/src/views/xm/core/components/XmProjectSelect.vue
@@ -562,12 +562,7 @@ export default {
   },
 };
 </script>
-<style scoped>
-.more-label-font {
-  text-align: center;
-  float: left;
-  padding-top: 5px;
-}
+<style scoped> 
 .align-right {
   float: right;
 }
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index e2f1a6f7..691f6853 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -2,7 +2,7 @@
 	<section>
 		<el-row  class="padding-left padding-right">
 			<!--
-		<el-col :span="6" class="border padding" > 
+		<el-row :span="6" class="border padding" > 
 			<el-row>
 				<el-row>
 					您可以通过 &nbsp;<el-button   @click="showAdd" icon="el-icon-plus" type="primary" plain>项目</el-button>&nbsp;创建一个新项目
@@ -14,9 +14,9 @@
 					通过&nbsp;<el-button @click="templateVisible=true" type="primary" plain style="margin-bottom:5px;">拷贝模板</el-button>&nbsp;快速创建新项目。<br/>
 				</el-row>
 			</el-row> 
-		</el-col> 
+		</el-row> 
 		-->
-		<el-col :span="24" class="padding-left">
+		<el-row :span="24" class="padding-left">
 			<el-row >
 				<el-row>
 					<el-select   v-model="filters.queryScope"  style="width:120px;"  placeholder="产品查询范围" clear>
@@ -36,72 +36,78 @@
 					
 					<el-popover
 						placement="top-start"
-						title=""
+						title="更多查询条件、操作"
 						width="500"
 						trigger="click" >
-						<el-divider content-position="left"><strong>查询条件</strong></el-divider>
+						<el-row> 
+								<el-button   @click="templateVisible=!templateVisible" >{{templateVisible?"隐藏模板":"显示模板"}}</el-button>
+								<el-button  @click="guiderStart(true)" icon="el-icon-help">新手导航</el-button>
+						</el-row>
+						<el-divider></el-divider>
 						<el-row>
-							<el-col :span="24" style="padding-top:5px;">
+							<el-row>
 
 								<font class="more-label-font">
 									产品查询范围：
 								</font>
-								<el-select  v-model="filters.queryScope" style="width:100%;"   placeholder="产品查询范围">
+								<el-select  v-model="filters.queryScope" style="width:200px;"   placeholder="产品查询范围">
 									<el-option :label="userInfo.branchName+'机构下的产品'" value="branchId"></el-option>
 									<el-option label="我相关的产品" value="compete"></el-option>
 									<el-option label="按产品编号精确查找" value="productId"></el-option>
 								</el-select>
-							</el-col>
-							<el-col  :span="24"  style="padding-top:5px;">
-								<el-input v-if="filters.queryScope=='productId'"  v-model="filters.id" style="width:100%;"  placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">
+							</el-row>  
+							<el-row v-if="filters.queryScope=='productId'">
+								<font class="more-label-font">
+									产品编号：
+								</font>
+								<el-input   v-model="filters.id" style="width:200px;" placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">
 								</el-input>
-							</el-col>
-							<el-col v-show="!selProject&&filters.queryScope!='productId'" :span="24"  style="padding-top:5px;">
-								<font class="more-label-font">创建时间:</font>
-								<el-date-picker
-									v-model="dateRanger"
-									type="daterange"
-									align="right"
-									unlink-panels
-									range-separator="至"
-									start-placeholder="开始日期"
-									end-placeholder="完成日期"
-									value-format="yyyy-MM-dd HH:mm:ss"
-									: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" style="width:100%;"  placeholder="输入产品名字关键字">
+								<el-input   v-model="filters.key" style="width:200px;"  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" closable @click="selectFiltersPmUser" @close="clearFiltersPmUser()">{{filters.pmUser.username}}</el-tag>
 								<el-button   v-else @click="selectFiltersPmUser()">选责任人</el-button>
 								<el-button    @click="setFiltersPmUserAsMySelf()">我的</el-button>
-							</el-col>
+							</el-row>
 
-							<el-col v-if="selProject" :span="24"  style="padding-top:5px;">
+							<el-row v-if="selProject">
 								<font class="more-label-font">
 									项目  <el-tag v-if="selProject">{{selProject?selProject.name:''}}</el-tag>
 								</font>
-							</el-col>
-							<el-col  v-if="xmIteration"  :span="24"  style="padding-top:5px;">
+							</el-row>
+							<el-row  v-if="xmIteration">
 								<font class="more-label-font">
 									迭代 <el-tag v-if="xmIteration">{{xmIteration.iterationName}}</el-tag>
 								</font>
-							</el-col>
-							<el-col :span="24"  style="padding-top:10px;">
-								<el-button type="primary" @click="searchXmProducts" >查询</el-button>
-								<el-button type="text"  @click="templateVisible=!templateVisible" >{{templateVisible?"隐藏模板":"显示模板"}}</el-button>
-								<el-button type="text"  @click="guiderStart(true)" icon="el-icon-help">新手导航</el-button>
-							</el-col>
+							</el-row>
+							
+							<el-row v-show="!selProject&&filters.queryScope!='productId'">
+								<font class="more-label-font">创建时间:</font>
+								<el-date-picker
+									v-model="dateRanger"
+									type="daterange"
+									align="right"
+									unlink-panels
+									range-separator="至"
+									start-placeholder="开始日期"
+									end-placeholder="完成日期"
+									value-format="yyyy-MM-dd HH:mm:ss"
+									:default-time="['00:00:00','23:59:59']"
+									:picker-options="pickerOptions"
+								></el-date-picker>
+							</el-row>
+							<el-row>
+								<el-button type="primary" @click="searchXmProducts" style="float:right;" icon="el-icon-search">查询</el-button>
+							</el-row>
 						</el-row>
 						<el-button  slot="reference"  style="margin-top: 10px;" icon="el-icon-more" id="guider-two"></el-button>
 					</el-popover>
@@ -111,21 +117,21 @@
 							width="450" 
 							trigger="click" > 
 							<el-row> 
-								<el-col :span="24" style="padding-top:5px;">
+								<el-row>
 									<el-badge value="都适用">
 									<el-button   @click="showAdd" icon="el-icon-plus">直接添加新产品</el-button> 
 									</el-badge>
-								</el-col>  
-								<el-col :span="24" style="padding-top:5px;">
+								</el-row>  
+								<el-row>
 									<el-badge value="进阶">
 									<el-button type="primary" icon="el-icon-plus" >通过【产品-复制】一键创建新的产品</el-button> 
 									</el-badge>
-								</el-col> 
-								<el-col :span="24" style="padding-top:5px;">
+								</el-row> 
+								<el-row>
 									<el-badge value="新手">
 									<el-button type="warning" @click="templateVisible=!templateVisible" icon="el-icon-plus">通过【模板-复制】一键创建新的产品</el-button> 
 									</el-badge>
-								</el-col> 
+								</el-row> 
 							</el-row>   
  							<el-button type="primary" slot="reference"  style="margin-top: 10px;"  icon="el-icon-plus" v-if="!xmIteration" id="guider-one" round>产品</el-button>
 					</el-popover>
@@ -348,7 +354,7 @@
 						</span>
 					</el-dialog>
 			</el-row>
-		</el-col>
+		</el-row>
 		</el-row> 
 		
 		<el-dialog :visible.sync="templateVisible" append-to-body width="60%" top="20px">
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 7506cd78..388564ad 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>
 		<el-row class="padding-left padding-right"> 
-			<el-col :span="24" class="padding-left"> 
+			<el-row :span="24" class="padding-left"> 
 				<el-row > 
 					<xm-product-select style="display:inline;" class="hidden-md-and-down" :auto-select="false" @row-click="onProductSelected" @clear="onProductClose"></xm-product-select> 
 					<el-select v-model="menukey" @change="handleSelect" clearable style="width:100px;">
@@ -24,26 +24,30 @@
 					<el-button  style="margin-top: 10px;" type="primary" icon="el-icon-search" @click="searchXmProjects">查询</el-button> 
 						<el-popover
 							placement="top-start"
-							title="更多查询条件或操作"
+							title="更多条件、操作"
 							width="400"
 							trigger="click" >
 							<el-row>  
-								<el-col  :span="24"  style="padding-top:5px;">  
-									<el-row>
+								<el-row>   
+									<font class="more-label-font">显示方式:</font>   
 										<el-radio  v-model="showType" :label="false">表格</el-radio>
-										<el-radio  v-model="showType" :label="true">卡片</el-radio>
-									</el-row>
-								</el-col>  
-								<el-col  :span="24"  style="padding-top:5px; " class="hidden-lg-and-up">  
-									<font v-if="filters.productId" class="more-label-font">项目:</font>  
+										<el-radio  v-model="showType" :label="true">卡片</el-radio> 
+								</el-row>  
+								<el-row>    
+									<el-button type="text" @click="templateVisible=!templateVisible">{{templateVisible?'隐藏模板':'显示模板'}}</el-button>
+									<el-button type="text"  @click="guiderStart(true)" icon="el-icon-help">新手导航</el-button>
+								</el-row>  
+								 <el-divider></el-divider>
+								<el-row v-if="filters.productId">  
+									<font  class="more-label-font">项目:</font>  
 									<xm-product-select style="display:inline;"  :auto-select="false" @row-click="onProductSelected" @clear="onProductClose"></xm-product-select> 
-								</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.id" clearable></el-input>
-								</el-col> 
-								<el-col  :span="24"  style="padding-top:5px;">
+									<el-input v-model="filters.id" clearable style="width:200px;"></el-input>
+								</el-row> 
+								<el-row>
 									<font class="more-label-font">创建时间:</font>  
 									<el-date-picker
 										v-model="dateRanger" 
@@ -57,13 +61,10 @@
 										: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-button  type="primary" icon="el-icon-search" @click="searchXmProjects">查询</el-button>
-									<el-button type="text" @click="templateVisible=!templateVisible">{{templateVisible?'隐藏模板':'显示模板'}}</el-button>
-									<el-button type="text"  @click="guiderStart(true)" icon="el-icon-help">新手导航</el-button>
-
-								</el-col>
+								</el-row>  
+								<el-row>
+									<el-button style="float:right;" type="primary" icon="el-icon-search" @click="searchXmProjects">查询</el-button> 
+								</el-row>
 							</el-row>
 							<el-button  slot="reference" icon="el-icon-more" id="prj-more-btn"></el-button>
 						</el-popover>
@@ -73,21 +74,21 @@
 							width="450" 
 							trigger="click" > 
 							<el-row> 
-								<el-col :span="24" style="padding-top:5px;">
+								<el-row>
 									<el-badge value="都适用">
 									<el-button   @click="showAdd" icon="el-icon-plus">直接添加新项目</el-button> 
 									</el-badge>
-								</el-col>  
-								<el-col :span="24" style="padding-top:5px;">
+								</el-row>  
+								<el-row>
 									<el-badge value="进阶">
 									<el-button type="primary" icon="el-icon-plus">通过【项目-复制】一键创建新的项目</el-button> 
 									</el-badge>
-								</el-col> 
-								<el-col :span="24" style="padding-top:5px;">
+								</el-row> 
+								<el-row>
 									<el-badge value="新手">
 									<el-button type="warning" @click="templateVisible=!templateVisible" icon="el-icon-plus">通过【模板-复制】一键创建新的项目</el-button> 
 									</el-badge>
-								</el-col> 
+								</el-row> 
 							</el-row>   
  							<el-button id="prj-plus-btn" type="primary" style="margin-top: 10px;" slot="reference"  icon="el-icon-plus" round>项目</el-button>
 							</el-popover>  
@@ -282,7 +283,7 @@
 					</el-table>
 					<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
 				</el-row>
-			</el-col>
+			</el-row>
 		</el-row>
 		
 		<el-dialog title="项目新增" :visible.sync="addFormVisible" :with-header="false" width="80%" top="20px" :close-on-click-modal="false" append-to-body>
@@ -1085,10 +1086,5 @@
 		overflow-y: auto;
 	}
 }
-
-.more-label-font{
-	text-align:center;
-	float:left;
-	padding-top:5px;
-}
+ 
 </style>
\ No newline at end of file