From 5ba81597f27c89de7520564cc3c70dff3d43baf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 4 Feb 2023 12:02:58 +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

---
 src/views/xm/rpt/product/menuAgeDist.vue      | 112 ++++++++++-------
 src/views/xm/rpt/product/menuAttDist.vue      | 117 ++++++++++--------
 .../xm/rpt/product/menuDayAccumulate.vue      |  41 +++---
 src/views/xm/rpt/product/menuDayTrend.vue     |  41 +++---
 src/views/xm/rpt/product/menuSort.vue         | 116 +++++++++--------
 5 files changed, 251 insertions(+), 176 deletions(-)

diff --git a/src/views/xm/rpt/product/menuAgeDist.vue b/src/views/xm/rpt/product/menuAgeDist.vue
index 78aae863..c5c3d04a 100644
--- a/src/views/xm/rpt/product/menuAgeDist.vue
+++ b/src/views/xm/rpt/product/menuAgeDist.vue
@@ -7,51 +7,73 @@
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" class="border">
-					<el-form :model="params" class="padding" label-width="100px" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">   
-						
-						<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="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 style="width:100px;" size="small"   v-model="params.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>
-							</el-select>
-						</el-form-item>  
-						<el-form-item  label="需求类型" prop="dtype" >
-							<el-select style="width:100px;" size="small" v-model="params.dtype"  @change="onXmMenuSomeFieldsChange('dtype',$event)" clearable>
-								<el-option v-for="i in this.dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item> 
-						<el-form-item  label="需求来源" prop="source">
-							<el-select style="width:100px;" size="small" v-model="params.source"  @change="onXmMenuSomeFieldsChange('source',$event)" clearable>
-								<el-option v-for="i in this.dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item> 
-						<el-form-item  label="需求层次" prop="dlvl" >
-							<el-select style="width:100px;" size="small" v-model="params.dlvl"  @change="onXmMenuSomeFieldsChange('dlvl',$event)" clearable>
-								<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item> 
-					<el-form-item  label="优先级别" prop="priority" >
-						<el-select style="width:100px;" size="small" v-model="params.priority" @change="onXmMenuSomeFieldsChange('priority',$event)" clearable>
-								<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
-						</el-select>
-					</el-form-item>  
-					<el-form-item>
-						 <el-button type="primary" icon="el-icon-search" @click="searchXmMenuAgeDist">查询</el-button>
-					</el-form-item>  
-					</el-form>
-				</el-col>
+				<el-col :span="6" v-if="showParams"> 
+					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
+						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-row>
+							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
+						</el-row>
+						<el-row>
+							<el-form :model="params" class="padding"   :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
+								<el-row>
+									<el-col :span="15">
+										<el-form-item label="分组属性">
+											<el-select style="width:100px;" size="small"   v-model="params.groupBy"  @change="onXmMenuSomeFieldsChange('groupBy',$event)">
+												<el-option v-for="i in this.groupBys" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item>     
+										<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="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-col>
+									<el-col :span="9">
+										<el-form-item label="需求状态" prop="status">
+											<el-select style="width:100px;" size="small"   v-model="params.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>
+											</el-select>
+										</el-form-item>  
+										<el-form-item  label="需求类型" prop="dtype" >
+											<el-select style="width:100px;" size="small" v-model="params.dtype"  @change="onXmMenuSomeFieldsChange('dtype',$event)" clearable>
+												<el-option v-for="i in this.dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item> 
+										<el-form-item  label="需求来源" prop="source">
+											<el-select style="width:100px;" size="small" v-model="params.source"  @change="onXmMenuSomeFieldsChange('source',$event)" clearable>
+												<el-option v-for="i in this.dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item> 
+										<el-form-item  label="需求层次" prop="dlvl" >
+											<el-select style="width:100px;" size="small" v-model="params.dlvl"  @change="onXmMenuSomeFieldsChange('dlvl',$event)" clearable>
+												<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item> 
+										<el-form-item  label="优先级别" prop="priority" >
+											<el-select style="width:100px;" size="small" v-model="params.priority" @change="onXmMenuSomeFieldsChange('priority',$event)" clearable>
+													<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item>  
+									</el-col>
+								</el-row>
+								
+									
+								<el-form-item>
+									<el-button type="primary"  style="float:right;" icon="el-icon-search" @click="searchXmMenuAgeDist">查询</el-button>
+								</el-form-item>  
+							</el-form>
+						</el-row>
+					 </el-popover>
+					
+				</el-col> 
 			</el-row>
 	</section>
 </template>
diff --git a/src/views/xm/rpt/product/menuAttDist.vue b/src/views/xm/rpt/product/menuAttDist.vue
index a6cc438d..4e2af818 100644
--- a/src/views/xm/rpt/product/menuAttDist.vue
+++ b/src/views/xm/rpt/product/menuAttDist.vue
@@ -7,56 +7,73 @@
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" class="border">
-					<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
-						<el-form-item label="分组属性">
-							<el-select style="width:100px;" size="small"   v-model="params.groupBy"  @change="onXmMenuSomeFieldsChange('groupBy',$event)" clearable>
-								<el-option v-for="i in this.groupBys" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item>      
-						<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="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 style="width:100px;" size="small"   v-model="params.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>
-							</el-select>
-						</el-form-item>  
-						<el-form-item  label="需求类型" prop="dtype" >
-							<el-select style="width:100px;" size="small" v-model="params.dtype"  @change="onXmMenuSomeFieldsChange('dtype',$event)" clearable>
-								<el-option v-for="i in this.dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item> 
-						<el-form-item  label="需求来源" prop="source">
-							<el-select style="width:100px;" size="small" v-model="params.source"  @change="onXmMenuSomeFieldsChange('source',$event)" clearable>
-								<el-option v-for="i in this.dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item> 
-						<el-form-item  label="需求层次" prop="dlvl" >
-							<el-select style="width:100px;" size="small" v-model="params.dlvl"  @change="onXmMenuSomeFieldsChange('dlvl',$event)" clearable>
-								<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item> 
-					<el-form-item  label="优先级别" prop="priority" >
-						<el-select style="width:100px;" size="small" v-model="params.priority" @change="onXmMenuSomeFieldsChange('priority',$event)" clearable>
-								<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
-						</el-select>
-					</el-form-item>  
-					<el-form-item>
-						 <el-button type="primary" icon="el-icon-search" @click="searchXmMenuAttDist">查询</el-button>
-					</el-form-item>  
-					</el-form>
-				</el-col>
+				<el-col :span="6" v-if="showParams"> 
+					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
+						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-row>
+							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
+						</el-row>
+						<el-row>
+							<el-form :model="params" class="padding"   :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
+								<el-row>
+									<el-col :span="15">
+										<el-form-item label="分组属性">
+											<el-select style="width:100px;" size="small"   v-model="params.groupBy"  @change="onXmMenuSomeFieldsChange('groupBy',$event)">
+												<el-option v-for="i in this.groupBys" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item>     
+										<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="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-col>
+									<el-col :span="9">
+										<el-form-item label="需求状态" prop="status">
+											<el-select style="width:100px;" size="small"   v-model="params.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>
+											</el-select>
+										</el-form-item>  
+										<el-form-item  label="需求类型" prop="dtype" >
+											<el-select style="width:100px;" size="small" v-model="params.dtype"  @change="onXmMenuSomeFieldsChange('dtype',$event)" clearable>
+												<el-option v-for="i in this.dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item> 
+										<el-form-item  label="需求来源" prop="source">
+											<el-select style="width:100px;" size="small" v-model="params.source"  @change="onXmMenuSomeFieldsChange('source',$event)" clearable>
+												<el-option v-for="i in this.dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item> 
+										<el-form-item  label="需求层次" prop="dlvl" >
+											<el-select style="width:100px;" size="small" v-model="params.dlvl"  @change="onXmMenuSomeFieldsChange('dlvl',$event)" clearable>
+												<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item> 
+										<el-form-item  label="优先级别" prop="priority" >
+											<el-select style="width:100px;" size="small" v-model="params.priority" @change="onXmMenuSomeFieldsChange('priority',$event)" clearable>
+													<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item>  
+									</el-col>
+								</el-row>
+								
+									
+								<el-form-item>
+									<el-button type="primary"  style="float:right;" icon="el-icon-search" @click="searchXmMenuAttDist">查询</el-button>
+								</el-form-item>  
+							</el-form>
+						</el-row>
+					 </el-popover>
+					
+				</el-col> 
 			</el-row>
 	</section>
 </template>
diff --git a/src/views/xm/rpt/product/menuDayAccumulate.vue b/src/views/xm/rpt/product/menuDayAccumulate.vue
index d8d0fda4..296a8d58 100644
--- a/src/views/xm/rpt/product/menuDayAccumulate.vue
+++ b/src/views/xm/rpt/product/menuDayAccumulate.vue
@@ -6,22 +6,31 @@
 					<div class="echart-box" :id="this.id"></div> 
 					</div>
 				</el-col>
-				<el-col :span="6" class="border">
-					<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef"> 
-						
-						<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="日期区间">
-						<br>
-							<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
-  					</el-form-item>  
-					<el-form-item>
-						 <el-button type="primary" icon="el-icon-search" @click="listXmProductStateHis">查询</el-button>
-					</el-form-item>  
-					</el-form>
-				</el-col>
+				<el-col :span="6" v-if="showParams"> 
+					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
+						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-row>
+							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
+						</el-row>
+						<el-row>
+							<el-form :model="params" class="padding"   :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
+								<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="日期区间">
+									<br>
+										<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
+								</el-form-item>    
+								<el-form-item>
+									<el-button type="primary"  style="float:right;" icon="el-icon-search" @click="listXmProductStateHis">查询</el-button>
+								</el-form-item>  
+							</el-form>
+						</el-row>
+					 </el-popover>
+					
+				</el-col>  
 			</el-row>
 	</section>
 </template>
diff --git a/src/views/xm/rpt/product/menuDayTrend.vue b/src/views/xm/rpt/product/menuDayTrend.vue
index 8cfe375e..53291ecd 100644
--- a/src/views/xm/rpt/product/menuDayTrend.vue
+++ b/src/views/xm/rpt/product/menuDayTrend.vue
@@ -8,22 +8,31 @@
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" class="border">
-					<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef"> 
-						
-						<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="日期区间">
-						<br>
-							<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
-  					</el-form-item>    
-					<el-form-item>
-						 <el-button type="primary" icon="el-icon-search" @click="listXmProductStateHis">查询</el-button>
-					</el-form-item>  
-					</el-form>
-				</el-col>
+				<el-col :span="6" v-if="showParams"> 
+					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
+						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-row>
+							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
+						</el-row>
+						<el-row>
+							<el-form :model="params" class="padding"   :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
+								<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="日期区间">
+									<br>
+										<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
+								</el-form-item>    
+								<el-form-item>
+									<el-button type="primary"  style="float:right;" icon="el-icon-search" @click="listXmProductStateHis">查询</el-button>
+								</el-form-item>  
+							</el-form>
+						</el-row>
+					 </el-popover>
+					
+				</el-col>  
 			</el-row>
 	</section>
 </template>
diff --git a/src/views/xm/rpt/product/menuSort.vue b/src/views/xm/rpt/product/menuSort.vue
index 0b16da57..1efccaac 100644
--- a/src/views/xm/rpt/product/menuSort.vue
+++ b/src/views/xm/rpt/product/menuSort.vue
@@ -7,55 +7,73 @@
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" class="border">
-					<el-form :model="params" class="padding" :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
-						<el-form-item label="分组属性">
-							<el-select style="width:100px;" size="small"   v-model="params.groupBy"  @change="onXmMenuSomeFieldsChange('groupBy',$event)">
-								<el-option v-for="i in this.groupBys" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item>     
-						<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="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 style="width:100px;" size="small"   v-model="params.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>
-							</el-select>
-						</el-form-item>  
-						<el-form-item  label="需求类型" prop="dtype" >
-							<el-select style="width:100px;" size="small" v-model="params.dtype"  @change="onXmMenuSomeFieldsChange('dtype',$event)" clearable>
-								<el-option v-for="i in this.dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item> 
-						<el-form-item  label="需求来源" prop="source">
-							<el-select style="width:100px;" size="small" v-model="params.source"  @change="onXmMenuSomeFieldsChange('source',$event)" clearable>
-								<el-option v-for="i in this.dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item> 
-						<el-form-item  label="需求层次" prop="dlvl" >
-							<el-select style="width:100px;" size="small" v-model="params.dlvl"  @change="onXmMenuSomeFieldsChange('dlvl',$event)" clearable>
-								<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item> 
-					<el-form-item  label="优先级别" prop="priority" >
-						<el-select style="width:100px;" size="small" v-model="params.priority" @change="onXmMenuSomeFieldsChange('priority',$event)" clearable>
-								<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
-						</el-select>
-					</el-form-item>  
-					<el-form-item>
-						 <el-button type="primary" icon="el-icon-search" @click="searchXmMenuSort">查询</el-button>
-					</el-form-item>  
-					</el-form>
-				</el-col>
+				<el-col :span="6" v-if="showParams"> 
+					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
+						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-row>
+							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
+						</el-row>
+						<el-row>
+							<el-form :model="params" class="padding"   :style="{width:'100%',overflow: 'auto'}" ref="filtersRef">
+								<el-row>
+									<el-col :span="15">
+										<el-form-item label="分组属性">
+											<el-select style="width:100px;" size="small"   v-model="params.groupBy"  @change="onXmMenuSomeFieldsChange('groupBy',$event)">
+												<el-option v-for="i in this.groupBys" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item>     
+										<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="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-col>
+									<el-col :span="9">
+										<el-form-item label="需求状态" prop="status">
+											<el-select style="width:100px;" size="small"   v-model="params.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>
+											</el-select>
+										</el-form-item>  
+										<el-form-item  label="需求类型" prop="dtype" >
+											<el-select style="width:100px;" size="small" v-model="params.dtype"  @change="onXmMenuSomeFieldsChange('dtype',$event)" clearable>
+												<el-option v-for="i in this.dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item> 
+										<el-form-item  label="需求来源" prop="source">
+											<el-select style="width:100px;" size="small" v-model="params.source"  @change="onXmMenuSomeFieldsChange('source',$event)" clearable>
+												<el-option v-for="i in this.dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item> 
+										<el-form-item  label="需求层次" prop="dlvl" >
+											<el-select style="width:100px;" size="small" v-model="params.dlvl"  @change="onXmMenuSomeFieldsChange('dlvl',$event)" clearable>
+												<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item> 
+										<el-form-item  label="优先级别" prop="priority" >
+											<el-select style="width:100px;" size="small" v-model="params.priority" @change="onXmMenuSomeFieldsChange('priority',$event)" clearable>
+													<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item>  
+									</el-col>
+								</el-row>
+								
+									
+								<el-form-item>
+									<el-button type="primary"  style="float:right;" icon="el-icon-search" @click="searchXmMenuSort">查询</el-button>
+								</el-form-item>  
+							</el-form>
+						</el-row>
+					 </el-popover>
+					
+				</el-col> 
 			</el-row>
 	</section>
 </template>