diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 4661b2d4..84074578 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -1,18 +1,42 @@
 <template>
 	<section class="page-container page-height padding">
-		<el-row >
+		<el-row class="page-main page-main-height">
 			<!--新增界面 XmTask xm_task--> 
-			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
-				<el-form-item label="项目名称">
-					<span>{{editForm.projectName}}</span>
-				</el-form-item>
+			<el-form :model="editForm"  label-width="100px" :rules="editFormRules" ref="editForm"> 
 				<el-form-item v-if="editForm.parentTaskname!=null && editForm.parentTaskname!=''" label="父任务名称">
 					<span>{{editForm.parentTaskname}}</span>
 				</el-form-item>
 				<el-form-item label="任务名称" prop="name">
-					<el-input v-model="editForm.name" placeholder="任务名称" ></el-input>
+					<el-row>
+					<el-col :span="24" style="padding-left:10px;">
+						<el-input v-model="editForm.name" placeholder="任务名称" ></el-input>
+						<el-tooltip content="归属项目"><el-tag>{{editForm.projectName}}</el-tag></el-tooltip>
+						<el-divider direction="vertical"></el-divider>
+						<el-tooltip content="上级" ><el-tag>{{editForm.parentTaskname?editForm.parentTaskname:"无上级"}}</el-tag></el-tooltip>
+					</el-col>
+					</el-row>
 				</el-form-item>
 				
+				<el-form-item label="参与流程">
+					<el-steps :active="calcTaskStep" align-center>
+						<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-form-item> 
+				
+				<el-form-item label="任务状态" prop="taskState">
+					<el-steps :active="calcTaskStep" align-center>
+						<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-form-item> 
 				<el-form-item label="排序号" prop="sortLevel">
 					<el-input  v-model="editForm.sortLevel"    placeholder="如1.0或者1.2.3等" ></el-input>
 				</el-form-item>
@@ -121,20 +145,14 @@
 					<el-select v-model=" editForm.settleSchemel">
 						<el-option v-for="i in options.xmTaskSettleSchemel" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
 					</el-select>
-				</el-form-item>  
-				<!-- 
-				<el-form-item label="任务创建人">
-					<span>{{userInfo.username}}</span>
-				</el-form-item>
-				-->
-				<el-form-item>
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button>  
-					</el-col>
-				</el-form-item> 
+				</el-form-item>   
 			</el-form>
 		</el-row>
+		<el-row class="page-bottom">
+			<el-button @click.native="handleCancel">取消</el-button>  
+			<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button>  
+					
+		</el-row>
  
 
 		<!-- <el-dialog append-to-body :title="'技能要求'" :visible.sync="skillVisible"  width="80%"  append-to-body   :close-on-click-modal="false">
@@ -172,6 +190,21 @@
 			...mapGetters([
 				'userInfo','roles'
 			]),   
+			calcTaskStep(){
+				if(!this.editForm.executorUserid){
+					return 1
+				}else if(this.editForm.exeUsernames.indexOf('执行中')>=0){
+					return 2
+				}else if(this.editForm.exeUsernames.indexOf('已验收')>=0){
+					return 3
+				}else if(this.editForm.exeUsernames.indexOf('已验收')>=0){
+					return 3
+				}else if(this.editForm.exeUsernames.indexOf('已验收')>=0){
+					return 3
+				} if(this.editForm.exeUsernames.indexOf('已结算')>=0){
+					return 4
+				}
+			}
 		},
 		props:['xmTask','visible','xmProject','projectPhase',"parentTask"],
 		watch: {
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index a17f5151..dad1d496 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -40,7 +40,7 @@
 						<el-checkbox v-model="gstcVisible"  class="hidden-md-and-down" >甘特图</el-checkbox>
 						<el-popover
 							placement="top-start"
-							title="标题"
+							title="选择创建任务的方式"
 							width="200"
 							trigger="hover"> 
 							<el-row> 
@@ -159,19 +159,17 @@
 							>
 							<el-table-column sortable prop="name" label="任务名称(点击详情)"  min-width="240" show-overflow-tooltip>
 								<template slot-scope="scope">
-									<span>{{scope.row.sortLevel}}&nbsp;<el-link  type="primary"  @click.stop="showDrawer(scope.row)">{{scope.row.name}}</el-link></span>
-
-								</template>
-							</el-table-column>
-							<el-table-column v-if=" !selProject || !selProject.id" prop="projectName" label="项目"  min-width="120" show-overflow-tooltip>
-
-								<template slot="header">
-									项目<el-button @click="showProjectList"  icon="el-icon-search" circle size="mini"></el-button>
-								</template>
-								<template slot-scope="scope">
-									{{scope.row.projectName}}
+									<span>
+										{{scope.row.sortLevel}}&nbsp;
+										<el-tag v-if="scope.row.level<='2'" type="info">轻微</el-tag>
+										<el-tag v-else-if="scope.row.level=='3'" type="warning">一般</el-tag> 
+										<el-tag v-else-if="scope.row.level=='4'" type="danger">紧急</el-tag> 
+										<el-tag v-else type="danger">特急</el-tag>
+										<el-link  type="primary"  @click.stop="showDrawer(scope.row)">{{scope.row.name}}</el-link>
+									</span>
+									<span></span>
 								</template>
-							</el-table-column>
+							</el-table-column> 
 							<el-table-column  prop="menuId" label="故事"  min-width="120" show-overflow-tooltip>
 								<template slot="header">
 									故事<el-button @click="showMenuStory"  icon="el-icon-search" circle size="mini"></el-button>
@@ -208,7 +206,7 @@
 							<el-table-column sortable prop="rate" label="进度" width="100">
 								<template slot-scope="scope">
 									<div>
-									<el-tag style="border-radius:30px;"> {{ (scope.row.rate!=null?scope.row.rate:0)+'%'}} </el-tag>
+									<el-tag style="border-radius:30px;" :type="scope.row.rate>=100?'success':'warning'"> {{ (scope.row.rate!=null?scope.row.rate:0)+'%'}} </el-tag>
 									</div>
 								</template>
 							</el-table-column>
@@ -389,7 +387,7 @@
 			</div>
 		</el-dialog>
 		<!--编辑 XmTask xm_task界面-->
-		<el-drawer title="编辑任务" :visible.sync="editFormVisible"  width="80%" append-to-body  :close-on-click-modal="false">
+		<el-drawer title="编辑任务" :visible.sync="editFormVisible"  :size="650" 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>
 
@@ -1076,8 +1074,9 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
 			},
 
 			showDrawer: function(row){
+				this.editFormVisible =true;
 				this.editForm=row;
-				this.drawerVisible = !this.drawerVisible;
+				
 				// this.$emit('row-click',row,);//  @row-click="rowClick"
 			},