diff --git a/src/components/ProcessDetailList.vue b/src/components/ProcessDetailList.vue index f11eb13..c0fa9b9 100644 --- a/src/components/ProcessDetailList.vue +++ b/src/components/ProcessDetailList.vue @@ -147,6 +147,30 @@ export default { type: Boolean, required: false, default: false + }, + // 是否可以点击节点名称跳转 + nodeNameClick: { + type: Boolean, + required: false, + default: false + }, + // 详情页从哪里点进来的(已办,已发还是监控流程) + detailFrom: { + type: String, + required: false, + default: '' + } + }, + watch: { + nodeNameClick: { + immediate: true, + handler (val) { + if (val) { + this.columns[0].scopedSlots.customRender = 'taskNode' + } else { + this.columns[0].scopedSlots.customRender = 'text' + } + } } }, computed: { @@ -249,6 +273,10 @@ export default { if (this.$route.query.source === 'monitorList' && this.$route.query.prcStatus === '3') { params.finishFlagSearch = '2,3,4' } + // 是已办,已发还是监控流程的查审批记录 + if (this.detailFrom) { + params.detailFrom = this.detailFrom + } if (this.$route.query.processInstanceId) { params.processInstanceId = this.$route.query.processInstanceId } else { diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 37514a7..596894a 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -140,6 +140,15 @@ export const IsReadOnlyEnums = { subConfigurable: { text: '字段固定,内部可配', value: 2 } } +// 流程中心-查看跳转详情需要传是已办,已发还是监控流程 +export const Process = { + TO_DO: { text: '待办流程', value: 'todo' }, + DONE: { text: '已办流程', value: 'done' }, + SENT: { text: '已发流程', value: 'sent' }, + MONITOR: { text: '监控流程', value: 'monitor' }, + DRAFT: { text: '草稿', value: 'draft' } +} + // 流程key,获取人员信息前需要获取流程定义id,传这里的名字到WorkCenterMixin的getFlowDefinition方法中 export const ProcessKey = { // 新法规导入流程 diff --git a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue index b150eaa..08f6871 100644 --- a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue +++ b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue @@ -1,7 +1,7 @@