优化

src/views/xm/rpt/iteration/IterationWorkItemDayList.vue

@@ -14,10 +14,13 @@
 						<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  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>
 						<span v-else>{{xmProductCpd.id}} <span v-if="xmProductCpd.productName"><br/>{{  xmProductCpd.productName  }} </span> </span>
 					</el-form-item>
-					<el-form-item label="归属迭代">
-						<xm-iteration-select  v-if="!xmIteration || !xmIteration.id" ref="xmIterationSelect"  :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>
-						<span v-else>  {{xmIteration.id}}
-							<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span></span> 
+					<el-form-item label="归属迭代" v-if="xmIteration && xmIteration.id">
+						<span>  {{xmIteration.id}}
+							<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span>
+						</span> 
+					</el-form-item>  
+					<el-form-item label="归属迭代" v-else-if="filters.product && filters.product.id">
+						<xm-iteration-select  ref="xmIterationSelect"  :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> 
 					<el-form-item label="日期区间">
 						<br>

src/views/xm/rpt/iteration/burnout.vue

@@ -1,6 +1,6 @@
 <template>
 	<section>
-        <el-dialog fullscreen :title="(	filters.iteration?'【'+filters.iteration.iterationName+'】':'')+'迭代燃尽图'" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
+        <el-dialog fullscreen :title="dialogTitle" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
 			
 			 
 			<el-row :gutter="5" v-if="visible">
@@ -13,21 +13,18 @@
 				</el-col>
 				<el-col :span="6" class="border">
 					<el-form  :model="filters" label-position="top" class="padding">  
-						<el-form-item label="归属产品" v-if="!xmProduct&&!xmIteration">
-								<xm-product-select     ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"   @clear="onProductClear"></xm-product-select>
+						<el-form-item label="归属产品"  >
+							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  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>
+							<span v-else>{{xmProductCpd.id}} <span v-if="xmProductCpd.productName"><br/>{{  xmProductCpd.productName  }} </span> </span>
 						</el-form-item>
-						<el-form-item label="归属产品" v-if="xmProduct && xmProduct.id">
-							<span v-if="xmProduct.id">编号：{{ xmProduct.id }}</span><br>
-							<span v-if="xmProduct.productName">名称：{{ xmProduct.productName }}</span>
- 						</el-form-item>  
- 						<el-form-item label="归属迭代" v-if="!xmIteration || !xmIteration.id"> 
-							<xm-iteration-select  style="display:inline;" :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="归属迭代" v-if="xmIteration && xmIteration.id">
+ 							<span>  {{xmIteration.id}}
+								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span>
+							</span> 
+						</el-form-item>  
+						<el-form-item label="归属迭代" v-else-if="filters.product && filters.product.id">
+							<xm-iteration-select  ref="xmIterationSelect"  :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> 
- 						<el-form-item label="归属迭代" v-if="xmIteration &&xmIteration.id"> 
-							编号：<span v-if="xmIteration.id">{{ xmIteration.id }}</span><br>
-							名称：<span v-if="xmIteration.iterationName">{{ xmIteration.iterationName }}</span>
-
- 						</el-form-item>  
 						<el-form-item>
 							<div class="padding"> <el-button  type="primary" icon="el-icon-search" @click="listXmIterationStateHis">查询</el-button></div>
 						</el-form-item>  
@@ -101,6 +98,23 @@
 					return this.xmIterationStateHiss.map(i=>i.budgetWorkload-i.estimateWorkload)
 				}
 			},
+			dialogTitle(){
+				if(this.xmIteration && this.xmIteration.id){
+					return (this.xmIteration?'迭代【'+this.xmIteration.iterationName+'】':'')+'燃尽图'
+				}else{
+					return "迭代燃尽图"
+				}
+				
+			},
+			xmProductCpd(){
+				if(this.xmIteration && this.xmIteration.id){
+					return {id:this.xmIteration.productId,productName:this.xmIteration.productName}
+				}
+				if(this.xmProduct && this.xmProduct.id){
+					return this.xmProduct
+				}
+				return null;
+			}
 			
         }, 
 		watch: {  

src/views/xm/rpt/iteration/menuDayAccumulate.vue

@@ -15,10 +15,13 @@
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  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>
 							<span v-else>{{xmProductCpd.id}} <span v-if="xmProductCpd.productName"><br/>{{  xmProductCpd.productName  }} </span> </span>
 						</el-form-item>
-						<el-form-item label="归属迭代">
-							<xm-iteration-select  v-if="!xmIteration || !xmIteration.id" ref="xmIterationSelect"  :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>
-							<span v-else>  {{xmIteration.id}}
-								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span></span> 
+						<el-form-item label="归属迭代" v-if="xmIteration && xmIteration.id">
+ 							<span>  {{xmIteration.id}}
+								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span>
+							</span> 
+						</el-form-item>  
+						<el-form-item label="归属迭代" v-else-if="filters.product && filters.product.id">
+							<xm-iteration-select  ref="xmIterationSelect"  :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>  
 					<el-form-item label="日期区间">
 						<br>

src/views/xm/rpt/iteration/menuDayTrend.vue

@@ -17,10 +17,13 @@
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  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>
 							<span v-else>{{xmProductCpd.id}} <span v-if="xmProductCpd.productName"><br/>{{  xmProductCpd.productName  }} </span> </span>
 						</el-form-item>
-						<el-form-item label="归属迭代">
-							<xm-iteration-select  v-if="!xmIteration || !xmIteration.id" ref="xmIterationSelect"  :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>
-							<span v-else>  {{xmIteration.id}}
-								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span></span> 
+						<el-form-item label="归属迭代" v-if="xmIteration && xmIteration.id">
+ 							<span>  {{xmIteration.id}}
+								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span>
+							</span> 
+						</el-form-item>  
+						<el-form-item label="归属迭代" v-else-if="filters.product && filters.product.id">
+							<xm-iteration-select  ref="xmIterationSelect"  :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> 
 					<el-form-item label="日期区间">
 						<br>

src/views/xm/rpt/iteration/questionDayTrend.vue

@@ -17,10 +17,13 @@
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  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>
 							<span v-else>{{xmProductCpd.id}} <span v-if="xmProductCpd.productName"><br/>{{  xmProductCpd.productName  }} </span> </span>
 						</el-form-item>
-						<el-form-item label="归属迭代">
-							<xm-iteration-select  v-if="!xmIteration || !xmIteration.id" ref="xmIterationSelect"  :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>
-							<span v-else>  {{xmIteration.id}}
-								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span></span> 
+						<el-form-item label="归属迭代" v-if="xmIteration && xmIteration.id">
+ 							<span>  {{xmIteration.id}}
+								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span>
+							</span> 
+						</el-form-item>  
+						<el-form-item label="归属迭代" v-else-if="filters.product && filters.product.id">
+							<xm-iteration-select  ref="xmIterationSelect"  :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> 
 					<el-form-item label="日期区间">
 						<br>

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

@@ -16,10 +16,13 @@
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  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>
 							<span v-else>{{xmProductCpd.id}} <span v-if="xmProductCpd.productName"><br/>{{  xmProductCpd.productName  }} </span> </span>
 						</el-form-item>
-						<el-form-item label="归属迭代">
-							<xm-iteration-select  v-if="!xmIteration || !xmIteration.id" ref="xmIterationSelect"  :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>
-							<span v-else>  {{xmIteration.id}}
-								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span></span> 
+						<el-form-item label="归属迭代" v-if="xmIteration && xmIteration.id">
+ 							<span>  {{xmIteration.id}}
+								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span>
+							</span> 
+						</el-form-item>  
+						<el-form-item label="归属迭代" v-else-if="filters.product && filters.product.id">
+							<xm-iteration-select  ref="xmIterationSelect"  :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> 
 						<el-form-item label="需求状态" prop="status">
 							<el-select   v-model="filters.status"  @change="onXmMenuSomeFieldsChange('status',$event)" clearable>

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

@@ -20,11 +20,13 @@
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  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>
 							<span v-else>{{xmProductCpd.id}} <span v-if="xmProductCpd.productName"><br/>{{  xmProductCpd.productName  }} </span> </span>
 						</el-form-item>
-						<el-form-item label="归属迭代">
-							<xm-iteration-select  v-if="!xmIteration || !xmIteration.id" ref="xmIterationSelect"  :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>
-							<span v-else>  {{xmIteration.id}}
-								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span></span>
-
+						<el-form-item label="归属迭代" v-if="xmIteration && xmIteration.id">
+ 							<span>  {{xmIteration.id}}
+								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span>
+							</span> 
+						</el-form-item>  
+						<el-form-item label="归属迭代" v-else-if="filters.product && filters.product.id">
+							<xm-iteration-select  ref="xmIterationSelect"  :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> 
 							
 						<el-form-item label="需求状态" prop="status">

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

@@ -20,10 +20,13 @@
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  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>
 							<span v-else>{{xmProductCpd.id}} <span v-if="xmProductCpd.productName"><br/>{{  xmProductCpd.productName  }} </span> </span>
 						</el-form-item>
-						<el-form-item label="归属迭代">
-							<xm-iteration-select  v-if="!xmIteration || !xmIteration.id" ref="xmIterationSelect"  :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>
-							<span v-else>  {{xmIteration.id}}
-								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span></span> 
+						<el-form-item label="归属迭代" v-if="xmIteration && xmIteration.id">
+ 							<span>  {{xmIteration.id}}
+								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span>
+							</span> 
+						</el-form-item>  
+						<el-form-item label="归属迭代" v-else-if="filters.product && filters.product.id">
+							<xm-iteration-select  ref="xmIterationSelect"  :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> 
 						 <el-form-item label="需求状态" prop="status">
 							<el-select   v-model="filters.status"  @change="onXmMenuSomeFieldsChange('status',$event)" clearable>

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

@@ -16,10 +16,13 @@
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  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>
 							<span v-else>{{xmProductCpd.id}} <span v-if="xmProductCpd.productName"><br/>{{  xmProductCpd.productName  }} </span> </span>
 						</el-form-item>
-						<el-form-item label="归属迭代">
-							<xm-iteration-select  v-if="!xmIteration || !xmIteration.id" ref="xmIterationSelect"  :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>
-							<span v-else>  {{xmIteration.id}}
-								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span></span> 
+						<el-form-item label="归属迭代" v-if="xmIteration && xmIteration.id">
+ 							<span>  {{xmIteration.id}}
+								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span>
+							</span> 
+						</el-form-item>  
+						<el-form-item label="归属迭代" v-else-if="filters.product && filters.product.id">
+							<xm-iteration-select  ref="xmIterationSelect"  :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> 
 						 <el-form-item label="缺陷状态" prop="bugStatus">
 							<el-select   v-model="filters.bugStatus"  @change="onXmQuestionSomeFieldsChange('bugStatus',$event)" clearable>

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

@@ -21,10 +21,13 @@
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  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>
 							<span v-else>{{xmProductCpd.id}} <span v-if="xmProductCpd.productName"><br/>{{  xmProductCpd.productName  }} </span> </span>
 						</el-form-item>
-						<el-form-item label="归属迭代">
-							<xm-iteration-select  v-if="!xmIteration || !xmIteration.id" ref="xmIterationSelect"  :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>
-							<span v-else>  {{xmIteration.id}}
-								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span></span> 
+						<el-form-item label="归属迭代" v-if="xmIteration && xmIteration.id">
+ 							<span>  {{xmIteration.id}}
+								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span>
+							</span> 
+						</el-form-item>  
+						<el-form-item label="归属迭代" v-else-if="filters.product && filters.product.id">
+							<xm-iteration-select  ref="xmIterationSelect"  :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> 
  						<el-form-item label="缺陷状态" prop="bugStatus">
 							<el-select   v-model="filters.bugStatus"  @change="onXmQuestionSomeFieldsChange('bugStatus',$event)" clearable>

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

@@ -21,10 +21,13 @@
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  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>
 							<span v-else>{{xmProductCpd.id}} <span v-if="xmProductCpd.productName"><br/>{{  xmProductCpd.productName  }} </span> </span>
 						</el-form-item>
-						<el-form-item label="归属迭代">
-							<xm-iteration-select  v-if="!xmIteration || !xmIteration.id" ref="xmIterationSelect"  :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>
-							<span v-else>  {{xmIteration.id}}
-								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span></span> 
+						<el-form-item label="归属迭代" v-if="xmIteration && xmIteration.id">
+ 							<span>  {{xmIteration.id}}
+								<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </span>
+							</span> 
+						</el-form-item>  
+						<el-form-item label="归属迭代" v-else-if="filters.product && filters.product.id">
+							<xm-iteration-select  ref="xmIterationSelect"  :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> 
 						<el-form-item label="缺陷状态" prop="bugStatus">
 							<el-select   v-model="filters.bugStatus"  @change="onXmQuestionSomeFieldsChange('bugStatus',$event)" clearable>