+
+
+
暂无信息
-
-
- >任务:{{item.name==''||item.name==null?'未知的节点名字':item.name}} 办理时间 :{{item.time}}{{formatTaskTime(item.time)}}
-
-
{{item.username?item.username:item.userid}}>
{{item.message}}
+
+
+
+
+ {{item.name==''||item.name==null?item.message:item.name}}
+ {{item.time}}
+
+ {{formatTaskTime(item.time)}}
+
+
+
+
{{item.username?item.username:item.userid}}
+
+
{{item.message}}
+
+
+ {{task.taskName}} 当前节点
+ {{task.startTime}}
+
+ {{formatTaskTime(task.startTime)}}
+
+
+
+
{{task.assigneeName?task.assigneeName:task.assignee}}
+
+
请尽快处理
-
@@ -33,7 +48,7 @@
import { listDept } from '@/api/mdp/sys/dept';//下拉框数据查询
import moment from "moment";
export default {
- props:['refresh','procInstId'],
+ props:['refresh','procInstId','task'],
watch: {
'refresh':function(refresh) {
if(refresh==true){
@@ -47,7 +62,7 @@
computed:{
screenWidth:function(){
return screen.width;
- }
+ },
},
data() {
return {
diff --git a/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue b/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
index ae17ca7b..527125f6 100644
--- a/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
+++ b/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
@@ -1,255 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- 标签查找
- 打标签
- 导出数据
- 全部
- 我发起
- 我参与
- 我主办
- 我监控
- 未结束
- 已结束
-
-
-
- 更多
-
-
-
- 全部
- 我发起
- 我参与
- 我主办
- 我监控
- 未结束
- 已结束
- 标签查找
- 打标签
- 任务执行人
- 导出数据
-
- 开始日期：
-
-
-
- 计划完成：
-
-
-
- 实际完成：
-
-
-
-
-
-
-
-
-
- 已选条件:
-
-
- {{tag.tagName}}
- {{tag.name}}
- {{filters.taskType=='0'?'已领取':''}}
- {{filters.taskType=='1'?'待领取':''}}
- {{'我参与'}}
- {{'我主办'}}
- {{'我监控'}}
- {{'已结束'}}
- {{'未结束'}}
- {{'我发起'}}
-
- {{filters.procCategory}}
- {{filters.key}}
-
- {{filters.assignee.username}}
-
+
-
-
-
-
-
- {{scope.row.mainTitle}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
-
-
-
-
-
- {{tagName}}
-
-
-
-
-
-
+
+
+ {{weixinContent}}
+
+ 拷贝链接
+ 拷贝内容
+
+ 微信催办
+
+
+
+
+
+
+ 查询范围：
+
+
+
+
+
+
+
+
+
+
+
+ 标签查找：
+
+
+
+ {{tag.tagName}}
+
+
+ 选择标签
+
+
+
+ 任务执行人：
+
+
+ {{filters.assignee.username}}
+
+ 选择执行人
+
+
+ 挂起的
+ 活动的
+
+
+
+
+
+ 开始日期：
+
+
+
+
+
+
+
+ 计划完成日期：
+
+
+
+
+
+
+
+
+ 按日历风格显示
+ 查询
+
+
+
+ 其它操作
+ 给任务打标签
+ 导出数据
+ 微信催办
+ 短信催办
+ OAMSG催办
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.mainTitle}}
+
+
+
+
+
+
+ {{tagName}}
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -449,7 +356,8 @@ export default {
],
planFinishTimeRanger: [],
endTimeRanger: [],
- assignee: null
+ assignee: null,
+ filterType:'',
},
pickerOptions: {
shortcuts: [
@@ -566,7 +474,8 @@ export default {
categorys: [],
tagSelectVisible: false,
isBatchSetProcTags: false,
- userSelectVisible: false
+ userSelectVisible: false,
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
};
}, //end data
@@ -686,8 +595,18 @@ export default {
if (this.filters.assignee != null) {
params.assignee = this.filters.assignee.userid;
}
- if (this.filters.otherParames) {
- params = Object.assign(params, this.filters.otherParames);
+
+ if(this.filters.filterType=='startUserId'){
+ params.startUserId=this.userInfo.userid
+ }
+ if(this.filters.filterType=='partake'){
+ params.partake=this.userInfo.userid
+ }
+ if(this.filters.filterType=='sponsors'){
+ params.sponsors='%'+this.userInfo.userid+'%'
+ }
+ if(this.filters.filterType=='monitors'){
+ params.monitors='%'+this.userInfo.userid+'%'
}
if (this.filters.proccategory != "") {
params.category = this.filters.proccategory;
@@ -1110,19 +1029,21 @@ export default {
this.categorys = res.data.data;
});
this.$nextTick(() => {
- if (this.isMyStart) {
- this.searchMyStart();
- } else if (this.isMyMonitors) {
- this.searchMyMonitors();
- } else if (this.isMySponsors) {
- this.searchMySponsors();
- } else if (this.isMyPartake) {
- this.searchMyPartake();
- } else if (this.isAll) {
- this.searchAll();
- } else {
- this.getProcinsts();
- }
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=70/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
+ if(this.isMyStart){
+ this.filters.filterType="startUserId"
+ }else if(this.isMyMonitors){
+ this.filters.filterType="monitors"
+ }else if(this.isMySponsors){
+ this.filters.filterType="sponsors"
+ }else if(this.isMyPartake){
+ this.filters.filterType="partake"
+ }else if(this.isAll){
+
+ }
+ this.getProcinsts();
});
}
};
@@ -1150,4 +1071,10 @@ export default {
.more-filter-item button {
margin: 2px 2px;
}
+
+ .more-label-font{
+ text-align:center;
+ float:left;
+ padding-top:5px;
+ }
\ No newline at end of file
diff --git a/src/views/mdp/workflow/re/deployment/DeploymentMng.vue b/src/views/mdp/workflow/re/deployment/DeploymentMng.vue
index a2e3d660..934d9413 100644
--- a/src/views/mdp/workflow/re/deployment/DeploymentMng.vue
+++ b/src/views/mdp/workflow/re/deployment/DeploymentMng.vue
@@ -1,68 +1,74 @@
-
-
-
-
-
- 查询
- 导出数据
-
-
-
-
-
-
-
-
-
-
-
-
- 取消发布
+
+
+
+
+
+
+ 查询
-
-
+
+ 导出数据
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消发布
+
+
+
-
-
-
-
-
+
+
+
+
+
+
@@ -131,7 +137,8 @@ export default {
key: "",
engineVersion: ""
},
- categorys: []
+ categorys: [],
+ tableHeight:300,
/**begin 自定义属性请在下面加 请加备注**/
/**end 自定义属性请在上面加 请加备注**/
@@ -374,6 +381,10 @@ export default {
this.categorys = res.data.data;
});
this.$nextTick(() => {
+
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=70/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getDeployments();
});
}
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue
index eac9559e..1ed1e918 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue
@@ -26,8 +26,7 @@
]),
},
data() {
- return {
- paramsStr:'',
+ return {
filters: {
params:{
@@ -52,41 +51,56 @@
methods: {
closeTab(){
+ var key="ProcdefListForBizStart"
this.$store.dispatch('delVisitedViews', this.$route)
+ localStorage.removeItem(key)
this.$router.back(-1);
+ },
+ dataInit(){
+ this.$nextTick(()=>{
+ var key="ProcdefListForBizStart"
+ if(this.$route.query && this.$route.query.params){
+ let paramsJsonStr=this.$route.query.params;
+ let params= JSON.parse(decodeURIComponent(paramsJsonStr))
+ this.filters.params=params;
+ localStorage.setItem(key,JSON.stringify(params))
+ /** 传过来的参数格式
+ let extVars={formDataIds:[row.id],formId:row.formId}
+ let jsonExtVars=JSON.stringify(extVars);
+ let params={
+ mainContext:'',
+ mainTitle:'',
+ bizUrl:process.env.BASE_API+config.getFormBasePath()+'/#/mdp/form/formData/FormDataMng?extVars='+jsonExtVars,
+ extVars:extVars
+ }
+ let jsonParmas=encodeURIComponent(JSON.stringify(params));//对方要 decodeURIComponent
+ this.$router.push({path:'/mdp/workflow/ru/execution/ExecutionMngForFormData',query:{params:jsonParmas}});
+ */
+
+ }else if(this.$route.params && this.$route.params.mainTitle){
+ this.filters.params=this.$route.params;
+ var paramsJsonStr=JSON.stringify(this.$route.params);
+ localStorage.setItem(key,paramsJsonStr)
+ }else{
+ var paramsJsonStr=localStorage.getItem(key);
+ if(paramsJsonStr){
+ this.filters.params=JSON.parse(paramsJsonStr);
+ }
+ }
+ })
+
}
},//end methods
components: {
//在下面添加其它组件
},
- activated:function(){
-
- if(this.$route.query && this.$route.query.params){
- let paramsJsonStr=this.$route.query.params;
-
- this.paramsStr=paramsJsonStr;
- let params= JSON.parse(decodeURIComponent(paramsJsonStr))
- this.filters.params=params;
-
- /** 传过来的参数格式
- let extVars={formDataIds:[row.id],formId:row.formId}
- let jsonExtVars=JSON.stringify(extVars);
- let params={
- mainContext:'',
- mainTitle:'',
- bizUrl:process.env.BASE_API+config.getFormBasePath()+'/#/mdp/form/formData/FormDataMng?extVars='+jsonExtVars,
- extVars:extVars
- }
- let jsonParmas=encodeURIComponent(JSON.stringify(params));//对方要 decodeURIComponent
- this.$router.push({path:'/mdp/workflow/ru/execution/ExecutionMngForFormData',query:{params:jsonParmas}});
- */
-
- }else if(this.$route.params){
- this.filters.params=this.$route.params;
- }
+ activated:function(){
+ this.dataInit();
},
mounted() {
+ this.dataInit();
+
}
}
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue
index 901a43a3..09878552 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue
@@ -1,186 +1,159 @@
-
-
-
-
-
- 查询
- 导出数据
- 标签查找
- 打标签
-
-
- 已选条件:
- {{tag.tagName}}
- {{tag.name}}
- {{filters.procCategory}}
- {{filters.key}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{scope.row.name}}
-
-
-
-
-
- {{tagName}}
-
-
-
+
+
+
+
+
+
+
+
+
- :formatter="formatterSuspensionState"
- >
-
-
-
- 详细描述
-
+ 标签
+
+
+ 查询
-
-
-
- 绑定业务
- 流程图
-
-
-
+
+ 导出数据
+ 打标签
+
+
+
+
+
+
+
+
+
+ {{scope.row.name}}
+
+
+
+
+
+ {{tagName}}
+
+
+
+
+
+
+ 详细描述
+
+
+
+
+
+ 绑定业务
+ 流程图
+
+
+
-
-
-
-
-
-
-
-
- 正在全力加载中。。。。。。。。。。
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 正在全力加载中。。。。。。。。。。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -256,7 +229,8 @@ export default {
categorys: [],
tagSelectVisible: false,
isBatchSetProcTags: false,
- bizModelVisible: false
+ bizModelVisible: false,
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
};
}, //end data
@@ -633,6 +607,11 @@ export default {
listCategorys({ tenantId: this.userInfo.branchId }).then(res => {
this.categorys = res.data.data;
});
+ this.$nextTick(()=>{
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=70/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
+ })
this.getProcdefs();
}
};
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue
index fd2cbbc7..924892a7 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue
@@ -1,62 +1,55 @@
-
-
-
-
-
-
-
-
- 查询
-
- 如果没有找到流程，请将业务编码【{{this.filters.params.bizKey}}】与流程进行关联
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{tagName}}
-
-
-
-
-
-
-
- 选中
- 发起
- 流程图
-
-
-
-
+
+
+
+
+ 查询
+
+
+ 如果没有找到流程，请将业务编码【{{this.filters.params.bizKey}}】与流程进行关联
+
+
+
+
+
+
+
+
+
+
+ {{tagName}}
+
+
+
+
+
+
+
+ 选中
+ 发起
+ 流程图
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- 正在全力加载中。。。。。。。。。。
-
-
-
-
+
+
+
+
+
+
+
+
+ 正在全力加载中。。。。。。。。。。
+
+
+
+
@@ -141,6 +134,7 @@
categorys:[],
tagSelectVisible:false,
isBatchSetProcTags:false,
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -299,6 +293,12 @@
this.filters.params=this.params;
this.searchProcdefs();
}
+ this.$nextTick(()=>{
+
+ var clientRect=this.$refs.procdefsTable.$el.getBoundingClientRect();
+ var subHeight=70/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.procdefsTable.$el.offsetTop-subHeight;
+ })
}
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue
index 64593639..38c989ea 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue
@@ -1,87 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- 标签查找
- 打标签
-
-
-
-
-
- 更多
-
-
- 标签查找
- 打标签
- 导出数据
-
-
-
-
-
-
- 已选条件:
- {{tag.tagName}}
- {{tag.name}}
-
- {{filters.procCategory}}
- {{filters.key}}
-
+
-
-
-
-
-
-
-
- {{scope.row.name}}
-
-
-
-
- {{scope.row.name}}
-
-
-
+
+
+
+
+
+ 查询
+
+
+ 标签查找
+ 打标签
+
+ 更多
+
+
+ 标签查找
+ 打标签
+ 导出数据
+
+
+
+
+
+
-
- {{tagName}}
-
-
-
-
-
-
- 选中
- 发起
- 流程图
-
-
-
+
+
+
+
+
+ {{scope.row.name}}
+
+
+
+
+ {{scope.row.name}}
+
+
+
+
+ {{tagName}}
+
+
+
+
+
+
+ 选中
+ 发起
+ 流程图
+
+
+
-
+
+
+
+
+
+
+
+
+ 正在全力加载中。。。。。。。。。。
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- 正在全力加载中。。。。。。。。。。
-
-
-
-
-
-
-
-
-
-
-
@@ -301,7 +255,8 @@ export default {
flowStartVisible: false, //发起流程
categorys: [],
tagSelectVisible: false,
- isBatchSetProcTags: false
+ isBatchSetProcTags: false,
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
};
}, //end data
@@ -692,7 +647,12 @@ export default {
if (this.params) {
this.filters.params = this.params;
}
-
+
+ this.$nextTick(()=>{
+ var clientRect=this.$refs.procdefsTable.$el.getBoundingClientRect();
+ var subHeight=70/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.procdefsTable.$el.offsetTop-subHeight;
+ })
this.searchProcdefs();
listCategorys({ tenantId: this.userInfo.branchId }).then(res => {
this.categorys = res.data.data;
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefMng.vue b/src/views/mdp/workflow/re/procdef/ProcdefMng.vue
index 3575643d..d8f6dbac 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefMng.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefMng.vue
@@ -1,7 +1,11 @@
-
-
+
+
+
+ 查询
+
+
-
- 查询
+
标签查找
打标签
-
+
已选条件:
-
+
@@ -152,6 +155,7 @@
categorys:[],
tagSelectVisible:false,
isBatchSetProcTags:false,
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -400,6 +404,11 @@
},
mounted() {
+ this.$nextTick(()=>{
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=70/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
+ })
listCategorys({tenantId:this.userInfo.branchId}).then(res=>{
this.categorys=res.data.data
})
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue b/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue
index f3ce2b46..3a8c3549 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue
@@ -1,176 +1,139 @@
-
-
-
-
-
- 查询
- 导出数据
- 标签查找
- 打标签
-
-
- 已选条件:
- {{tag.tagName}}
- {{tag.name}}
+
+
+
+
+
+
+
+
+
+ 标签查找
+
+
+ 查询
+
+
+ 导出数据
+ 打标签
+
+
+
+
+
+
+
+
+
- {{filters.procCategory}}
- {{filters.key}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{tagName}}
-
-
-
-
-
-
-
-
-
-
- 流程图
- 挂起
- 激活
-
-
-
-
-
-
-
-
-
-
-
- 正在全力加载中。。。。。。。。。。
-
-
-
-
-
-
-
-
-
+
+
+ {{tagName}}
+
+
+
+
+
+
+
+
+
+ 流程图
+ 挂起
+ 激活
+
+
+
+
+
+
+
+
+
+
+
+ 正在全力加载中。。。。。。。。。。
+
+
+
+
+
+
+
+
+
+
@@ -242,7 +205,8 @@ export default {
diagramUrl: "", //显示流程图的路径
categorys: [],
tagSelectVisible: false,
- isBatchSetProcTags: false
+ isBatchSetProcTags: false,
+ tableHeight:300,
/**end 自定义属性请在上面加 请加备注**/
};
}, //end data
@@ -616,6 +580,12 @@ export default {
listCategorys({ tenantId: this.userInfo.branchId }).then(res => {
this.categorys = res.data.data;
});
+
+ this.$nextTick(()=>{
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=70/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
+ })
this.getProcdefs();
}
};
diff --git a/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue b/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue
index 4e1b95d1..611a6bcc 100644
--- a/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue
+++ b/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue
@@ -99,7 +99,8 @@
{{showAssigneeTips(scope.row)}}
选候选人
- 选人员
+ 选人员
+ 转发起人
-
-
- 查询
-
+
+
+
+ 查询
+
+
+
-
+
@@ -82,7 +85,8 @@
//编辑procdefParamesTemplate界面初始化数据
editForm: {
id:'',isRefForm:'',monitors:'',sponsors:'',formId:'',procDefId:'',userid:'',lastDate:'',mainContext:'',mainTitle:'',bizUrl:'',bizName:'',categoryId:'',branchId:'',formShowType:'',fp:'',sp:'',tp:'',pconfig:'',fo:'',fi:'',tagNames:'',tagIds:'',mainQx:'',modelKey:''
- }
+ },
+ tableHeight:300,
/**begin 自定义属性请在下面加 请加备注**/
/**end 自定义属性请在上面加 请加备注**/
@@ -225,7 +229,10 @@
//在下面添加其它组件
},
mounted() {
- this.$nextTick(() => {
+ this.$nextTick(() => {
+ var clientRect=this.$refs.table.$el.getBoundingClientRect();
+ var subHeight=70/1000 * window.innerHeight;
+ this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
this.getProcdefParamesTemplates();
});
}
diff --git a/src/views/mdp/workflow/ru/execution/ExecutionMng.vue b/src/views/mdp/workflow/ru/execution/ExecutionMng.vue
index a0110ab1..7ffc2d1c 100644
--- a/src/views/mdp/workflow/ru/execution/ExecutionMng.vue
+++ b/src/views/mdp/workflow/ru/execution/ExecutionMng.vue
@@ -1,32 +1,36 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- 查询
- 标签查找
- 打标签
-
- 全部
- 我发起
- 我参与
- 我主办
- 我监控
+
+
+
+
+ 查询
+
+
拷贝内容