From a3f0af0aad2c12765ffdc00e9e5cf9ac4f8eb247 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:23:19 +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/rpt/project/projectWorkItemDayList.vue |  42 +++++---
 .../rpt/project/projectWorkloadSetDayList.vue |  56 ++++++----
 .../project/projectWorkloadSetMonthList.vue   |  56 ++++++----
 src/views/xm/rpt/project/taskAgeDist.vue      |  95 +++++++++-------
 src/views/xm/rpt/project/taskAttDist.vue      | 101 ++++++++++--------
 .../xm/rpt/project/taskDayAccumulate.vue      |  43 +++++---
 src/views/xm/rpt/project/taskDayTrend.vue     |  43 +++++---
 src/views/xm/rpt/project/taskSort.vue         | 100 ++++++++++-------
 8 files changed, 328 insertions(+), 208 deletions(-)

diff --git a/src/views/xm/rpt/project/projectWorkItemDayList.vue b/src/views/xm/rpt/project/projectWorkItemDayList.vue
index 1cdfde59..ffb9b041 100644
--- a/src/views/xm/rpt/project/projectWorkItemDayList.vue
+++ b/src/views/xm/rpt/project/projectWorkItemDayList.vue
@@ -8,21 +8,33 @@
 						<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-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
-						<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </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="listXmProjectStateHis">查询</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-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+									<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </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="listXmProjectStateHis">查询</el-button>
+								</el-form-item>  
+							</el-form>
+						</el-row>
+					 </el-popover>
+					
+				</el-col>   
 			</el-row>
 	</section>
 </template>
diff --git a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue
index 828e3ae8..860cbae1 100644
--- a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue
+++ b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue
@@ -8,29 +8,41 @@
 						<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-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
-						<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
-					</el-form-item>  
-					<el-form-item label="人员编号">
-						<mdp-select-user-xm label="选择人员" :clearable="true" v-model="filters" userid-key="userid" username-key="username" :project-id="filters.project?filters.project.id:null"></mdp-select-user-xm>
+				<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-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+									<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
+								</el-form-item>  
+								<el-form-item label="人员编号">
+									<mdp-select-user-xm label="选择人员" :clearable="true" v-model="filters" userid-key="userid" username-key="username" :project-id="filters.project?filters.project.id:null"></mdp-select-user-xm>
 
-  					</el-form-item>  
-					  
-					<el-form-item label="任务编号">
-							<el-input v-model="params.taskId"></el-input>
-  					</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="listProjectWorkloadSetDay">查询</el-button>
-					</el-form-item>  
-					</el-form>
-				</el-col>
+								</el-form-item>  
+								
+								<el-form-item label="任务编号">
+										<el-input v-model="params.taskId"></el-input>
+								</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="listProjectWorkloadSetDay">查询</el-button>
+								</el-form-item>  
+							</el-form>
+						</el-row>
+					 </el-popover>
+					
+				</el-col>  
 			</el-row>
 	</section>
 </template>
diff --git a/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue b/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue
index b7ff0e3e..91e8c6de 100644
--- a/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue
+++ b/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue
@@ -8,29 +8,41 @@
 						<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-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
-						<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
-					</el-form-item>  
-					<el-form-item label="人员编号">
-						<mdp-select-user-xm label="选择人员" :clearable="true" v-model="filters" userid-key="userid" username-key="username" :project-id="filters.project?filters.project.id:null"></mdp-select-user-xm>
+				<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-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+									<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
+								</el-form-item>  
+								<el-form-item label="人员编号">
+									<mdp-select-user-xm label="选择人员" :clearable="true" v-model="filters" userid-key="userid" username-key="username" :project-id="filters.project?filters.project.id:null"></mdp-select-user-xm>
 
-  					</el-form-item>  
-					  
-					<el-form-item label="任务编号">
-							<el-input v-model="params.taskId"></el-input>
-  					</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="listProjectWorkloadSetMonth">查询</el-button>
-					</el-form-item>  
-					</el-form>
-				</el-col>
+								</el-form-item>  
+								
+								<el-form-item label="任务编号">
+										<el-input v-model="params.taskId"></el-input>
+								</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="listProjectWorkloadSetMonth">查询</el-button>
+								</el-form-item>  
+							</el-form>
+						</el-row>
+					 </el-popover>
+					
+				</el-col>  
 			</el-row>
 	</section>
 </template>
diff --git a/src/views/xm/rpt/project/taskAgeDist.vue b/src/views/xm/rpt/project/taskAgeDist.vue
index b93740a0..4f72c551 100644
--- a/src/views/xm/rpt/project/taskAgeDist.vue
+++ b/src/views/xm/rpt/project/taskAgeDist.vue
@@ -8,42 +8,65 @@
 						<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-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
-							<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
-						</el-form-item>  
-						 <el-form-item label="任务状态" prop="taskState">
-							<el-select style="width:100px;" size="small"   v-model="params.taskState"  @change="onXmTaskSomeFieldsChange('taskState',$event)" clearable>
-								<el-option v-for="i in this.dicts.taskState" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item>  
-						<el-form-item  label="任务类型" prop="taskType" >
-							<el-select style="width:100px;" size="small" v-model="params.taskType"  @change="onXmTaskSomeFieldsChange('taskType',$event)" clearable>
-								<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item> 
-						<el-form-item  label="任务来源" prop="planType">
-							<el-select style="width:100px;" size="small" v-model="params.planType"  @change="onXmTaskSomeFieldsChange('planType',$event)" clearable>
-								<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item> 
-						<el-form-item  label="任务层次" prop="settleSchemel" >
-							<el-select style="width:100px;" size="small" v-model="params.settleSchemel"  @change="onXmTaskSomeFieldsChange('settleSchemel',$event)" clearable>
-								<el-option v-for="i in this.dicts.xmTaskSettleSchemel" :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="onXmTaskSomeFieldsChange('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="searchXmTaskAgeDist">查询</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="onXmTaskSomeFieldsChange('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-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+											<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
+										</el-form-item>  
+									</el-col>
+									<el-col :span="9">
+										<el-form-item label="任务状态" prop="taskState">
+											<el-select style="width:100px;" size="small"   v-model="params.taskState"  @change="onXmTaskSomeFieldsChange('taskState',$event)" clearable>
+												<el-option v-for="i in this.dicts.taskState" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item>  
+										<el-form-item  label="任务类型" prop="taskType" >
+											<el-select style="width:100px;" size="small" v-model="params.taskType"  @change="onXmTaskSomeFieldsChange('taskType',$event)" clearable>
+												<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item> 
+										<el-form-item  label="任务来源" prop="planType">
+											<el-select style="width:100px;" size="small" v-model="params.planType"  @change="onXmTaskSomeFieldsChange('planType',$event)" clearable>
+												<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item> 
+										<el-form-item  label="任务层次" prop="settleSchemel" >
+											<el-select style="width:100px;" size="small" v-model="params.settleSchemel"  @change="onXmTaskSomeFieldsChange('settleSchemel',$event)" clearable>
+												<el-option v-for="i in this.dicts.xmTaskSettleSchemel" :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="onXmTaskSomeFieldsChange('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="searchXmTaskAgeDist">查询</el-button>
+								</el-form-item>  
+							</el-form>
+						</el-row>
+					 </el-popover>
+					
+				</el-col>  
 			</el-row>
 	</section>
 </template>
diff --git a/src/views/xm/rpt/project/taskAttDist.vue b/src/views/xm/rpt/project/taskAttDist.vue
index cab07dd7..6ecb618a 100644
--- a/src/views/xm/rpt/project/taskAttDist.vue
+++ b/src/views/xm/rpt/project/taskAttDist.vue
@@ -8,48 +8,65 @@
 						<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="onXmTaskSomeFieldsChange('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-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
-							<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
-						</el-form-item>    
-							 
- 						<el-form-item label="任务状态" prop="taskState">
-							<el-select style="width:100px;" size="small"   v-model="params.taskState"  @change="onXmTaskSomeFieldsChange('taskState',$event)" clearable>
-								<el-option v-for="i in this.dicts.taskState" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item>  
-						<el-form-item  label="任务类型" prop="taskType" >
-							<el-select style="width:100px;" size="small" v-model="params.taskType"  @change="onXmTaskSomeFieldsChange('taskType',$event)" clearable>
-								<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item> 
-						<el-form-item  label="计划类型" prop="planType">
-							<el-select style="width:100px;" size="small" v-model="params.planType"  @change="onXmTaskSomeFieldsChange('planType',$event)" clearable>
-								<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item> 
-						<el-form-item  label="结算方案" prop="settleSchemel" >
-							<el-select style="width:100px;" size="small" v-model="params.settleSchemel"  @change="onXmTaskSomeFieldsChange('settleSchemel',$event)" clearable>
-								<el-option v-for="i in this.dicts.xmTaskSettleSchemel" :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="onXmTaskSomeFieldsChange('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="searchXmTaskAttDist">查询</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="onXmTaskSomeFieldsChange('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-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+											<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
+										</el-form-item>  
+									</el-col>
+									<el-col :span="9">
+										<el-form-item label="任务状态" prop="taskState">
+											<el-select style="width:100px;" size="small"   v-model="params.taskState"  @change="onXmTaskSomeFieldsChange('taskState',$event)" clearable>
+												<el-option v-for="i in this.dicts.taskState" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item>  
+										<el-form-item  label="任务类型" prop="taskType" >
+											<el-select style="width:100px;" size="small" v-model="params.taskType"  @change="onXmTaskSomeFieldsChange('taskType',$event)" clearable>
+												<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item> 
+										<el-form-item  label="任务来源" prop="planType">
+											<el-select style="width:100px;" size="small" v-model="params.planType"  @change="onXmTaskSomeFieldsChange('planType',$event)" clearable>
+												<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item> 
+										<el-form-item  label="任务层次" prop="settleSchemel" >
+											<el-select style="width:100px;" size="small" v-model="params.settleSchemel"  @change="onXmTaskSomeFieldsChange('settleSchemel',$event)" clearable>
+												<el-option v-for="i in this.dicts.xmTaskSettleSchemel" :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="onXmTaskSomeFieldsChange('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="searchXmTaskAttDist">查询</el-button>
+								</el-form-item>  
+							</el-form>
+						</el-row>
+					 </el-popover>
+					
+				</el-col>  
 			</el-row>
 	</section>
 </template>
diff --git a/src/views/xm/rpt/project/taskDayAccumulate.vue b/src/views/xm/rpt/project/taskDayAccumulate.vue
index 67450c64..c03c68e4 100644
--- a/src/views/xm/rpt/project/taskDayAccumulate.vue
+++ b/src/views/xm/rpt/project/taskDayAccumulate.vue
@@ -7,21 +7,34 @@
 					<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-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
-						<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </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="listXmProjectStateHis">查询</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-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+								<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </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="listXmProjectStateHis">查询</el-button>
+								</el-form-item>  
+							</el-form>
+						</el-row>
+					 </el-popover>
+					
+				</el-col>  
 			</el-row>
 	</section>
 </template>
diff --git a/src/views/xm/rpt/project/taskDayTrend.vue b/src/views/xm/rpt/project/taskDayTrend.vue
index 0a4009fe..c6a0b554 100644
--- a/src/views/xm/rpt/project/taskDayTrend.vue
+++ b/src/views/xm/rpt/project/taskDayTrend.vue
@@ -9,21 +9,34 @@
 						<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-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
-						<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </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="listXmProjectStateHis">查询</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-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+								<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </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="listXmProjectStateHis">查询</el-button>
+								</el-form-item>  
+							</el-form>
+						</el-row>
+					 </el-popover>
+					
+				</el-col>   
 			</el-row>
 	</section>
 </template>
diff --git a/src/views/xm/rpt/project/taskSort.vue b/src/views/xm/rpt/project/taskSort.vue
index 93b128c8..fe42be53 100644
--- a/src/views/xm/rpt/project/taskSort.vue
+++ b/src/views/xm/rpt/project/taskSort.vue
@@ -8,47 +8,65 @@
 						<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="onXmTaskSomeFieldsChange('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-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
-							<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
-						</el-form-item>  
-						 <el-form-item label="任务状态" prop="taskState">
-							<el-select style="width:100px;" size="small"   v-model="params.taskState"  @change="onXmTaskSomeFieldsChange('taskState',$event)" clearable>
-								<el-option v-for="i in this.dicts.taskState" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item>  
-						<el-form-item  label="任务类型" prop="taskType" >
-							<el-select style="width:100px;" size="small" v-model="params.taskType"  @change="onXmTaskSomeFieldsChange('taskType',$event)" clearable>
-								<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item> 
-						<el-form-item  label="任务来源" prop="planType">
-							<el-select style="width:100px;" size="small" v-model="params.planType"  @change="onXmTaskSomeFieldsChange('planType',$event)" clearable>
-								<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
-							</el-select>
-						</el-form-item> 
-						<el-form-item  label="任务层次" prop="settleSchemel" >
-							<el-select style="width:100px;" size="small" v-model="params.settleSchemel"  @change="onXmTaskSomeFieldsChange('settleSchemel',$event)" clearable>
-								<el-option v-for="i in this.dicts.xmTaskSettleSchemel" :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="onXmTaskSomeFieldsChange('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="searchXmTaskSort">查询</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="onXmTaskSomeFieldsChange('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-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
+											<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
+										</el-form-item>  
+									</el-col>
+									<el-col :span="9">
+										<el-form-item label="任务状态" prop="taskState">
+											<el-select style="width:100px;" size="small"   v-model="params.taskState"  @change="onXmTaskSomeFieldsChange('taskState',$event)" clearable>
+												<el-option v-for="i in this.dicts.taskState" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item>  
+										<el-form-item  label="任务类型" prop="taskType" >
+											<el-select style="width:100px;" size="small" v-model="params.taskType"  @change="onXmTaskSomeFieldsChange('taskType',$event)" clearable>
+												<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item> 
+										<el-form-item  label="任务来源" prop="planType">
+											<el-select style="width:100px;" size="small" v-model="params.planType"  @change="onXmTaskSomeFieldsChange('planType',$event)" clearable>
+												<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+											</el-select>
+										</el-form-item> 
+										<el-form-item  label="任务层次" prop="settleSchemel" >
+											<el-select style="width:100px;" size="small" v-model="params.settleSchemel"  @change="onXmTaskSomeFieldsChange('settleSchemel',$event)" clearable>
+												<el-option v-for="i in this.dicts.xmTaskSettleSchemel" :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="onXmTaskSomeFieldsChange('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="searchXmTaskSort">查询</el-button>
+								</el-form-item>  
+							</el-form>
+						</el-row>
+					 </el-popover>
+					
+				</el-col>  
 			</el-row>
 	</section>
 </template>