优化

src/views/xm/core/xmGroup/XmGroupMng.vue

@@ -1,7 +1,7 @@
 <template>
 	<section class="page-container border padding" >
 		<el-row>  
-			<xm-project-select style="display:inline;" v-if="!selProject &&pgClass==='0'" :auto-select="false"   :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null"  @row-click="onProjectRowClick" @clear-select="onProjectClearSelect"></xm-project-select>
+			<xm-project-select style="display:inline;" v-if="!selProject &&pgClass==='0'" :auto-select="false"   :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null"  @row-click="onProjectRowClick" @clear="onProjectClearSelect"></xm-project-select>
 			
 			<el-input v-model="filters.key" style="width:15%;" clearable placeholder="名称过滤"></el-input>   
 			<el-button  type="primary" @click="searchXmGroups" icon="el-icon-search">刷新</el-button> 

src/views/xm/core/xmGroup/XmGroupSelect.vue

@@ -2,9 +2,9 @@
 	<section class="border padding-left">
 		<el-row class="padding-top"> 
  
-						<xm-project-select style="display:inline;" v-if="!selProject" :auto-select="false" :xm-product="xmProduct"  @row-click="onProjectRowClick" @clear-select="onProjectClose"></xm-project-select>
+						<xm-project-select style="display:inline;" v-if="!selProject" :auto-select="false" :xm-product="xmProduct"  @row-click="onProjectRowClick" @clear="onProjectClose"></xm-project-select>
  
-						<xm-product-select style="display:inline;" v-if="!xmProduct" :auto-select="false"  :link-project-id="selProject?selProject.id:null" @row-click="onProductRowClick" @clear-select="onProductClose"></xm-product-select>
+						<xm-product-select style="display:inline;" v-if="!xmProduct" :auto-select="false"  :link-project-id="selProject?selProject.id:null" @row-click="onProductRowClick" @clear="onProductClose"></xm-product-select>
 							 
 					<el-button   type="primary" @click="userConfirm" icon="el-icon-finished">确认选择</el-button>  
 		</el-row>  

src/views/xm/core/xmIteration/XmIterationAdd.vue

@@ -4,7 +4,7 @@
 			<!--新增界面 XmIteration 迭代定义--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">   
 				<el-form-item label="归属产品" prop="productId">  
-						<xm-product-select v-if="!xmProduct||!xmProduct.id" ref="xmProductSelect" :auto-select="true" :sel-project="selProject"   @row-click="onProductRowClick" @clear-select="onProductClearSelect" @close="productSelectVisible=false"></xm-product-select>
+						<xm-product-select v-if="!xmProduct||!xmProduct.id" ref="xmProductSelect" :auto-select="true" :sel-project="selProject"   @row-click="onProductRowClick" @clear="onProductClearSelect" @close="productSelectVisible=false"></xm-product-select>
  
 					<span v-else>{{addForm.productName}}</span>
 				</el-form-item>

src/views/xm/core/xmMenu/XmMenuMng.vue

@@ -3,7 +3,7 @@
 		<el-row>
 			<el-col :span="24" class="padding-left">
 					<el-row>
-						<xm-product-select ref="xmProductSelect1" style="display:inline;" v-if="!xmProduct && !xmIteration"   :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear-select="onProductClearSelect"></xm-product-select>
+						<xm-product-select ref="xmProductSelect1" style="display:inline;" v-if="!xmProduct && !xmIteration"   :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClearSelect"></xm-product-select>
 
 						<xm-iteration-select v-if="!xmIteration || !xmIteration.id" style="display:inline;" :auto-select="false"  :product-id="filters.product?filters.product.id:null" :link-project-id="selProject?selProject.id:null"   placeholder="迭代"  @row-click="onIterationSelected" @clear="onIterationClearSelect">
 					    </xm-iteration-select>

src/views/xm/core/xmMenu/XmMenuSelect.vue

@@ -3,9 +3,9 @@
 		<el-row>   
 			<el-col :span="24"  style="padding-left:12px;" >
 				<el-row>     
-						<xm-product-select style="display:inline;" v-if="!xmProduct&&!xmIteration" :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected" ref="xmProductMng" :iteration-id="xmIteration?xmIteration.id:null"  @clear-select="onProductClearSelect"></xm-product-select>
+						<xm-product-select style="display:inline;" v-if="!xmProduct&&!xmIteration" :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected" ref="xmProductMng" :iteration-id="xmIteration?xmIteration.id:null"  @clear="onProductClearSelect"></xm-product-select>
  
-						<xm-iteration-select style="display:inline;"  v-if="!xmIteration" :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onIterationSelected" ref="xmIterationMng" :product-id="xmProduct?xmProduct.id:null"  @clear-select="onIterationClearSelect"></xm-iteration-select>
+						<xm-iteration-select style="display:inline;"  v-if="!xmIteration" :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onIterationSelected" ref="xmIterationMng" :product-id="xmProduct?xmProduct.id:null"  @clear="onIterationClearSelect"></xm-iteration-select>
 						 
 						<el-select  v-model="filters.taskFilterType" placeholder="已分配任务的需求？" clearable v-if="taskFilterType">
 							<el-option   value="not-join-any-project"  label="未分配过任务的需求"></el-option>  

src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue

@@ -6,7 +6,7 @@
 						placement="bottom"
 						width="400"
 						trigger="click"> 
-						<xm-product-tpl-mng :auto-select="true" :isSelect="true"  showType="simple"  @row-click="onProductRowClick" @clear-select="onProductClearSelect"></xm-product-tpl-mng>
+						<xm-product-tpl-mng :auto-select="true" :isSelect="true"  showType="simple"  @row-click="onProductRowClick" @clear="onProductClearSelect"></xm-product-tpl-mng>
 							<el-link type="warning" slot="reference" icon="el-icon-search"><font style="font-size:14px;">{{filters.product?filters.product.productName:'选择产品模板'}}</font></el-link> 
 					</el-popover>
 					<el-input v-model="filters.key" style="width: 20%;" placeholder="需求名字模糊查询"></el-input> 

src/views/xm/core/xmProduct/XmProductForLinkComplex.vue

@@ -5,7 +5,7 @@
 				<el-tabs type="border-card"  :value="showPanel"  @tab-click="tabClick">
 					<el-tab-pane disabled> 
 						<div  slot="label">
-								<xm-product-select ref="xmProductSelect" :auto-select="true" :link-project-id="selProject?selProject.id:null" :iterationId="xmIteration?xmIteration.id:null"  @row-click="onProductRowClick" @clear-select="onProductClearSelect"></xm-product-select>
+								<xm-product-select ref="xmProductSelect" :auto-select="true" :link-project-id="selProject?selProject.id:null" :iterationId="xmIteration?xmIteration.id:null"  @row-click="onProductRowClick" @clear="onProductClearSelect"></xm-product-select>
 						</div>
 					</el-tab-pane>
 					<el-tab-pane disabled> 

src/views/xm/core/xmProject/XmProjectForLinkComplex.vue

@@ -5,7 +5,7 @@
 				<el-tabs type="border-card"  :value="showPanel" @tab-click="tabClick">
 					<el-tab-pane disabled> 
 						<div  slot="label"> 
-								<xm-project-select ref="xmProjectSelect" :auto-select="true"  :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null"  @row-click="onProjectRowClick" @clear-select="onProjectClearSelect"></xm-project-select>
+								<xm-project-select ref="xmProjectSelect" :auto-select="true"  :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null"  @row-click="onProjectRowClick" @clear="onProjectClearSelect"></xm-project-select>
  								  
 						</div>
 					 </el-tab-pane> 

src/views/xm/core/xmProject/XmProjectMng.vue

@@ -8,7 +8,7 @@
 			</el-col> 
 			<el-col :span="templateVisible?18:24" class="border padding-top padding-right"> 
 				<el-row class="padding-left"> 
-					<xm-product-select style="display:inline;" class="hidden-md-and-down" :auto-select="false" @row-click="onProductSelected" @clear-select="onProductClose"></xm-product-select> 
+					<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>
 						<el-option value="all" label="全部"></el-option>
 						<el-option value="compete"  label="我参与"></el-option>

src/views/xm/core/xmQuestion/XmQuestionMng.vue

@@ -1,8 +1,8 @@
 <template>
 	<section class="padding">
 			<el-row>
-				<xm-product-select v-if="!xmProduct&&!xmIteration" style="display:inline;" :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected" @clear-select="clearProduct"></xm-product-select>
-			  	<xm-project-select v-if="!selProject" style="display:inline;" ref="xmProjectSelect" :auto-select="false" :link-product-id="xmProduct?xmProduct.id:null" @row-click="onProjectConfirm" @clear-select="clearProject"></xm-project-select>
+				<xm-product-select v-if="!xmProduct&&!xmIteration" style="display:inline;" :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected" @clear="clearProduct"></xm-product-select>
+			  	<xm-project-select v-if="!selProject" style="display:inline;" ref="xmProjectSelect" :auto-select="false" :link-product-id="xmProduct?xmProduct.id:null" @row-click="onProjectConfirm" @clear="clearProject"></xm-project-select>
 
 				  <el-select v-model="filters.bugStatus" placeholder="状态" style="width:100px;"  clearable @change="changeBugStatus">
 					<el-option v-for="(b,index) in dicts['bugStatus']" :value="b.id"  :key="index" :label="b.name">{{b.name}}

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

@@ -7,7 +7,7 @@
 							placement="bottom"
 							width="400"
 							trigger="click"> 
-							<xm-project-select v-if="ptype!=='1' && (!selProject||!selProject.id)" :auto-select="true"  :xm-iteration="xmIteration" :xm-product="xmProduct"  @row-click="onProjectRowClick" @clear-select="onProjectClear"></xm-project-select>
+							<xm-project-select v-if="ptype!=='1' && (!selProject||!selProject.id)" :auto-select="true"  :xm-iteration="xmIteration" :xm-product="xmProduct"  @row-click="onProjectRowClick" @clear="onProjectClear"></xm-project-select>
 								<el-link type="warning" slot="reference" v-if="ptype!=='1' && (!selProject||!selProject.id)"  icon="el-icon-search"><font style="font-size:14px;">{{filters.selProject?filters.selProject.name:'选择项目'}}</font></el-link> 
 						</el-popover> 
 						

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

@@ -7,7 +7,7 @@
         :class="{ 'flex-box': displayType == 'agil' }"
       >
         <el-row> 
-            <xm-project-select style="display:inline;" v-if="!selProject||!selProject.id" :auto-select="true"  :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null"  @row-click="onProjectRowClick" @clear-select="onProjectClear" ></xm-project-select>
+            <xm-project-select style="display:inline;" v-if="!selProject||!selProject.id" :auto-select="true"  :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null"  @row-click="onProjectRowClick" @clear="onProjectClear" ></xm-project-select>
               
 					<el-select style="width: 100px" v-model="filters.taskState" placeholder="状态" clearable>
 									<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.taskState" :key="index"></el-option> 
@@ -239,7 +239,7 @@
             <el-row>
               <el-col :span="24" style="padding-top: 5px">
                 <font class="more-label-font">产品:</font
-                > <xm-product-select :auto-select="false" :link-project-id="filters.selProject && filters.selProject.id?filters.selProject.id:null" @row-click="onProductSelected" @clear-select="onProductClearSelect"></xm-product-select>
+                > <xm-product-select :auto-select="false" :link-project-id="filters.selProject && filters.selProject.id?filters.selProject.id:null" @row-click="onProductSelected" @clear="onProductClearSelect"></xm-product-select>
               </el-col>
               <el-col :span="24" style="padding-top: 5px">
                 <font class="more-label-font">需求:</font>

src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue

@@ -11,7 +11,7 @@
         <el-form-item label="选择项目：" prop="projectId">
 <!--          <el-button v-if="!editForm.projectId" type="primary" @click="projSelVisible=true" round>选择项目</el-button>-->
           <div v-if="!editForm.projectId">
-            <xm-project-select style="display:inline;" :auto-select="false" @row-click="onProjectRowClick(arguments)" @clear-select="onProjectClear" ></xm-project-select>
+            <xm-project-select style="display:inline;" :auto-select="false" @row-click="onProjectRowClick(arguments)" @clear="onProjectClear" ></xm-project-select>
           </div>
           <span v-else>{{editForm.projectId}}</span>
         </el-form-item>

src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue

@@ -1,7 +1,7 @@
 <template>
 	<section class="page-container border padding">
 		<el-row>
-      <xm-project-select style="display:inline;" ref="xmProjectSelect" :auto-select="false"  @row-click="onProjectConfirm" @clear-select="clearProject"></xm-project-select>
+      <xm-project-select style="display:inline;" ref="xmProjectSelect" :auto-select="false"  @row-click="onProjectConfirm" @clear="clearProject"></xm-project-select>
       <el-select v-model="filters.status" clearable @change="searchXmTaskSbills" placeholder="请选择结算单状态">
         <el-option label="全部状态" value=""></el-option>
         <el-option label="结算待提交" value="0"></el-option>

src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue

@@ -5,7 +5,7 @@
 						placement="bottom"
 						width="400"
 						trigger="click"> 
-						<xm-project-tpl-mng :auto-select="true" :isSelect="true" showType="simple"  @row-click="onProjectRowClick" @clear-select="onProjectClearSelect"></xm-project-tpl-mng>
+						<xm-project-tpl-mng :auto-select="true" :isSelect="true" showType="simple"  @row-click="onProjectRowClick" @clear="onProjectClearSelect"></xm-project-tpl-mng>
 							<el-link type="warning" slot="reference" icon="el-icon-search"><font style="font-size:14px;">{{filters.project?filters.project.name:'选择项目模板'}}</font></el-link> 
 					</el-popover>
 					
@@ -13,7 +13,7 @@
 						placement="bottom"
 						width="400"
 						trigger="click"> 
-						<xm-product-tpl-mng :auto-select="true" :isSelect="true"  showType="simple"  @row-click="onProductRowClick" @clear-select="onProductClearSelect"></xm-product-tpl-mng>
+						<xm-product-tpl-mng :auto-select="true" :isSelect="true"  showType="simple"  @row-click="onProductRowClick" @clear="onProductClearSelect"></xm-product-tpl-mng>
 							<el-link type="warning" slot="reference" icon="el-icon-search"><font style="font-size:14px;">{{filters.product?filters.product.productName:'选择产品模板'}}</font></el-link> 
 					</el-popover>
 					<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 

src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue

@@ -1,7 +1,7 @@
 <template>
 	<section class="page-container border padding">
 		<el-row>
-      <xm-project-select style="display:inline;" ref="xmProjectSelect" :auto-select="false"  @row-click="onProjectConfirm" @clear-select="clearProject"></xm-project-select>
+      <xm-project-select style="display:inline;" ref="xmProjectSelect" :auto-select="false"  @row-click="onProjectConfirm" @clear="clearProject"></xm-project-select>
       <el-select v-if="wstatuses && wstatuses.toString()=='0,2'" v-model="filters.wstatus" clearable @change="searchXmTaskWorkloads" placeholder="请选择工时单状态">
         <el-option label="全部状态" value=""></el-option>
         <el-option label="待确认" value="0"></el-option>

src/views/xm/core/xmTestCase/XmTestCaseMng.vue

@@ -3,7 +3,7 @@
 		<el-row> 
 			<div>
 				
-				<xm-product-select style="display:inline;" :auto-select="false" :link-project-id="filters.selProject?filters.selProject.id:null"   @row-click="onProductSelected" @clear-select="filters.xmProduct=null"></xm-product-select>
+				<xm-product-select style="display:inline;" :auto-select="false" :link-project-id="filters.selProject?filters.selProject.id:null"   @row-click="onProductSelected" @clear="filters.xmProduct=null"></xm-product-select>
 				<el-button v-if=" !filters.menus || filters.menus.length==0" @click="showMenu"> 选择需求</el-button>
 				<el-tag v-else   closable @close=" clearFiltersMenu(filters.menus[0])">{{filters.menus[0].menuName.substr(0,5)}}等({{filters.menus.length}})个</el-tag>
 				<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
@@ -18,10 +18,10 @@
 					trigger="click" > 
 					<el-row>
 						<el-col :span="24" style="padding-top:5px;">
-							<xm-product-select :auto-select="false" :link-project-id="filters.selProject?filters.selProject.id:null"   @row-click="onProductSelected" @clear-select="filters.xmProduct=null"></xm-product-select>
+							<xm-product-select :auto-select="false" :link-project-id="filters.selProject?filters.selProject.id:null"   @row-click="onProductSelected" @clear="filters.xmProduct=null"></xm-product-select>
 						</el-col> 
 						<el-col :span="24" style="padding-top:5px;" v-if="!selProject" >
-							<xm-project-select :auto-select="false" :link-product-id="filters.product?filters.product.id:null"   @row-click="onPorjectConfirm" @clear-select="filters.selProject=null"></xm-project-select>
+							<xm-project-select :auto-select="false" :link-product-id="filters.product?filters.product.id:null"   @row-click="onPorjectConfirm" @clear="filters.selProject=null"></xm-project-select>
 						</el-col> 		
 						<el-col :span="24" style="padding-top:5px;">
 								<font class="more-label-font">需求:</font>

src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue

@@ -1,8 +1,8 @@
 <template>
 	<section class="page-container  padding border">
 		<el-row v-if="!batchEditVisible">
-				<xm-product-select style="display:inline;" :auto-select="false" :link-project-id="filters.selProject?filters.selProject.id:null"   @row-click="onProductSelected" @clear-select="filters.xmProduct=null"></xm-product-select>
-  				<xm-project-select style="display:inline;" :auto-select="false"  :link-product-id="filters.product?filters.product.id:null"  @row-click="onPorjectConfirm" @clear-select="filters.selProject=null"></xm-project-select>
+				<xm-product-select style="display:inline;" :auto-select="false" :link-project-id="filters.selProject?filters.selProject.id:null"   @row-click="onProductSelected" @clear="filters.xmProduct=null"></xm-product-select>
+  				<xm-project-select style="display:inline;" :auto-select="false"  :link-product-id="filters.product?filters.product.id:null"  @row-click="onPorjectConfirm" @clear="filters.selProject=null"></xm-project-select>
 				<el-button v-if=" !filters.menus || filters.menus.length==0" @click="showMenu"> 选择需求</el-button>
 				<el-tag v-else   closable @close="clearFiltersMenu(filters.menus[0])">{{filters.menus[0].menuName.substr(0,5)}}等({{filters.menus.length}})个</el-tag>
 				<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"> 

src/views/xm/rpt/product/menuAttDist.vue

@@ -16,9 +16,9 @@
 								<el-option v-for="i in this.groupBys" :label="i.name" :key="i.id" :value="i.id"></el-option>
 							</el-select>
 						</el-form-item>     
-							 <xm-product-select class="padding" v-if="!xmProduct && !xmIteration"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear-select="onProductClear"></xm-product-select>
+							 <xm-product-select class="padding" v-if="!xmProduct && !xmIteration"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClear"></xm-product-select>
 						    
-							<xm-iteration-select ref="xmIterationSelect" class="padding" v-if="!xmIteration || !xmIteration.id"  :auto-select="false"  :product-id="filters.product?filters.product.id:null" :link-project-id="xmProject?xmProject.id:null"   placeholder="迭代"  @row-click="onIterationSelected" @clear-select="onIterationClear"></xm-iteration-select>
+							<xm-iteration-select ref="xmIterationSelect" class="padding" v-if="!xmIteration || !xmIteration.id"  :auto-select="false"  :product-id="filters.product?filters.product.id:null" :link-project-id="xmProject?xmProject.id:null"   placeholder="迭代"  @row-click="onIterationSelected" @clear="onIterationClear"></xm-iteration-select>
  						<el-form-item label="需求状态" prop="status">
 							<el-select   v-model="filters.status"  @change="onXmMenuSomeFieldsChange('status',$event)" clearable>
 								<el-option v-for="i in this.dicts.menuStatus" :label="i.name" :key="i.id" :value="i.id"></el-option>
@@ -215,7 +215,7 @@
 				)
 			},
 			onXmMenuSomeFieldsChange(fieldName,$event){
-
+				this.xmMenuAttDists=[]
 			},
 			searchXmMenuAttDist(){
 				if(!this.groupBy){