1.添加审批人数量限制配置2.草稿箱添加当前过滤和任务名和流程发起者
This commit is contained in:
@ -8,7 +8,6 @@
|
|||||||
:clickRowToExpand="true"
|
:clickRowToExpand="true"
|
||||||
:treeData="treeData"
|
:treeData="treeData"
|
||||||
:fieldNames="fieldNames"
|
:fieldNames="fieldNames"
|
||||||
@row-dbClick="dbClickRow"
|
|
||||||
:row-selection="rowSelection"
|
:row-selection="rowSelection"
|
||||||
>
|
>
|
||||||
<template #title="item">
|
<template #title="item">
|
||||||
@ -202,6 +201,7 @@
|
|||||||
import { InputParamItem } from '/@/components/ApiConfig/src/interface';
|
import { InputParamItem } from '/@/components/ApiConfig/src/interface';
|
||||||
import { getDraftInfo } from '/@/api/workflow/process';
|
import { getDraftInfo } from '/@/api/workflow/process';
|
||||||
import FlowRecord from '/@/views/workflow/task/components/flow/FlowRecord.vue';
|
import FlowRecord from '/@/views/workflow/task/components/flow/FlowRecord.vue';
|
||||||
|
import {de} from "@fullcalendar/core/internal-common";
|
||||||
interface SearchDate {
|
interface SearchDate {
|
||||||
fieldName: string;
|
fieldName: string;
|
||||||
format: string;
|
format: string;
|
||||||
@ -579,15 +579,6 @@
|
|||||||
|
|
||||||
function handleView(record: Recordable) {
|
function handleView(record: Recordable) {
|
||||||
if (record.workflowData?.taskIds && record.workflowData.taskIds.length) {
|
if (record.workflowData?.taskIds && record.workflowData.taskIds.length) {
|
||||||
const { processId, taskIds, schemaId } = record.workflowData;
|
|
||||||
router.push({
|
|
||||||
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
|
|
||||||
query: {
|
|
||||||
taskId: taskIds[0],
|
|
||||||
rtId: currentRoute.value.query.rtId
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} else if (record.workflowData?.schemaId && !record.workflowData.taskIds) {
|
|
||||||
const { processId, schemaId } = record.workflowData;
|
const { processId, schemaId } = record.workflowData;
|
||||||
router.push({
|
router.push({
|
||||||
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
|
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
|
||||||
@ -758,6 +749,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
async function handleLaunchProcess(record: Recordable) {
|
async function handleLaunchProcess(record: Recordable) {
|
||||||
|
debugger
|
||||||
if (record.workflowData) {
|
if (record.workflowData) {
|
||||||
if (record.workflowData.draftId) {
|
if (record.workflowData.draftId) {
|
||||||
let res = await getDraftInfo(record.workflowData.draftId);
|
let res = await getDraftInfo(record.workflowData.draftId);
|
||||||
@ -783,10 +775,14 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
function handleApproveProcess(record: Recordable) {
|
function handleApproveProcess(record: Recordable) {
|
||||||
visibleApproveProcessRef.value = true;
|
const { processId, taskIds, schemaId } = record.workflowData;
|
||||||
schemaIdRef.value = record.workflowData.schemaId;
|
router.push({
|
||||||
processIdRef.value = record.workflowData.processId;
|
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
|
||||||
taskIdRef.value = record.workflowData.taskIds[0];
|
query: {
|
||||||
|
taskId: taskIds[0],
|
||||||
|
rtId: currentRoute.value.query.rtId
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
function handleCloseLaunch() {
|
function handleCloseLaunch() {
|
||||||
visibleLaunchProcessRef.value = false;
|
visibleLaunchProcessRef.value = false;
|
||||||
@ -948,35 +944,6 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
function dbClickRow(record) {
|
|
||||||
if (record.workflowData?.taskIds && record.workflowData.taskIds.length) {
|
|
||||||
const { processId, taskIds, schemaId } = record.workflowData;
|
|
||||||
router.push({
|
|
||||||
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
|
|
||||||
query: {
|
|
||||||
taskId: taskIds[0],
|
|
||||||
rtId: currentRoute.value.query.rtId
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} else if (record.workflowData?.schemaId && !record.workflowData.taskIds) {
|
|
||||||
const { processId, schemaId } = record.workflowData;
|
|
||||||
router.push({
|
|
||||||
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
|
|
||||||
query: {
|
|
||||||
readonly: 1,
|
|
||||||
taskId: '',
|
|
||||||
rtId: currentRoute.value.query.rtId
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
router.push({
|
|
||||||
path: '/form/infoTaskManageItem/' + record.id + '/viewForm',
|
|
||||||
query: {
|
|
||||||
formPath: 'infoManage/infoTaskManageItem'
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const rowSelection: TableProps['rowSelection'] = {
|
const rowSelection: TableProps['rowSelection'] = {
|
||||||
onChange: (selectedRowKeys: string[], selectedRows: DataType[]) => {
|
onChange: (selectedRowKeys: string[], selectedRows: DataType[]) => {
|
||||||
|
|||||||
@ -27,16 +27,27 @@ const { t } = useI18n();
|
|||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const configColumns = [
|
const configColumns = [
|
||||||
{
|
{
|
||||||
title: t('流程名称'),
|
title: t('流程定义名称'),
|
||||||
dataIndex: 'schemaName',
|
dataIndex: 'schemaName',
|
||||||
align: 'left'
|
align: 'left'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: t('发起者'),
|
title: t('任务名称'),
|
||||||
|
dataIndex: 'taskName',
|
||||||
|
align: 'left',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('流程发起者'),
|
||||||
dataIndex: 'originator',
|
dataIndex: 'originator',
|
||||||
sorter: true,
|
sorter: true,
|
||||||
align: 'left'
|
align: 'left'
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: t('创建人'),
|
||||||
|
dataIndex: 'createUserName',
|
||||||
|
sorter: true,
|
||||||
|
align: 'left',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: t('发起时间'),
|
title: t('发起时间'),
|
||||||
dataIndex: 'createDate',
|
dataIndex: 'createDate',
|
||||||
|
|||||||
Reference in New Issue
Block a user