From 1489ffae62a9bf0d9051d06e04cfca8f17d18674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 2 Jul 2021 18:57:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mdp/workflow/ru/procinstNodeInfo.js   |   9 +-
 .../mdp/workflow/biz/bizModel/BizModelMng.vue |  75 +-
 src/views/mdp/workflow/de/model/ModelMng.vue  | 111 +--
 .../mdp/workflow/hi/comment/commentStep.vue   |  55 +-
 .../mdp/workflow/hi/procinst/ProcinstMng.vue  | 693 ++++++++----------
 .../workflow/re/deployment/DeploymentMng.vue  | 133 ++--
 .../re/procdef/ProcdefListForBizStart.vue     |  68 +-
 .../re/procdef/ProcdefListForParames.vue      | 337 ++++-----
 .../re/procdef/ProcdefListForSimpleStart.vue  | 112 +--
 .../re/procdef/ProcdefListForStart.vue        | 348 ++++-----
 .../mdp/workflow/re/procdef/ProcdefMng.vue    |  21 +-
 .../workflow/re/procdef/ProcdefSuspend.vue    | 312 ++++----
 .../re/procdefParames/ProcdefParamesSet.vue   |  20 +-
 .../ProcdefParamesTemplateMng.vue             |  21 +-
 .../workflow/ru/execution/ExecutionMng.vue    | 499 +++++--------
 .../ru/execution/ExecutionMngForFormData.vue  |   4 +-
 .../procinstParames/ProcinstNodeInfoSet.vue   |  60 +-
 .../ProcinstParamesExecutionSet.vue           | 325 ++++----
 .../ProcinstParamesExecutionSetRoute.vue      |  31 +-
 .../ProcinstParamesStartSet.vue               |  12 +-
 .../ProcinstParamesStartSetRoute.vue          |  13 +-
 src/views/mdp/workflow/ru/task/TaskMng.vue    | 341 +++------
 22 files changed, 1674 insertions(+), 1926 deletions(-)

diff --git a/src/api/mdp/workflow/ru/procinstNodeInfo.js b/src/api/mdp/workflow/ru/procinstNodeInfo.js
index 5806f921..4731e85b 100644
--- a/src/api/mdp/workflow/ru/procinstNodeInfo.js
+++ b/src/api/mdp/workflow/ru/procinstNodeInfo.js
@@ -13,6 +13,10 @@ let base = config.getWorkflowBasePath();
  
 //普通查询 条件之间and关系  
 export const listProcinstNodeInfo = params => { return axios.get(`${base}/mdp/workflow/ru/procinstNodeInfo/list`, { params: params }); };
+//普通查询 条件之间and关系  
+export const getNodeInfos = params => { return axios.get(`${base}/mdp/workflow/ru/procinstNodeInfo/getNodeInfos`, { params: params }); };
+//修改一条mdp_ru_procinst_node_info记录
+export const updateNodeInfos = params => { return axios.post(`${base}/mdp/workflow/ru/procinstNodeInfo/updateNodeInfos`, params); };
 
 //模糊查询mdp_ru_procinst_node_info 条件之间or关系  
 //export const listProcinstNodeInfoKey = params => { return axios.get(`${base}/mdp/workflow/ru/procinstNodeInfo/listKey`, { params: params }); };
@@ -27,7 +31,4 @@ export const batchDelProcinstNodeInfo = params => { return axios.post(`${base}/m
 export const editProcinstNodeInfo = params => { return axios.post(`${base}/mdp/workflow/ru/procinstNodeInfo/edit`, params); };
 
 //新增一条mdp_ru_procinst_node_info
-export const addProcinstNodeInfo = params => { return axios.post(`${base}/mdp/workflow/ru/procinstNodeInfo/add`, params); };
-
-
-export const getNodeInfos = params => { return axios.get(`${base}/mdp/workflow/ru/procinstNodeInfo/getNodeInfos`, { params: params }); };
\ No newline at end of file
+export const addProcinstNodeInfo = params => { return axios.post(`${base}/mdp/workflow/ru/procinstNodeInfo/add`, params); };
\ No newline at end of file
diff --git a/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue b/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue
index 86efde6c..2206e763 100644
--- a/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue
+++ b/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue
@@ -1,40 +1,43 @@
 <template>
 	<section>
-		<sticky :className="'sub-navbar draft'">
+		<el-row class="app-container">
 			<el-row>
-			<el-input v-model="filters.key" style="width:20%;" placeholder="模糊查询"></el-input> 
-			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchBizModels">查询</el-button>
-			<el-button type="primary" @click="showAdd">+业务模块</el-button>
-			<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
-			</el-row>
-		</sticky>
-		<el-row class="app-container"> 
-			<!--列表 BizModel mdp_biz_model-->
-			<el-table :data="bizModels"  highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
-				<el-table-column sortable type="selection" width="40"></el-table-column>
-				<el-table-column sortable type="index" width="40"></el-table-column>
-				<el-table-column sortable prop="bizName" label="业务名称" min-width="80" ></el-table-column>
-				<el-table-column sortable prop="bizKey" label="业务编码" min-width="80" ></el-table-column>
-				<el-table-column sortable prop="modelKey" label="模型编码" min-width="80" ></el-table-column>
-				<el-table-column sortable prop="modelName" label="模型名称" min-width="80" ></el-table-column> 
-				<el-table-column label="操作" width="160" fixed="right"  >
-					<template slot-scope="scope">
-						<el-button  @click="showEdit( scope.row,scope.$index)">改</el-button>
-						<el-button type="danger" @click="handleDel(scope.row,scope.$index)">删</el-button>
+				<el-input v-model="filters.key" style="width:30%;" placeholder="模糊查询">
+					<template slot="append"> 
+						<el-button type="primary"  v-loading="load.list" :disabled="load.list==true"  v-on:click="searchBizModels" icon="el-icon-search">查询</el-button> 
 					</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-input>  
+				<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>
+			<el-row style="padding-top:10px;"> 
+				<!--列表 BizModel mdp_biz_model-->
+				<el-table  ref="table" :max-height="tableHeight" :data="bizModels"  highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+					<el-table-column sortable type="selection" width="40"></el-table-column>
+					<el-table-column sortable type="index" width="40"></el-table-column>
+					<el-table-column sortable prop="bizName" label="业务名称" min-width="80" show-overflow-tooltip></el-table-column>
+					<el-table-column sortable prop="bizKey" label="业务编码" min-width="80"  show-overflow-tooltip></el-table-column>
+					<el-table-column sortable prop="modelKey" label="模型编码" min-width="80"  show-overflow-tooltip></el-table-column>
+					<el-table-column sortable prop="modelName" label="模型名称" min-width="80"  show-overflow-tooltip></el-table-column> 
+					<el-table-column label="操作" width="160" fixed="right"  >
+						<template slot-scope="scope">
+							<el-button  @click="showEdit( scope.row,scope.$index)" icon="el-icon-edit"></el-button>
+							<el-button type="danger" @click="handleDel(scope.row,scope.$index)" icon="el-icon-delete"></el-button>
+						</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> 
+			
+				<!--编辑 BizModel mdp_biz_model界面-->
+				<el-dialog title="修改业务模块" :visible.sync="editFormVisible"  width="50%"  :close-on-click-modal="false" append-to-body>
+					<biz-model-edit :disabled-select-model="!!modelKey" :biz-model="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></biz-model-edit>
+				</el-dialog>
 		
-			<!--编辑 BizModel mdp_biz_model界面-->
-			<el-dialog title="修改业务模块" :visible.sync="editFormVisible"  width="50%"  :close-on-click-modal="false" append-to-body>
-				  <biz-model-edit :disabled-select-model="!!modelKey" :biz-model="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></biz-model-edit>
-			</el-dialog>
-	
-			<!--新增 BizModel mdp_biz_model界面-->
-			<el-dialog title="新增业务模块" :visible.sync="addFormVisible"  width="50%"  :close-on-click-modal="false" append-to-body>
-				<biz-model-add :disabled-select-model="!!modelKey" :biz-model="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></biz-model-add>
-			</el-dialog> 
+				<!--新增 BizModel mdp_biz_model界面-->
+				<el-dialog title="新增业务模块" :visible.sync="addFormVisible"  width="50%"  :close-on-click-modal="false" append-to-body>
+					<biz-model-add :disabled-select-model="!!modelKey" :biz-model="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></biz-model-add>
+				</el-dialog> 
+			</el-row>
 		</el-row>
 	</section>
 </template>
@@ -94,7 +97,8 @@
 				//编辑bizModel界面初始化数据
 				editForm: {
 					bizName:'',bizKey:'',modelKey:'',modelName:'',id:'',branchId:''
-				}
+				},
+				tableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -243,7 +247,10 @@
 			this.addForm.modelName=this.modelName
 			this.editForm.modelKey=this.modelKey
 			this.editForm.modelName=this.modelName
-			this.$nextTick(() => {
+			this.$nextTick(() => { 
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=70/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;   
 				this.getBizModels();
         	}); 
 		}
diff --git a/src/views/mdp/workflow/de/model/ModelMng.vue b/src/views/mdp/workflow/de/model/ModelMng.vue
index fe0902c7..f0913949 100644
--- a/src/views/mdp/workflow/de/model/ModelMng.vue
+++ b/src/views/mdp/workflow/de/model/ModelMng.vue
@@ -1,58 +1,63 @@
 <template>
-	<section>
-		<sticky  :className="'sub-navbar draft'">
-			<el-input v-model="filters.key" style="width:20%;"  placeholder="模糊查询"></el-input> 
-			<el-button type="primary"   v-on:click="searchModels">查询</el-button> 
-			<el-button
-				type="primary"
-				@click="handleDownload"
-			>导出数据</el-button>
-	    </sticky>
-		<el-row class="app-container"> 
-			<!--列表 Model act_de_model-->
-			<el-table :data="models"    highlight-current-row v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
-				<el-table-column type="index" width="40"></el-table-column> 
-				<el-table-column sortable prop="name" label="流程(点击查已发布版本)" min-width="300" >
-					<template slot-scope="scope">  
-							<el-link type="primary" @click="showDeploymentList( scope.row,scope.$index)">{{scope.row.name}} </el-link>
-					</template>
-				</el-table-column> 
-				<el-table-column sortable prop="version" label="模型版本" min-width="80"  ></el-table-column> 
-				<el-table-column sortable prop="description" label="描述" width="120">
-					<template slot-scope="scope">
-						<el-popover
-						placement="top-start"
-						title="描述"
-						width="400"
-						trigger="click"
-						:content="scope.row.description">
-						<el-button slot="reference">详细描述</el-button>
-						</el-popover>
+	<section> 
+		<el-row  class="app-container">
+			<el-row>
+				<el-input v-model="filters.key" style="width:30%;"  placeholder="模糊查询">
+					<template slot="append"> 
+						<el-button type="primary"   v-on:click="searchModels" icon="el-icon-search">查询</el-button> 
 					</template>
+				</el-input> 
+				<el-button 
+					@click="handleDownload"
+					icon="el-icon-download"
+				>导出数据</el-button>
+			</el-row>
+			<el-row style="padding-top:10px;"> 
+				<!--列表 Model act_de_model-->
+				<el-table  ref="table" :max-height="tableHeight" :data="models"    highlight-current-row v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+					<el-table-column type="index" width="40"></el-table-column> 
+					<el-table-column  prop="name" label="流程(点击查已发布版本)" min-width="300" show-overflow-tooltip>
+						<template slot-scope="scope">  
+								<el-link type="primary" @click="showDeploymentList( scope.row,scope.$index)">{{scope.row.name}} </el-link>
+						</template>
+					</el-table-column> 
+					<el-table-column sortable prop="version" label="模型版本" min-width="80"   show-overflow-tooltip></el-table-column> 
+					<el-table-column  prop="description" label="描述" width="120" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<el-popover
+							placement="top-start"
+							title="描述"
+							width="400"
+							trigger="click"
+							:content="scope.row.description">
+							<el-button slot="reference">详细描述</el-button>
+							</el-popover>
+						</template>
 
-				</el-table-column>
-				<el-table-column sortable prop="modelComment" label="备注" min-width="80"  ></el-table-column>
-				<el-table-column sortable prop="created" label="创建时间" min-width="120"  ></el-table-column>
-				<el-table-column sortable prop="lastUpdated" label="更新时间" min-width="120"  ></el-table-column>
-				<el-table-column sortable prop="lastUpdatedBy" label="更新人" min-width="120"  ></el-table-column>
-				<el-table-column label="操作" width="300"  fixed="right">
-					<template slot-scope="scope">
-						<el-button   @click="showDiagram( scope.row,scope.$index)">流程图</el-button>
-						<el-button   @click="deploy( scope.row,scope.$index)">发布新版</el-button> 
-						<el-button type="danger"  @click="handleDel(scope.row,scope.$index)">删</el-button>
-					</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-table-column>
+					<el-table-column  prop="modelComment" label="备注" min-width="80"   show-overflow-tooltip></el-table-column>
+					<el-table-column sortable prop="created" label="创建时间" min-width="120"   show-overflow-tooltip></el-table-column>
+					<el-table-column sortable prop="lastUpdated" label="更新时间" min-width="120"   show-overflow-tooltip></el-table-column>
+					<el-table-column  prop="lastUpdatedBy" label="更新人" min-width="120"   show-overflow-tooltip></el-table-column>
+					<el-table-column label="操作" width="300"  fixed="right">
+						<template slot-scope="scope">
+							<el-button   @click="showDiagram( scope.row,scope.$index)">流程图</el-button>
+							<el-button   @click="deploy( scope.row,scope.$index)">发布新版</el-button> 
+							<el-button type="danger"  @click="handleDel(scope.row,scope.$index)">删</el-button>
+						</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-dialog title="流程图" :visible.sync="diagramVisible"  width="80%"  :close-on-click-modal="false">
-				  <img :src="diagramUrl"></img>
-			</el-dialog>
+					<!--流程图界面-->
+				<el-dialog title="流程图" :visible.sync="diagramVisible"  width="80%"  :close-on-click-modal="false">
+					<img :src="diagramUrl"></img>
+				</el-dialog>
 
-			<el-dialog title="已发布的流程" :visible.sync="deploymentVisible"  width="80%"  :close-on-click-modal="false"> 
-				<deployment-mng :modelKey="editForm.modelKey"></deployment-mng>
-			</el-dialog>
+				<el-dialog title="已发布的流程" :visible.sync="deploymentVisible"  width="80%"  :close-on-click-modal="false"> 
+					<deployment-mng :modelKey="editForm.modelKey"></deployment-mng>
+				</el-dialog>
+			</el-row>
 		</el-row>
 	</section>
 </template>
@@ -110,6 +115,7 @@
 				companyDepts:[],	
 				deploymentVisible:false,
 				categorys:[],
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -377,7 +383,10 @@
 		},
 		mounted() { 
 			 
-			this.$nextTick(() => {
+			this.$nextTick(() => { 
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=70/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;   
 				this.getModels();
         	});
 
diff --git a/src/views/mdp/workflow/hi/comment/commentStep.vue b/src/views/mdp/workflow/hi/comment/commentStep.vue
index ec6b921d..43d4b014 100644
--- a/src/views/mdp/workflow/hi/comment/commentStep.vue
+++ b/src/views/mdp/workflow/hi/comment/commentStep.vue
@@ -1,26 +1,41 @@
 <template>
-	<section>
-		<el-row style="max-height:400px;overflow-y:scroll;overflow-x:hidden;">
-			<!--工具条1-->  
-			<!--如果有更多工具条,放开此注释
-			<el-col :span="24" class="toolbar"  style="padding-bottom: 0px;">
-				<el-col :span="4">
-				</el-col>
-			</el-col>
-			-->
-			 
-			 
-			<div  style="border:1px dashed #000"> 	
+	<section> 
+		<el-row style="max-height:400px;overflow-y:scroll;overflow-x:hidden;">  
+			<div  style="border:1px dashed #000;padding:10px;"> 	
 				  <div v-if="!comments || comments.length<=0" style="padding-left: 10px;">暂无信息</div>
-				  <el-steps :space="60"  direction="vertical">
-				    <el-step v-for="item in comments " :title="item.name"  >
-				    	<div slot="title"><el-col :span="24"> ><font v-if="screenWidth>500">任务:</font>{{item.name==''||item.name==null?'未知的节点名字':item.name}}  <font v-if="screenWidth>500">办理时间 :{{item.time}}</font><font v-if="screenWidth<500">{{formatTaskTime(item.time)}}</font></el-col> </div>
-				    	<div slot="description" style="color: #303133;"> 
-				    		<el-col :xs="8" :sm="6" :md="4" :lg="3" :xl="1"><div>{{item.username?item.username:item.userid}}></div></el-col><el-col :xs="16" :sm="18" :md="20" :lg="21" :xl="23"><div>{{item.message}}</div></el-col>
+				  <el-steps :space="60"  direction="vertical" process-status="process" finish-status="success">
+				    <el-step v-for="(item,index) in comments " :key="index" status="success">
+				    	<div slot="title">
+							<el-col :span="24"> 
+								{{item.name==''||item.name==null?item.message:item.name}}  
+								<font v-if="screenWidth>500"> &nbsp;&nbsp;{{item.time}}
+								</font>
+								<font v-if="screenWidth<500">{{formatTaskTime(item.time)}}</font>
+							</el-col> 
+						</div>
+				    	<div slot="description" style="color: #303133;">  
+								<div style="display: inline-block;">{{item.username?item.username:item.userid}}</div> 
+								 <el-divider style="display: inline-block;" direction="vertical"></el-divider>
+								<div style="display: inline-block;">{{item.message}}</div> 
+				    	</div>
+				    </el-step>
+					<el-step v-if="task && task.taskId"  status="process" icon="el-icon-edit">
+				    	<div slot="title">
+							<el-col :span="24"> 
+								{{task.taskName}}  <el-tag type="warning">当前节点</el-tag>
+								<font v-if="screenWidth>500"> &nbsp;&nbsp;{{task.startTime}}
+								</font>
+								<font v-if="screenWidth<500">{{formatTaskTime(task.startTime)}}</font>
+							</el-col> 
+						</div>
+				    	<div slot="description" style="color: #303133;">  
+								<div style="display: inline-block;">{{task.assigneeName?task.assigneeName:task.assignee}}</div> 
+								 <el-divider style="display: inline-block;" direction="vertical"></el-divider>
+								<div style="display: inline-block;">请尽快处理</div> 
 				    	</div>
 				    </el-step>
 				  </el-steps>
-				  </div> 
+			</div> 
 		</el-row>
 	</section>
 </template>
@@ -33,7 +48,7 @@
 	import { listDept } from '@/api/mdp/sys/dept';//下拉框数据查询
 	import moment from "moment";
 	export default {
-		props:['refresh','procInstId'],
+		props:['refresh','procInstId','task'],
 		watch: {
 	      'refresh':function(refresh) {  
 	    	  if(refresh==true){
@@ -47,7 +62,7 @@
 		computed:{
 			screenWidth:function(){
 				return screen.width;
-			}
+			}, 
 		},
 		data() {
 			return {
diff --git a/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue b/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
index ae17ca7b..527125f6 100644
--- a/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
+++ b/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
@@ -1,255 +1,5 @@
 <template>
-  <section>
-    <sticky :className="'sub-navbar draft'">
-      <el-row>
-        <el-col :xs="22" :sm="22" :md="23" :lg="23" :xl="23">
-          <el-col :xs="8" :sm="8" :md="5" :lg="4" :xl="4">
-            <el-input v-model="filters.key" style="width:100%;" placeholder="模糊查询"></el-input>
-          </el-col>
-          <el-col :xs="8" :sm="8" :md="5" :lg="4" :xl="4">
-            <el-select
-              v-model="filters.procCategory"
-              style="width:99%;"
-              clearable
-              filterable
-              placeholder="请选择分类"
-            >
-              <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
-            </el-select>
-          </el-col>
-          <el-col :xs="8" :sm="8" :md="14" :lg="16" :xl="16">
-            <el-button type="primary" v-on:click="searchProcinsts">查询</el-button>
-            <el-button @click.native="showTagSelect(false)">标签查找</el-button>
-            <el-button @click.native="showTagSelect(true)">打标签</el-button>
-            <el-button type="primary" @click="handleDownload">导出数据</el-button>
-            <el-button v-if="isAll" :type="filters.allBtn?'success':''" v-on:click="searchAll">全部</el-button>
-            <el-button
-              :type="filters.otherParames.startUserId?'success':''"
-              v-on:click="searchMyStart"
-            >我发起</el-button>
-            <el-button
-              :type="filters.otherParames.partake?'success':''"
-              v-on:click="searchMyPartake"
-            >我参与</el-button>
-            <el-button
-              :type="filters.otherParames.sponsors?'success':''"
-              v-on:click="searchMySponsors"
-            >我主办</el-button>
-            <el-button
-              :type="filters.otherParames.monitors?'success':''"
-              v-on:click="searchMyMonitors"
-            >我监控</el-button>
-            <el-button
-              :type="filters.otherParames.isEnd==0?'success':''"
-              v-on:click="searchNotEnd"
-            >未结束</el-button>
-            <el-button :type="filters.otherParames.isEnd==1?'success':''" v-on:click="searchEnd">已结束</el-button>
-          </el-col>
-        </el-col>
-        <el-col :xs="2" :sm="2" :md="1" :lg="1" :xl="1">
-          <el-button @click="drawer = true" type="text">更多</el-button>
-
-          <el-drawer title="更多查询条件" :visible.sync="drawer" :with-header="false" append-to-body>
-            <el-row class="more-filter-item">
-              <el-button v-if="isAll" :type="filters.allBtn?'success':''" v-on:click="searchAll">全部</el-button>
-              <el-button
-                :type="filters.otherParames.startUserId?'success':''"
-                v-on:click="searchMyStart"
-              >我发起</el-button>
-              <el-button
-                :type="filters.otherParames.partake?'success':''"
-                v-on:click="searchMyPartake"
-              >我参与</el-button>
-              <el-button
-                :type="filters.otherParames.sponsors?'success':''"
-                v-on:click="searchMySponsors"
-              >我主办</el-button>
-              <el-button
-                :type="filters.otherParames.monitors?'success':''"
-                v-on:click="searchMyMonitors"
-              >我监控</el-button>
-              <el-button
-                :type="filters.otherParames.isEnd==0?'success':''"
-                v-on:click="searchNotEnd"
-              >未结束</el-button>
-              <el-button
-                :type="filters.otherParames.isEnd==1?'success':''"
-                v-on:click="searchEnd"
-              >已结束</el-button>
-              <el-button @click.native="showTagSelect(false)">标签查找</el-button>
-              <el-button @click.native="showTagSelect(true)">打标签</el-button>
-              <el-button @click.native="userSelectVisible=true">任务执行人</el-button>
-			  <el-button type="primary" @click="handleDownload">导出数据</el-button>
-              <el-col :span="24">
-                开始日期：
-                <el-date-picker
-                  v-model="filters.startTimeRanger"
-                  type="daterange"
-                  align="right"
-                  unlink-panels
-                  range-separator="至"
-                  start-placeholder="创建日期"
-                  end-placeholder="创建日期"
-                  value-format="yyyy-MM-dd"
-                  :default-time="['00:00:00','23:59:59']"
-                  :picker-options="pickerOptions"
-                ></el-date-picker>
-              </el-col>
-              <el-col :span="24">
-                计划完成：
-                <el-date-picker
-                  v-model="filters.planFinishTimeRanger"
-                  type="daterange"
-                  align="right"
-                  unlink-panels
-                  range-separator="至"
-                  start-placeholder="计划完成日期"
-                  end-placeholder="计划完成日期"
-                  value-format="yyyy-MM-dd"
-                  :default-time="['00:00:00','23:59:59']"
-                  :picker-options="pickerOptions"
-                ></el-date-picker>
-              </el-col>
-              <el-col :span="24">
-                实际完成：
-                <el-date-picker
-                  v-model="filters.endTimeRanger"
-                  type="daterange"
-                  align="right"
-                  unlink-panels
-                  range-separator="至"
-                  start-placeholder="实际完成日期"
-                  end-placeholder="实际完成日期"
-                  value-format="yyyy-MM-dd"
-                  :default-time="['00:00:00','23:59:59']"
-                  :picker-options="pickerOptions"
-                ></el-date-picker>
-              </el-col>
-            </el-row>
-            <category-tree
-              class="hidden-md-and-up"
-              ref="categoryTree"
-              multiple
-              :expandOnClickNode="false"
-              :defaultExpandAll="true"
-              show-checkbox
-              :current-key="addForm.categoryId"
-              v-on:check-change="handleCategoryCheckChange"
-            ></category-tree>
-          </el-drawer>
-        </el-col>
-      </el-row>
-    </sticky>
-    <el-row class="filters-show">
-      <font class="filters-label">已选条件:</font>
-      <el-date-picker
-        v-model="filters.startTimeRanger"
-        class="hidden-sm-and-down"
-        type="daterange"
-        align="right"
-        unlink-panels
-        range-separator="至"
-        start-placeholder="创建日期"
-        end-placeholder="创建日期"
-        value-format="yyyy-MM-dd"
-        :default-time="['00:00:00','23:59:59']"
-        :picker-options="pickerOptions"
-      ></el-date-picker>
-      <el-date-picker
-        v-model="filters.endTimeRanger"
-        class="hidden-sm-and-down"
-        type="daterange"
-        align="right"
-        unlink-panels
-        range-separator="至"
-        start-placeholder="实际完成日期"
-        end-placeholder="实际完成日期"
-        value-format="yyyy-MM-dd"
-        :default-time="['00:00:00','23:59:59']"
-        :picker-options="pickerOptions"
-      ></el-date-picker>
-      <el-tag
-        v-if="filters.tags"
-        :key="tag.tagId"
-        v-for="tag in filters.tags"
-        :type="''"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose(tag,'tags')"
-      >{{tag.tagName}}</el-tag>
-      <el-tag
-        v-if="filters.categoryTreeNodes"
-        :key="tag.id"
-        v-for="tag in filters.categoryTreeNodes"
-        :type="'info'"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose(tag,'categoryTreeNodes')"
-      >{{tag.name}}</el-tag>
-      <el-tag
-        v-if="filters.taskType=='0'"
-        :type="'warning'"
-        :disable-transitions="false"
-      >{{filters.taskType=='0'?'已领取':''}}</el-tag>
-      <el-tag
-        v-if="filters.taskType=='1'"
-        :type="'warning'"
-        :disable-transitions="false"
-      >{{filters.taskType=='1'?'待领取':''}}</el-tag>
-      <el-tag
-        v-if="filters.otherParames.partake"
-        :type="'warning'"
-        :disable-transitions="false"
-      >{{'我参与'}}</el-tag>
-      <el-tag
-        v-if="filters.otherParames.sponsors"
-        :type="'warning'"
-        :disable-transitions="false"
-      >{{'我主办'}}</el-tag>
-      <el-tag
-        v-if="filters.otherParames.monitors"
-        :type="'warning'"
-        :disable-transitions="false"
-      >{{'我监控'}}</el-tag>
-      <el-tag
-        v-if="filters.otherParames.isEnd=='1'"
-        :type="'warning'"
-        :disable-transitions="false"
-      >{{'已结束'}}</el-tag>
-      <el-tag
-        v-if="filters.otherParames.isEnd=='0'"
-        :type="'warning'"
-        :disable-transitions="false"
-      >{{'未结束'}}</el-tag>
-      <el-tag
-        v-if="filters.otherParames.startUserId"
-        :type="'warning'"
-        :disable-transitions="false"
-      >{{'我发起'}}</el-tag>
-
-      <el-tag
-        v-if="filters.procCategory"
-        :type="'dangger'"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose('','procCategory')"
-      >{{filters.procCategory}}</el-tag>
-      <el-tag
-        v-if="filters.key"
-        :type="'success'"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose('','key')"
-      >{{filters.key}}</el-tag>
-
-      <el-tag
-        v-if="filters.assignee"
-        :type="'success'"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose('','assignee')"
-      >{{filters.assignee.username}}</el-tag>
-    </el-row>
+  <section> 
     <el-row class="app-container">
       <el-col :xs="4" :sm="4" :md="3" :lg="3" :xl="3" class="hidden-sm-and-down">
         <category-tree
@@ -264,123 +14,280 @@
       </el-col>
       <el-col :xs="24" :sm="24" :md="21" :lg="21" :xl="21">
         <!--列表 Procinst act_hi_procinst-->
-        <el-table
-          :data="procinsts"
-          highlight-current-row
-          v-loading="listLoading"
-          border
-          @selection-change="selsChange"
-          @row-click="rowClick"
-          style="width: 100%;"
-        >
-          <el-table-column type="selection" width="40"></el-table-column>
-          <el-table-column type="index" width="40"></el-table-column>
-					<el-table-column sortable prop="mainTitle" label="流程(点击详情)" min-width="300" >
-						<template slot-scope="scope">  
-							 <el-link type="primary" @click="showEdit( scope.row,scope.$index)">{{scope.row.mainTitle}}</el-link>
+        <el-row> 
+					<el-select v-model="filters.filterType" clearable placeholder="查询范围" class="hidden-md-and-down">
+						<el-option value="" label="全部"> </el-option>
+						<el-option value="startUserId" label="我发起"> </el-option>
+						<el-option value="partake" label="我参与"> </el-option>
+						<el-option value="sponsors" label="我主办"> </el-option>
+						<el-option value="monitors" label="我监控"> </el-option>
+					</el-select>
+					
+					<el-date-picker
+						v-model="filters.startTimeRanger" class="hidden-sm-and-down"
+						type="daterange"
+						align="right"
+						unlink-panels
+						range-separator="至"
+						start-placeholder="创建日期"
+						end-placeholder="创建日期"
+						value-format="yyyy-MM-dd"
+						:default-time="['00:00:00','23:59:59']"
+						:picker-options="pickerOptions">
+					</el-date-picker>  
+					<el-input v-model="filters.key" style="width:20%;"     placeholder="模糊查询">
+						<template slot="append">
+							<el-button      v-on:click="searchProcinsts" icon="el-icon-search">查询</el-button>  
 						</template>
-					</el-table-column>
-          <el-table-column
-            sortable
-            prop="startDeptName"
-            label="发起部门"
-            min-width="180"
-            
-          ></el-table-column>
-          <el-table-column
-            sortable
-            prop="startUsername"
-            label="发起人"
-            min-width="120" 
-          ></el-table-column>
-          <el-table-column sortable prop="tagNames" label="标签" min-width="150">
-            <template slot-scope="scope">
-              <el-tag
-                v-for="tagName in (scope.row.tagNames?scope.row.tagNames.split(','):[])"
-                :key="tagName"
-              >{{tagName}}</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column
-            sortable
-            prop="startTime"
-            label="发起时间"
-            min-width="120"
-            
-          ></el-table-column>
-          <el-table-column
-            sortable
-            prop="planFinishTime"
-            label="到期时间"
-            min-width="120"
-            
-          ></el-table-column>
-          <el-table-column
-            sortable
-            prop="endTime"
-            label="结束时间"
-            min-width="120"
-            
-          ></el-table-column>
-          <el-table-column
-            sortable
-            prop="duration"
-            label="执行时长"
-            min-width="120"
-            
-            :formatter="formatterDuration"
-          ></el-table-column>
+					</el-input>  
+					<el-popover 
+						placement="top"
+						width="375"
+						trigger="manual"
+						v-model="weixinContentVisible">
+						<p>{{weixinContent}}</p>
+						<div style="text-align: right; margin: 0"> 
+							<el-button size="mini" type="text" @click="doCopyWeixinUrl">拷贝链接</el-button>
+							<el-button type="primary" size="mini" @click="doCopyWeixinContent">拷贝内容</el-button>
+						</div> 
+						<el-button slot="reference"     class="hidden-sm-and-down"  v-on:click="showWeixin">微信催办</el-button>
+					</el-popover> 
+
+					<el-popover
+					title="更多查询条件"
+					placement="top-start" 
+					width="400"
+					trigger="click"> 
+						<el-row class="more-filter-item">
+							<el-col :span="24">
+								<font class="more-label-font">
+									查询范围：
+								</font>
+								<el-select size="mini" v-model="filters.filterType"  placeholder="查询范围">
+									<el-option value="" label="全部"> </el-option>
+									<el-option value="startUserId" label="我发起"> </el-option>
+									<el-option value="partake" label="我参与"> </el-option>
+									<el-option value="sponsors" label="我主办"> </el-option>
+									<el-option value="monitors" label="我监控"> </el-option>
+								</el-select> 
+							</el-col>
+							<el-col :span="24">
+								<font class="more-label-font">
+									标签查找：
+								</font> 
+								<el-row v-show="filters.tags && filters.tags.length>0">
+									<el-tag  
+										:key="tag.tagId"
+										v-for="tag in filters.tags"
+										:type="''"
+										closable
+										:disable-transitions="false"
+										@click="showTagSelect(false)"
+										@close="handleFiltersTagClose(tag,'tags')">
+										{{tag.tagName}}
+									</el-tag>
+								</el-row>
+								<el-button v-if="filters.tags==null || filters.tags.length==0"  size="mini"   @click.native="showTagSelect(false)">选择标签</el-button>
+							</el-col>
+							<el-col :span="24"  >
+								<font class="more-label-font">
+									任务执行人：
+								</font>  
+								<el-tag v-if="filters.assignee"
+									:type="'success'"
+									closable
+									:disable-transitions="false" 
+									@click="userSelectVisible=true"
+									@close="handleFiltersTagClose('','assignee')">
+									{{filters.assignee.username}}
+								</el-tag>  
+								<el-button v-else size="mini"   @click.native="userSelectVisible=true" >选择执行人</el-button>   
+							</el-col>
+							<el-col :span="24"  > 
+								<el-button size="mini"  :type="filters.suspensionState=='2'?'success':''"   v-on:click="filters.suspensionState='2'">挂起的</el-button>
+								<el-button size="mini"  :type="filters.suspensionState=='1'?'success':''"   v-on:click="filters.suspensionState='1'">活动的</el-button>  
+	
+								
+							</el-col>
+							<el-col :span="24">
+								<font class="more-label-font">
+									开始日期：
+								</font>
+								<el-date-picker 
+									v-model="filters.startTimeRanger"  
+									type="daterange"
+									align="right"
+									unlink-panels
+									range-separator="至"
+									start-placeholder="创建日期"
+									end-placeholder="创建日期"
+									value-format="yyyy-MM-dd"
+									:default-time="['00:00:00','23:59:59']"
+									:picker-options="pickerOptions">
+								</el-date-picker> 
+							</el-col>
+							<el-col :span="24">
+								
+								<font class="more-label-font">
+									计划完成日期：
+								</font>
+								<el-date-picker 
+									v-model="filters.planFinishTimeRanger"  
+									type="daterange"
+									align="right"
+									unlink-panels
+									range-separator="至"
+									start-placeholder="计划完成日期"
+									end-placeholder="计划完成日期"
+									value-format="yyyy-MM-dd"
+									:default-time="['00:00:00','23:59:59']"
+									:picker-options="pickerOptions">
+								</el-date-picker> 
+							</el-col> 
+							<el-col :span="24">
+								<category-tree class="hidden-md-and-up"   ref="categoryTree" multiple :expandOnClickNode="false" :defaultExpandAll="true" show-checkbox  :current-key="addForm.categoryId"  v-on:check-change="handleCategoryCheckChange" ></category-tree>
+							</el-col> 
+							<el-col :span="24">
+								<el-checkbox size="mini"  v-model="showCalendar">按日历风格显示</el-checkbox>
+								<el-button size="mini"   type="primary"    v-on:click="searchExecutions" icon="el-icon-search">查询</el-button>   
+							</el-col>
+										
+							<el-col :span="24">   
+								<el-divider content-position="left">其它操作</el-divider>	
+								<el-button size="mini"     @click.native="showTagSelect(true)"  >给任务打标签</el-button> 
+								<el-button size="mini"  @click="handleDownload">导出数据</el-button>
+								<el-button size="mini"       v-on:click="showWeixinTask">微信催办</el-button> 
+								<el-button size="mini"      v-on:click="showSendSms">短信催办</el-button> 
+								<el-button size="mini"       v-on:click="showOaMsg">OAMSG催办</el-button>	
+							</el-col>
+						</el-row>
+						<el-button  slot="reference" icon="el-icon-more" circle></el-button>
+					</el-popover>   
+        </el-row>
+        <el-row style="padding-top:10px;">
+          <el-table
+            ref="table"
+            :max-height="tableHeight"
+            :data="procinsts"
+            highlight-current-row
+            v-loading="listLoading"
+            border
+            @selection-change="selsChange"
+            @row-click="rowClick"
+            style="width: 100%;"
+          >
+            <el-table-column type="selection" width="40"></el-table-column>
+            <el-table-column type="index" width="40"></el-table-column>
+            <el-table-column sortable prop="mainTitle" label="流程(点击详情)" min-width="300" show-overflow-tooltip>
+              <template slot-scope="scope">  
+                <el-link type="primary" @click="showEdit( scope.row,scope.$index)">{{scope.row.mainTitle}}</el-link>
+              </template>
+            </el-table-column>
+            <el-table-column
+              sortable
+              prop="startDeptName"
+              label="发起部门"
+              min-width="180"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              sortable
+              prop="startUsername"
+              label="发起人"
+              min-width="120" 
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column sortable prop="tagNames" label="标签" min-width="150"
+              show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-tag
+                  v-for="tagName in (scope.row.tagNames?scope.row.tagNames.split(','):[])"
+                  :key="tagName"
+                >{{tagName}}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column
+              sortable
+              prop="startTime"
+              label="发起时间"
+              min-width="120"
+              show-overflow-tooltip 
+            ></el-table-column>
+            <el-table-column
+              sortable
+              prop="planFinishTime"
+              label="到期时间"
+              min-width="120"
+              show-overflow-tooltip 
+            ></el-table-column>
+            <el-table-column
+              sortable
+              prop="endTime"
+              label="结束时间"
+              min-width="120"
+              show-overflow-tooltip 
+            ></el-table-column>
+            <el-table-column
+              sortable
+              prop="duration"
+              label="执行时长"
+              min-width="120"
+              show-overflow-tooltip 
+              :formatter="formatterDuration"
+            ></el-table-column>
 
-          <el-table-column
-            sortable
-            prop="sponsors"
-            label="主办"
-            min-width="80"
-            
-          ></el-table-column>
-          <el-table-column
-            sortable
-            prop="monitors"
-            label="监控"
-            min-width="80"
-            
-          ></el-table-column>
-          <el-table-column
-            sortable
-            prop="deleteReason"
-            label="删除原因"
-            min-width="120" 
-          ></el-table-column> 
-        </el-table>
-        <el-pagination
-          layout="total, prev, 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>
-        <!--编辑 Execution act_ru_execution界面-->
-        <el-dialog
-          title="任务详情"
-          fullscreen
-          :visible.sync="editFormVisible"
-          :width="dialogWidth()"
-          :close-on-click-modal="false"
-        >
-          <procinst-parames-execution-set
-            :companyEmployees="companyEmployees"
-            :companyDepts="companyDepts"
-            :taskInfo="editForm"
-            :procDefId="editForm.procDefId"
-            :procInstId="editForm.procInstId"
-            :visible="editFormVisible"
-            @cancel="editFormVisible=false"
-            @submit="afterEditSubmit"
-          ></procinst-parames-execution-set>
-        </el-dialog>
+            <el-table-column
+              sortable
+              prop="sponsors"
+              label="主办"
+              min-width="80"
+              show-overflow-tooltip 
+            ></el-table-column>
+            <el-table-column
+              sortable
+              prop="monitors"
+              label="监控"
+              min-width="80"
+              show-overflow-tooltip 
+            ></el-table-column>
+            <el-table-column
+              sortable
+              prop="deleteReason"
+              label="删除原因"
+              min-width="120" 
+              show-overflow-tooltip 
+            ></el-table-column> 
+          </el-table>
+          <el-pagination
+            layout="total, prev, 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>
+          <!--编辑 Execution act_ru_execution界面-->
+          <el-dialog
+            title="任务详情"
+            fullscreen
+            :visible.sync="editFormVisible"
+            :width="dialogWidth()"
+            :close-on-click-modal="false"
+          >
+            <procinst-parames-execution-set
+              :companyEmployees="companyEmployees"
+              :companyDepts="companyDepts"
+              :taskInfo="editForm"
+              :procDefId="editForm.procDefId"
+              :procInstId="editForm.procInstId"
+              :visible="editFormVisible"
+              @cancel="editFormVisible=false"
+              @submit="afterEditSubmit"
+            ></procinst-parames-execution-set>
+          </el-dialog>
+        </el-row>
       </el-col>
 
       <el-dialog append-to-body title="选择员工" :visible.sync="userSelectVisible" width="60%">
@@ -449,7 +356,8 @@ export default {
         ],
         planFinishTimeRanger: [],
         endTimeRanger: [],
-        assignee: null
+        assignee: null, 
+				filterType:'',
       },
       pickerOptions: {
         shortcuts: [
@@ -566,7 +474,8 @@ export default {
       categorys: [],
       tagSelectVisible: false,
       isBatchSetProcTags: false,
-      userSelectVisible: false
+      userSelectVisible: false,
+      tableHeight:300,
       /**end 自定义属性请在上面加 请加备注**/
     };
   }, //end data
@@ -686,8 +595,18 @@ export default {
       if (this.filters.assignee != null) {
         params.assignee = this.filters.assignee.userid;
       }
-      if (this.filters.otherParames) {
-        params = Object.assign(params, this.filters.otherParames);
+      
+      if(this.filters.filterType=='startUserId'){
+        params.startUserId=this.userInfo.userid
+      }
+      if(this.filters.filterType=='partake'){
+        params.partake=this.userInfo.userid
+      }
+      if(this.filters.filterType=='sponsors'){
+        params.sponsors='%'+this.userInfo.userid+'%'
+      }
+      if(this.filters.filterType=='monitors'){
+        params.monitors='%'+this.userInfo.userid+'%'
       }
       if (this.filters.proccategory != "") {
         params.category = this.filters.proccategory;
@@ -1110,19 +1029,21 @@ export default {
       this.categorys = res.data.data;
     });
     this.$nextTick(() => {
-      if (this.isMyStart) {
-        this.searchMyStart();
-      } else if (this.isMyMonitors) {
-        this.searchMyMonitors();
-      } else if (this.isMySponsors) {
-        this.searchMySponsors();
-      } else if (this.isMyPartake) {
-        this.searchMyPartake();
-      } else if (this.isAll) {
-        this.searchAll();
-      } else {
-        this.getProcinsts();
-      }
+        var clientRect=this.$refs.table.$el.getBoundingClientRect();
+        var subHeight=70/1000 * window.innerHeight; 
+        this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;   
+				if(this.isMyStart){
+					this.filters.filterType="startUserId"
+				}else if(this.isMyMonitors){
+					this.filters.filterType="monitors"
+				}else if(this.isMySponsors){
+					this.filters.filterType="sponsors"
+				}else if(this.isMyPartake){
+					this.filters.filterType="partake"
+				}else if(this.isAll){
+					
+				}  
+				this.getProcinsts();
     });
   }
 };
@@ -1150,4 +1071,10 @@ export default {
 .more-filter-item button {
   margin: 2px 2px;
 }
+
+  .more-label-font{
+  	text-align:center;
+  	float:left;
+  	padding-top:5px;
+  }
 </style>
\ No newline at end of file
diff --git a/src/views/mdp/workflow/re/deployment/DeploymentMng.vue b/src/views/mdp/workflow/re/deployment/DeploymentMng.vue
index a2e3d660..934d9413 100644
--- a/src/views/mdp/workflow/re/deployment/DeploymentMng.vue
+++ b/src/views/mdp/workflow/re/deployment/DeploymentMng.vue
@@ -1,68 +1,74 @@
 <template>
   <section>
-    <sticky :className="'sub-navbar draft'">
-      <el-input v-model="filters.key" style="width:20%;" placeholder="模糊查询"></el-input>
-      <el-select v-model="filters.category" clearable filterable placeholder="请选择分类">
-        <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
-      </el-select>
-      <el-button type="primary" v-on:click="searchDeployments">查询</el-button>
-      <el-button type="primary" @click="handleDownload">导出数据</el-button>
-    </sticky>
     <el-row class="app-container">
-      <!--列表 Deployment act_re_deployment-->
-      <el-table
-        :data="deployments"
-        highlight-current-row
-        v-loading="listLoading"
-        border
-        @selection-change="selsChange"
-        @row-click="rowClick"
-        style="width: 100%;"
-      >
-        <el-table-column type="selection" width="40"></el-table-column>
-        <el-table-column type="index" width="40"></el-table-column>
-        
-        <el-table-column sortable prop="category" label="分类" min-width="80" ></el-table-column>
-        <el-table-column sortable prop="key" label="业务编码" min-width="150"></el-table-column>
-        <el-table-column sortable prop="name" label="发布包名" min-width="300"></el-table-column>
-        <el-table-column
-          sortable
-          prop="deployTime"
-          label="发布时间"
-          min-width="80"
-          
-        ></el-table-column>
-        <el-table-column label="操作" width="150" fixed="right">
-          <template slot-scope="scope">
-            <el-button type="danger" @click="handleDel(scope.row,scope.$index)">取消发布</el-button>
+      <el-row>
+        <el-select v-model="filters.category" clearable filterable placeholder="请选择分类">
+          <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
+        </el-select> 
+        <el-input v-model="filters.key" style="width:30%;" placeholder="模糊查询">
+          <template slot="append"> 
+            <el-button type="primary"   v-on:click="searchDeployments" icon="el-icon-search">查询</el-button> 
           </template>
-        </el-table-column>
-      </el-table>
+        </el-input>
+        <el-button @click="handleDownload" icon="el-icon-download">导出数据</el-button>
+      </el-row>
+      <el-row style="padding-top:10px;">
+        <!--列表 Deployment act_re_deployment-->
+        <el-table
+          ref="table" :max-height="tableHeight" 
+          :data="deployments"
+          highlight-current-row
+          v-loading="listLoading"
+          border
+          @selection-change="selsChange"
+          @row-click="rowClick"
+          style="width: 100%;"
+        >
+          <el-table-column type="selection" width="40"></el-table-column>
+          <el-table-column type="index" width="40"></el-table-column>
+          
+          <el-table-column sortable prop="category" label="分类" min-width="80" show-overflow-tooltip></el-table-column>
+          <el-table-column sortable prop="key" label="业务编码" min-width="150"  show-overflow-tooltip></el-table-column>
+          <el-table-column sortable prop="name" label="发布包名" min-width="300"  show-overflow-tooltip></el-table-column>
+          <el-table-column
+            sortable
+            prop="deployTime"
+            label="发布时间"
+            min-width="80"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column label="操作" width="150" fixed="right">
+            <template slot-scope="scope">
+              <el-button type="danger" @click="handleDel(scope.row,scope.$index)">取消发布</el-button>
+            </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-dialog
-        title="新增"
-        :visible.sync="addFormVisible"
-        width="50%"
-        :close-on-click-modal="false"
-      >
-        <deployment-add
-          :deployment="addForm"
-          :visible="addFormVisible"
-          @cancel="addFormVisible=false"
-          @submit="afterAddSubmit"
-        ></deployment-add>
-      </el-dialog>
+        <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-dialog
+          title="新增"
+          :visible.sync="addFormVisible"
+          width="50%"
+          :close-on-click-modal="false"
+        >
+          <deployment-add
+            :deployment="addForm"
+            :visible="addFormVisible"
+            @cancel="addFormVisible=false"
+            @submit="afterAddSubmit"
+          ></deployment-add>
+        </el-dialog>
+      </el-row>
     </el-row>
   </section>
 </template>
@@ -131,7 +137,8 @@ export default {
         key: "",
         engineVersion: ""
       },
-      categorys: []
+      categorys: [],
+			tableHeight:300,
       /**begin 自定义属性请在下面加 请加备注**/
 
       /**end 自定义属性请在上面加 请加备注**/
@@ -374,6 +381,10 @@ export default {
       this.categorys = res.data.data;
     });
     this.$nextTick(() => {
+      
+      var clientRect=this.$refs.table.$el.getBoundingClientRect();
+      var subHeight=70/1000 * window.innerHeight; 
+      this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
       this.getDeployments();
     });
   }
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue
index eac9559e..1ed1e918 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue
@@ -26,8 +26,7 @@
 		    ]), 
 		},
 		data() {
-			return {
-				paramsStr:'',
+			return { 
 				filters: { 
 
 					params:{
@@ -52,41 +51,56 @@
 		methods: {
 			 
 			  closeTab(){
+				  var key="ProcdefListForBizStart"
 				  this.$store.dispatch('delVisitedViews', this.$route)
+				  localStorage.removeItem(key)
 				  this.$router.back(-1);
+			  },
+			  dataInit(){ 
+				  this.$nextTick(()=>{
+					  var key="ProcdefListForBizStart"
+						if(this.$route.query && this.$route.query.params){
+							let paramsJsonStr=this.$route.query.params; 
+							let params= JSON.parse(decodeURIComponent(paramsJsonStr))
+							this.filters.params=params;
+							localStorage.setItem(key,JSON.stringify(params))
+							/** 传过来的参数格式
+							let extVars={formDataIds:[row.id],formId:row.formId}
+							let jsonExtVars=JSON.stringify(extVars); 
+							let params={ 
+									mainContext:'',
+									mainTitle:'',
+									bizUrl:process.env.BASE_API+config.getFormBasePath()+'/#/mdp/form/formData/FormDataMng?extVars='+jsonExtVars,
+									extVars:extVars
+							}
+							let jsonParmas=encodeURIComponent(JSON.stringify(params));//对方要 decodeURIComponent
+							this.$router.push({path:'/mdp/workflow/ru/execution/ExecutionMngForFormData',query:{params:jsonParmas}});
+							*/
+							
+						}else if(this.$route.params && this.$route.params.mainTitle){
+							this.filters.params=this.$route.params;
+							var paramsJsonStr=JSON.stringify(this.$route.params);
+							localStorage.setItem(key,paramsJsonStr)
+						}else{
+							var paramsJsonStr=localStorage.getItem(key);
+							if(paramsJsonStr){
+								this.filters.params=JSON.parse(paramsJsonStr);
+							} 
+						}  
+				  })
+				  
 			  }
 			
 		},//end methods
 		components: {  
 			//在下面添加其它组件 
 		},
-		activated:function(){ 
-			
-			if(this.$route.query && this.$route.query.params){
-				let paramsJsonStr=this.$route.query.params;
-
-				this.paramsStr=paramsJsonStr;
-				let params= JSON.parse(decodeURIComponent(paramsJsonStr))
-				this.filters.params=params;
-
-				/** 传过来的参数格式
-				let extVars={formDataIds:[row.id],formId:row.formId}
-				let jsonExtVars=JSON.stringify(extVars); 
-				let params={ 
-						mainContext:'',
-						mainTitle:'',
-						bizUrl:process.env.BASE_API+config.getFormBasePath()+'/#/mdp/form/formData/FormDataMng?extVars='+jsonExtVars,
-						extVars:extVars
-				}
-				let jsonParmas=encodeURIComponent(JSON.stringify(params));//对方要 decodeURIComponent
-				this.$router.push({path:'/mdp/workflow/ru/execution/ExecutionMngForFormData',query:{params:jsonParmas}});
-				 */
-				 
-			}else if(this.$route.params){
-				this.filters.params=this.$route.params;
-			}
+		activated:function(){  
+			this.dataInit();
 		},
 		mounted() { 
+			 this.dataInit();
+			
 		}
 	}
 
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue
index 901a43a3..09878552 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue
@@ -1,186 +1,159 @@
 <template>
   <section>
-    <sticky :className="'sub-navbar draft'">
-      <el-input v-model="filters.key" style="width:20%;" placeholder="模糊查询"></el-input>
-      <el-select v-model="filters.procCategory" clearable filterable placeholder="请选择分类">
-        <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
-      </el-select>
-      <el-button type="primary" v-on:click="searchProcdefs">查询</el-button>
-      <el-button type="primary" @click="handleDownload">导出数据</el-button>
-      <el-button @click.native="showTagSelect(false)">标签查找</el-button>
-      <el-button @click.native="showTagSelect(true)">打标签</el-button>
-    </sticky>
-    <el-row class="filters-show">
-      <font class="filters-label">已选条件:</font>
-      <el-tag
-        v-if="filters.tags"
-        :key="tag.tagId"
-        v-for="tag in filters.tags"
-        :type="''"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose(tag,'tags')"
-      >{{tag.tagName}}</el-tag>
-      <el-tag
-        v-if="filters.categoryTreeNodes"
-        :key="tag.id"
-        v-for="tag in filters.categoryTreeNodes"
-        :type="'info'"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose(tag,'categoryTreeNodes')"
-      >{{tag.name}}</el-tag>
-      <el-tag
-        v-if="filters.procCategory"
-        :type="'dangger'"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose('','procCategory')"
-      >{{filters.procCategory}}</el-tag>
-      <el-tag
-        v-if="filters.key"
-        :type="'success'"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose('','key')"
-      >{{filters.key}}</el-tag>
-    </el-row>
-    <el-row class="app-container">
-      <el-col :xs="4" :sm="4" :md="4" :lg="4" :xl="4" class="hidden-sm-and-down">
-        <category-tree
-          ref="categoryTree"
-          multiple
-          :expandOnClickNode="false"
-          :defaultExpandAll="true"
-          show-checkbox
-          :current-key="addForm.categoryId"
-          v-on:check-change="handleCategoryCheckChange"
-        ></category-tree>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="20" :lg="20" :xl="20">
-        <!--列表 Procdef act_re_procdef-->
-        <el-table
-          :data="procdefs"
-          highlight-current-row
-          v-loading="listLoading"
-          border
-          @selection-change="selsChange"
-          @row-click="rowClick"
-          style="width: 100%;"
-        >
-          <el-table-column type="selection" width="40"></el-table-column>
-          <el-table-column type="index" width="40"></el-table-column>
-          <el-table-column sortable prop="category" label="分类" min-width="80" ></el-table-column>
-          <el-table-column sortable prop="name" label="流程(点击进入参数设置)" min-width="300" >
-            <template slot-scope="scope">  
-                <el-link type="primary" @click="showProcdefParamesSet( scope.row,scope.$index)">{{scope.row.name}} </el-link>
-            </template>
-          </el-table-column>  
-          <el-table-column sortable prop="version" label="版本" min-width="80" ></el-table-column>
-          <el-table-column sortable prop="tagNames" label="标签" min-width="80" >
-            <template slot-scope="scope">
-              <el-tag
-                v-for="(tagName,index) in (scope.row.tagNames?scope.row.tagNames.split(','):[])"
-                :key="index"
-              >{{tagName}}</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column
-            sortable
-            prop="suspensionState"
-            label="状态"
-            min-width="80"
+    <el-row class="app-container"> 
+      <el-row>
+        <el-col :xs="4" :sm="4" :md="4" :lg="4" :xl="4" class="hidden-sm-and-down">
+          <category-tree
+            ref="categoryTree"
+            multiple
+            :expandOnClickNode="false"
+            :defaultExpandAll="true"
+            show-checkbox
+            :current-key="addForm.categoryId"
+            v-on:check-change="handleCategoryCheckChange"
+          ></category-tree>
+        </el-col>
+        <el-col :xs="24" :sm="24" :md="20" :lg="20" :xl="20">
+          <el-row> 
+            <el-select v-model="filters.procCategory" clearable filterable placeholder="请选择分类">
+              <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
+            </el-select>
             
-            :formatter="formatterSuspensionState"
-          ></el-table-column>
-          <el-table-column sortable prop="key" label="模型编码" min-width="180" ></el-table-column>
-          <el-table-column
-            sortable
-            prop="description"
-            label="描述"
-            min-width="100"
-          > <template slot-scope="scope">
-                <el-popover
-                  placement="top-start"
-                  title="描述"
-                  width="200"
-                  trigger="click"
-                  :content="scope.row.description">
-                  <el-button slot="reference">详细描述</el-button>
-                </el-popover>
+            <el-button @click.native="showTagSelect(false)">标签</el-button>
+            <el-input v-model="filters.key" style="width:20%;" placeholder="模糊查询">
+              <template slot="append"> 
+                <el-button type="primary"   v-on:click="searchProcdefs" icon="el-icon-search">查询</el-button> 
               </template>
-          </el-table-column>
-          <el-table-column label="操作" width="220" fixed="right">
-            <template slot-scope="scope">
-              <el-button type="primary" @click="showBizModelDialog(scope.row,scope.$index)">绑定业务</el-button>
-              <el-button @click="showDiagram( scope.row,scope.$index)">流程图</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+            </el-input> 
+            <el-button type="primary" @click="handleDownload" 	icon="el-icon-download">导出数据</el-button>
+            <el-button @click.native="showTagSelect(true)">打标签</el-button>
+          </el-row> 
+          <el-row  style="padding-top:10px;">
+            <!--列表 Procdef act_re_procdef-->
+            <el-table
+              ref="table" :max-height="tableHeight" 
+              :data="procdefs"
+              highlight-current-row
+              v-loading="listLoading"
+              border
+              @selection-change="selsChange"
+              @row-click="rowClick"
+              style="width: 100%;"
+            >
+              <el-table-column type="selection" width="40"></el-table-column>
+              <el-table-column type="index" width="40"></el-table-column>
+              <el-table-column sortable prop="category" label="分类" min-width="80" show-overflow-tooltip></el-table-column>
+              <el-table-column sortable prop="name" label="流程(点击进入参数设置)" min-width="200"  show-overflow-tooltip>
+                <template slot-scope="scope">  
+                    <el-link type="primary" @click="showProcdefParamesSet( scope.row,scope.$index)">{{scope.row.name}} </el-link>
+                </template>
+              </el-table-column>  
+              <el-table-column sortable prop="version" label="版本" min-width="80"  show-overflow-tooltip></el-table-column>
+              <el-table-column sortable prop="tagNames" label="标签" min-width="80"  show-overflow-tooltip>
+                <template slot-scope="scope">
+                  <el-tag
+                    v-for="(tagName,index) in (scope.row.tagNames?scope.row.tagNames.split(','):[])"
+                    :key="index"
+                  >{{tagName}}</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column
+                sortable
+                prop="suspensionState"
+                label="状态"
+                min-width="80"
+                
+                :formatter="formatterSuspensionState"
+              ></el-table-column>
+              <el-table-column sortable prop="key" label="模型编码" min-width="180"  show-overflow-tooltip></el-table-column>
+              <el-table-column
+                sortable
+                prop="description"
+                label="描述"
+                min-width="100"
+              > <template slot-scope="scope">
+                    <el-popover
+                      placement="top-start"
+                      title="描述"
+                      width="200"
+                      trigger="click"
+                      :content="scope.row.description">
+                      <el-button slot="reference">详细描述</el-button>
+                    </el-popover>
+                  </template>
+              </el-table-column>
+              <el-table-column label="操作" width="220" fixed="right">
+                <template slot-scope="scope">
+                  <el-button type="primary" @click="showBizModelDialog(scope.row,scope.$index)">绑定业务</el-button>
+                  <el-button @click="showDiagram( scope.row,scope.$index)">流程图</el-button>
+                </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-dialog
-          title="流程图"
-          :visible.sync="diagramVisible"
-          width="80%"
-          :close-on-click-modal="false"
-        >
-          <el-image :fit="'contain'" :src="diagramUrl">
-            <div slot="error" class="image-slot">
-              <i class="el-icon-picture-outline"></i>
-            </div>
-            <div slot="placeholder" class="image-slot">
-              正在全力加载中。。。。。。。。。。
-              <i class="el-icon-loading"></i>
-            </div>
-          </el-image>
-        </el-dialog>
-        <!--流程图界面-->
-        <el-dialog
-          title="流程参数设置"
-          :visible.sync="procdefParamesVisible"
-          width="80%"
-          :close-on-click-modal="false"
-        >
-          <procdef-parames-set
-            :procdef="addForm"
-            @cancel="procdefParamesVisible=false"
-            @submit="procdefParamesVisible=false"
-          ></procdef-parames-set>
-        </el-dialog>
-        <el-dialog
-          title="业务关联设置"
-          :visible.sync="bizModelVisible"
-          width="80%"
-          :close-on-click-modal="false"
-          append-to-body
-        >
-          <biz-model-mng
-            :model-key="addForm.key"
-            :model-name="addForm.name"
-            :visible="bizModelVisible"
-            @cancel="bizModelVisible=false"
-            @submit="bizModelVisible=false"
-          ></biz-model-mng>
-        </el-dialog>
-        <el-dialog append-to-body title="标签条件" :visible.sync="tagSelectVisible" width="60%">
-          <tag-mng
-            :tagIds="filters.tags?filters.tags.map(i=>i.tagId):[]"
-            :jump="true"
-            @select-confirm="onTagSelected"
-          ></tag-mng>
-        </el-dialog>
-      </el-col>
+            <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-dialog
+              title="流程图"
+              :visible.sync="diagramVisible"
+              width="80%"
+              :close-on-click-modal="false"
+            >
+              <el-image :fit="'contain'" :src="diagramUrl">
+                <div slot="error" class="image-slot">
+                  <i class="el-icon-picture-outline"></i>
+                </div>
+                <div slot="placeholder" class="image-slot">
+                  正在全力加载中。。。。。。。。。。
+                  <i class="el-icon-loading"></i>
+                </div>
+              </el-image>
+            </el-dialog>
+            <!--流程图界面-->
+            <el-dialog
+              title="流程参数设置"
+              :visible.sync="procdefParamesVisible" append-to-body fullscreen
+              :close-on-click-modal="false"
+            >
+              <procdef-parames-set
+                :procdef="addForm"
+                @cancel="procdefParamesVisible=false"
+                @submit="procdefParamesVisible=false"
+              ></procdef-parames-set>
+            </el-dialog>
+            <el-dialog
+              title="业务关联设置"
+              :visible.sync="bizModelVisible"
+              width="80%"
+              :close-on-click-modal="false"
+              append-to-body
+            >
+              <biz-model-mng
+                :model-key="addForm.key"
+                :model-name="addForm.name"
+                :visible="bizModelVisible"
+                @cancel="bizModelVisible=false"
+                @submit="bizModelVisible=false"
+              ></biz-model-mng>
+            </el-dialog>
+            <el-dialog append-to-body title="标签条件" :visible.sync="tagSelectVisible" width="60%">
+              <tag-mng
+                :tagIds="filters.tags?filters.tags.map(i=>i.tagId):[]"
+                :jump="true"
+                @select-confirm="onTagSelected"
+              ></tag-mng>
+            </el-dialog>
+          </el-row>
+        </el-col>
+      </el-row>
     </el-row>
   </section>
 </template>
@@ -256,7 +229,8 @@ export default {
       categorys: [],
       tagSelectVisible: false,
       isBatchSetProcTags: false,
-      bizModelVisible: false
+      bizModelVisible: false,
+			tableHeight:300,
       /**end 自定义属性请在上面加 请加备注**/
     };
   }, //end data
@@ -633,6 +607,11 @@ export default {
     listCategorys({ tenantId: this.userInfo.branchId }).then(res => {
       this.categorys = res.data.data;
     });
+    this.$nextTick(()=>{ 
+        var clientRect=this.$refs.table.$el.getBoundingClientRect();
+        var subHeight=70/1000 * window.innerHeight; 
+        this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+    })
     this.getProcdefs();
   }
 };
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue
index fd2cbbc7..924892a7 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue
@@ -1,62 +1,55 @@
 <template>
 	<section>
-		<el-row v-if="flowStartVisible==false">
-		<sticky  :className="'sub-navbar draft'">  
-			<el-row>
-			<el-col :span="22">
-				<el-col :xs="8" :sm="8" :md="6" :lg="6" :xl="6">
-					<el-input v-model="filters.key"  style="width:100%;" placeholder="模糊查询"></el-input> 
-				</el-col> 
-				<el-col :xs="8" :sm="8" :md="6" :lg="6" :xl="6">
-					<el-button type="primary"   v-on:click="searchProcdefs">查询</el-button>  
-				</el-col>
-				 <el-tag type="info" v-if="this.procdefs.length==0">如果没有找到流程，请将业务编码【{{this.filters.params.bizKey}}】与流程进行关联</el-tag>
-			</el-col> 
-			</el-row>
-	    </sticky> 
-		<el-row class="app-container"> 
-			<el-col :xs="24" :sm="24" :md="21" :lg="21" :xl="21"> 
-				<!--列表 Procdef act_re_procdef-->
-				<el-table ref="procdefsTable" :data="procdefs"   highlight-current-row v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
-					<el-table-column type="selection" width="40"></el-table-column>
-					<el-table-column type="index" width="40"></el-table-column> 
-					<el-table-column sortable prop="category" label="分类" min-width="80" ></el-table-column>
-					<el-table-column sortable prop="name" label="流程名称" min-width="200"></el-table-column> 
-					<el-table-column sortable prop="tagNames" label="标签" min-width="150"  >
-						<template slot-scope="scope">
-							<el-tag v-for="tagName in (scope.row.tagNames?scope.row.tagNames.split(','):[])" :key="tagName">{{tagName}}</el-tag>
-						</template>
-					</el-table-column>
-					<el-table-column sortable prop="description" label="描述" min-width="200" ></el-table-column> 
-					<el-table-column sortable prop="version" label="版本" min-width="80" ></el-table-column>
-					<el-table-column label="操作" :min-width="screenWidth>=500?200:80"  fixed="right">
-						<template slot-scope="scope">
-							
-							<el-button v-show="isSelectModel"  @click="rowClick(scope.row,scope.$index)">选中</el-button>
-							<el-button type="primary" v-show="!isSelectModel"  @click="showFlowStart(scope.row,scope.$index)">发起</el-button>
-							<el-button   class="hidden-sm-and-down" @click="showDiagram( scope.row,scope.$index)">流程图</el-button>
-							
-						</template>
-					</el-table-column>
-				</el-table>
+		<el-row v-if="flowStartVisible==false"  class="app-container">
+			<el-row >    
+				<el-input v-model="filters.key"  style="width:30%;" placeholder="模糊查询">
+					<template slot="append"> 
+						<el-button type="primary" v-loading="listLoading" :disabled="listLoading" v-on:click="searchProcdefs" icon="el-icon-search">查询</el-button> 
+					</template>
+				</el-input>  
+				<el-tag type="info" v-if="this.procdefs.length==0">如果没有找到流程，请将业务编码【{{this.filters.params.bizKey}}】与流程进行关联</el-tag> 
+			</el-row> 
+			<el-row style="padding-top:10px;">  
+					<!--列表 Procdef act_re_procdef-->
+					<el-table ref="procdefsTable"  :max-height="tableHeight"  :data="procdefs"   highlight-current-row v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+						<el-table-column type="selection" width="40"></el-table-column>
+						<el-table-column type="index" width="40"></el-table-column> 
+						<el-table-column sortable prop="category" label="分类" min-width="80" ></el-table-column>
+						<el-table-column sortable prop="name" label="流程名称" min-width="200"></el-table-column> 
+						<el-table-column sortable prop="tagNames" label="标签" min-width="150"  >
+							<template slot-scope="scope">
+								<el-tag v-for="tagName in (scope.row.tagNames?scope.row.tagNames.split(','):[])" :key="tagName">{{tagName}}</el-tag>
+							</template>
+						</el-table-column>
+						<el-table-column sortable prop="description" label="描述" min-width="200" ></el-table-column> 
+						<el-table-column sortable prop="version" label="版本" min-width="80" ></el-table-column>
+						<el-table-column label="操作" :min-width="screenWidth>=500?200:80"  fixed="right">
+							<template slot-scope="scope">
+								
+								<el-button v-show="isSelectModel"  @click="rowClick(scope.row,scope.$index)">选中</el-button>
+								<el-button type="primary" v-show="!isSelectModel"  @click="showFlowStart(scope.row,scope.$index)">发起</el-button>
+								<el-button   class="hidden-sm-and-down" @click="showDiagram( scope.row,scope.$index)">流程图</el-button>
+								
+							</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  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-col>
-			
-			<!--流程图界面-->
-			<el-dialog title="流程图" :visible.sync="diagramVisible"  width="80%"  :close-on-click-modal="false">
-				  
-				<el-image   :fit="'contain'" :src="diagramUrl">
-					<div slot="error" class="image-slot">
-						<i class="el-icon-picture-outline"></i>
-					</div>
-					<div slot="placeholder" class="image-slot">
-						正在全力加载中。。。。。。。。。。<i class="el-icon-loading"></i>
-					</div>
-				</el-image>  
-			</el-dialog>
-		</el-row>
+				<!--流程图界面-->
+				<el-dialog title="流程图" :visible.sync="diagramVisible"  width="80%"  :close-on-click-modal="false">
+					
+					<el-image   :fit="'contain'" :src="diagramUrl">
+						<div slot="error" class="image-slot">
+							<i class="el-icon-picture-outline"></i>
+						</div>
+						<div slot="placeholder" class="image-slot">
+							正在全力加载中。。。。。。。。。。<i class="el-icon-loading"></i>
+						</div>
+					</el-image>  
+				</el-dialog>
+			</el-row>
 		</el-row>
 		<el-row v-else-if="flowStartVisible==true">
 			 <procinst-parames-start-set :procdef="addForm" :visible="flowStartVisible" :params="filters.params"    @cancel="startCancel"></procinst-parames-start-set>
@@ -141,6 +134,7 @@
 				categorys:[],
 				tagSelectVisible:false,
 				isBatchSetProcTags:false,
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -299,6 +293,12 @@
 				 this.filters.params=this.params; 
 				 this.searchProcdefs(); 
 			 }
+			 this.$nextTick(()=>{
+				 
+				var clientRect=this.$refs.procdefsTable.$el.getBoundingClientRect();
+				var subHeight=70/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.procdefsTable.$el.offsetTop-subHeight; 
+			 })
 			  
 			 
 		}
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue
index 64593639..38c989ea 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue
@@ -1,87 +1,5 @@
 <template>
-  <section>
-    <sticky :className="'sub-navbar draft'">
-      <el-row>
-        <el-col :span="22">
-          <el-col :xs="8" :sm="8" :md="6" :lg="6" :xl="6">
-            <el-input v-model="filters.key" style="width:100%;" placeholder="模糊查询"></el-input>
-          </el-col>
-          <el-col :xs="8" :sm="8" :md="6" :lg="6" :xl="6">
-            <el-select
-              v-model="filters.procCategory"
-              style="width:100%;'"
-              clearable
-              filterable
-              placeholder="请选择分类"
-            >
-              <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
-            </el-select>
-          </el-col>
-          <el-col :xs="8" :sm="8" :md="6" :lg="6" :xl="6">
-            <el-button type="primary" v-on:click="searchProcdefs">查询</el-button>
-            <el-button @click.native="showTagSelect(false)">标签查找</el-button>
-            <el-button @click.native="showTagSelect(true)">打标签</el-button>
-            
-          </el-col>
-        </el-col>
-
-        <el-col :span="2">
-          <el-button @click="drawer = true" type="text">更多</el-button>
-
-          <el-drawer title="更多查询条件" :visible.sync="drawer" :with-header="false" append-to-body>
-            <el-button @click.native="showTagSelect(false)">标签查找</el-button>
-            <el-button @click.native="showTagSelect(true)">打标签</el-button>
-			      <el-button type="primary" @click="handleDownload">导出数据</el-button>
-            <category-tree
-              class="hidden-md-and-up"
-              ref="categoryTree"
-              multiple
-              :expandOnClickNode="false"
-              :defaultExpandAll="true"
-              show-checkbox
-              :current-key="addForm.categoryId"
-              v-on:check-change="handleCategoryCheckChange"
-            ></category-tree>
-          </el-drawer>
-        </el-col>
-      </el-row>
-    </sticky>
-    <el-row class="filters-show">
-      <font class="filters-label">已选条件:</font>
-      <el-tag
-        v-if="filters.tags"
-        :key="tag.tagId"
-        v-for="tag in filters.tags"
-        :type="''"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose(tag,'tags')"
-      >{{tag.tagName}}</el-tag>
-      <el-tag
-        v-if="filters.categoryTreeNodes"
-        :key="tag.id"
-        v-for="tag in filters.categoryTreeNodes"
-        :type="'info'"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose(tag,'categoryTreeNodes')"
-      >{{tag.name}}</el-tag>
-
-      <el-tag
-        v-if="filters.procCategory"
-        :type="'dangger'"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose('','procCategory')"
-      >{{filters.procCategory}}</el-tag>
-      <el-tag
-        v-if="filters.key"
-        :type="'success'"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose('','key')"
-      >{{filters.key}}</el-tag>
-    </el-row>
+  <section> 
     <el-row class="app-container">
       <el-col :xs="4" :sm="4" :md="3" :lg="3" :xl="3" class="hidden-sm-and-down">
         <category-tree
@@ -95,118 +13,154 @@
         ></category-tree>
       </el-col>
       <el-col :xs="24" :sm="24" :md="21" :lg="21" :xl="21">
-        <!--列表 Procdef act_re_procdef-->
-        <el-table
-          ref="procdefsTable"
-          :data="procdefs"
-          highlight-current-row
-          v-loading="listLoading"
-          border
-          @selection-change="selsChange"
-          @row-click="rowClick"
-          style="width: 100%;"
-        >
-          <el-table-column type="selection" width="40"></el-table-column>
-          <el-table-column type="index" width="40"></el-table-column>
-          <el-table-column sortable prop="category" label="分类" min-width="80" ></el-table-column>
-					<el-table-column v-if="!isSelectModel" sortable prop="name" label="流程(点击发起)" min-width="300" >
-						<template slot-scope="scope">  
-							 <el-link  type="primary" @click="showFlowStart( scope.row,scope.$index)">{{scope.row.name}}</el-link> 
-						</template>
-					</el-table-column>
-					<el-table-column v-else  sortable prop="name" label="流程(点击选中)" min-width="300" >
-						<template slot-scope="scope">   
-               <el-link   type="primary" @click="rowClick( scope.row,scope.$index)">{{scope.row.name}}</el-link> 
-						</template>
-					</el-table-column>
-          <el-table-column
-            sortable
-            prop="tagNames"
-            label="标签"
-            min-width="150"
-            
+        <el-row>  
+              <el-select
+                v-model="filters.procCategory" 
+                clearable
+                filterable
+                placeholder="请选择分类"
+              >
+                <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
+              </el-select>  
+              <el-input v-model="filters.key" style="width:20%;" placeholder="模糊查询">
+              <template slot="append"> 
+                <el-button type="primary"   v-on:click="searchProcdefs" icon="el-icon-search">查询</el-button> 
+              </template>
+            </el-input> 
+              <el-button @click.native="showTagSelect(false)">标签查找</el-button>
+              <el-button @click.native="showTagSelect(true)">打标签</el-button>
+               
+            <el-button @click="drawer = true" type="text">更多</el-button>
+
+            <el-drawer title="更多查询条件" :visible.sync="drawer" :with-header="false" append-to-body>
+              <el-button @click.native="showTagSelect(false)">标签查找</el-button>
+              <el-button @click.native="showTagSelect(true)">打标签</el-button>
+              <el-button type="primary" @click="handleDownload" icon="el-icon-download">导出数据</el-button>
+              <category-tree
+                class="hidden-md-and-up"
+                ref="categoryTree"
+                multiple
+                :expandOnClickNode="false"
+                :defaultExpandAll="true"
+                show-checkbox
+                :current-key="addForm.categoryId"
+                v-on:check-change="handleCategoryCheckChange"
+              ></category-tree>
+            </el-drawer> 
+        </el-row>
+        <el-row style="padding-top:10px;">
+          <!--列表 Procdef act_re_procdef-->
+          <el-table
+            ref="procdefsTable"  :max-height="tableHeight" 
+            :data="procdefs"
+            highlight-current-row
+            v-loading="listLoading"
+            border
+            @selection-change="selsChange"
+            @row-click="rowClick"
+            style="width: 100%;"
           >
-            <template slot-scope="scope">
-              <el-tag
-                v-for="tagName in (scope.row.tagNames?scope.row.tagNames.split(','):[])"
-                :key="tagName"
-              >{{tagName}}</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column
-            sortable
-            prop="description"
-            label="描述"
-            min-width="200"
-            
-          ></el-table-column>
-          <el-table-column sortable prop="version" label="版本" min-width="80" ></el-table-column>
-          <el-table-column label="操作" :min-width="screenWidth>=500?200:80" fixed="right">
-            <template slot-scope="scope">
-              <el-button v-show="isSelectModel" @click="rowClick(scope.row,scope.$index)">选中</el-button>
-              <el-button
-                type="primary"
-                v-show="!isSelectModel"
-                @click="showFlowStart(scope.row,scope.$index)"
-              >发起</el-button>
-              <el-button
-                class="hidden-sm-and-down"
-                @click="showDiagram( scope.row,scope.$index)"
-              >流程图</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+            <el-table-column type="selection" width="40"></el-table-column>
+            <el-table-column type="index" width="40"></el-table-column>
+            <el-table-column sortable prop="category" label="分类" min-width="80" ></el-table-column>
+            <el-table-column v-if="!isSelectModel" sortable prop="name" label="流程(点击发起)" min-width="300" >
+              <template slot-scope="scope">  
+                <el-link  type="primary" @click="showFlowStart( scope.row,scope.$index)">{{scope.row.name}}</el-link> 
+              </template>
+            </el-table-column>
+            <el-table-column v-else  sortable prop="name" label="流程(点击选中)" min-width="300" >
+              <template slot-scope="scope">   
+                <el-link   type="primary" @click="rowClick( scope.row,scope.$index)">{{scope.row.name}}</el-link> 
+              </template>
+            </el-table-column>
+            <el-table-column
+              sortable
+              prop="tagNames"
+              label="标签"
+              min-width="150"
+              
+            >
+              <template slot-scope="scope">
+                <el-tag
+                  v-for="tagName in (scope.row.tagNames?scope.row.tagNames.split(','):[])"
+                  :key="tagName"
+                >{{tagName}}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column
+              sortable
+              prop="description"
+              label="描述"
+              min-width="200"
+              
+            ></el-table-column>
+            <el-table-column sortable prop="version" label="版本" min-width="80" ></el-table-column>
+            <el-table-column label="操作" :min-width="screenWidth>=500?200:80" fixed="right">
+              <template slot-scope="scope">
+                <el-button v-show="isSelectModel" @click="rowClick(scope.row,scope.$index)">选中</el-button>
+                <el-button
+                  type="primary"
+                  v-show="!isSelectModel"
+                  @click="showFlowStart(scope.row,scope.$index)"
+                >发起</el-button>
+                <el-button
+                  class="hidden-sm-and-down"
+                  @click="showDiagram( scope.row,scope.$index)"
+                >流程图</el-button>
+              </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
+            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-dialog
+          title="流程图"
+          :visible.sync="diagramVisible"
+          width="80%"
+          :close-on-click-modal="false"
+        >
+          <el-image :fit="'contain'" :src="diagramUrl">
+            <div slot="error" class="image-slot">
+              <i class="el-icon-picture-outline"></i>
+            </div>
+            <div slot="placeholder" class="image-slot">
+              正在全力加载中。。。。。。。。。。
+              <i class="el-icon-loading"></i>
+            </div>
+          </el-image>
+        </el-dialog>
+        <!--流程起动界面-->
+        <el-dialog
+          title="发起流程"
+          :visible.sync="flowStartVisible"
+          :width="dialogWidth()"
+          :close-on-click-modal="false"
+        >
+          <procinst-parames-start-set
+            :procdef="addForm"
+            :visible="flowStartVisible"
+            :params="filters.params"
+            @cancel="flowStartVisible=false"
+          ></procinst-parames-start-set>
+        </el-dialog>
+        <el-dialog append-to-body title="标签条件" :visible.sync="tagSelectVisible" width="60%">
+          <tag-mng
+            :tagIds="filters.tags?filters.tags.map(i=>i.tagId):[]"
+            :jump="true"
+            @select-confirm="onTagSelected"
+          ></tag-mng>
+        </el-dialog>
+      </el-row>
       </el-col>
-
-      <!--流程图界面-->
-      <el-dialog
-        title="流程图"
-        :visible.sync="diagramVisible"
-        width="80%"
-        :close-on-click-modal="false"
-      >
-        <el-image :fit="'contain'" :src="diagramUrl">
-          <div slot="error" class="image-slot">
-            <i class="el-icon-picture-outline"></i>
-          </div>
-          <div slot="placeholder" class="image-slot">
-            正在全力加载中。。。。。。。。。。
-            <i class="el-icon-loading"></i>
-          </div>
-        </el-image>
-      </el-dialog>
-      <!--流程起动界面-->
-      <el-dialog
-        title="发起流程"
-        :visible.sync="flowStartVisible"
-        :width="dialogWidth()"
-        :close-on-click-modal="false"
-      >
-        <procinst-parames-start-set
-          :procdef="addForm"
-          :visible="flowStartVisible"
-          :params="filters.params"
-          @cancel="flowStartVisible=false"
-        ></procinst-parames-start-set>
-      </el-dialog>
-      <el-dialog append-to-body title="标签条件" :visible.sync="tagSelectVisible" width="60%">
-        <tag-mng
-          :tagIds="filters.tags?filters.tags.map(i=>i.tagId):[]"
-          :jump="true"
-          @select-confirm="onTagSelected"
-        ></tag-mng>
-      </el-dialog>
     </el-row>
   </section>
 </template>
@@ -301,7 +255,8 @@ export default {
       flowStartVisible: false, //发起流程
       categorys: [],
       tagSelectVisible: false,
-      isBatchSetProcTags: false
+      isBatchSetProcTags: false,
+			tableHeight:300,
       /**end 自定义属性请在上面加 请加备注**/
     };
   }, //end data
@@ -692,7 +647,12 @@ export default {
     if (this.params) {
       this.filters.params = this.params;
     }
-
+    
+    this.$nextTick(()=>{ 
+        var clientRect=this.$refs.procdefsTable.$el.getBoundingClientRect();
+        var subHeight=70/1000 * window.innerHeight; 
+        this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.procdefsTable.$el.offsetTop-subHeight; 
+    })
     this.searchProcdefs();
     listCategorys({ tenantId: this.userInfo.branchId }).then(res => {
       this.categorys = res.data.data;
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefMng.vue b/src/views/mdp/workflow/re/procdef/ProcdefMng.vue
index 3575643d..d8f6dbac 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefMng.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefMng.vue
@@ -1,7 +1,11 @@
 <template>
 	<section>
-		<sticky  :className="'sub-navbar draft'">  
-			<el-input v-model="filters.key"  style="width:20%;" placeholder="模糊查询"></el-input> 
+		<el-row  class="app-container">  
+			<el-input v-model="filters.key"  style="width:20%;" placeholder="模糊查询">
+				<template slot="append"> 
+					<el-button type="primary"   v-on:click="searchProcdefs" icon="el-icon-search">查询</el-button> 
+				</template>
+			</el-input> 
 			<el-select v-model="filters.procCategory"   clearable filterable placeholder="请选择分类">
 		     <el-option
 		      v-for="item in categorys"
@@ -9,11 +13,10 @@
 		      :label="item"
 		      :value="item">
 		    </el-option>
-		  </el-select>
-			<el-button type="primary"   v-on:click="searchProcdefs">查询</el-button>   
+		  </el-select>   
 			<el-button   @click.native="showTagSelect(false)"  >标签查找</el-button>
 			<el-button   @click.native="showTagSelect(true)"  >打标签</el-button>
-	    </sticky>
+	    </el-row>
 		<el-row class="filters-show">
 			<font class="filters-label">已选条件:</font>
 			<el-tag  v-if="filters.tags"
@@ -57,7 +60,7 @@
 			<el-col :xs="24" :sm="24" :md="20" :lg="20" :xl="20"> 
 			
 			<!--列表 Procdef act_re_procdef-->
-			<el-table :data="procdefs"    highlight-current-row v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table  ref="table" :max-height="tableHeight"  :data="procdefs"    highlight-current-row v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column type="selection" width="40"></el-table-column>
 				<el-table-column type="index" width="40"></el-table-column> 
 				<el-table-column prop="category" label="分类" min-width="80" ></el-table-column>
@@ -152,6 +155,7 @@
 				categorys:[],
 				tagSelectVisible:false,
 				isBatchSetProcTags:false,
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -400,6 +404,11 @@
 		},
 		mounted() {
 			
+			this.$nextTick(()=>{ 
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=70/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+			})
 			listCategorys({tenantId:this.userInfo.branchId}).then(res=>{
 				this.categorys=res.data.data
 			})
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue b/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue
index f3ce2b46..3a8c3549 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue
@@ -1,176 +1,139 @@
 <template>
   <section>
-    <sticky :className="'sub-navbar draft'">
-      <el-input v-model="filters.key" style="width:20%;" placeholder="模糊查询"></el-input>
-      <el-select v-model="filters.procCategory" clearable filterable placeholder="请选择分类">
-        <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
-      </el-select>
-      <el-button type="primary" v-on:click="searchProcdefs">查询</el-button>
-      <el-button type="primary" @click="handleDownload">导出数据</el-button>
-      <el-button @click.native="showTagSelect(false)">标签查找</el-button>
-      <el-button @click.native="showTagSelect(true)">打标签</el-button>
-    </sticky>
-    <el-row class="filters-show">
-      <font class="filters-label">已选条件:</font>
-      <el-tag
-        v-if="filters.tags"
-        :key="tag.tagId"
-        v-for="tag in filters.tags"
-        :type="''"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose(tag,'tags')"
-      >{{tag.tagName}}</el-tag>
-      <el-tag
-        v-if="filters.categoryTreeNodes"
-        :key="tag.id"
-        v-for="tag in filters.categoryTreeNodes"
-        :type="'info'"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose(tag,'categoryTreeNodes')"
-      >{{tag.name}}</el-tag>
+    <el-row class="app-container"> 
+        <el-col :xs="4" :sm="4" :md="4" :lg="4" :xl="4" class="hidden-sm-and-down">
+          <category-tree
+            ref="categoryTree"
+            multiple
+            :expandOnClickNode="false"
+            :defaultExpandAll="true"
+            show-checkbox
+            :current-key="addForm.categoryId"
+            v-on:check-change="handleCategoryCheckChange"
+          ></category-tree>
+        </el-col>
+        <el-col :xs="24" :sm="24" :md="20" :lg="20" :xl="20"> 
+          <el-row>
+            <el-select v-model="filters.procCategory" clearable filterable placeholder="请选择分类">
+              <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
+            </el-select> 
+            <el-button @click.native="showTagSelect(false)">标签查找</el-button>
+            <el-input v-model="filters.key" style="width:20%;" placeholder="模糊查询">
+              <template slot="append"> 
+                <el-button type="primary"   v-on:click="searchProcdefs" icon="el-icon-search">查询</el-button> 
+              </template>
+            </el-input> 
+            <el-button type="primary" @click="handleDownload" icon="el-icon-download">导出数据</el-button>
+            <el-button @click.native="showTagSelect(true)">打标签</el-button>
+          </el-row> 
+          <!--列表 Procdef act_re_procdef-->
+          <el-row style="padding-top:10px;">
+          <el-table
+            ref="table" :max-height="tableHeight" 
+            :data="procdefs"
+            highlight-current-row
+            v-loading="listLoading"
+            border
+            @selection-change="selsChange"
+            @row-click="rowClick"
+            style="width: 100%;"
+          >
+            <el-table-column type="selection" width="40"></el-table-column>
+            <el-table-column type="index" width="40"></el-table-column>
+            <el-table-column sortable prop="category" label="分类" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column sortable prop="name" label="模型名称" min-width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column
+              sortable
+              prop="suspensionState"
+              label="状态"
+              min-width="80"
+              show-overflow-tooltip
+              :formatter="formatterSuspensionState"
+            ></el-table-column>
 
-      <el-tag
-        v-if="filters.procCategory"
-        :type="'dangger'"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose('','procCategory')"
-      >{{filters.procCategory}}</el-tag>
-      <el-tag
-        v-if="filters.key"
-        :type="'success'"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose('','key')"
-      >{{filters.key}}</el-tag>
-    </el-row>
-    <el-row class="app-container">
-      <el-col :xs="4" :sm="4" :md="4" :lg="4" :xl="4" class="hidden-sm-and-down">
-        <category-tree
-          ref="categoryTree"
-          multiple
-          :expandOnClickNode="false"
-          :defaultExpandAll="true"
-          show-checkbox
-          :current-key="addForm.categoryId"
-          v-on:check-change="handleCategoryCheckChange"
-        ></category-tree>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="20" :lg="20" :xl="20">
-        <!--列表 Procdef act_re_procdef-->
-        <el-table
-          :data="procdefs"
-          highlight-current-row
-          v-loading="listLoading"
-          border
-          @selection-change="selsChange"
-          @row-click="rowClick"
-          style="width: 100%;"
-        >
-          <el-table-column type="selection" width="40"></el-table-column>
-          <el-table-column type="index" width="40"></el-table-column>
-          <el-table-column sortable prop="category" label="分类" min-width="80" ></el-table-column>
-          <el-table-column sortable prop="name" label="模型名称" min-width="80" ></el-table-column>
-          <el-table-column
-            sortable
-            prop="suspensionState"
-            label="状态"
-            min-width="80"
-            
-            :formatter="formatterSuspensionState"
-          ></el-table-column>
-
-          <el-table-column prop="tagNames" label="标签" min-width="80" >
-            <template slot-scope="scope">
-              <el-tag
-                v-for="tagName in (scope.row.tagNames?scope.row.tagNames.split(','):[])"
-                :key="tagName"
-              >{{tagName}}</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column sortable prop="key" label="业务编码" min-width="80" ></el-table-column>
-          <el-table-column sortable prop="version" label="版本" min-width="80" ></el-table-column>
-          <el-table-column
-            sortable
-            prop="deploymentId"
-            label="部署编号"
-            min-width="80"
-            
-          ></el-table-column>
-          <el-table-column
-            sortable
-            prop="resourceName"
-            label="模型文件名称"
-            min-width="80"
-            
-          ></el-table-column>
-          <el-table-column
-            sortable
-            prop="dgrmResourceName"
-            label="图片名称"
-            min-width="80"
-            
-          ></el-table-column>
-          <el-table-column
-            sortable
-            prop="description"
-            label="描述"
-            min-width="80"
-            
-          ></el-table-column>
-          <el-table-column label="操作" min-width="150" fixed="right" >
-            <template slot-scope="scope">
-              <el-button @click="showDiagram( scope.row,scope.$index)">流程图</el-button>
-              <el-button
-                v-if="scope.row.suspensionState=='1' "
-                type="danger"
-                @click="handleSuspend(scope.row,scope.$index)"
-              >挂起</el-button>
-              <el-button
-                v-if="scope.row.suspensionState!='1' "
-                @click="handleActivate(scope.row,scope.$index)"
-              >激活</el-button>
-            </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-dialog
-          title="流程图"
-          :visible.sync="diagramVisible"
-          width="80%"
-          :close-on-click-modal="false"
-        >
-          <el-image :fit="'contain'" :src="diagramUrl">
-            <div slot="error" class="image-slot">
-              <i class="el-icon-picture-outline"></i>
-            </div>
-            <div slot="placeholder" class="image-slot">
-              正在全力加载中。。。。。。。。。。
-              <i class="el-icon-loading"></i>
-            </div>
-          </el-image>
-        </el-dialog>
-        <el-dialog append-to-body title="标签条件" :visible.sync="tagSelectVisible" width="60%">
-          <tag-mng
-            :tagIds="filters.tags?filters.tags.map(i=>i.tagId):[]"
-            :jump="true"
-            @select-confirm="onTagSelected"
-          ></tag-mng>
-        </el-dialog>
-      </el-col>
-    </el-row>
+            <el-table-column prop="tagNames" label="标签" min-width="80" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-tag
+                  v-for="tagName in (scope.row.tagNames?scope.row.tagNames.split(','):[])"
+                  :key="tagName"
+                >{{tagName}}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column sortable prop="key" label="业务编码" min-width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column sortable prop="version" label="版本" min-width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column
+              sortable
+              prop="deploymentId"
+              label="部署编号"
+              min-width="80"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              sortable
+              prop="resourceName"
+              label="模型文件名称"
+              min-width="80"
+              show-overflow-tooltip
+            ></el-table-column> 
+            <el-table-column
+              sortable
+              prop="description"
+              label="描述"
+              min-width="80"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column label="操作" width="200" fixed="right" >
+              <template slot-scope="scope">
+                <el-button @click="showDiagram( scope.row,scope.$index)">流程图</el-button>
+                <el-button
+                  v-if="scope.row.suspensionState=='1' "
+                  type="danger"
+                  @click="handleSuspend(scope.row,scope.$index)"
+                >挂起</el-button>
+                <el-button
+                  v-if="scope.row.suspensionState!='1' "
+                  @click="handleActivate(scope.row,scope.$index)"
+                >激活</el-button>
+              </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-dialog
+            title="流程图"
+            :visible.sync="diagramVisible"
+            width="80%"
+            :close-on-click-modal="false"
+          >
+            <el-image :fit="'contain'" :src="diagramUrl">
+              <div slot="error" class="image-slot">
+                <i class="el-icon-picture-outline"></i>
+              </div>
+              <div slot="placeholder" class="image-slot">
+                正在全力加载中。。。。。。。。。。
+                <i class="el-icon-loading"></i>
+              </div>
+            </el-image>
+          </el-dialog>
+          <el-dialog append-to-body title="标签条件" :visible.sync="tagSelectVisible" width="60%">
+            <tag-mng
+              :tagIds="filters.tags?filters.tags.map(i=>i.tagId):[]"
+              :jump="true"
+              @select-confirm="onTagSelected"
+            ></tag-mng>
+          </el-dialog>
+          </el-row>
+        </el-col>
+      </el-row> 
   </section>
 </template>
 
@@ -242,7 +205,8 @@ export default {
       diagramUrl: "", //显示流程图的路径
       categorys: [],
       tagSelectVisible: false,
-      isBatchSetProcTags: false
+      isBatchSetProcTags: false,
+			tableHeight:300,
       /**end 自定义属性请在上面加 请加备注**/
     };
   }, //end data
@@ -616,6 +580,12 @@ export default {
     listCategorys({ tenantId: this.userInfo.branchId }).then(res => {
       this.categorys = res.data.data;
     });
+    
+    this.$nextTick(()=>{ 
+        var clientRect=this.$refs.table.$el.getBoundingClientRect();
+        var subHeight=70/1000 * window.innerHeight; 
+        this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+    })
     this.getProcdefs();
   }
 };
diff --git a/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue b/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue
index 4e1b95d1..611a6bcc 100644
--- a/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue
+++ b/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue
@@ -99,7 +99,8 @@
 							<template slot-scope="scope">
 								{{showAssigneeTips(scope.row)}} 
 								<el-button round v-if="scope.row.candidate=='1'" type="warning" @click.native="showCandidateSelectDialog(scope.row,'')" :loading="addLoading">选候选人</el-button> 
-								<el-button round v-if="scope.row.candidate!='1'" type="success" @click.native="showUserSelectDialog(scope.row,'')" :loading="addLoading">选人员</el-button>   
+								<el-button round v-if="scope.row.candidate!='1' " type="success" @click.native="showUserSelectDialog(scope.row,'')" :loading="addLoading">选人员</el-button>  
+								<el-button round v-if="scope.row.toCreater!='1'" type="primary" @click.native="setAssigneeAsStartUser(scope.row)">转发起人</el-button>  
 							</template>
 						</el-table-column>
 						<el-table-column
@@ -466,6 +467,7 @@
 				 
 				this.actSelected.nodeUsers=actAssignee.nodeUsers;
 				this.actSelected.groupIds=actAssignee.groupIds
+				this.actSelected.toCreater='0'
 
 			},
 			onUserSelected:function(users){
@@ -477,6 +479,7 @@
 					}
 				})
 				this.actSelected.nodeUsers=users 
+				this.actSelected.toCreater='0'
 
 			}, 
 			onTagSelected:function(tags){
@@ -528,7 +531,9 @@
 			},
 			showAssigneeTips(actAssignee){
 				var tips=[];
-				if(actAssignee.candidate=='1'){
+				if(actAssignee.toCreater=='1'){
+					tips.push("流程发起人作为执行人")
+				} else if(actAssignee.candidate=='1'){
 					if(actAssignee.nodeUsers){
 						var userCount=actAssignee.nodeUsers.length;
 						tips.push(userCount+"个候选用户");
@@ -689,6 +694,17 @@
 			showNodeForm:function(nodeInfo){ 
 				this.actSelected=nodeInfo 
 				this.nodeFormVisible=true
+			},
+			setAssigneeAsStartUser(nodeInfo){
+				if(nodeInfo.allowOverUser=='0'){
+					this.$message.error("该节点不允许改变执行人")
+					return ;
+				} 
+				this.actSelected=nodeInfo
+				this.actSelected.toCreater='1'
+				this.actSelected.candidate='0'
+				this.actSelected.showNextAssignees='0'
+				
 			}
 		},//end method
 		components: {  
diff --git a/src/views/mdp/workflow/re/procdefParamesTemplate/ProcdefParamesTemplateMng.vue b/src/views/mdp/workflow/re/procdefParamesTemplate/ProcdefParamesTemplateMng.vue
index d5ade49f..2ad143c0 100644
--- a/src/views/mdp/workflow/re/procdefParamesTemplate/ProcdefParamesTemplateMng.vue
+++ b/src/views/mdp/workflow/re/procdefParamesTemplate/ProcdefParamesTemplateMng.vue
@@ -1,12 +1,15 @@
 <template>
 	<section>
-		<sticky :className="'sub-navbar draft'">
-			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
-			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchProcdefParamesTemplates">查询</el-button> 
-		</sticky>
+		<el-row class="app-container">
+			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
+				<template slot="append"> 
+					<el-button type="primary"   v-on:click="searchProcdefParamesTemplates" icon="el-icon-search">查询</el-button> 
+				</template>
+			</el-input>  
+		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 ProcdefParamesTemplate mdp_re_procdef_parames_template-->
-			<el-table :data="procdefParamesTemplates"   highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table  ref="table" :max-height="tableHeight"  :data="procdefParamesTemplates"   highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				 
 				<el-table-column type="index" width="40"></el-table-column>  
 				<el-table-column sortable prop="mainTitle" label="流程标题" min-width="150" ></el-table-column> 
@@ -82,7 +85,8 @@
 				//编辑procdefParamesTemplate界面初始化数据
 				editForm: {
 					id:'',isRefForm:'',monitors:'',sponsors:'',formId:'',procDefId:'',userid:'',lastDate:'',mainContext:'',mainTitle:'',bizUrl:'',bizName:'',categoryId:'',branchId:'',formShowType:'',fp:'',sp:'',tp:'',pconfig:'',fo:'',fi:'',tagNames:'',tagIds:'',mainQx:'',modelKey:''
-				}
+				},
+				tableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -225,7 +229,10 @@
 		    //在下面添加其它组件
 		},
 		mounted() { 
-			this.$nextTick(() => {
+			this.$nextTick(() => { 
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=70/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				this.getProcdefParamesTemplates();
         	}); 
 		}
diff --git a/src/views/mdp/workflow/ru/execution/ExecutionMng.vue b/src/views/mdp/workflow/ru/execution/ExecutionMng.vue
index a0110ab1..7ffc2d1c 100644
--- a/src/views/mdp/workflow/ru/execution/ExecutionMng.vue
+++ b/src/views/mdp/workflow/ru/execution/ExecutionMng.vue
@@ -1,32 +1,36 @@
 <template>
 	<section>
-		<sticky  :className="'sub-navbar draft'">  
-			<el-row>
-			<el-col :xs="22" :sm="22" :md="23" :lg="23" :xl="23">
-				<el-col :xs="8" :sm="8" :md="5" :lg="4" :xl="4">
-					<el-input v-model="filters.key" style="width:100%;"     placeholder="模糊查询"></el-input> 
-				</el-col>
-				<el-col :xs="8" :sm="8" :md="5" :lg="4" :xl="4">
-					<el-select v-model="filters.procCategory" style="width:99%;"     clearable filterable placeholder="请选择分类">
-						<el-option
-						v-for="item in categorys"
-						:key="item"
-						:label="item"
-						:value="item">
-						</el-option>
+		<el-row  class="app-container">    
+			<el-col :xs="4" :sm="4" :md="3" :lg="3" :xl="3" class="hidden-sm-and-down">
+				<category-tree  ref="categoryTree" multiple :expandOnClickNode="false" :defaultExpandAll="true" show-checkbox  :current-key="addForm.categoryId"  v-on:check-change="handleCategoryCheckChange" ></category-tree> 
+			</el-col>
+			<el-col v-if="showCalendar==false" :xs="24" :sm="24" :md="21" :lg="21" :xl="21"> 
+				<el-row>  
+					<el-select v-model="filters.filterType" clearable placeholder="查询范围" class="hidden-md-and-down">
+						<el-option value="" label="全部"> </el-option>
+						<el-option value="startUserId" label="我发起"> </el-option>
+						<el-option value="partake" label="我参与"> </el-option>
+						<el-option value="sponsors" label="我主办"> </el-option>
+						<el-option value="monitors" label="我监控"> </el-option>
 					</el-select>
-				</el-col>
-				<el-col :xs="8" :sm="8" :md="14" :lg="16" :xl="16">
-					<el-button      v-on:click="searchExecutions">查询</el-button>  
-					<el-button   @click.native="showTagSelect(false)"  >标签查找</el-button>
-					<el-button   @click.native="showTagSelect(true)"  >打标签</el-button>
-				
-					<el-button v-if="isAll" :type="filters.allBtn?'success':''"    v-on:click="searchAll">全部</el-button>
-					<el-button  :type="filters.otherParames.startUserId?'success':''"    v-on:click="searchMyStart">我发起</el-button>
-					<el-button  :type="filters.otherParames.partake?'success':''"   v-on:click="searchMyPartake">我参与</el-button>
-					<el-button  :type="filters.otherParames.sponsors?'success':''"    v-on:click="searchMySponsors">我主办</el-button> 
-					<el-button  :type="filters.otherParames.monitors?'success':''"   v-on:click="searchMyMonitors">我监控</el-button>
 					
+					<el-date-picker
+						v-model="filters.startTimeRanger" class="hidden-sm-and-down"
+						type="daterange"
+						align="right"
+						unlink-panels
+						range-separator="至"
+						start-placeholder="创建日期"
+						end-placeholder="创建日期"
+						value-format="yyyy-MM-dd"
+						:default-time="['00:00:00','23:59:59']"
+						:picker-options="pickerOptions">
+					</el-date-picker>  
+					<el-input v-model="filters.key" style="width:20%;"     placeholder="模糊查询">
+						<template slot="append">
+							<el-button      v-on:click="searchExecutions" icon="el-icon-search">查询</el-button>  
+						</template>
+					</el-input>  
 					<el-popover 
 						placement="top"
 						width="375"
@@ -38,225 +42,142 @@
 							<el-button type="primary" size="mini" @click="doCopyWeixinContent">拷贝内容</el-button>
 						</div> 
 						<el-button slot="reference"     class="hidden-sm-and-down"  v-on:click="showWeixin">微信催办</el-button>
-					</el-popover>
-					<el-button     class="hidden-sm-and-down"  v-on:click="showSendSms">短信催办</el-button>
-					
-					<el-button    class="hidden-sm-and-down"  v-on:click="showOaMsg">OAMSG催办</el-button>	
-					
-					<el-button  :type="filters.otherParames.suspensionState=='2'?'success':''"    v-on:click="searchSuspend">挂起的</el-button>
-					<el-button  :type="filters.otherParames.suspensionState=='1'?'success':''"     v-on:click="searchActivite">活动的</el-button> 
-				</el-col> 
-			</el-col>
-			
-			<el-col :xs="2" :sm="2" :md="1" :lg="1" :xl="1">
-				<el-button   @click="drawer = true" type="text" >
-					更多
-				</el-button>
+					</el-popover> 
 
-				<el-drawer
-				title="更多查询条件"
-				:visible.sync="drawer"
-				:with-header="false" append-to-body> 
-					<el-row class="more-filter-item">
-					<el-col :span="24"  >
-						<el-button    @click.native="showTagSelect(false)"  >标签查找</el-button>
-						<el-button    @click.native="showTagSelect(true)"  >打标签</el-button>
-						<el-button v-if="isAll" :type="filters.allBtn?'success':''"   v-on:click="searchAll">全部</el-button>
-						<el-button  :type="filters.otherParames.startUserId?'success':''"   v-on:click="searchMyStart">我发起</el-button>
-						<el-button  :type="filters.otherParames.partake?'success':''"   v-on:click="searchMyPartake">我参与</el-button>
-						<el-button  :type="filters.otherParames.sponsors?'success':''"   v-on:click="searchMySponsors">我主办</el-button> 
-						<el-button  :type="filters.otherParames.monitors?'success':''"   v-on:click="searchMyMonitors">我监控</el-button>
-						<el-button  :type="filters.otherParames.suspensionState=='2'?'success':''"   v-on:click="searchSuspend">挂起的</el-button>
-						<el-button  :type="filters.otherParames.suspensionState=='1'?'success':''"   v-on:click="searchActivite">活动的</el-button>  
-						<el-button       v-on:click="showWeixinTask">微信催办</el-button> 
-						<el-button      v-on:click="showSendSms">短信催办</el-button> 
-						<el-button       v-on:click="showOaMsg">OAMSG催办</el-button>	
-						<el-button   @click.native="userSelectVisible=true" >任务执行人</el-button>  
-						<el-button type="primary" @click="handleDownload">导出数据</el-button>
-					</el-col>
-					 <el-col :span="24">
-						开始日期：<el-date-picker
-							v-model="filters.startTimeRanger"  
-							type="daterange"
-							align="right"
-							unlink-panels
-							range-separator="至"
-							start-placeholder="创建日期"
-							end-placeholder="创建日期"
-							value-format="yyyy-MM-dd"
-							:default-time="['00:00:00','23:59:59']"
-							:picker-options="pickerOptions">
-						</el-date-picker> 
-					 </el-col>
-					 <el-col :span="24">
-						计划完成：<el-date-picker 
-							v-model="filters.planFinishTimeRanger"  
-							type="daterange"
-							align="right"
-							unlink-panels
-							range-separator="至"
-							start-placeholder="计划完成日期"
-							end-placeholder="计划完成日期"
-							value-format="yyyy-MM-dd"
-							:default-time="['00:00:00','23:59:59']"
-							:picker-options="pickerOptions">
-						</el-date-picker> 
-					 </el-col>
-					 
-					 <el-col :span="24">
-					   <el-checkbox v-model="showCalendar">按日历风格显示</el-checkbox>
-					 </el-col>
-					<category-tree class="hidden-md-and-up"   ref="categoryTree" multiple :expandOnClickNode="false" :defaultExpandAll="true" show-checkbox  :current-key="addForm.categoryId"  v-on:check-change="handleCategoryCheckChange" ></category-tree>
-					</el-row>
-				
-				</el-drawer> 
-			</el-col>
-			</el-row>
-	    </sticky> 
-		<el-row class="filters-show">
-			<font class="filters-label">已选条件:</font> 
-			<el-date-picker
-				v-model="filters.startTimeRanger" class="hidden-sm-and-down"
-				type="daterange"
-				align="right"
-				unlink-panels
-				range-separator="至"
-				start-placeholder="创建日期"
-				end-placeholder="创建日期"
-				value-format="yyyy-MM-dd"
-				:default-time="['00:00:00','23:59:59']"
-				:picker-options="pickerOptions">
-			</el-date-picker> 
-			<el-date-picker 
-				v-model="filters.planFinishTimeRanger" class="hidden-sm-and-down"
-				type="daterange"
-				align="right"
-				unlink-panels
-				range-separator="至"
-				start-placeholder="计划完成日期"
-				end-placeholder="计划完成日期"
-				value-format="yyyy-MM-dd"
-				:default-time="['00:00:00','23:59:59']"
-				:picker-options="pickerOptions">
-			</el-date-picker> 
-			<el-tag  v-if="filters.tags"
-				:key="tag.tagId"
-				v-for="tag in filters.tags"
-				:type="''"
-				closable
-				:disable-transitions="false"
-				@close="handleFiltersTagClose(tag,'tags')">
-				{{tag.tagName}}
-			</el-tag>
-			<el-tag v-if="filters.categoryTreeNodes"
-				:key="tag.id"
-				v-for="tag in filters.categoryTreeNodes"
-				:type="'info'"
-				closable
-				:disable-transitions="false"
-				@close="handleFiltersTagClose(tag,'categoryTreeNodes')">
-				{{tag.name}}
-			</el-tag> 
-			<el-tag v-if="filters.taskType=='0'"
-				:type="'warning'"
-				:disable-transitions="false" >
-				 {{filters.taskType=='0'?'已领取':''}}
-			</el-tag>
-			<el-tag v-if="filters.taskType=='1'"
-				:type="'warning'" 
-				:disable-transitions="false" >
-				 {{filters.taskType=='1'?'待领取':''}}
-			</el-tag>
-			<el-tag v-if="filters.otherParames.partake"
-				:type="'warning'" 
-				:disable-transitions="false" >
-				 {{'我参与'}}
-			</el-tag>
-			<el-tag v-if="filters.otherParames.sponsors"
-				:type="'warning'" 
-				:disable-transitions="false" >
-				 {{'我主办'}}
-			</el-tag>
-			<el-tag v-if="filters.otherParames.monitors"
-				:type="'warning'" 
-				:disable-transitions="false" >
-				 {{'我监控'}}
-			</el-tag>
-			<el-tag v-if="filters.otherParames.suspensionState=='1'"
-				:type="'warning'" 
-				:disable-transitions="false" >
-				 {{'已激活'}}
-			</el-tag>
-			<el-tag v-if="filters.otherParames.suspensionState=='2'"
-				:type="'warning'" 
-				:disable-transitions="false" >
-				 {{'已挂起'}}
-			</el-tag>
-			<el-tag v-if="filters.otherParames.startUserId"
-				:type="'warning'" 
-				:disable-transitions="false" >
-				 {{'我发起'}}
-			</el-tag>
-			
-			<el-tag v-if="filters.procCategory"
-				:type="'dangger'"
-				closable
-				:disable-transitions="false"
-				@close="handleFiltersTagClose('','procCategory')" >
-				 {{filters.procCategory}}
-			</el-tag>
-			<el-tag v-if="filters.key"
-				:type="'success'"
-				closable
-				:disable-transitions="false" 
-				@close="handleFiltersTagClose('','key')">
-				 {{filters.key}}
-			</el-tag>   
-			
-			<el-tag v-if="filters.assignee"
-				:type="'success'"
-				closable
-				:disable-transitions="false" 
-				@close="handleFiltersTagClose('','assignee')">
-				 {{filters.assignee.username}}
-			</el-tag>   
-			
-			<el-tag 
-				:type="'success'" 
-				:disable-transitions="false" 
-				closable
-				 @click="handleFiltersTagClose(showCalendar,'calendar')" 
-				 @close="handleFiltersTagClose(showCalendar,'calendar')">
-				 {{showCalendar==true?'切换列表':'切换日历'}}
-			</el-tag>   
-		</el-row>
-		<el-row class="app-container">
-			
-			<el-col :xs="4" :sm="4" :md="3" :lg="3" :xl="3" class="hidden-sm-and-down">
-				<category-tree  ref="categoryTree" multiple :expandOnClickNode="false" :defaultExpandAll="true" show-checkbox  :current-key="addForm.categoryId"  v-on:check-change="handleCategoryCheckChange" ></category-tree> 
-			</el-col>
-			<el-col v-if="showCalendar==false" :xs="24" :sm="24" :md="21" :lg="21" :xl="21"> 
-				
+					<el-popover
+					title="更多查询条件"
+					placement="top-start" 
+					width="400"
+					trigger="click"> 
+						<el-row class="more-filter-item">
+							<el-col :span="24">
+								<font class="more-label-font">
+									查询范围：
+								</font>
+								<el-select size="mini" v-model="filters.filterType"  placeholder="查询范围">
+									<el-option value="" label="全部"> </el-option>
+									<el-option value="startUserId" label="我发起"> </el-option>
+									<el-option value="partake" label="我参与"> </el-option>
+									<el-option value="sponsors" label="我主办"> </el-option>
+									<el-option value="monitors" label="我监控"> </el-option>
+								</el-select> 
+							</el-col>
+							<el-col :span="24">
+								<font class="more-label-font">
+									标签查找：
+								</font> 
+								<el-row v-show="filters.tags && filters.tags.length>0">
+									<el-tag  
+										:key="tag.tagId"
+										v-for="tag in filters.tags"
+										:type="''"
+										closable
+										:disable-transitions="false"
+										@click="showTagSelect(false)"
+										@close="handleFiltersTagClose(tag,'tags')">
+										{{tag.tagName}}
+									</el-tag>
+								</el-row>
+								<el-button v-if="filters.tags==null || filters.tags.length==0"  size="mini"   @click.native="showTagSelect(false)">选择标签</el-button>
+							</el-col>
+							<el-col :span="24"  >
+								<font class="more-label-font">
+									任务执行人：
+								</font>  
+								<el-tag v-if="filters.assignee"
+									:type="'success'"
+									closable
+									:disable-transitions="false" 
+									@click="userSelectVisible=true"
+									@close="handleFiltersTagClose('','assignee')">
+									{{filters.assignee.username}}
+								</el-tag>  
+								<el-button v-else size="mini"   @click.native="userSelectVisible=true" >选择执行人</el-button>   
+							</el-col>
+							<el-col :span="24"  > 
+								<el-button size="mini"  :type="filters.suspensionState=='2'?'success':''"   v-on:click="filters.suspensionState='2'">挂起的</el-button>
+								<el-button size="mini"  :type="filters.suspensionState=='1'?'success':''"   v-on:click="filters.suspensionState='1'">活动的</el-button>  
+	
+								
+							</el-col>
+							<el-col :span="24">
+								<font class="more-label-font">
+									开始日期：
+								</font>
+								<el-date-picker 
+									v-model="filters.startTimeRanger"  
+									type="daterange"
+									align="right"
+									unlink-panels
+									range-separator="至"
+									start-placeholder="创建日期"
+									end-placeholder="创建日期"
+									value-format="yyyy-MM-dd"
+									:default-time="['00:00:00','23:59:59']"
+									:picker-options="pickerOptions">
+								</el-date-picker> 
+							</el-col>
+							<el-col :span="24">
+								
+								<font class="more-label-font">
+									计划完成日期：
+								</font>
+								<el-date-picker 
+									v-model="filters.planFinishTimeRanger"  
+									type="daterange"
+									align="right"
+									unlink-panels
+									range-separator="至"
+									start-placeholder="计划完成日期"
+									end-placeholder="计划完成日期"
+									value-format="yyyy-MM-dd"
+									:default-time="['00:00:00','23:59:59']"
+									:picker-options="pickerOptions">
+								</el-date-picker> 
+							</el-col> 
+							<el-col :span="24">
+								<category-tree class="hidden-md-and-up"   ref="categoryTree" multiple :expandOnClickNode="false" :defaultExpandAll="true" show-checkbox  :current-key="addForm.categoryId"  v-on:check-change="handleCategoryCheckChange" ></category-tree>
+							</el-col> 
+							<el-col :span="24">
+								<el-checkbox size="mini"  v-model="showCalendar">按日历风格显示</el-checkbox>
+								<el-button size="mini"   type="primary"    v-on:click="searchExecutions" icon="el-icon-search">查询</el-button>   
+							</el-col>
+										
+							<el-col :span="24">   
+								<el-divider content-position="left">其它操作</el-divider>	
+								<el-button size="mini"     @click.native="showTagSelect(true)"  >给任务打标签</el-button> 
+								<el-button size="mini"  @click="handleDownload">导出数据</el-button>
+								<el-button size="mini"       v-on:click="showWeixinTask">微信催办</el-button> 
+								<el-button size="mini"      v-on:click="showSendSms">短信催办</el-button> 
+								<el-button size="mini"       v-on:click="showOaMsg">OAMSG催办</el-button>	
+							</el-col>
+						</el-row>
+						<el-button  slot="reference" icon="el-icon-more" circle></el-button>
+					</el-popover>  
+				</el-row>
 				<!--列表 Execution act_ru_execution-->
-				<el-table :data="executions"    highlight-current-row v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+				<el-row style="padding-top:10px;">
+				<el-table ref="table" :max-height="tableHeight" :data="executions"    highlight-current-row v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 					<el-table-column type="selection" width="40"></el-table-column>
 					<el-table-column type="index" width="40"></el-table-column>
-					<el-table-column sortable prop="mainTitle" label="流程【任务】(点击详情)" min-width="300" >
+					<el-table-column sortable prop="mainTitle" label="流程(点击详情)" min-width="300" show-overflow-tooltip>
 						<template slot-scope="scope">  
-							 <el-link type="primary" @click="showTasksInfo( scope.row,scope.$index)">{{scope.row.mainTitle}}【{{scope.row.taskName}}】</el-link>
+							 <el-link type="primary" @click="showTasksInfo( scope.row,scope.$index)">{{scope.row.mainTitle}}</el-link>
 						</template>
+					</el-table-column> 
+					<el-table-column prop="taskName" label="当前节点" min-width="100" show-overflow-tooltip> 
 					</el-table-column>
-					<el-table-column sortable prop="tagNames" label="标签" min-width="100" >
+					<el-table-column sortable prop="tagNames" label="标签" min-width="100" show-overflow-tooltip>
 						<template slot-scope="scope">
 							<el-tag v-for="tagName in (scope.row.tagNames?scope.row.tagNames.split(','):[])" :key="tagName">{{tagName}}</el-tag>
 						</template>
 					</el-table-column>
-					<el-table-column sortable prop="assigneeName" label="执行人" width="100" ></el-table-column>
-					<el-table-column sortable prop="startUsername" label="发起人" width="100"  ></el-table-column> 
-					<el-table-column sortable prop="startTime" label="发起时间" width="120" ></el-table-column> 
-					<el-table-column sortable prop="planFinishTime" label="到期时间" width="120"  ></el-table-column> 
-					<el-table-column sortable prop="startDeptName" label="发起部门" width="150"  ></el-table-column> 
-					<el-table-column sortable prop="suspensionState" label="状态" min-width="80"  :formatter="formatterSuspensionState"></el-table-column> 
+					<el-table-column sortable prop="assigneeName" label="执行人" width="100" show-overflow-tooltip></el-table-column>
+					<el-table-column sortable prop="startUsername" label="发起人" width="100"  show-overflow-tooltip></el-table-column> 
+					<el-table-column sortable prop="startTime" label="发起时间" width="120" show-overflow-tooltip></el-table-column> 
+					<el-table-column sortable prop="planFinishTime" label="到期时间" width="120"  show-overflow-tooltip></el-table-column> 
+					<el-table-column sortable prop="startDeptName" label="发起部门" width="150"  show-overflow-tooltip></el-table-column> 
+					<el-table-column  prop="suspensionState" label="状态" min-width="80"  :formatter="formatterSuspensionState"></el-table-column> 
 					<el-table-column label="操作" :width="screenWidth<500?80:160"  fixed="right">
 						<template slot-scope="scope">
 							<el-button  type="primary" @click="showTasksInfo( scope.row,scope.$index)">详情</el-button>  
@@ -275,7 +196,7 @@
 				</el-table>
 				
 				<el-pagination  layout="total,  prev,  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>
 			</el-col>
 			
 			<el-col v-if="showCalendar==true" :xs="24" :sm="24" :md="21" :lg="21" :xl="21">
@@ -400,9 +321,7 @@
 			fromStartTime.setTime(fromStartTime.getTime() - 3600 * 1000 * 24 * 7 * 4);
 			return {
 				filters: {
-					key: '',
-					otherParames:{},
-					allBtn:false,
+					key: '',  
 					procCategory:'', 
 					categoryTreeNodes:[], 
 					tags:[],  
@@ -410,6 +329,8 @@
 					planFinishTimeRanger:[],
 					assignee:null,//已选中人员
 					calendarDate:util.formatDate.format(toStartTime,'yyyy-MM-dd'),
+					filterType:'',
+					suspensionState:'',//1/2 激活、挂起
 				},
 				pickerOptions: {
 					shortcuts: [{
@@ -500,6 +421,7 @@
 				isBatchSetProcTags:false,
 				userSelectVisible:false,
 				showCalendar:true,
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -588,9 +510,21 @@
 				
 				if(this.filters.assignee!=null && this.filters.assignee.userid){
 					params.assignee=this.filters.assignee.userid 
+				} 
+				if(this.filters.filterType=='startUserId'){
+					params.startUserId=this.userInfo.userid
+				}
+				if(this.filters.filterType=='partake'){
+					params.partake=this.userInfo.userid
+				}
+				if(this.filters.filterType=='sponsors'){
+					params.sponsors='%'+this.userInfo.userid+'%'
 				}
-				if(this.filters.otherParames){
-					params=Object.assign(params,this.filters.otherParames);
+				if(this.filters.filterType=='monitors'){
+					params.monitors='%'+this.userInfo.userid+'%'
+				}
+				if(this.filters.suspensionState){
+					params.suspensionState=this.filters.suspensionState
 				}
 				params.tenantId=this.userInfo.branchId
 				this.listLoading = true;
@@ -715,67 +649,7 @@
 				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
 			},
 			/**begin 自定义函数请在下面加**/
-			
-			searchMyPartake(){
-				 this.pageInfo.pageNum=1;
-				 this.pageInfo.total=0;
-				 this.pageInfo.count=true;
-				 this.filters.allBtn=false;
-				 this.filters.otherParames={partake: this.userInfo.userid};
-				 this.getExecutions();
-			},
-			searchMyStart(){
-				 this.pageInfo.pageNum=1;
-				 this.pageInfo.total=0;
-				 this.pageInfo.count=true;
-				 this.filters.allBtn=false;
-				 this.filters.otherParames={startUserId: this.userInfo.userid};
-				 this.getExecutions();
-			},
-			searchMySponsors(){
-				 this.pageInfo.pageNum=1;
-				 this.pageInfo.total=0;
-				 this.pageInfo.count=true; 
-				 this.filters.allBtn=false;
-				 this.filters.otherParames={sponsors:'%'+this.userInfo.userid+'%'};
-				 this.getExecutions();
-			},
-			searchMyMonitors(){
-				 this.pageInfo.pageNum=1;
-				 this.pageInfo.total=0;
-				 this.pageInfo.count=true;
-				 this.filters.allBtn=false;
-				 this.filters.otherParames={monitors:'%'+this.userInfo.userid+'%'};
-				 this.getExecutions();
-			},
-			searchActivite(){
-				 this.pageInfo.pageNum=1;
-				 this.pageInfo.total=0;
-				 this.pageInfo.count=true;
-				  this.filters.allBtn=false;
-				 this.filters.otherParames=Object.assign(this.filters.otherParames,{suspensionState:1});
-				 this.getExecutions();
-			},
-			searchSuspend(){
-				 this.pageInfo.pageNum=1;
-				 this.pageInfo.total=0;
-				 this.pageInfo.count=true;
-				  this.filters.allBtn=false;
-				 this.filters.otherParames=Object.assign(this.filters.otherParames,{suspensionState:2});
-				 this.getExecutions();
-			} ,	
-			searchAll(){
-				 this.pageInfo.pageNum=1;
-				 this.pageInfo.total=0;
-				 this.pageInfo.count=true;
-				 this.filters.allBtn=true;
-				 if(this.isMyStart||this.isMyMonitors||this.isMySponsors||this.isMyPartake){
-					 this.filters.otherParames=Object.assign(this.filters.otherParames,{suspensionState:null});
-				 }else{
-					 this.filters.otherParames={};
-				 }
-				 this.searchExecutions();
-			} ,	 
+			 
 			handleFiltersTagClose:function(tag,paramsName){
 				if(paramsName=='key'){
 					this.filters.key=null;
@@ -1212,17 +1086,27 @@
 				this.showCalendar=false;
 			}
 			this.$nextTick(() => {
+				if(!this.showCalendar){
+					var clientRect=this.$refs.table.$el.getBoundingClientRect();
+					var subHeight=70/1000 * window.innerHeight; 
+					this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				}else{
+					var subHeight=70/1000 * window.innerHeight; 
+					this.tableHeight =  window.innerHeight-subHeight; 
+				}
+				
 				if(this.isMyStart){
-					this.searchMyStart();
+					this.filters.filterType="startUserId"
 				}else if(this.isMyMonitors){
-					this.searchMyMonitors();
+					this.filters.filterType="monitors"
 				}else if(this.isMySponsors){
-					this.searchMySponsors();
+					this.filters.filterType="sponsors"
 				}else if(this.isMyPartake){
-					this.searchMyPartake();
+					this.filters.filterType="partake"
 				}else if(this.isAll){
-					this.searchAll();
+					
 				}  
+				this.searchExecutions();
         	});
 			//加载下拉列表 如有需要去年注释
 			
@@ -1264,4 +1148,9 @@
 .more-filter-item button { 
 		margin: 2px 2px; 
 }
+  .more-label-font{
+  	text-align:center;
+  	float:left;
+  	padding-top:5px;
+  }
 </style>
\ No newline at end of file
diff --git a/src/views/mdp/workflow/ru/execution/ExecutionMngForFormData.vue b/src/views/mdp/workflow/ru/execution/ExecutionMngForFormData.vue
index cb12677f..fd0bd775 100644
--- a/src/views/mdp/workflow/ru/execution/ExecutionMngForFormData.vue
+++ b/src/views/mdp/workflow/ru/execution/ExecutionMngForFormData.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<sticky  :className="'sub-navbar draft'">  
+		<el-row  class="app-container">  
 			<el-row>
 			<el-col :xs="22" :sm="22" :md="23" :lg="23" :xl="23"> 
 				<el-col :xs="8" :sm="8" :md="14" :lg="16" :xl="16">
@@ -46,7 +46,7 @@
 				</el-drawer> 
 			</el-col>
 			</el-row>
-	    </sticky>  
+	    </el-row>  
 		<el-row class="app-container"> 
 			<el-col   :span="24" v-if="executions.length==0"> 
 				<el-button  type="primary"  v-if="executions.length==0" v-loading="listLoading"  v-on:click="startProc">还没有发起审核或者流程已结束，点击发起流程</el-button> 
diff --git a/src/views/mdp/workflow/ru/procinstParames/ProcinstNodeInfoSet.vue b/src/views/mdp/workflow/ru/procinstParames/ProcinstNodeInfoSet.vue
index 58839dca..fa27d707 100644
--- a/src/views/mdp/workflow/ru/procinstParames/ProcinstNodeInfoSet.vue
+++ b/src/views/mdp/workflow/ru/procinstParames/ProcinstNodeInfoSet.vue
@@ -1,10 +1,10 @@
 <template>
 	<section>
-		<el-row class="app-container">
-			<el-button @click="handleCancel">取消</el-button>
-			<el-button @click="confirm">确定</el-button>
+		<el-row>
+			<el-button @click="handleCancel" icon="el-icon-back">取消</el-button>
+			<el-button type="primary" @click="confirm" icon="el-icon-finished">确定</el-button>
 		</el-row>
-		<el-row class="app-container">  
+		<el-row style="padding-top:10px;">  
 			<!--新增界面 ProcinstParames 流程实例参数设置表-->   
 					  <el-table
 						:data="nodeInfoList"
@@ -23,8 +23,9 @@
 						min-width="250">
 							<template slot-scope="scope">
 								{{showAssigneeTips(scope.row)}} 
-								<el-button round v-if="scope.row.candidate=='1'" type="warning" @click.native="showCandidateSelectDialog(scope.row,'')" :loading="listLoading">选候选人</el-button> 
-								<el-button round v-if="scope.row.candidate!='1'" type="success" @click.native="showUserSelectDialog(scope.row,'')" :loading="listLoading">选人员</el-button>   
+								<el-button round v-if="scope.row.candidate=='1'  && scope.row.allowOverUser!='0'" type="warning" @click.native="showCandidateSelectDialog(scope.row,'')" :loading="listLoading">选候选人</el-button> 
+								<el-button  round v-if="scope.row.candidate!='1' && scope.row.allowOverUser!='0'" type="success" @click.native="showUserSelectDialog(scope.row,'')" :loading="listLoading">选人员</el-button>   
+								<el-button round v-if="scope.row.toCreater!='1'" type="primary" @click.native="setAssigneeAsStartUser(scope.row)">转发起人</el-button>  
 							</template>
 						</el-table-column>
 						<el-table-column
@@ -34,7 +35,7 @@
 						width="150">
 						
 							<template slot-scope="scope">
-								<el-checkbox v-model="scope.row.showNextAssignees" label="可手选" true-label="1" false-label="0" border></el-checkbox>   
+								<el-checkbox v-if="scope.row.allowOverUser!='0'" v-model="scope.row.showNextAssignees" label="可手选" true-label="1" false-label="0" border></el-checkbox>   
 							</template>
 						</el-table-column>
 						<el-table-column
@@ -42,7 +43,7 @@
 						label="候选任务"
 						width="120"> 
 							<template slot-scope="scope">
-								<el-checkbox v-model="scope.row.candidate" label="候选" true-label="1" false-label="0" border></el-checkbox>  
+								<el-checkbox v-if="scope.row.allowOverUser!='0'" v-model="scope.row.candidate" label="候选" true-label="1" false-label="0" border></el-checkbox>  
 							</template>
 						</el-table-column> 
 						
@@ -123,7 +124,7 @@
 		methods: {
 			// 取消按钮点击 父组件监听@cancel="addFormVisible=false" 监听
 			handleCancel:function(){
-				this.nodeInfoList=JSON.parse(JSON.stringify(this.nodeInfoListOld))
+				//this.nodeInfoList=JSON.parse(JSON.stringify(this.nodeInfoListOld))
 				this.$emit('cancel');
 			},
 			confirm:function(){
@@ -134,28 +135,38 @@
 				console.log("nodeInfo-----------"+JSON.stringify(nodeInfo));
 				 
 				this.nodeInfoSeleced.nodeUsers=nodeInfo.nodeUsers;
-				this.nodeInfoSeleced.groupIds=nodeInfo.groupIds
+				this.nodeInfoSeleced.groupIds=nodeInfo.groupIds 
+				this.nodeInfoSeleced.toCreater='0'
 
 			},
 			onUserSelected:function(users){
 				this.userSelectVisible=false; 
-				this.nodeInfoSeleced.nodeUsers=users 
+				this.nodeInfoSeleced.nodeUsers=users  
+				this.nodeInfoSeleced.toCreater='0'
 
 			},   
 			
 			showUserSelectDialog:function(nodeInfoSeleced,index){
-				console.log(nodeInfoSeleced);
+				if(nodeInfoSeleced.allowOverUser=='0'){
+					this.$message.error("当前节点不允许变更执行人")
+					return;
+				} 
 				this.userSelectVisible=true;
 				this.nodeInfoSeleced=nodeInfoSeleced;
 			},
 			showCandidateSelectDialog:function(nodeInfoSeleced,index){
-				console.log(nodeInfoSeleced);
+				if(nodeInfoSeleced.allowOverUser=='0'){
+					this.$message.error("当前节点不允许变更执行人")
+					return;
+				} 
 				this.candidateSelectVisible=true;
 				this.nodeInfoSeleced=nodeInfoSeleced;
 			},
 			showAssigneeTips(nodeInfo){
 				var tips=[];
-				if(nodeInfo.candidate=='1'){
+				if(nodeInfo.toCreater=='1'){
+					tips.push("流程发起人作为执行人")
+				}else if(nodeInfo.candidate=='1'){
 					if(nodeInfo.nodeUsers){
 						var userCount=nodeInfo.nodeUsers.length;
 						tips.push(userCount+"个候选用户");
@@ -164,15 +175,15 @@
 						var groupCount=nodeInfo.groupIds.split(",").length;
 						tips.push(groupCount+"个候选部门/岗位");
 					}
+					
 					if(tips.length==0){
 						tips.push("未配置任何候选人/候选部门/候选岗位");
 					}
 					
 				}else{
-					if(nodeInfo.nodeUsers){
- 
-							tips=tips.concat(nodeInfo.nodeUsers.map(i=>i.username)); 
-					}else{
+					if(nodeInfo.nodeUsers){ 
+						tips=tips.concat(nodeInfo.nodeUsers.map(i=>i.username)); 
+					}else{ 
 						tips.push("未配置任何任务执行人");
 					} 
 				}
@@ -225,7 +236,18 @@
 			showQxDialog:function(nodeInfo){
 				this.qxVisible=true;
 				this.nodeInfoSeleced=nodeInfo;
-			}, 
+			},
+			setAssigneeAsStartUser(nodeInfoSeleced){
+				if(nodeInfoSeleced.allowOverUser=='0'){
+					this.$message.error("当前节点不允许变更执行人")
+					return;
+				} 
+				this.nodeInfoSeleced=nodeInfoSeleced
+				this.nodeInfoSeleced.toCreater='1'
+				this.nodeInfoSeleced.candidate='0'
+				this.nodeInfoSeleced.showNextAssignees='0'
+				
+			}
 			  
 		},//end method
 		components: {  
diff --git a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue
index 4c79a313..2f4de0e5 100644
--- a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue
+++ b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue
@@ -1,35 +1,45 @@
 <template>
 	<section>
-		<sticky  :className="'sub-navbar draft'" style="margin-left:-20px;">   
+		<el-row   style="margin-left:-20px;">   
 			<el-row>
-				 <el-button    @click.native="handleCancel">取消</el-button>  
-				<el-button   v-if="screenWidth>=500"  @click.native="handlePrint" >打印</el-button>    
-				<el-button   v-if="isArchive"  @click.native="handleArchive" >归档</el-button> 
-				<el-button   v-if="task.taskId"   @click.native="addComment" :loading="addLoading">只存办理意见</el-button>  
-				<el-button   @click.native="tagSelectVisible=true" :loading="tagSetLoading">打标签</el-button> 
-				<el-button v-if="displayDiagram==false" @click="showDiagram()">查看流程图</el-button>   
-				<el-button @click="showNodeInfoDialog">配置审批人</el-button>
-				<el-button   @click="showComment=!showComment">{{showComment==false?"显示流转信息":"隐藏流转信息"}}</el-button>
-				<el-button   @click="showMainContext=!showMainContext">{{showMainContext==false?"显示正文":"隐藏正文"}}</el-button>
-				<el-button   @click="showMainContextOnly=!showMainContextOnly">{{showMainContextOnly==false?"只看正文":"显示全部"}}</el-button>
-							<el-popover 
-								placement="top"
-								width="600"
-								trigger="click"
-								v-model="modelFilesVisible"> 
-								<div v-if="modelFilesVisible==true" style="text-align: right; margin: 0"> 
-									 <attachment-upload  :branch-id="userInfo.branchId" :deptid="userInfo.deptid" :archive-id="procDefId" :category-id="taskInfo.categoryId"></attachment-upload>
-								</div> 
-								<el-button slot="reference"     class="hidden-sm-and-down"  v-on:click="modelFilesVisible=!modelFilesVisible">附件模板</el-button>
-							</el-popover>
+				<el-button  type="text"  @click.native="handleCancel" icon="el-icon-back">取消</el-button>  
+				<el-button   type="text"  v-if="screenWidth>=500"  @click.native="handlePrint" icon="el-icon-printer">打印</el-button>    
+				<el-button   type="text"  v-if="isArchive"  @click.native="handleArchive"  icon="el-icon-s-grid">归档</el-button> 
+				<el-button   type="text"  v-if="task.taskId"   @click.native="addComment" :loading="addLoading" icon="el-icon-finished">只存办理意见</el-button>  
+				<el-button  type="text"   @click.native="tagSelectVisible=true" :loading="tagSetLoading"  icon="el-icon-finished">打标签</el-button> 
+				<el-button  type="text" v-if="displayDiagram==false" @click="showDiagram()" icon="el-icon-picture-outline">查看流程图</el-button>   
+				<el-button  type="text"  @click="showNodeInfoDialog"  icon="el-icon-s-check">配置审批人</el-button>
+				<el-button   type="text"  @click="showComment=!showComment"  icon="el-icon-document">{{showComment==false?"显示流转信息":"隐藏流转信息"}}</el-button>
+				<el-button   type="text"  @click="showMainContext=!showMainContext"  icon="el-icon-document" class=" hidden-md-and-down">{{showMainContext==false?"显示正文":"隐藏正文"}}</el-button>
+				<el-button   type="text"  @click="showMainContextOnly=!showMainContextOnly"  icon="el-icon-finished" class=" hidden-sm-and-down">{{showMainContextOnly==false?"只看正文":"显示全部"}}</el-button>
+				<el-popover 
+					placement="top"
+					width="600"
+					trigger="click"
+					v-model="modelFilesVisible"> 
+					<div v-if="modelFilesVisible==true" style="text-align: right; margin: 0"> 
+							<attachment-upload  :branch-id="userInfo.branchId" :deptid="userInfo.deptid" :archive-id="procDefId" :category-id="taskInfo.categoryId"></attachment-upload>
+					</div> 
+					<el-button slot="reference"   type="text"    class="hidden-sm-and-down"  v-on:click="modelFilesVisible=!modelFilesVisible"  icon="el-icon-document-copy">附件模板</el-button>
+				</el-popover>				
+				<el-popover 
+					placement="top"
+					width="600"
+					trigger="click"
+					v-model="modelFilesVisible"> 
+					<div v-if="modelFilesVisible==true" style="text-align: right; margin: 0"> 
+							<attachment-upload  :branch-id="userInfo.branchId" :deptid="userInfo.deptid" :archive-id="taskInfo.paramsId" :category-id="taskInfo.categoryId"></attachment-upload>
+					</div> 
+					<el-button slot="reference"   type="text"    class="hidden-sm-and-down"  v-on:click="modelFilesVisible=!modelFilesVisible"  icon="el-icon-document-copy">流程附件</el-button>
+				</el-popover>
 			</el-row>
-	    </sticky>
+	    </el-row>
 		<el-row v-show="showMainContextOnly==true">
 			<div style="padding: 20px;" v-html="addForm.mainContext"></div>
 		</el-row>
 		<el-row v-show="showMainContextOnly==false">
 			 
-			<el-col> 
+			<el-row> 
 			    <!--新增界面 ProcinstParames 流程实例参数设置表-->  
 					<el-form :model="addForm"  :label-width="labelWidth()" label-position="left" :rules="addFormRules" ref="addForm" > 
 						<el-row class=" hidden-sm-and-down">
@@ -38,10 +48,8 @@
 						<el-row class="hidden-md-and-up">
 							<el-col class="wf-sub-title"> {{addForm.mainTitle}}</el-col> 
 						</el-row> 
-						<el-row class="hidden-sm-and-down"> 
-							<el-col :span="20" class="wf-sub-title">   <el-tag>发起部门: {{addForm.startDeptName}}</el-tag>  <el-tag>发起人: {{addForm.startUsername}}</el-tag> <el-tag>发起时间：{{addForm.startDate}}</el-tag></el-col>  
-						</el-row>  
-						<el-form-item label="标签">  
+						<el-row> 
+							<el-col :span="24" class="wf-sub-title">  
 								<font  v-if="addForm.tagNames" >
 								<el-tag v-for="tag in (addForm.tagNames.split(','))" :key="tag"
 									:type="'warning'"
@@ -49,47 +57,123 @@
 									{{tag}}
 								</el-tag>
 								</font>
-								 {{addForm.tagNames?'':'还没有标签，去打一个呗-->'}}
-								 <el-button   @click.native="tagSelectVisible=true" :loading="tagSetLoading">打标签</el-button> 
-								<el-button v-if="displayDiagram==false" @click="showDiagram()">查看流程图</el-button>  
-						</el-form-item>  
-						<el-form-item label="计划完成时间" prop="planFinishTime">  
-							<el-col   :span="10">
-								<el-date-picker style="width:100%;"
+								 发起部门: {{addForm.startDeptName}} &nbsp;&nbsp;&nbsp;
+								  由&nbsp;{{addForm.startUsername}}&nbsp;于&nbsp;
+								 {{addForm.startDate}} &nbsp;发起
+								 </el-col>   
+						</el-row>   
+						<el-row>   
+								预计
+								<el-date-picker style="width:20%;"
 									v-model="addForm.planFinishTime"
 									type="date" value-format="yyyy-MM-dd HH:mm:ss" 
 									:picker-options="pickerOptions"
 									placeholder="选择计划完成日期" >
 								</el-date-picker>
-							</el-col>  <el-button   @click.native="updateFlowPlanFinishTime" :loading="addLoading">保存计划</el-button> <font style="margin-left:5px;"></font>
-						</el-form-item> 
-						<el-form-item label="发起部门" class="hidden-md-and-up"> 
-							<el-col :span="20">  {{addForm.startDeptName}}</el-col>
-							<el-col :span="4"> 
-								<el-button v-if="displayDiagram==false" @click="showDiagram()">查看流程图</el-button> 
-							</el-col>
-						</el-form-item> 
-						<el-form-item label="发起人"  class="hidden-md-and-up">  
-								{{addForm.startUsername}}  {{addForm.startDate}} 
-						</el-form-item>
-						<el-col :span="24">
-							<el-col :span="12">
-							<el-form-item label="主办人" prop="sponsors" > 
-									<el-select disabled   value-key="userid" style="width:99%"  v-model="sponsors" multiple placeholder="请选择">
+								完成  <el-button   @click.native="updateFlowPlanFinishTime" :loading="addLoading" icon="el-icon-finished">保存日期</el-button>  
+
+										主办人：
+										<el-select disabled   value-key="userid"    v-model="sponsors" multiple placeholder="请选择">
+											<el-option
+											v-for="item in baseUserList"
+											:key="item.userid"
+											:label="item.username"
+											:value="item">
+											<span style="float: left">{{ item.username }}</span>
+											<span style="float: right; color: #8492a6; font-size: 14px">{{ item.shortName }}</span>
+											</el-option>
+										</el-select> 
+										<font class=" hidden-md-and-down">
+											监控人：
+											<el-select disabled   value-key="userid"   v-model="monitors" multiple placeholder="请选择">
+												<el-option
+												v-for="item in baseUserList"
+												:key="item.userid"
+												:label="item.username"
+												:value="item">
+												<span style="float: left">{{ item.username }}</span>
+												<span style="float: right; color: #8492a6; font-size: 13px">{{ item.shortName }}</span>
+												</el-option>
+											</el-select> 
+										</font>
+						</el-row>   
+						<el-row  v-if="addForm.isRefForm=='1' && addForm.formId && addForm.formShowType!='table'" style="padding-top:10px;">
+							<form-data-mng-for-flow-form :formShowType="addForm.formShowType"  :companyDepts="companyDepts" :companyEmployees="companyEmployees" :formId="addForm.formId"  :qxCode="qxCode"  :procInstId="procInstId" :flowStartUserid="addForm.userid" :submitEvent="formDataSubmitEvent" @submit="startSubmit"><div></div></form-data-mng-for-flow-form> 
+						</el-row>
+						<el-row  v-if="actAssignee&&actAssignee.formId?true:false"  style="padding-top:10px;">
+							<form-data-for-flow-node :visible="actAssignee&&actAssignee.formId?true:false" :form-id="actAssignee.formId" :form-fields-json="actAssignee.formFieldsJson"  :submit-event="formDataSubmitEvent" @submit="startSubmit"><div></div></form-data-for-flow-node> 
+						</el-row>						
+
+						<el-row  v-if="addForm.mainContext && addForm.mainContext.length>0 && showMainContext"> 
+								<div  class="wf-main-context-box" v-if="screenWidth>=500">
+									<div style="padding: 20px;" class="wf-main-context" v-html="addForm.mainContext"></div>
+								</div>  
+							<div   class="wf-main-context-box" v-if="screenWidth<500">
+									<div style="padding: 20px;" v-html="addForm.mainContext"></div>
+							</div> 
+						</el-row>   
+						<el-row>
+							<comment-step :task="task"  :procInstId="procInstId" :refresh="refreshCommentList"   @get-comments="getComments"></comment-step>  
+						</el-row> 
+						<div v-if="task.taskId"> 
+							<el-form-item :label="'办理意见'" prop="commentMsg">
+								<el-row class=" hidden-md-and-down" style="padding-top:10px;">
+									<el-radio-group v-model="task.action">
+										<div v-if="task.action!='claim'">
+											<el-radio min-width="60px" v-show="taskInfo && taskInfo.delegation!='PENDING'" label="agree">同意&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
+											<el-radio v-show="taskInfo && taskInfo.delegation!='PENDING'" label="disAgree">不同意&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
+											<el-radio label="rejectToActivity">驳回&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
+											<el-radio label="sponsors">转主办&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
+											<el-radio label="rejectToStartUser">转发起人</el-radio>
+											<el-radio v-show="taskInfo && taskInfo.delegation!='RESOLVED'" label="transfer">请人代办</el-radio>
+											<el-radio label="delegate">请人协办,完成后返回给我</el-radio>
+											<el-radio v-show="taskInfo && taskInfo.delegation!='RESOLVED' && taskInfo.delegation=='PENDING'" label="resolve">返回给原执行人</el-radio>
+											<el-radio label="over">结束流程</el-radio>
+										</div>
+										<div v-else>
+											<el-radio label="claim">领取任务</el-radio>
+										</div>
+									</el-radio-group>
+								</el-row>
+								<el-row class=" hidden-lg-and-up" style="padding-top:10px;"> 
+									<el-select   v-model="task.action" placeholder="请选择办理意见" >
+										<div v-if="task.action!='claim'">
+											<el-option  v-show="taskInfo && taskInfo.delegation!='PENDING'" label="同意" value="agree">  </el-option>
+											<el-option  v-show="taskInfo && taskInfo.delegation!='PENDING'" label="不同意" value="disAgree">  </el-option>
+											<el-option  label="驳回" value="rejectToActivity">  </el-option>
+											<el-option label="转主办" value="sponsors">  </el-option>
+											<el-option   label="转发起人" value="rejectToStartUser">  </el-option>
+											<el-option  v-show="taskInfo && taskInfo.delegation!='RESOLVED'" label="请人代办" value="transfer">  </el-option>
+											<el-option   label="请人协办,完成后返回给我" value="delegate">  </el-option>
+											<el-option v-show="taskInfo && taskInfo.delegation!='RESOLVED' && taskInfo.delegation=='PENDING'"  label="返回给原执行人" value="resolve">  </el-option>
+											<el-option label="结束流程" value="over">  </el-option>
+										</div>
+										<div v-else>
+											<el-radio label="claim">领取任务</el-radio>
+										</div>
+									</el-select> 
+								</el-row>
+								<el-row style="padding-top:10px;">
+									<el-input  type="textarea" :rows="3" v-model="task.commentMsg" auto-complete="off" ></el-input>
+								</el-row> 
+							</el-form-item>   
+							<el-form-item v-show="task.action=='rejectToActivity'" label="驳回节点" prop="rejectToActivity"> 
+								<el-col :span="10">
+									<el-select   style="width:100%" value-key="taskId" v-model="task.rejectActivity" @change="rejectToActivitySelectChange" placeholder="请选择">
 									<el-option
-									v-for="item in baseUserList"
-									:key="item.userid"
-									:label="item.username"
+									v-for="item in comments"
+									:key="item.taskId"
+									:label="item.name"
 									:value="item">
-									<span style="float: left">{{ item.username }}</span>
-									<span style="float: right; color: #8492a6; font-size: 14px">{{ item.shortName }}</span>
+									<span style="float: left">{{ item.name }}</span>
+									<span style="float: right; color: #8492a6; font-size: 13px">{{ item.username }}-{{item.message}}</span>
 									</el-option>
-								</el-select> 
-							</el-form-item>  
-							</el-col>
-							<el-col :span="12">
-							<el-form-item label="监控人" prop="monitors" > 
-								<el-select disabled   value-key="userid" style="width:99%" v-model="monitors" multiple placeholder="请选择">
+								</el-select>
+								</el-col>
+							</el-form-item> 
+							<el-form-item v-show="task.action=='transfer'||task.action=='delegate'||needAssignee!=''||(actAssignee&&actAssignee.showNextAssignees=='1')"  :label="nextAssigneeListLabel" prop="needAssignee"> 
+								<el-col :xs="24" :sm="18" :md="16" :lg="14" :xl="12">
+									<el-select    value-key="userid" style="width:80%" v-model="task.nextAssigneeList" multiple @change="nextAssigneeListSelectChange"  placeholder="如果不选则系统自动判断">
 									<el-option
 									v-for="item in baseUserList"
 									:key="item.userid"
@@ -98,94 +182,12 @@
 									<span style="float: left">{{ item.username }}</span>
 									<span style="float: right; color: #8492a6; font-size: 13px">{{ item.shortName }}</span>
 									</el-option>
-								</el-select> 
-							</el-form-item>  
-							</el-col>
-						</el-col>
-						<el-col :span="24" v-if="addForm.isRefForm=='1' && addForm.formId && addForm.formShowType!='table'">
-						<form-data-mng-for-flow-form :formShowType="addForm.formShowType"  :companyDepts="companyDepts" :companyEmployees="companyEmployees" :formId="addForm.formId"  :qxCode="qxCode"  :procInstId="procInstId" :flowStartUserid="addForm.userid" :submitEvent="formDataSubmitEvent" @submit="startSubmit"><div></div></form-data-mng-for-flow-form> 
-						</el-col>
-						<el-col :span="24" v-if="actAssignee&&actAssignee.formId?true:false" >
-							<form-data-for-flow-node :visible="actAssignee&&actAssignee.formId?true:false" :form-id="actAssignee.formId" :form-fields-json="actAssignee.formFieldsJson"  :submit-event="formDataSubmitEvent" @submit="startSubmit"><div></div></form-data-for-flow-node> 
-						</el-col>						
-
-						<el-col :span="24" v-if="addForm.mainContext && addForm.mainContext.length>0 && showMainContext">
-							<el-form-item label="流程正文" prop="mainContext" v-loading="listLoading" >
-								<div  style="border:1px dashed #000" v-if="screenWidth>=500">
-									<div style="padding: 20px;" class="wf-main-context" v-html="addForm.mainContext"></div>
-								</div> 
-							</el-form-item>  
-							<div  style="border:1px dashed #000" v-if="screenWidth<500">
-									<div style="padding: 20px;" v-html="addForm.mainContext"></div>
-							</div> 
-						</el-col> 
-						<el-form-item label="流程附件" prop="attachment">
-							<el-button @click="showAttachment=!showAttachment">{{showAttachment==true?"隐藏附件":"显示附件"}}</el-button>
-							<el-col v-if="showAttachment" :span="24">
-							<el-col :xs="20" :sm="18" :md="16" :lg="14" :xl="12"><attachment-upload :branch-id="userInfo.branchId" :deptid="userInfo.deptid" :archive-id="taskInfo.paramsId" :category-id="taskInfo.categoryId"></attachment-upload></el-col>
-							</el-col>
-						</el-form-item> 
-						<el-form-item v-show="showComment" label="流转信息" prop="commentMsg">
-								<comment-step v-if="screenWidth>=500" :procInstId="procInstId" :refresh="refreshCommentList"   @get-comments="getComments"></comment-step>
-						</el-form-item>
-						<comment-step v-if="screenWidth<500" :procInstId="procInstId" :refresh="refreshCommentList"  @get-comments="getComments"></comment-step>
-
-						<div v-if="task.taskId">
-						<el-form-item label="当前任务" prop="commentMsg">
-							 <el-tag>{{task.taskName}} </el-tag>  办理人<el-tag>{{  task.assigneeName? task.assigneeName:'待候选人领取' }}</el-tag>
-						</el-form-item>
-						<el-form-item :label="'办理意见'" prop="commentMsg">
-							<el-input  type="textarea" :rows="3" v-model="task.commentMsg" auto-complete="off" ></el-input>
-						</el-form-item>  
-						<el-form-item  label="下一操作" prop="action">
-							 <el-radio-group v-model="task.action">
-								<div v-if="task.action!='claim'">
-									<el-radio min-width="60px" v-show="taskInfo && taskInfo.delegation!='PENDING'" label="agree">同意&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
-									<el-radio v-show="taskInfo && taskInfo.delegation!='PENDING'" label="disAgree">不同意&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
-									<el-radio label="rejectToActivity">驳回&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
-									<el-radio label="sponsors">转主办&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
-									<el-radio label="rejectToStartUser">转发起人</el-radio>
-									<el-radio v-show="taskInfo && taskInfo.delegation!='RESOLVED'" label="transfer">请人代办</el-radio>
-									<el-radio label="delegate">请人协办,完成后返回给我</el-radio>
-									<el-radio v-show="taskInfo && taskInfo.delegation!='RESOLVED' && taskInfo.delegation=='PENDING'" label="resolve">返回给原执行人</el-radio>
-									<el-radio label="over">结束流程</el-radio>
-							    </div>
-								<div v-else>
-									<el-radio label="claim">领取任务</el-radio>
-								</div>
-							  </el-radio-group>
-						</el-form-item> 
-						<el-form-item v-show="task.action=='rejectToActivity'" label="驳回节点" prop="rejectToActivity"> 
-							<el-col :span="10">
-								<el-select   style="width:100%" value-key="taskId" v-model="task.rejectActivity" @change="rejectToActivitySelectChange" placeholder="请选择">
-							     <el-option
-							      v-for="item in comments"
-							      :key="item.taskId"
-							      :label="item.name"
-							      :value="item">
-							      <span style="float: left">{{ item.name }}</span>
-		     					  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.username }}-{{item.message}}</span>
-							    </el-option>
-							  </el-select>
-							</el-col>
-						</el-form-item> 
-						<el-form-item v-show="task.action=='transfer'||task.action=='delegate'||needAssignee!=''||(actAssignee&&actAssignee.showNextAssignees=='1')"  :label="nextAssigneeListLabel" prop="needAssignee"> 
-							<el-col :xs="24" :sm="18" :md="16" :lg="14" :xl="12">
-								<el-select    value-key="userid" style="width:80%" v-model="task.nextAssigneeList" multiple @change="nextAssigneeListSelectChange"  placeholder="如果不选则系统自动判断">
-							     <el-option
-							      v-for="item in baseUserList"
-							      :key="item.userid"
-							      :label="item.username"
-							      :value="item">
-							      <span style="float: left">{{ item.username }}</span>
-		     					  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.shortName }}</span>
-							    </el-option>
-							  </el-select>
-							  <el-button   @click.native="showCommonUserSelectDialog" :loading="addLoading">更多人员</el-button>  
-							</el-col>
-						</el-form-item> 
+								</el-select>
+								<el-button   @click.native="showCommonUserSelectDialog" :loading="addLoading">更多人员</el-button>  
+								</el-col>
+							</el-form-item> 
 						</div> 
-						<el-row v-if="screenWidth<500" v-loading="listLoading">
+						<el-row v-if="screenWidth<500" v-loading="listLoading" style="padding-top:10px;">
 							<el-col :span="24">
 									<el-button    @click.native="handleCancel">取消</el-button>  
 									<el-button  v-if="screenWidth>=500"  @click.native="handlePrint" >打印</el-button>    
@@ -196,17 +198,17 @@
 									<el-button  v-if="task.action=='claim' && task.taskId  && sponsors.some(i=>i.userid==userInfo.userid)"  @click.native="addCandidateUsers" :loading="addLoading">添加候选人</el-button> 
 							</el-col>
 						</el-row>  
-						<el-form-item v-if="screenWidth>=500" v-loading="listLoading">
-									<el-button    @click.native="handleCancel">取消</el-button>  
-									<el-button   v-if="screenWidth>=500"  @click.native="handlePrint" >打印</el-button>    
-									<el-button   v-if="isArchive"  @click.native="handleArchive" >归档</el-button> 
-									<el-button   v-if="task.taskId"   @click.native="addComment" :loading="addLoading">只存办理意见</el-button>  
-									<el-button   v-if="task.action!='claim' && task.taskId" type="primary" @click.native="completeHandle" :loading="addLoading">提交任务</el-button>  
-									<el-button  v-if="task.action=='claim' && task.taskId"  @click.native="completeHandle" :loading="addLoading">领取任务</el-button>  
-									<el-button  v-if="task.action=='claim' && task.taskId  && sponsors.some(i=>i.userid==userInfo.userid)"  @click.native="showTaskCandidateSet" :loading="addLoading">添加候选人</el-button> 
+						<el-form-item v-if="screenWidth>=500" v-loading="listLoading" style="padding-top:10px;">
+									<el-button    @click.native="handleCancel" icon="el-icon-back">取消</el-button>  
+									<el-button   v-if="screenWidth>=500"  @click.native="handlePrint" icon="el-icon-printer">打印</el-button>    
+									<el-button   v-if="isArchive"  @click.native="handleArchive" icon="el-icon-s-grid">归档</el-button> 
+									<el-button   v-if="task.taskId"   @click.native="addComment" :loading="addLoading" icon="el-icon-finished">只存办理意见</el-button>  
+									<el-button   v-if="task.action!='claim' && task.taskId" type="primary" @click.native="completeHandle" :loading="addLoading"  icon="el-icon-finished">提交任务</el-button>  
+									<el-button  v-if="task.action=='claim' && task.taskId"  @click.native="completeHandle" :loading="addLoading"  icon="el-icon-finished">领取任务</el-button>  
+									<el-button  v-if="task.action=='claim' && task.taskId  && sponsors.some(i=>i.userid==userInfo.userid)"  @click.native="showTaskCandidateSet" :loading="addLoading"  icon="el-icon-s-check">添加候选人</el-button> 
 						</el-form-item>  
 					</el-form> 
-			</el-col>
+			</el-row>
 			<el-dialog 
 				title="流程图"
 				:visible.sync="displayDiagram"
@@ -1119,16 +1121,19 @@
 .wf-title {
 	text-align: center;
 	font: outline;
-	font-size:2.5em;
-	margin-top: 0.875em;
+	font-size:2.5em; 
 }
 .wf-sub-title {
 	text-align: center;
-	font: outline;
-	font-size:1.875em;
+	font: outline; 
 	margin-top: 0.875em;
 	margin-bottom: 0.875em;
 }  
+ .wf-main-context-box {  
+	border:1px dashed #000;
+	margin-bottom: 10px;
+	margin-top: 10px; 
+}
  .wf-main-context p { 
 	color: #585858;  
 }
diff --git a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSetRoute.vue b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSetRoute.vue
index 741aac45..86764b8e 100644
--- a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSetRoute.vue
+++ b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSetRoute.vue
@@ -26,13 +26,30 @@
 		},//end data
 		methods: {
 			 afterEditSubmit:function(){
+				 var key='ProcinstParamesExecutionSetRoute'
+				 localStorage.removeItem(key)
 				 this.$store.dispatch('delVisitedViews', {path:'/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSetRoute',name:'ProcinstParamesExecutionSetRoute'})
 				 
 			 },
 			 handleCancel:function(){
-				 
+				 var key='ProcinstParamesExecutionSetRoute'
+				 localStorage.removeItem(key)
 				this.$store.dispatch('delVisitedViews', {path:'/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSetRoute',name:'ProcinstParamesExecutionSetRoute'})
 			 	 this.$router.back(-1)
+			 },
+			 initData(){
+				 this.$nextTick(()=>{
+					var key='ProcinstParamesExecutionSetRoute'
+					if(this.$route.params && this.$route.params.taskInfo){
+						this.editFormVisible=true;
+						this.taskInfo=this.$route.params.taskInfo
+						localStorage.setItem(key,JSON.stringify(this.taskInfo))
+					}else{
+						var taskInfoStr=localStorage.getItem(key)
+						this.editFormVisible=true;
+						this.taskInfo=JSON.parse(taskInfoStr);
+					}
+				}) 
 			 }
 			
 		},//end methods
@@ -40,13 +57,11 @@
 		   ProcinstParamesExecutionSet
 		    //在下面添加其它组件
 		},
-		mounted() {
-			if(this.$route.params){
-				this.editFormVisible=true;
-				 this.taskInfo=this.$route.params.taskInfo
-			}
-			
-			 
+		activated(){
+			this.initData();
+		},
+		mounted() { 
+			this.initData();
 		}
 	}
 
diff --git a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue
index 3d55dfc7..688db879 100644
--- a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue
+++ b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue
@@ -119,8 +119,8 @@
 					</el-col>
 				</el-form-item> 
 				<el-form-item> 
-							<el-button @click.native="handleCancel">取消</el-button>  
-							<el-button type="primary" @click.native="startHandle" :loading="addLoading">发起流程</el-button>   
+							<el-button @click.native="handleCancel" icon="el-icon-back">取消</el-button>  
+							<el-button type="primary" @click.native="startHandle" :loading="addLoading" icon="el-icon-finished">发起流程</el-button>   
 				</el-form-item> 
 			</el-form> 
 			</el-col>
@@ -134,8 +134,9 @@
 			<el-dialog append-to-body
 				title="配置审批人"
 				:visible.sync="nodeInfoVisible"
-				width="60%"> 
-				<procinst-node-info-set   :node-infos="nodeInfos"   :visible="nodeInfoVisible"   @cancel="onMainQxCancel"   @confirm="onNodeInfosConfirm"></procinst-node-info-set> 
+				fullscreen
+				> 
+				<procinst-node-info-set   :node-infos="nodeInfos"   :visible="nodeInfoVisible"   @cancel="onNodeInfosCancel"   @confirm="onNodeInfosConfirm"></procinst-node-info-set> 
 			</el-dialog>
 			<el-dialog
 				title="流程图"
@@ -548,6 +549,9 @@
 				this.mainQxVisible=false;
 				this.addForm.mainQx=qxCode;
 			},
+			onNodeInfosCancel(){
+				this.nodeInfoVisible=false;
+			},
 			onNodeInfosConfirm:function(nodeInfos){
 				this.nodeInfoVisible=false;
 				this.nodeInfos=nodeInfos
diff --git a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSetRoute.vue b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSetRoute.vue
index 344202a0..e139e378 100644
--- a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSetRoute.vue
+++ b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSetRoute.vue
@@ -43,13 +43,22 @@
 		    //在下面添加其它组件
 		},
 		mounted() {
-			console.log("this.$route.params-------------------"+JSON.stringify(this.$route.params));
-			if(this.$route.params){
+			var key="ProcinstParamesStartSetRoute"
+			if(this.$route.params.procdef){
 				this.flowStartVisible=true;
 				 this.procdef=this.$route.params.procdef
 				 if(this.$route.params.params){
 					 this.filters.params=this.$route.params.params
 				 }
+				 localStorage.setItem(key,JSON.stringify(this.$route.params));
+			}else{
+				var paramsStr= localStorage.getItem(key);
+				var params=JSON.parse(paramsStr);
+				this.procdef=params.procdef
+				if(params.params){
+					this.filters.params=params.params
+				} 
+
 			}
 			
 			 
diff --git a/src/views/mdp/workflow/ru/task/TaskMng.vue b/src/views/mdp/workflow/ru/task/TaskMng.vue
index 00a87834..a8118e00 100644
--- a/src/views/mdp/workflow/ru/task/TaskMng.vue
+++ b/src/views/mdp/workflow/ru/task/TaskMng.vue
@@ -1,86 +1,25 @@
 <template>
-  <section>
-    <sticky :className="'sub-navbar draft'">
-      <el-row>
-        <el-col :xs="22" :sm="22" :md="23" :lg="23" :xl="23">
-          <el-col :xs="8" :sm="8" :md="5" :lg="4" :xl="4">
-            <el-input v-model="filters.key" style="width:100%;" placeholder="模糊查询"></el-input>
-          </el-col>
-          <el-col :xs="8" :sm="8" :md="5" :lg="4" :xl="4">
-            <el-select
-              v-model="filters.procCategory"
-              style="width:99%;"
-              clearable
-              filterable
-              placeholder="流程分类"
-            >
-              <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
-            </el-select>
-          </el-col>
-          <el-col :xs="8" :sm="8" :md="14" :lg="16" :xl="16">
-            <el-button
-              v-show="assigneeToMe!==false"
-              :type="filters.taskType=='0'?'success':''"
-              v-on:click="searchAssigneeToMeTasks"
-            >已领取</el-button>
-            <el-button
-              v-show="assigneeToMe!==false"
-              :type="filters.taskType=='1'?'success':''"
-              v-on:click="searchMyCandidateUserTasks"
-            >待领取</el-button>
-
-            <el-button @click.native="showTagSelect(false)">标签查找</el-button>
-            <el-button @click.native="showTagSelect(true)">打标签</el-button>
-            <el-button type="primary" @click="handleDownload">导出数据</el-button>
-            <el-select
-              v-show="assigneeToMe===false && filters.taskType=='0'"
-              class="hidden-sm-and-down"
-              v-model="filters.assignee"
-              clearable
-              filterable
-              placeholder="请选择用户"
-            >
-              <el-option
-                v-for="item in companyEmployees"
-                :key="item.userid"
-                :label="item.username"
-                :value="item.userid"
-              >
-                <span style="float: left">{{ item.username }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.shortName }}</span>
-              </el-option>
-            </el-select>
-            <el-select
-              v-show="assigneeToMe===false && filters.taskType=='1'"
-              v-model="filters.candidateUser"
-              class="hidden-sm-and-down"
-              clearable
-              filterable
-              placeholder="请选择用户"
-            >
-              <el-option
-                v-for="item in companyEmployees"
-                :key="item.userid"
-                :label="item.username"
-                :value="item.userid"
-              >
-                <span style="float: left">{{ item.username }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.shortName }}</span>
-              </el-option>
-            </el-select>
-            <el-button
-              v-show="assigneeToMe===false"
-              :type="filters.taskType=='0'?'success':''"
-              v-on:click="searchAssigneeToAnyTasks"
-            >已领取</el-button>
-
-            <el-button
-              v-show="assigneeToMe===false"
-              :type="filters.taskType=='1'?'success':''"
-              class="hidden-sm-and-down"
-              v-on:click="searchAnyCandidateUserTasks"
-            >待领取</el-button>
-
+  <section> 
+    <el-row class="app-container">
+      <el-col :xs="4" :sm="4" :md="3" :lg="3" :xl="3" class="hidden-sm-and-down">
+        <category-tree
+          ref="categoryTree"
+          multiple
+          :expandOnClickNode="false"
+          :defaultExpandAll="true"
+          show-checkbox
+          :current-key="addForm.categoryId"
+          v-on:check-change="handleCategoryCheckChange"
+        ></category-tree>
+      </el-col>
+      <el-col :xs="24" :sm="24" :md="21" :lg="21" :xl="21">
+        <el-row>  
+            <el-button @click.native="showTagSelect(false)">标签 </el-button> 
+            <el-input v-model="filters.key" style="width:30%;" placeholder="模糊查询">
+              <template slot="append">
+                <el-button @click="searchAssigneeToMeTasks" icon="el-icon-search">查询</el-button>  
+              </template> 
+            </el-input>  
             <el-popover placement="top" width="375" trigger="manual" v-model="weixinContentVisible">
               <p>{{weixinContent}}</p>
               <div style="text-align: right; margin: 0">
@@ -104,27 +43,40 @@
               v-show="assigneeToMe===false"
               class="hidden-sm-and-down"
               v-on:click="showOaMsg"
-            >OAMSG催办</el-button>
-          </el-col>
-        </el-col>
-        <el-col :xs="2" :sm="2" :md="1" :lg="1" :xl="1">
+            >OAMSG催办</el-button> 
           <el-button @click="drawer = true" type="text">更多</el-button>
           <el-drawer title="更多查询条件" :visible.sync="drawer" :with-header="false" append-to-body>
-            <el-row class="more-filter-item">
-              <el-button
-                v-show="assigneeToMe!==false"
-                :type="filters.taskType=='0'?'success':''"
-                v-on:click="searchAssigneeToMeTasks"
-              >已领取</el-button>
-              <el-button
-                v-show="assigneeToMe!==false"
-                :type="filters.taskType=='1'?'success':''"
-                v-on:click="searchMyCandidateUserTasks"
-              >待领取</el-button>
-
-              <el-button @click.native="showTagSelect(false)">标签查找</el-button>
-              <el-button @click.native="showTagSelect(true)">打标签</el-button>
-			  <el-button type="primary" @click="handleDownload">导出数据</el-button>
+            <el-row class="more-filter-item"> 
+              <el-col :span="24">
+                 <el-select
+                    v-model="filters.procCategory"
+                    style="width:99%;"
+                    clearable
+                    filterable
+                    placeholder="流程分类"
+                  >
+                    <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
+                  </el-select>
+              </el-col>
+              
+							<el-col :span="24">
+								<font class="more-label-font">
+									标签查找：
+								</font> 
+								<el-row v-show="filters.tags && filters.tags.length>0">
+									<el-tag  
+										:key="tag.tagId"
+										v-for="tag in filters.tags"
+										:type="''"
+										closable
+										:disable-transitions="false"
+										@click="showTagSelect(false)"
+										@close="handleFiltersTagClose(tag,'tags')">
+										{{tag.tagName}}
+									</el-tag>
+								</el-row>
+								<el-button v-if="filters.tags==null || filters.tags.length==0"  size="mini"   @click.native="showTagSelect(false)">选择标签</el-button>
+							</el-col>
               <el-col :span="24">
                 开始日期：
                 <el-date-picker
@@ -154,120 +106,37 @@
                   :default-time="['00:00:00','23:59:59']"
                   :picker-options="pickerOptions"
                 ></el-date-picker>
+              </el-col>  
+              
+              <el-col :span="24"> 
+                 <category-tree
+                  class="hidden-md-and-up"
+                  ref="categoryTree"
+                  multiple
+                  :expandOnClickNode="false"
+                  :defaultExpandAll="true"
+                  show-checkbox
+                  :current-key="addForm.categoryId"
+                  v-on:check-change="handleCategoryCheckChange"
+                ></category-tree>
               </el-col>
               <el-col :span="24">
                 <el-checkbox v-model="showCalendar">按日历风格显示</el-checkbox>
+                <el-button type="primary" @click="searchAssigneeToMeTasks" icon="el-icon-search">查询</el-button>
+              </el-col>
+              <el-col :span="24">
+                <el-divider content-position="left">其它操作</el-divider>	 
+                <el-button @click.native="showTagSelect(true)">打标签</el-button>
+                <el-button   @click="handleDownload">导出数据</el-button>
               </el-col>
             </el-row>
-            <category-tree
-              class="hidden-md-and-up"
-              ref="categoryTree"
-              multiple
-              :expandOnClickNode="false"
-              :defaultExpandAll="true"
-              show-checkbox
-              :current-key="addForm.categoryId"
-              v-on:check-change="handleCategoryCheckChange"
-            ></category-tree>
-          </el-drawer>
-        </el-col>
+           
+          </el-drawer> 
       </el-row>
-    </sticky>
-    <el-row class="filters-show">
-      <font class="filters-label">已选条件:</font>
-      <el-date-picker
-        v-model="filters.startTimeRanger"
-        class="hidden-sm-and-down"
-        type="daterange"
-        align="right"
-        unlink-panels
-        range-separator="至"
-        start-placeholder="创建日期"
-        end-placeholder="创建日期"
-        value-format="yyyy-MM-dd"
-        :default-time="['00:00:00','23:59:59']"
-        :picker-options="pickerOptions"
-      ></el-date-picker>
-      <el-date-picker
-        v-model="filters.planFinishTimeRanger"
-        class="hidden-sm-and-down"
-        type="daterange"
-        align="right"
-        unlink-panels
-        range-separator="至"
-        start-placeholder="计划完成日期"
-        end-placeholder="计划完成日期"
-        value-format="yyyy-MM-dd"
-        :default-time="['00:00:00','23:59:59']"
-        :picker-options="pickerOptions"
-      ></el-date-picker>
-      <el-tag
-        v-if="filters.tags"
-        :key="tag.tagId"
-        v-for="tag in filters.tags"
-        :type="''"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose(tag,'tags')"
-      >{{tag.tagName}}</el-tag>
-      <el-tag
-        v-if="filters.categoryTreeNodes"
-        :key="tag.id"
-        v-for="tag in filters.categoryTreeNodes"
-        :type="'info'"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose(tag,'categoryTreeNodes')"
-      >{{tag.name}}</el-tag>
-      <el-tag
-        v-if="filters.taskType=='0'"
-        :type="'warning'"
-        :disable-transitions="false"
-      >{{filters.taskType=='0'?'已领取':''}}</el-tag>
-      <el-tag
-        v-if="filters.taskType=='1'"
-        :type="'warning'"
-        :disable-transitions="false"
-      >{{filters.taskType=='1'?'待领取':''}}</el-tag>
-
-      <el-tag
-        v-if="filters.procCategory"
-        :type="'dangger'"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose('','procCategory')"
-      >{{filters.procCategory}}</el-tag>
-      <el-tag
-        v-if="filters.key"
-        :type="'success'"
-        closable
-        :disable-transitions="false"
-        @close="handleFiltersTagClose('','key')"
-      >{{filters.key}}</el-tag>
-
-      <el-tag
-        :type="'success'"
-        :disable-transitions="false"
-        closable
-        @click="handleFiltersTagClose(showCalendar,'calendar')"
-        @close="handleFiltersTagClose(showCalendar,'calendar')"
-      >{{showCalendar==true?'切换列表':'切换日历'}}</el-tag>
-    </el-row>
-    <el-row class="app-container">
-      <el-col :xs="4" :sm="4" :md="3" :lg="3" :xl="3" class="hidden-sm-and-down">
-        <category-tree
-          ref="categoryTree"
-          multiple
-          :expandOnClickNode="false"
-          :defaultExpandAll="true"
-          show-checkbox
-          :current-key="addForm.categoryId"
-          v-on:check-change="handleCategoryCheckChange"
-        ></category-tree>
-      </el-col>
-      <el-col v-if="showCalendar==false" :xs="24" :sm="24" :md="21" :lg="21" :xl="21">
+      <el-row style="padding-top:10px;" v-if="showCalendar==false" >
         <!--列表 Task act_ru_task-->
         <el-table
+          ref="table"
           :data="tasks"
           highlight-current-row
           v-loading="listLoading"
@@ -275,6 +144,7 @@
           @selection-change="selsChange"
           @row-click="rowClick"
           style="width: 100%;"
+          :max-height="tableHeight"
         >
           <el-table-column
             type="selection"
@@ -283,11 +153,17 @@
             :class="'hidden-sm-and-down'"
           ></el-table-column>
           <el-table-column type="index" width="40" :class="'hidden-sm-and-down'"></el-table-column>
-          <el-table-column sortable prop="mainTitle" label="流程[任务](点击详情)" min-width="300"> 
+          <el-table-column sortable prop="mainTitle" label="流程(点击详情)" min-width="300" show-overflow-tooltip> 
 						<template slot-scope="scope">  
-							 <el-link type="primary" @click="showTaskDetail( scope.row,scope.$index)">{{scope.row.mainTitle}}【{{scope.row.taskName}}】</el-link>
+							 <el-link type="primary" @click="showTaskDetail( scope.row,scope.$index)">{{scope.row.mainTitle}}</el-link>
 						</template>
           </el-table-column> 
+          <el-table-column 
+            prop="taskName"
+            label="当前节点"
+            min-width="120"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column sortable prop="tagNames" label="标签" min-width="100">
             <template slot-scope="scope">
               <el-tag
@@ -301,13 +177,14 @@
             prop="startDeptName"
             label="发起部门"
             min-width="120"
-            
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             sortable
             prop="startUsername"
             label="发起人"
             min-width="100"
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             sortable
@@ -315,23 +192,23 @@
             prop="assigneeName"
             label="执行人"
             min-width="100"
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             sortable
             prop="createTime"
             label="创建时间"
             min-width="120"
-            
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             sortable
             prop="planFinishTime"
             label="到期时间"
             min-width="120"
-            
+            show-overflow-tooltip
           ></el-table-column>
-          <el-table-column
-            sortable
+          <el-table-column 
             v-if="assigneeToMe===false"
             prop="suspensionState"
             label="状态"
@@ -345,20 +222,21 @@
             label="代办"
             min-width="80"
             :formatter="formatterDelegation"
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             sortable
             prop="claimTime"
             label="委办时间"
             min-width="120"
-            
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             sortable
             prop="description"
             label="备注"
             min-width="80"
-            
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             sortable
@@ -366,6 +244,7 @@
             prop="dueDate"
             label="处理时长"
             min-width="80"
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column label="操作" width="100" fixed="right">
             <template slot-scope="scope">
@@ -384,6 +263,7 @@
           style="float:right;"
         ></el-pagination>
         <!--编辑 Execution act_ru_execution界面-->
+      </el-row>
       </el-col>
       <el-col v-if="showCalendar==true" :xs="24" :sm="24" :md="21" :lg="21" :xl="21">
         <el-calendar v-loading="listLoading"  v-model="filters.calendarDate">
@@ -739,7 +619,8 @@ export default {
       categorys: [],
       tagSelectVisible: false,
       drawer: false,
-      showCalendar: true
+      showCalendar: true,
+      tableHeight:300,
       /** end 自定义属性请在上面加 请加备注**/
     };
   }, // end data
@@ -1626,26 +1507,24 @@ export default {
     } else {
       this.showCalendar = false;
     }
-
+    this.$nextTick(()=>{
+      if(!this.showCalendar){
+        var clientRect=this.$refs.table.$el.getBoundingClientRect();
+        var subHeight=70/1000 * window.innerHeight; 
+        this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+      }else{
+        var subHeight=70/1000 * window.innerHeight; 
+        this.tableHeight =  window.innerHeight -subHeight; 
+      }
+    })
+    
     this.myBranchDepts = this.myDepts.filter(i => {
       if (i.branchId == this.userInfo.branchId) {
         return true;
       } else {
         return false;
       }
-    });
-    console.log(
-      "this.assigneeToMe------------------------" + this.assigneeToMe !== false
-    );
-    console.log(
-      "this.assigneeToMe------------------------" + this.assigneeToMe != false
-    );
-    console.log(
-      "this.assigneeToMe------------------------" + !this.assigneeToMe
-    );
-    console.log(
-      "this.assigneeToMe------------------------" + this.assigneeToMe
-    );
+    }); 
 
     if (this.assigneeToMe !== false) {
       if (this.isClaim == undefined || this.isClaim === false) {