优化

src/views/xm/core/components/XmIterationSelect.vue

@@ -28,13 +28,18 @@
 					<el-button  type="text" style="float:right;margin-top:-40px;"  @click="moreVisible=false" icon="el-icon-close">关闭</el-button>
 					
 					<el-divider></el-divider> 
+					
+            
 						<el-row>
+							<font class="more-label-font"> 迭代管理员: </font>
+							<mdp-select-user-xm label="选择迭代管理员" v-model="filters" userid-key="adminUserid" username-key="adminUsername" :project-id="linkProjectId" :clearable="true"></mdp-select-user-xm>
+						</el-row>
 						<el-row> 
-							<font class="more-label-font">迭代编号:</font><el-input  v-model="filters.id"  style="width:200px;"  placeholder="输入迭代编号">  
+							<font class="more-label-font">迭代编号:</font><el-input  v-model="filters.id"  style="width:200px;"  placeholder="输入迭代编号" clearable>  
 							</el-input> 
 						</el-row>
 						<el-row>
-								<font class="more-label-font">迭代名称:</font><el-input  v-model="filters.key" style="width:200px;" placeholder="模糊查询"></el-input>
+								<font class="more-label-font">迭代名称:</font><el-input  v-model="filters.key" style="width:200px;" placeholder="模糊查询" clearable></el-input>
 						</el-row> 
 						
 						<el-row>
@@ -55,7 +60,6 @@
 						<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>
 				<el-button type="text" @click="close" style="float:right;" icon="el-icon-close">关闭</el-button> 
@@ -168,6 +172,8 @@
 					key: '',
 					queryScope:'',//迭代查询范围 iterationId\branchId\compete\''
 					id:'',//迭代编号
+					adminUserid:'',
+					adminUsername:'',
 				},
 				pickerOptions:  util.getPickerOptions('datarange'), 
 				dateRangerOnline: [ 
@@ -260,7 +266,9 @@
 				if(this.linkProjectId){
 					params.linkProjectId=this.linkProjectId
 				} 
-				
+				if(this.filters.adminUserid){
+					params.adminUserid=this.filters.adminUserid
+				}
 				if(this.dateRangerOnline && this.dateRangerOnline.length==2){
 					params.onlineTimeStart=this.dateRangerOnline[0] 
 					params.onlineTimeEnd=this.dateRangerOnline[1] 
@@ -284,7 +292,7 @@
 								this.rowClick(row)
 							} 
 						}else{
-							if(this.xmIterations.length==0 ){
+							if(this.xmIterations.length==0 && this.moreVisible==false){
 								if(this.editForm && this.editForm.id){
 									this.clearSelectIteration()
 								}

src/views/xm/core/components/XmProductSelect.vue

@@ -40,13 +40,18 @@
           <el-row>
             
 						<el-divider></el-divider>
+            
+            <el-row>
+              <font class="more-label-font"> 产品经理: </font>
+              <mdp-select-user-xm label="选择产品经理" v-model="filters" userid-key="pmUserid" username-key="pmUsername" :project-id="linkProjectId" :clearable="true"></mdp-select-user-xm>
+            </el-row>
             <el-row>
               <font class="more-label-font">产品编号:</font>
               <el-input
                 v-model="filters.id"
                 style="width: 200px;"
                 placeholder="输入产品编号"
-                @keyup.enter.native="searchXmProducts"
+                 clearable 
               >
               </el-input>
             </el-row>
@@ -55,15 +60,11 @@
               <font class="more-label-font"> 产品名称: </font>
               <el-input
                 v-model="filters.key"
-                style="width: 200px;"
+                style="width: 200px;" clearable
                 placeholder="输入产品名字关键字"
               >
               </el-input>
             </el-row>
-            <el-row>
-              <font class="more-label-font"> 产品经理: </font>
-              <mdp-select-user-xm label="选择产品经理" v-model="filters" userid-key="pmUserid" username-key="pmUsername" :project-id="linkProjectId" :clearable="true"></mdp-select-user-xm>
-            </el-row>
             
 
             <el-row>

src/views/xm/core/components/XmProjectSelect.vue

@@ -40,13 +40,18 @@
                   <el-row>
                     
 								<el-divider></el-divider>
+                
+                    <el-row>
+                      <font class="more-label-font"> 项目经理: </font>
+                     <mdp-select-user-xm label="选择项目经理" v-model="filters" userid-key="pmUserid" username-key="pmUsername" :clearable="true"></mdp-select-user-xm>
+                    </el-row>
                     <el-row>
                       <font class="more-label-font">项目编号:</font>
                       <el-input
                         v-model="filters.id"
                         style="width: 200px;"
                         placeholder="输入项目编号" 
-                        @keyup.enter.native="searchXmProjects"
+                         clearable
                       >
                       </el-input>
                     </el-row>
@@ -57,13 +62,10 @@
                         v-model="filters.key"
                         style="width: 200px;"
                         placeholder="输入项目名字关键字"
+                         clearable
                       >
                       </el-input>
                     </el-row>
-                    <el-row>
-                      <font class="more-label-font"> 项目经理: </font>
-                      <mdp-select-user-xm label="选择项目经理" v-model="filters" userid-key="pmUserid" username-key="pmUsername" :clearable="true"></mdp-select-user-xm>
-                    </el-row>
 
                     <el-row>
                       <font class="more-label-font">创建时间:</font>
@@ -218,7 +220,6 @@ import { listXmProject } from "@/api/xm/core/xmProject";
 import { mapGetters } from "vuex"; 
 const map = new Map();
  
-import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index";
 import XmProjectAdd from "../xmProject/XmProjectEdit.vue";
 
 export default {
@@ -503,7 +504,7 @@ export default {
     }, 
   }, //end methods
   components: {
-    MdpSelectUserXm,XmProjectAdd,
+    "mdp-select-user-xm":()=>import("./MdpSelectUserXm/index.vue"),XmProjectAdd,
     //在下面添加其它组件
   },
   mounted() {

src/views/xm/core/xmTask/XmTaskMng.vue

@@ -88,11 +88,12 @@
               <el-divider></el-divider>
               <el-row>
                 <font class="more-label-font">显示方式:</font
-                >  <el-row>
-                    <el-radio v-model="displayType" label="grant">甘特图</el-radio>
+                >   
+                <span class="more-label-font">
+                    <el-radio v-model="displayType" label="grant" >甘特图</el-radio>
                     <el-radio v-model="displayType" label="agile">敏捷看板</el-radio>
                     <el-radio v-model="displayType" label="table">表格</el-radio> 
-                  </el-row>
+                </span>
               </el-row>
               <el-divider></el-divider>
               <el-row>
@@ -161,7 +162,7 @@
               <el-row>
                 <font class="more-label-font">众包任务:</font>
 
-                <el-checkbox
+                <el-checkbox  class="more-label-font"
                   v-model="filters.taskOut"
                   true-label="1"
                   false-label=""