界面优化

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

@@ -1,10 +1,10 @@
 <template>
-	<section class="page-container page-full-height padding border">
+	<section class="padding">
 		<el-row v-if=" !batchEditVisible"> 
 			<el-col :span="6">
 				<xm-product-mng :sel-project="selProject" @row-click="onProductSelected" ref="xmProductMng" :simple="true"></xm-product-mng>
 			</el-col>
-			<el-col :span="18">
+			<el-col :span="18" class="padding-left">
 					<el-row >  
 						<el-select  v-model="filters.taskFilterType" placeholder="是否分配了任务？" clearable >
 							<el-option   value="not-join"  label="未分配任何任务的故事"></el-option>  
@@ -92,7 +92,7 @@
 						</el-popover> 
 					
 					</el-row>
-					<el-row style="padding-top:12px;">  
+					<el-row class="padding-top">  
 						<el-table  ref="table" :height="tableHeight" :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick">
 							<el-table-column sortable type="selection" width="40"></el-table-column> 
 							<el-table-column prop="menuName" label="故事名称" min-width="160" show-overflow-tooltip> 

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

@@ -1,6 +1,6 @@
 <template>
 	<section class="page-container padding">
-    <el-row class="padding-bottom"> 
+    <el-row> 
 			<el-select   v-model="filters.queryScope"    placeholder="产品查询范围">
 				<el-option :label="userInfo.branchName+'机构下所有的产品'" value="branchId"></el-option>
 				<el-option label="我相关的产品" value="compete"></el-option>
@@ -91,7 +91,7 @@
 				<el-button  slot="reference"   icon="el-icon-more" circle></el-button>
 			</el-popover> 
 		</el-row>
-		<el-row  class="page-main"> 
+		<el-row  class="padding-top"> 
 			<!--列表 XmProduct 产品表-->
 			<el-table ref="table"  :height="tableHeight" :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
   				<el-table-column prop="productName" label="产品名称" min-width="300"> 

src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue

@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<el-row  class="page-main" >
+		<el-row >
 			<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-button type="warning" @click="saveBatchEdit" v-loading="load.edit" icon="el-icon-finished">批量保存</el-button>
 			
@@ -15,14 +15,14 @@
 				
 			</div> 
 		</el-row>
-		<el-row class="page-main"  >  
+		<el-row class="padding-top"  >  
  					<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>  
 
  		</el-row> 
- 		<el-row class="page-main" >   
+ 		<el-row class="padding-top" >   
 			<!--列表 XmProjectPhase xm_project_phase-->
 			<el-table ref="table" :height="tableHeight" class="drag-table" default-expand-all :summary-method="getSummariesForBatchEdit" :data="projectPhaseTreeData"    :show-summary="true"  row-key="id" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column    type="selection" width="50"></el-table-column>

src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue

@@ -1,6 +1,6 @@
 <template>
-	<section>
-		<el-row  class="page-main" v-show="batchEditVisible==false"> 
+	<section class="padding">
+		<el-row v-show="batchEditVisible==false"> 
 			<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>
 			<span  v-if="batchEditVisible!=true"   >
@@ -58,31 +58,20 @@
 			</el-popover>
 			
 		</el-row>
-		<el-row class="app-container hidden-md-and-down"     v-show="batchEditVisible==false">  
+		<el-row class="padding-top 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>  
 
  		</el-row> 
- 		<el-row class="page-main" v-show="batchEditVisible==false"> 
+ 		<el-row  class="padding-top" v-show="batchEditVisible==false"> 
 			<!--列表 XmProjectPhase xm_project_phase-->
 			<el-table ref="table" :height="tableHeight" v-show="!gstcVisible "  default-expand-all :data="projectPhaseTreeData"  :summary-method="getSummariesForNoBatchEdit"  :show-summary="true"  row-key="id" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
   				<el-table-column prop="phaseName" label="阶段名称" min-width="150" show-overflow-tooltip> 
 					 <template slot-scope="scope">   
-						<span>{{scope.row.seqNo}} &nbsp;&nbsp;<el-link type="primary" @click="showEdit(scope.row)"> {{scope.row.phaseName}}</el-link></span>
-						<font style="float:right;">
-						<span>
-							<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>
-						</span> 
-						<span>
-							<el-tag :type="scope.row.actRate>=100?'success':'primary'"> {{ (scope.row.actRate!=null?scope.row.actRate:0)+'%'}} </el-tag> 
-						</span>
 						<span>
-							<font class="hidden-md-and-down" >{{formatDate(scope.row.beginDate)}}<br>{{formatDate(scope.row.endDate)}}  </font>
-							<font 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></font> 
-						</span>
+							{{scope.row.seqNo}} &nbsp;&nbsp; 
 							<span>
 								<el-dropdown @command="handleCommand" :hide-on-click="false">
 									<span class="el-dropdown-link">
@@ -102,6 +91,21 @@
 									</el-dropdown-menu>
 								</el-dropdown> 
 							</span>
+							<span>
+								<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>
+							</span> 
+							<span>
+								<el-tag :type="scope.row.actRate>=100?'success':'primary'"> {{ (scope.row.actRate!=null?scope.row.actRate:0)+'%'}} </el-tag> 
+							</span>	
+							<el-link type="primary" @click="showEdit(scope.row)"> {{scope.row.phaseName}}</el-link>
+						</span>
+						
+						<font style="float:right;"> 
+							<span>
+								<font class="hidden-md-and-down" >{{formatDate(scope.row.beginDate)}}{{formatDate(scope.row.endDate)}}  </font>
+								<font 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></font> 
+							</span>
 						</font> 
 					 </template>
 				</el-table-column>   

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

@@ -1,10 +1,16 @@
 <template>
-	<section>
-		<el-row class="xm-question">
-			<!--新增界面 XmQuestion xm_question--> 
-			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
+	<section class="page-container page-full-height padding">
 		<el-row>
-					<el-col :span="12">
+			<el-steps :active="calcBugStep" simple finish-status="success">
+				<el-step title="已激活,待确认" description="创建后自动激活、关闭后重新激活)"></el-step>
+				<el-step title="已确认,待解决" description="业务确认缺陷后变为已确认"></el-step>
+				<el-step title="已解决,待关闭" description="开发修复缺陷后，变成已解决"></el-step>
+				<el-step title="已关闭(可重新激活)" description="测试通过后变为已关闭，已关闭缺陷可以重新激活"></el-step> 
+			</el-steps>
+		</el-row>
+		<el-row class="page-main page-height-80 padding"> 
+			<el-form :model="addForm"  :rules="addFormRules" ref="addForm"> 
+						
 						<el-form-item label="隶属项目" prop="projectName">
 							<el-tag :closable="!selProject" @close="clearProject">{{this.filters.selProject?this.filters.selProject.name:'未选项目'}}</el-tag><el-button v-if="!selProject" @click="showProjectList" type="plian">选项目</el-button> 
 						</el-form-item>
@@ -43,31 +49,18 @@
 						<el-form-item label="指派给" prop="handlerUsername">
 							{{addForm.handlerUsername}} <el-button @click="sendToAsk">指派给提出人</el-button><el-button @click="sendToCreater">指派给创建人</el-button><el-button @click="showGroupUsers('handlerUsername')">选其它人</el-button>
 						</el-form-item>   
-					</el-col>
-					<el-col :span="12">
 											
-						<el-form-item>
-							<el-col :span="24">测试步骤</el-col>
-							<el-col :span="24">
+						<el-form-item label="测试步骤" prop="opStep"> 
 									<vue-editor :id="'opStep'+addForm.id" :branch-id="userInfo.branchId" v-model="addForm.opStep" ref="opStep"></vue-editor>  
-							</el-col>
-							<el-col :span="24"  >预期结果</el-col>
 		 
-							<el-col :span="24"  >  
+ 						</el-form-item>  
+											
+						<el-form-item label="预期结果" prop="expectResult">  
 									<vue-editor :id="'expectResult'+addForm.id" :branch-id="userInfo.branchId" v-model="addForm.expectResult"  ref="expectResult"></vue-editor>   
-							</el-col> 
 						</el-form-item>  
-					</el-col>
-				</el-row>
 				<el-form-item label="缺陷描述" prop="description"> 
         			<vue-editor :id="'description_'+addForm.id" :branch-id="userInfo.branchId" v-model="addForm.description"></vue-editor>
 				</el-form-item>    
-				<el-form-item class="add-btns">
-					<el-col style="text-align:center;" :span="24"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.add" type="primary" @click.native="addSubmit" :disabled="load.add==true">保存</el-button> 
-					</el-col>
-				</el-form-item> 
 			</el-form>
 			<el-drawer title="选中用户" :visible.sync="selectUserVisible"  size="80%"  append-to-body   :close-on-click-modal="false">
 				<xm-group-mng  :sel-project="filters.selProject" :is-select-single-user="1" @user-confirm="onUserConfirm"></xm-group-mng>
@@ -85,6 +78,10 @@
 				<xm-project-list    @project-confirm="onPorjectConfirm"></xm-project-list>
 			</el-drawer> 
 		</el-row>
+		<el-row> 
+			<el-button @click.native="handleCancel">取消</el-button>  
+			<el-button v-loading="load.add" type="primary" @click.native="addSubmit" :disabled="load.add==true">保存</el-button> 
+		</el-row>
 	</section>
 </template>
 
@@ -381,19 +378,18 @@
 </script>
 
 <style scoped>
-.xm-question{
+
+  .wf-main-context-box {  
+	border:1px dashed #000;
+	margin-bottom: 10px;
+	margin-top: 30px;  
 	padding:10px;
 }
-.el-form-item{
-	margin-bottom: 15px;
-}
-.el-form-item__content{
-	margin-left: 0;
+ .wf-main-context p { 
+	color: #585858;  
 }
-.el-form-item__content{
-	margin-left: 0;
-}
-.add-btns >>> .el-form-item__content{
-	margin-left: 0 !important;
+	
+.wf-main-context   p  > img {
+	max-width: 100%; 
 }
 </style>

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

@@ -1,11 +1,5 @@
 <template>
-	<section class="page-container padding">
-			
-			 <el-row class="page-main">
-				<!--列表 XmQuestion xm_question-->
-				<el-table ref="table" :height="tableHeight" :data="xmQuestions" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
- 					<el-table-column prop="name" label="缺陷名称"  min-width="200">
-						<template slot="header" slot-scope="scope">
+	<section class="padding">
 			<el-row>
 			  	<el-select v-model="filters.bugStatus" placeholder="请选择状态" style="width:15%;" clearable @change="changeBugStatus">
 					<el-option v-for="(b,index) in options['bugStatus']" :value="b.optionValue"  :key="index" :label="b.optionName">{{b.optionName}}
@@ -126,7 +120,10 @@
 					<el-button  slot="reference" icon="el-icon-more" circle></el-button>
 				</el-popover> 
 			 </el-row>
-						</template>
+			 <el-row class="padding-top">
+				<!--列表 XmQuestion xm_question-->
+				<el-table ref="table" :height="tableHeight" :data="xmQuestions" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+ 					<el-table-column prop="name" label="缺陷名称"  min-width="200">
 						<template slot-scope="scope">
 							<div>
 							<span>
@@ -173,7 +170,7 @@
 			</el-drawer>
 
 			<!--新增 XmQuestion xm_question界面-->
-			<el-drawer title="新增缺陷"  :visible.sync="addFormVisible"   width="100%"  append-to-body   :close-on-click-modal="false">
+			<el-drawer title="新增缺陷"  :visible.sync="addFormVisible" :with-header="false" :size="750"  append-to-body   :close-on-click-modal="false">
 				<xm-question-add :xm-test-case-exec="xmTestCaseExec" :xm-test-case="xmTestCase" :qtype="qtype" :sel-project=" filters.selProject " :xm-question="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-question-add>
 			</el-drawer>
 			<el-drawer title="选中用户" v-if=" filters.selProject " :visible.sync="selectUserVisible"  size="80%"  append-to-body   :close-on-click-modal="false">
@@ -905,6 +902,7 @@
 				var subHeight=70/1000 * window.innerHeight;
 				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
 				this.getXmQuestions();
+			});
 				listOption([{categoryId:'all',itemCode:'bugSeverity'},{categoryId:'all',itemCode:'bugSolution'},{categoryId:'all',itemCode:'bugStatus'},{categoryId:'all',itemCode:'bugType'},{categoryId:'all',itemCode:'urgencyLevel'}] ).then(res=>{
 					if(res.data.tips.isOk){
 						this.options['bugSeverity']=res.data.data.bugSeverity
@@ -914,8 +912,6 @@
 						this.options['urgencyLevel']=res.data.data.urgencyLevel
 					}
 				});
-			});
-				
 		}
 	}
 

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

@@ -1,6 +1,6 @@
 <template>
 	<section class="page-container padding">
-		<el-row class="page-header padding">
+		<el-row>
 			<el-button type="text" @click="goAnchor('baseInfoAdd')">基础信息</el-button>
 			<el-button type="text" @click="goAnchor('planInfoAdd')">进度计划</el-button>
 			<el-button type="text" @click="goAnchor('costInfoAdd')">工作量与成本</el-button>
@@ -8,6 +8,17 @@
 			<el-button type="text" @click="goAnchor('menuInfoAdd')">故事明细</el-button>
 			<el-button type="text" @click="goAnchor('taskOutAdd')">众包</el-button>
 		</el-row>
+		<el-row>  
+			<el-steps :active="calcTaskStep" finish-status="success" simple>
+				<el-step title="发布" description="任务创建成功后即发布"></el-step>
+				<el-step title="竞标" description="候选人参与竞标，或者由责任人主动设置候选人"></el-step>
+				<el-step title="执行" description="候选人中标后，成为执行人，执行任务"></el-step>
+				<el-step title="验收" description="任务完成后提交验收，验收通过，即可进行结算"></el-step>
+				<el-step title="结算" description="提交结算申请审批流程，审批过程自动根据审批结果进行结算"></el-step>
+				<el-step title="企业付款" description="结算流程审批通过，自动付款到个人钱包"></el-step> 
+				<el-step title="提现" description="企业付款完成后，个人对钱包中余额进行提现"></el-step> 
+			</el-steps>
+		</el-row>
 		<el-row class="page-main page-height-80">
 			<!--新增界面 XmTask xm_task-->
 			<el-form :model="addForm"  label-width="100px" :rules="addFormRules" ref="addForm">
@@ -521,12 +532,19 @@
 				this.addForm.taskType=this.parentTask.taskType
 				this.addForm.planType=this.parentTask.planType
 			}else{
+				if(this.projectPhase){
 					this.addForm.taskType=this.projectPhase.taskType
 				} 
+ 			}
+			if(this.xmProject){
 				this.addForm.projectId=this.xmProject.id
 				this.addForm.projectName=this.xmProject.name
+			}
+			if(this.projectPhase){
 				this.addForm.projectPhaseId=this.projectPhase.id
 				this.addForm.projectPhaseName=this.projectPhase.phaseName
+			}
+			
 			if(this.parentTask ){
 				if(this.parentTask.children){
 					this.addForm.sortLevel=this.parentTask.sortLevel+"."+(this.parentTask.children.length+1)

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

@@ -1,6 +1,6 @@
 <template>
 	<section class="page-container padding">
-		<el-row class="page-header padding"> 
+		<el-row> 
 			<el-button type="text" @click="goAnchor('baseInfo')">基础信息</el-button> 
 			<el-button type="text" @click="goAnchor('planInfo')">进度计划</el-button> 
 			<el-button type="text" @click="goAnchor('costInfo')">工作量与成本</el-button>
@@ -8,16 +8,22 @@
 			<el-button type="text" @click="goAnchor('menuInfo')">故事明细</el-button> 
 			<el-button type="text" @click="goAnchor('taskOut')">众包</el-button>  
 		</el-row>
+		<el-row> 
+			<el-steps :active="calcTaskStep" finish-status="success" simple>
+			<el-step title="发布" description="任务创建成功后即发布"></el-step>
+			<el-step title="竞标" description="候选人参与竞标，或者由责任人主动设置候选人"></el-step>
+			<el-step title="执行" description="候选人中标后，成为执行人，执行任务"></el-step>
+			<el-step title="验收" description="任务完成后提交验收，验收通过，即可进行结算"></el-step>
+			<el-step title="结算" description="提交结算申请审批流程，审批过程自动根据审批结果进行结算"></el-step>
+			<el-step title="企业付款" description="结算流程审批通过，自动付款到个人钱包"></el-step> 
+			<el-step title="提现" description="企业付款完成后，个人对钱包中余额进行提现"></el-step> 
+		</el-steps>
+		</el-row>
 		<el-row class="page-main page-height-80">
 			<!--新增界面 XmTask xm_task--> 
 			<el-form :model="editForm"  label-width="100px" :rules="editFormRules" ref="editForm">     
 				<el-card class="box-card" header="基础信息" id="baseInfo" shadow="hover"> 
-					<el-steps :active="calcTaskStep" align-center finish-status="success">
-						<el-step title="待领取"></el-step>
-						<el-step title="执行中"></el-step>
-						<el-step title="已完工待结算"></el-step>
-						<el-step title="已结算"></el-step> 
-					</el-steps> 
+
 					<el-form-item label="任务名称" prop="name">
 						<el-row>
 						<el-col :span="24" style="padding-left:10px;">
@@ -145,7 +151,7 @@
 
 					</el-form-item>   
 					<el-form-item label="众包流程" prop="taskOut">
-						 <el-steps :active="calcTaskStep" align-center>
+						 <el-steps :active="calcTaskStep" align-center finish-status="success" simple>
 							<el-step title="发布" description="任务创建成功后即发布"></el-step>
 							<el-step title="竞标" description="候选人参与竞标，或者由责任人主动设置候选人"></el-step>
 							<el-step title="执行" description="候选人中标后，成为执行人，执行任务"></el-step>

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

@@ -1,10 +1,10 @@
 <template>
-	<section class="page-container padding">
+	<section class="padding">
 		<el-row  v-show="batchEditVisible==false"> 
 			<el-col v-if="isTaskCenter!='1' && currentProject " :span="4" >
 				<xm-project-phase-mng  :sel-project="currentProject" :simple="true" @row-click="projectPhaseRowClick" @clear-select="clearSelectPhase"></xm-project-phase-mng>
 			</el-col>
-			<el-col :span="isTaskCenter!='1' && currentProject?20:24">
+			<el-col :span="isTaskCenter!='1' && currentProject?20:24" class="padding-left">
 				<el-row>
 					<el-select v-model="selkey" placeholder="请选择任务状态" clearable @change="changeSelKey">
 						<el-option class="showall" value="" label="全部状态">全部状态</el-option>
@@ -136,7 +136,7 @@
 							<el-button  slot="reference" icon="el-icon-more" circle></el-button>
 						</el-popover>
 				</el-row>
-				<el-row style="padding-top:10px;">
+				<el-row class="padding-top">
 						<el-table v-if="!gstcVisible"
 							show-summary
 							:data="tasksTreeData"
@@ -297,12 +297,12 @@
 			</div>
 		</el-drawer>
 		<!--编辑 XmTask xm_task界面-->
-		<el-drawer title="编辑任务" :visible.sync="editFormVisible" :with-header="false" :size="650" append-to-body  :close-on-click-modal="false">
+		<el-drawer title="编辑任务" :visible.sync="editFormVisible" :with-header="false" :size="750" append-to-body  :close-on-click-modal="false">
 				<xm-task-edit :xm-project="currentProject" :xm-task="editForm" :project-phase="currentProjectPhase" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-task-edit>
 		</el-drawer>
 
 		<!-- 新增 XmTask xm_task界面-->
-		<el-drawer class="xm-task-add" title="新增任务" :visible.sync="addFormVisible" :with-header="false"  size="80%" append-to-body  :close-on-click-modal="false">
+		<el-drawer class="xm-task-add" title="新增任务" :visible.sync="addFormVisible" :with-header="false"  :size="750" append-to-body  :close-on-click-modal="false">
 			<xm-task-add :xm-project="currentProject" :project-phase="currentProjectPhase"   :xm-task="addForm" :parent-task="parentTask" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-task-add>
 		</el-drawer>
 

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

@@ -1,5 +1,5 @@
 <template>
-	<section class="page-container page-full-height padding border">
+	<section class="page-container padding border">
 		<el-row> 
 			<el-row    v-if="projectPhase">   
  					<el-button type="warning"   @click="saveBatchEdit" v-loading="load.edit" icon="el-icon-finished">保存</el-button>