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

---
 .../mdp/workflow/biz/bizModel/BizModelMng.vue |  104 +-
 src/views/mdp/workflow/de/model/ModelMng.vue  |  132 +-
 .../mdp/workflow/hi/procinst/ProcinstMng.vue  | 1901 ++++++-----
 .../workflow/re/deployment/DeploymentMng.vue  |   40 +-
 .../re/procdef/ProcdefListForBizStart.vue     |   12 +-
 .../re/procdef/ProcdefListForParames.vue      |   74 +-
 .../re/procdef/ProcdefListForSimpleStart.vue  |  669 ++--
 .../re/procdef/ProcdefListForStart.vue        | 1202 ++++---
 .../mdp/workflow/re/procdef/ProcdefMng.vue    |   38 +-
 .../workflow/re/procdef/ProcdefSuspend.vue    |   67 +-
 .../re/procdefParames/ProcdefParamesSet.vue   |  340 +-
 .../workflow/ru/execution/ExecutionMng.vue    | 2481 +++++++-------
 .../ProcinstParamesExecutionSet.vue           |   77 +-
 .../ProcinstParamesStartSet.vue               |  117 +-
 src/views/mdp/workflow/ru/task/TaskMng.vue    | 2871 ++++++++---------
 15 files changed, 5126 insertions(+), 4999 deletions(-)

diff --git a/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue b/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue
index 2206e763..0bc8a731 100644
--- a/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue
+++ b/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue
@@ -3,14 +3,14 @@
 		<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-loading="load.list" :disabled="load.list==true"  v-on:click="searchBizModels" icon="el-icon-search">查询</el-button> 
+					<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-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-input>
+				<el-button @click="showAdd" icon="el-icon-plus" style="margin-left: 13px;">业务模块</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;"> 
+			<el-row style="padding-top:20px;">
 				<!--列表 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>
@@ -18,7 +18,7 @@
 					<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 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>
@@ -26,17 +26,17 @@
 						</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>
+
 				<!--编辑 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> 
+				</el-dialog>
 			</el-row>
 		</el-row>
 	</section>
@@ -50,8 +50,8 @@
 	import  BizModelAdd from './BizModelAdd';//新增界面
 	import  BizModelEdit from './BizModelEdit';//修改界面
 	import { mapGetters } from 'vuex'
-	
-	export default { 
+
+	export default {
 		name:'BizModelMng',
 		props:["modelKey","modelName","visible"],
 		watch:{
@@ -61,7 +61,7 @@
 					this.addForm.modelKey=this.modelKey
 					this.getBizModels();
 				}
-				
+
 			}
 		},
 		computed: {
@@ -85,14 +85,14 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				
+				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
+
 				addFormVisible: false,//新增bizModel界面是否显示
 				//新增bizModel界面初始化数据
 				addForm: {
 					bizName:'',bizKey:'',modelKey:'',modelName:'',id:'',branchId:''
 				},
-				
+
 				editFormVisible: false,//编辑界面是否显示
 				//编辑bizModel界面初始化数据
 				editForm: {
@@ -100,13 +100,13 @@
 				},
 				tableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/
-					
+
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
-		methods: { 
-			handleSizeChange(pageSize) { 
-				this.pageInfo.pageSize=pageSize; 
+		methods: {
+			handleSizeChange(pageSize) {
+				this.pageInfo.pageSize=pageSize;
 				this.getBizModels();
 			},
 			handleCurrentChange(pageNum) {
@@ -128,7 +128,7 @@
 				this.getBizModels();
 			},
 			searchBizModels(){
-				 this.pageInfo.count=true; 
+				 this.pageInfo.count=true;
 				 this.getBizModels();
 			},
 			//获取列表 BizModel mdp_biz_model
@@ -141,9 +141,9 @@
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
-					for(var i=0;i<this.pageInfo.orderFields.length;i++){ 
+					for(var i=0;i<this.pageInfo.orderFields.length;i++){
 						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
-					}  
+					}
 					params.orderBy= orderBys.join(",")
 				}
 				if(this.filters.key!==""){
@@ -158,13 +158,13 @@
 				this.load.list = true;
 				listBizModel(params).then((res) => {
 					var tips=res.data.tips;
-					if(tips.isOk){ 
+					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
 						this.pageInfo.count=false;
 						this.bizModels = res.data.data;
 					}else{
 						this.$message({ message: tips.msg, type: 'error' });
-					} 
+					}
 					this.load.list = false;
 				}).catch( err => this.load.list = false );
 			},
@@ -190,38 +190,38 @@
 			//选择行bizModel
 			selsChange: function (sels) {
 				this.sels = sels;
-			}, 
+			},
 			//删除bizModel
-			handleDel: function (row,index) { 
+			handleDel: function (row,index) {
 				this.$confirm('确认删除该记录吗?', '提示', {
 					type: 'warning'
-				}).then(() => { 
+				}).then(() => {
 					this.load.del=true;
 					let params = { id: row.id };
 					delBizModel(params).then((res) => {
 						this.load.del=false;
 						var tips=res.data.tips;
-						if(tips.isOk){ 
+						if(tips.isOk){
 							this.pageInfo.count=true;
 							this.getBizModels();
 						}
-						this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); 
+						this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
 					}).catch( err  => this.load.del=false );
 				});
 			},
 			//批量删除bizModel
 			batchDel: function () {
-				
+
 				this.$confirm('确认删除选中记录吗？', '提示', {
 					type: 'warning'
-				}).then(() => { 
+				}).then(() => {
 					this.load.del=true;
 					batchDelBizModel(this.sels).then((res) => {
 						this.load.del=false;
 						var tips=res.data.tips;
-						if( tips.isOk ){ 
+						if( tips.isOk ){
 							this.pageInfo.count=true;
-							this.getBizModels(); 
+							this.getBizModels();
 						}
 						this.$message({ message: tips.msg, type: tips.isOk?'success':'error'});
 					}).catch( err  => this.load.del=false );
@@ -231,28 +231,28 @@
 				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
 			}
 			/**begin 自定义函数请在下面加**/
-			
-				
+
+
 			/**end 自定义函数请在上面加**/
-			
+
 		},//end methods
-		components: { 
+		components: {
 		    'biz-model-add':BizModelAdd,
 		    'biz-model-edit':BizModelEdit,
 		    'sticky': Sticky
 		    //在下面添加其它组件
 		},
-		mounted() { 
+		mounted() {
 			this.addForm.modelKey=this.modelKey
 			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;   
+				var subHeight=70/1000 * window.innerHeight;
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
 				this.getBizModels();
-        	}); 
+        	});
 		}
 	}
 
@@ -260,4 +260,18 @@
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
+
+<style>
+  .el-input-group__append, .el-input-group__prepend {
+      background-color: #409EFF!important;
+      color: #ffffff!important;
+      vertical-align: middle;
+      display: table-cell;
+      position: relative;
+      border: 1px solid #409EFF!important;
+      padding: 0 20px;
+      width: 1px;
+      white-space: nowrap;
+  }
+</style>
diff --git a/src/views/mdp/workflow/de/model/ModelMng.vue b/src/views/mdp/workflow/de/model/ModelMng.vue
index f0913949..d8f44556 100644
--- a/src/views/mdp/workflow/de/model/ModelMng.vue
+++ b/src/views/mdp/workflow/de/model/ModelMng.vue
@@ -1,38 +1,28 @@
 <template>
-	<section> 
+	<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> 
+				<el-input v-model="filters.key" style="width:270px;"  placeholder="模糊查询">
+					<template slot="append">
+						<el-button type="primary"   v-on:click="searchModels" icon="el-icon-search">查询</el-button>
 					</template>
-				</el-input> 
-				<el-button 
+				</el-input>
+				<el-button style="margin-left: 13px;"
 					@click="handleDownload"
 					icon="el-icon-download"
 				>导出数据</el-button>
 			</el-row>
-			<el-row style="padding-top:10px;"> 
+			<el-row style="padding-top:20px;">
 				<!--列表 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 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>
+								<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="100"   show-overflow-tooltip></el-table-column>
+					<el-table-column  prop="description" label="描述" width="120" show-overflow-tooltip> 
 
 					</el-table-column>
 					<el-table-column  prop="modelComment" label="备注" min-width="80"   show-overflow-tooltip></el-table-column>
@@ -42,8 +32,8 @@
 					<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>
+							<el-button   @click="deploy( scope.row,scope.$index)" type="primary" icon="el-icon-position"></el-button>
+							<el-button type="danger"  @click="handleDel(scope.row,scope.$index)" icon="el-icon-delete"></el-button>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -54,7 +44,7 @@
 					<img :src="diagramUrl"></img>
 				</el-dialog>
 
-				<el-dialog title="已发布的流程" :visible.sync="deploymentVisible"  width="80%"  :close-on-click-modal="false"> 
+				<el-dialog title="已发布的流程" :visible.sync="deploymentVisible"  width="80%"  :close-on-click-modal="false">
 					<deployment-mng :modelKey="editForm.modelKey"></deployment-mng>
 				</el-dialog>
 			</el-row>
@@ -96,13 +86,13 @@
 				listLoading: false,//查询中...
 				sels: [],//列表选中数据
 				options:{},//下拉选择框的所有静态数据 options.sex,options.project
-				
+
 				addFormVisible: false,//新增model界面是否显示
 				//新增model界面初始化数据
 				addForm: {
 					id:'',name:'',modelKey:'',description:'',modelComment:'',created:'',createdBy:'',lastUpdated:'',lastUpdatedBy:'',version:'',modelEditorJson:'',thumbnail:'',modelType:''
 				},
-				
+
 				editFormVisible: false,//编辑界面是否显示
 				//编辑model界面初始化数据
 				editForm: {
@@ -112,7 +102,7 @@
 				diagramVisible:false,
 				diagramUrl:'',
 				companyEmployees:[],
-				companyDepts:[],	
+				companyDepts:[],
 				deploymentVisible:false,
 				categorys:[],
 				tableHeight:300,
@@ -128,9 +118,9 @@
 					return code[0].codeName
 				}else{
 					return codeValue
-				} 
+				}
 			},
-			handleSizeChange(pageSize) { 
+			handleSizeChange(pageSize) {
 				this.pageInfo.pageSize=pageSize;
 				this.pageInfo.total=0;
 				this.pageInfo.pageNum=1;
@@ -156,7 +146,7 @@
 			},
 			searchModels(){
 				 this.pageInfo.pageNum=1;
-				 this.pageInfo.total=0; 
+				 this.pageInfo.total=0;
 				 this.pageInfo.count=true
 				 this.getModels();
 			},
@@ -170,9 +160,9 @@
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
-					for(var i=0;i<this.pageInfo.orderFields.length;i++){ 
+					for(var i=0;i<this.pageInfo.orderFields.length;i++){
 						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
-					}  
+					}
 					params.orderBy= orderBys.join(",")
 				}
 				if(this.filters.key!==""){
@@ -182,17 +172,17 @@
 				listModel(params).then((res) => {
 					console.log(res)
 					var tips=res.data.tips;
-					if(tips.isOk){ 
-						this.pageInfo.total = res.data.total; 
+					if(tips.isOk){
+						this.pageInfo.total = res.data.total;
 				 		this.pageInfo.count=false
 						this.models = res.data.data;
 					}else{
 						this.$message({ message: tips.msg, type: 'error' });
-					} 
+					}
 					this.listLoading = false;
 				}).catch(() => {
 					this.listLoading = false;
-					
+
 				});
 			},
 
@@ -217,7 +207,7 @@
 			//选择行model
 			selsChange: function (sels) {
 				this.sels = sels;
-			}, 
+			},
 			//删除model
 			handleDel: function (row,index) {
 				this.$confirm('【不可逆操作】将永久删除该模型及有关的所有流程和任务，确认删除该记录吗?', '提示', {
@@ -228,17 +218,17 @@
 					delModel(params).then((res) => {
 						this.listLoading = false;
 						var tips=res.data.tips;
-						if(tips.isOk){ 
+						if(tips.isOk){
 							this.pageInfo.total=0;
 				 			this.pageInfo.count=true
 							this.getModels();
 						}
 						this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
-						
+
 					});
 				}).catch(() => {
 					this.listLoading = false;
-					
+
 				});
 			},
 			//批量删除model
@@ -251,16 +241,16 @@
 					batchDelModel(ids).then((res) => {
 						this.listLoading = false;
 						var tips=res.data.tips;
-						if( tips.isOk ){ 
-							this.pageInfo.total=0; 
+						if( tips.isOk ){
+							this.pageInfo.total=0;
 				 			this.pageInfo.count=true
-							this.getModels(); 
+							this.getModels();
 						}
 						this.$message({ message: tips.msg, type: tips.isOk?'success':'error'});
 					});
 				}).catch(() => {
 					this.listLoading = false;
-					
+
 				});
 			},
 			rowClick: function(row, event, column){
@@ -273,16 +263,16 @@
 				}).then(() => {
 					 deployModel(row).then(res=>{
 					 	var tips=res.data.tips;
-					 	if(tips.isOk){ 
-					 		this.getModels(); 
+					 	if(tips.isOk){
+					 		this.getModels();
 					 	}else{
 					 		this.$message({ message: tips.msg, type: 'error' });
 					 	}
-					 	
+
 					 });
 				}).catch(() => {
 					this.listLoading = false;
-					
+
 				});
 			},
 			unDeploy: function(row, index){
@@ -292,22 +282,22 @@
 					 unDeployModel(row).then(res=>{
 					 	var tips=res.data.tips;
 					 	if(tips.isOk){
-					 		this.getModels(); 
+					 		this.getModels();
 					 	}else{
 					 		this.$message({ message: tips.msg, type: 'error' });
 					 	}
-					 	
+
 					 });
 				}).catch(() => {
 					this.listLoading = false;
-					
+
 				});
-			},	
+			},
 			//显示编辑界面 Model act_de_model
 			showDiagram: function ( row,index ) {
 				this.diagramVisible = true;
 				this.diagramUrl="/"+process.env.BASE_API+"/"+process.env.VERSION+"/"+config.getWorkflowBasePath()+"/mdp/workflow/de/model/diagram/"+row.id
-			},  
+			},
 			showDeploymentList:function(row,index){
 				this.editForm=row
 				this.deploymentVisible=true;
@@ -375,18 +365,18 @@
 				);
 			}
 			/**end 自定义函数请在上面加**/
-			
+
 		},//end methods
-		components: {  
+		components: {
 		    'sticky': Sticky,DeploymentMng
 		    //在下面添加其它组件
 		},
-		mounted() { 
-			 
-			this.$nextTick(() => { 
+		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;   
+				var subHeight=70/1000 * window.innerHeight;
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
 				this.getModels();
         	});
 
@@ -395,11 +385,11 @@
 			let optionsParams={code:'all',fieldNames:['sex']};
 			selectCacheOptions(optionsParams).then(res=>{
 				this.options=res.data.data;
-			}); 
+			});
 			**/
 			//给下拉列表初始化默认值
 			//this.addForm.xxx=getDefaultValue(this.options.xxx,'1');
-			
+
 			/**在下面写其它函数***/
 		}
 	}
@@ -408,4 +398,18 @@
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
+
+<style>
+  .el-input-group__append, .el-input-group__prepend {
+      background-color: #409EFF!important;
+      color: #ffffff!important;
+      vertical-align: middle;
+      display: table-cell;
+      position: relative;
+      border: 1px solid #409EFF!important;
+      padding: 0 20px;
+      width: 1px;
+      white-space: nowrap;
+  }
+</style>
diff --git a/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue b/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
index 527125f6..05100d6d 100644
--- a/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
+++ b/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
@@ -1,1080 +1,979 @@
 <template>
-  <section> 
+  <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-col :xs="4" :sm="4" :md="3" :lg="3" :xl="3" class="hidden-md-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="24" :lg="24" :xl="24">
         <!--列表 Procinst act_hi_procinst-->
-        <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-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-row>
+          <el-select v-model="filters.filterType" clearable placeholder="查询范围" class="hidden-lg-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-select v-model="filters.procCategory" clearable filterable placeholder="选择分类" class="hidden-sm-and-down">
+            <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></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:270px;" placeholder="模糊查询">
+            <template slot="append">
+              <el-button v-on:click="searchProcinsts" icon="el-icon-search">查询</el-button>
+            </template>
+          </el-input>
+          <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-select size="mini"  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-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">
+                <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-lg-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" style="margin-top: 11px;">
+                <el-button size="mini" type="primary" v-on:click="searchProcinsts" icon="el-icon-search">查询</el-button>
+              </el-col>
 
-					<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-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-col>
+            </el-row>
+            <el-button slot="reference" icon="el-icon-more" style="margin-left: 13px;" 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-row style="padding-top:20px;">
+          <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">  
+              <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>
+            <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>
+                <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="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"
-              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-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>
+          <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>
           <!--编辑 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 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%">
-        <users-select
-          :select-userids="filters.assignee?[filters.assignee.userid]:[]"
-          @confirm="onUserSelected"
-        ></users-select>
+        <users-select :select-userids="filters.assignee?[filters.assignee.userid]:[]" @confirm="onUserSelected">
+        </users-select>
       </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>
+        <tag-mng :tagIds="filters.tags?filters.tags.map(i=>i.tagId):[]" :jump="true" @select-confirm="onTagSelected">
+        </tag-mng>
       </el-dialog>
     </el-row>
   </section>
 </template>
 
 <script>
-import util from "@/common/js/util"; //全局公共库
-//import { getCompanyEmployees,getCompanyDepts,selectCacheOptions,getDefaultValue,getCodeName } from '../../../../../api/common/code';//下拉框数据查询
-import {
-  listProcinst,
-  delProcinst,
-  batchDelProcinst
-} from "@/api/mdp/workflow/hi/procinst";
-import ProcinstParamesExecutionSet from "../../ru/procinstParames/ProcinstParamesExecutionSet"; //流程参数加载
-import { listCategorys } from "@/api/mdp/workflow/re/procdef";
-import Sticky from "@/components/Sticky"; // 粘性header组件
-import { mapGetters } from "vuex";
-import { listUser } from "@/api/mdp/sys/user"; //下拉框数据查询
-import { listDept } from "@/api/mdp/sys/dept"; //下拉框数据查询
+  import util from "@/common/js/util"; //全局公共库
+  //import { getCompanyEmployees,getCompanyDepts,selectCacheOptions,getDefaultValue,getCodeName } from '../../../../../api/common/code';//下拉框数据查询
+  import {
+    listProcinst,
+    delProcinst,
+    batchDelProcinst
+  } from "@/api/mdp/workflow/hi/procinst";
+  import ProcinstParamesExecutionSet from "../../ru/procinstParames/ProcinstParamesExecutionSet"; //流程参数加载
+  import {
+    listCategorys
+  } from "@/api/mdp/workflow/re/procdef";
+  import Sticky from "@/components/Sticky"; // 粘性header组件
+  import {
+    mapGetters
+  } from "vuex";
+  import {
+    listUser
+  } from "@/api/mdp/sys/user"; //下拉框数据查询
+  import {
+    listDept
+  } from "@/api/mdp/sys/dept"; //下拉框数据查询
 
-import CategoryTree from "@/views/mdp/arc/category/CategoryTree"; //修改界面
-import TagMng from "@/views/mdp/arc/tag/TagMng";
-import { batchInsertOrDeleteTags } from "@/api/mdp/workflow/ru/procinstTag";
-import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
+  import CategoryTree from "@/views/mdp/arc/category/CategoryTree"; //修改界面
+  import TagMng from "@/views/mdp/arc/tag/TagMng";
+  import {
+    batchInsertOrDeleteTags
+  } from "@/api/mdp/workflow/ru/procinstTag";
+  import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
 
-export default {
-  name: "ProcinstMng",
-  computed: {
-    ...mapGetters(["userInfo"]),
-    screenWidth: function() {
-      return screen.width;
-    }
-  },
-  props: ["isMyMonitors", "isMyStart", "isMySponsors", "isMyPartake", "isAll"],
-  data() {
-    const fromStartTime = new Date();
-    const toStartTime = new Date();
-    fromStartTime.setTime(fromStartTime.getTime() - 3600 * 1000 * 24 * 7);
-    return {
-      filters: {
-        key: "",
-        otherParames: {},
-        allBtn: false,
-        procCategory: "",
-        categoryId: "", //流程归档分类编号
-        categoryTreeNodes: [],
-        tags: [],
-        startTimeRanger: [
-          util.formatDate.format(fromStartTime, "yyyy-MM-dd"),
-          util.formatDate.format(toStartTime, "yyyy-MM-dd")
-        ],
-        planFinishTimeRanger: [],
-        endTimeRanger: [],
-        assignee: null, 
-				filterType:'',
-      },
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "最近一周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
-            }
-          },
-          {
-            text: "最近两周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 * 2);
-              picker.$emit("pick", [start, end]);
-            }
-          },
-          {
-            text: "最近三周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 * 3);
-              picker.$emit("pick", [start, end]);
-            }
-          },
-          {
-            text: "最近四周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 * 4);
-              picker.$emit("pick", [start, end]);
-            }
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
-            }
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
+  export default {
+    name: "ProcinstMng",
+    computed: {
+      ...mapGetters(["userInfo"]),
+      screenWidth: function() {
+        return screen.width;
+      }
+    },
+    props: ["isMyMonitors", "isMyStart", "isMySponsors", "isMyPartake", "isAll"],
+    data() {
+      const fromStartTime = new Date();
+      const toStartTime = new Date();
+      fromStartTime.setTime(fromStartTime.getTime() - 3600 * 1000 * 24 * 7);
+      return {
+        filters: {
+          key: "",
+          otherParames: {},
+          allBtn: false,
+          procCategory: "",
+          categoryId: "", //流程归档分类编号
+          categoryTreeNodes: [],
+          tags: [],
+          startTimeRanger: [
+            util.formatDate.format(fromStartTime, "yyyy-MM-dd"),
+            util.formatDate.format(toStartTime, "yyyy-MM-dd")
+          ],
+          planFinishTimeRanger: [],
+          endTimeRanger: [],
+          assignee: null,
+          filterType: '',
+        },
+        pickerOptions: {
+          shortcuts: [{
+              text: "最近一周",
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                picker.$emit("pick", [start, end]);
+              }
+            },
+            {
+              text: "最近两周",
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 * 2);
+                picker.$emit("pick", [start, end]);
+              }
+            },
+            {
+              text: "最近三周",
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 * 3);
+                picker.$emit("pick", [start, end]);
+              }
+            },
+            {
+              text: "最近四周",
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 * 4);
+                picker.$emit("pick", [start, end]);
+              }
+            },
+            {
+              text: "最近一个月",
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                picker.$emit("pick", [start, end]);
+              }
+            },
+            {
+              text: "最近三个月",
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                picker.$emit("pick", [start, end]);
+              }
             }
-          }
-        ]
+          ]
+        },
+        procinsts: [], //查询结果
+        pageInfo: {
+          //分页数据
+          total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
+          pageSize: 20, //每页数据
+          pageNum: 1, //当前页码、从1开始计算
+          orderFields: ["end_time_", "start_time_"], //排序列 如 ['sex','student_id']，必须为数据库字段
+          orderDirs: ["desc", "desc"], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
+          count: true
+        },
+        listLoading: false, //查询中...
+        sels: [], //列表选中数据
+        options: {}, //下拉选择框的所有静态数据 options.sex,options.project
+        drawer: false,
+        addFormVisible: false, //新增procinst界面是否显示
+        //新增procinst界面初始化数据
+        addForm: {
+          id: "",
+          procInstId: "",
+          businessKey: "",
+          procDefId: "",
+          startTime: "",
+          endTime: "",
+          duration: "",
+          startUserId: "",
+          startActId: "",
+          endActId: "",
+          superProcessInstanceId: "",
+          deleteReason: "",
+          tenantId: "",
+          name: ""
+        },
+
+        editFormVisible: false, //编辑界面是否显示
+        //编辑procinst界面初始化数据
+        editForm: {
+          id: "",
+          procInstId: "",
+          businessKey: "",
+          procDefId: "",
+          startTime: "",
+          endTime: "",
+          duration: "",
+          startUserId: "",
+          startActId: "",
+          endActId: "",
+          superProcessInstanceId: "",
+          deleteReason: "",
+          tenantId: "",
+          name: ""
+        },
+        /**begin 自定义属性请在下面加 请加备注**/
+        companyEmployees: [],
+        companyDepts: [],
+        categorys: [],
+        tagSelectVisible: false,
+        isBatchSetProcTags: false,
+        userSelectVisible: false,
+        tableHeight: 300,
+        /**end 自定义属性请在上面加 请加备注**/
+      };
+    }, //end data
+    methods: {
+      //获取代码对应的名称 用于数据反显 如 getCodeName(options.sex,'1');
+      getCodeName(options, codeValue) {
+        if (!options) return codeValue;
+        let code = options.filter(i => i.codeValue == codeValue);
+        if (code.length > 0) {
+          return code[0].codeName;
+        } else {
+          return codeValue;
+        }
+      },
+
+      dialogWidth: function() {
+        if (screen.width > 500) {
+          return "80%";
+        } else {
+          return "100%";
+        }
       },
-      procinsts: [], //查询结果
-      pageInfo: {
-        //分页数据
-        total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-        pageSize: 20, //每页数据
-        pageNum: 1, //当前页码、从1开始计算
-        orderFields: ["end_time_", "start_time_"], //排序列 如 ['sex','student_id']，必须为数据库字段
-        orderDirs: ["desc", "desc"], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
-        count: true
+      handleSizeChange(pageSize) {
+        this.pageInfo.pageSize = pageSize;
+        this.pageInfo.total = 0;
+        this.pageInfo.count = true;
+        this.pageInfo.pageNum = 1;
+        this.getProcinsts();
       },
-      listLoading: false, //查询中...
-      sels: [], //列表选中数据
-      options: {}, //下拉选择框的所有静态数据 options.sex,options.project
-      drawer: false,
-      addFormVisible: false, //新增procinst界面是否显示
-      //新增procinst界面初始化数据
-      addForm: {
-        id: "",
-        procInstId: "",
-        businessKey: "",
-        procDefId: "",
-        startTime: "",
-        endTime: "",
-        duration: "",
-        startUserId: "",
-        startActId: "",
-        endActId: "",
-        superProcessInstanceId: "",
-        deleteReason: "",
-        tenantId: "",
-        name: ""
+      handleCurrentChange(pageNum) {
+        this.pageInfo.pageNum = pageNum;
+        this.getProcinsts();
       },
-
-      editFormVisible: false, //编辑界面是否显示
-      //编辑procinst界面初始化数据
-      editForm: {
-        id: "",
-        procInstId: "",
-        businessKey: "",
-        procDefId: "",
-        startTime: "",
-        endTime: "",
-        duration: "",
-        startUserId: "",
-        startActId: "",
-        endActId: "",
-        superProcessInstanceId: "",
-        deleteReason: "",
-        tenantId: "",
-        name: ""
+      // 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
+      sortChange(obj) {
+        var dir = "asc";
+        if (obj.order == "ascending") {
+          dir = "asc";
+        } else {
+          dir = "desc";
+        }
+        if (obj.prop == "xxx") {
+          this.pageInfo.orderFields = ["xxx"];
+          this.pageInfo.orderDirs = [dir];
+        }
+        this.getProcinsts();
       },
-      /**begin 自定义属性请在下面加 请加备注**/
-      companyEmployees: [],
-      companyDepts: [],
-      categorys: [],
-      tagSelectVisible: false,
-      isBatchSetProcTags: false,
-      userSelectVisible: false,
-      tableHeight:300,
-      /**end 自定义属性请在上面加 请加备注**/
-    };
-  }, //end data
-  methods: {
-    //获取代码对应的名称 用于数据反显 如 getCodeName(options.sex,'1');
-    getCodeName(options, codeValue) {
-      if (!options) return codeValue;
-      let code = options.filter(i => i.codeValue == codeValue);
-      if (code.length > 0) {
-        return code[0].codeName;
-      } else {
-        return codeValue;
-      }
-    },
-
-    dialogWidth: function() {
-      if (screen.width > 500) {
-        return "80%";
-      } else {
-        return "100%";
-      }
-    },
-    handleSizeChange(pageSize) {
-      this.pageInfo.pageSize = pageSize;
-      this.pageInfo.total = 0;
-      this.pageInfo.count = true;
-      this.pageInfo.pageNum = 1;
-      this.getProcinsts();
-    },
-    handleCurrentChange(pageNum) {
-      this.pageInfo.pageNum = pageNum;
-      this.getProcinsts();
-    },
-    // 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
-    sortChange(obj) {
-      var dir = "asc";
-      if (obj.order == "ascending") {
-        dir = "asc";
-      } else {
-        dir = "desc";
-      }
-      if (obj.prop == "xxx") {
-        this.pageInfo.orderFields = ["xxx"];
-        this.pageInfo.orderDirs = [dir];
-      }
-      this.getProcinsts();
-    },
-    searchProcinsts() {
-      this.pageInfo.pageNum = 1;
-      this.pageInfo.total = 0;
-      this.pageInfo.count = true;
-      this.getProcinsts();
-    },
-    //获取列表 Procinst act_hi_procinst
-    getProcinsts() {
-      let params = {
-        pageSize: this.pageInfo.pageSize,
-        pageNum: this.pageInfo.pageNum,
-        total: this.pageInfo.total,
-        count: this.pageInfo.count
-      };
-      if (
-        this.pageInfo.orderFields != null &&
-        this.pageInfo.orderFields.length > 0
-      ) {
-        let orderBys = [];
-        for (var i = 0; i < this.pageInfo.orderFields.length; i++) {
-          orderBys.push(
-            this.pageInfo.orderFields[i] + " " + this.pageInfo.orderDirs[i]
-          );
+      searchProcinsts() {
+        this.pageInfo.pageNum = 1;
+        this.pageInfo.total = 0;
+        this.pageInfo.count = true;
+        this.getProcinsts();
+      },
+      //获取列表 Procinst act_hi_procinst
+      getProcinsts() {
+        let params = {
+          pageSize: this.pageInfo.pageSize,
+          pageNum: this.pageInfo.pageNum,
+          total: this.pageInfo.total,
+          count: this.pageInfo.count
+        };
+        if (
+          this.pageInfo.orderFields != null &&
+          this.pageInfo.orderFields.length > 0
+        ) {
+          let orderBys = [];
+          for (var i = 0; i < this.pageInfo.orderFields.length; i++) {
+            orderBys.push(
+              this.pageInfo.orderFields[i] + " " + this.pageInfo.orderDirs[i]
+            );
+          }
+          params.orderBy = orderBys.join(",");
+        }
+        if (this.filters.key != "" && this.filters.key != null) {
+          params.key = "%" + this.filters.key + "%";
+        }
+        if (this.filters.categoryId != "") {
+          params.categoryId = this.filters.categoryId;
         }
-        params.orderBy = orderBys.join(",");
-      }
-      if (this.filters.key != "" && this.filters.key != null) {
-        params.key = "%" + this.filters.key + "%";
-      }
-      if (this.filters.categoryId != "") {
-        params.categoryId = this.filters.categoryId;
-      }
 
-      if (
-        this.filters.categoryTreeNodes != null &&
-        this.filters.categoryTreeNodes.length > 0
-      ) {
-        params.categoryIds = this.filters.categoryTreeNodes.map(i => i.id);
-      }
+        if (
+          this.filters.categoryTreeNodes != null &&
+          this.filters.categoryTreeNodes.length > 0
+        ) {
+          params.categoryIds = this.filters.categoryTreeNodes.map(i => i.id);
+        }
 
-      if (this.filters.tags != null && this.filters.tags.length > 0) {
-        params.tagIds = this.filters.tags.map(i => i.tagId);
-      }
+        if (this.filters.tags != null && this.filters.tags.length > 0) {
+          params.tagIds = this.filters.tags.map(i => i.tagId);
+        }
 
-      if (
-        this.filters.startTimeRanger != null &&
-        this.filters.startTimeRanger.length == 2
-      ) {
-        params.fromStartTime = this.filters.startTimeRanger[0] + " 00:00:00";
-        params.toStartTime = this.filters.startTimeRanger[1] + " 23:59:59";
-      }
-      if (
-        this.filters.planFinishTimeRanger != null &&
-        this.filters.planFinishTimeRanger.length == 2
-      ) {
-        params.fromPlanFinishTime =
-          this.filters.planFinishTimeRanger[0] + " 00:00:00";
-        params.toPlanFinishTime =
-          this.filters.planFinishTimeRanger[1] + " 23:59:59";
-      }
+        if (
+          this.filters.startTimeRanger != null &&
+          this.filters.startTimeRanger.length == 2
+        ) {
+          params.fromStartTime = this.filters.startTimeRanger[0] + " 00:00:00";
+          params.toStartTime = this.filters.startTimeRanger[1] + " 23:59:59";
+        }
+        if (
+          this.filters.planFinishTimeRanger != null &&
+          this.filters.planFinishTimeRanger.length == 2
+        ) {
+          params.fromPlanFinishTime =
+            this.filters.planFinishTimeRanger[0] + " 00:00:00";
+          params.toPlanFinishTime =
+            this.filters.planFinishTimeRanger[1] + " 23:59:59";
+        }
 
-      if (
-        this.filters.endTimeRanger != null &&
-        this.filters.endTimeRanger.length == 2
-      ) {
-        params.fromEndTime = this.filters.endTimeRanger[0] + " 00:00:00";
-        params.toEndTime = this.filters.endTimeRanger[1] + " 23:59:59";
-      }
+        if (
+          this.filters.endTimeRanger != null &&
+          this.filters.endTimeRanger.length == 2
+        ) {
+          params.fromEndTime = this.filters.endTimeRanger[0] + " 00:00:00";
+          params.toEndTime = this.filters.endTimeRanger[1] + " 23:59:59";
+        }
 
-      if (this.filters.assignee != null) {
-        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.filterType=='monitors'){
-        params.monitors='%'+this.userInfo.userid+'%'
-      }
-      if (this.filters.proccategory != "") {
-        params.category = this.filters.proccategory;
-      }
-      params.tenantId = this.userInfo.branchId;
-      this.listLoading = true;
-      listProcinst(params)
-        .then(res => {
-          var tips = res.data.tips;
-          if (tips.isOk) {
-            this.pageInfo.total = res.data.total;
-            this.pageInfo.count = false;
-            this.procinsts = res.data.data;
-          } else {
-            this.$message({ message: tips.msg, type: "error" });
-          }
-          this.listLoading = false;
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
+        if (this.filters.assignee != null) {
+          params.assignee = this.filters.assignee.userid;
+        }
 
-    //显示编辑界面 Procinst act_hi_procinst
-    showEdit: function(row, index) {
-      this.editFormVisible = true;
-      var task = Object.assign({}, row);
-      this.editForm = task;
-    },
-    //显示新增界面 Procinst act_hi_procinst
-    showAdd: function() {
-      this.addFormVisible = true;
-      //this.addForm=Object.assign({}, this.editForm);
-    },
-    afterAddSubmit() {
-      this.addFormVisible = false;
-      this.pageInfo.count = true;
-      this.pageInfo.total = 0;
-      this.getProcinsts();
-    },
-    afterEditSubmit() {
-      this.editFormVisible = false;
-    },
-    //选择行procinst
-    selsChange: function(sels) {
-      this.sels = sels;
-    },
-    //删除procinst
-    handleDel: function(row, index) {
-      this.$confirm("确认删除该记录吗?", "提示", {
-        type: "warning"
-      })
-        .then(() => {
-          this.listLoading = true;
-          let params = { id: row.id };
-          delProcinst(params).then(res => {
-            this.listLoading = false;
+        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;
+        }
+        params.tenantId = this.userInfo.branchId;
+        this.listLoading = true;
+        listProcinst(params)
+          .then(res => {
             var tips = res.data.tips;
             if (tips.isOk) {
-              this.pageInfo.total = 0;
-              this.pageInfo.count = true;
-              this.getProcinsts();
+              this.pageInfo.total = res.data.total;
+              this.pageInfo.count = false;
+              this.procinsts = res.data.data;
+            } else {
+              this.$message({
+                message: tips.msg,
+                type: "error"
+              });
             }
-            this.$message({
-              message: tips.msg,
-              type: tips.isOk ? "success" : "error"
-            });
+            this.listLoading = false;
+          })
+          .catch(() => {
+            this.listLoading = false;
           });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //批量删除procinst
-    batchDel: function() {
-      var ids = this.sels.map(item => item.id);
-      this.$confirm("确认删除选中记录吗？", "提示", {
-        type: "warning"
-      })
-        .then(() => {
-          this.listLoading = true;
-          batchDelProcinst(ids).then(res => {
+      },
+
+      //显示编辑界面 Procinst act_hi_procinst
+      showEdit: function(row, index) {
+        this.editFormVisible = true;
+        var task = Object.assign({}, row);
+        this.editForm = task;
+      },
+      //显示新增界面 Procinst act_hi_procinst
+      showAdd: function() {
+        this.addFormVisible = true;
+        //this.addForm=Object.assign({}, this.editForm);
+      },
+      afterAddSubmit() {
+        this.addFormVisible = false;
+        this.pageInfo.count = true;
+        this.pageInfo.total = 0;
+        this.getProcinsts();
+      },
+      afterEditSubmit() {
+        this.editFormVisible = false;
+      },
+      //选择行procinst
+      selsChange: function(sels) {
+        this.sels = sels;
+      },
+      //删除procinst
+      handleDel: function(row, index) {
+        this.$confirm("确认删除该记录吗?", "提示", {
+            type: "warning"
+          })
+          .then(() => {
+            this.listLoading = true;
+            let params = {
+              id: row.id
+            };
+            delProcinst(params).then(res => {
+              this.listLoading = false;
+              var tips = res.data.tips;
+              if (tips.isOk) {
+                this.pageInfo.total = 0;
+                this.pageInfo.count = true;
+                this.getProcinsts();
+              }
+              this.$message({
+                message: tips.msg,
+                type: tips.isOk ? "success" : "error"
+              });
+            });
+          })
+          .catch(() => {
             this.listLoading = false;
-            var tips = res.data.tips;
-            if (tips.isOk) {
-              this.pageInfo.total = 0;
-              this.getProcinsts();
-            }
-            this.$message({
-              message: tips.msg,
-              type: tips.isOk ? "success" : "error"
+          });
+      },
+      //批量删除procinst
+      batchDel: function() {
+        var ids = this.sels.map(item => item.id);
+        this.$confirm("确认删除选中记录吗？", "提示", {
+            type: "warning"
+          })
+          .then(() => {
+            this.listLoading = true;
+            batchDelProcinst(ids).then(res => {
+              this.listLoading = false;
+              var tips = res.data.tips;
+              if (tips.isOk) {
+                this.pageInfo.total = 0;
+                this.getProcinsts();
+              }
+              this.$message({
+                message: tips.msg,
+                type: tips.isOk ? "success" : "error"
+              });
             });
+          })
+          .catch(() => {
+            this.listLoading = false;
           });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    rowClick: function(row, event, column) {
-      this.$emit("row-click", row, event, column); //  @row-click="rowClick"
-    },
-    /**begin 自定义函数请在下面加**/
+      },
+      rowClick: function(row, event, column) {
+        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.getProcinsts();
-    },
-    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.getProcinsts();
-    },
-    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.getProcinsts();
-    },
-    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.getProcinsts();
-    },
-    searchEnd() {
-      this.pageInfo.pageNum = 1;
-      this.pageInfo.total = 0;
-      this.pageInfo.count = true;
-      this.filters.allBtn = false;
-      this.filters.otherParames = Object.assign(this.filters.otherParames, {
-        isEnd: 1
-      });
-      this.getProcinsts();
-    },
-    searchNotEnd() {
-      this.pageInfo.pageNum = 1;
-      this.pageInfo.total = 0;
-      this.pageInfo.count = true;
-      this.filters.allBtn = false;
-      this.filters.otherParames = Object.assign(this.filters.otherParames, {
-        isEnd: 0
-      });
-      this.getProcinsts();
-    },
-    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
-      ) {
+      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.getProcinsts();
+      },
+      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.getProcinsts();
+      },
+      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.getProcinsts();
+      },
+      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.getProcinsts();
+      },
+      searchEnd() {
+        this.pageInfo.pageNum = 1;
+        this.pageInfo.total = 0;
+        this.pageInfo.count = true;
+        this.filters.allBtn = false;
         this.filters.otherParames = Object.assign(this.filters.otherParames, {
-          isEnd: null
+          isEnd: 1
         });
-      } else {
-        this.filters.otherParames = {};
-      }
+        this.getProcinsts();
+      },
+      searchNotEnd() {
+        this.pageInfo.pageNum = 1;
+        this.pageInfo.total = 0;
+        this.pageInfo.count = true;
+        this.filters.allBtn = false;
+        this.filters.otherParames = Object.assign(this.filters.otherParames, {
+          isEnd: 0
+        });
+        this.getProcinsts();
+      },
+      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, {
+            isEnd: null
+          });
+        } else {
+          this.filters.otherParames = {};
+        }
 
-      this.searchProcinsts();
-    },
-    formatterSuspensionState(row, column, cellValue) {
-      return cellValue == 1 ? "激活的" : "挂起的";
-    },
-    formatterDuration(row, column, cellValue) {
-      if (cellValue != null && cellValue != "") {
-        if (cellValue < 1000 * 60) {
-          return (cellValue / 1000).toFixed(0) + "秒";
-        } else if (cellValue < 1000 * 60 * 60) {
-          return (cellValue / 1000 / 60).toFixed(2) + "分";
-        } else if (cellValue < 1000 * 60 * 60 * 24) {
-          return (cellValue / 1000 / 60 / 60).toFixed(2) + "小时";
-        } else if (cellValue < 1000 * 60 * 60 * 24 * 30) {
-          return (cellValue / 1000 / 60 / 60 / 24).toFixed(2) + "天";
+        this.searchProcinsts();
+      },
+      formatterSuspensionState(row, column, cellValue) {
+        return cellValue == 1 ? "激活的" : "挂起的";
+      },
+      formatterDuration(row, column, cellValue) {
+        if (cellValue != null && cellValue != "") {
+          if (cellValue < 1000 * 60) {
+            return (cellValue / 1000).toFixed(0) + "秒";
+          } else if (cellValue < 1000 * 60 * 60) {
+            return (cellValue / 1000 / 60).toFixed(2) + "分";
+          } else if (cellValue < 1000 * 60 * 60 * 24) {
+            return (cellValue / 1000 / 60 / 60).toFixed(2) + "小时";
+          } else if (cellValue < 1000 * 60 * 60 * 24 * 30) {
+            return (cellValue / 1000 / 60 / 60 / 24).toFixed(2) + "天";
+          } else {
+            return (cellValue / 1000 / 60 / 60 / 24 / 30).toFixed(2) + "月";
+          }
         } else {
-          return (cellValue / 1000 / 60 / 60 / 24 / 30).toFixed(2) + "月";
+          return cellValue;
         }
-      } else {
-        return cellValue;
-      }
-    },
+      },
 
-    handleFiltersTagClose: function(tag, paramsName) {
-      if (paramsName == "key") {
-        this.filters.key = null;
-      } else if (paramsName == "categoryTreeNodes") {
-        this.filters.categoryTreeNodes = this.filters.categoryTreeNodes.filter(
-          i => i.id != tag.id
-        );
-        this.$refs.categoryTree.$refs.nodeTree.setChecked(tag.id, false, false);
-      } else if (paramsName == "procCategory") {
-        this.filters.procCategory = null;
-      } else if (paramsName == "tags") {
-        this.filters.tags = this.filters.tags.filter(i => i.tagId != tag.tagId);
-      } else if (paramsName == "assignee") {
-        this.filters.assignee = null;
-      }
-    },
+      handleFiltersTagClose: function(tag, paramsName) {
+        if (paramsName == "key") {
+          this.filters.key = null;
+        } else if (paramsName == "categoryTreeNodes") {
+          this.filters.categoryTreeNodes = this.filters.categoryTreeNodes.filter(
+            i => i.id != tag.id
+          );
+          this.$refs.categoryTree.$refs.nodeTree.setChecked(tag.id, false, false);
+        } else if (paramsName == "procCategory") {
+          this.filters.procCategory = null;
+        } else if (paramsName == "tags") {
+          this.filters.tags = this.filters.tags.filter(i => i.tagId != tag.tagId);
+        } else if (paramsName == "assignee") {
+          this.filters.assignee = null;
+        }
+      },
 
-    onTagSelected(tags) {
-      this.tagSelectVisible = false;
-      if (this.isBatchSetProcTags == true) {
-        //TOD 批量更新后台数据标签
-        if (!tags || tags.length == 0) {
-          this.$message.error("最少选中一个标签");
-          this.isBatchSetProcTags = false;
+      onTagSelected(tags) {
+        this.tagSelectVisible = false;
+        if (this.isBatchSetProcTags == true) {
+          //TOD 批量更新后台数据标签
+          if (!tags || tags.length == 0) {
+            this.$message.error("最少选中一个标签");
+            this.isBatchSetProcTags = false;
+            return;
+          }
+          var procinstTagsVos = [];
+          this.sels.forEach(row => {
+            var procinstTags = {
+              procDefId: row.procDefId,
+              procInstId: row.procInstId,
+              branchId: row.branchId,
+              userid: this.userInfo.userid,
+              tags: tags.map(i => {
+                return {
+                  tagId: i.tagId,
+                  tagName: i.tagName
+                };
+              })
+            };
+            procinstTagsVos.push(procinstTags);
+          });
+          var params = procinstTagsVos;
+
+          batchInsertOrDeleteTags(params)
+            .then(res => {
+              this.isBatchSetProcTags = false;
+              if (res.data.tips.isOk) {
+                var tagIds = tags.map(i => i.tagId).join(",");
+                var tagNames = tags.map(i => i.tagName).join(",");
+                this.sels.forEach(row => {
+                  row.tagIds = tagIds;
+                  row.tagNames = tagNames;
+                });
+                this.$message.success("打标签成功");
+              } else {
+                this.$message.error(res.data.tips.msg);
+              }
+            })
+            .catch(e => (this.isBatchSetProcTags = false));
+        } else {
+          if (tags == null) {
+            this.filters.tags = null;
+          } else {
+            this.filters.tags = tags;
+          }
+        }
+      },
+      handleCategoryCheckChange(data, checked, indeterminate) {
+        if (data.id == "C0") {
+          //选择了根节点，默认不按分类查询
+          this.filters.categoryTreeNodes = null;
           return;
         }
-        var procinstTagsVos = [];
-        this.sels.forEach(row => {
-          var procinstTags = {
-            procDefId: row.procDefId,
-            procInstId: row.procInstId,
-            branchId: row.branchId,
-            userid: this.userInfo.userid,
-            tags: tags.map(i => {
-              return { tagId: i.tagId, tagName: i.tagName };
-            })
-          };
-          procinstTagsVos.push(procinstTags);
-        });
-        var params = procinstTagsVos;
+        var node = this.$refs.categoryTree.$refs.nodeTree.getCheckedNodes();
+        console.log("node-------------" + JSON.stringify(node));
+        this.filters.categoryTreeNodes = node;
+      },
+      showTagSelect: function(isBatchSetProcTags) {
+        if (isBatchSetProcTags == true) {
+          if (this.sels.length == 0) {
+            this.$message.error("请选中流程任务");
+            return false;
+          }
+          this.tagSelectVisible = true;
+        } else {
+          this.tagSelectVisible = true;
+        }
+        this.isBatchSetProcTags = isBatchSetProcTags;
+      },
 
-        batchInsertOrDeleteTags(params)
-          .then(res => {
-            this.isBatchSetProcTags = false;
-            if (res.data.tips.isOk) {
-              var tagIds = tags.map(i => i.tagId).join(",");
-              var tagNames = tags.map(i => i.tagName).join(",");
-              this.sels.forEach(row => {
-                row.tagIds = tagIds;
-                row.tagNames = tagNames;
-              });
-              this.$message.success("打标签成功");
+      onUserSelected: function(users) {
+        this.userSelectVisible = false;
+        this.filters.assignee = users[0];
+      },
+      handleDownload() {
+        console.log(JSON.stringify(this.procinsts));
+        import("@/vendor/Export2Excel").then(excel => {
+          const tHeader = [
+            "备用字段5",
+            "开始节点编号",
+            "标签编号",
+            "部门编号",
+            "主要操作---mainQx",
+            "备用字段4",
+            "备用字段1",
+            "智能表单展示方式",
+            "备用字段",
+            "实际完成时间",
+            "用户编号",
+            "标签名称",
+            "持续时间",
+            "计划完成时间",
+            "发起人编号",
+            "参数编号",
+            "主办人",
+            "结束节点编号",
+            "开始时间",
+            "主键",
+            "备用字段2",
+            "流程实例编号 == superProcessInstanceId",
+            "表单编号",
+            "版次 --- rev",
+            "是否关联自定义表单",
+            "发起人名称",
+            "流程实例编号",
+            "流程定义编号",
+            "删除原因",
+            "回滚编号",
+            "流程标题",
+            "发起部门",
+            "业务编码",
+            "工作编号----tenantId",
+            "流程名称",
+            "结束时间",
+            "备用字段3",
+            "所属分类编号",
+            "回滚类型",
+            "监控人"
+          ];
+          const filterVal = [
+            "fi",
+            "startActId",
+            "tagIds",
+            "deptid",
+            "mainQx",
+            "fo",
+            "fp",
+            "formShowType",
+            "pconfig",
+            "realFinishTime",
+            "userid",
+            "tagNames",
+            "duration",
+            "planFinishTime",
+            "startUserId",
+            "paramsId",
+            "sponsors",
+            "endActId",
+            "startTime",
+            "id",
+            "sp",
+            "superProcessInstanceId",
+            "formId",
+            "rev",
+            "isRefForm",
+            "startUsername",
+            "procInstId",
+            "procDefId",
+            "deleteReason",
+            "callbackId",
+            "mainTitle",
+            "startDeptName",
+            "businessKey",
+            "tenantId",
+            "name",
+            "endTime",
+            "tp",
+            "categoryId",
+            "callbackType",
+            "monitors"
+          ];
+          const list = this.procinsts;
+          const data = this.formatJson(filterVal, list);
+          var filename = "历史流程";
+          if (this.formDefSelected) {
+            filename = this.formDefSelected.formName ?
+              this.formDefSelected.formName :
+              this.formDefSelected.id + "历史流程";
+          }
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: filename,
+            autoWidth: true,
+            bookType: "xlsx"
+          });
+        });
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v =>
+          filterVal.map(j => {
+            if (j === "timestamp") {
+              return parseTime(v[j]);
             } else {
-              this.$message.error(res.data.tips.msg);
+              return v[j];
             }
           })
-          .catch(e => (this.isBatchSetProcTags = false));
-      } else {
-        if (tags == null) {
-          this.filters.tags = null;
-        } else {
-          this.filters.tags = tags;
-        }
-      }
-    },
-    handleCategoryCheckChange(data, checked, indeterminate) {
-      if (data.id == "C0") {
-        //选择了根节点，默认不按分类查询
-        this.filters.categoryTreeNodes = null;
-        return;
-      }
-      var node = this.$refs.categoryTree.$refs.nodeTree.getCheckedNodes();
-      console.log("node-------------" + JSON.stringify(node));
-      this.filters.categoryTreeNodes = node;
-    },
-    showTagSelect: function(isBatchSetProcTags) {
-      if (isBatchSetProcTags == true) {
-        if (this.sels.length == 0) {
-          this.$message.error("请选中流程任务");
-          return false;
-        }
-        this.tagSelectVisible = true;
-      } else {
-        this.tagSelectVisible = true;
+        );
       }
-      this.isBatchSetProcTags = isBatchSetProcTags;
+      /**end 自定义函数请在上面加**/
+    }, //end methods
+    components: {
+      //在下面添加其它组件
+      "procinst-parames-execution-set": ProcinstParamesExecutionSet,
+      sticky: Sticky,
+      CategoryTree,
+      TagMng,
+      UsersSelect
     },
+    mounted() {
+      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;
+        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) {
 
-    onUserSelected: function(users) {
-      this.userSelectVisible = false;
-      this.filters.assignee = users[0];
-    },
-    handleDownload() {
-      console.log(JSON.stringify(this.procinsts));
-      import("@/vendor/Export2Excel").then(excel => {
-        const tHeader = [
-          "备用字段5",
-          "开始节点编号",
-          "标签编号",
-          "部门编号",
-          "主要操作---mainQx",
-          "备用字段4",
-          "备用字段1",
-          "智能表单展示方式",
-          "备用字段",
-          "实际完成时间",
-          "用户编号",
-          "标签名称",
-          "持续时间",
-          "计划完成时间",
-          "发起人编号",
-          "参数编号",
-          "主办人",
-          "结束节点编号",
-          "开始时间",
-          "主键",
-          "备用字段2",
-          "流程实例编号 == superProcessInstanceId",
-          "表单编号",
-          "版次 --- rev",
-          "是否关联自定义表单",
-          "发起人名称",
-          "流程实例编号",
-          "流程定义编号",
-          "删除原因",
-          "回滚编号",
-          "流程标题",
-          "发起部门",
-          "业务编码",
-          "工作编号----tenantId",
-          "流程名称",
-          "结束时间",
-          "备用字段3",
-          "所属分类编号",
-          "回滚类型",
-          "监控人"
-        ];
-        const filterVal = [
-          "fi",
-          "startActId",
-          "tagIds",
-          "deptid",
-          "mainQx",
-          "fo",
-          "fp",
-          "formShowType",
-          "pconfig",
-          "realFinishTime",
-          "userid",
-          "tagNames",
-          "duration",
-          "planFinishTime",
-          "startUserId",
-          "paramsId",
-          "sponsors",
-          "endActId",
-          "startTime",
-          "id",
-          "sp",
-          "superProcessInstanceId",
-          "formId",
-          "rev",
-          "isRefForm",
-          "startUsername",
-          "procInstId",
-          "procDefId",
-          "deleteReason",
-          "callbackId",
-          "mainTitle",
-          "startDeptName",
-          "businessKey",
-          "tenantId",
-          "name",
-          "endTime",
-          "tp",
-          "categoryId",
-          "callbackType",
-          "monitors"
-        ];
-        const list = this.procinsts;
-        const data = this.formatJson(filterVal, list);
-        var filename = "历史流程";
-        if (this.formDefSelected) {
-          filename = this.formDefSelected.formName
-            ? this.formDefSelected.formName
-            : this.formDefSelected.id + "历史流程";
         }
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: filename,
-          autoWidth: true,
-          bookType: "xlsx"
-        });
+        this.getProcinsts();
       });
-    },
-    formatJson(filterVal, jsonData) {
-      return jsonData.map(v =>
-        filterVal.map(j => {
-          if (j === "timestamp") {
-            return parseTime(v[j]);
-          } else {
-            return v[j];
-          }
-        })
-      );
     }
-    /**end 自定义函数请在上面加**/
-  }, //end methods
-  components: {
-    //在下面添加其它组件
-    "procinst-parames-execution-set": ProcinstParamesExecutionSet,
-    sticky: Sticky,
-    CategoryTree,
-    TagMng,
-    UsersSelect
-  },
-  mounted() {
-    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;   
-				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();
-    });
-  }
-};
+  };
 </script>
 
 <style scoped>
-.filters-show {
-  margin-left: 20px;
-  margin-top: 10px;
-  margin-bottom: 0px;
-}
-.filters-label {
-  font-size: 14px;
-  color: black;
-  font-weight: bold;
-}
+  .filters-show {
+    margin-left: 20px;
+    margin-top: 10px;
+    margin-bottom: 0px;
+  }
+
+  .filters-label {
+    font-size: 14px;
+    color: black;
+    font-weight: bold;
+  }
 
-.more-filter-item {
-  margin: 20px 20px;
-}
+  .more-filter-item {
+    margin: 20px 0px;
+  }
+
+  .more-filter-item .el-col {
+    margin: 2px 2px;
+  }
 
-.more-filter-item .el-col {
-  margin: 2px 2px;
-}
-.more-filter-item button {
-  margin: 2px 2px;
-}
+  .more-filter-item button {
+    margin: 2px 2px;
+  }
+
+  .more-label-font {
+    text-align: center;
+    float: left;
+    height: 28px;
+    line-height: 28px;
+    margin-right: 10px;
+  }
 
-  .more-label-font{
-  	text-align:center;
-  	float:left;
-  	padding-top:5px;
+  .el-popover__title {
+    color: #303133;
+    font-size: 18px;
+    line-height: 1;
+    margin-bottom: 12px;
+    margin-top: 11px;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/mdp/workflow/re/deployment/DeploymentMng.vue b/src/views/mdp/workflow/re/deployment/DeploymentMng.vue
index 934d9413..cf65d316 100644
--- a/src/views/mdp/workflow/re/deployment/DeploymentMng.vue
+++ b/src/views/mdp/workflow/re/deployment/DeploymentMng.vue
@@ -4,18 +4,18 @@
       <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> 
+        </el-select>
+        <el-input v-model="filters.key" style="width:270px;margin-right: 13px;" placeholder="模糊查询">
+          <template slot="append">
+            <el-button type="primary"   v-on:click="searchDeployments" icon="el-icon-search">查询</el-button>
           </template>
         </el-input>
-        <el-button @click="handleDownload" icon="el-icon-download">导出数据</el-button>
+        <el-button @click="handleDownload" icon="el-icon-download" style="">导出数据</el-button>
       </el-row>
-      <el-row style="padding-top:10px;">
+      <el-row style="padding-top:20px;">
         <!--列表 Deployment act_re_deployment-->
         <el-table
-          ref="table" :max-height="tableHeight" 
+          ref="table" :max-height="tableHeight"
           :data="deployments"
           highlight-current-row
           v-loading="listLoading"
@@ -26,7 +26,7 @@
         >
           <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>
@@ -39,7 +39,7 @@
           ></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-button type="danger" @click="handleDel(scope.row,scope.$index)">下架当前版本</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -381,10 +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; 
+      var subHeight=70/1000 * window.innerHeight;
+      this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
       this.getDeployments();
     });
   }
@@ -392,4 +392,18 @@ export default {
 </script>
 
 <style scoped>
-</style>
\ No newline at end of file
+</style>
+
+<style>
+  .el-input-group__append, .el-input-group__prepend {
+      background-color: #409EFF!important;
+      color: #ffffff!important;
+      vertical-align: middle;
+      display: table-cell;
+      position: relative;
+      border: 1px solid #409EFF!important;
+      padding: 0 20px;
+      width: 1px;
+      white-space: nowrap;
+  }
+</style>
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue
index 1ed1e918..b1b19136 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue
@@ -28,13 +28,14 @@
 		data() {
 			return { 
 				filters: { 
-
+					params:null,
+					/** 
 					params:{
-						mainTitle:'xxxxxxx',
-						mainContext:'xxxx',
+						mainTitle:'',
+						mainContext:'',
 						bizUrl:'',//前端跳转  //自带参数，建议只带主键
-						bizKey:'company_regit',//用于选中流程模型并原样输出到restUrl
-						restUrl:'xxxxxxxx',//后端接口同步
+						bizKey:'',//用于选中流程模型并原样输出到restUrl
+						restUrl:'',//后端接口同步
 						formId:'',//form 表单编号
 						formDataId:'',//form表单对应的数据
 						extVars:{ //不用提交给工作流的变量池 
@@ -44,6 +45,7 @@
 						}
 
 					}
+					*/
 				}, 
 				/**end 自定义属性请在上面加 请加备注**/
 			}
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue
index 09878552..6d790ab3 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue
@@ -1,37 +1,26 @@
 <template>
   <section>
-    <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-row class="app-container">
+      <el-row> 
+        <el-col>
+          <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> 
+
+            <el-input v-model="filters.key" style="width:270px;" 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> 
-          <el-row  style="padding-top:10px;">
+            </el-input>
+            <el-button @click.native="showTagSelect(false)" icon="el-icon-search" style="margin-left: 13px;" class="hidden-sm-and-down">标签</el-button>
+            <el-button @click.native="showTagSelect(true)" icon="el-icon-plus" class="hidden-sm-and-down">标签</el-button>
+            <el-button @click="handleDownload" 	icon="el-icon-download" class="hidden-md-and-down">导出数据</el-button>
+          </el-row>
+          <el-row  style="padding-top:20px;">
             <!--列表 Procdef act_re_procdef-->
             <el-table
-              ref="table" :max-height="tableHeight" 
+              ref="table" :max-height="tableHeight"
               :data="procdefs"
               highlight-current-row
               v-loading="listLoading"
@@ -44,10 +33,10 @@
               <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">  
+                <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>
               <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">
@@ -62,7 +51,7 @@
                 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>
@@ -78,14 +67,14 @@
                       width="200"
                       trigger="click"
                       :content="scope.row.description">
-                      <el-button slot="reference">详细描述</el-button>
+                      <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>
+                  <el-button type="primary" @click="showBizModelDialog(scope.row,scope.$index)">绑定业务</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -607,10 +596,10 @@ export default {
     listCategorys({ tenantId: this.userInfo.branchId }).then(res => {
       this.categorys = res.data.data;
     });
-    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; 
+        var subHeight=70/1000 * window.innerHeight;
+        this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
     })
     this.getProcdefs();
   }
@@ -628,4 +617,19 @@ export default {
   color: black;
   font-weight: bold;
 }
-</style>
\ No newline at end of file
+</style>
+
+
+<style>
+  .el-input-group__append, .el-input-group__prepend {
+      background-color: #409EFF!important;
+      color: #ffffff!important;
+      vertical-align: middle;
+      display: table-cell;
+      position: relative;
+      border: 1px solid #409EFF!important;
+      padding: 0 20px;
+      width: 1px;
+      white-space: nowrap;
+  }
+</style>
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue
index 924892a7..fb22b129 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue
@@ -1,322 +1,365 @@
 <template>
-	<section>
-		<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-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>
-		</el-row>
-	</section>
+  <section>
+    <el-row v-if="flowStartVisible==false" class="app-container">
+      <el-row>
+        <el-input v-model="filters.key" style="width:270px;" 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:20px;">
+        <!--列表 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-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>
+    </el-row>
+  </section>
 </template>
 
 <script>
-	import util from '@/common/js/util';//全局公共库
-	import config from '@/common/config';//全局公共库
-	//import { selectCacheOptions,getDefaultValue,getCodeName } from '../../../../../api/common/code';//下拉框数据查询
-	import { listProcdef } from '@/api/mdp/workflow/re/procdef';
-	import ProcinstParamesStartSet from "../../ru/procinstParames/ProcinstParamesStartSet"
-	import Sticky from '@/components/Sticky' // 粘性header组件
-	import { mapGetters } from 'vuex'  
-	export default {
-		name:'ProcdefListForBizStart',
-		props:['params','isSelectModel'],
-	    computed: {
-		    ...mapGetters([
-		      'userInfo'
-		    ]),
-			screenWidth:function(){
-				return screen.width;
-			},
-		},
-		watch:{
-			params:function(params){
-				
-				this.filters.params=params;
-				this.searchProcdefs();
-			}
-		},
-		data() {
-			return {
-				filters: {
-					key: '',
-					procCategory:'', 
-					categoryTreeNodes:[], 
-					tags:[], 
-
-					params:{
-						mainTitle:'',
-						mainContext:'',
-						bizUrl:'',//前端跳转  //自带参数，建议只带主键
-						bizKey:'',//用于选中流程模型并原样输出到restUrl
-						restUrl:'',//后端接口同步
-						formId:'',//form 表单编号
-						formDataId:'',//form表单对应的数据
-						extVars:{ //不用提交给工作流的变量池 
-						},
-						flowVars:{//提交进流程实例变量的变量池,flowVars所有变量将post方式推送回restUrl指定的地址
-
-						}
-
-					}
-				},
-				procdefs: [],//查询结果
-				pageInfo:{//分页数据
-					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-					pageSize:10,//每页数据
-					pageNum:1,//当前页码、从1开始计算
-					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
-					orderDirs:[],//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
-					count:true,
-				},
-				listLoading: false,//查询中...
-				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 options.sex,options.project
-				
-				addFormVisible: false,//新增procdef界面是否显示
-				//新增procdef界面初始化数据
-				addForm: {
-					id:'',rev:'',category:'',name:'',key:'',version:'',deploymentId:'',resourceName:'',dgrmResourceName:'',description:'',hasStartFormKey:'',hasGraphicalNotation:'',suspensionState:'',tenantId:'',engineVersion:''
-				},
-				drawer:false,
-				 
-				/**begin 自定义属性请在下面加 请加备注**/
-				diagramVisible:false,//显示流程图
-				diagramUrl:'',//显示流程图的路径	
-				flowStartVisible:false,//发起流程	
-				categorys:[],
-				tagSelectVisible:false,
-				isBatchSetProcTags:false,
-				tableHeight:300,
-				/**end 自定义属性请在上面加 请加备注**/
-			}
-		},//end data
-		methods: {
-			//获取代码对应的名称 用于数据反显 如 getCodeName(options.sex,'1');
-			getCodeName(options,codeValue){
-				if(!options)return codeValue;
-				let code=options.filter(i=>i.codeValue==codeValue);
-				if(code.length>0){
-					return code[0].codeName
-				}else{
-					return codeValue
-				} 
-			},
-			
-			dialogWidth:function(){
-				if(screen.width>500){
-					return "80%";
-				}else{
-					return "100%";
-				}
-			},
-			handleSizeChange(pageSize) { 
-				this.pageInfo.pageSize=pageSize;
-				this.pageInfo.total=0;
-				this.pageInfo.count=true
-				this.pageInfo.pageNum=1;
-				this.getProcdefs();
-			},
-			handleCurrentChange(pageNum) {
-				this.pageInfo.pageNum = pageNum;
-				this.getProcdefs();
-			},
-			// 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
-			sortChange( obj ){
-				var dir='asc';
-				if(obj.order=='ascending'){
-					dir='asc'
-				}else{
-					dir='desc';
-				}
-				if(obj.prop=='xxx'){
-					this.pageInfo.orderFields=['xxx'];
-					this.pageInfo.orderDirs=[dir];
-				}
-				this.getProcdefs();
-			},
-			searchProcdefs(){
-				 this.pageInfo.pageNum=1;
-				 this.pageInfo.total=0;
-				 this.pageInfo.count=true
-				 this.getProcdefs();
-			},  
-			 
-			//获取列表 Procdef act_re_procdef
-			getProcdefs() {
-				let params = {
-					pageSize: this.pageInfo.pageSize,
-					pageNum: this.pageInfo.pageNum,
-					total: this.pageInfo.total,
-					count:this.pageInfo.count
-				};
-				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
-					let orderBys=[];
-					for(var i=0;i<this.pageInfo.orderFields.length;i++){ 
-						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
-					}  
-					params.orderBy= orderBys.join(",")
-				}
-				if(this.filters.key!==""){
-					params.filtersKey='%'+this.filters.key+'%'
-				}
-				if(this.filters.category!==""){
-					params.category=this.filters.category
-				}
-				if(this.filters.params.formId!=""&& this.filters.params.formId!=null){
-					params.formId=this.filters.params.formId
-				} 
-				
-				if(this.filters.procCategory!='' && this.filters.procCategory!=null){
-					params.category=this.filters.procCategory
-				} 
-				
-				if(this.filters.categoryTreeNodes!=null && this.filters.categoryTreeNodes.length>0){
-					params.categoryIds=this.filters.categoryTreeNodes.map(i=>i.id)
-				}
-				
-				if(this.filters.tags!=null && this.filters.tags.length>0){
-					params.tagIds=this.filters.tags.map(i=>i.tagId)
-				}
-
-				if(this.filters.params!=null && this.filters.params.bizKey!=null && this.filters.params.bizKey!=''){
-					params.bizKey=this.filters.params.bizKey
-				}
-				params.tenantId=this.userInfo.branchId
-				params.includeContext="1";
-				params.suspensionState=1;
-				this.listLoading = true;
-				listProcdef(params).then((res) => {
-					var tips=res.data.tips;
-					if(tips.isOk){ 
-						this.pageInfo.total = res.data.total 
-						this.pageInfo.count=false
-						if(res.data.data.length==1){
-							this.addForm=res.data.data[0] 
-							this.flowStartVisible=true;
-						}else if(res.data.data.length>1){ 
-							this.flowStartVisible=false;
-							this.$message.success("请选中一个流程")
-						}
-						this.procdefs = res.data.data; 
-					}else{
-						this.$message({ message: tips.msg, type: 'error' });
-					} 
-					this.listLoading = false;
-				}).catch(() => {
-					this.listLoading = false;
-					
-				});
-			},
- 
-			//选择行procdef
-			selsChange: function (sels) {
-				this.sels = sels;
-			},  
-			 
-			rowClick: function(row, event, column){
-				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
-			},
-			/**begin 自定义函数请在下面加**/
-
-			showDiagram: function ( row,index ) {
-				this.diagramVisible = true;
-				this.diagramUrl="/"+process.env.BASE_API+"/"+process.env.VERSION+"/"+config.getWorkflowBasePath()+"/mdp/workflow/re/procdef/diagram/"+row.id
-			},	
-			showFlowStart: function ( row,index ) {
-				this.addForm=row;
-				this.flowStartVisible=true;
-				
-				
-			},	
-			startCancel(){
-				this.$emit("closeTab");
-			} 
-			/**end 自定义函数请在上面加**/
-			
-		},//end methods
-		components: {  
-		    //在下面添加其它组件
-		    'procinst-parames-start-set':ProcinstParamesStartSet,
-			'sticky': Sticky, 
-		}, 
-		mounted() {
-			 
-			 if(this.params){
-				 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; 
-			 })
-			  
-			 
-		}
-	}
+  import util from '@/common/js/util'; //全局公共库
+  import config from '@/common/config'; //全局公共库
+  //import { selectCacheOptions,getDefaultValue,getCodeName } from '../../../../../api/common/code';//下拉框数据查询
+  import {
+    listProcdef
+  } from '@/api/mdp/workflow/re/procdef';
+  import ProcinstParamesStartSet from "../../ru/procinstParames/ProcinstParamesStartSet"
+  import Sticky from '@/components/Sticky' // 粘性header组件
+  import {
+    mapGetters
+  } from 'vuex'
+  export default {
+    name: 'ProcdefListForBizStart',
+    props: ['params', 'isSelectModel'],
+    computed: {
+      ...mapGetters([
+        'userInfo'
+      ]),
+      screenWidth: function() {
+        return screen.width;
+      },
+    },
+    watch: {
+      params: function(params) {
+
+        this.filters.params = params;
+        this.searchProcdefs();
+      }
+    },
+    data() {
+      return {
+        filters: {
+          key: '',
+          procCategory: '',
+          categoryTreeNodes: [],
+          tags: [],
+
+          params: {
+            mainTitle: '',
+            mainContext: '',
+            bizUrl: '', //前端跳转  //自带参数，建议只带主键
+            bizKey: '', //用于选中流程模型并原样输出到restUrl
+            restUrl: '', //后端接口同步
+            formId: '', //form 表单编号
+            formDataId: '', //form表单对应的数据
+            extVars: { //不用提交给工作流的变量池
+            },
+            flowVars: { //提交进流程实例变量的变量池,flowVars所有变量将post方式推送回restUrl指定的地址
+
+            }
+
+          }
+        },
+        procdefs: [], //查询结果
+        pageInfo: { //分页数据
+          total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
+          pageSize: 10, //每页数据
+          pageNum: 1, //当前页码、从1开始计算
+          orderFields: [], //排序列 如 ['sex','student_id']，必须为数据库字段
+          orderDirs: [], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
+          count: true,
+        },
+        listLoading: false, //查询中...
+        sels: [], //列表选中数据
+        options: {}, //下拉选择框的所有静态数据 options.sex,options.project
+
+        addFormVisible: false, //新增procdef界面是否显示
+        //新增procdef界面初始化数据
+        addForm: {
+          id: '',
+          rev: '',
+          category: '',
+          name: '',
+          key: '',
+          version: '',
+          deploymentId: '',
+          resourceName: '',
+          dgrmResourceName: '',
+          description: '',
+          hasStartFormKey: '',
+          hasGraphicalNotation: '',
+          suspensionState: '',
+          tenantId: '',
+          engineVersion: ''
+        },
+        drawer: false,
+
+        /**begin 自定义属性请在下面加 请加备注**/
+        diagramVisible: false, //显示流程图
+        diagramUrl: '', //显示流程图的路径
+        flowStartVisible: false, //发起流程
+        categorys: [],
+        tagSelectVisible: false,
+        isBatchSetProcTags: false,
+        tableHeight: 300,
+        /**end 自定义属性请在上面加 请加备注**/
+      }
+    }, //end data
+    methods: {
+      //获取代码对应的名称 用于数据反显 如 getCodeName(options.sex,'1');
+      getCodeName(options, codeValue) {
+        if (!options) return codeValue;
+        let code = options.filter(i => i.codeValue == codeValue);
+        if (code.length > 0) {
+          return code[0].codeName
+        } else {
+          return codeValue
+        }
+      },
+
+      dialogWidth: function() {
+        if (screen.width > 500) {
+          return "80%";
+        } else {
+          return "100%";
+        }
+      },
+      handleSizeChange(pageSize) {
+        this.pageInfo.pageSize = pageSize;
+        this.pageInfo.total = 0;
+        this.pageInfo.count = true
+        this.pageInfo.pageNum = 1;
+        this.getProcdefs();
+      },
+      handleCurrentChange(pageNum) {
+        this.pageInfo.pageNum = pageNum;
+        this.getProcdefs();
+      },
+      // 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
+      sortChange(obj) {
+        var dir = 'asc';
+        if (obj.order == 'ascending') {
+          dir = 'asc'
+        } else {
+          dir = 'desc';
+        }
+        if (obj.prop == 'xxx') {
+          this.pageInfo.orderFields = ['xxx'];
+          this.pageInfo.orderDirs = [dir];
+        }
+        this.getProcdefs();
+      },
+      searchProcdefs() {
+        this.pageInfo.pageNum = 1;
+        this.pageInfo.total = 0;
+        this.pageInfo.count = true
+        this.getProcdefs();
+      },
+
+      //获取列表 Procdef act_re_procdef
+      getProcdefs() {
+        let params = {
+          pageSize: this.pageInfo.pageSize,
+          pageNum: this.pageInfo.pageNum,
+          total: this.pageInfo.total,
+          count: this.pageInfo.count
+        };
+        if (this.pageInfo.orderFields != null && this.pageInfo.orderFields.length > 0) {
+          let orderBys = [];
+          for (var i = 0; i < this.pageInfo.orderFields.length; i++) {
+            orderBys.push(this.pageInfo.orderFields[i] + " " + this.pageInfo.orderDirs[i])
+          }
+          params.orderBy = orderBys.join(",")
+        }
+        if (this.filters.key !== "") {
+          params.filtersKey = '%' + this.filters.key + '%'
+        }
+        if (this.filters.category !== "") {
+          params.category = this.filters.category
+        }
+        if (this.filters.params.formId != "" && this.filters.params.formId != null) {
+          params.formId = this.filters.params.formId
+        }
+
+        if (this.filters.procCategory != '' && this.filters.procCategory != null) {
+          params.category = this.filters.procCategory
+        }
 
+        if (this.filters.categoryTreeNodes != null && this.filters.categoryTreeNodes.length > 0) {
+          params.categoryIds = this.filters.categoryTreeNodes.map(i => i.id)
+        }
+
+        if (this.filters.tags != null && this.filters.tags.length > 0) {
+          params.tagIds = this.filters.tags.map(i => i.tagId)
+        }
+
+        if (this.filters.params != null && this.filters.params.bizKey != null && this.filters.params.bizKey != '') {
+          params.bizKey = this.filters.params.bizKey
+        }
+        params.tenantId = this.userInfo.branchId
+        params.includeContext = "1";
+        params.suspensionState = 1;
+        this.listLoading = true;
+        listProcdef(params).then((res) => {
+          var tips = res.data.tips;
+          if (tips.isOk) {
+            this.pageInfo.total = res.data.total
+            this.pageInfo.count = false
+            if (res.data.data.length == 1) {
+              this.addForm = res.data.data[0]
+              this.flowStartVisible = true;
+            } else if (res.data.data.length > 1) {
+              this.flowStartVisible = false;
+              this.$message.success("请选中一个流程")
+            }
+            this.procdefs = res.data.data;
+          } else {
+            this.$message({
+              message: tips.msg,
+              type: 'error'
+            });
+          }
+          this.listLoading = false;
+        }).catch(() => {
+          this.listLoading = false;
+
+        });
+      },
+
+      //选择行procdef
+      selsChange: function(sels) {
+        this.sels = sels;
+      },
+
+      rowClick: function(row, event, column) {
+        this.$emit('row-click', row, event, column); //  @row-click="rowClick"
+      },
+      /**begin 自定义函数请在下面加**/
+
+      showDiagram: function(row, index) {
+        this.diagramVisible = true;
+        this.diagramUrl = "/" + process.env.BASE_API + "/" + process.env.VERSION + "/" + config
+        .getWorkflowBasePath() + "/mdp/workflow/re/procdef/diagram/" + row.id
+      },
+      showFlowStart: function(row, index) {
+        this.addForm = row;
+        this.flowStartVisible = true;
+
+
+      },
+      startCancel() {
+        this.$emit("closeTab");
+      }
+      /**end 自定义函数请在上面加**/
+
+    }, //end methods
+    components: {
+      //在下面添加其它组件
+      'procinst-parames-start-set': ProcinstParamesStartSet,
+      'sticky': Sticky,
+    },
+    mounted() {
+
+      if (this.params) {
+        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;
+      })
+
+
+    }
+  }
 </script>
 
 <style scoped>
+  .filters-show {
+    margin-left: 20px;
+    margin-top: 10px;
+    margin-bottom: 0px;
+  }
+
+  .filters-label {
+    font-size: 14px;
+    color: black;
+    font-weight: bold;
+  }
+</style>
 
-  
-.filters-show {
-	margin-left: 20px;
-	margin-top: 10px;
-	margin-bottom: 0px;
-}
-.filters-label { 
-	font-size: 14px;
-	color:black;
-	font-weight: bold;
-}
-</style>
\ No newline at end of file
+<style>
+  .el-input-group__append,
+  .el-input-group__prepend {
+    background-color: #409EFF !important;
+    color: #ffffff !important;
+    vertical-align: middle;
+    display: table-cell;
+    position: relative;
+    border: 1px solid #409EFF !important;
+    padding: 0 20px;
+    width: 1px;
+    white-space: nowrap;
+  }
+</style>
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue
index 38c989ea..c65db1fc 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue
@@ -1,675 +1,647 @@
 <template>
-  <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-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>
+  <section>
+    <el-row class="app-container"> 
+      <el-col>
+        <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:270px;" 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)" icon="el-icon-search" class="hidden-md-and-down">标签</el-button>
+          <el-button @click.native="showTagSelect(true)" icon="el-icon-plus" class="hidden-md-and-down">标签</el-button>
+
+          <!-- <el-button @click="drawer = true" icon="el-icon-more" circle="true"></el-button> -->
+          <el-button @click="handleDownload" icon="el-icon-download" class="hidden-md-and-down">导出数据</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-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;">
+        <el-row style="padding-top:20px;">
           <!--列表 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 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 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> 
+            <el-table-column sortable prop="category" label="分类" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isSelectModel" sortable prop="name" label="流程(点击发起)" min-width="300" show-overflow-tooltip>
+              <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> 
+            <el-table-column v-else sortable prop="name" label="流程(点击选中)" min-width="300" show-overflow-tooltip>
+              <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-table-column  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>
+                <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  prop="description" label="描述" min-width="200" 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 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>
+                <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-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-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-row>
   </section>
 </template>
 
 <script>
-import util from "@/common/js/util"; //全局公共库
-import config from "@/common/config"; //全局公共库
-//import { selectCacheOptions,getDefaultValue,getCodeName } from '../../../../../api/common/code';//下拉框数据查询
-import { listProcdef, listCategorys } from "@/api/mdp/workflow/re/procdef";
-import ProcinstParamesStartSet from "../../ru/procinstParames/ProcinstParamesStartSet";
-import Sticky from "@/components/Sticky"; // 粘性header组件
-import { mapGetters } from "vuex";
-import CategoryTree from "@/views/mdp/arc/category/CategoryTree"; //修改界面
-import TagMng from "@/views/mdp/arc/tag/TagMng";
-import { batchInsertOrDeleteTags } from "@/api/mdp/workflow/re/procdefTag";
-export default {
-  name: "ProcdefListForStart",
-  props: ["params", "isSelectModel"],
-  computed: {
-    ...mapGetters(["userInfo"]),
-    screenWidth: function() {
-      return screen.width;
-    }
-  },
-  watch: {
-    params: function(params) {
-      this.filters.params = params;
-    }
-  },
-  data() {
-    return {
-      filters: {
-        key: "",
-        procCategory: "",
-        categoryTreeNodes: [],
-        tags: [],
-
-        params: {
-          mainTitle: "",
-          mainContext: "",
-          bizUrl: "", //前端跳转  //自带参数，建议只带主键
-          bizKey: "", //用于选中流程模型并原样输出到restUrl
-          restUrl: "", //后端接口同步
-          formId: "", //form 表单编号
-          formDataIds: [], //form表单对应的数据
-          extVars: {
-            //不用提交给工作流的变量池
-          },
-          flowVars: {
-            //提交进流程实例变量的变量池,flowVars所有变量将post方式推送回restUrl指定的地址
-          }
-        }
-      },
-      procdefs: [], //查询结果
-      pageInfo: {
-        //分页数据
-        total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-        pageSize: 10, //每页数据
-        pageNum: 1, //当前页码、从1开始计算
-        orderFields: [], //排序列 如 ['sex','student_id']，必须为数据库字段
-        orderDirs: [], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
-        count: true
-      },
-      listLoading: false, //查询中...
-      sels: [], //列表选中数据
-      options: {}, //下拉选择框的所有静态数据 options.sex,options.project
-
-      addFormVisible: false, //新增procdef界面是否显示
-      //新增procdef界面初始化数据
-      addForm: {
-        id: "",
-        rev: "",
-        category: "",
-        name: "",
-        key: "",
-        version: "",
-        deploymentId: "",
-        resourceName: "",
-        dgrmResourceName: "",
-        description: "",
-        hasStartFormKey: "",
-        hasGraphicalNotation: "",
-        suspensionState: "",
-        tenantId: "",
-        engineVersion: ""
-      },
-      drawer: false,
-
-      /**begin 自定义属性请在下面加 请加备注**/
-      diagramVisible: false, //显示流程图
-      diagramUrl: "", //显示流程图的路径
-      flowStartVisible: false, //发起流程
-      categorys: [],
-      tagSelectVisible: false,
-      isBatchSetProcTags: false,
-			tableHeight:300,
-      /**end 自定义属性请在上面加 请加备注**/
-    };
-  }, //end data
-  methods: {
-    //获取代码对应的名称 用于数据反显 如 getCodeName(options.sex,'1');
-    getCodeName(options, codeValue) {
-      if (!options) return codeValue;
-      let code = options.filter(i => i.codeValue == codeValue);
-      if (code.length > 0) {
-        return code[0].codeName;
-      } else {
-        return codeValue;
+  import util from "@/common/js/util"; //全局公共库
+  import config from "@/common/config"; //全局公共库
+  //import { selectCacheOptions,getDefaultValue,getCodeName } from '../../../../../api/common/code';//下拉框数据查询
+  import {
+    listProcdef,
+    listCategorys
+  } from "@/api/mdp/workflow/re/procdef";
+  import ProcinstParamesStartSet from "../../ru/procinstParames/ProcinstParamesStartSet";
+  import Sticky from "@/components/Sticky"; // 粘性header组件
+  import {
+    mapGetters
+  } from "vuex";
+  import CategoryTree from "@/views/mdp/arc/category/CategoryTree"; //修改界面
+  import TagMng from "@/views/mdp/arc/tag/TagMng";
+  import {
+    batchInsertOrDeleteTags
+  } from "@/api/mdp/workflow/re/procdefTag";
+  export default {
+    name: "ProcdefListForStart",
+    props: ["params", "isSelectModel"],
+    computed: {
+      ...mapGetters(["userInfo"]),
+      screenWidth: function() {
+        return screen.width;
       }
     },
-
-    dialogWidth: function() {
-      if (screen.width > 500) {
-        return "80%";
-      } else {
-        return "100%";
+    watch: {
+      params: function(params) {
+        this.filters.params = params;
       }
     },
-    handleSizeChange(pageSize) {
-      this.pageInfo.pageSize = pageSize;
-      this.pageInfo.total = 0;
-      this.pageInfo.count = true;
-      this.pageInfo.pageNum = 1;
-      this.getProcdefs();
-    },
-    handleCurrentChange(pageNum) {
-      this.pageInfo.pageNum = pageNum;
-      this.getProcdefs();
-    },
-    // 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
-    sortChange(obj) {
-      var dir = "asc";
-      if (obj.order == "ascending") {
-        dir = "asc";
-      } else {
-        dir = "desc";
-      }
-      if (obj.prop == "xxx") {
-        this.pageInfo.orderFields = ["xxx"];
-        this.pageInfo.orderDirs = [dir];
-      }
-      this.getProcdefs();
-    },
-    searchProcdefs() {
-      this.pageInfo.pageNum = 1;
-      this.pageInfo.total = 0;
-      this.pageInfo.count = true;
-      this.getProcdefs();
-    },
+    data() {
+      return {
+        filters: {
+          key: "",
+          procCategory: "",
+          categoryTreeNodes: [],
+          tags: [],
 
-    handleFiltersTagClose: function(tag, paramsName) {
-      if (paramsName == "key") {
-        this.filters.key = null;
-      } else if (paramsName == "categoryTreeNodes") {
-        this.filters.categoryTreeNodes = this.filters.categoryTreeNodes.filter(
-          i => i.id != tag.id
-        );
-        this.$refs.categoryTree.$refs.nodeTree.setChecked(tag.id, false, false);
-      } else if (paramsName == "procCategory") {
-        this.filters.procCategory = null;
-      } else if (paramsName == "tags") {
-        this.filters.tags = this.filters.tags.filter(i => i.tagId != tag.tagId);
-      }
-    },
+          params: {
+            mainTitle: "",
+            mainContext: "",
+            bizUrl: "", //前端跳转  //自带参数，建议只带主键
+            bizKey: "", //用于选中流程模型并原样输出到restUrl
+            restUrl: "", //后端接口同步
+            formId: "", //form 表单编号
+            formDataIds: [], //form表单对应的数据
+            extVars: {
+              //不用提交给工作流的变量池
+            },
+            flowVars: {
+              //提交进流程实例变量的变量池,flowVars所有变量将post方式推送回restUrl指定的地址
+            }
+          }
+        },
+        procdefs: [], //查询结果
+        pageInfo: {
+          //分页数据
+          total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
+          pageSize: 10, //每页数据
+          pageNum: 1, //当前页码、从1开始计算
+          orderFields: [], //排序列 如 ['sex','student_id']，必须为数据库字段
+          orderDirs: [], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
+          count: true
+        },
+        listLoading: false, //查询中...
+        sels: [], //列表选中数据
+        options: {}, //下拉选择框的所有静态数据 options.sex,options.project
 
-    onTagSelected(tags) {
-      this.tagSelectVisible = false;
-      if (this.isBatchSetProcTags == true) {
-        //TOD 批量更新后台数据标签
-        if (!tags || tags.length == 0) {
-          this.$message.error("最少选中一个标签");
-          this.isBatchSetProcTags = false;
-          return;
+        addFormVisible: false, //新增procdef界面是否显示
+        //新增procdef界面初始化数据
+        addForm: {
+          id: "",
+          rev: "",
+          category: "",
+          name: "",
+          key: "",
+          version: "",
+          deploymentId: "",
+          resourceName: "",
+          dgrmResourceName: "",
+          description: "",
+          hasStartFormKey: "",
+          hasGraphicalNotation: "",
+          suspensionState: "",
+          tenantId: "",
+          engineVersion: ""
+        },
+        drawer: false,
+
+        /**begin 自定义属性请在下面加 请加备注**/
+        diagramVisible: false, //显示流程图
+        diagramUrl: "", //显示流程图的路径
+        flowStartVisible: false, //发起流程
+        categorys: [],
+        tagSelectVisible: false,
+        isBatchSetProcTags: false,
+        tableHeight: 300,
+        /**end 自定义属性请在上面加 请加备注**/
+      };
+    }, //end data
+    methods: {
+      //获取代码对应的名称 用于数据反显 如 getCodeName(options.sex,'1');
+      getCodeName(options, codeValue) {
+        if (!options) return codeValue;
+        let code = options.filter(i => i.codeValue == codeValue);
+        if (code.length > 0) {
+          return code[0].codeName;
+        } else {
+          return codeValue;
         }
-        var procinstTagsVos = [];
-        this.sels.forEach(row => {
-          var procinstTags = {
-            procDefId: row.procDefId,
-            procInstId: row.procInstId,
-            branchId: row.branchId,
-            userid: this.userInfo.userid,
-            tags: tags.map(i => {
-              return { tagId: i.tagId, tagName: i.tagName };
-            })
-          };
-          procinstTagsVos.push(procinstTags);
-        });
-        var params = procinstTagsVos;
+      },
 
-        batchInsertOrDeleteTags(params)
-          .then(res => {
-            this.isBatchSetProcTags = false;
-            if (res.data.tips.isOk) {
-              var tagIds = tags.map(i => i.tagId).join(",");
-              var tagNames = tags.map(i => i.tagName).join(",");
-              this.sels.forEach(row => {
-                row.tagIds = tagIds;
-                row.tagNames = tagNames;
-              });
-              this.$message.success("打标签成功");
-            } else {
-              this.$message.error(res.data.tips.msg);
-            }
-          })
-          .catch(e => (this.isBatchSetProcTags = false));
-      } else {
-        if (tags == null) {
-          this.filters.tags = null;
+      dialogWidth: function() {
+        if (screen.width > 500) {
+          return "80%";
         } else {
-          this.filters.tags = tags;
+          return "100%";
         }
-      }
-    },
-    handleCategoryCheckChange(data, checked, indeterminate) {
-      if (data.id == "C0") {
-        //选择了根节点，默认不按分类查询
-        this.filters.categoryTreeNodes = null;
-        return;
-      }
-      var node = this.$refs.categoryTree.$refs.nodeTree.getCheckedNodes();
-      console.log("node-------------" + JSON.stringify(node));
-      this.filters.categoryTreeNodes = node;
-    },
-    showTagSelect: function(isBatchSetProcTags) {
-      if (isBatchSetProcTags == true) {
-        if (this.sels.length == 0) {
-          this.$message.error("请选中流程任务");
-          return false;
+      },
+      handleSizeChange(pageSize) {
+        this.pageInfo.pageSize = pageSize;
+        this.pageInfo.total = 0;
+        this.pageInfo.count = true;
+        this.pageInfo.pageNum = 1;
+        this.getProcdefs();
+      },
+      handleCurrentChange(pageNum) {
+        this.pageInfo.pageNum = pageNum;
+        this.getProcdefs();
+      },
+      // 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
+      sortChange(obj) {
+        var dir = "asc";
+        if (obj.order == "ascending") {
+          dir = "asc";
+        } else {
+          dir = "desc";
         }
-        this.tagSelectVisible = true;
-      } else {
-        this.tagSelectVisible = true;
-      }
-      this.isBatchSetProcTags = isBatchSetProcTags;
-    },
-    //获取列表 Procdef act_re_procdef
-    getProcdefs() {
-      let params = {
-        pageSize: this.pageInfo.pageSize,
-        pageNum: this.pageInfo.pageNum,
-        total: this.pageInfo.total,
-        count: this.pageInfo.count
-      };
-      if (
-        this.pageInfo.orderFields != null &&
-        this.pageInfo.orderFields.length > 0
-      ) {
-        let orderBys = [];
-        for (var i = 0; i < this.pageInfo.orderFields.length; i++) {
-          orderBys.push(
-            this.pageInfo.orderFields[i] + " " + this.pageInfo.orderDirs[i]
-          );
+        if (obj.prop == "xxx") {
+          this.pageInfo.orderFields = ["xxx"];
+          this.pageInfo.orderDirs = [dir];
         }
-        params.orderBy = orderBys.join(",");
-      }
-      if (this.filters.key !== "") {
-        params.filtersKey = "%" + this.filters.key + "%";
-      }
-      if (this.filters.category !== "") {
-        params.category = this.filters.category;
-      }
-      if (
-        this.filters.params.formId != "" &&
-        this.filters.params.formId != null
-      ) {
-        params.formId = this.filters.params.formId;
-      }
-
-      if (
-        this.filters.procCategory != "" &&
-        this.filters.procCategory != null
-      ) {
-        params.category = this.filters.procCategory;
-      }
+        this.getProcdefs();
+      },
+      searchProcdefs() {
+        this.pageInfo.pageNum = 1;
+        this.pageInfo.total = 0;
+        this.pageInfo.count = true;
+        this.getProcdefs();
+      },
 
-      if (
-        this.filters.categoryTreeNodes != null &&
-        this.filters.categoryTreeNodes.length > 0
-      ) {
-        params.categoryIds = this.filters.categoryTreeNodes.map(i => i.id);
-      }
+      handleFiltersTagClose: function(tag, paramsName) {
+        if (paramsName == "key") {
+          this.filters.key = null;
+        } else if (paramsName == "categoryTreeNodes") {
+          this.filters.categoryTreeNodes = this.filters.categoryTreeNodes.filter(
+            i => i.id != tag.id
+          );
+          this.$refs.categoryTree.$refs.nodeTree.setChecked(tag.id, false, false);
+        } else if (paramsName == "procCategory") {
+          this.filters.procCategory = null;
+        } else if (paramsName == "tags") {
+          this.filters.tags = this.filters.tags.filter(i => i.tagId != tag.tagId);
+        }
+      },
 
-      if (this.filters.tags != null && this.filters.tags.length > 0) {
-        params.tagIds = this.filters.tags.map(i => i.tagId);
-      }
+      onTagSelected(tags) {
+        this.tagSelectVisible = false;
+        if (this.isBatchSetProcTags == true) {
+          //TOD 批量更新后台数据标签
+          if (!tags || tags.length == 0) {
+            this.$message.error("最少选中一个标签");
+            this.isBatchSetProcTags = false;
+            return;
+          }
+          var procinstTagsVos = [];
+          this.sels.forEach(row => {
+            var procinstTags = {
+              procDefId: row.procDefId,
+              procInstId: row.procInstId,
+              branchId: row.branchId,
+              userid: this.userInfo.userid,
+              tags: tags.map(i => {
+                return {
+                  tagId: i.tagId,
+                  tagName: i.tagName
+                };
+              })
+            };
+            procinstTagsVos.push(procinstTags);
+          });
+          var params = procinstTagsVos;
 
-      if (
-        this.filters.params != null &&
-        this.filters.params.bizKey != null &&
-        this.filters.params.bizKey != ""
-      ) {
-        params.bizKey = this.filters.params.bizKey;
-      }
-      params.tenantId = this.userInfo.branchId;
-      params.includeContext = "1";
-      params.suspensionState = 1;
-      this.listLoading = true;
-      listProcdef(params)
-        .then(res => {
-          var tips = res.data.tips;
-          if (tips.isOk) {
-            this.pageInfo.total = res.data.total;
-            this.pageInfo.count = false;
-            this.procdefs = res.data.data;
+          batchInsertOrDeleteTags(params)
+            .then(res => {
+              this.isBatchSetProcTags = false;
+              if (res.data.tips.isOk) {
+                var tagIds = tags.map(i => i.tagId).join(",");
+                var tagNames = tags.map(i => i.tagName).join(",");
+                this.sels.forEach(row => {
+                  row.tagIds = tagIds;
+                  row.tagNames = tagNames;
+                });
+                this.$message.success("打标签成功");
+              } else {
+                this.$message.error(res.data.tips.msg);
+              }
+            })
+            .catch(e => (this.isBatchSetProcTags = false));
+        } else {
+          if (tags == null) {
+            this.filters.tags = null;
           } else {
-            this.$message({ message: tips.msg, type: "error" });
+            this.filters.tags = tags;
           }
-          this.listLoading = false;
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
+        }
+      },
+      handleCategoryCheckChange(data, checked, indeterminate) {
+        if (data.id == "C0") {
+          //选择了根节点，默认不按分类查询
+          this.filters.categoryTreeNodes = null;
+          return;
+        }
+        var node = this.$refs.categoryTree.$refs.nodeTree.getCheckedNodes();
+        console.log("node-------------" + JSON.stringify(node));
+        this.filters.categoryTreeNodes = node;
+      },
+      showTagSelect: function(isBatchSetProcTags) {
+        if (isBatchSetProcTags == true) {
+          if (this.sels.length == 0) {
+            this.$message.error("请选中流程任务");
+            return false;
+          }
+          this.tagSelectVisible = true;
+        } else {
+          this.tagSelectVisible = true;
+        }
+        this.isBatchSetProcTags = isBatchSetProcTags;
+      },
+      //获取列表 Procdef act_re_procdef
+      getProcdefs() {
+        let params = {
+          pageSize: this.pageInfo.pageSize,
+          pageNum: this.pageInfo.pageNum,
+          total: this.pageInfo.total,
+          count: this.pageInfo.count
+        };
+        if (
+          this.pageInfo.orderFields != null &&
+          this.pageInfo.orderFields.length > 0
+        ) {
+          let orderBys = [];
+          for (var i = 0; i < this.pageInfo.orderFields.length; i++) {
+            orderBys.push(
+              this.pageInfo.orderFields[i] + " " + this.pageInfo.orderDirs[i]
+            );
+          }
+          params.orderBy = orderBys.join(",");
+        }
+        if (this.filters.key !== "") {
+          params.filtersKey = "%" + this.filters.key + "%";
+        }
+        if (this.filters.category !== "") {
+          params.category = this.filters.category;
+        }
+        if (
+          this.filters.params.formId != "" &&
+          this.filters.params.formId != null
+        ) {
+          params.formId = this.filters.params.formId;
+        }
 
-    //选择行procdef
-    selsChange: function(sels) {
-      this.sels = sels;
-    },
+        if (
+          this.filters.procCategory != "" &&
+          this.filters.procCategory != null
+        ) {
+          params.category = this.filters.procCategory;
+        }
 
-    //激活挂起
-    handleStart: function(row, index) {
-      this.$confirm("确认删除该记录吗?", "提示", {
-        type: "warning"
-      })
-        .then(() => {
-          this.listLoading = true;
-          let params = { id: row.id };
-          startProcdef(params).then(res => {
-            this.listLoading = false;
+        if (
+          this.filters.categoryTreeNodes != null &&
+          this.filters.categoryTreeNodes.length > 0
+        ) {
+          params.categoryIds = this.filters.categoryTreeNodes.map(i => i.id);
+        }
+
+        if (this.filters.tags != null && this.filters.tags.length > 0) {
+          params.tagIds = this.filters.tags.map(i => i.tagId);
+        }
+
+        if (
+          this.filters.params != null &&
+          this.filters.params.bizKey != null &&
+          this.filters.params.bizKey != ""
+        ) {
+          params.bizKey = this.filters.params.bizKey;
+        }
+        params.tenantId = this.userInfo.branchId;
+        params.includeContext = "1";
+        params.suspensionState = 1;
+        if(this.params && !this.params.bizKey){
+          return;
+        }
+        this.listLoading = true;
+        listProcdef(params)
+          .then(res => {
             var tips = res.data.tips;
             if (tips.isOk) {
-              this.pageInfo.total = 0;
-              this.pageInfo.count = true;
-              this.getProcdefs();
+              this.pageInfo.total = res.data.total;
+              this.pageInfo.count = false;
+              this.procdefs = res.data.data;
+            } else {
+              this.$message({
+                message: tips.msg,
+                type: "error"
+              });
             }
-            this.$message({
-              message: tips.msg,
-              type: tips.isOk ? "success" : "error"
+            this.listLoading = false;
+          })
+          .catch(() => {
+            this.listLoading = false;
+          });
+      },
+
+      //选择行procdef
+      selsChange: function(sels) {
+        this.sels = sels;
+      },
+
+      //激活挂起
+      handleStart: function(row, index) {
+        this.$confirm("确认删除该记录吗?", "提示", {
+            type: "warning"
+          })
+          .then(() => {
+            this.listLoading = true;
+            let params = {
+              id: row.id
+            };
+            startProcdef(params).then(res => {
+              this.listLoading = false;
+              var tips = res.data.tips;
+              if (tips.isOk) {
+                this.pageInfo.total = 0;
+                this.pageInfo.count = true;
+                this.getProcdefs();
+              }
+              this.$message({
+                message: tips.msg,
+                type: tips.isOk ? "success" : "error"
+              });
             });
+          })
+          .catch(() => {
+            this.listLoading = false;
           });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
+      },
 
-    rowClick: function(row, event, column) {
-      this.$emit("row-click", row, event, column); //  @row-click="rowClick"
-    },
-    /**begin 自定义函数请在下面加**/
+      rowClick: function(row, event, column) {
+        this.$emit("row-click", row, event, column); //  @row-click="rowClick"
+      },
+      /**begin 自定义函数请在下面加**/
 
-    showDiagram: function(row, index) {
-      this.diagramVisible = true;
-      this.diagramUrl =
-        "/" +
-        process.env.BASE_API +
-        "/" +
-        process.env.VERSION +
-        "/" +
-        config.getWorkflowBasePath() +
-        "/mdp/workflow/re/procdef/diagram/" +
-        row.id;
-    },
-    showFlowStart: function(row, index) {
-      this.addForm = row;
-      //this.flowStartVisible = true;
-      // 传过来的参数格式
-      if (this.params) {
-        this.$emit("closeTab");
-        this.$router.replace({
-          name: "ProcinstParamesStartSetRoute",
-          params: { procdef: row, params: this.filters.params }
-        });
-      } else {
-        this.$router.push({
-          name: "ProcinstParamesStartSetRoute",
-          params: { procdef: row, params: this.filters.params }
+      showDiagram: function(row, index) {
+        this.diagramVisible = true;
+        this.diagramUrl =
+          "/" +
+          process.env.BASE_API +
+          "/" +
+          process.env.VERSION +
+          "/" +
+          config.getWorkflowBasePath() +
+          "/mdp/workflow/re/procdef/diagram/" +
+          row.id;
+      },
+      showFlowStart: function(row, index) {
+        this.addForm = row;
+        //this.flowStartVisible = true;
+        // 传过来的参数格式
+        if (this.params) {
+          this.$emit("closeTab");
+          this.$router.replace({
+            name: "ProcinstParamesStartSetRoute",
+            params: {
+              procdef: row,
+              params: this.filters.params
+            }
+          });
+        } else {
+          this.$router.push({
+            name: "ProcinstParamesStartSetRoute",
+            params: {
+              procdef: row,
+              params: this.filters.params
+            }
+          });
+        }
+      },
+      handleDownload() {
+        console.log(JSON.stringify(this.procdefs));
+        import("@/vendor/Export2Excel").then(excel => {
+          const tHeader = [
+            "状态",
+            "派生版本",
+            "hasGraphicalNotation",
+            "标签编号",
+            "主要操作---mainQx",
+            "描述",
+            "智能表单展示方式",
+            "标签名称",
+            "参数编号",
+            "主办人",
+            "部署编号",
+            "表单来源",
+            "主键",
+            "hasStartFormKey",
+            "derivedFromRoot",
+            "key",
+            "引擎版本",
+            "表单编号",
+            "版次",
+            "是否关联自定义表单",
+            "资源名称",
+            "版本",
+            "流程定义编号",
+            "流程标题",
+            "流程名称",
+            "图片名称",
+            "工作编号---tenantId",
+            "所属分类",
+            "监控人"
+          ];
+          const filterVal = [
+            "suspensionState",
+            "derivedVersion",
+            "hasGraphicalNotation",
+            "tagIds",
+            "mainQx",
+            "description",
+            "formShowType",
+            "tagNames",
+            "paramsId",
+            "sponsors",
+            "deploymentId",
+            "derivedFrom",
+            "id",
+            "hasStartFormKey",
+            "derivedFromRoot",
+            "key",
+            "engineVersion",
+            "formId",
+            "rev",
+            "isRefForm",
+            "resourceName",
+            "version",
+            "procDefId",
+            "mainTitle",
+            "name",
+            "dgrmResourceName",
+            "tenantId",
+            "category",
+            "monitors"
+          ];
+          const list = this.procdefs;
+          const data = this.formatJson(filterVal, list);
+          var filename = "发起流程导出";
+          if (this.formDefSelected) {
+            filename = this.formDefSelected.formName ?
+              this.formDefSelected.formName :
+              this.formDefSelected.id + "发起流程导出";
+          }
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: filename,
+            autoWidth: true,
+            bookType: "xlsx"
+          });
         });
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v =>
+          filterVal.map(j => {
+            if (j === "timestamp") {
+              return parseTime(v[j]);
+            } else {
+              return v[j];
+            }
+          })
+        );
       }
+      /**end 自定义函数请在上面加**/
+    }, //end methods
+    components: {
+      //在下面添加其它组件
+      "procinst-parames-start-set": ProcinstParamesStartSet,
+      sticky: Sticky,
+      CategoryTree,
+      TagMng
     },
-    handleDownload() {
-      console.log(JSON.stringify(this.procdefs));
-      import("@/vendor/Export2Excel").then(excel => {
-        const tHeader = [
-          "状态",
-          "派生版本",
-          "hasGraphicalNotation",
-          "标签编号",
-          "主要操作---mainQx",
-          "描述",
-          "智能表单展示方式",
-          "标签名称",
-          "参数编号",
-          "主办人",
-          "部署编号",
-          "表单来源",
-          "主键",
-          "hasStartFormKey",
-          "derivedFromRoot",
-          "key",
-          "引擎版本",
-          "表单编号",
-          "版次",
-          "是否关联自定义表单",
-          "资源名称",
-          "版本",
-          "流程定义编号",
-          "流程标题",
-          "流程名称",
-          "图片名称",
-          "工作编号---tenantId",
-          "所属分类",
-          "监控人"
-        ];
-        const filterVal = [
-          "suspensionState",
-          "derivedVersion",
-          "hasGraphicalNotation",
-          "tagIds",
-          "mainQx",
-          "description",
-          "formShowType",
-          "tagNames",
-          "paramsId",
-          "sponsors",
-          "deploymentId",
-          "derivedFrom",
-          "id",
-          "hasStartFormKey",
-          "derivedFromRoot",
-          "key",
-          "engineVersion",
-          "formId",
-          "rev",
-          "isRefForm",
-          "resourceName",
-          "version",
-          "procDefId",
-          "mainTitle",
-          "name",
-          "dgrmResourceName",
-          "tenantId",
-          "category",
-          "monitors"
-        ];
-        const list = this.procdefs;
-        const data = this.formatJson(filterVal, list);
-        var filename = "发起流程导出";
-        if (this.formDefSelected) {
-          filename = this.formDefSelected.formName
-            ? this.formDefSelected.formName
-            : this.formDefSelected.id + "发起流程导出";
-        }
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: filename,
-          autoWidth: true,
-          bookType: "xlsx"
-        });
+    mounted() {
+      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;
       });
-    },
-    formatJson(filterVal, jsonData) {
-      return jsonData.map(v =>
-        filterVal.map(j => {
-          if (j === "timestamp") {
-            return parseTime(v[j]);
-          } else {
-            return v[j];
-          }
-        })
-      );
     }
-    /**end 自定义函数请在上面加**/
-  }, //end methods
-  components: {
-    //在下面添加其它组件
-    "procinst-parames-start-set": ProcinstParamesStartSet,
-    sticky: Sticky,
-    CategoryTree,
-    TagMng
-  },
-  mounted() {
-    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;
-    });
-  }
-};
+  };
 </script>
 
 <style scoped>
-.filters-show {
-  margin-left: 20px;
-  margin-top: 10px;
-  margin-bottom: 0px;
-}
-.filters-label {
-  font-size: 14px;
-  color: black;
-  font-weight: bold;
-}
-</style>
\ No newline at end of file
+  .filters-show {
+    margin-left: 20px;
+    margin-top: 10px;
+    margin-bottom: 0px;
+  }
+
+  .filters-label {
+    font-size: 14px;
+    color: black;
+    font-weight: bold;
+  }
+
+  .el-button+.el-button {
+    margin-left: 0px;
+  }
+</style>
+
+<style>
+  .el-input-group__append,
+  .el-input-group__prepend {
+    background-color: #409EFF !important;
+    color: #ffffff !important;
+    vertical-align: middle;
+    display: table-cell;
+    position: relative;
+    border: 1px solid #409EFF !important;
+    padding: 0 20px;
+    width: 1px;
+    white-space: nowrap;
+  }
+</style>
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefMng.vue b/src/views/mdp/workflow/re/procdef/ProcdefMng.vue
index d8f6dbac..84ff81fa 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefMng.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefMng.vue
@@ -16,43 +16,7 @@
 		  </el-select>   
 			<el-button   @click.native="showTagSelect(false)"  >标签查找</el-button>
 			<el-button   @click.native="showTagSelect(true)"  >打标签</el-button>
-	    </el-row>
-		<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> 
 		<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> 
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue b/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue
index 3a8c3549..ed51e298 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue
@@ -1,35 +1,24 @@
 <template>
   <section>
-    <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 class="app-container">
+        <el-col>
           <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> 
+            </el-select>
+            <el-input v-model="filters.key" style="width:270px;" 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> 
+            </el-input>
+            <el-button @click.native="showTagSelect(false)" icon="el-icon-search" style="margin-left: 13px;" class="hidden-sm-and-down">标签</el-button>
+            <el-button @click.native="showTagSelect(true)" icon="el-icon-plus" class="hidden-sm-and-down">标签</el-button>
+            <el-button @click="handleDownload" icon="el-icon-download" class="hidden-md-and-down">导出数据</el-button>
+          </el-row>
           <!--列表 Procdef act_re_procdef-->
-          <el-row style="padding-top:10px;">
+          <el-row style="padding-top:20px;">
           <el-table
-            ref="table" :max-height="tableHeight" 
+            ref="table" :max-height="tableHeight"
             :data="procdefs"
             highlight-current-row
             v-loading="listLoading"
@@ -74,7 +63,7 @@
               label="模型文件名称"
               min-width="80"
               show-overflow-tooltip
-            ></el-table-column> 
+            ></el-table-column>
             <el-table-column
               sortable
               prop="description"
@@ -82,7 +71,7 @@
               min-width="80"
               show-overflow-tooltip
             ></el-table-column>
-            <el-table-column label="操作" width="200" fixed="right" >
+            <el-table-column label="操作" width="220" fixed="right" >
               <template slot-scope="scope">
                 <el-button @click="showDiagram( scope.row,scope.$index)">流程图</el-button>
                 <el-button
@@ -133,7 +122,7 @@
           </el-dialog>
           </el-row>
         </el-col>
-      </el-row> 
+      </el-row>
   </section>
 </template>
 
@@ -580,11 +569,11 @@ export default {
     listCategorys({ tenantId: this.userInfo.branchId }).then(res => {
       this.categorys = res.data.data;
     });
-    
-    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; 
+        var subHeight=70/1000 * window.innerHeight;
+        this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
     })
     this.getProcdefs();
   }
@@ -602,4 +591,18 @@ export default {
   color: black;
   font-weight: bold;
 }
-</style>
\ No newline at end of file
+</style>
+
+<style>
+  .el-input-group__append, .el-input-group__prepend {
+      background-color: #409EFF!important;
+      color: #ffffff!important;
+      vertical-align: middle;
+      display: table-cell;
+      position: relative;
+      border: 1px solid #409EFF!important;
+      padding: 0 20px;
+      width: 1px;
+      white-space: nowrap;
+  }
+</style>
diff --git a/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue b/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue
index 611a6bcc..7702b04d 100644
--- a/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue
+++ b/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue
@@ -1,14 +1,14 @@
 <template>
 	<section>
-		<el-row class="app-container">  
-			<!--新增界面 ProcinstParames 流程实例参数设置表--> 
+		<el-row class="app-container">
+			<!--新增界面 ProcinstParames 流程实例参数设置表-->
 			<el-col :span="24">
-			<!--新增界面 ProcdefParames 流程定义参数设置表--> 
-			<el-form :model="addForm"   label-width="120px" label-position="left" :rules="addFormRules" ref="addForm" v-loading="listLoading">  
+			<!--新增界面 ProcdefParames 流程定义参数设置表-->
+			<el-form :model="addForm"   label-width="120px" label-position="left" :rules="addFormRules" ref="addForm" v-loading="listLoading">
 				<el-form-item label="流程标题" prop="mainTitle">
 					<el-input v-model="addForm.mainTitle" auto-complete="off"></el-input>
-				</el-form-item> 
-				<el-form-item label="标签" prop="tagNames">
+				</el-form-item>
+				<el-form-item label="流程标签" prop="tagNames">
 					<font v-if="addForm.tagNames">
 					<el-tag  v-for="tag in (addForm.tagNames.split(','))" :key="tag"
 						:type="'warning'"
@@ -16,14 +16,14 @@
 						{{tag}}
 					</el-tag>
 					</font>
-						{{addForm.tagNames?'':'还没有标签，去打一个呗-->'}}
-					<el-button   @click.native="tagSelectVisible=true" :loading="addLoading">打标签</el-button>
-					<el-button  v-if="displayDiagram==false" @click="showDiagram()">流程图</el-button> 
+						{{addForm.tagNames?'':''}}
+					<el-button   @click.native="tagSelectVisible=true" :loading="addLoading" icon="el-icon-plus">标签</el-button>
+					<el-button  v-if="displayDiagram==false" @click="showDiagram()" icon="el-icon-view">流程图</el-button>
 				</el-form-item>
-				<el-col :span="12"> 
-					<el-form-item label="监控人" prop="monitors"> 
+				<el-col :span="12">
+					<el-form-item label="流程监控" prop="monitors">
 							<el-col :span="16">
-								<el-select style="width:100%" v-model="monitors" multiple clearable filterable placeholder="请选择">
+								<el-select style="width:100%" v-model="monitors" multiple clearable filterable placeholder="请选择人员">
 									<el-option
 									v-for="item in baseUserList"
 									:key="item.userid"
@@ -35,15 +35,15 @@
 								</el-select>
 							</el-col>
 							<el-col :span="8">
-								<el-button   @click.native="monitorsSelectVisible=true" :loading="addLoading">更多人员</el-button> 
+								<el-button   @click.native="monitorsSelectVisible=true" :loading="addLoading" icon="el-icon-more"></el-button>
 							</el-col>
-						
+
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="主办人" prop="sponsors">   
+					<el-form-item label="流程主办" prop="sponsors">
 							<el-col :span="16">
-								<el-select style="width:100%" v-model="sponsors" multiple  clearable filterable placeholder="请选择">
+								<el-select style="width:100%" v-model="sponsors" multiple  clearable filterable placeholder="请选择人员">
 									<el-option
 									v-for="item in baseUserList"
 									:key="item.userid"
@@ -55,16 +55,16 @@
 								</el-select>
 							</el-col>
 							<el-col :span="8">
-								<el-button   @click.native="sponsorsSelectVisible=true" :loading="addLoading">更多人员</el-button> 
-							</el-col> 
-					</el-form-item> 
-				</el-col> 
-				<el-form-item label="流程归档分类" prop="categoryId"> 
-					<el-col :span="14"> <category-tree  show-checkbox  :current-key="addForm.categoryId"  v-on:check-change="handleCategoryCheckChange" ></category-tree> 
-					</el-col> 
-				</el-form-item> 
-				<el-form-item label="关联智能表单" prop="isRefForm">
-					<el-col :span="10"> 
+								<el-button   @click.native="sponsorsSelectVisible=true" :loading="addLoading" icon="el-icon-more"></el-button>
+							</el-col>
+					</el-form-item>
+				</el-col>
+				<el-form-item label="归档分类" prop="categoryId">
+					<el-col :span="14"> <category-tree  show-checkbox  :current-key="addForm.categoryId"  v-on:check-change="handleCategoryCheckChange" ></category-tree>
+					</el-col>
+				</el-form-item>
+				<el-form-item label="关联表单" prop="isRefForm">
+					<el-col :span="10">
 					   <el-select style="width:100%" v-model="addForm.formId" clearable filterable  placeholder="请选择">
 					    <el-option
 					      v-for="item in formDefs"
@@ -74,13 +74,13 @@
 					    </el-option>
 					  </el-select>
 					</el-col>
-					<el-col :span="10" style="padding-left:5px;"> 
+					<el-col :span="10" style="padding-left:22px;">
 						<el-radio v-model="addForm.formShowType" label="form">表单形式展现</el-radio>
   						<el-radio v-model="addForm.formShowType" label="table">表格形式展现</el-radio>
 					</el-col>
-				</el-form-item>  
-				<form-data-mng-for-flow-form v-if="addForm.isRefForm=='1' && addForm.formId!=null && addForm.formId!=''" :formShowType="addForm.formShowType" :companyDepts="companyDepts" :companyEmployees="companyEmployees" :formId="addForm.formId" @formFieldsLoad="onFormFieldsLoad"><div></div></form-data-mng-for-flow-form> 
-				<el-form-item  label="审批人设置" prop="assignees">  
+				</el-form-item>
+				<form-data-mng-for-flow-form v-if="addForm.isRefForm=='1' && addForm.formId!=null && addForm.formId!=''" :formShowType="addForm.formShowType" :companyDepts="companyDepts" :companyEmployees="companyEmployees" :formId="addForm.formId" @formFieldsLoad="onFormFieldsLoad"><div></div></form-data-mng-for-flow-form>
+				<el-form-item  label="审批人设置" prop="assignees">
 					  <el-table
 						:data="nodeInfosSelectOptions"
 						border
@@ -97,10 +97,10 @@
 						label="已配置人员"
 						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="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>  
+								{{showAssigneeTips(scope.row)}}
+								<el-button round v-if="scope.row.candidate=='1'" size="mini" @click.native="showCandidateSelectDialog(scope.row,'')" :loading="addLoading">选候选人</el-button>
+								<el-button round v-if="scope.row.candidate!='1' " size="mini" @click.native="showUserSelectDialog(scope.row,'')" :loading="addLoading">选人员</el-button>
+								<el-button round v-if="scope.row.toCreater!='1'" size="mini" @click.native="setAssigneeAsStartUser(scope.row)">转发起人</el-button>
 							</template>
 						</el-table-column>
 						<el-table-column
@@ -108,64 +108,64 @@
 						prop="showNextAssignees"
 						label="手选执行人"
 						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-model="scope.row.showNextAssignees" label="可手选" true-label="1" false-label="0" border></el-checkbox>
 							</template>
 						</el-table-column>
 						<el-table-column
 						prop="candidate"
 						label="候选任务"
-						width="120"> 
+						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-model="scope.row.candidate" label="候选" true-label="1" false-label="0" border></el-checkbox>
 							</template>
-						</el-table-column> 
-						
+						</el-table-column>
+
 						<el-table-column
-						prop="qxCode" 
+						prop="qxCode"
 						label="权限配置"
 						min-width="100">
-							<template slot-scope="scope">  
-								<el-button   type="plain" @click.native="showQxDialog(scope.row)"  >配置权限</el-button>   
+							<template slot-scope="scope">
+								<el-button   type="plain" @click.native="showQxDialog(scope.row)"  >配置权限</el-button>
 							</template>
-						</el-table-column> 
-						
+						</el-table-column>
+
 						<el-table-column
-						prop="formId" 
+						prop="formId"
 						label="表单配置"
 						min-width="100">
-							<template slot-scope="scope">  
-								<el-button   type="plain" @click.native="showNodeForm(scope.row)"  >配置表单</el-button>   
+							<template slot-scope="scope">
+								<el-button   type="plain" @click.native="showNodeForm(scope.row)"  >配置表单</el-button>
 							</template>
-						</el-table-column> 
-					</el-table> 
+						</el-table-column>
+					</el-table>
 				</el-form-item>
 				<el-form-item label="流程正文" prop="mainContext">
-					<vue-editor :branch-id="userInfo.branchId" v-model="addForm.mainContext"></vue-editor>  
+					<vue-editor :branch-id="userInfo.branchId" v-model="addForm.mainContext"></vue-editor>
 				</el-form-item>
 				<el-form-item>
 					<attachment-upload :branch-id="userInfo.branchId" :deptid="userInfo.deptid" :archive-id="procdef.id" :category-id="addForm.categoryId"></attachment-upload>
 
 				</el-form-item>
-				
+
 				<el-form-item  label="流程权限" prop="mainQx">
 					 <el-button @click="showMainQxDialog">点击查看/设置流程权限</el-button>
 				</el-form-item>
-				<el-form-item> 
-							<el-button @click.native="handleCancel">取消</el-button>   
-							<el-button type="primary" @click.native="templateVisible=true" :loading="addLoading">导入模板</el-button> 
-							<el-button type="primary" @click.native="saveAsTemplate" :loading="addLoading">存为模板</el-button> 
-							<el-button type="primary" @click.native="addOrEditSubmit" :loading="addLoading">提交</el-button>   
-				</el-form-item> 
+				<el-form-item>
+              <el-button type="primary" @click.native="addOrEditSubmit" :loading="addLoading">提交</el-button>
+							<el-button @click.native="handleCancel">取消</el-button>
+							<el-button @click.native="templateVisible=true" :loading="addLoading">导入模板</el-button>
+							<el-button @click.native="saveAsTemplate" :loading="addLoading">存为模板</el-button>
+				</el-form-item>
 			</el-form>
-			</el-col>	
-			
-			<el-dialog 
+			</el-col>
+
+			<el-dialog
 				title="流程图"
 				:visible.sync="displayDiagram"
-				width="80%" append-to-body	> 
-				<el-image   :fit="'contain'" :src="diagramUrl"> 
+				width="80%" append-to-body	>
+				<el-image   :fit="'contain'" :src="diagramUrl">
 					<div slot="error" class="image-slot">
 						<i class="el-icon-picture-outline"></i>
 					</div>
@@ -173,64 +173,64 @@
 						正在全力加载中。。。。。。。。。。<i class="el-icon-loading"></i>
 					</div>
 				</el-image>
-				<span slot="footer" class="dialog-footer"> 
+				<span slot="footer" class="dialog-footer">
 					<el-button type="primary" @click="displayDiagram = false">关闭</el-button>
 				</span>
-			</el-dialog> 		 
-			 		 
+			</el-dialog>
+
 			<el-dialog append-to-body
 				title="模板导入"
 				:visible.sync="templateVisible"
-				width="60%"> 
-				<procdef-parames-template-mng :visible="templateVisible" :modelKey="procdef.key" :procDefId="procdef.id"  @cancel="templateVisible=false"   @confirm="onTemplateSelected"></procdef-parames-template-mng> 
+				width="60%">
+				<procdef-parames-template-mng :visible="templateVisible" :modelKey="procdef.key" :procDefId="procdef.id"  @cancel="templateVisible=false"   @confirm="onTemplateSelected"></procdef-parames-template-mng>
 			</el-dialog>
 			<el-dialog append-to-body
 				title="配置流程总体权限"
 				:visible.sync="mainQxVisible"
-				width="60%"> 
-				<act-qx-code-set :qxType="'mainQx'" :formFields="formFields" :visible="mainQxVisible" :qxCode="addForm.mainQx" @cancel="onMainQxCancel"   @confirm="onMainQxSelected"></act-qx-code-set> 
+				width="60%">
+				<act-qx-code-set :qxType="'mainQx'" :formFields="formFields" :visible="mainQxVisible" :qxCode="addForm.mainQx" @cancel="onMainQxCancel"   @confirm="onMainQxSelected"></act-qx-code-set>
 			</el-dialog>
 			<el-dialog append-to-body
 				title="配置流程节点权限"
 				:visible.sync="qxVisible"
-				width="60%"> 
-				<act-qx-code-set :formFields="formFields" :visible="qxVisible" :qxCode="actSelected ? actSelected.qxCode:''" @cancel="onQxCancel"   @confirm="onQxSelected"></act-qx-code-set> 
+				width="60%">
+				<act-qx-code-set :formFields="formFields" :visible="qxVisible" :qxCode="actSelected ? actSelected.qxCode:''" @cancel="onQxCancel"   @confirm="onQxSelected"></act-qx-code-set>
 			</el-dialog>
 			<el-dialog append-to-body
 				title="选择监控人"
 				:visible.sync="monitorsSelectVisible"
-				width="60%"> 
-				<users-select :select-userids="monitors.map(i=>i.userid)"   @confirm="onMonitorsSelected"></users-select> 
+				width="60%">
+				<users-select :select-userids="monitors.map(i=>i.userid)"   @confirm="onMonitorsSelected"></users-select>
 			</el-dialog>
 			<el-dialog append-to-body
 				title="设置标签"
 				:visible.sync="tagSelectVisible"
-				width="60%"> 
-				<tag-mng :tagIds="addForm.tagIds==null?null:addForm.tagIds.split(',')"  :jump="true" @select-confirm="onTagSelected"></tag-mng> 
+				width="60%">
+				<tag-mng :tagIds="addForm.tagIds==null?null:addForm.tagIds.split(',')"  :jump="true" @select-confirm="onTagSelected"></tag-mng>
 			</el-dialog>
 			<el-dialog append-to-body
 				title="选择候选人/候选部门/候选岗位"
 				:visible.sync="candidateSelectVisible"
-				width="60%"> 
-				<act-candidate-set :actAssignee="actSelected"  @confirm="onCandidateSelected"></act-candidate-set> 
+				width="60%">
+				<act-candidate-set :actAssignee="actSelected"  @confirm="onCandidateSelected"></act-candidate-set>
 			</el-dialog>
 			<el-dialog append-to-body
 				title="选择主办员工"
 				:visible.sync="sponsorsSelectVisible"
-				width="60%"> 
-				<users-select :select-userids="sponsors.map(i=>i.userid)"   @confirm="onSponsorsSelected"></users-select> 
+				width="60%">
+				<users-select :select-userids="sponsors.map(i=>i.userid)"   @confirm="onSponsorsSelected"></users-select>
 			</el-dialog>
 			<el-dialog append-to-body
 				title="选择审批员工"
 				:visible.sync="userSelectVisible"
-				width="60%"> 
-				<users-select :select-userids=" (actSelected && actSelected.nodeUsers)?actSelected.nodeUsers:[]"   @confirm="onUserSelected"></users-select> 
+				width="60%">
+				<users-select :select-userids=" (actSelected && actSelected.nodeUsers)?actSelected.nodeUsers:[]"   @confirm="onUserSelected"></users-select>
 			</el-dialog>
 			<el-dialog append-to-body
 				title="配置表单"
 				:visible.sync="nodeFormVisible"
-				width="80%"> 
-				<form-def-for-flow-node :visible="nodeFormVisible" :form-id=" (actSelected && actSelected.formId)?actSelected.formId:''" @cancel="onNodeFormCancel" :form-fields-json="actSelected?actSelected.formFieldsJson:null"  @submit="onFormDefForFlowNodeSubmit"></form-def-for-flow-node> 
+				width="80%">
+				<form-def-for-flow-node :visible="nodeFormVisible" :form-id=" (actSelected && actSelected.formId)?actSelected.formId:''" @cancel="onNodeFormCancel" :form-fields-json="actSelected?actSelected.formFieldsJson:null"  @submit="onFormDefForFlowNodeSubmit"></form-def-for-flow-node>
 			</el-dialog>
 		</el-row>
 	</section>
@@ -238,7 +238,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import config from '@/common/config';//全局公共库import 
+	import config from '@/common/config';//全局公共库import
 	//import { getCompanyEmployees,getCompanyDepts, selectCacheOptions,getDefaultValue,getCodeName } from '@/api/common/code';//下拉框数据查询
 	import { editProcdefParames,listProcdefParames, addProcdefParames } from '@/api/mdp/workflow/re/procdefParames';
 	import { listProcdefParamesTemplate, addOrUpdateTemplate } from '@/api/mdp/workflow/re/procdefParamesTemplate';
@@ -249,18 +249,18 @@
 	import { listUser,listUserNames } from '@/api/mdp/sys/user';
 	import { listDept } from '@/api/mdp/sys/dept';
 	import Sticky from '@/components/Sticky' // 粘性header组件
-	import { mapGetters } from 'vuex' 
-	import AttachmentUpload from '@/views/mdp/arc/archiveAttachment/AttachmentUpload';  
+	import { mapGetters } from 'vuex'
+	import AttachmentUpload from '@/views/mdp/arc/archiveAttachment/AttachmentUpload';
 	import VueEditor from '@/components/VueEditor/Index';
-	import UsersSelect from '@/views/mdp/sys/user/UsersSelect';  
-	import FormDefForFlowNode from '@/views/mdp/form/formDef/FormDefForFlowNode';  
-	
-	import ProcdefParamesTemplateMng from '@/views/mdp/workflow/re/ProcdefParamesTemplate/ProcdefParamesTemplateMng';  
-	
-	import TagMng from '@/views/mdp/arc/tag/TagMng';  
-	
-	import ActCandidateSet from '@/views/mdp/workflow/re/procdefParames/ActCandidateSet';  
-	import ActQxCodeSet from '@/views/mdp/workflow/re/procdefParames/ActQxCodeSet';  
+	import UsersSelect from '@/views/mdp/sys/user/UsersSelect';
+	import FormDefForFlowNode from '@/views/mdp/form/formDef/FormDefForFlowNode';
+
+	import ProcdefParamesTemplateMng from '@/views/mdp/workflow/re/ProcdefParamesTemplate/ProcdefParamesTemplateMng';
+
+	import TagMng from '@/views/mdp/arc/tag/TagMng';
+
+	import ActCandidateSet from '@/views/mdp/workflow/re/procdefParames/ActCandidateSet';
+	import ActQxCodeSet from '@/views/mdp/workflow/re/procdefParames/ActQxCodeSet';
 
 	export default {
 		name:'ProcdefParamesSet',
@@ -279,7 +279,7 @@
 	    	  		this.addForm.isRefForm="0"
 	    	  	}else{
 	    	  		this.addForm.isRefForm="1"
-	    	  	} 
+	    	  	}
 		      },
 	      'procdef':function( procdef ) {
 		        this.addForm.procDefId=procdef.id;
@@ -293,15 +293,15 @@
 		        this.sponsors=[];
 		        this.$nextTick(() => {
 					this.getProcdefParamess();
-					this.listBpmnActAssignees(); 
+					this.listBpmnActAssignees();
 	        	});
-		       
-		  }, 
-	      'visible':function(visible) {  
-	      	if(visible==true){ 
+
+		  },
+	      'visible':function(visible) {
+	      	if(visible==true){
 	      	}
-	      } 
-	    },	
+	      }
+	    },
 		data() {
 			return {
 				options:{},//下拉选择框的所有静态数据
@@ -328,9 +328,9 @@
 				formDefs:[],
 				diagramUrl:'',
 				nodeInfos:[],//id:'',actId:'',actName:'',procDefId:'',assignees:'',isMultiple:'' ,
-				nodeInfosSelectOptions:[],//id:'',actId:'',actName:'',procDefId:'',assignees:[],isMultiple:'' 
-				candidateSelectVisible:false, 
-				userSelectVisible:false, 
+				nodeInfosSelectOptions:[],//id:'',actId:'',actName:'',procDefId:'',assignees:[],isMultiple:''
+				candidateSelectVisible:false,
+				userSelectVisible:false,
 				actSelected:null,//选中的nodeInfos
 				sponsorsSelectVisible:false,
 				monitorsSelectVisible:false,
@@ -354,8 +354,8 @@
 				this.$refs.addForm.validate((valid) => {
 					if (valid) {
 						this.$confirm('确认提交吗？', '提示', {}).then(() => {
-							this.addLoading = true; 
-							let params = Object.assign({}, this.addForm); 
+							this.addLoading = true;
+							let params = Object.assign({}, this.addForm);
 							params.sponsors=this.sponsors.map(i=>i.userid).join(',');
 							params.monitors=this.monitors.map(i=>i.userid).join(',');
 							if(params.branchId==null || params.branchId==''){
@@ -368,17 +368,17 @@
 							}
 							var nodeInfosNew=new Array();
 							this.nodeInfosSelectOptions.forEach(i=>{
-								let act=Object.assign({},i) 
+								let act=Object.assign({},i)
 								 if(act.showNextAssignees==null || act.showNextAssignees==''||!act.showNextAssignees){
 									act.showNextAssignees="0"
 								 }
 								 if(act.candidate==null || act.candidate==''||!act.candidate){
 									act.candidate="0"
-								 } 
+								 }
 								 if(act.isMultiple==null || act.isMultiple==''||!act.isMultiple){
 									act.isMultiple="0"
 								 }
-								 
+
 								 if(act.instanceCount==null || act.instanceCount==''||!act.instanceCount){
 									act.instanceCount="0"
 								 }
@@ -389,20 +389,20 @@
 								params.modelKey=this.procdef.key
 								addOrUpdateTemplate(params).then(res=>{
 									var tips=res.data.tips;
-									this.addLoading = false; 
-									this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); 
+									this.addLoading = false;
+									this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
 								}).catch(e=>this.addLoading=false);
 								return;
 							}
 							if(params.id==''){
 								addProcdefParames({procdefParames:params,nodeInfos:nodeInfosNew}).then((res) => {
-									this.addLoading = false; 
+									this.addLoading = false;
 									var tips=res.data.tips;
 									if(tips.isOk){
 										this.$refs['addForm'].resetFields();
 										this.$emit('submit');//  @submit="afterAddSubmit"
 									}
-									this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); 
+									this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
 								}).catch(() => {
 									this.addLoading = false;
 								});
@@ -414,20 +414,20 @@
 									changeTags="0"
 								}else{//修改过标签
 									changeTags="1"
-								} 
+								}
 								editProcdefParames({changeTags:changeTags,procdefParames:params,nodeInfos:nodeInfosNew}).then((res) => {
-									this.addLoading = false; 
+									this.addLoading = false;
 									var tips=res.data.tips;
 									if(tips.isOk){
 										this.$refs['addForm'].resetFields();
 										this.$emit('submit');//  @submit="afterAddSubmit"
 									}
-									this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); 
+									this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
 								}).catch(() => {
 									this.addLoading = false;
 								});
 							}
-							
+
 						});
 					}
 				});
@@ -438,33 +438,33 @@
 				let params = {
 					procDefId: this.procdef.id
 				};
-				 
+
 				this.listLoading = true;
 				listProcdefParames(params).then((res) => {
 					var tips=res.data.tips;
-					if(tips.isOk){  
+					if(tips.isOk){
 						if(res.data.data.length>0){
 							console.log(res.data);
-							this.addForm=res.data.data[0]; 
+							this.addForm=res.data.data[0];
 							this.sponsors=this.addForm.sponsors==null?[]:this.addForm.sponsors.split(',').map(i=>{return {userid:i,username:i}});
 							this.monitors=this.addForm.monitors==null?[]:this.addForm.monitors.split(',').map(i=>{return {userid:i,username:i}});
 						}
-						
+
 						console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxx");
 						console.log(this.nodeInfosSelectOptions);
 					}else{
 						this.$message({ message: tips.msg, type: 'error' });
-					} 
+					}
 					this.listLoading = false;
 				}).catch(() => {
 					this.listLoading = false;
-					
+
 				});
-			},	 
+			},
 			onCandidateSelected:function(actAssignee){
 				this.candidateSelectVisible=false;
 				console.log("actAssignee-----------"+JSON.stringify(actAssignee));
-				 
+
 				this.actSelected.nodeUsers=actAssignee.nodeUsers;
 				this.actSelected.groupIds=actAssignee.groupIds
 				this.actSelected.toCreater='0'
@@ -478,18 +478,18 @@
 						this.baseUserList.push(i);
 					}
 				})
-				this.actSelected.nodeUsers=users 
+				this.actSelected.nodeUsers=users
 				this.actSelected.toCreater='0'
 
-			}, 
+			},
 			onTagSelected:function(tags){
 				this.tagSelectVisible=false;
 				console.log("tags"+JSON.stringify(tags));
-				this.addForm.tagIds=tags.map(t=>t.tagId).join(",");  
-				this.addForm.tagNames=tags.map(t=>t.tagName).join(",");  
+				this.addForm.tagIds=tags.map(t=>t.tagId).join(",");
+				this.addForm.tagNames=tags.map(t=>t.tagName).join(",");
+
+			},
 
-			}, 
-			
 			onMonitorsSelected:function(users){
 				this.monitorsSelectVisible=false;
 				console.log("posts-----------"+JSON.stringify(users));
@@ -501,7 +501,7 @@
 				this.monitors=users;
 
 			},
-			
+
 			onSponsorsSelected:function(users){
 				this.sponsorsSelectVisible=false;
 				users.forEach(i=>{
@@ -509,7 +509,7 @@
 						this.baseUserList.push(i);
 					}
 				})
-				console.log("posts-----------"+JSON.stringify(users));  
+				console.log("posts-----------"+JSON.stringify(users));
 				this.sponsors=users;
 			},
 			showMonitorsSelectDialog(){
@@ -517,8 +517,8 @@
 			},
 			showSponsorsSelectDialog(){
 
-			}, 
-			
+			},
+
 			showUserSelectDialog:function(actSelected,index){
 				console.log(actSelected);
 				this.userSelectVisible=true;
@@ -537,7 +537,7 @@
 					if(actAssignee.nodeUsers){
 						var userCount=actAssignee.nodeUsers.length;
 						tips.push(userCount+"个候选用户");
-					} 
+					}
 					if(actAssignee.groupIds){
 						var groupCount=actAssignee.groupIds.split(",").length;
 						tips.push(groupCount+"个候选部门/岗位");
@@ -545,14 +545,14 @@
 					if(tips.length==0){
 						tips.push("未配置任何候选人/候选部门/候选岗位");
 					}
-					
+
 				}else{
 					if(actAssignee.nodeUsers){
- 
-							tips=tips.concat(actAssignee.nodeUsers.map(i=>i.username)); 
+
+							tips=tips.concat(actAssignee.nodeUsers.map(i=>i.username));
 					}else{
 						tips.push("未配置任何任务执行人");
-					} 
+					}
 				}
 				return tips.join(",");
 			},
@@ -566,11 +566,11 @@
 				this.listLoading = true;
 				listFormDef(params).then((res) => {
 					var tips=res.data.tips;
-					if(tips.isOk){ 
+					if(tips.isOk){
 						this.formDefs = res.data.data;
 					}else{
 						this.$message({ message: tips.msg, type: 'error' });
-					} 
+					}
 					this.listLoading = false;
 				}).catch(() => {
 					this.listLoading = false;
@@ -578,7 +578,7 @@
 				});
 			},
 			handleCategoryCheckChange(data, checked, indeterminate){
-				console.log("555555555555555555555555555555555555555555"); 
+				console.log("555555555555555555555555555555555555555555");
 				this.addForm.categoryId=checked?data.id:'';
 				console.log(this.addForm.categoryId);
 			},
@@ -595,14 +595,14 @@
 					if(tips.isOk){
 						//this.nodeInfos=res.data.data
 						this.nodeInfos=res.data.data;
-						this.nodeInfosSelectOptions=this.nodeInfos; 
+						this.nodeInfosSelectOptions=this.nodeInfos;
 					}else{
 						this.$message({ message: tips.msg, type: 'error' });
 					}
 				});
 			},
 			/**end 在上面加自定义方法**/
-			
+
 			initBaseUserList(){
 				var that=this;
 				var sponsors=that.addForm.sponsors.split(',').map(i=>{return {userid:i,username:i}});
@@ -611,7 +611,7 @@
 				var currentUser={userid:this.userInfo.userid,username:this.userInfo.username}
 				that.baseUserList=sponsors.concat(monitors.filter(m=>!sponsors.some(s=>s.userid==m.userid)))
 				that.sponsors=sponsors;
-				that.monitors=monitors; 
+				that.monitors=monitors;
 				if(!that.baseUserList.some(i=>i.userid==currentUser.userid)){
 						that.baseUserList.push(currentUser);
 				}
@@ -620,7 +620,7 @@
 				}
 				listUserNames({userids:that.baseUserList.map(i=>i.userid),branchId:that.userInfo.branchId}).then(res=>{
 					if(res.data.tips.isOk){
-						that.baseUserList=res.data.data 
+						that.baseUserList=res.data.data
 						that.baseUserList.forEach(u=>{
 							that.monitors.forEach((m,index)=>{
 								if(m.userid==u.userid){
@@ -634,32 +634,32 @@
 							});
 						})
 					}
-					
+
 				});
 			},
 			onQxSelected:function(qxCode){
 				this.qxVisible=false;
 				this.actSelected.qxCode=qxCode;
 			},
-			
+
 			onQxCancel:function(){
-				this.qxVisible=false; 
+				this.qxVisible=false;
 			},
 			showQxDialog:function(act){
 				this.qxVisible=true;
 				this.actSelected=act;
 			},
-			
+
 			onMainQxSelected:function(qxCode){
 				this.mainQxVisible=false;
 				this.addForm.mainQx=qxCode;
 			},
-			
+
 			onMainQxCancel:function(){
-				this.mainQxVisible=false; 
+				this.mainQxVisible=false;
 			},
 			showMainQxDialog:function(){
-				this.mainQxVisible=true; 
+				this.mainQxVisible=true;
 			},
 			onFormFieldsLoad:function(formFields){
 				this.formFields=formFields;
@@ -691,23 +691,23 @@
 			onNodeFormCancel:function(){
 				this.nodeFormVisible=false;
 			},
-			showNodeForm:function(nodeInfo){ 
-				this.actSelected=nodeInfo 
+			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: {  
+		components: {
 		    //在下面添加其它组件 'procdef-parames-edit':ProcdefParamesEdit
 		    'form-data-mng-for-flow-form':FormDataMngForFlowForm,
 		    'vue-editor':VueEditor,
@@ -715,7 +715,7 @@
 			'sticky': Sticky,
 			AttachmentUpload,UsersSelect,ActCandidateSet,TagMng,ActQxCodeSet,ProcdefParamesTemplateMng,FormDefForFlowNode
 		},
-		mounted() { 
+		mounted() {
 				this.addForm=Object.assign(this.addForm, this.procdefParames);
 				this.addForm.procDefId=this.procdef.id;
 				this.addForm.mainTitle=this.procdef.name;
@@ -723,21 +723,21 @@
 				this.listBpmnActAssignees();
 				this.getFormDefs();
 				this.initBaseUserList();
-				 
-					 
-			
+
+
+
 			//加载下拉列表 如有需要去掉注释
 			/**
 			let optionsParams={code:'all',fieldNames:['sex']};
 			selectCacheOptions(optionsParams).then(res=>{
 				this.options=res.data.data;
-			}); 
+			});
 			**/
 			//给下拉列表初始化默认值
 			//this.addForm.xxx=getDefaultValue(this.options.xxx,'1');
-			
+
 			/**在下面写其它函数***/
-			
+
 		}//end mounted
 	}
 
@@ -747,4 +747,4 @@
 	.actConfig {
 		margin-bottom: 14px;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/mdp/workflow/ru/execution/ExecutionMng.vue b/src/views/mdp/workflow/ru/execution/ExecutionMng.vue
index 7ffc2d1c..ef21e743 100644
--- a/src/views/mdp/workflow/ru/execution/ExecutionMng.vue
+++ b/src/views/mdp/workflow/ru/execution/ExecutionMng.vue
@@ -1,1156 +1,1365 @@
 <template>
-	<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 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-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"
-						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>
-				<!--列表 Execution act_ru_execution-->
-				<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" show-overflow-tooltip>
-						<template slot-scope="scope">  
-							 <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" 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" 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>  
-							<el-dropdown @command="handleCommand"    class="hidden-sm-and-down" >
-								<span class="el-dropdown-link">
-								更多<i class="el-icon-arrow-down el-icon--right"></i>
-								</span>
-								<el-dropdown-menu slot="dropdown"> 
-								<el-dropdown-item icon="el-icon-setting" v-if="scope.row.suspensionState=='1'" :command="{type:'handleSuspend',row:scope.row}">挂起流程</el-dropdown-item>
-								<el-dropdown-item icon="el-icon-success" v-if="scope.row.suspensionState=='2'"  :command="{type:'handleActivite',index:scope.$index,row:scope.row}">激活流程</el-dropdown-item>  
-								<el-dropdown-item icon="el-icon-remove"   :command="{type:'handleDel',index:scope.$index,row:scope.row}">删除</el-dropdown-item> 
-								</el-dropdown-menu>
-							</el-dropdown> 
-						</template>
-					</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>
-				</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">
-					<!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
-					<template
-						slot="dateCell"
-						slot-scope="{date, data}">
-						<div :class="data.isSelected ? 'is-selected' : ''">
-							<div class="calendar-cell-data"> {{ data.day.split('-')[2] }}{{ data.isSelected ? '✔️' : ''}}
-								<div  v-for=" (i,index)  in  showCalendarDataTips(date,data)"  :key="index">  
-									<el-popover
-									placement="right" 
-									trigger="hover">
-									<el-row>
-										<el-col>
-											<el-tag v-for=" tag in i.tags" :key="tag.id">{{tag.tagName+'('+tag.count+')'}}</el-tag>
-										</el-col>
-									</el-row>
-									<el-table :data="i.allTasks"  max-height="450px" max-width="450px">
-										<el-table-column width="40" type="index"></el-table-column>
-										<el-table-column sortable min-width="250" property="mainTitle" label="流程【任务】(点击详情)">
-											<template slot-scope="scope">
-												<el-link type="primary"  @click.stop="showTasksInfo( scope.row,scope.$index)">{{scope.row.mainTitle}}【{{scope.row.taskName}}】</el-link> 
-											</template> 
-										</el-table-column>
-										<el-table-column sortable prop="assigneeName" label="执行人" min-width="100" ></el-table-column>
-										<el-table-column sortable min-width="80" property="calStatus" label="状态">
-											<template slot-scope="scope">
-												<el-tag effect="dark" type="info" v-if="scope.row.calStatus=='开始'">开始</el-tag>  
-												<el-tag effect="dark" type="warning" v-if="scope.row.calStatus=='到期'">到期</el-tag> 
-												<el-tag effect="dark" type="success" v-if="scope.row.calStatus=='执行中'">执行中</el-tag>  
-												<el-tag effect="dark" type="danger" v-if="scope.row.calStatus=='延期'">延期</el-tag>
-											</template>
-
-										</el-table-column>
-										<el-table-column sortable min-width="120" property="tagNames" label="标签">
-											<template slot-scope="scope">
-												<div v-if="scope.row.tagNames"><el-tag effect="light" type="" v-for="(tagName,index) in scope.row.tagNames.split(',')"  :key="index">{{tagName}}</el-tag>   </div>
-											</template>
-										</el-table-column>
-										<el-table-column sortable min-width="100" property="planFinishTime" label="到期时间" ></el-table-column>
-									</el-table> 
-									<div slot="reference">
-										<el-tag effect="dark" type="info" v-if="i.startTasksCount>0">{{'开始:'+i.startTasksCount}}</el-tag>  
-										<el-tag effect="dark" type="warning" v-if="i.planFinishTasksCount>0">{{'到期:'+i.planFinishTasksCount}}</el-tag> 
-										<el-tag effect="dark" type="success" v-if="i.runningTasksCount>0">{{'执行中:'+i.runningTasksCount}}</el-tag>  
-										<el-tag effect="dark" type="danger" v-if="i.delayTasksCount>0">{{'延期:'+i.delayTasksCount}}</el-tag>  
-									</div>
-								</el-popover> 
-								</div>
-							</div>
-						</div>
-					</template>
-					</el-calendar>
-			</el-col>
-			<el-dialog append-to-body
-				title="选择员工"
-				:visible.sync="userSelectVisible"
-				width="60%">  
-				<users-select :select-userids="filters.assignee?[filters.assignee.userid]:[]"   @confirm="onUserSelected"></users-select> 
-			</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-dialog title="短信催办" :visible.sync="sendSmsVisible"  :width="dialogWidth()"  :close-on-click-modal="false">
-				<send-sms :sms-body-params="smsBodyParams" :sms-user-list="smsUserList" :load-phoneno-by-userid='true' :visible="sendSmsVisible" @cancel="sendSmsVisible=false" ></send-sms>
-			</el-dialog>
-			<!--编辑 Execution act_ru_execution界面-->
-			<el-dialog title="任务详情" :visible.sync="editFormVisible" fullscreen :width="dialogWidth()"  :close-on-click-modal="false"> 
-				<procinst-parames-execution-set :companyEmployees="companyEmployees" :companyDepts="companyDepts" :taskInfo='editForm' :isArchive="isArchive" :procDefId="editForm.procDefId" :procInstId="editForm.procInstId" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></procinst-parames-execution-set>
-			</el-dialog>
-		</el-row>
-	</section>
+  <section>
+    <el-row class="app-container"> 
+      <el-col v-if="showCalendar==false">
+        <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-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-date-picker v-model="filters.startTimeRanger" class="" 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:270px;" 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" 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" style="margin-left: 13px;" class="hidden-lg-and-down" icon="el-icon-alarm-clock " 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-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-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">
+                <font class="more-label-font">
+                  流程状态
+                </font>
+                <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">
+                <el-checkbox size="mini" v-model="showCalendar">按日历风格显示</el-checkbox>
+              </el-col>
+
+
+
+              <el-col :span="24" style="margin-top: 11px;">
+                <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" style="margin-left: 13px;" circle></el-button>
+          </el-popover>
+        </el-row>
+        <!--列表 Execution act_ru_execution-->
+        <el-row style="padding-top:20px;">
+          <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" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <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" 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" 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>
+                <el-dropdown @command="handleCommand" class="hidden-sm-and-down">
+                  <span class="el-dropdown-link">
+                    更多<i class="el-icon-arrow-down el-icon--right"></i>
+                  </span>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item icon="el-icon-setting" v-if="scope.row.suspensionState=='1'"
+                      :command="{type:'handleSuspend',row:scope.row}">挂起流程</el-dropdown-item>
+                    <el-dropdown-item icon="el-icon-success" v-if="scope.row.suspensionState=='2'"
+                      :command="{type:'handleActivite',index:scope.$index,row:scope.row}">激活流程</el-dropdown-item>
+                    <el-dropdown-item icon="el-icon-remove"
+                      :command="{type:'handleDel',index:scope.$index,row:scope.row}">删除</el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </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-row>
+      </el-col>
+
+      <el-col v-if="showCalendar==true">
+
+        <el-calendar v-loading="listLoading" v-model="filters.calendarDate">
+          <!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
+          <template slot="dateCell" slot-scope="{date, data}">
+            <div :class="data.isSelected ? 'is-selected' : ''">
+              <div class="calendar-cell-data"> {{ data.day.split('-')[2] }}{{ data.isSelected ? '✔️' : ''}}
+                <div v-for=" (i,index)  in  showCalendarDataTips(date,data)" :key="index">
+                  <el-popover placement="right" trigger="hover">
+                    <el-row>
+                      <el-col>
+                        <el-tag v-for=" tag in i.tags" :key="tag.id">{{tag.tagName+'('+tag.count+')'}}</el-tag>
+                      </el-col>
+                    </el-row>
+                    <el-table :data="i.allTasks" max-height="450px" max-width="450px">
+                      <el-table-column width="40" type="index"></el-table-column>
+                      <el-table-column sortable min-width="250" property="mainTitle" label="流程【任务】(点击详情)">
+                        <template slot-scope="scope">
+                          <el-link type="primary" @click.stop="showTasksInfo( scope.row,scope.$index)">
+                            {{scope.row.mainTitle}}【{{scope.row.taskName}}】
+                          </el-link>
+                        </template>
+                      </el-table-column>
+                      <el-table-column sortable prop="assigneeName" label="执行人" min-width="100"></el-table-column>
+                      <el-table-column sortable min-width="80" property="calStatus" label="状态">
+                        <template slot-scope="scope">
+                          <el-tag effect="dark" type="info" v-if="scope.row.calStatus=='开始'">开始</el-tag>
+                          <el-tag effect="dark" type="warning" v-if="scope.row.calStatus=='到期'">到期</el-tag>
+                          <el-tag effect="dark" type="success" v-if="scope.row.calStatus=='执行中'">执行中</el-tag>
+                          <el-tag effect="dark" type="danger" v-if="scope.row.calStatus=='延期'">延期</el-tag>
+                        </template>
+
+                      </el-table-column>
+                      <el-table-column sortable min-width="120" property="tagNames" label="标签">
+                        <template slot-scope="scope">
+                          <div v-if="scope.row.tagNames">
+                            <el-tag effect="light" type="" v-for="(tagName,index) in scope.row.tagNames.split(',')"
+                              :key="index">{{tagName}}</el-tag>
+                          </div>
+                        </template>
+                      </el-table-column>
+                      <el-table-column sortable min-width="100" property="planFinishTime" label="到期时间">
+                      </el-table-column>
+                    </el-table>
+                    <div slot="reference">
+                      <el-tag effect="dark" type="info" v-if="i.startTasksCount>0">{{'开始:'+i.startTasksCount}}</el-tag>
+                      <el-tag effect="dark" type="warning" v-if="i.planFinishTasksCount>0">
+                        {{'到期:'+i.planFinishTasksCount}}
+                      </el-tag>
+                      <el-tag effect="dark" type="success" v-if="i.runningTasksCount>0">{{'执行中:'+i.runningTasksCount}}
+                      </el-tag>
+                      <el-tag effect="dark" type="danger" v-if="i.delayTasksCount>0">{{'延期:'+i.delayTasksCount}}
+                      </el-tag>
+                    </div>
+                  </el-popover>
+                </div>
+              </div>
+            </div>
+          </template>
+        </el-calendar>
+      </el-col>
+      <el-dialog append-to-body title="选择员工" :visible.sync="userSelectVisible" width="60%">
+        <users-select :select-userids="filters.assignee?[filters.assignee.userid]:[]" @confirm="onUserSelected">
+        </users-select>
+      </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-dialog title="短信催办" :visible.sync="sendSmsVisible" :width="dialogWidth()" :close-on-click-modal="false">
+        <send-sms :sms-body-params="smsBodyParams" :sms-user-list="smsUserList" :load-phoneno-by-userid='true'
+          :visible="sendSmsVisible" @cancel="sendSmsVisible=false"></send-sms>
+      </el-dialog>
+      <!--编辑 Execution act_ru_execution界面-->
+      <el-dialog title="任务详情" :visible.sync="editFormVisible" fullscreen :width="dialogWidth()"
+        :close-on-click-modal="false">
+        <procinst-parames-execution-set :companyEmployees="companyEmployees" :companyDepts="companyDepts"
+          :taskInfo='editForm' :isArchive="isArchive" :procDefId="editForm.procDefId" :procInstId="editForm.procInstId"
+          :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit">
+        </procinst-parames-execution-set>
+      </el-dialog>
+    </el-row>
+  </section>
 </template>
 
 <script>
-	import util from '@/common/js/util';//全局公共库
-	//import { getCompanyEmployees,getCompanyDepts,selectCacheOptions,getDefaultValue,getCodeName } from '../../../../../api/common/code';//下拉框数据查询
-	import { listExecution, activiteExecution, suspendExecution,delExecution } from '@/api/mdp/workflow/ru/execution';
-	import  ProcinstParamesExecutionSet from '../procinstParames/ProcinstParamesExecutionSet';//流程参数加载
-	import { listCategorys } from '@/api/mdp/workflow/re/procdef';
-	import { batchInsertOrDeleteTags } from '@/api/mdp/workflow/ru/procinstTag';
-	import Sticky from '@/components/Sticky' // 粘性header组件
-	import { listUser } from '@/api/mdp/sys/user';//下拉框数据查询
-	import { listDept } from '@/api/mdp/sys/dept';//下拉框数据查询
-	import { mapGetters } from 'vuex'
-	import { createShortToken } from '@/api/login';//下拉框数据查询  
-	import  SendSms from '@/views/mdp/sms/SendSms';//流程参数加载 
-	import VueClipboard from 'vue-clipboard2'
-	import Vue from 'vue' 
-	import TagMng from '@/views/mdp/arc/tag/TagMng';  
-	
-	import  CategoryTree from '@/views/mdp/arc/category/CategoryTree';//修改界面
-	import UsersSelect from '@/views/mdp/sys/user/UsersSelect'; 
-
-	VueClipboard.config.autoSetContainer = true // add this line
-	Vue.use(VueClipboard)
-
-	export default {
-		name:'ExecutionMng',
-	    computed: {
-		    ...mapGetters([
-		      'userInfo'
-		    ]),
-			screenWidth:function(){
-				return screen.width;
-			},
-		},
-		props:['isMyMonitors','isMyStart','isMySponsors','isArchive','isMyPartake','isAll','defaultShowCalendar'],
-		data() {
-			
-			const fromStartTime = new Date();
-			const toStartTime = new Date();
-			fromStartTime.setTime(fromStartTime.getTime() - 3600 * 1000 * 24 * 7 * 4);
-			return {
-				filters: {
-					key: '',  
-					procCategory:'', 
-					categoryTreeNodes:[], 
-					tags:[],  
-					startTimeRanger:[util.formatDate.format(fromStartTime,'yyyy-MM-dd'),util.formatDate.format(toStartTime,'yyyy-MM-dd')], 
-					planFinishTimeRanger:[],
-					assignee:null,//已选中人员
-					calendarDate:util.formatDate.format(toStartTime,'yyyy-MM-dd'),
-					filterType:'',
-					suspensionState:'',//1/2 激活、挂起
-				},
-				pickerOptions: {
-					shortcuts: [{
-						text: '最近一周',
-						onClick(picker) {
-						const end = new Date();
-						const start = new Date();
-						start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-						picker.$emit('pick', [start, end]);
-						}
-					},{
-						text: '最近两周',
-						onClick(picker) {
-						const end = new Date();
-						const start = new Date();
-						start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 *2);
-						picker.$emit('pick', [start, end]);
-						}
-					},{
-						text: '最近三周',
-						onClick(picker) {
-						const end = new Date();
-						const start = new Date();
-						start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 *3);
-						picker.$emit('pick', [start, end]);
-						}
-					},{
-						text: '最近四周',
-						onClick(picker) {
-						const end = new Date();
-						const start = new Date();
-						start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 *4);
-						picker.$emit('pick', [start, end]);
-						}
-					}, {
-						text: '最近一个月',
-						onClick(picker) {
-						const end = new Date();
-						const start = new Date();
-						start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-						picker.$emit('pick', [start, end]);
-						}
-					}, {
-						text: '最近三个月',
-						onClick(picker) {
-						const end = new Date();
-						const start = new Date();
-						start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-						picker.$emit('pick', [start, end]);
-						}
-					}]
-					},
-				executions: [],//查询结果
-				pageInfo:{//分页数据
-					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-					pageSize:20,//每页数据
-					pageNum:1,//当前页码、从1开始计算
-					orderFields:['start_time_'],//排序列 如 ['sex','student_id']，必须为数据库字段
-					orderDirs:['desc'],//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
-					count:true
-				},
-				listLoading: false,//查询中...
-				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 options.sex,options.project
-				
-				smsBodyParams:[],//需要发短信的短信内容参数[assigneeName,taskName,createTime,starter]
-				smsUserList:[{userid:'',phoneno:'',username:''}],//接受短信的人
-				sendSmsVisible:false,//是否显示发短信对话框 
-				weixinContentVisible:false,//微信内容面板是否显示
-				weixinContent:'',//微信消息体
-				addFormVisible: false,//新增execution界面是否显示
-				drawer:false,
-				//新增execution界面初始化数据
-				addForm: {
-					id:'',rev:'',procInstId:'',businessKey:'',parentId:'',procDefId:'',superExec:'',actId:'',isActive:'',isConcurrent:'',isScope:'',isEventScope:'',suspensionState:'',cachedEntState:'',tenantId:'',name:'',lockTime:'',rootProcInstId:'',isMiRoot:'',startTime:'',startUserId:'',deptid:'',isCountEnabled:'',evtSubscrCount:'',taskCount:'',jobCount:'',timerJobCount:'',suspJobCount:'',deadletterJobCount:'',varCount:'',idLinkCount:''
-				},
-				
-				editFormVisible: false,//编辑界面是否显示
-				//编辑execution界面初始化数据
-				editForm: {
-					id:'',rev:'',procInstId:'',businessKey:'',parentId:'',procDefId:'',superExec:'',actId:'',isActive:'',isConcurrent:'',isScope:'',isEventScope:'',suspensionState:'',cachedEntState:'',tenantId:'',name:'',lockTime:'',rootProcInstId:'',isMiRoot:'',startTime:'',startUserId:'',deptid:'',isCountEnabled:'',evtSubscrCount:'',taskCount:'',jobCount:'',timerJobCount:'',suspJobCount:'',deadletterJobCount:'',varCount:'',idLinkCount:''
-				},
-				/**begin 自定义属性请在下面加 请加备注**/
-				companyEmployees:[],
-				companyDepts:[],
-				categorys:[],
-				tagSelectVisible:false,
-				isBatchSetProcTags:false,
-				userSelectVisible:false,
-				showCalendar:true,
-				tableHeight:300,
-				/**end 自定义属性请在上面加 请加备注**/
-			}
-		},//end data
-		methods: {
-			//获取代码对应的名称 用于数据反显 如 getCodeName(options.sex,'1');
-			getCodeName(options,codeValue){
-				if(!options)return codeValue;
-				let code=options.filter(i=>i.codeValue==codeValue);
-				if(code.length>0){
-					return code[0].codeName
-				}else{
-					return codeValue
-				} 
-			},
-			handleSizeChange(pageSize) { 
-				this.pageInfo.pageSize=pageSize;
-				this.pageInfo.total=0;
-				 this.pageInfo.count=true; 
-				this.pageInfo.pageNum=1;
-				this.getExecutions();
-			},
-			handleCurrentChange(pageNum) {
-				this.pageInfo.pageNum = pageNum;
-				this.getExecutions();
-			},
-			// 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
-			sortChange( obj ){
-				var dir='asc';
-				if(obj.order=='ascending'){
-					dir='asc'
-				}else{
-					dir='desc';
-				}
-				if(obj.prop=='xxx'){
-					this.pageInfo.orderFields=['xxx'];
-					this.pageInfo.orderDirs=[dir];
-				}
-				this.getExecutions();
-			},
-			searchExecutions(){
-				 this.pageInfo.pageNum=1;
-				 this.pageInfo.total=0; 
-				 this.pageInfo.count=true;
-				 //this.filters.otherParames={};
-				 this.getExecutions();
-				 
-			},
-			//获取列表 Execution act_ru_execution
-			getExecutions() {
-				let params = {
-					pageSize: this.pageInfo.pageSize,
-					pageNum: this.pageInfo.pageNum,
-					total: this.pageInfo.total,
-					count:this.pageInfo.count
-				};
-				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
-					let orderBys=[];
-					for(var i=0;i<this.pageInfo.orderFields.length;i++){ 
-						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
-					}  
-					params.orderBy= orderBys.join(",")
-				}
-				if(this.filters.key!="" && this.filters.key!=null ){
-					params.key='%'+this.filters.key+'%'
-				}
-				if(this.filters.procCategory!='' && this.filters.procCategory!=null){
-					params.category=this.filters.procCategory
-				} 
-				
-				if(this.filters.categoryTreeNodes!=null && this.filters.categoryTreeNodes.length>0){
-					params.categoryIds=this.filters.categoryTreeNodes.map(i=>i.id)
-				}
-				
-				if(this.filters.tags!=null && this.filters.tags.length>0){
-					params.tagIds=this.filters.tags.map(i=>i.tagId)
-				}
-				
-				if(this.filters.startTimeRanger!=null && this.filters.startTimeRanger.length==2){
-					params.fromStartTime=this.filters.startTimeRanger[0]+" 00:00:00"
-					params.toStartTime=this.filters.startTimeRanger[1]+" 23:59:59"
-				}
-				if(this.filters.planFinishTimeRanger!=null && this.filters.planFinishTimeRanger.length==2){
-					params.fromPlanFinishTime=this.filters.planFinishTimeRanger[0]+" 00:00:00"
-					params.toPlanFinishTime=this.filters.planFinishTimeRanger[1]+" 23:59:59"
-				}
-				
-				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.filterType=='monitors'){
-					params.monitors='%'+this.userInfo.userid+'%'
-				}
-				if(this.filters.suspensionState){
-					params.suspensionState=this.filters.suspensionState
-				}
-				params.tenantId=this.userInfo.branchId
-				this.listLoading = true;
-				listExecution(params).then((res) => {
-					var tips=res.data.tips;
-					if(tips.isOk){ 
-						this.pageInfo.total = res.data.total  
-						this.pageInfo.count=false;
-						this.executions = res.data.data;
-					}else{
-						this.$message({ message: tips.msg, type: 'error' });
-					} 
-					this.listLoading = false;
-				}).catch(() => {
-					this.listLoading = false;
-					
-				});
-			},
-			//显示编辑界面 Execution act_ru_execution
-			showTasksInfo: function ( row,index ) {
-				//this.editFormVisible = true;
-				console.log("xxxxxxxxxxxxxx进来了");
-				var task= Object.assign({}, row);  
-				this.editForm =task;
-				
-				this.editForm = Object.assign({}, row);
-				this.$router.push({name:'ProcinstParamesExecutionSetRoute',params:{taskInfo:task}});
-			},
-			//显示新增界面 Execution act_ru_execution
-			showAdd: function () {
-				this.addFormVisible = true;
-				//this.addForm=Object.assign({}, this.editForm);
-			},
-			afterAddSubmit(){
-				this.addFormVisible=false;
-				this.pageInfo.total=0; 
-				 this.pageInfo.count=true;
-				this.getExecutions();
-			},
-			afterEditSubmit(){
-				this.editFormVisible=false;
-			},
-			//删除流程实例
-			handleDel: function (row,index) {
-				this.$confirm('确认删除该流程实例吗?', '提示', {
-					type: 'warning'
-				}).then(() => {
-					this.listLoading = true;
-					let params = { procInstId: row.procInstId,tenantId:row.tenantId,startUserid:row.userid };
-					delExecution(params).then((res) => {
-						this.listLoading = false;
-						var tips=res.data.tips;
-						if(tips.isOk){ 
-							this.pageInfo.total=0;
-							this.getExecutions();
-						}
-						this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
-						
-					});
-				}).catch(() => {
-					this.listLoading = false;
-					
-				});
-			},
-			
-			dialogWidth:function(){
-				if(screen.width>500){
-					return "80%";
-				}else{
-					return "100%";
-				}
-			},
-			//选择行execution
-			selsChange: function (sels) {
-				this.sels = sels;
-			}, 
-			//激活流程
-			handleActivite: function (row,index) {
-				this.$confirm('确认要激活该流程吗?', '提示', {
-					type: 'warning'
-				}).then(() => {
-					this.listLoading = true;
-					let params = { procInstId: row.procInstId };
-					activiteExecution(params).then((res) => {
-						this.listLoading = false;
-						var tips=res.data.tips;
-						if(tips.isOk){ 
-							this.pageInfo.total=0;
-							this.getExecutions();
-						}
-						this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
-						
-					});
-				}).catch(() => {
-					this.listLoading = false;
-					
-				});
-			},
-			//挂起流程
-			handleSuspend: function (row,index) {
-				this.$confirm('确认要挂起该流程吗?', '提示', {
-					type: 'warning'
-				}).then(() => {
-					this.listLoading = true;
-					let params = { procInstId: row.procInstId };
-					suspendExecution(params).then((res) => {
-						this.listLoading = false;
-						var tips=res.data.tips;
-						if(tips.isOk){ 
-							this.pageInfo.total=0;
-							this.getExecutions();
-						}
-						this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
-						
-					});
-				}).catch(() => {
-					this.listLoading = false;
-					
-				});
-			}, 
-			rowClick: function(row, event, column){
-				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
-			},
-			/**begin 自定义函数请在下面加**/
-			 
-			handleFiltersTagClose:function(tag,paramsName){
-				if(paramsName=='key'){
-					this.filters.key=null;
-				}else if(paramsName=='categoryTreeNodes'){
-					this.filters.categoryTreeNodes=this.filters.categoryTreeNodes.filter(i=>i.id!=tag.id);
-					this.$refs.categoryTree.$refs.nodeTree.setChecked(tag.id,false,false);
-				}else if(paramsName=='procCategory'){
-					this.filters.procCategory=null;
- 				}else if(paramsName=='tags'){
-					this.filters.tags=this.filters.tags.filter(i=>i.tagId!=tag.tagId);
- 				} else if(paramsName=='assignee'){
-					this.filters.assignee=null;
- 				} else if(paramsName=='calendar'){
-					this.showCalendar=!this.showCalendar
- 				} 
-			},
-			
-			onTagSelected(tags){
-				this.tagSelectVisible=false;
-				if(this.isBatchSetProcTags==true){
-					//TOD 批量更新后台数据标签
-					if(!tags || tags.length==0){
-						 this.$message.error("最少选中一个标签");
-						  this.isBatchSetProcTags=false;
-						 return;
-					}
-					var procinstTagsVos=[];
-					this.sels.forEach(row=>{
-						 
-						var procinstTags={
-							procDefId:row.procDefId,
-							procInstId:row.procInstId,
-							branchId:row.branchId,
-							userid:this.userInfo.userid,
-							tags:tags.map(i=>{return {tagId:i.tagId,tagName:i.tagName}})
-						}
-						procinstTagsVos.push(procinstTags);
-					})
-					var params= procinstTagsVos
-					
-					 batchInsertOrDeleteTags(params).then(res=>{
-						 this.isBatchSetProcTags=false;
-						 if(res.data.tips.isOk){
-							 var tagIds=tags.map(i=>i.tagId).join(",");
-							 var tagNames=tags.map(i=>i.tagName).join(",");
-							this.sels.forEach(row=>{
-								row.tagIds=tagIds
-								row.tagNames=tagNames
-						 	})
-							 this.$message.success("打标签成功");
-						 }else{
-							  this.$message.error(res.data.tips.msg);
-						 }
-					 }).catch(e=>this.isBatchSetProcTags=false);
-				}else{
-					if(tags==null){
-						this.filters.tags=null 
-					}else{
-						this.filters.tags=tags 
-					} 
-				}
-				
-				
-			},
-			handleCategoryCheckChange(data, checked, indeterminate){ 
-				if(data.id=='C0'){//选择了根节点，默认不按分类查询
-					this.filters.categoryTreeNodes=null
-					return;
-				}
-				var node=this.$refs.categoryTree.$refs.nodeTree.getCheckedNodes();
-				console.log("node-------------"+JSON.stringify(node));
-				this.filters.categoryTreeNodes=node;  
-			},
-			showTagSelect:function(isBatchSetProcTags){
-				if(isBatchSetProcTags==true){
-					if(this.sels.length==0){
-						this.$message.error("请选中流程任务");
-						return false;
-					}
-					this.tagSelectVisible=true;
-				}else{
-					this.tagSelectVisible=true;
-				}
-				this.isBatchSetProcTags=isBatchSetProcTags;
-			}, 
-			
-			onUserSelected: function(users){  
-				this.userSelectVisible=false;
-				this.filters.assignee=users[0]
-			},
-			formatterSuspensionState(row, column, cellValue){
-				return cellValue==1?"激活的":"挂起的"
-			},
-			
-			showSendSms:function(){
-				if(this.sels.length>1){
- 					this.$message({ message: '一次只能给一个人发短信', type: 'error' });
-				}else if(this.sels.length<1){
-					this.$message({ message: '请选择一条任务', type: 'error' });
-				}else{
-					let task=this.sels[0];
-					this.smsBodyParams=[task.assigneeName,task.mainTitle+"-"+task.taskName,task.createTime,task.userid]
-					this.smsUserList=[{userid:task.assignee}];
-					this.sendSmsVisible=true;
-				}
-				
-			},
-			showWeixinTask:function(){
-				if(this.sels.length>1){
-					 this.$message({ message: '一次只能给一个人发信', type: 'error' });
-					 this.weixinContentVisible=false;
-					 return false;
-				}else if(this.sels.length<1){
-					this.$message({ message: '请选择一条任务', type: 'error' });
-					this.weixinContentVisible=false;
-					return false;
-				}else{
-					let task=this.sels[0];
-					//var url=window.location.href;
-					let url=window.location.protocol+"//"+window.location.host+"/oa/"+process.env.VERSION+"/#/mdp/workflow/ru/task/TaskListAssigneeToMe";
-					
-					createShortToken({userid:task.assignee,branchId:this.userInfo.branchId}).then(res=>{
-						if(res.data.tips.isOk){
-							var userToken=res.data.userToken; 
-							this.weixinContent=task.assigneeName+"您好，您有任务【"+task.mainTitle+"-"+task.taskName +"】待处理，请登陆OA系统或者点击以下链接处理。"+url+"?userToken="+userToken;
-							this.$copyText(this.weixinContent).then(e=>{ 
-								this.$message({ message: '已拷贝内容，您可黏贴到微信中', type: 'success' });
-							});
-						}
-					});
-					 
-				}
-			},
-			showWeixin:function(){
-				if(this.sels.length>1){
-					 this.$message({ message: '一次只能给一个人发信', type: 'error' });
-					 this.weixinContentVisible=false;
-					 return false;
-				}else if(this.sels.length<1){
-					this.$message({ message: '请选择一条任务', type: 'error' });
-					this.weixinContentVisible=false;
-					return false;
-				}else{
-					let task=this.sels[0];
-					//var url=window.location.href;
-					let url=window.location.protocol+"//"+window.location.host+"/oa/"+process.env.VERSION+"/#/mdp/workflow/ru/task/TaskListAssigneeToMe";
-					
-					createShortToken({userid:task.assignee,branchId:this.userInfo.branchId}).then(res=>{
-						if(res.data.tips.isOk){
-							var userToken=res.data.userToken;
-							this.weixinContentVisible=true;
-							this.weixinContent=task.assigneeName+"您好，您有任务【"+task.mainTitle+"-"+task.taskName +"】待处理，请登陆OA系统或者点击以下链接处理。"+url+"?userToken="+userToken;
-							 
-						}
-					});
-					 
-				}
-				
-			},
-			showOaMsg:function(){ 
-				if(this.sels.length>1){
-					 this.$message({ message: '一次只能给一个人发信', type: 'error' });
-					 return false;
-				}else if(this.sels.length<1){
-					this.$message({ message: '请选择一条任务', type: 'error' });
-					return false;
-				}else{
-					let task=this.sels[0];
-					var msgBody=task.assigneeName+"您好，您有任务【"+task.mainTitle+"-"+task.taskName +"】待处理，请登陆OA系统处理";
-							 
-					let href=window.location.protocol+"//"+window.location.host+"/im/"+process.env.VERSION+"/#/mdp/im/messages/messageChat?toUserid="+task.assignee+"&msgBody="+msgBody
-					window.open(href, '_blank');
-				}
-			},
-			doCopyWeixinUrl:function(){
-				this.weixinContentVisible=false;
-				let href=window.location.protocol+"//"+window.location.host+"/oa/"+process.env.VERSION+"/#/mdp/workflow/ru/task/TaskListAssigneeToMe";
-					
-				this.$copyText(href).then(e=>{
-
-				});
-			},
-			doCopyWeixinContent:function(){
-				this.weixinContentVisible=false;
-				this.$copyText(this.weixinContent).then(e=>{
-
-				});
-			},
-			showCalendarDataTips:function(date,data){
-				var datas=this.executions;
-				var startTasks=[];
-				var planFinishTasks=[];
-				var runningTasks=[];
-				var delayTasks=[];
-				var tags=[];
-				var now=new Date();
-				var dateStr=util.formatDate.format(now,'yyyy-MM-dd');
-				
-				if(dateStr==data.day){
-					data.isSelected=true;
-				}
-				datas.forEach(i=>{
-					var task=Object.assign({},i);
-					if(task.startTime.indexOf(data.day)>=0){
-						task.calStatus='开始' 
-						startTasks.push(task);
-					}
-				
-					if(task.planFinishTime){
-						if((task.planFinishTime.indexOf(data.day)>=0)){
-							task.calStatus="到期" 
-							planFinishTasks.push(task)
-						} else if((task.planFinishTime>data.day) && task.startTime<data.day){
-							task.calStatus="执行中" 
-							runningTasks.push(task)
-						}else if((task.planFinishTime>data.day) && task.startTime>data.day){
-							//未开始
-						}else if((task.planFinishTime<data.day) && dateStr>=data.day){ 
-							task.calStatus="延期" 
-							delayTasks.push(task)
-						}
-					}else{
-						 if(task.startTime<data.day){
-							task.calStatus="执行中" 
-							runningTasks.push(task)
-						}else if( task.startTime>data.day){
-							//未开始
-						}
-					}
-					
-				});
-				 
-				var allTasks= startTasks.concat(planFinishTasks).concat(runningTasks).concat(delayTasks);
-				allTasks.forEach(i=>{
-					var tagIds=i.tagIds?i.tagIds.split(","):[];
-					var tagNames=i.tagNames?i.tagNames.split(","):[]; 
-					tagIds.forEach((tagId,index)=>{
-						var tag=tags.find(t=>t.tagId==tagId);
-						if(tag){
-							tag.count=tag.count+1;
-						}else{
-							tag={
-								tagId:tagId,
-								tagName:tagNames[index],
-								count:1
-							}
-							tags.push(tag)
-						}
-					});
-				});
-
-				 var msg={
-					 startTasks:startTasks,
-					 planFinishTasks:planFinishTasks,
-					 runningTasks:runningTasks,
-					 startTasksCount:startTasks.length,
-					 planFinishTasksCount:planFinishTasks.length,
-					 runningTasksCount:runningTasks.length,
-					 delayTasksCount:delayTasks.length,
-					 delayTasks:delayTasks,
-					 allTasks:allTasks,
-					 tags:tags
-				 }
-				return [msg];
-			},
-			handleDownload() {
-      console.log(JSON.stringify(this.executions));
-      import("@/vendor/Export2Excel").then(excel => {
-        const tHeader = [
-          "状态",
-          "流程定义名称",
-          "实际完成时间",
-          "是否活跃",
-          "用户编号",
-          "超级执行官---superExec",
-          "参数编号",
-          "主办人",
-          "部署编号",
-          "主键",
-          "流程实例名称",
-          "表单编号",
-          "isScope",
-          "流程定义编号",
-          "版次",
-          "流程定义编号",
-          "任务名称",
-          "缓存状态",
-          "指派人",
-          "流程定义版本",
-          "监控人",
-          "isEventScope",
-          "备用字段5",
-          "标签编号",
-          "节点编号",
-          "部门编号",
-          "主要操作----mainQx",
-          "备用字段4",
-          "备用字段1",
-          "智能表单展示方式",
-          "备用字段",
-          "标签名称",
-          "流程定义编码",
-          "根流程实例编号",
-          "计划完成时间",
-          "发起人编号",
-          "锁定时间",
-          "执行人",
-          "开始时间",
-          "备用字段2",
-          "是否关联自定义表单",
-          "发起人",
-          "流程实例编号",
-          "是否同时发生---isConcurrent",
-          "父编号",
-          "isMiRoot",
-          "流程标题",
-          "发起部门",
-          "业务编码",
-          "工作编号---tenantId",
-          "备用字段3",
-          "任务编号",
-          "所属分类编号"
-        ];
-        const filterVal = [
-          "suspensionState",
-          "processDefinitionName",
-          "realFinishTime",
-          "isActive",
-          "userid",
-          "superExec",
-          "paramsId",
-          "sponsors",
-          "deploymentId",
-          "id",
-          "procInstName",
-          "formId",
-          "isScope",
-          "processDefinitionId",
-          "rev",
-          "procDefId",
-          "taskName",
-          "cachedEntState",
-          "assignee",
-          "processDefinitionVersion",
-          "monitors",
-          "isEventScope",
-          "fi",
-          "tagIds",
-          "actId",
-          "deptid",
-          "mainQx",
-          "fo",
-          "fp",
-          "formShowType",
-          "pconfig",
-          "tagNames",
-          "processDefinitionKey",
-          "rootProcInstId",
-          "planFinishTime",
-          "startUserId",
-          "lockTime",
-          "assigneeName",
-          "startTime",
-          "sp",
-          "isRefForm",
-          "startUsername",
-          "procInstId",
-          "isConcurrent",
-          "parentId",
-          "isMiRoot",
-          "mainTitle",
-          "startDeptName",
-          "businessKey",
-          "tenantId",
-          "tp",
-          "taskId",
-          "categoryId"
-        ];
-        const list = this.executions;
-        const data = this.formatJson(filterVal, list);
-        var filename = "流程中心";
-        if (this.formDefSelected) {
-          filename = this.formDefSelected.formName
-            ? this.formDefSelected.formName
-            : this.formDefSelected.id + "流程中心";
+  import util from '@/common/js/util'; //全局公共库
+  //import { getCompanyEmployees,getCompanyDepts,selectCacheOptions,getDefaultValue,getCodeName } from '../../../../../api/common/code';//下拉框数据查询
+  import {
+    listExecution,
+    activiteExecution,
+    suspendExecution,
+    delExecution
+  } from '@/api/mdp/workflow/ru/execution';
+  import ProcinstParamesExecutionSet from '../procinstParames/ProcinstParamesExecutionSet'; //流程参数加载
+  import {
+    listCategorys
+  } from '@/api/mdp/workflow/re/procdef';
+  import {
+    batchInsertOrDeleteTags
+  } from '@/api/mdp/workflow/ru/procinstTag';
+  import Sticky from '@/components/Sticky' // 粘性header组件
+  import {
+    listUser
+  } from '@/api/mdp/sys/user'; //下拉框数据查询
+  import {
+    listDept
+  } from '@/api/mdp/sys/dept'; //下拉框数据查询
+  import {
+    mapGetters
+  } from 'vuex'
+  import {
+    createShortToken
+  } from '@/api/login'; //下拉框数据查询
+  import SendSms from '@/views/mdp/sms/SendSms'; //流程参数加载
+  import VueClipboard from 'vue-clipboard2'
+  import Vue from 'vue'
+  import TagMng from '@/views/mdp/arc/tag/TagMng';
+
+  import CategoryTree from '@/views/mdp/arc/category/CategoryTree'; //修改界面
+  import UsersSelect from '@/views/mdp/sys/user/UsersSelect';
+
+  VueClipboard.config.autoSetContainer = true // add this line
+  Vue.use(VueClipboard)
+
+  export default {
+    name: 'ExecutionMng',
+    computed: {
+      ...mapGetters([
+        'userInfo'
+      ]),
+      screenWidth: function() {
+        return screen.width;
+      },
+    },
+    props: ['isMyMonitors', 'isMyStart', 'isMySponsors', 'isArchive', 'isMyPartake', 'isAll', 'defaultShowCalendar'],
+    data() {
+
+      const fromStartTime = new Date();
+      const toStartTime = new Date();
+      fromStartTime.setTime(fromStartTime.getTime() - 3600 * 1000 * 24 * 7 * 4);
+      return {
+        filters: {
+          key: '',
+          procCategory: '',
+          categoryTreeNodes: [],
+          tags: [],
+          startTimeRanger: [util.formatDate.format(fromStartTime, 'yyyy-MM-dd'), util.formatDate.format(toStartTime,
+            'yyyy-MM-dd')],
+          planFinishTimeRanger: [],
+          assignee: null, //已选中人员
+          calendarDate: util.formatDate.format(toStartTime, 'yyyy-MM-dd'),
+          filterType: '',
+          suspensionState: '', //1/2 激活、挂起
+        },
+        pickerOptions: {
+          shortcuts: [{
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近两周',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 * 2);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近三周',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 * 3);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近四周',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 * 4);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近三个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit('pick', [start, end]);
+            }
+          }]
+        },
+        executions: [], //查询结果
+        pageInfo: { //分页数据
+          total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
+          pageSize: 20, //每页数据
+          pageNum: 1, //当前页码、从1开始计算
+          orderFields: ['start_time_'], //排序列 如 ['sex','student_id']，必须为数据库字段
+          orderDirs: ['desc'], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
+          count: true
+        },
+        listLoading: false, //查询中...
+        sels: [], //列表选中数据
+        options: {}, //下拉选择框的所有静态数据 options.sex,options.project
+
+        smsBodyParams: [], //需要发短信的短信内容参数[assigneeName,taskName,createTime,starter]
+        smsUserList: [{
+          userid: '',
+          phoneno: '',
+          username: ''
+        }], //接受短信的人
+        sendSmsVisible: false, //是否显示发短信对话框
+        weixinContentVisible: false, //微信内容面板是否显示
+        weixinContent: '', //微信消息体
+        addFormVisible: false, //新增execution界面是否显示
+        drawer: false,
+        //新增execution界面初始化数据
+        addForm: {
+          id: '',
+          rev: '',
+          procInstId: '',
+          businessKey: '',
+          parentId: '',
+          procDefId: '',
+          superExec: '',
+          actId: '',
+          isActive: '',
+          isConcurrent: '',
+          isScope: '',
+          isEventScope: '',
+          suspensionState: '',
+          cachedEntState: '',
+          tenantId: '',
+          name: '',
+          lockTime: '',
+          rootProcInstId: '',
+          isMiRoot: '',
+          startTime: '',
+          startUserId: '',
+          deptid: '',
+          isCountEnabled: '',
+          evtSubscrCount: '',
+          taskCount: '',
+          jobCount: '',
+          timerJobCount: '',
+          suspJobCount: '',
+          deadletterJobCount: '',
+          varCount: '',
+          idLinkCount: ''
+        },
+
+        editFormVisible: false, //编辑界面是否显示
+        //编辑execution界面初始化数据
+        editForm: {
+          id: '',
+          rev: '',
+          procInstId: '',
+          businessKey: '',
+          parentId: '',
+          procDefId: '',
+          superExec: '',
+          actId: '',
+          isActive: '',
+          isConcurrent: '',
+          isScope: '',
+          isEventScope: '',
+          suspensionState: '',
+          cachedEntState: '',
+          tenantId: '',
+          name: '',
+          lockTime: '',
+          rootProcInstId: '',
+          isMiRoot: '',
+          startTime: '',
+          startUserId: '',
+          deptid: '',
+          isCountEnabled: '',
+          evtSubscrCount: '',
+          taskCount: '',
+          jobCount: '',
+          timerJobCount: '',
+          suspJobCount: '',
+          deadletterJobCount: '',
+          varCount: '',
+          idLinkCount: ''
+        },
+        /**begin 自定义属性请在下面加 请加备注**/
+        companyEmployees: [],
+        companyDepts: [],
+        categorys: [],
+        tagSelectVisible: false,
+        isBatchSetProcTags: false,
+        userSelectVisible: false,
+        showCalendar: true,
+        tableHeight: 300,
+        /**end 自定义属性请在上面加 请加备注**/
+      }
+    }, //end data
+    methods: {
+      //获取代码对应的名称 用于数据反显 如 getCodeName(options.sex,'1');
+      getCodeName(options, codeValue) {
+        if (!options) return codeValue;
+        let code = options.filter(i => i.codeValue == codeValue);
+        if (code.length > 0) {
+          return code[0].codeName
+        } else {
+          return codeValue
+        }
+      },
+      handleSizeChange(pageSize) {
+        this.pageInfo.pageSize = pageSize;
+        this.pageInfo.total = 0;
+        this.pageInfo.count = true;
+        this.pageInfo.pageNum = 1;
+        this.getExecutions();
+      },
+      handleCurrentChange(pageNum) {
+        this.pageInfo.pageNum = pageNum;
+        this.getExecutions();
+      },
+      // 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
+      sortChange(obj) {
+        var dir = 'asc';
+        if (obj.order == 'ascending') {
+          dir = 'asc'
+        } else {
+          dir = 'desc';
+        }
+        if (obj.prop == 'xxx') {
+          this.pageInfo.orderFields = ['xxx'];
+          this.pageInfo.orderDirs = [dir];
+        }
+        this.getExecutions();
+      },
+      searchExecutions() {
+        this.pageInfo.pageNum = 1;
+        this.pageInfo.total = 0;
+        this.pageInfo.count = true;
+        //this.filters.otherParames={};
+        this.getExecutions();
+
+      },
+      //获取列表 Execution act_ru_execution
+      getExecutions() {
+        let params = {
+          pageSize: this.pageInfo.pageSize,
+          pageNum: this.pageInfo.pageNum,
+          total: this.pageInfo.total,
+          count: this.pageInfo.count
+        };
+        if (this.pageInfo.orderFields != null && this.pageInfo.orderFields.length > 0) {
+          let orderBys = [];
+          for (var i = 0; i < this.pageInfo.orderFields.length; i++) {
+            orderBys.push(this.pageInfo.orderFields[i] + " " + this.pageInfo.orderDirs[i])
+          }
+          params.orderBy = orderBys.join(",")
+        }
+        if (this.filters.key != "" && this.filters.key != null) {
+          params.key = '%' + this.filters.key + '%'
+        }
+        if (this.filters.procCategory != '' && this.filters.procCategory != null) {
+          params.category = this.filters.procCategory
+        }
+
+        if (this.filters.categoryTreeNodes != null && this.filters.categoryTreeNodes.length > 0) {
+          params.categoryIds = this.filters.categoryTreeNodes.map(i => i.id)
+        }
+
+        if (this.filters.tags != null && this.filters.tags.length > 0) {
+          params.tagIds = this.filters.tags.map(i => i.tagId)
+        }
+
+        if (this.filters.startTimeRanger != null && this.filters.startTimeRanger.length == 2) {
+          params.fromStartTime = this.filters.startTimeRanger[0] + " 00:00:00"
+          params.toStartTime = this.filters.startTimeRanger[1] + " 23:59:59"
+        }
+        if (this.filters.planFinishTimeRanger != null && this.filters.planFinishTimeRanger.length == 2) {
+          params.fromPlanFinishTime = this.filters.planFinishTimeRanger[0] + " 00:00:00"
+          params.toPlanFinishTime = this.filters.planFinishTimeRanger[1] + " 23:59:59"
+        }
+
+        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.filterType == 'monitors') {
+          params.monitors = '%' + this.userInfo.userid + '%'
+        }
+        if (this.filters.suspensionState) {
+          params.suspensionState = this.filters.suspensionState
         }
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: filename,
-          autoWidth: true,
-          bookType: "xlsx"
+        params.tenantId = this.userInfo.branchId
+        this.listLoading = true;
+        listExecution(params).then((res) => {
+          var tips = res.data.tips;
+          if (tips.isOk) {
+            this.pageInfo.total = res.data.total
+            this.pageInfo.count = false;
+            this.executions = res.data.data;
+          } else {
+            this.$message({
+              message: tips.msg,
+              type: 'error'
+            });
+          }
+          this.listLoading = false;
+        }).catch(() => {
+          this.listLoading = false;
+
         });
-      });
-    },
-    formatJson(filterVal, jsonData) {
-      return jsonData.map(v =>
-        filterVal.map(j => {
-          if (j === "timestamp") {
-            return parseTime(v[j]);
+      },
+      //显示编辑界面 Execution act_ru_execution
+      showTasksInfo: function(row, index) {
+        //this.editFormVisible = true;
+        console.log("xxxxxxxxxxxxxx进来了");
+        var task = Object.assign({}, row);
+        this.editForm = task;
+
+        this.editForm = Object.assign({}, row);
+        this.$router.push({
+          name: 'ProcinstParamesExecutionSetRoute',
+          params: {
+            taskInfo: task
+          }
+        });
+      },
+      //显示新增界面 Execution act_ru_execution
+      showAdd: function() {
+        this.addFormVisible = true;
+        //this.addForm=Object.assign({}, this.editForm);
+      },
+      afterAddSubmit() {
+        this.addFormVisible = false;
+        this.pageInfo.total = 0;
+        this.pageInfo.count = true;
+        this.getExecutions();
+      },
+      afterEditSubmit() {
+        this.editFormVisible = false;
+      },
+      //删除流程实例
+      handleDel: function(row, index) {
+        this.$confirm('确认删除该流程实例吗?', '提示', {
+          type: 'warning'
+        }).then(() => {
+          this.listLoading = true;
+          let params = {
+            procInstId: row.procInstId,
+            tenantId: row.tenantId,
+            startUserid: row.userid
+          };
+          delExecution(params).then((res) => {
+            this.listLoading = false;
+            var tips = res.data.tips;
+            if (tips.isOk) {
+              this.pageInfo.total = 0;
+              this.getExecutions();
+            }
+            this.$message({
+              message: tips.msg,
+              type: tips.isOk ? 'success' : 'error'
+            });
+
+          });
+        }).catch(() => {
+          this.listLoading = false;
+
+        });
+      },
+
+      dialogWidth: function() {
+        if (screen.width > 500) {
+          return "80%";
+        } else {
+          return "100%";
+        }
+      },
+      //选择行execution
+      selsChange: function(sels) {
+        this.sels = sels;
+      },
+      //激活流程
+      handleActivite: function(row, index) {
+        this.$confirm('确认要激活该流程吗?', '提示', {
+          type: 'warning'
+        }).then(() => {
+          this.listLoading = true;
+          let params = {
+            procInstId: row.procInstId
+          };
+          activiteExecution(params).then((res) => {
+            this.listLoading = false;
+            var tips = res.data.tips;
+            if (tips.isOk) {
+              this.pageInfo.total = 0;
+              this.getExecutions();
+            }
+            this.$message({
+              message: tips.msg,
+              type: tips.isOk ? 'success' : 'error'
+            });
+
+          });
+        }).catch(() => {
+          this.listLoading = false;
+
+        });
+      },
+      //挂起流程
+      handleSuspend: function(row, index) {
+        this.$confirm('确认要挂起该流程吗?', '提示', {
+          type: 'warning'
+        }).then(() => {
+          this.listLoading = true;
+          let params = {
+            procInstId: row.procInstId
+          };
+          suspendExecution(params).then((res) => {
+            this.listLoading = false;
+            var tips = res.data.tips;
+            if (tips.isOk) {
+              this.pageInfo.total = 0;
+              this.getExecutions();
+            }
+            this.$message({
+              message: tips.msg,
+              type: tips.isOk ? 'success' : 'error'
+            });
+
+          });
+        }).catch(() => {
+          this.listLoading = false;
+
+        });
+      },
+      rowClick: function(row, event, column) {
+        this.$emit('row-click', row, event, column); //  @row-click="rowClick"
+      },
+      /**begin 自定义函数请在下面加**/
+
+      handleFiltersTagClose: function(tag, paramsName) {
+        if (paramsName == 'key') {
+          this.filters.key = null;
+        } else if (paramsName == 'categoryTreeNodes') {
+          this.filters.categoryTreeNodes = this.filters.categoryTreeNodes.filter(i => i.id != tag.id);
+          this.$refs.categoryTree.$refs.nodeTree.setChecked(tag.id, false, false);
+        } else if (paramsName == 'procCategory') {
+          this.filters.procCategory = null;
+        } else if (paramsName == 'tags') {
+          this.filters.tags = this.filters.tags.filter(i => i.tagId != tag.tagId);
+        } else if (paramsName == 'assignee') {
+          this.filters.assignee = null;
+        } else if (paramsName == 'calendar') {
+          this.showCalendar = !this.showCalendar
+        }
+      },
+
+      onTagSelected(tags) {
+        this.tagSelectVisible = false;
+        if (this.isBatchSetProcTags == true) {
+          //TOD 批量更新后台数据标签
+          if (!tags || tags.length == 0) {
+            this.$message.error("最少选中一个标签");
+            this.isBatchSetProcTags = false;
+            return;
+          }
+          var procinstTagsVos = [];
+          this.sels.forEach(row => {
+
+            var procinstTags = {
+              procDefId: row.procDefId,
+              procInstId: row.procInstId,
+              branchId: row.branchId,
+              userid: this.userInfo.userid,
+              tags: tags.map(i => {
+                return {
+                  tagId: i.tagId,
+                  tagName: i.tagName
+                }
+              })
+            }
+            procinstTagsVos.push(procinstTags);
+          })
+          var params = procinstTagsVos
+
+          batchInsertOrDeleteTags(params).then(res => {
+            this.isBatchSetProcTags = false;
+            if (res.data.tips.isOk) {
+              var tagIds = tags.map(i => i.tagId).join(",");
+              var tagNames = tags.map(i => i.tagName).join(",");
+              this.sels.forEach(row => {
+                row.tagIds = tagIds
+                row.tagNames = tagNames
+              })
+              this.$message.success("打标签成功");
+            } else {
+              this.$message.error(res.data.tips.msg);
+            }
+          }).catch(e => this.isBatchSetProcTags = false);
+        } else {
+          if (tags == null) {
+            this.filters.tags = null
+          } else {
+            this.filters.tags = tags
+          }
+        }
+
+
+      },
+      handleCategoryCheckChange(data, checked, indeterminate) {
+        if (data.id == 'C0') { //选择了根节点，默认不按分类查询
+          this.filters.categoryTreeNodes = null
+          return;
+        }
+        var node = this.$refs.categoryTree.$refs.nodeTree.getCheckedNodes();
+        console.log("node-------------" + JSON.stringify(node));
+        this.filters.categoryTreeNodes = node;
+      },
+      showTagSelect: function(isBatchSetProcTags) {
+        if (isBatchSetProcTags == true) {
+          if (this.sels.length == 0) {
+            this.$message.error("请选中流程任务");
+            return false;
+          }
+          this.tagSelectVisible = true;
+        } else {
+          this.tagSelectVisible = true;
+        }
+        this.isBatchSetProcTags = isBatchSetProcTags;
+      },
+
+      onUserSelected: function(users) {
+        this.userSelectVisible = false;
+        this.filters.assignee = users[0]
+      },
+      formatterSuspensionState(row, column, cellValue) {
+        return cellValue == 1 ? "激活的" : "挂起的"
+      },
+
+      showSendSms: function() {
+        if (this.sels.length > 1) {
+          this.$message({
+            message: '一次只能给一个人发短信',
+            type: 'error'
+          });
+        } else if (this.sels.length < 1) {
+          this.$message({
+            message: '请选择一条任务',
+            type: 'error'
+          });
+        } else {
+          let task = this.sels[0];
+          this.smsBodyParams = [task.assigneeName, task.mainTitle + "-" + task.taskName, task.createTime, task.userid]
+          this.smsUserList = [{
+            userid: task.assignee
+          }];
+          this.sendSmsVisible = true;
+        }
+
+      },
+      showWeixinTask: function() {
+        if (this.sels.length > 1) {
+          this.$message({
+            message: '一次只能给一个人发信',
+            type: 'error'
+          });
+          this.weixinContentVisible = false;
+          return false;
+        } else if (this.sels.length < 1) {
+          this.$message({
+            message: '请选择一条任务',
+            type: 'error'
+          });
+          this.weixinContentVisible = false;
+          return false;
+        } else {
+          let task = this.sels[0];
+          //var url=window.location.href;
+          let url = window.location.protocol + "//" + window.location.host + "/oa/" + process.env.VERSION +
+            "/#/mdp/workflow/ru/task/TaskListAssigneeToMe";
+
+          createShortToken({
+            userid: task.assignee,
+            branchId: this.userInfo.branchId
+          }).then(res => {
+            if (res.data.tips.isOk) {
+              var userToken = res.data.userToken;
+              this.weixinContent = task.assigneeName + "您好，您有任务【" + task.mainTitle + "-" + task.taskName +
+                "】待处理，请登陆OA系统或者点击以下链接处理。" + url + "?userToken=" + userToken;
+              this.$copyText(this.weixinContent).then(e => {
+                this.$message({
+                  message: '已拷贝内容，您可黏贴到微信中',
+                  type: 'success'
+                });
+              });
+            }
+          });
+
+        }
+      },
+      showWeixin: function() {
+        if (this.sels.length > 1) {
+          this.$message({
+            message: '一次只能给一个人发信',
+            type: 'error'
+          });
+          this.weixinContentVisible = false;
+          return false;
+        } else if (this.sels.length < 1) {
+          this.$message({
+            message: '请选择一条任务',
+            type: 'error'
+          });
+          this.weixinContentVisible = false;
+          return false;
+        } else {
+          let task = this.sels[0];
+          //var url=window.location.href;
+          let url = window.location.protocol + "//" + window.location.host + "/oa/" + process.env.VERSION +
+            "/#/mdp/workflow/ru/task/TaskListAssigneeToMe";
+
+          createShortToken({
+            userid: task.assignee,
+            branchId: this.userInfo.branchId
+          }).then(res => {
+            if (res.data.tips.isOk) {
+              var userToken = res.data.userToken;
+              this.weixinContentVisible = true;
+              this.weixinContent = task.assigneeName + "您好，您有任务【" + task.mainTitle + "-" + task.taskName +
+                "】待处理，请登陆OA系统或者点击以下链接处理。" + url + "?userToken=" + userToken;
+
+            }
+          });
+
+        }
+
+      },
+      showOaMsg: function() {
+        if (this.sels.length > 1) {
+          this.$message({
+            message: '一次只能给一个人发信',
+            type: 'error'
+          });
+          return false;
+        } else if (this.sels.length < 1) {
+          this.$message({
+            message: '请选择一条任务',
+            type: 'error'
+          });
+          return false;
+        } else {
+          let task = this.sels[0];
+          var msgBody = task.assigneeName + "您好，您有任务【" + task.mainTitle + "-" + task.taskName + "】待处理，请登陆OA系统处理";
+
+          let href = window.location.protocol + "//" + window.location.host + "/im/" + process.env.VERSION +
+            "/#/mdp/im/messages/messageChat?toUserid=" + task.assignee + "&msgBody=" + msgBody
+          window.open(href, '_blank');
+        }
+      },
+      doCopyWeixinUrl: function() {
+        this.weixinContentVisible = false;
+        let href = window.location.protocol + "//" + window.location.host + "/oa/" + process.env.VERSION +
+          "/#/mdp/workflow/ru/task/TaskListAssigneeToMe";
+
+        this.$copyText(href).then(e => {
+
+        });
+      },
+      doCopyWeixinContent: function() {
+        this.weixinContentVisible = false;
+        this.$copyText(this.weixinContent).then(e => {
+
+        });
+      },
+      showCalendarDataTips: function(date, data) {
+        var datas = this.executions;
+        var startTasks = [];
+        var planFinishTasks = [];
+        var runningTasks = [];
+        var delayTasks = [];
+        var tags = [];
+        var now = new Date();
+        var dateStr = util.formatDate.format(now, 'yyyy-MM-dd');
+
+        if (dateStr == data.day) {
+          data.isSelected = true;
+        }
+        datas.forEach(i => {
+          var task = Object.assign({}, i);
+          if (task.startTime.indexOf(data.day) >= 0) {
+            task.calStatus = '开始'
+            startTasks.push(task);
+          }
+
+          if (task.planFinishTime) {
+            if ((task.planFinishTime.indexOf(data.day) >= 0)) {
+              task.calStatus = "到期"
+              planFinishTasks.push(task)
+            } else if ((task.planFinishTime > data.day) && task.startTime < data.day) {
+              task.calStatus = "执行中"
+              runningTasks.push(task)
+            } else if ((task.planFinishTime > data.day) && task.startTime > data.day) {
+              //未开始
+            } else if ((task.planFinishTime < data.day) && dateStr >= data.day) {
+              task.calStatus = "延期"
+              delayTasks.push(task)
+            }
           } else {
-            return v[j];
+            if (task.startTime < data.day) {
+              task.calStatus = "执行中"
+              runningTasks.push(task)
+            } else if (task.startTime > data.day) {
+              //未开始
+            }
+          }
+
+        });
+
+        var allTasks = startTasks.concat(planFinishTasks).concat(runningTasks).concat(delayTasks);
+        allTasks.forEach(i => {
+          var tagIds = i.tagIds ? i.tagIds.split(",") : [];
+          var tagNames = i.tagNames ? i.tagNames.split(",") : [];
+          tagIds.forEach((tagId, index) => {
+            var tag = tags.find(t => t.tagId == tagId);
+            if (tag) {
+              tag.count = tag.count + 1;
+            } else {
+              tag = {
+                tagId: tagId,
+                tagName: tagNames[index],
+                count: 1
+              }
+              tags.push(tag)
+            }
+          });
+        });
+
+        var msg = {
+          startTasks: startTasks,
+          planFinishTasks: planFinishTasks,
+          runningTasks: runningTasks,
+          startTasksCount: startTasks.length,
+          planFinishTasksCount: planFinishTasks.length,
+          runningTasksCount: runningTasks.length,
+          delayTasksCount: delayTasks.length,
+          delayTasks: delayTasks,
+          allTasks: allTasks,
+          tags: tags
+        }
+        return [msg];
+      },
+      handleDownload() {
+        console.log(JSON.stringify(this.executions));
+        import("@/vendor/Export2Excel").then(excel => {
+          const tHeader = [
+            "状态",
+            "流程定义名称",
+            "实际完成时间",
+            "是否活跃",
+            "用户编号",
+            "超级执行官---superExec",
+            "参数编号",
+            "主办人",
+            "部署编号",
+            "主键",
+            "流程实例名称",
+            "表单编号",
+            "isScope",
+            "流程定义编号",
+            "版次",
+            "流程定义编号",
+            "任务名称",
+            "缓存状态",
+            "指派人",
+            "流程定义版本",
+            "监控人",
+            "isEventScope",
+            "备用字段5",
+            "标签编号",
+            "节点编号",
+            "部门编号",
+            "主要操作----mainQx",
+            "备用字段4",
+            "备用字段1",
+            "智能表单展示方式",
+            "备用字段",
+            "标签名称",
+            "流程定义编码",
+            "根流程实例编号",
+            "计划完成时间",
+            "发起人编号",
+            "锁定时间",
+            "执行人",
+            "开始时间",
+            "备用字段2",
+            "是否关联自定义表单",
+            "发起人",
+            "流程实例编号",
+            "是否同时发生---isConcurrent",
+            "父编号",
+            "isMiRoot",
+            "流程标题",
+            "发起部门",
+            "业务编码",
+            "工作编号---tenantId",
+            "备用字段3",
+            "任务编号",
+            "所属分类编号"
+          ];
+          const filterVal = [
+            "suspensionState",
+            "processDefinitionName",
+            "realFinishTime",
+            "isActive",
+            "userid",
+            "superExec",
+            "paramsId",
+            "sponsors",
+            "deploymentId",
+            "id",
+            "procInstName",
+            "formId",
+            "isScope",
+            "processDefinitionId",
+            "rev",
+            "procDefId",
+            "taskName",
+            "cachedEntState",
+            "assignee",
+            "processDefinitionVersion",
+            "monitors",
+            "isEventScope",
+            "fi",
+            "tagIds",
+            "actId",
+            "deptid",
+            "mainQx",
+            "fo",
+            "fp",
+            "formShowType",
+            "pconfig",
+            "tagNames",
+            "processDefinitionKey",
+            "rootProcInstId",
+            "planFinishTime",
+            "startUserId",
+            "lockTime",
+            "assigneeName",
+            "startTime",
+            "sp",
+            "isRefForm",
+            "startUsername",
+            "procInstId",
+            "isConcurrent",
+            "parentId",
+            "isMiRoot",
+            "mainTitle",
+            "startDeptName",
+            "businessKey",
+            "tenantId",
+            "tp",
+            "taskId",
+            "categoryId"
+          ];
+          const list = this.executions;
+          const data = this.formatJson(filterVal, list);
+          var filename = "流程中心";
+          if (this.formDefSelected) {
+            filename = this.formDefSelected.formName ?
+              this.formDefSelected.formName :
+              this.formDefSelected.id + "流程中心";
           }
-        })
-      );
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: filename,
+            autoWidth: true,
+            bookType: "xlsx"
+          });
+        });
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v =>
+          filterVal.map(j => {
+            if (j === "timestamp") {
+              return parseTime(v[j]);
+            } else {
+              return v[j];
+            }
+          })
+        );
+      },
+      handleCommand(command) {
+        if (command.type == 'handleSuspend') {
+          this.handleSuspend(command.row, command.index);
+        } else if (command.type == 'handleActivite') {
+          this.handleActivite(command.row, command.index);
+        } else if (command.type == 'handleDel') {
+          this.handleDel(command.row, command.index);
+        }
+      }
+      /**end 自定义函数请在上面加**/
+
+    }, //end methods
+    components: {
+      'procinst-parames-execution-set': ProcinstParamesExecutionSet,
+      'sticky': Sticky,
+      'send-sms': SendSms,
+      CategoryTree,
+      TagMng,
+      UsersSelect
+      //在下面添加其它组件
     },
-			handleCommand(command) { 
-				if(command.type=='handleSuspend'){
-					this.handleSuspend(command.row,command.index);
-				}else if(command.type=='handleActivite'){
-					this.handleActivite(command.row,command.index);
-				}else if(command.type=='handleDel'){
-					this.handleDel( command.row,command.index);
-				} 
-			}
-			/**end 自定义函数请在上面加**/
-			
-		},//end methods
-		components: { 
-		    'procinst-parames-execution-set':ProcinstParamesExecutionSet,
-			'sticky': Sticky,
-			'send-sms':SendSms,
-			CategoryTree,TagMng,UsersSelect
-		    //在下面添加其它组件
-		},
-		mounted() {
-			listCategorys({tenantId:this.userInfo.branchId}).then(res=>{
-				this.categorys=res.data.data
-			})
-			
-			if(this.defaultShowCalendar){
-				this.showCalendar=true;
-			}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; 
-				}
-				
-				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.searchExecutions();
-        	});
-			//加载下拉列表 如有需要去年注释
-			
-			
-			/**在下面写其它函数***/
-		}
-	}
+    activated(){
+      this.searchExecutions();
+    },
+    mounted() {
+      listCategorys({
+        tenantId: this.userInfo.branchId
+      }).then(res => {
+        this.categorys = res.data.data
+      })
+
+      if (this.defaultShowCalendar) {
+        this.showCalendar = true;
+      } 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;
+        } 
+      });
+      
+        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) {
+
+        } 
+      //加载下拉列表 如有需要去年注释
 
+
+      /**在下面写其它函数***/
+    }
+  }
 </script>
 
 <style scoped>
-.el-dropdown-link {
+  .el-dropdown-link {
     cursor: pointer;
     color: #409EFF;
   }
+
   .el-icon-arrow-down {
     font-size: 12px;
   }
-  
-.filters-show {
-	margin-left: 20px;
-	margin-top: 10px;
-	margin-bottom: 0px;
-}
-.filters-label { 
-	font-size: 14px;
-	color:black;
-	font-weight: bold;
-}
-.more-filter-item { 
-	margin: 20px 20px;
-	
-}
-
-.more-filter-item .el-col {  
-	margin: 2px 2px;
-	
-}
-.more-filter-item button { 
-		margin: 2px 2px; 
-}
-  .more-label-font{
-  	text-align:center;
-  	float:left;
-  	padding-top:5px;
+
+  .filters-show {
+    margin-left: 20px;
+    margin-top: 10px;
+    margin-bottom: 0px;
+  }
+
+  .filters-label {
+    font-size: 14px;
+    color: black;
+    font-weight: bold;
+  }
+
+  .more-filter-item {
+    margin: 20px 0px;
+
+  }
+
+  .more-filter-item .el-col {
+    margin: 2px 2px;
+
+  }
+
+  .more-filter-item button {
+    margin: 2px 0px;
+  }
+
+  .more-label-font {
+    text-align: center;
+    float: left;
+    height: 28px;
+    line-height: 28px;
+    margin-right: 10px;
+  }
+
+  .el-divider--horizontal {
+    display: block;
+    height: 1px;
+    width: 100%;
+    margin: 24px 0;
+    padding-top: 20px;
+    margin-left: 0px;
+    background: #fff;
+  }
+
+  .el-divider__text.is-left {
+    left: 0px;
+  }
+
+  .el-divider__text {
+    padding: 0px 0px;
+  }
+</style>
+
+<style>
+  .el-input-group__append,
+  .el-input-group__prepend {
+    background-color: #409EFF !important;
+    color: #ffffff !important;
+    vertical-align: middle;
+    display: table-cell;
+    position: relative;
+    border: 1px solid #409EFF !important;
+    padding: 0 20px;
+    width: 1px;
+    white-space: nowrap;
+  }
+  .el-calendar__header {
+      display: -webkit-box;
+      display: -ms-flexbox;
+      display: flex;
+      -webkit-box-pack: justify;
+      -ms-flex-pack: justify;
+      justify-content: space-between;
+      padding: 20px 0px;
+      padding-top: 0px;
+      border: none;
+  }
+  .el-calendar__body {
+      padding: 12px 20px 35px;
+      border: 1px solid #EBEEF5;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue
index 2f4de0e5..75314ae6 100644
--- a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue
+++ b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue
@@ -71,20 +71,27 @@
 									placeholder="选择计划完成日期" >
 								</el-date-picker>
 								完成  <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-popover
+									placement="top-start"
+									title="设置主办监控人"
+									width="400"
+									trigger="manual" v-model="sponsorsAndMonitorsVisible"> 
+									<el-row> 
+										<el-col :span="24" style="padding-top:5px;">
+											<font class="more-label-font">主办人:</font> 
+											<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> 
+										</el-col> 
+										<el-col :span="24" style="padding-top:5px;">
+											<font class="more-label-font">监控人:</font>  
 											<el-select disabled   value-key="userid"   v-model="monitors" multiple placeholder="请选择">
 												<el-option
 												v-for="item in baseUserList"
@@ -95,7 +102,10 @@
 												<span style="float: right; color: #8492a6; font-size: 13px">{{ item.shortName }}</span>
 												</el-option>
 											</el-select> 
-										</font>
+										</el-col> 
+									</el-row>
+									<el-button  slot="reference" icon="el-icon-s-check" @click="showSponsorsAndMonitors">主办人、监控人查询</el-button>
+								</el-popover>  
 						</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> 
@@ -369,9 +379,9 @@
 		      this.task.rejectActivity.taskId='' 
 	    	  this.$nextTick(() => {
 				  this.getProcinstParamess(); 
-				  this.listNodeInfos();
+				  //this.listNodeInfos();
 				}); 
-			  this.initBaseUserList();
+			  //this.initBaseUserList();
 	      }
 	    },	
 		data() {
@@ -598,7 +608,7 @@
 				showMainContextOnly:false,
 				nodeInfos:[],
 				nodeInfoVisible:false,
-
+				sponsorsAndMonitorsVisible:false,
 				/**end 在上面加自定义属性**/
 			}//end return
 		},//end data
@@ -827,7 +837,7 @@
 				this.diagramUrl=config.getBaseDomainUrl()+config.getWorkflowBasePath()+'/mdp/workflow/ru/diagram/'+this.procDefId+'/'+this.procInstId
 				this.displayDiagram=true;
 			},
-			initBaseUserList(){
+			initBaseUserList(sponsorsAndMonitorsVisible){
 				var that=this;
 				var sponsors=that.addForm.sponsors?that.addForm.sponsors.split(',').map(i=>{return {userid:i,username:i}}):[];
 				var monitors=that.addForm.monitors?that.addForm.monitors.split(',').map(i=>{return {userid:i,username:i}}):[];
@@ -852,6 +862,7 @@
 							});
 						})
 					}
+					this.sponsorsAndMonitorsVisible=sponsorsAndMonitorsVisible
 				});
 			},
 			handleUploadChange(){
@@ -985,9 +996,14 @@
 				});
 			}, 
 			showNodeInfoDialog:function(){
-				this.nodeInfoVisible=true;
+				if(this.nodeInfos && this.nodeInfos.length>0){
+					this.nodeInfoVisible=true;
+				}else{
+					this.listNodeInfos(true)
+				}
+				
 			},
-			listNodeInfos(){
+			listNodeInfos(showNodeInfoDialog){
 				var params={procInstId:this.taskInfo.procInstId}
 				getNodeInfos(params).then(res=>{
 					if(res.data.tips.isOk){
@@ -1006,6 +1022,9 @@
 							}else{
 								this.actAssignee=null;
 							}   
+							if(showNodeInfoDialog){
+								this.nodeInfoVisible=true;
+							}
 						}
 					}
 				});
@@ -1050,6 +1069,13 @@
 				})
 				
 			},
+			showSponsorsAndMonitors(){
+				if( (this.monitors==null || this.monitors.length==0 || this.sponsors==null||this.sponsors.length==0) && this.sponsorsAndMonitorsVisible==false ){
+					this.initBaseUserList(true)
+				}else{
+					this.sponsorsAndMonitorsVisible=!this.sponsorsAndMonitorsVisible;
+				} 
+			}
 			/**end 在上面加自定义方法**/
 			
 		},//end method
@@ -1093,7 +1119,7 @@
 					this.qxCode= this.addForm.mainQx
 
 
-					this.initBaseUserList();
+					//this.initBaseUserList();
 			      	console.log("mountedxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")
 					  console.log(this.taskInfo)
 					if(this.taskInfo.assignee==null || this.taskInfo.assignee==''){
@@ -1108,7 +1134,7 @@
 			    	  this.$nextTick(() => {
 			    		  this.getProcinstParamess();
 						});
-					this.listNodeInfos();
+					//this.listNodeInfos();
 			    }
 			/**在下面写其它函数***/
 			
@@ -1141,4 +1167,9 @@
 .wf-main-context   p  > img {
 	max-width: 100%; 
 }
+.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/procinstParames/ProcinstParamesStartSet.vue b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue
index 393fa403..73e96ed1 100644
--- a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue
+++ b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<el-row>
+		<el-row class="app-container">
 			
 			<!--新增界面 ProcinstParames 流程实例参数设置表--> 
 			<el-col :span="24"> 
@@ -31,49 +31,53 @@
 								placeholder="选择计划完成日期" >
 							</el-date-picker>
 						</el-col> <font style="margin-left:5px;">主办可以调整</font>
-					</el-form-item> 
-					<el-col :span="24">
-						<el-col :span="12">
-							<el-form-item label="发起部门" prop="deptid"> 
-									<el-select  style="width:99%;" v-model="addForm.deptid"  clearable filterable placeholder="请选择">
+					</el-form-item>  
+					<el-form-item label="发起部门" prop="deptid"> 
+						<el-select  v-model="addForm.deptid"  clearable filterable placeholder="请选择">
+							<el-option
+							v-for="item in myDepts"
+							:key="item.deptid"
+							:label="item.deptName"
+							:value="item.deptid">
+							</el-option>
+						</el-select>  
+
+						<el-popover
+							placement="top-start"
+							title="设置主办监控人"
+							width="400"
+							trigger="manual" v-model="sponsorsAndMonitorsVisible"> 
+							<el-row> 
+								<el-col :span="24" style="padding-top:5px;">
+									<font class="more-label-font">主办人:</font> 
+									<el-select disabled   value-key="userid"    v-model="sponsors" multiple placeholder="请选择">
 										<el-option
-										v-for="item in myDepts"
-										:key="item.deptid"
-										:label="item.deptName"
-										:value="item.deptid">
+										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>    
-							</el-form-item> 
-						</el-col>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="主办人" prop="sponsors" >   
-								<el-select   value-key="userid" style="width:99%"  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: 13px">{{ item.shortName }}</span>
-									</el-option>
-								</el-select> 
-						</el-form-item>
-					</el-col>
-					<el-col :span="12"> 
-						<el-form-item label="监控人" prop="monitors"> 
-									<el-select  value-key="userid" style="width:99%" v-model="monitors" multiple placeholder="请选择">
+									</el-select> 
+								</el-col> 
+								<el-col :span="24" style="padding-top:5px;">
+									<font class="more-label-font">监控人:</font>  
+									<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>
+										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-form-item> 
-					</el-col> 
+									</el-select> 
+								</el-col> 
+							</el-row>
+							<el-button  slot="reference" icon="el-icon-s-check" @click="showSponsorsAndMonitors">主办人、监控人查询</el-button>
+						</el-popover>     
+					</el-form-item>  
 				<div  v-if="addForm.isRefForm=='1' && addForm.formId!=null && addForm.formId!='' && addForm.formShowType!='table' ">
 						<form-data-mng-for-flow-form :form-data-id="filters.formDataId" :qxCode="addForm.mainQx" :isFlowStart="true"    :form-id="addForm.formId" :submit-event="formDataSubmitEvent" @submit="startSubmit"><div></div></form-data-mng-for-flow-form> 
 				</div>
@@ -354,6 +358,7 @@
 				showAttachment:false,
 				nodeInfoVisible:false,
 				nodeInfos:[],
+				sponsorsAndMonitorsVisible:false,
 				/**end 在上面加自定义属性**/
 			}//end return
 		},//end data
@@ -377,17 +382,7 @@
 								params.extVars=this.params.extVars
 								params.flowVars=this.params.flowVars
 							}
-							if(this.nodeInfos.length<=0){
-								this.listBpmnActAssignees(true);
-								this.$message({ message: "未配置节点审批人，无法提交，将自动加载默认配置，请稍后提交", type: 'error' }); 
-								return;
-							}else{
-								if(this.nodeInfos.some(i=>i.toCreater!='1' && (i.nodeUsers==null || i.nodeUsers.length==0))){
-									this.$message.error("还有节点未配置审批人，请配置审批人后再提交");
-									this.showNodeInfoDialog();
-									return;
-								}
-							}
+							 
 							this.addLoading = true; 
 							params.procinstParames.startDeptName=this.myDepts.filter(d=>d.deptid==this.addForm.deptid)[0].deptName;
 							params.procinstParames.startUsername=this.userInfo.username
@@ -450,7 +445,7 @@
 					
 				})
 			},
-			initBaseUserList(){
+			initBaseUserList(sponsorsAndMonitorsVisible){
 				var that=this;
 				var sponsors=[];
 				var monitors=[];
@@ -477,6 +472,7 @@
 					that.monitors=monitors
 					that.sponsors=sponsors
 					that.baseUserList=baseUserList 
+					this.sponsorsAndMonitorsVisible=sponsorsAndMonitorsVisible
 					return;
 				}else{
 					listUserNames({userids:baseUserList.map(i=>i.userid),branchId:that.userInfo.branchId}).then(res=>{
@@ -498,6 +494,7 @@
 							that.sponsors=sponsors
 							that.baseUserList=baseUserList
 						}
+						this.sponsorsAndMonitorsVisible=sponsorsAndMonitorsVisible
 					});
 				}
 				
@@ -564,7 +561,11 @@
 				this.mainQxVisible=true; 
 			},
 			showNodeInfoDialog:function(){
-				this.nodeInfoVisible=true;
+				if(this.nodeInfos==null || this.nodeInfos.length==0){
+					this.listBpmnActAssignees(true)
+				}else{
+					this.nodeInfoVisible=true;
+				} 
 			},
 			onFormFieldsLoad:function(formFields){
 				this.formFields=formFields;
@@ -616,6 +617,14 @@
 				this.addForm.tagNames=this.procdef.tagNames;
 				this.addForm.mainQx=this.procdef.mainQx;
 			},
+			
+			showSponsorsAndMonitors(){
+				if( (this.monitors==null || this.monitors.length==0 || this.sponsors==null||this.sponsors.length==0) && this.sponsorsAndMonitorsVisible==false ){
+					this.initBaseUserList(true)
+				}else{
+					this.sponsorsAndMonitorsVisible=!this.sponsorsAndMonitorsVisible;
+				} 
+			},
 			listBpmnActAssignees(nodeInfoVisible){
 				this.nodeInfos=[]; 
 				this.listLoading = true;
@@ -649,7 +658,7 @@
 			this.$nextTick(() => {
 				this.initByProcdef();//先procdef
 				this.initByParams();//再 params 以 如果有相同数据以params为准
-				this.listBpmnActAssignees();
+				//this.listBpmnActAssignees();
 				this.initBaseUserList();
         	}); 
 			/**在下面写其它函数***/
diff --git a/src/views/mdp/workflow/ru/task/TaskMng.vue b/src/views/mdp/workflow/ru/task/TaskMng.vue
index a8118e00..0f7c3088 100644
--- a/src/views/mdp/workflow/ru/task/TaskMng.vue
+++ b/src/views/mdp/workflow/ru/task/TaskMng.vue
@@ -1,272 +1,156 @@
 <template>
-  <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">
-                <el-button size="mini" type="text" @click="doCopyWeixinUrl">拷贝链接</el-button>
-                <el-button type="primary" size="mini" @click="doCopyWeixinContent">拷贝内容</el-button>
+  <section>
+    <el-row class="app-container"> 
+      <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+        <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:270px;" placeholder="模糊查询">
+            <template slot="append">
+              <div class="search">
+                <el-button @click="searchAssigneeToMeTasks" icon="el-icon-search">查询</el-button>
               </div>
-              <el-button
-                slot="reference"
-                v-show="assigneeToMe===false"
-                class="hidden-sm-and-down"
-                v-on:click="showWeixin"
-              >微信催办</el-button>
-            </el-popover>
-            <el-button
-              v-show="assigneeToMe===false"
-              class="hidden-sm-and-down"
-              v-on:click="showSendSms"
-            >短信催办</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">
+              <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" v-show="assigneeToMe===false"
+              v-on:click="showWeixin" class="hidden-sm-and-down">微信催办</el-button>
+          </el-popover>
+          <el-button v-show="assigneeToMe===false" class="hidden-sm-and-down" v-on:click="showSendSms">短信催办</el-button>
+
+          <el-button v-show="assigneeToMe===false" class="hidden-sm-and-down" v-on:click="showOaMsg">OAMSG催办</el-button>
+
+          <el-button @click.native="showTagSelect(false)" icon="el-icon-plus">标签</el-button>
+          <el-button @click="drawer = true" circle icon="el-icon-more"></el-button>
+
 
-            <el-button
-              v-show="assigneeToMe===false"
-              class="hidden-sm-and-down"
-              v-on:click="showOaMsg"
-            >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-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>
+                <font class="more-label-font" style="margin-right: 13px;">
+                  流程分类
+                </font>
+                <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-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
-                  v-model="filters.startTimeRanger"
-                  type="daterange"
-                  align="right"
-                  unlink-panels
-                  range-separator="至"
-                  start-placeholder="创建日期"
-                  end-placeholder="创建日期"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  :default-time="['00:00:00','23:59:59']"
-                  :picker-options="pickerOptions"
-                ></el-date-picker>
+                <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
-                  v-model="filters.planFinishTimeRanger"
-                  type="daterange"
-                  align="right"
-                  unlink-panels
-                  range-separator="至"
-                  start-placeholder="计划完成日期"
-                  end-placeholder="计划完成日期"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  :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>
+                <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 HH:mm:ss"
+                  :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 HH:mm:ss" :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-button type="primary" @click="searchAssigneeToMeTasks" icon="el-icon-search">查询</el-button>
               </el-col>
+
+              <el-col :span="24">
+                <el-button type="primary" @click="searchAssigneeToMeTasks" icon="el-icon-search"
+                  style="margin-top: 11px;">查询</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-divider content-position="left">其它操作</el-divider>
+                <el-button @click.native="showTagSelect(true)">添加标签</el-button>
+                <el-button @click="handleDownload">导出数据</el-button>
               </el-col>
             </el-row>
-           
-          </el-drawer> 
-      </el-row>
-      <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"
-          border
-          @selection-change="selsChange"
-          @row-click="rowClick"
-          style="width: 100%;"
-          :max-height="tableHeight"
-        >
-          <el-table-column
-            type="selection"
-            width="40"
-            v-if="screenWidth>=500"
-            :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" show-overflow-tooltip> 
-						<template slot-scope="scope">  
-							 <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
-                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="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
-            v-if="assigneeToMe===false"
-            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 
-            v-if="assigneeToMe===false"
-            prop="suspensionState"
-            label="状态"
-            min-width="80"
-            :formatter="formatterSuspensionState"
-          ></el-table-column>
 
-          <el-table-column
-            sortable
-            prop="delegation"
-            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
-            v-if="assigneeToMe===false"
-            prop="dueDate"
-            label="处理时长"
-            min-width="80"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column label="操作" width="100" fixed="right">
-            <template slot-scope="scope">
-              <el-button type="primary" @click="showTaskDetail( 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>
-        <!--编辑 Execution act_ru_execution界面-->
-      </el-row>
+          </el-drawer>
+        </el-row>
+        <el-row style="padding-top:20px;" v-if="showCalendar==false">
+          <!--列表 Task act_ru_task-->
+          <el-table ref="table" :data="tasks" highlight-current-row v-loading="listLoading" border
+            @selection-change="selsChange" @row-click="rowClick" style="width: 100%;" :max-height="tableHeight">
+            <el-table-column type="selection" width="40" v-if="screenWidth>=500" :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" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <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 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="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 v-if="assigneeToMe===false" 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 v-if="assigneeToMe===false" prop="suspensionState" label="状态" min-width="80"
+              :formatter="formatterSuspensionState"></el-table-column>
+
+            <el-table-column sortable prop="delegation" 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 v-if="assigneeToMe===false" prop="dueDate" label="处理时长" min-width="80"
+              show-overflow-tooltip></el-table-column>
+            <el-table-column label="操作" width="100" fixed="right">
+              <template slot-scope="scope">
+                <el-button type="primary" @click="showTaskDetail( 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>
+          <!--编辑 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">
+      <el-col v-if="showCalendar==true">
+        <el-calendar v-loading="listLoading" v-model="filters.calendarDate">
           <!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
           <template slot="dateCell" scope="{date, data}">
             <div :class="data.isSelected ? 'is-selected' : ''">
@@ -276,33 +160,19 @@
                   <el-popover placement="right" trigger="hover">
                     <el-row>
                       <el-col>
-                        <el-tag
-                          v-for=" tag in i.tags"
-                          :key="tag.id"
-                        >{{tag.tagName+'('+tag.count+')'}}</el-tag>
+                        <el-tag v-for=" tag in i.tags" :key="tag.id">{{tag.tagName+'('+tag.count+')'}}</el-tag>
                       </el-col>
                     </el-row>
                     <el-table :data="i.allTasks" max-height="450px">
                       <el-table-column width="40" type="index"></el-table-column>
-                      <el-table-column
-                        sortable
-                        min-width="300"
-                        property="mainTitle"
-                        label="流程【任务】(点击详情)"
-                      >
+                      <el-table-column sortable min-width="300" property="mainTitle" label="流程【任务】(点击详情)">
                         <template slot-scope="scope">
-                          <el-link type="primary" 
-                            @click="showTaskDetail( scope.row,scope.$index)"
-                          >{{scope.row.mainTitle}}【{{scope.row.taskName}}】</el-link>
-                        </template> 
+                          <el-link type="primary" @click="showTaskDetail( scope.row,scope.$index)">
+                            {{scope.row.mainTitle}}【{{scope.row.taskName}}】
+                          </el-link>
+                        </template>
                       </el-table-column>
-                      <el-table-column
-                        sortable
-                        min-width="100"
-                        property="assigneeName"
-                        label="执行人"
-                        
-                      ></el-table-column>
+                      <el-table-column sortable min-width="100" property="assigneeName" label="执行人"></el-table-column>
                       <el-table-column sortable min-width="80" property="calStatus" label="状态">
                         <template slot-scope="scope">
                           <el-tag effect="dark" type="info" v-if="scope.row.calStatus=='开始'">开始</el-tag>
@@ -314,44 +184,23 @@
                       <el-table-column sortable min-width="120" property="tagNames" label="标签">
                         <template slot-scope="scope">
                           <div v-if="scope.row.tagNames">
-                            <el-tag
-                              effect="light"
-                              type
-                              v-for="(tagName,index) in scope.row.tagNames.split(',')"
-                              :key="index"
-                            >{{tagName}}</el-tag>
+                            <el-tag effect="light" type v-for="(tagName,index) in scope.row.tagNames.split(',')"
+                              :key="index">{{tagName}}</el-tag>
                           </div>
                         </template>
                       </el-table-column>
-                      <el-table-column
-                        sortable
-                        min-width="120"
-                        property="planFinishTime"
-                        label="到期时间"
-                        
-                      ></el-table-column>
+                      <el-table-column sortable min-width="120" property="planFinishTime" label="到期时间" show-overflow-tooltip>
+                      </el-table-column>
                     </el-table>
                     <div slot="reference">
-                      <el-tag
-                        effect="dark"
-                        type="info"
-                        v-if="i.startTasksCount>0"
-                      >{{'开始:'+i.startTasksCount}}</el-tag>
-                      <el-tag
-                        effect="dark"
-                        type="warning"
-                        v-if="i.planFinishTasksCount>0"
-                      >{{'到期:'+i.planFinishTasksCount}}</el-tag>
-                      <el-tag
-                        effect="dark"
-                        type="success"
-                        v-if="i.runningTasksCount>0"
-                      >{{'执行中:'+i.runningTasksCount}}</el-tag>
-                      <el-tag
-                        effect="dark"
-                        type="danger"
-                        v-if="i.delayTasksCount>0"
-                      >{{'延期:'+i.delayTasksCount}}</el-tag>
+                      <el-tag effect="dark" type="info" v-if="i.startTasksCount>0">{{'开始:'+i.startTasksCount}}</el-tag>
+                      <el-tag effect="dark" type="warning" v-if="i.planFinishTasksCount>0">
+                        {{'到期:'+i.planFinishTasksCount}}
+                      </el-tag>
+                      <el-tag effect="dark" type="success" v-if="i.runningTasksCount>0">{{'执行中:'+i.runningTasksCount}}
+                      </el-tag>
+                      <el-tag effect="dark" type="danger" v-if="i.delayTasksCount>0">{{'延期:'+i.delayTasksCount}}
+                      </el-tag>
                     </div>
                   </el-popover>
                 </div>
@@ -361,489 +210,568 @@
         </el-calendar>
       </el-col>
 
-      <el-dialog
-        title="短信催办"
-        :visible.sync="sendSmsVisible"
-        :width="dialogWidth()"
-        :close-on-click-modal="false"
-      >
-        <send-sms
-          :sms-body-params="smsBodyParams"
-          :sms-user-list="smsUserList"
-          :load-phoneno-by-userid="true"
-          :visible="sendSmsVisible"
-          @cancel="sendSmsVisible=false"
-        ></send-sms>
+      <el-dialog title="短信催办" :visible.sync="sendSmsVisible" :width="dialogWidth()" :close-on-click-modal="false">
+        <send-sms :sms-body-params="smsBodyParams" :sms-user-list="smsUserList" :load-phoneno-by-userid="true"
+          :visible="sendSmsVisible" @cancel="sendSmsVisible=false"></send-sms>
       </el-dialog>
-      <el-dialog fullscreen
-        title="任务详情"
-        :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 fullscreen title="任务详情" :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-dialog
-        append-to-body
-        title="标签条件"
-        :visible.sync="tagSelectVisible"
-        class="dialog-body"
-        width="60%"
-      >
-        <tag-mng
-          :tagIds="filters.tags?filters.tags.map(i=>i.tagId):[]"
-          :jump="true"
-          @select-confirm="onTagSelected"
-        ></tag-mng>
+      <el-dialog append-to-body title="标签条件" :visible.sync="tagSelectVisible" class="dialog-body" 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>
 
 <script>
-import util from "../../../../../common/js/util"; // 全局公共库
-import {
-  listAssigneeToAnyTasks,
-  listAssigneeToMeTasks,
-  listMyCandidateUserTasks,
-  listAnyCandidateUserTasks,
-  listMyCandidateGroupTasks,
-  listAnyCandidateGroupTasks,
-  delTask,
-  batchDelTask
-} from "../../../../../api/mdp/workflow/ru/task";
-import { listUser } from "@/api/mdp/sys/user"; // 下拉框数据查询
-import { createShortToken } from "@/api/login"; // 下拉框数据查询
-import { listDept } from "@/api/mdp/sys/dept"; // 下拉框数据查询
-import ProcinstParamesExecutionSet from "../procinstParames/ProcinstParamesExecutionSet"; // 流程参数加载
-import SendSms from "@/views/mdp/sms/SendSms"; // 流程参数加载
-import { listCategorys } from "@/api/mdp/workflow/re/procdef";
-import Sticky from "@/components/Sticky"; // 粘性header组件
-import { mapGetters } from "vuex";
-import VueClipboard from "vue-clipboard2";
-import Vue from "vue";
-import CategoryTree from "@/views/mdp/arc/category/CategoryTree"; // 修改界面
-import TagMng from "@/views/mdp/arc/tag/TagMng";
-import { batchInsertOrDeleteTags } from "@/api/mdp/workflow/ru/procinstTag";
+  import util from "../../../../../common/js/util"; // 全局公共库
+  import {
+    listAssigneeToAnyTasks,
+    listAssigneeToMeTasks,
+    listMyCandidateUserTasks,
+    listAnyCandidateUserTasks,
+    listMyCandidateGroupTasks,
+    listAnyCandidateGroupTasks,
+    delTask,
+    batchDelTask
+  } from "../../../../../api/mdp/workflow/ru/task";
+  import {
+    listUser
+  } from "@/api/mdp/sys/user"; // 下拉框数据查询
+  import {
+    createShortToken
+  } from "@/api/login"; // 下拉框数据查询
+  import {
+    listDept
+  } from "@/api/mdp/sys/dept"; // 下拉框数据查询
+  import ProcinstParamesExecutionSet from "../procinstParames/ProcinstParamesExecutionSet"; // 流程参数加载
+  import SendSms from "@/views/mdp/sms/SendSms"; // 流程参数加载
+  import {
+    listCategorys
+  } from "@/api/mdp/workflow/re/procdef";
+  import Sticky from "@/components/Sticky"; // 粘性header组件
+  import {
+    mapGetters
+  } from "vuex";
+  import VueClipboard from "vue-clipboard2";
+  import Vue from "vue";
+  import CategoryTree from "@/views/mdp/arc/category/CategoryTree"; // 修改界面
+  import TagMng from "@/views/mdp/arc/tag/TagMng";
+  import {
+    batchInsertOrDeleteTags
+  } from "@/api/mdp/workflow/ru/procinstTag";
 
-VueClipboard.config.autoSetContainer = true; // add this line
-Vue.use(VueClipboard);
+  VueClipboard.config.autoSetContainer = true; // add this line
+  Vue.use(VueClipboard);
 
-export default {
-  name: "TaskMng",
-  props: ["assigneeToMe", "defaultShowCalendar", "isClaim"], // 待我执行的任务
-  computed: {
-    ...mapGetters(["userInfo", "myDepts", "myPosts"]),
-    screenWidth: function() {
-      return screen.width;
-    }
-  },
-  activated: function() {
-    if (this.assigneeToMe !== false) {
-      if (this.isClaim == undefined || this.isClaim === false) {
-        this.filters.assignee = this.userInfo.userid;
-        this.getTasks();
-      } else {
-        this.searchMyCandidateUserTasks();
+  export default {
+    name: "TaskMng",
+    props: ["assigneeToMe", "defaultShowCalendar", "isClaim"], // 待我执行的任务
+    computed: {
+      ...mapGetters(["userInfo", "myDepts", "myPosts"]),
+      screenWidth: function() {
+        return screen.width;
       }
-    }
-  },
-  data() {
-    const fromStartTime = new Date();
-    const toStartTime = new Date();
-    fromStartTime.setTime(fromStartTime.getTime() - 3600 * 1000 * 24 * 7 * 4);
-    return {
-      filters: {
-        key: "",
-        taskType: "0", // 0已领取待执行的任务，1待领取的个人业务,2待领取的部门业务
-        candidateUser: "", // 候选用户编号
-        candidateGroups: [], // 候选部门
-        assignee: "", // 任务执行人
-        procCategory: "", // 流程分类
-        categoryId: "", // 归档分类
-        categoryTreeNodes: [],
-        tags: [],
-        startTimeRanger: [
-          util.formatDate.format(fromStartTime, "yyyy-MM-dd"),
-          util.formatDate.format(toStartTime, "yyyy-MM-dd")
-        ],
-        planFinishTimeRanger: [],
-        calendarDate:util.formatDate.format(toStartTime,'yyyy-MM-dd'),
-      },
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "最近一周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
-            }
-          },
-          {
-            text: "最近两周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 * 2);
-              picker.$emit("pick", [start, end]);
-            }
-          },
-          {
-            text: "最近三周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 * 3);
-              picker.$emit("pick", [start, end]);
-            }
-          },
-          {
-            text: "最近四周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 * 4);
-              picker.$emit("pick", [start, end]);
-            }
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
-            }
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
+    },
+    activated: function() {
+      if (this.assigneeToMe !== false) {
+        if (this.isClaim == undefined || this.isClaim === false) {
+          this.filters.assignee = this.userInfo.userid;
+          this.getTasks();
+        } else {
+          this.searchMyCandidateUserTasks();
+        }
+      }
+    },
+    data() {
+      const fromStartTime = new Date();
+      const toStartTime = new Date();
+      fromStartTime.setTime(fromStartTime.getTime() - 3600 * 1000 * 24 * 7 * 4);
+      return {
+        filters: {
+          key: "",
+          taskType: "0", // 0已领取待执行的任务，1待领取的个人业务,2待领取的部门业务
+          candidateUser: "", // 候选用户编号
+          candidateGroups: [], // 候选部门
+          assignee: "", // 任务执行人
+          procCategory: "", // 流程分类
+          categoryId: "", // 归档分类
+          categoryTreeNodes: [],
+          tags: [],
+          startTimeRanger: [
+            util.formatDate.format(fromStartTime, "yyyy-MM-dd"),
+            util.formatDate.format(toStartTime, "yyyy-MM-dd")
+          ],
+          planFinishTimeRanger: [],
+          calendarDate: util.formatDate.format(toStartTime, 'yyyy-MM-dd'),
+        },
+        pickerOptions: {
+          shortcuts: [{
+              text: "最近一周",
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                picker.$emit("pick", [start, end]);
+              }
+            },
+            {
+              text: "最近两周",
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 * 2);
+                picker.$emit("pick", [start, end]);
+              }
+            },
+            {
+              text: "最近三周",
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 * 3);
+                picker.$emit("pick", [start, end]);
+              }
+            },
+            {
+              text: "最近四周",
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 * 4);
+                picker.$emit("pick", [start, end]);
+              }
+            },
+            {
+              text: "最近一个月",
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                picker.$emit("pick", [start, end]);
+              }
+            },
+            {
+              text: "最近三个月",
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                picker.$emit("pick", [start, end]);
+              }
             }
-          }
-        ]
+          ]
+        },
+        tasks: [], // 查询结果
+        pageInfo: {
+          // 分页数据
+          total: 0, // 服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
+          pageSize: 20, // 每页数据
+          pageNum: 1, // 当前页码、从1开始计算
+          orderFields: ["create_time_"], // 排序列 如 ['sex','student_id']，必须为数据库字段
+          orderDirs: ["desc"], // 升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
+          count: true
+        },
+        listLoading: false, // 查询中...
+        sels: [], // 列表选中数据
+        options: {}, // 下拉选择框的所有静态数据 options.sex,options.project
+        smsBodyParams: [], // 需要发短信的短信内容参数[assigneeName,taskName,createTime,starter]
+        smsUserList: [{
+          userid: "",
+          phoneno: "",
+          username: ""
+        }], // 接受短信的人
+        sendSmsVisible: false, // 是否显示发短信对话框
+        addFormVisible: false, // 新增task界面是否显示
+        weixinContentVisible: false, // 微信内容面板是否显示
+        weixinContent: "", // 微信消息体
+        // 新增task界面初始化数据
+        addForm: {
+          id: "",
+          rev: "",
+          executionId: "",
+          procInstId: "",
+          procDefId: "",
+          name: "",
+          parentTaskId: "",
+          description: "",
+          taskDefKey: "",
+          owner: "",
+          assignee: "",
+          delegation: "",
+          priority: "",
+          createTime: "",
+          dueDate: "",
+          category: "",
+          suspensionState: "",
+          tenantId: "",
+          formKey: "",
+          claimTime: "",
+          mainTitle: "",
+          sponsors: "",
+          userid: "",
+          deptid: ""
+        },
+
+        editFormVisible: false, // 编辑界面是否显示
+        // 编辑task界面初始化数据
+        editForm: {
+          id: "",
+          rev: "",
+          executionId: "",
+          procInstId: "",
+          procDefId: "",
+          name: "",
+          parentTaskId: "",
+          description: "",
+          taskDefKey: "",
+          owner: "",
+          assignee: "",
+          delegation: "",
+          priority: "",
+          createTime: "",
+          dueDate: "",
+          category: "",
+          suspensionState: "",
+          tenantId: "",
+          formKey: "",
+          claimTime: "",
+          mainTitle: "",
+          sponsors: "",
+          userid: "",
+          deptid: ""
+        },
+        /** begin 自定义属性请在下面加 请加备注**/
+        companyEmployees: [],
+        companyDepts: [],
+        myBranchDepts: [],
+        categorys: [],
+        tagSelectVisible: false,
+        drawer: false,
+        showCalendar: true,
+        tableHeight: 300,
+        /** end 自定义属性请在上面加 请加备注**/
+      };
+    }, // end data
+    methods: {
+      // 获取代码对应的名称 用于数据反显 如 getCodeName(options.sex,'1');
+      getCodeName(options, codeValue) {
+        if (!options) return codeValue;
+        const code = options.filter(i => i.codeValue == codeValue);
+        if (code.length > 0) {
+          return code[0].codeName;
+        } else {
+          return codeValue;
+        }
       },
-      tasks: [], // 查询结果
-      pageInfo: {
-        // 分页数据
-        total: 0, // 服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-        pageSize: 20, // 每页数据
-        pageNum: 1, // 当前页码、从1开始计算
-        orderFields: ["create_time_"], // 排序列 如 ['sex','student_id']，必须为数据库字段
-        orderDirs: ["desc"], // 升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
-        count: true
+      handleSizeChange(pageSize) {
+        this.pageInfo.pageSize = pageSize;
+        this.pageInfo.total = 0;
+        this.pageInfo.count = true;
+        this.pageInfo.pageNum = 1;
+        this.getTasks();
       },
-      listLoading: false, // 查询中...
-      sels: [], // 列表选中数据
-      options: {}, // 下拉选择框的所有静态数据 options.sex,options.project
-      smsBodyParams: [], // 需要发短信的短信内容参数[assigneeName,taskName,createTime,starter]
-      smsUserList: [{ userid: "", phoneno: "", username: "" }], // 接受短信的人
-      sendSmsVisible: false, // 是否显示发短信对话框
-      addFormVisible: false, // 新增task界面是否显示
-      weixinContentVisible: false, // 微信内容面板是否显示
-      weixinContent: "", // 微信消息体
-      // 新增task界面初始化数据
-      addForm: {
-        id: "",
-        rev: "",
-        executionId: "",
-        procInstId: "",
-        procDefId: "",
-        name: "",
-        parentTaskId: "",
-        description: "",
-        taskDefKey: "",
-        owner: "",
-        assignee: "",
-        delegation: "",
-        priority: "",
-        createTime: "",
-        dueDate: "",
-        category: "",
-        suspensionState: "",
-        tenantId: "",
-        formKey: "",
-        claimTime: "",
-        mainTitle: "",
-        sponsors: "",
-        userid: "",
-        deptid: ""
+      handleCurrentChange(pageNum) {
+        this.pageInfo.pageNum = pageNum;
+        this.getTasks();
       },
-
-      editFormVisible: false, // 编辑界面是否显示
-      // 编辑task界面初始化数据
-      editForm: {
-        id: "",
-        rev: "",
-        executionId: "",
-        procInstId: "",
-        procDefId: "",
-        name: "",
-        parentTaskId: "",
-        description: "",
-        taskDefKey: "",
-        owner: "",
-        assignee: "",
-        delegation: "",
-        priority: "",
-        createTime: "",
-        dueDate: "",
-        category: "",
-        suspensionState: "",
-        tenantId: "",
-        formKey: "",
-        claimTime: "",
-        mainTitle: "",
-        sponsors: "",
-        userid: "",
-        deptid: ""
+      // 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
+      sortChange(obj) {
+        var dir = "asc";
+        if (obj.order == "ascending") {
+          dir = "asc";
+        } else {
+          dir = "desc";
+        }
+        if (obj.prop == "xxx") {
+          this.pageInfo.orderFields = ["xxx"];
+          this.pageInfo.orderDirs = [dir];
+        }
+        this.getTasks();
+      },
+      dialogWidth: function() {
+        if (screen.width > 500) {
+          return "80%";
+        } else {
+          return "100%";
+        }
       },
-      /** begin 自定义属性请在下面加 请加备注**/
-      companyEmployees: [],
-      companyDepts: [],
-      myBranchDepts: [],
-      categorys: [],
-      tagSelectVisible: false,
-      drawer: false,
-      showCalendar: true,
-      tableHeight:300,
-      /** end 自定义属性请在上面加 请加备注**/
-    };
-  }, // end data
-  methods: {
-    // 获取代码对应的名称 用于数据反显 如 getCodeName(options.sex,'1');
-    getCodeName(options, codeValue) {
-      if (!options) return codeValue;
-      const code = options.filter(i => i.codeValue == codeValue);
-      if (code.length > 0) {
-        return code[0].codeName;
-      } else {
-        return codeValue;
-      }
-    },
-    handleSizeChange(pageSize) {
-      this.pageInfo.pageSize = pageSize;
-      this.pageInfo.total = 0;
-      this.pageInfo.count = true;
-      this.pageInfo.pageNum = 1;
-      this.getTasks();
-    },
-    handleCurrentChange(pageNum) {
-      this.pageInfo.pageNum = pageNum;
-      this.getTasks();
-    },
-    // 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
-    sortChange(obj) {
-      var dir = "asc";
-      if (obj.order == "ascending") {
-        dir = "asc";
-      } else {
-        dir = "desc";
-      }
-      if (obj.prop == "xxx") {
-        this.pageInfo.orderFields = ["xxx"];
-        this.pageInfo.orderDirs = [dir];
-      }
-      this.getTasks();
-    },
-    dialogWidth: function() {
-      if (screen.width > 500) {
-        return "80%";
-      } else {
-        return "100%";
-      }
-    },
 
-    searchAssigneeToMeTasks() {
-      this.pageInfo.pageNum = 1;
-      this.pageInfo.total = 0;
-      this.pageInfo.count = true;
-      this.filters.taskType = "0";
-      this.filters.assignee = this.userInfo.userid;
-      this.getTasks();
-    },
-    searchAssigneeToAnyTasks() {
-      this.pageInfo.pageNum = 1;
-      this.pageInfo.total = 0;
-      this.pageInfo.count = true;
-      this.filters.taskType = "0";
-      this.getTasks();
-    },
-    searchMyCandidateUserTasks() {
-      this.pageInfo.pageNum = 1;
-      this.pageInfo.total = 0;
-      this.pageInfo.count = true;
-      this.filters.taskType = "1";
-      this.filters.candidateUser = this.userInfo.userid;
-      this.filters.candidateGroups = this.myDepts
-        .map(i => "_dept_" + i.deptid)
-        .concat(this.myPosts.map(i => "_post_" + i.postId));
-      this.getTasks();
-    },
-    searchAnyCandidateUserTasks() {
-      this.pageInfo.pageNum = 1;
-      this.pageInfo.total = 0;
-      this.pageInfo.count = true;
-      this.filters.taskType = "1";
-      if (this.filters.candidateUser == "") {
-        this.$message({ message: "请先选择用户", type: "error" });
-      } else {
+      searchAssigneeToMeTasks() {
+        this.pageInfo.pageNum = 1;
+        this.pageInfo.total = 0;
+        this.pageInfo.count = true;
+        this.filters.taskType = "0";
+        this.filters.assignee = this.userInfo.userid;
         this.getTasks();
-      }
-    },
-    searchMyCandidateGroupTasks() {
-      this.pageInfo.pageNum = 1;
-      this.pageInfo.total = 0;
-      this.pageInfo.count = true;
-      this.filters.taskType = "2";
-      if (this.filters.candidateGroups.length <= 0) {
-        this.$message({ message: "请先选择部门", type: "error" });
-      } else {
+      },
+      searchAssigneeToAnyTasks() {
+        this.pageInfo.pageNum = 1;
+        this.pageInfo.total = 0;
+        this.pageInfo.count = true;
+        this.filters.taskType = "0";
         this.getTasks();
-      }
-    },
-    searchAnyCandidateGroupTasks() {
-      this.pageInfo.pageNum = 1;
-      this.pageInfo.total = 0;
-      this.pageInfo.count = true;
-      this.filters.taskType = "2";
-      if (this.filters.candidateGroups.length <= 0) {
-        this.$message({ message: "请先选择部门", type: "error" });
-      } else {
+      },
+      searchMyCandidateUserTasks() {
+        this.pageInfo.pageNum = 1;
+        this.pageInfo.total = 0;
+        this.pageInfo.count = true;
+        this.filters.taskType = "1";
+        this.filters.candidateUser = this.userInfo.userid;
+        this.filters.candidateGroups = this.myDepts
+          .map(i => "_dept_" + i.deptid)
+          .concat(this.myPosts.map(i => "_post_" + i.postId));
         this.getTasks();
-      }
-    },
+      },
+      searchAnyCandidateUserTasks() {
+        this.pageInfo.pageNum = 1;
+        this.pageInfo.total = 0;
+        this.pageInfo.count = true;
+        this.filters.taskType = "1";
+        if (this.filters.candidateUser == "") {
+          this.$message({
+            message: "请先选择用户",
+            type: "error"
+          });
+        } else {
+          this.getTasks();
+        }
+      },
+      searchMyCandidateGroupTasks() {
+        this.pageInfo.pageNum = 1;
+        this.pageInfo.total = 0;
+        this.pageInfo.count = true;
+        this.filters.taskType = "2";
+        if (this.filters.candidateGroups.length <= 0) {
+          this.$message({
+            message: "请先选择部门",
+            type: "error"
+          });
+        } else {
+          this.getTasks();
+        }
+      },
+      searchAnyCandidateGroupTasks() {
+        this.pageInfo.pageNum = 1;
+        this.pageInfo.total = 0;
+        this.pageInfo.count = true;
+        this.filters.taskType = "2";
+        if (this.filters.candidateGroups.length <= 0) {
+          this.$message({
+            message: "请先选择部门",
+            type: "error"
+          });
+        } else {
+          this.getTasks();
+        }
+      },
 
-    handleFiltersTagClose: function(tag, paramsName) {
-      if (paramsName == "key") {
-        this.filters.key = null;
-      } else if (paramsName == "categoryTreeNodes") {
-        this.filters.categoryTreeNodes = this.filters.categoryTreeNodes.filter(
-          i => i.id != tag.id
-        );
-        this.$refs.categoryTree.$refs.nodeTree.setChecked(tag.id, false, false);
-      } else if (paramsName == "procCategory") {
-        this.filters.procCategory = null;
-      } else if (paramsName == "tags") {
-        this.filters.tags = this.filters.tags.filter(i => i.tagId != tag.tagId);
-      } else if (paramsName == "calendar") {
-        this.showCalendar = !tag;
-      }
-    },
-    onTagSelected(tags) {
-      this.tagSelectVisible = false;
-      if (this.isBatchSetProcTags == true) {
-        // TOD 批量更新后台数据标签
-        if (!tags || tags.length == 0) {
-          this.$message.error("最少选中一个标签");
-          this.isBatchSetProcTags = false;
-          return;
+      handleFiltersTagClose: function(tag, paramsName) {
+        if (paramsName == "key") {
+          this.filters.key = null;
+        } else if (paramsName == "categoryTreeNodes") {
+          this.filters.categoryTreeNodes = this.filters.categoryTreeNodes.filter(
+            i => i.id != tag.id
+          );
+          this.$refs.categoryTree.$refs.nodeTree.setChecked(tag.id, false, false);
+        } else if (paramsName == "procCategory") {
+          this.filters.procCategory = null;
+        } else if (paramsName == "tags") {
+          this.filters.tags = this.filters.tags.filter(i => i.tagId != tag.tagId);
+        } else if (paramsName == "calendar") {
+          this.showCalendar = !tag;
         }
-        var procinstTagsVos = [];
-        this.sels.forEach(row => {
-          var procinstTags = {
-            procDefId: row.procDefId,
-            procInstId: row.procInstId,
-            branchId: row.branchId,
-            userid: this.userInfo.userid,
-            tags: tags.map(i => {
-              return { tagId: i.tagId, tagName: i.tagName };
+      },
+      onTagSelected(tags) {
+        this.tagSelectVisible = false;
+        if (this.isBatchSetProcTags == true) {
+          // TOD 批量更新后台数据标签
+          if (!tags || tags.length == 0) {
+            this.$message.error("最少选中一个标签");
+            this.isBatchSetProcTags = false;
+            return;
+          }
+          var procinstTagsVos = [];
+          this.sels.forEach(row => {
+            var procinstTags = {
+              procDefId: row.procDefId,
+              procInstId: row.procInstId,
+              branchId: row.branchId,
+              userid: this.userInfo.userid,
+              tags: tags.map(i => {
+                return {
+                  tagId: i.tagId,
+                  tagName: i.tagName
+                };
+              })
+            };
+            procinstTagsVos.push(procinstTags);
+          });
+          var params = procinstTagsVos;
+
+          batchInsertOrDeleteTags(params)
+            .then(res => {
+              this.isBatchSetProcTags = false;
+              if (res.data.tips.isOk) {
+                var tagIds = tags.map(i => i.tagId).join(",");
+                var tagNames = tags.map(i => i.tagName).join(",");
+                this.sels.forEach(row => {
+                  row.tagIds = tagIds;
+                  row.tagNames = tagNames;
+                });
+                this.$message.success("打标签成功");
+              } else {
+                this.$message.error(res.data.tips.msg);
+              }
             })
-          };
-          procinstTagsVos.push(procinstTags);
-        });
-        var params = procinstTagsVos;
+            .catch(e => (this.isBatchSetProcTags = false));
+        } else {
+          if (tags == null) {
+            this.filters.tags = null;
+          } else {
+            this.filters.tags = tags;
+          }
+        }
+      },
+      handleCategoryCheckChange(data, checked, indeterminate) {
+        if (data.id == "C0") {
+          // 选择了根节点，默认不按分类查询
+          this.filters.categoryTreeNodes = null;
+          return;
+        }
+        var node = this.$refs.categoryTree.$refs.nodeTree.getCheckedNodes();
+        console.log("node-------------" + JSON.stringify(node));
+        this.filters.categoryTreeNodes = node;
+      },
+      showTagSelect: function(isBatchSetProcTags) {
+        if (isBatchSetProcTags == true) {
+          if (this.sels.length == 0) {
+            this.$message.error("请选中流程任务");
+            return false;
+          }
+          this.tagSelectVisible = true;
+        } else {
+          this.tagSelectVisible = true;
+        }
+        this.isBatchSetProcTags = isBatchSetProcTags;
+      },
+      showSendSms: function() {
+        if (this.sels.length > 1) {
+          this.$message({
+            message: "一次只能给一个人发短信",
+            type: "error"
+          });
+        } else if (this.sels.length < 1) {
+          this.$message({
+            message: "请选择一条任务",
+            type: "error"
+          });
+        } else {
+          const task = this.sels[0];
+          this.smsBodyParams = [
+            task.assigneeName,
+            task.mainTitle + "-" + task.taskName,
+            task.createTime,
+            task.userid
+          ];
+          this.smsUserList = [{
+            userid: task.assignee
+          }];
+          this.sendSmsVisible = true;
+        }
+      },
+      showWeixin: function() {
+        if (this.sels.length > 1) {
+          this.$message({
+            message: "一次只能给一个人发信",
+            type: "error"
+          });
+          this.weixinContentVisible = false;
+          return false;
+        } else if (this.sels.length < 1) {
+          this.$message({
+            message: "请选择一条任务",
+            type: "error"
+          });
+          this.weixinContentVisible = false;
+          return false;
+        } else {
+          const task = this.sels[0];
+          // var url=window.location.href;
+          const url =
+            window.location.protocol +
+            "//" +
+            window.location.host +
+            "/oa/" +
+            process.env.VERSION +
+            "/#/mdp/workflow/ru/task/TaskListAssigneeToMe";
 
-        batchInsertOrDeleteTags(params)
-          .then(res => {
-            this.isBatchSetProcTags = false;
+          createShortToken({
+            userid: task.assignee,
+            branchId: this.userInfo.branchId
+          }).then(res => {
             if (res.data.tips.isOk) {
-              var tagIds = tags.map(i => i.tagId).join(",");
-              var tagNames = tags.map(i => i.tagName).join(",");
-              this.sels.forEach(row => {
-                row.tagIds = tagIds;
-                row.tagNames = tagNames;
-              });
-              this.$message.success("打标签成功");
-            } else {
-              this.$message.error(res.data.tips.msg);
+              var userToken = res.data.userToken;
+              this.weixinContentVisible = true;
+              this.weixinContent =
+                task.assigneeName +
+                "您好，您有任务【" +
+                task.mainTitle +
+                "-" +
+                task.taskName +
+                "】待处理，请登陆OA系统或者点击以下链接处理。" +
+                url +
+                "?userToken=" +
+                userToken;
             }
-          })
-          .catch(e => (this.isBatchSetProcTags = false));
-      } else {
-        if (tags == null) {
-          this.filters.tags = null;
-        } else {
-          this.filters.tags = tags;
+          });
         }
-      }
-    },
-    handleCategoryCheckChange(data, checked, indeterminate) {
-      if (data.id == "C0") {
-        // 选择了根节点，默认不按分类查询
-        this.filters.categoryTreeNodes = null;
-        return;
-      }
-      var node = this.$refs.categoryTree.$refs.nodeTree.getCheckedNodes();
-      console.log("node-------------" + JSON.stringify(node));
-      this.filters.categoryTreeNodes = node;
-    },
-    showTagSelect: function(isBatchSetProcTags) {
-      if (isBatchSetProcTags == true) {
-        if (this.sels.length == 0) {
-          this.$message.error("请选中流程任务");
+      },
+      showOaMsg: function() {
+        if (this.sels.length > 1) {
+          this.$message({
+            message: "一次只能给一个人发信",
+            type: "error"
+          });
+          return false;
+        } else if (this.sels.length < 1) {
+          this.$message({
+            message: "请选择一条任务",
+            type: "error"
+          });
           return false;
+        } else {
+          const task = this.sels[0];
+          var msgBody =
+            task.assigneeName +
+            "您好，您有任务【" +
+            task.mainTitle +
+            "-" +
+            task.taskName +
+            "】待处理，请登陆OA系统处理";
+
+          const href =
+            window.location.protocol +
+            "//" +
+            window.location.host +
+            "/im/" +
+            process.env.VERSION +
+            "/#/mdp/im/messages/messageChat?toUserid=" +
+            task.assignee +
+            "&msgBody=" +
+            msgBody;
+          window.open(href, "_blank");
         }
-        this.tagSelectVisible = true;
-      } else {
-        this.tagSelectVisible = true;
-      }
-      this.isBatchSetProcTags = isBatchSetProcTags;
-    },
-    showSendSms: function() {
-      if (this.sels.length > 1) {
-        this.$message({ message: "一次只能给一个人发短信", type: "error" });
-      } else if (this.sels.length < 1) {
-        this.$message({ message: "请选择一条任务", type: "error" });
-      } else {
-        const task = this.sels[0];
-        this.smsBodyParams = [
-          task.assigneeName,
-          task.mainTitle + "-" + task.taskName,
-          task.createTime,
-          task.userid
-        ];
-        this.smsUserList = [{ userid: task.assignee }];
-        this.sendSmsVisible = true;
-      }
-    },
-    showWeixin: function() {
-      if (this.sels.length > 1) {
-        this.$message({ message: "一次只能给一个人发信", type: "error" });
-        this.weixinContentVisible = false;
-        return false;
-      } else if (this.sels.length < 1) {
-        this.$message({ message: "请选择一条任务", type: "error" });
+      },
+      doCopyWeixinUrl: function() {
         this.weixinContentVisible = false;
-        return false;
-      } else {
-        const task = this.sels[0];
-        // var url=window.location.href;
-        const url =
+        const href =
           window.location.protocol +
           "//" +
           window.location.host +
@@ -851,752 +779,783 @@ export default {
           process.env.VERSION +
           "/#/mdp/workflow/ru/task/TaskListAssigneeToMe";
 
-        createShortToken({
-          userid: task.assignee,
-          branchId: this.userInfo.branchId
-        }).then(res => {
-          if (res.data.tips.isOk) {
-            var userToken = res.data.userToken;
-            this.weixinContentVisible = true;
-            this.weixinContent =
-              task.assigneeName +
-              "您好，您有任务【" +
-              task.mainTitle +
-              "-" +
-              task.taskName +
-              "】待处理，请登陆OA系统或者点击以下链接处理。" +
-              url +
-              "?userToken=" +
-              userToken;
+        this.$copyText(href).then(e => {});
+      },
+      doCopyWeixinContent: function() {
+        this.weixinContentVisible = false;
+        this.$copyText(this.weixinContent).then(e => {});
+      },
+      // 获取列表 Task act_ru_task
+      getTasks() {
+        const params = {
+          pageSize: this.pageInfo.pageSize,
+          pageNum: this.pageInfo.pageNum,
+          total: this.pageInfo.total,
+          count: this.pageInfo.count
+        };
+        if (
+          this.pageInfo.orderFields != null &&
+          this.pageInfo.orderFields.length > 0
+        ) {
+          const orderBys = [];
+          for (var i = 0; i < this.pageInfo.orderFields.length; i++) {
+            orderBys.push(
+              this.pageInfo.orderFields[i] + " " + this.pageInfo.orderDirs[i]
+            );
           }
-        });
-      }
-    },
-    showOaMsg: function() {
-      if (this.sels.length > 1) {
-        this.$message({ message: "一次只能给一个人发信", type: "error" });
-        return false;
-      } else if (this.sels.length < 1) {
-        this.$message({ message: "请选择一条任务", type: "error" });
-        return false;
-      } else {
-        const task = this.sels[0];
-        var msgBody =
-          task.assigneeName +
-          "您好，您有任务【" +
-          task.mainTitle +
-          "-" +
-          task.taskName +
-          "】待处理，请登陆OA系统处理";
-
-        const href =
-          window.location.protocol +
-          "//" +
-          window.location.host +
-          "/im/" +
-          process.env.VERSION +
-          "/#/mdp/im/messages/messageChat?toUserid=" +
-          task.assignee +
-          "&msgBody=" +
-          msgBody;
-        window.open(href, "_blank");
-      }
-    },
-    doCopyWeixinUrl: function() {
-      this.weixinContentVisible = false;
-      const href =
-        window.location.protocol +
-        "//" +
-        window.location.host +
-        "/oa/" +
-        process.env.VERSION +
-        "/#/mdp/workflow/ru/task/TaskListAssigneeToMe";
-
-      this.$copyText(href).then(e => {});
-    },
-    doCopyWeixinContent: function() {
-      this.weixinContentVisible = false;
-      this.$copyText(this.weixinContent).then(e => {});
-    },
-    // 获取列表 Task act_ru_task
-    getTasks() {
-      const params = {
-        pageSize: this.pageInfo.pageSize,
-        pageNum: this.pageInfo.pageNum,
-        total: this.pageInfo.total,
-        count: this.pageInfo.count
-      };
-      if (
-        this.pageInfo.orderFields != null &&
-        this.pageInfo.orderFields.length > 0
-      ) {
-        const orderBys = [];
-        for (var i = 0; i < this.pageInfo.orderFields.length; i++) {
-          orderBys.push(
-            this.pageInfo.orderFields[i] + " " + this.pageInfo.orderDirs[i]
-          );
+          params.orderBy = orderBys.join(",");
+        }
+        if (this.filters.key !== "") {
+          params.key = "%" + this.filters.key + "%";
+        }
+        if (this.filters.procCategory != "") {
+          params.procCategory = this.filters.procCategory;
         }
-        params.orderBy = orderBys.join(",");
-      }
-      if (this.filters.key !== "") {
-        params.key = "%" + this.filters.key + "%";
-      }
-      if (this.filters.procCategory != "") {
-        params.procCategory = this.filters.procCategory;
-      }
 
-      if (
-        this.filters.categoryTreeNodes != null &&
-        this.filters.categoryTreeNodes.length > 0
-      ) {
-        params.categoryIds = this.filters.categoryTreeNodes.map(i => i.id);
-      }
-      if (this.filters.tags != null && this.filters.tags.length > 0) {
-        params.tagIds = this.filters.tags.map(i => i.tagId);
-      }
-      if (
-        this.filters.candidateGroups != null &&
-        this.filters.candidateGroups.length > 0
-      ) {
-        params.candidateGroups = this.filters.candidateGroups;
-      }
-      if (
-        this.filters.startTimeRanger != null &&
-        this.filters.startTimeRanger.length == 2
-      ) {
-        params.fromStartTime = this.filters.startTimeRanger[0] + " 00:00:00";
-        params.toStartTime = this.filters.startTimeRanger[1] + " 23:59:59";
-      }
-      if (
-        this.filters.planFinishTimeRanger != null &&
-        this.filters.planFinishTimeRanger.length == 2
-      ) {
-        params.fromPlanFinishTime =
-          this.filters.planFinishTimeRanger[0] + " 00:00:00";
-        params.toPlanFinishTime =
-          this.filters.planFinishTimeRanger[1] + " 23:59:59";
-      }
-      params.tenantId = this.userInfo.branchId;
-      this.listLoading = true;
-      if (this.assigneeToMe) {
-        if (this.filters.taskType == "0") {
-          params.assignee = this.filters.assignee;
-          listAssigneeToMeTasks(params)
-            .then(res => {
-              var tips = res.data.tips;
-              if (tips.isOk) {
-                this.pageInfo.total = res.data.total;
-                this.pageInfo.count = false;
-                var taskList = res.data.data;
-                taskList.forEach(i => {
-                  i.taskId = i.id;
-                  i.actId = i.taskDefKey;
-                  i.taskName = i.name;
-                });
-                this.tasks = taskList;
-              } else {
-                this.$message({ message: tips.msg, type: "error" });
-              }
-              this.listLoading = false;
-            })
-            .catch(() => {
-              this.listLoading = false;
-            });
+        if (
+          this.filters.categoryTreeNodes != null &&
+          this.filters.categoryTreeNodes.length > 0
+        ) {
+          params.categoryIds = this.filters.categoryTreeNodes.map(i => i.id);
         }
-        if (this.filters.taskType == "1") {
-          params.candidateUser = this.filters.candidateUser;
-          listMyCandidateUserTasks(params)
-            .then(res => {
-              var tips = res.data.tips;
-              if (tips.isOk) {
-                this.pageInfo.total = res.data.total;
-                this.pageInfo.count = false;
-                this.tasks = res.data.data;
-                var taskList = res.data.data;
-                taskList.forEach(i => {
-                  i.taskId = i.id;
-                  i.actId = i.taskDefKey;
-                  i.taskName = i.name;
-                });
-                this.tasks = taskList;
-              } else {
-                this.$message({ message: tips.msg, type: "error" });
-              }
-              this.listLoading = false;
-            })
-            .catch(() => {
-              this.listLoading = false;
-            });
+        if (this.filters.tags != null && this.filters.tags.length > 0) {
+          params.tagIds = this.filters.tags.map(i => i.tagId);
         }
-        if (this.filters.taskType == "2") {
-          params.candidateGroups = this.myDepts.map(i => i.deptid);
-          listMyCandidateGroupTasks(params)
-            .then(res => {
-              var tips = res.data.tips;
-              if (tips.isOk) {
-                this.pageInfo.total = res.data.total;
-                this.pageInfo.count = false;
-                var taskList = res.data.data;
-                taskList.forEach(i => {
-                  i.taskId = i.id;
-                  i.actId = i.taskDefKey;
-                  i.taskName = i.name;
-                });
-                this.tasks = taskList;
-              } else {
-                this.$message({ message: tips.msg, type: "error" });
-              }
-              this.listLoading = false;
-            })
-            .catch(() => {
-              this.listLoading = false;
-            });
+        if (
+          this.filters.candidateGroups != null &&
+          this.filters.candidateGroups.length > 0
+        ) {
+          params.candidateGroups = this.filters.candidateGroups;
         }
-      } else {
-        if (this.filters.taskType == "0") {
-          params.assignee = this.filters.assignee;
-          listAssigneeToAnyTasks(params)
-            .then(res => {
-              var tips = res.data.tips;
-              if (tips.isOk) {
-                this.pageInfo.total = res.data.total;
-                this.pageInfo.count = false;
-                var taskList = res.data.data;
-                taskList.forEach(i => {
-                  i.taskId = i.id;
-                  i.actId = i.taskDefKey;
-                  i.taskName = i.name;
-                });
-                this.tasks = taskList;
-              } else {
-                this.$message({ message: tips.msg, type: "error" });
-              }
-              this.listLoading = false;
-            })
-            .catch(() => {
-              this.listLoading = false;
-            });
+        if (
+          this.filters.startTimeRanger != null &&
+          this.filters.startTimeRanger.length == 2
+        ) {
+          params.fromStartTime = this.filters.startTimeRanger[0] + " 00:00:00";
+          params.toStartTime = this.filters.startTimeRanger[1] + " 23:59:59";
         }
-        if (this.filters.taskType == "1") {
-          params.candidateUser = this.filters.candidateUser;
-          listAnyCandidateUserTasks(params)
-            .then(res => {
+        if (
+          this.filters.planFinishTimeRanger != null &&
+          this.filters.planFinishTimeRanger.length == 2
+        ) {
+          params.fromPlanFinishTime =
+            this.filters.planFinishTimeRanger[0] + " 00:00:00";
+          params.toPlanFinishTime =
+            this.filters.planFinishTimeRanger[1] + " 23:59:59";
+        }
+        params.tenantId = this.userInfo.branchId;
+        this.listLoading = true;
+        if (this.assigneeToMe) {
+          if (this.filters.taskType == "0") {
+            params.assignee = this.filters.assignee;
+            listAssigneeToMeTasks(params)
+              .then(res => {
+                var tips = res.data.tips;
+                if (tips.isOk) {
+                  this.pageInfo.total = res.data.total;
+                  this.pageInfo.count = false;
+                  var taskList = res.data.data;
+                  taskList.forEach(i => {
+                    i.taskId = i.id;
+                    i.actId = i.taskDefKey;
+                    i.taskName = i.name;
+                  });
+                  this.tasks = taskList;
+                } else {
+                  this.$message({
+                    message: tips.msg,
+                    type: "error"
+                  });
+                }
+                this.listLoading = false;
+              })
+              .catch(() => {
+                this.listLoading = false;
+              });
+          }
+          if (this.filters.taskType == "1") {
+            params.candidateUser = this.filters.candidateUser;
+            listMyCandidateUserTasks(params)
+              .then(res => {
+                var tips = res.data.tips;
+                if (tips.isOk) {
+                  this.pageInfo.total = res.data.total;
+                  this.pageInfo.count = false;
+                  this.tasks = res.data.data;
+                  var taskList = res.data.data;
+                  taskList.forEach(i => {
+                    i.taskId = i.id;
+                    i.actId = i.taskDefKey;
+                    i.taskName = i.name;
+                  });
+                  this.tasks = taskList;
+                } else {
+                  this.$message({
+                    message: tips.msg,
+                    type: "error"
+                  });
+                }
+                this.listLoading = false;
+              })
+              .catch(() => {
+                this.listLoading = false;
+              });
+          }
+          if (this.filters.taskType == "2") {
+            params.candidateGroups = this.myDepts.map(i => i.deptid);
+            listMyCandidateGroupTasks(params)
+              .then(res => {
+                var tips = res.data.tips;
+                if (tips.isOk) {
+                  this.pageInfo.total = res.data.total;
+                  this.pageInfo.count = false;
+                  var taskList = res.data.data;
+                  taskList.forEach(i => {
+                    i.taskId = i.id;
+                    i.actId = i.taskDefKey;
+                    i.taskName = i.name;
+                  });
+                  this.tasks = taskList;
+                } else {
+                  this.$message({
+                    message: tips.msg,
+                    type: "error"
+                  });
+                }
+                this.listLoading = false;
+              })
+              .catch(() => {
+                this.listLoading = false;
+              });
+          }
+        } else {
+          if (this.filters.taskType == "0") {
+            params.assignee = this.filters.assignee;
+            listAssigneeToAnyTasks(params)
+              .then(res => {
+                var tips = res.data.tips;
+                if (tips.isOk) {
+                  this.pageInfo.total = res.data.total;
+                  this.pageInfo.count = false;
+                  var taskList = res.data.data;
+                  taskList.forEach(i => {
+                    i.taskId = i.id;
+                    i.actId = i.taskDefKey;
+                    i.taskName = i.name;
+                  });
+                  this.tasks = taskList;
+                } else {
+                  this.$message({
+                    message: tips.msg,
+                    type: "error"
+                  });
+                }
+                this.listLoading = false;
+              })
+              .catch(() => {
+                this.listLoading = false;
+              });
+          }
+          if (this.filters.taskType == "1") {
+            params.candidateUser = this.filters.candidateUser;
+            listAnyCandidateUserTasks(params)
+              .then(res => {
+                var tips = res.data.tips;
+                if (tips.isOk) {
+                  this.pageInfo.total = res.data.total;
+                  this.pageInfo.count = false;
+                  var taskList = res.data.data;
+                  taskList.forEach(i => {
+                    i.taskId = i.id;
+                    i.actId = i.taskDefKey;
+                    i.taskName = i.name;
+                  });
+                  this.tasks = taskList;
+                } else {
+                  this.$message({
+                    message: tips.msg,
+                    type: "error"
+                  });
+                }
+                this.listLoading = false;
+              })
+              .catch(() => {
+                this.listLoading = false;
+              });
+          }
+          if (this.filters.taskType == "2") {
+            params.candidateGroups = this.filters.candidateGroups;
+            listAnyCandidateGroupTasks(params)
+              .then(res => {
+                var tips = res.data.tips;
+                if (tips.isOk) {
+                  this.pageInfo.total = res.data.total;
+                  this.pageInfo.count = false;
+                  var taskList = res.data.data;
+                  taskList.forEach(i => {
+                    i.taskId = i.id;
+                    i.actId = i.taskDefKey;
+                    i.taskName = i.name;
+                  });
+                  this.tasks = taskList;
+                } else {
+                  this.$message({
+                    message: tips.msg,
+                    type: "error"
+                  });
+                }
+                this.listLoading = false;
+              })
+              .catch(() => {
+                this.listLoading = false;
+              });
+          }
+        }
+      },
+
+      // 显示编辑界面 Task act_ru_task
+      showTaskDetail: function(row, index) {
+        // this.editFormVisible = true;
+        this.editForm = Object.assign({}, row);
+        this.$router.push({
+          name: "ProcinstParamesExecutionSetRoute",
+          params: {
+            taskInfo: row
+          }
+        });
+      },
+      // 显示新增界面 Task act_ru_task
+      showAdd: function() {
+        this.addFormVisible = true;
+        // this.addForm=Object.assign({}, this.editForm);
+      },
+      afterAddSubmit() {
+        this.addFormVisible = false;
+        this.pageInfo.total = 0;
+        this.getTasks();
+      },
+      afterEditSubmit() {
+        this.editFormVisible = false;
+        this.getTasks();
+      },
+      // 选择行task
+      selsChange: function(sels) {
+        this.sels = sels;
+      },
+      // 删除task
+      handleDel: function(row, index) {
+        this.$confirm("确认删除该记录吗?", "提示", {
+            type: "warning"
+          })
+          .then(() => {
+            this.listLoading = true;
+            const params = {
+              id: row.id
+            };
+            delTask(params).then(res => {
+              this.listLoading = false;
               var tips = res.data.tips;
               if (tips.isOk) {
-                this.pageInfo.total = res.data.total;
-                this.pageInfo.count = false;
-                var taskList = res.data.data;
-                taskList.forEach(i => {
-                  i.taskId = i.id;
-                  i.actId = i.taskDefKey;
-                  i.taskName = i.name;
-                });
-                this.tasks = taskList;
-              } else {
-                this.$message({ message: tips.msg, type: "error" });
+                this.pageInfo.total = 0;
+                this.getTasks();
               }
-              this.listLoading = false;
-            })
-            .catch(() => {
-              this.listLoading = false;
+              this.$message({
+                message: tips.msg,
+                type: tips.isOk ? "success" : "error"
+              });
             });
-        }
-        if (this.filters.taskType == "2") {
-          params.candidateGroups = this.filters.candidateGroups;
-          listAnyCandidateGroupTasks(params)
-            .then(res => {
+          })
+          .catch(() => {
+            this.listLoading = false;
+          });
+      },
+      // 批量删除task
+      batchDel: function() {
+        var ids = this.sels.map(item => item.id);
+        this.$confirm("确认删除选中记录吗？", "提示", {
+            type: "warning"
+          })
+          .then(() => {
+            this.listLoading = true;
+            batchDelTask(ids).then(res => {
+              this.listLoading = false;
               var tips = res.data.tips;
               if (tips.isOk) {
-                this.pageInfo.total = res.data.total;
-                this.pageInfo.count = false;
-                var taskList = res.data.data;
-                taskList.forEach(i => {
-                  i.taskId = i.id;
-                  i.actId = i.taskDefKey;
-                  i.taskName = i.name;
-                });
-                this.tasks = taskList;
-              } else {
-                this.$message({ message: tips.msg, type: "error" });
+                this.pageInfo.total = 0;
+                this.getTasks();
               }
-              this.listLoading = false;
-            })
-            .catch(() => {
-              this.listLoading = false;
-            });
-        }
-      }
-    },
-
-    // 显示编辑界面 Task act_ru_task
-    showTaskDetail: function(row, index) {
-      // this.editFormVisible = true;
-      this.editForm = Object.assign({}, row);
-      this.$router.push({
-        name: "ProcinstParamesExecutionSetRoute",
-        params: { taskInfo: row }
-      });
-    },
-    // 显示新增界面 Task act_ru_task
-    showAdd: function() {
-      this.addFormVisible = true;
-      // this.addForm=Object.assign({}, this.editForm);
-    },
-    afterAddSubmit() {
-      this.addFormVisible = false;
-      this.pageInfo.total = 0;
-      this.getTasks();
-    },
-    afterEditSubmit() {
-      this.editFormVisible = false;
-      this.getTasks();
-    },
-    // 选择行task
-    selsChange: function(sels) {
-      this.sels = sels;
-    },
-    // 删除task
-    handleDel: function(row, index) {
-      this.$confirm("确认删除该记录吗?", "提示", {
-        type: "warning"
-      })
-        .then(() => {
-          this.listLoading = true;
-          const params = { id: row.id };
-          delTask(params).then(res => {
-            this.listLoading = false;
-            var tips = res.data.tips;
-            if (tips.isOk) {
-              this.pageInfo.total = 0;
-              this.getTasks();
-            }
-            this.$message({
-              message: tips.msg,
-              type: tips.isOk ? "success" : "error"
+              this.$message({
+                message: tips.msg,
+                type: tips.isOk ? "success" : "error"
+              });
             });
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    // 批量删除task
-    batchDel: function() {
-      var ids = this.sels.map(item => item.id);
-      this.$confirm("确认删除选中记录吗？", "提示", {
-        type: "warning"
-      })
-        .then(() => {
-          this.listLoading = true;
-          batchDelTask(ids).then(res => {
+          })
+          .catch(() => {
             this.listLoading = false;
-            var tips = res.data.tips;
-            if (tips.isOk) {
-              this.pageInfo.total = 0;
-              this.getTasks();
-            }
-            this.$message({
-              message: tips.msg,
-              type: tips.isOk ? "success" : "error"
-            });
           });
-        })
-        .catch(() => {
-          this.listLoading = false;
+      },
+      rowClick: function(row, event, column) {
+        this.$emit("row-click", row, event, column); //  @row-click="rowClick"
+      },
+      /** begin 自定义函数请在下面加**/
+      formatterDept(row, column, cellValue) {
+        var newValue = cellValue;
+        if (this.companyDepts == null) {
+          return newValue;
+        }
+        this.companyDepts.forEach(dept => {
+          if (dept.deptid == cellValue) {
+            newValue = dept.deptName;
+            return;
+          }
         });
-    },
-    rowClick: function(row, event, column) {
-      this.$emit("row-click", row, event, column); //  @row-click="rowClick"
-    },
-    /** begin 自定义函数请在下面加**/
-    formatterDept(row, column, cellValue) {
-      var newValue = cellValue;
-      if (this.companyDepts == null) {
         return newValue;
-      }
-      this.companyDepts.forEach(dept => {
-        if (dept.deptid == cellValue) {
-          newValue = dept.deptName;
-          return;
+      },
+      formatterUserid(row, column, cellValue) {
+        var newValue = cellValue;
+        if (this.companyEmployees == null) {
+          return newValue;
         }
-      });
-      return newValue;
-    },
-    formatterUserid(row, column, cellValue) {
-      var newValue = cellValue;
-      if (this.companyEmployees == null) {
+        this.companyEmployees.forEach(item => {
+          if (item.userid == cellValue) {
+            newValue = item.username;
+          }
+        });
         return newValue;
-      }
-      this.companyEmployees.forEach(item => {
-        if (item.userid == cellValue) {
-          newValue = item.username;
+      },
+      formatterUserids(row, column, cellValue) {
+        var newValue = cellValue;
+        if (cellValue == "" || cellValue == null) {
+          return newValue;
         }
-      });
-      return newValue;
-    },
-    formatterUserids(row, column, cellValue) {
-      var newValue = cellValue;
-      if (cellValue == "" || cellValue == null) {
-        return newValue;
-      }
-      if (this.companyEmployees == null) {
-        return newValue;
-      }
-      this.companyEmployees.forEach(item => {
-        if (cellValue.indexOf(item.userid) >= 0) {
-          newValue = newValue.replace(item.userid, item.username);
+        if (this.companyEmployees == null) {
+          return newValue;
         }
-      });
-      return newValue;
-    },
-    formatterSuspensionState(row, column, cellValue) {
-      return cellValue == 1 ? "激活的" : "挂起的";
-    },
-    formatterDelegation(row, column, cellValue) {
-      return cellValue == "PENDING" ? "是" : "否";
-    },
-    showCalendarDataTips: function(date, data) {
-      var datas = this.tasks;
-      var startTasks = [];
-      var planFinishTasks = [];
-      var runningTasks = [];
-      var delayTasks = [];
-      var tags = [];
+        this.companyEmployees.forEach(item => {
+          if (cellValue.indexOf(item.userid) >= 0) {
+            newValue = newValue.replace(item.userid, item.username);
+          }
+        });
+        return newValue;
+      },
+      formatterSuspensionState(row, column, cellValue) {
+        return cellValue == 1 ? "激活的" : "挂起的";
+      },
+      formatterDelegation(row, column, cellValue) {
+        return cellValue == "PENDING" ? "是" : "否";
+      },
+      showCalendarDataTips: function(date, data) {
+        var datas = this.tasks;
+        var startTasks = [];
+        var planFinishTasks = [];
+        var runningTasks = [];
+        var delayTasks = [];
+        var tags = [];
 
-      var now = new Date();
-      var dateStr = util.formatDate.format(now, "yyyy-MM-dd");
-      if (dateStr == data.day) {
-        data.isSelected = true;
-      }
-      datas.forEach(i => {
-        var task = Object.assign({}, i);
-        if (task.createTime.indexOf(data.day) >= 0) {
-          task.calStatus = "开始";
-          startTasks.push(task);
+        var now = new Date();
+        var dateStr = util.formatDate.format(now, "yyyy-MM-dd");
+        if (dateStr == data.day) {
+          data.isSelected = true;
         }
-
-        if (task.planFinishTime) {
-          if (task.planFinishTime.indexOf(data.day) >= 0) {
-            task.calStatus = "到期";
-            planFinishTasks.push(task);
-          } else if (
-            task.planFinishTime > data.day &&
-            task.createTime < data.day
-          ) {
-            task.calStatus = "执行中";
-            runningTasks.push(task);
-          } else if (
-            task.planFinishTime > data.day &&
-            task.createTime > data.day
-          ) {
-            // 未开始
-          } else if (task.planFinishTime < data.day && dateStr >= data.day) {
-            task.calStatus = "延期";
-            delayTasks.push(task);
+        datas.forEach(i => {
+          var task = Object.assign({}, i);
+          if (task.createTime.indexOf(data.day) >= 0) {
+            task.calStatus = "开始";
+            startTasks.push(task);
           }
-        } else {
-          if (task.createTime < data.day) {
-            task.calStatus = "执行中";
-            runningTasks.push(task);
-          } else if (task.createTime > data.day) {
-            // 未开始
-          }
-        }
-      });
 
-      var allTasks = startTasks
-        .concat(planFinishTasks)
-        .concat(runningTasks)
-        .concat(delayTasks);
-      allTasks.forEach(i => {
-        var tagIds = i.tagIds ? i.tagIds.split(",") : [];
-        var tagNames = i.tagNames ? i.tagNames.split(",") : [];
-        tagIds.forEach((tagId, index) => {
-          var tag = tags.find(t => t.tagId == tagId);
-          if (tag) {
-            tag.count = tag.count + 1;
+          if (task.planFinishTime) {
+            if (task.planFinishTime.indexOf(data.day) >= 0) {
+              task.calStatus = "到期";
+              planFinishTasks.push(task);
+            } else if (
+              task.planFinishTime > data.day &&
+              task.createTime < data.day
+            ) {
+              task.calStatus = "执行中";
+              runningTasks.push(task);
+            } else if (
+              task.planFinishTime > data.day &&
+              task.createTime > data.day
+            ) {
+              // 未开始
+            } else if (task.planFinishTime < data.day && dateStr >= data.day) {
+              task.calStatus = "延期";
+              delayTasks.push(task);
+            }
           } else {
-            tag = {
-              tagId: tagId,
-              tagName: tagNames[index],
-              count: 1
-            };
-            tags.push(tag);
+            if (task.createTime < data.day) {
+              task.calStatus = "执行中";
+              runningTasks.push(task);
+            } else if (task.createTime > data.day) {
+              // 未开始
+            }
           }
         });
-      });
 
-      var msg = {
-        startTasks: startTasks,
-        planFinishTasks: planFinishTasks,
-        runningTasks: runningTasks,
-        startTasksCount: startTasks.length,
-        planFinishTasksCount: planFinishTasks.length,
-        runningTasksCount: runningTasks.length,
-        delayTasksCount: delayTasks.length,
-        delayTasks: delayTasks,
-        allTasks: allTasks,
-        tags: tags
-      };
-      return [msg];
-    },
-    handleDownload() {
-      console.log(JSON.stringify(this.tasks));
-      import("@/vendor/Export2Excel").then(excel => {
-        const tHeader = [
-          "状态",
-          "处理时长",
-          "实际完成时间",
-          "创建人",
-          "参数编号",
-          "主办人",
-          "主键",
-          "任务定义编码",
-          "表单编号",
-          "版次---rev",
-          "范围编号",
-          "优先----priority",
-          "流程定义编号",
-          "委办时间",
-          "执行编号",
-          "范围定义编号",
-          "子任务计数--subTaskCount",
-          "任务名称",
-          "是否启用计数",
-          "指派人",
-          "任务定义编号",
-          "监控人",
-          "备用字段5",
-          "父任务编号",
-          "标签编号",
-          "编号链接总数----idLinkCount",
-          "部门编号",
-          "主要操作----mainQx",
-          "备注",
-          "备用字段4",
-          "备用字段1",
-          "智能表单展示方式",
-          "备用字段",
-          "标签名称",
-          "计划完成时间",
-          "作用域类型",
-          "执行人",
-          "变量计数",
-          "备用字段2",
-          "所有权人",
-          "是否关联自定义表单",
-          "表单编码",
-          "发起人",
-          "流程实例编号",
-          "子范围编号---subScopeId",
-          "创建时间",
-          "流程标题",
-          "发起部门",
-          "工作编号---tenantId",
-          "是否代办",
-          "所属分类",
-          "备用字段3",
-          "所属分类编号",
-          "任务编号",
-          "节点编号",
-          "任务名称"
-        ];
-        const filterVal = [
-          "suspensionState",
-          "dueDate",
-          "realFinishTime",
-          "userid",
-          "paramsId",
-          "sponsors",
-          "id",
-          "taskDefKey",
-          "formId",
-          "rev",
-          "scopeId",
-          "priority",
-          "procDefId",
-          "claimTime",
-          "executionId",
-          "scopeDefinitionId",
-          "subTaskCount",
-          "name",
-          "isCountEnabled",
-          "assignee",
-          "taskDefId",
-          "monitors",
-          "fi",
-          "parentTaskId",
-          "tagIds",
-          "idLinkCount",
-          "deptid",
-          "mainQx",
-          "description",
-          "fo",
-          "fp",
-          "formShowType",
-          "pconfig",
-          "tagNames",
-          "planFinishTime",
-          "scopeType",
-          "assigneeName",
-          "varCount",
-          "sp",
-          "owner",
-          "isRefForm",
-          "formKey",
-          "startUsername",
-          "procInstId",
-          "subScopeId",
-          "createTime",
-          "mainTitle",
-          "startDeptName",
-          "tenantId",
-          "delegation",
-          "category",
-          "tp",
-          "categoryId",
-          "taskId",
-          "actId",
-          "taskName"
-        ];
-        const list = this.tasks;
-        const data = this.formatJson(filterVal, list);
-        var filename = "我的任务";
-        if (this.formDefSelected) {
-          filename = this.formDefSelected.formName
-            ? this.formDefSelected.formName
-            : this.formDefSelected.id + "我的任务";
-        }
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: filename,
-          autoWidth: true,
-          bookType: "xlsx"
+        var allTasks = startTasks
+          .concat(planFinishTasks)
+          .concat(runningTasks)
+          .concat(delayTasks);
+        allTasks.forEach(i => {
+          var tagIds = i.tagIds ? i.tagIds.split(",") : [];
+          var tagNames = i.tagNames ? i.tagNames.split(",") : [];
+          tagIds.forEach((tagId, index) => {
+            var tag = tags.find(t => t.tagId == tagId);
+            if (tag) {
+              tag.count = tag.count + 1;
+            } else {
+              tag = {
+                tagId: tagId,
+                tagName: tagNames[index],
+                count: 1
+              };
+              tags.push(tag);
+            }
+          });
         });
-      });
-    },
-    formatJson(filterVal, jsonData) {
-      return jsonData.map(v =>
-        filterVal.map(j => {
-          if (j === "timestamp") {
-            return parseTime(v[j]);
-          } else {
-            return v[j];
+
+        var msg = {
+          startTasks: startTasks,
+          planFinishTasks: planFinishTasks,
+          runningTasks: runningTasks,
+          startTasksCount: startTasks.length,
+          planFinishTasksCount: planFinishTasks.length,
+          runningTasksCount: runningTasks.length,
+          delayTasksCount: delayTasks.length,
+          delayTasks: delayTasks,
+          allTasks: allTasks,
+          tags: tags
+        };
+        return [msg];
+      },
+      handleDownload() {
+        console.log(JSON.stringify(this.tasks));
+        import("@/vendor/Export2Excel").then(excel => {
+          const tHeader = [
+            "状态",
+            "处理时长",
+            "实际完成时间",
+            "创建人",
+            "参数编号",
+            "主办人",
+            "主键",
+            "任务定义编码",
+            "表单编号",
+            "版次---rev",
+            "范围编号",
+            "优先----priority",
+            "流程定义编号",
+            "委办时间",
+            "执行编号",
+            "范围定义编号",
+            "子任务计数--subTaskCount",
+            "任务名称",
+            "是否启用计数",
+            "指派人",
+            "任务定义编号",
+            "监控人",
+            "备用字段5",
+            "父任务编号",
+            "标签编号",
+            "编号链接总数----idLinkCount",
+            "部门编号",
+            "主要操作----mainQx",
+            "备注",
+            "备用字段4",
+            "备用字段1",
+            "智能表单展示方式",
+            "备用字段",
+            "标签名称",
+            "计划完成时间",
+            "作用域类型",
+            "执行人",
+            "变量计数",
+            "备用字段2",
+            "所有权人",
+            "是否关联自定义表单",
+            "表单编码",
+            "发起人",
+            "流程实例编号",
+            "子范围编号---subScopeId",
+            "创建时间",
+            "流程标题",
+            "发起部门",
+            "工作编号---tenantId",
+            "是否代办",
+            "所属分类",
+            "备用字段3",
+            "所属分类编号",
+            "任务编号",
+            "节点编号",
+            "任务名称"
+          ];
+          const filterVal = [
+            "suspensionState",
+            "dueDate",
+            "realFinishTime",
+            "userid",
+            "paramsId",
+            "sponsors",
+            "id",
+            "taskDefKey",
+            "formId",
+            "rev",
+            "scopeId",
+            "priority",
+            "procDefId",
+            "claimTime",
+            "executionId",
+            "scopeDefinitionId",
+            "subTaskCount",
+            "name",
+            "isCountEnabled",
+            "assignee",
+            "taskDefId",
+            "monitors",
+            "fi",
+            "parentTaskId",
+            "tagIds",
+            "idLinkCount",
+            "deptid",
+            "mainQx",
+            "description",
+            "fo",
+            "fp",
+            "formShowType",
+            "pconfig",
+            "tagNames",
+            "planFinishTime",
+            "scopeType",
+            "assigneeName",
+            "varCount",
+            "sp",
+            "owner",
+            "isRefForm",
+            "formKey",
+            "startUsername",
+            "procInstId",
+            "subScopeId",
+            "createTime",
+            "mainTitle",
+            "startDeptName",
+            "tenantId",
+            "delegation",
+            "category",
+            "tp",
+            "categoryId",
+            "taskId",
+            "actId",
+            "taskName"
+          ];
+          const list = this.tasks;
+          const data = this.formatJson(filterVal, list);
+          var filename = "我的任务";
+          if (this.formDefSelected) {
+            filename = this.formDefSelected.formName ?
+              this.formDefSelected.formName :
+              this.formDefSelected.id + "我的任务";
           }
-        })
-      );
-    }
-    /** end 自定义函数请在上面加**/
-  }, // end methods
-  components: {
-    "procinst-parames-execution-set": ProcinstParamesExecutionSet,
-    sticky: Sticky,
-    "send-sms": SendSms,
-    CategoryTree,
-    TagMng
-    // 在下面添加其它组件
-  },
-  mounted() {
-    this.filters.candidateUser = this.userInfo.userid;
-    listCategorys({ tenantId: this.userInfo.branchId }).then(res => {
-      this.categorys = res.data.data;
-    });
-    if (this.defaultShowCalendar) {
-      this.showCalendar = true;
-    } 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; 
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: filename,
+            autoWidth: true,
+            bookType: "xlsx"
+          });
+        });
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v =>
+          filterVal.map(j => {
+            if (j === "timestamp") {
+              return parseTime(v[j]);
+            } else {
+              return v[j];
+            }
+          })
+        );
       }
-    })
-    
-    this.myBranchDepts = this.myDepts.filter(i => {
-      if (i.branchId == this.userInfo.branchId) {
-        return true;
+      /** end 自定义函数请在上面加**/
+    }, // end methods
+    components: {
+      "procinst-parames-execution-set": ProcinstParamesExecutionSet,
+      sticky: Sticky,
+      "send-sms": SendSms,
+      CategoryTree,
+      TagMng
+      // 在下面添加其它组件
+    }, 
+    mounted() {
+      this.filters.candidateUser = this.userInfo.userid;
+      listCategorys({
+        tenantId: this.userInfo.branchId
+      }).then(res => {
+        this.categorys = res.data.data;
+      });
+      if (this.defaultShowCalendar) {
+        this.showCalendar = true;
       } else {
-        return false;
+        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.assigneeToMe !== false) {
-      if (this.isClaim == undefined || this.isClaim === false) {
-        this.filters.assignee = this.userInfo.userid;
-        console.log(this.myBranchDepts);
-        // this.filters.candidateGroups=this.myBranchDepts.map(i=>i.deptid)
-        // this.getTasks();
-      } else {
-        // this.searchMyCandidateUserTasks()
+      this.myBranchDepts = this.myDepts.filter(i => {
+        if (i.branchId == this.userInfo.branchId) {
+          return true;
+        } else {
+          return false;
+        }
+      });
+
+      if (this.assigneeToMe !== false) {
+        if (this.isClaim == undefined || this.isClaim === false) {
+          this.filters.assignee = this.userInfo.userid;
+          console.log(this.myBranchDepts);
+          // this.filters.candidateGroups=this.myBranchDepts.map(i=>i.deptid)
+          //this.getTasks();
+        } else {
+          //this.searchMyCandidateUserTasks()
+        }
       }
     }
-  }
-};
+  };
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.filters-show {
-  margin-left: 20px;
-  margin-top: 10px;
-  margin-bottom: 0px;
-}
-.filters-label {
-  font-size: 14px;
-  color: black;
-  font-weight: bold;
-}
-.dialog-body {
-  padding: 0px 0px;
-}
+  .filters-show {
+    margin-left: 20px;
+    margin-top: 10px;
+    margin-bottom: 0px;
+  }
 
-.more-filter-item {
-  margin: 20px 20px;
-}
+  .filters-label {
+    font-size: 14px;
+    color: black;
+    font-weight: bold;
+  }
 
-.more-filter-item .el-col {
-  margin: 2px 2px;
-}
-.more-filter-item button {
-  margin: 2px 2px;
-}
+  .dialog-body {
+    padding: 0px 0px;
+  }
 
-.calendar-cell-data {
-  flex: 1;
-  display: inline-block;
-  align-items: left;
-  justify-content: space-between;
-  font-size: 14px;
-  color: #4386c6;
-  i，span {
-    margin-left: 0px;
-    font-size: 18px;
-    font-weight: 600;
+  .more-filter-item {
+    margin: 20px 20px;
+  }
+
+  .more-filter-item .el-col {
+    margin: 2px 2px;
+  }
+
+  .more-filter-item button {
+    margin: 2px 2px;
+  }
+
+  .calendar-cell-data {
+    flex: 1;
+    display: inline-block;
+    align-items: left;
+    justify-content: space-between;
+    font-size: 14px;
+    color: #4386c6;
+
+    i，span {
+      margin-left: 0px;
+      font-size: 18px;
+      font-weight: 600;
+    }
+  }
+
+  .el-ic {
+    display: none;
+
+    i,
+    span {
+      padding: 0 0px;
+      font-size: 18px;
+      font-weight: 600;
+    }
+  }
+
+  .calendar-cell-data:hover .el-ic {
+    color: #428bca !important;
+    display: inline-block;
+    margin-left: 20px;
   }
-}
 
-.el-ic {
-  display: none;
-  i,
-  span {
-    padding: 0 0px;
-    font-size: 18px;
-    font-weight: 600;
+  .calendar-cell-datat:hover {
+    font-weight: bold;
   }
-}
 
-.calendar-cell-data:hover .el-ic {
-  color: #428bca !important;
-  display: inline-block;
-  margin-left: 20px;
-}
+  .more-label-font {
+    text-align: center;
+    float: left;
+    height: 28px;
+    line-height: 28px;
+    margin-right: 10px;
+    margin-top: 2px;
+  }
+
+  .el-input--medium .el-input__inner {
+    height: 36px;
+    line-height: 36px;
+    margin-left: 2px;
+  }
 
-.calendar-cell-datat:hover {
-  font-weight: bold;
-}
+  .el-divider--horizontal {
+    display: block;
+    height: 1px;
+    width: 100%;
+    margin: 24px 0;
+    padding-top: 20px;
+    margin-left: 0px;
+    background: #fff;
+  }
+
+  .el-divider__text.is-left {
+    left: 0px;
+  }
+</style>
+
+<style>
+  .el-input-group__append, .el-input-group__prepend {
+      background-color: #409EFF!important;
+      color: #ffffff!important;
+      vertical-align: middle;
+      display: table-cell;
+      position: relative;
+      border: 1px solid #409EFF!important;
+      padding: 0 20px;
+      width: 1px;
+      white-space: nowrap;
+  }
+  .el-calendar__header {
+      display: -webkit-box;
+      display: -ms-flexbox;
+      display: flex;
+      -webkit-box-pack: justify;
+      -ms-flex-pack: justify;
+      justify-content: space-between;
+      padding: 20px 0px;
+      border: none;
+  }
+  .el-calendar__body {
+      padding: 12px 20px 35px;
+      border: 1px solid #EBEEF5;
+  }
+  .el-divider__text {
+      position: absolute;
+      background-color: #FFF;
+      padding: 0px 0px;
+      color: #303133;
+  }
 </style>