diff --git a/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue b/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue index 117d5ef1..e08f1a22 100644 --- a/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue +++ b/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue @@ -28,7 +28,7 @@ 查询范围 - + @@ -40,7 +40,7 @@ 分类 - + @@ -54,7 +54,7 @@ {{tag.tagName}} - 选择标签 @@ -65,7 +65,7 @@ @click="userSelectVisible=true" @close="handleFiltersTagClose('','assignee')"> {{filters.assignee.username}} - 选择执行人 + 选择执行人 @@ -93,13 +93,13 @@ --> - 查询 + 查询 其它操作 - 给任务打标签 - 导出数据 + 给任务打标签 + 导出数据 @@ -109,7 +109,7 @@ v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;"> - + @@ -143,7 +143,7 @@ :page-size="pageInfo.pageSize" :total="pageInfo.total" style="float:right;"> + :close-on-click-modal="false" append-to-body> @@ -202,7 +202,7 @@ return screen.width; } }, - props: ["isMyMonitors", "isMyStart", "isMySponsors", "isMyPartake", "isAll"], + props: ["isMyMonitors", "isMyStart", "isMySponsors", "isMyPartake", "isAll",'bizParentPkid','bizPkid','procInstIds'], data() { const fromStartTime = new Date(); const toStartTime = new Date(); @@ -477,6 +477,16 @@ if (this.filters.procCategory != "") { params.category = this.filters.procCategory; } + + if(this.bizParentPkid){ + params.bizParentPkid=this.bizParentPkid + } + if(this.bizPkid){ + params.bizPkid=this.bizPkid + } + if(this.procInstIds){ + params.procInstIds=this.procInstIds + } params.tenantId = this.userInfo.branchId; this.listLoading = true; listProcinst(params) diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue index b1b19136..06ee948b 100644 --- a/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue +++ b/src/views/mdp/workflow/re/procdef/ProcdefListForBizStart.vue @@ -25,6 +25,11 @@ 'userInfo' ]), }, + watch:{ + $route(to,from){ + this.dataInit(); + } + }, data() { return { filters: { @@ -59,6 +64,7 @@ this.$router.back(-1); }, dataInit(){ + debugger; this.$nextTick(()=>{ var key="ProcdefListForBizStart" if(this.$route.query && this.$route.query.params){ @@ -98,7 +104,7 @@ //在下面添加其它组件 }, activated:function(){ - this.dataInit(); + //this.dataInit(); }, mounted() { this.dataInit(); diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue index faca8577..91a7b737 100644 --- a/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue +++ b/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue @@ -56,7 +56,7 @@ - + @@ -86,11 +86,14 @@ return screen.width; }, }, - watch: { - params: function(params) { - - this.filters.params = params; - this.searchProcdefs(); + watch: { + params: { + handler: function() { + this.flowStartVisible=false; + this.filters.params = this.params; + this.searchProcdefs(); + }, + deep: true } }, data() { @@ -262,6 +265,7 @@ if (tips.isOk) { this.pageInfo.total = res.data.total this.pageInfo.count = false + this.procdefs = res.data.data; if (res.data.data.length == 1) { this.addForm = res.data.data[0] this.flowStartVisible = true; @@ -269,7 +273,7 @@ this.flowStartVisible = false; this.$message.success("请选中一个流程") } - this.procdefs = res.data.data; + } else { this.$message({showClose: true, message: tips.msg, diff --git a/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue b/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue index 3c0358f0..ce6c3865 100644 --- a/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue +++ b/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue @@ -97,9 +97,9 @@ min-width="250">

{{weixinContent}}

- 拷贝链接 - 拷贝内容 + 拷贝链接 + 拷贝内容
微信催办 @@ -38,7 +38,7 @@ 查询范围 - + @@ -64,7 +64,7 @@ {{tag.tagName}} - 选择标签 @@ -75,15 +75,15 @@ @click="userSelectVisible=true" @close="handleFiltersTagClose('','assignee')"> {{filters.assignee.username}} - 选择执行人 + 选择执行人 流程状态 - 挂起的 - 活动的 @@ -106,20 +106,20 @@ - 查询 + 查询 其它操作 - 按日历风格显示 - 添加标签 - 导出数据 + 按日历风格显示 + 添加标签 + 导出数据 催办 - 微信催办 - 短信催办 - OAMSG催办 + 微信催办 + 短信催办 + OAMSG催办 @@ -131,7 +131,7 @@ v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;"> - + @@ -44,11 +55,12 @@ import XmProductOverview from './XmProductOverview.vue'; import XmProductEdit from './XmProductEdit.vue'; import XmIterationLinkForProduct from '../xmIterationLink/XmIterationLinkForProduct.vue'; import XmProductProjectLinkMng from '../xmProductProjectLink/XmProductProjectLinkMng.vue'; - import { loadTasksToXmProductState } from '@/api/xm/core/xmProductState'; - import { loadTasksToXmMenuState} from '@/api/xm/core/xmMenuState'; - +import { loadTasksToXmProductState } from '@/api/xm/core/xmProductState'; +import { loadTasksToXmMenuState} from '@/api/xm/core/xmMenuState'; +import TaskMng from '@/views/mdp/workflow/ru/task/TaskMng'; +import ProcinstMng from '@/views//mdp/workflow/hi/procinst/ProcinstMng'; export default { - components: { XmProductOverview, XmProductEdit, XmIterationLinkForProduct, XmProductProjectLinkMng }, + components: { XmProductOverview, XmProductEdit, XmIterationLinkForProduct, XmProductProjectLinkMng,TaskMng,ProcinstMng,}, computed: { ...mapGetters(["userInfo"]), }, diff --git a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue index a0a3ee95..d504b2d2 100644 --- a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue +++ b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue @@ -15,6 +15,14 @@ 执行项目数据统计计划 + + + + 当前审批流 + + + + 历史审批流 @@ -34,6 +42,9 @@ 将从项目任务汇总结算数据项目统计表 + + + @@ -47,10 +58,12 @@ import XmProjectDetail from './XmProjectDetail.vue'; import XmProductProjectLinkMng from '../xmProductProjectLink/XmProductProjectLinkMng.vue'; import XmIterationLinkForProject from '../xmIterationLink/XmIterationLinkForProject.vue'; - import { loadTasksToXmProjectState , loadTasksSettleToXmProjectState} from '@/api/xm/core/xmProjectState'; +import TaskMng from '@/views/mdp/workflow/ru/task/TaskMng'; +import ProcinstMng from '@/views//mdp/workflow/hi/procinst/ProcinstMng'; +import { loadTasksToXmProjectState , loadTasksSettleToXmProjectState} from '@/api/xm/core/xmProjectState'; export default { - components: { XmProjectOverview, XmProjectDetail, XmProductProjectLinkMng ,XmIterationLinkForProject}, + components: { XmProjectOverview, XmProjectDetail, XmProductProjectLinkMng ,XmIterationLinkForProject,TaskMng,ProcinstMng}, computed: { ...mapGetters(["userInfo"]), },