diff --git a/src/api/workCenter.js b/src/api/workCenter.js index fbe04147..285c0f35 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -2,6 +2,8 @@ import { getAction, postAction } from './manage.js' // 查询定义流程列表 const getProcessNodeList = (params) => getAction('/activiti/getNodeList', params) +// 催办 +const urgeProcessNode = (params) =>postAction('/workCenter/urging', params) // 流程配置-部署 const deployWorkFlow = (params) => getAction('/activitiModel/deploy', params) @@ -401,6 +403,7 @@ const saveNoMatchTrackingProcess = (params) => postAction('/process/projectNotMe export { getProcessNodeList, + urgeProcessNode, deployWorkFlow, getFlowNodeList, diff --git a/src/components/ProcessDetailList.vue b/src/components/ProcessDetailList.vue index 739a33e2..ca00912c 100644 --- a/src/components/ProcessDetailList.vue +++ b/src/components/ProcessDetailList.vue @@ -23,7 +23,7 @@
- + {{ $t('workCenter.processDetail.urgeHandle') }} @@ -38,7 +38,7 @@ :columns="columns" :dataSource="dataSource" :can-drag="true" - rowKey="id" + rowKey="taskId" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" :scroll="{x: '100%'}" @@ -100,6 +100,7 @@ import FlowChartModal from './FlowChartModal.vue' import UploadFile from './UploadFile' import { filterObj } from '../utils/util' import { kkFilePreview } from '../utils/kkFilePreview' +import { urgeProcessNode } from '../api/workCenter' // 支持预览的文件后缀 const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx'] @@ -121,12 +122,6 @@ export default { } } }, - // 是否可以催办,自己不能催自己 - canUrge: { - type: Boolean, - required: false, - default: true - }, // 催办按钮的权限 urgePermissionFlag: { type: String, @@ -144,6 +139,12 @@ export default { type: String, required: false, default: null + }, + // 是否展示催办按钮 + showUrgeButton: { + type: Boolean, + required: false, + default: false } }, data () { @@ -275,7 +276,24 @@ export default { fileLook (record) { this.$refs.uploadFile.open(record.commitFile) }, + /** + * 催办 + */ handleUrge () { + if (!this.selectedRowKeys || this.selectedRowKeys.length === 0) { + this.$message.warning(this.$t('selectARecord')) + return + } + this.loading = true + urgeProcessNode({taskId: this.selectedRowKeys.join(',')}).then(res => { + if (res.success) { + this.$message.success(res.message) + } else { + this.$message.warning(res.message) + } + }).finally(() => { + this.loading = false + }) }, /** * 跳转流程图页面 diff --git a/src/views/workCenter/processCenter/detail/ProcessDetail.vue b/src/views/workCenter/processCenter/detail/ProcessDetail.vue index 82a613b6..81fefe33 100644 --- a/src/views/workCenter/processCenter/detail/ProcessDetail.vue +++ b/src/views/workCenter/processCenter/detail/ProcessDetail.vue @@ -1,6 +1,6 @@