diff --git a/src/components/FlowChart.vue b/src/components/FlowChart.vue new file mode 100644 index 00000000..0bba1221 --- /dev/null +++ b/src/components/FlowChart.vue @@ -0,0 +1,339 @@ + + + + + diff --git a/src/components/FlowChartModal.vue b/src/components/FlowChartModal.vue new file mode 100644 index 00000000..daaba6c5 --- /dev/null +++ b/src/components/FlowChartModal.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/src/components/ProcessDetailList.vue b/src/components/ProcessDetailList.vue index 47fc5124..bcc32ac9 100644 --- a/src/components/ProcessDetailList.vue +++ b/src/components/ProcessDetailList.vue @@ -71,6 +71,8 @@ + + @@ -82,6 +84,7 @@ import { ACCESS_TOKEN } from '../store/mutation-types.js' import { downloadFile, getFileAccessHttpUrl } from '../api/manage.js' import { previewPdf } from '../utils/previewPdf.js' import { Base64 } from 'js-base64' +import FlowChartModal from './FlowChartModal.vue' // 支持预览的文件后缀 const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'raw', 'pdf', 'docx', 'doc'] @@ -90,7 +93,7 @@ const FILE_TYPE_PDF = 'pdf' export default { name: 'ProcessDetailList', - components: { JTable }, + components: { JTable, FlowChartModal }, mixins: [JeroListMixin], props: { // 需要有list属性,用于混入里的接口获取 @@ -131,7 +134,7 @@ export default { }, // 任务受理人 { - dataIndex: 'projectName', + dataIndex: 'projectName1', title: this.$t('workCenter.processDetail.taskHandler'), width: 120 }, @@ -143,7 +146,7 @@ export default { }, // 完成时间 { - dataIndex: 'nameWorkNo', + dataIndex: 'nameWorkNo1', title: this.$t('workCenter.processDetail.completionTime'), width: 150 }, @@ -192,6 +195,8 @@ export default { * 跳转流程图页面 */ viewFlowChart () { + this.$refs.flowChartModal.processId = '62507' + this.$refs.flowChartModal.open() }, handlePreview (file) { if (!file || !file.url) { diff --git a/src/views/workCenter/processConfig/EditFlowNode.vue b/src/views/workCenter/processConfig/EditFlowNode.vue index f78d217b..5cca4478 100644 --- a/src/views/workCenter/processConfig/EditFlowNode.vue +++ b/src/views/workCenter/processConfig/EditFlowNode.vue @@ -2,7 +2,7 @@
-
+
@@ -17,48 +17,13 @@