From 39c2c0f8e1845b8ba5dff936fe6268815eb882bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 28 Apr 2021 03:14:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmMenu/XmMenuMng.vue        |  4 +-
 src/views/xm/core/xmProduct/XmProductMng.vue  | 45 +++++++++---
 .../xm/core/xmProduct/XmProductSelect.vue     |  2 +-
 src/views/xm/core/xmProject/XmProjectInfo.vue | 14 ++--
 src/views/xm/core/xmProject/XmProjectMng.vue  | 28 +++++--
 .../xmProjectPhase/XmProjectPhaseBatch.vue    | 26 +++----
 .../core/xmProjectPhase/XmProjectPhaseMng.vue | 73 ++++++++++++-------
 .../xmProjectPhase/XmProjectPhaseSelect.vue   |  2 +-
 .../xm/core/xmQuestion/XmQuestionMng.vue      | 18 ++++-
 src/views/xm/core/xmTask/XmTaskMng.vue        | 27 ++++---
 10 files changed, 156 insertions(+), 83 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 0fa1fe0a..d35fbe76 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -2,10 +2,10 @@
 	<section>
 		<el-row>
 			<el-row >  
-				<el-col v-show="!batchEditVisible" :span="filters.product?6:24" class="app-container">
+				<el-col v-show="!batchEditVisible&& !filters.product" :span="24" class="app-container">
 					<xm-product-mng :sel-project="selProject" @row-click="onProductSelected" ref="xmProductMng" :simple="true"></xm-product-mng>
 				</el-col>
-				<el-col v-show="filters.product" :span="!batchEditVisible? 18:24" >
+				<el-col v-show="filters.product" :span="24" >
 					<el-row class="app-container">  
 						<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
 							<template slot="append">
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index b0c6bd66..2c16e4b9 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -1,13 +1,13 @@
 <template>
 	<section>
 		<el-row  class="app-container">
-			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
+			<el-input v-model="filters.key" style="width: 40%;" placeholder="模糊查询">
 				<template slot="append">
 					
 					<el-button v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProducts" icon="el-icon-search"></el-button>
 				</template>
 			</el-input> 
-			<el-button type="primary" @click="showAdd" icon="el-icon-plus"></el-button>
+			<el-button type="primary" @click="showAdd" icon="el-icon-plus">产品</el-button>
 
 			<el-button  type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete"></el-button> 
 		</el-row>
@@ -27,15 +27,40 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="pmUsername" label="产品经理" width="100" ></el-table-column> 
-				<el-table-column prop="planWorkload" label="预计工作量.人时" width="120" ></el-table-column>
-				<el-table-column prop="actWorkload" label="实际工作量.人时" width="120" ></el-table-column> 
- 				<el-table-column  label="操作" width="540" fixed="right">
+				<el-table-column prop="planWorkload" label="预计工作量.人时" width="150" ></el-table-column>
+				<el-table-column prop="actWorkload" label="实际工作量.人时" width="150" ></el-table-column> 
+ 				<el-table-column  label="操作" width="200" fixed="right">
 					<template slot-scope="scope"> 
-						<el-button  type="warning" @click="loadTasksToXmProductState(scope.row)" icon="el-icon-s-data">刷新</el-button>
-						<el-button  type="warning" @click="showProductState(scope.row)" icon="el-icon-s-data">报告</el-button> 
-						<el-button  type="success" @click="toIterationList(scope.row)" icon="el-icon-document">迭代</el-button>   
-						<el-button type="success" @click="toProjectList(scope.row)"  icon="el-icon-document">项目</el-button> 
-						<el-button  type="success" @click="toTaskList(scope.row)"  icon="el-icon-tickets">任务</el-button>
+						<el-button  type="primary" @click="toIterationList(scope.row)" icon="el-icon-document">迭代计划</el-button>  
+						<el-popover
+							placement="top-start"
+							title=""
+							width="200"
+							trigger="click" >
+							<el-row>
+								<el-col :span="24"  style="padding-top:12px;">
+									<el-button  type="warning" @click="loadTasksToXmProductState(scope.row)" icon="el-icon-s-data">执行统计任务</el-button>
+								</el-col>
+								<el-col :span="24" style="padding-top:12px;">
+									<el-button  type="warning" @click="showProductState(scope.row)" icon="el-icon-s-data">产品报告</el-button> 
+								</el-col>
+								<el-col :span="24" class="hidden-lg-and-up" style="padding-top:12px;">
+									<el-button type="success" @click="toProjectList(scope.row)"  icon="el-icon-document">关联项目查询</el-button> 
+								</el-col> 
+								<el-col :span="24" class="hidden-lg-and-up" style="padding-top:12px;">
+									<el-button  type="success" @click="toIterationList(scope.row)" icon="el-icon-document">迭代计划管理</el-button>   
+								</el-col> 
+								<el-col :span="24"  style="padding-top:12px;">
+									<el-button  type="success" @click="toTaskList(scope.row)"  icon="el-icon-tickets">关联任务查询</el-button>
+								</el-col> 
+							</el-row>
+							<el-button  slot="reference" icon="el-icon-more" circle></el-button>
+						</el-popover> 
+						
+						
+						
+						
+						
 					</template>
 				</el-table-column>
 			</el-table>
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
index 991441e9..b27b5598 100644
--- a/src/views/xm/core/xmProduct/XmProductSelect.vue
+++ b/src/views/xm/core/xmProduct/XmProductSelect.vue
@@ -15,7 +15,7 @@
 					</template>
 				</el-table-column>
 			</el-table>
-			<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination>  
+			<el-pagination class="hidden-md-and-down" layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination>  
 		</el-row> 
 	</section>
 </template>
diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index c25a37f9..d2679903 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -7,7 +7,7 @@
 						<el-radio-button label="任务"></el-radio-button>
 						<el-radio-button label="阶段计划"></el-radio-button>
 						<el-radio-button label="团队"></el-radio-button>
-						<el-radio-button label="风险"></el-radio-button>
+						<el-radio-button class="hidden-sm-and-down" label="风险"></el-radio-button>
 						<el-radio-button label="问题"></el-radio-button>
 						<el-radio-button label="测试计划"></el-radio-button> 
 						<el-radio-button label="文档"></el-radio-button>
@@ -15,12 +15,12 @@
 						<el-radio-button label="故事监控"></el-radio-button>
 						<el-radio-button label="项目监控"></el-radio-button> 
 						<el-radio-button label="详情"></el-radio-button>
-						<el-radio-button label="考核"></el-radio-button>
-						<el-radio-button label="日志"></el-radio-button>
-						<el-radio-button label="费用"></el-radio-button>
-						<el-radio-button label="预算"></el-radio-button>
-						<el-radio-button label="合同管理"></el-radio-button>
-						<el-radio-button label="环境清单"></el-radio-button> 
+						<el-radio-button class="hidden-sm-and-down" label="考核"></el-radio-button>
+						<el-radio-button class="hidden-md-and-down" label="日志"></el-radio-button>
+						<el-radio-button class="hidden-md-and-down" label="费用"></el-radio-button>
+						<el-radio-button class="hidden-md-and-down" label="预算"></el-radio-button>
+						<el-radio-button class="hidden-lg-and-down" label="合同管理"></el-radio-button>
+						<el-radio-button class="hidden-lg-and-down" label="环境清单"></el-radio-button> 
 					</el-radio-group>
 					<el-popover
 						placement="top-start" 
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 60ac9a56..3d24f951 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>
 		<el-row>
-			<el-menu   active-text-color="#00abfc" :default-active="menukey" class="el-menu-demo" mode="horizontal" @select="handleSelect">
+			<el-menu  active-text-color="#00abfc" :default-active="menukey" class="el-menu-demo" mode="horizontal" @select="handleSelect">
 				<el-menu-item index="all">全部</el-menu-item>
 				<el-menu-item index="compete">我参与</el-menu-item>
 				<el-menu-item index="leader">我管理</el-menu-item>
@@ -12,11 +12,11 @@
 				<el-menu-item index="myExecuserStatus0">我排队</el-menu-item>
 				<el-menu-item index="myExecuserStatus1">我执行</el-menu-item>
 				<el-menu-item index="myExecuserStatus2">我提交验收</el-menu-item>
-				<el-menu-item index="myExecuserStatus3">我验收成功</el-menu-item>
-				<el-menu-item index="myExecuserStatus4">我验收失败</el-menu-item>
-				<el-menu-item index="myExecuserStatus5">我付款中</el-menu-item>
-				<el-menu-item index="myExecuserStatus6">我付款成功</el-menu-item>
-				<el-menu-item index="myExecuserStatus7">我放弃</el-menu-item>
+				<el-menu-item class="hidden-md-and-down" index="myExecuserStatus3">我验收成功</el-menu-item>
+				<el-menu-item class="hidden-md-and-down" index="myExecuserStatus4">我验收失败</el-menu-item>
+				<el-menu-item class="hidden-md-and-down" index="myExecuserStatus5">我付款中</el-menu-item>
+				<el-menu-item class="hidden-lg-and-down" index="myExecuserStatus6">我付款成功</el-menu-item>
+				<el-menu-item class="hidden-lg-and-down" index="myExecuserStatus7">我放弃</el-menu-item>
 				<!-- <el-submenu index="7">
 					<template slot="title">更多筛选</template>
 					<el-menu-item index="7-1">选项1</el-menu-item>
@@ -39,16 +39,24 @@
 							<el-button :loading="load.list" v-if="!showType" :class="{'changebtn-active':showType}" plain type="text" @click="showType=true" icon="el-icon-menu"></el-button>
 							<el-button :loading="load.list" v-else :class="{'changebtn-active':!showType}" plain type="text" @click="showType=false" icon="el-icon-more"></el-button>
 						</el-col> 
+						
+						<el-col  :span="24"  style="padding-top:5px; ">
+							<el-button class="hidden-lg-and-up hidden-btn"  style="margin-left:10px;"  @click="handleSelect('myExecuserStatus3')">我验收成功</el-button>
+							<el-button class="hidden-lg-and-up hidden-btn"    @click="handleSelect('myExecuserStatus4')">我验收失败</el-button>
+							<el-button class="hidden-lg-and-up hidden-btn"   @click="handleSelect('myExecuserStatus5')">我付款中</el-button>
+							<el-button class="hidden-xl-and-up hidden-btn"    @click="handleSelect('myExecuserStatus6')">我付款成功</el-button>
+							<el-button class="hidden-xl-and-up hidden-btn"    @click="handleSelect('myExecuserStatus7')">我放弃</el-button>
+						</el-col> 
 					</el-row>
 					<el-button type="text"  slot="reference" icon="el-icon-more"></el-button>
 				</el-popover>
 			</el-menu>
 			 
 		</el-row> 
-		<el-row class="app-container"> 
+		<el-row  class="app-container"> 
 			<!--列表 XmProject xm_project-->
 			<el-row v-show="showType" v-loading="load.list">
-				<el-col v-cloak v-for="(p,i) in ScreenData" :key="i" :xl="4" :lg="6" :md="8" :sm="12">
+				<el-col  v-cloak v-for="(p,i) in ScreenData" :key="i" :xl="4" :lg="6" :md="8" :sm="12">
 					<el-card @click.native="intoInfo(p,i)" class="project-card" shadow="always">
 						<div class="project-name" title="这是项目名称">{{p.name}}</div>
 						<div class="project-id eui-text-truncate">{{p.code}}</div>
@@ -767,4 +775,8 @@
 [v-cloak]{
 	display: none;
 }
+.hidden-btn{
+	margin-top: 5px;
+	margin-bottom: 5px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
index a7808efc..7a7a7613 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
@@ -6,21 +6,21 @@
 			
 			<el-button  type="success"  @click="handlePopover(null,'add')" icon="el-icon-plus"></el-button>
 			<el-button  @click="noBatchEdit" v-loading="load.edit" icon="el-icon-back">返回</el-button>
-			
+			<div  style=" float:right;margin-right:10px;" > 
+				<el-input   v-model="filters.key" style="width:200px;" placeholder="模糊查询">
+					<template slot="append">
+						<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectPhases" icon="el-icon-search"></el-button>
+					</template>
+				</el-input> 
+				
+			</div> 
 		</el-row>
 		<el-row class="app-container"  >  
  					<span style="margin-left:10px;font-size:14px;">项目总预算：</span><el-tag type='success'> {{toFixed(selProject.planTotalCost/10000,2)}}万，剩{{toFixed(phaseBudgetData.surplusPlanCostAt/10000,2)}}万</el-tag> 
 					<span style="margin-left:10px;font-size:14px;">非人力总预算：</span><el-tag :type="phaseBudgetData.surplusPlanNouserAt>0?'warning':'danger'">{{toFixed(selProject.planNouserAt/10000,2)}}万，剩{{toFixed(phaseBudgetData.surplusPlanNouserAt/10000,2)}}万</el-tag>  
 					<span style="margin-left:10px;font-size:14px;">内部人力总预算：</span><el-tag  :type="phaseBudgetData.surplusPlanInnerUserAt>0?'warning':'danger'">{{toFixed(selProject.planInnerUserAt/10000,2)}}万，剩{{toFixed(phaseBudgetData.surplusPlanInnerUserAt/10000,2)}}万</el-tag>  
 					<span style="margin-left:10px;font-size:14px;">外购人力总预算：</span><el-tag  :type="phaseBudgetData.surplusPlanOutUserAt>0?'warning':'danger'">{{toFixed(selProject.planOutUserAt/10000,2)}}万，剩{{toFixed(phaseBudgetData.surplusPlanOutUserAt/10000,2)}}万</el-tag>  
-					<div  style=" float:right;margin-right:10px;" > 
-						<el-input   v-model="filters.key" style="width:200px;" placeholder="模糊查询">
-							<template slot="append">
-								<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectPhases" icon="el-icon-search"></el-button>
-							</template>
-						</el-input> 
-						
-					</div> 
+
  		</el-row> 
  		<el-row class="app-container" >   
 			<!--列表 XmProjectPhase xm_project_phase-->
@@ -34,8 +34,8 @@
 								width="400"
 								trigger="click">
 								<div style="text-align: center; margin: 0">
-                  <div :ref="'phase_'+scope.$index" :data-phase-id="scope.row.id"></div>
-                  <el-button type="primary" size="mini"   @click="handlePopover(scope.row,'highestPmenuId')">成为顶级节点</el-button> 
+									<div :ref="'phase_'+scope.$index" :data-phase-id="scope.row.id"></div>
+									<el-button type="primary" size="mini"   @click="handlePopover(scope.row,'highestPmenuId')">成为顶级节点</el-button> 
 									<el-button type="danger" size="mini"   @click="handlePopover(scope.row,'delete')">删除当前行</el-button> 
 									<el-button type="success" size="mini"   @click="handlePopover(scope.row,'addSub')">增加子行</el-button> 
 								</div>
@@ -49,9 +49,7 @@
 					<template  slot-scope="scope">
 						<el-input    v-model="scope.row.phaseName"    @change="fieldChange(scope.row,'phaseName')"></el-input>  
 					</template>
-				</el-table-column>  
-				<el-table-column  prop="mngUsername" label="责任人" min-width="80" >  
-				</el-table-column>
+				</el-table-column>   
 				<el-table-column  prop="beginDate" label="起始时间"  width="200" >
 					<template slot-scope="scope">  
 						<div>
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
index 679f8eb5..b05862f3 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
@@ -2,28 +2,51 @@
 	<section>
 		<el-row  class="app-container" v-show="batchEditVisible==false">
 
-			<el-button  type="primary" @click="showAdd" v-loading="load.add" icon="el-icon-plus">添加计划</el-button>
-			<el-button  type="primary" @click="showPhaseTemplate" v-loading="load.add" icon="el-icon-plus">由模板导入计划</el-button>
-			<el-button  type="primary" @click="showMenu" v-loading="load.add" icon="el-icon-plus">由故事批量创建</el-button>
-
-			<el-button  type="warning" @click="loadTasksToXmProjectPhase(sels)" v-loading="load.edit" icon="el-icon-s-data">由任务汇总实际数据</el-button> 
-			<el-button type="success"  @click="batchEditVisible=true" v-loading="load.edit" icon="el-icon-edit">批量修改</el-button>
+			<el-button  type="primary" @click="showAdd" v-loading="load.add" icon="el-icon-plus">添加计划</el-button> 
+			<el-button   @click="showMenu" v-loading="load.add" icon="el-icon-plus">由故事批量创建</el-button> 
+			<el-button  class="hidden-md-and-down"  @click="showPhaseTemplate" v-loading="load.add" icon="el-icon-plus">由模板导入计划</el-button> 
+			<el-button  class="hidden-md-and-down"  @click="loadTasksToXmProjectPhase(sels)" v-loading="load.edit" icon="el-icon-s-data">由任务汇总实际数据</el-button> 
+			<el-button   @click="batchEditVisible=true" v-loading="load.edit" icon="el-icon-edit">批量修改</el-button>
+			<div  v-if="batchEditVisible!=true" style=" float:right;margin-right:10px;" >
+				<el-checkbox v-model="gstcVisible"  >甘特图</el-checkbox>
+				<el-input   v-model="filters.key" style="width:200px;" placeholder="模糊查询">
+					<template slot="append">
+						<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectPhases" icon="el-icon-search"></el-button>
+					</template>
+				</el-input> 
+				<el-popover
+					placement="top-start"
+					title=""
+					width="200"
+					trigger="click" >
+					<el-row>
+						<el-col :span="24" style="padding-top:5px;">
+							<el-button  type="primary" @click="showPhaseTemplate" v-loading="load.add" icon="el-icon-plus">由模板导入计划</el-button>
+						</el-col>
+						<el-col  :span="24"  style="padding-top:5px;">
+							<el-button  type="primary" @click="showMenu" v-loading="load.add" icon="el-icon-plus">由故事批量创建</el-button> 
+						</el-col>
+						<el-col  :span="24"  style="padding-top:5px;">
+							<el-button  type="warning" @click="loadTasksToXmProjectPhase(sels)" v-loading="load.edit" icon="el-icon-s-data">由任务汇总实际数据</el-button> 
+						</el-col>  
+						<el-col :span="24" style="padding-top:5px;">
+							<el-checkbox v-model="gstcVisible"  class="hidden-lg-and-up" >甘特图</el-checkbox>
+						</el-col>
+						<el-col  :span="24"  style="padding-top:5px;"> 
+			
+						</el-col> 
+					</el-row>
+					<el-button  slot="reference" icon="el-icon-more" circle></el-button>
+				</el-popover> 
+			</div> 
 			
 		</el-row>
-		<el-row class="app-container"  v-show="batchEditVisible==false">  
+		<el-row class="app-container hidden-md-and-down"     v-show="batchEditVisible==false">  
  					<span style="margin-left:10px;font-size:14px;">项目总预算：</span><el-tag type='success'> {{toFixed(selProject.planTotalCost/10000,2)}}万，剩{{toFixed(phaseBudgetData.surplusPlanCostAt/10000,2)}}万</el-tag> 
 					<span style="margin-left:10px;font-size:14px;">非人力总预算：</span><el-tag :type="phaseBudgetData.surplusPlanNouserAt>0?'warning':'danger'">{{toFixed(selProject.planNouserAt/10000,2)}}万，剩{{toFixed(phaseBudgetData.surplusPlanNouserAt/10000,2)}}万</el-tag>  
 					<span style="margin-left:10px;font-size:14px;">内部人力总预算：</span><el-tag  :type="phaseBudgetData.surplusPlanInnerUserAt>0?'warning':'danger'">{{toFixed(selProject.planInnerUserAt/10000,2)}}万，剩{{toFixed(phaseBudgetData.surplusPlanInnerUserAt/10000,2)}}万</el-tag>  
 					<span style="margin-left:10px;font-size:14px;">外购人力总预算：</span><el-tag  :type="phaseBudgetData.surplusPlanOutUserAt>0?'warning':'danger'">{{toFixed(selProject.planOutUserAt/10000,2)}}万，剩{{toFixed(phaseBudgetData.surplusPlanOutUserAt/10000,2)}}万</el-tag>  
-					<div  v-if="batchEditVisible!=true" style=" float:right;margin-right:10px;" >
-					  <el-checkbox v-model="gstcVisible"  >甘特图</el-checkbox>
-						<el-input   v-model="filters.key" style="width:200px;" placeholder="模糊查询">
-							<template slot="append">
-								<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectPhases" icon="el-icon-search"></el-button>
-							</template>
-						</el-input> 
-						
-					</div> 
+
  		</el-row> 
  		<el-row class="app-container" v-show="batchEditVisible==false"> 
 			<!--列表 XmProjectPhase xm_project_phase-->
@@ -36,13 +59,13 @@
 				</el-table-column>   
 				<el-table-column  prop="mngUsername" label="责任人" min-width="80" > 
 					<template  slot-scope="scope">
-						<el-button  v-if="!scope.row.mngUserid"  v-model="scope.row.mngUsername" @click="groupUserSelectVisible=true" icon="el-icon-setting">去设置</el-button>  
-						<el-link v-else type="primary" icon="el-icon-setting" @click="groupUserSelectVisible=true">{{scope.row.mngUsername}}</el-link>
+						<el-button type="text" v-if="!scope.row.mngUserid"  v-model="scope.row.mngUsername" @click="groupUserSelectVisible=true" icon="el-icon-setting">去设置</el-button>  
+						<el-link v-else type="primary"   @click="groupUserSelectVisible=true">{{scope.row.mngUsername}}</el-link>
 					</template>
 				</el-table-column>
 				<el-table-column  prop="beginDate" label="起止时间" min-width="150" >
 					<template slot-scope="scope">  
-								{{formatDate(scope.row.beginDate)}}~{{formatDate(scope.row.endDate)}}  
+								<font class="hidden-md-and-down" >{{formatDate(scope.row.beginDate)}}<br>{{formatDate(scope.row.endDate)}}  </font>
 								<div v-for="item in [calcTaskStateByTime(scope.row.beginDate,scope.row.endDate,scope.row.actRate,scope.phaseStatus)]" :key="item.status"><el-tag :type="item.status">{{item.remark}}</el-tag></div> 
 					</template>
 				</el-table-column>
@@ -54,16 +77,10 @@
 				</el-table-column>
 				<el-table-column  prop="phaseBudgetHours" label="工时.人时" min-width="200" > 
 					<template slot-scope="scope">  
-						计划：{{getFloatValue(scope.row.phaseBudgetOutUserCnt)+getFloatValue(scope.row.phaseBudgetInnerUserCnt)}}人,{{scope.row.phaseBudgetHours}}小时,{{scope.row.phaseBudgetWorkload}}人时 <br/> 
-						实际：{{scope.row.actStaffNu}}人,{{scope.row.actHours}}小时,{{scope.row.phaseActWorkload}}人时
+						计划：{{scope.row.phaseBudgetWorkload}} <br/> 
+						实际：{{scope.row.phaseActWorkload}} 
 					</template>
-				</el-table-column> 
-				<el-table-column  prop="phaseBudgetNouserAt" label="成本.元" min-width="300" > 
-					<template slot-scope="scope">  
-						计划：非人力:{{scope.row.phaseBudgetNouserAt}},内购人力:{{scope.row.phaseBudgetInnerUserAt}},外购人力:{{scope.row.phaseBudgetOutUserAt}} <br/> 
-						实际：非人力:{{scope.row.actNouserAt}},内购人力:{{scope.row.actInnerUserAt}},外购人力:{{scope.row.actOutUserAt}}
-					</template>
-				</el-table-column> 
+				</el-table-column>  
 				<el-table-column  prop="phaseBudgetCostAt" label="成本合计.元" min-width="120" > 
 					<template slot-scope="scope">  
 						计划：{{scope.row.phaseBudgetCostAt}} <br/> 
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
index 68630d02..8c2f6d1c 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
@@ -11,7 +11,7 @@
 				</template>
 			</el-table-column>   
 		</el-table>
-		<el-pagination  layout="total,  prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
+		<el-pagination  class="hidden-md-and-down"   layout="total,  prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
 		</el-row>
 	</section>
 </template>
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index c56976ee..69f34350 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -7,11 +7,11 @@
 					<el-option v-for="(b,index) in options['bugStatus']" :value="b.optionValue"  :key="index" :label="b.optionName">{{b.optionName}}
 					</el-option>
 				</el-select>
-				<el-select v-model="filters.priority" placeholder="请选择紧急程度" clearable @change="changePriority">
+				<el-select class="hidden-md-and-down" v-model="filters.priority" placeholder="请选择紧急程度" clearable @change="changePriority">
 					<el-option v-for="(b,index) in options['urgencyLevel']" :value="b.optionValue" :key="index" :label="b.optionName">{{b.optionName}}
 					</el-option>
 				</el-select>
-				<el-select v-model="filters.solution" placeholder="请选择解决方案" clearable @change="changeSolution">
+				<el-select class="hidden-md-and-down" v-model="filters.solution" placeholder="请选择解决方案" clearable @change="changeSolution">
 					<el-option v-for="(b,index) in options['bugSolution']" :value="b.optionValue" :key="index" :label="b.optionName">{{b.optionName}}
 					</el-option>
 				</el-select>
@@ -30,7 +30,7 @@
 					placement="top-start"
 					title=""
 					width="400"
-					trigger="hover" >
+					trigger="click" >
 					<el-row>
 						<el-col :span="24"  style="padding-top:12px;">
 							<el-tag v-if="filters.selProject && !selProject" closable @close="clearProject" @click="showProjectList(true)">{{ filters.selProject.name }}</el-tag>
@@ -41,6 +41,18 @@
 							指派给:<el-tag v-if="!filters.handlerUsername" @click="showGroupUsers('handlerUsername')">未选，点我</el-tag>
 							<el-tag v-if="filters.handlerUsername" closable @close="clearHandler"  @click="showGroupUsers('handlerUsername')">{{filters.handlerUsername}}</el-tag>
 						</el-col>
+						<el-col :span="24" class="hidden-lg-and-up" style="padding-top:12px;">
+							<el-select   v-model="filters.priority" placeholder="请选择紧急程度" clearable @change="changePriority">
+								<el-option v-for="(b,index) in options['urgencyLevel']" :value="b.optionValue" :key="index" :label="b.optionName">{{b.optionName}}
+								</el-option>
+							</el-select>
+						</el-col> 
+						<el-col :span="24" class="hidden-lg-and-up" style="padding-top:12px;">
+							<el-select  v-model="filters.solution" placeholder="请选择解决方案" clearable @change="changeSolution">
+								<el-option v-for="(b,index) in options['bugSolution']" :value="b.optionValue" :key="index" :label="b.optionName">{{b.optionName}}
+								</el-option>
+							</el-select>
+						</el-col> 
 						<el-col :span="24"  style="padding-top:12px;">
 							<el-button @click="handleExport"   icon="el-icon-download">导出</el-button>
 						</el-col> 
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 9dc8ad31..631546f1 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -24,14 +24,14 @@
 						<el-option class="showall" value="all"  label="全部类型">全部类型</el-option>
 						<el-option  v-for="(i,index) in options.taskType" :value="i.optionValue" :label="i.optionName" :key="index">{{i.optionName}}</el-option> 
 					</el-select> 
-					<el-button v-if=" !filters.skillTags || filters.skillTags.length==0" icon="el-icon-search" @click="showSkillSelect">选择标签</el-button>
+					<el-button  class="hidden-md-and-down"  v-if=" !filters.skillTags || filters.skillTags.length==0" icon="el-icon-search" @click="showSkillSelect">选择标签</el-button>
 					<el-tag closable v-for=" (skill,index) in filters.skillTags" :key="index"  @click="showSkillSelect" @close="skillTagClear(skill)">{{skill.skillName}}</el-tag>
-					<div style="line-height:50px;float:right;margin-right:10px;">
-						<el-checkbox v-model="gstcVisible"  >甘特图</el-checkbox>
-						<el-tag v-if=" !selProject && filters.selProject" :closable="!selProject"  @click="showProjectList" @close="clearProject">项目:{{this.filters.selProject.name}}</el-tag>
-						<el-tag v-if=" !selProject && !filters.selProject" @click="showProjectList" type="plian">未选项目，点我</el-tag>
+					<div style=" float:right;margin-right:10px;">
+						<el-checkbox v-model="gstcVisible"  class="hidden-md-and-down" >甘特图</el-checkbox>
+						<el-tag  class="hidden-md-and-down" v-if=" !selProject && filters.selProject" :closable="!selProject"  @click="showProjectList" @close="clearProject">项目:{{this.filters.selProject.name}}</el-tag>
+						<el-tag  class="hidden-md-and-down" v-if=" !selProject && !filters.selProject" @click="showProjectList" type="plian">未选项目，点我</el-tag>
 
-						<el-input  style="width:200px;" v-model="filters.key" placeholder="任务名称">
+						<el-input   style="width:200px;" v-model="filters.key" placeholder="任务名称">
 							<template slot="append">
 								<el-button    @click="searchXmTasks" type="primary" icon="el-icon-search" v-loading="load.list"></el-button> 
 							</template>
@@ -41,7 +41,7 @@
 							placement="top-start"
 							title=""
 							width="200"
-							trigger="hover" >
+							trigger="click" >
 							<el-row>
 								<el-col :span="24" style="padding-top:5px;">
 									<el-button type="primary" v-if=" isTaskCenter!='1'   && isMy!='1'"  @click="showBatchEdit" v-loading="load.edit" icon="el-icon-edit">批量修改任务</el-button>
@@ -53,11 +53,20 @@
 									<el-button v-if=" isTaskCenter!='1'   && isMy!='1'"  @click="showMenu" type="success" icon="el-icon-plus">由故事快速创建任务</el-button> 
 								</el-col> 
 							</el-row>
+							<el-row>
+								<el-col :span="24" style="padding-top:5px;">
+									<el-checkbox v-model="gstcVisible"  class="hidden-lg-and-up" >甘特图</el-checkbox>
+								</el-col>
+								<el-col  :span="24"  style="padding-top:5px;">
+									<el-button  class="hidden-lg-and-up"  v-if=" !filters.skillTags || filters.skillTags.length==0" icon="el-icon-search" @click="showSkillSelect">选择标签</el-button>
+					
+								</el-col> 
+							</el-row>
 							<el-button  slot="reference" icon="el-icon-more" circle></el-button>
 						</el-popover> 
 					</div>  
 				</el-row> 
-				<el-row> 
+				<el-row style="padding-top:12px;"> 
 						<el-table v-if="!gstcVisible"
 							show-summary
 							:data="tasksTreeData"
@@ -187,7 +196,7 @@
 								</template>
 							</el-table-column>
 						</el-table>
-						<el-pagination v-if="!gstcVisible" layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
+						<el-pagination  v-if="!gstcVisible" layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
 						<xm-gantt v-if="gstcVisible" :tree-data="tasksTreeData" :project-phase="{startTime: currentProjectPhase.beginDate, endTime: currentProjectPhase.endDate}" :useRealTime="true"></xm-gantt>
 					 
 				</el-row>