update:发起任务界面
This commit is contained in:
@@ -608,16 +608,16 @@ export const appList = [
|
||||
// icon: 'fa fa-share-square',
|
||||
// },
|
||||
// },
|
||||
// {
|
||||
// name: 'taskStarted',
|
||||
// zhCn: '发起任务',
|
||||
// en: 'Started Task',
|
||||
// path: '/task/started',
|
||||
// component: () => import('/@/views/flow/task/started.vue'),
|
||||
// meta: {
|
||||
// icon: 'fa fa-plane',
|
||||
// },
|
||||
// },
|
||||
{
|
||||
name: 'taskStarted',
|
||||
zhCn: '发起任务',
|
||||
en: 'Started Task',
|
||||
path: '/task/started',
|
||||
component: () => import('/@/views/flow/task/started.vue'),
|
||||
meta: {
|
||||
icon: 'fa fa-plane',
|
||||
},
|
||||
},
|
||||
// {
|
||||
// name: 'taskCc',
|
||||
// zhCn: '抄送任务',
|
||||
|
||||
@@ -256,6 +256,7 @@ export default {
|
||||
projectDetail: 'Project Detail',
|
||||
projectSet: 'Project Set',
|
||||
taskPending: 'Pending Task',
|
||||
taskStarted: 'Started Task',
|
||||
taskCompleted: 'Completed Task',
|
||||
flowGroup: 'Flow List',
|
||||
formTemplateList: 'Form Template List',
|
||||
|
||||
@@ -159,6 +159,7 @@ export default {
|
||||
projectDetail: '项目详情',
|
||||
projectSet: '项目设置',
|
||||
taskPending: '待办任务',
|
||||
taskStarted: '发起任务',
|
||||
taskCompleted: '已完成任务',
|
||||
flowGroup: '流程模板管理',
|
||||
formTemplateList: '表单列表',
|
||||
|
||||
@@ -30,7 +30,7 @@ export const appMap = {
|
||||
spdm_SystemDynamicTable: {"name":"moduleApps.spdm_SystemDynamicTable","zhCn":"动态表格","en":"Dynamic Table","pages":[{"name":"spdmSystemDynamicTable","zhCn":"动态表格","en":"Dynamic Table","path":"/spdm/system/dynamicTable","meta":{"icon":"ele-Document"}}]},
|
||||
spdm_SystemRecycleBin: {"name":"moduleApps.spdm_SystemRecycleBin","zhCn":"回收站","en":"Recycle Bin","pages":[{"name":"spdmSystemRecycleBin","zhCn":"回收站","en":"Recycle Bin","path":"/spdm/system/recycleBin","meta":{"icon":"ele-Delete"}}]},
|
||||
project: {"name":"moduleApps.project","zhCn":"项目管理","en":"Project Management","pages":[{"name":"projectList","zhCn":"项目列表","en":"Project List","path":"/project/list","meta":{"icon":"iconfont icon-diannao1"}},{"name":"projectDetail","zhCn":"项目详情","en":"Project Detail","path":"/project/detail","meta":{"isKeepAlive":true,"parentName":"projectList"}},{"name":"projectSet","zhCn":"项目设置","en":"Project Set","path":"/project/set","meta":{"parentName":"projectDetail"}}]},
|
||||
task: {"name":"moduleApps.task","zhCn":"审批流程","en":"Task Center","functions":["shutdown"],"pages":[{"name":"taskPending","zhCn":"待办任务","en":"Pending Task","path":"/task/pending","meta":{"icon":"fa fa-flag-checkered"}},{"name":"taskCompleted","zhCn":"已完成任务","en":"Completed Task","path":"/task/completed","meta":{"icon":"fa fa-hand-o-right"}},{"name":"flowGroup","zhCn":"流程模板管理","en":"Flow List","path":"/flow/group","meta":{"icon":"iconfont icon-gongju"}}]},
|
||||
task: {"name":"moduleApps.task","zhCn":"审批流程","en":"Task Center","functions":["shutdown"],"pages":[{"name":"taskPending","zhCn":"待办任务","en":"Pending Task","path":"/task/pending","meta":{"icon":"fa fa-flag-checkered"}},{"name":"taskStarted","zhCn":"发起任务","en":"Started Task","path":"/task/started","meta":{"icon":"fa fa-plane"}},{"name":"taskCompleted","zhCn":"已完成任务","en":"Completed Task","path":"/task/completed","meta":{"icon":"fa fa-hand-o-right"}},{"name":"flowGroup","zhCn":"流程模板管理","en":"Flow List","path":"/flow/group","meta":{"icon":"iconfont icon-gongju"}}]},
|
||||
form_template: {"name":"moduleApps.form_template","zhCn":"表单管理","en":"Form Management","pages":[{"name":"formTemplateList","zhCn":"表单列表","en":"Form Template List","path":"/form-template/list","meta":{"icon":"iconfont icon-putong"}},{"name":"formTemplateVersion","zhCn":"表单版本","en":"Form Template Version","path":"/form-template/version","meta":{"icon":"iconfont icon-barcode-qr","parentName":"formTemplateList"}}]},
|
||||
flow_template: {"name":"moduleApps.flow_template","zhCn":"流程模板管理","en":"Flow Template Management","pages":[{"name":"flowCreate","zhCn":"创建流程","en":"Create Flow Template","path":"/flow/create","meta":{"icon":"fa fa-arrow-circle-right","parentName":"flowGroup"}}]},
|
||||
flow_initiate: {"name":"moduleApps.flow_initiate","zhCn":"发起流程","en":"Initiate Flow","pages":[{"name":"flowInitiate","zhCn":"发起流程","en":"Initiate Flow","path":"/flow/initiate","meta":{"icon":"fa fa-play"}}]},
|
||||
@@ -394,6 +394,14 @@ export const pageMap = {
|
||||
"code": "task_view"
|
||||
}
|
||||
},
|
||||
"taskStarted": {
|
||||
"path": "/task/started",
|
||||
"name": "moduleRoutes.taskStarted",
|
||||
"meta": {
|
||||
"icon": "fa fa-plane",
|
||||
"code": "task_view"
|
||||
}
|
||||
},
|
||||
"taskCompleted": {
|
||||
"path": "/task/completed",
|
||||
"name": "moduleRoutes.taskCompleted",
|
||||
|
||||
@@ -256,6 +256,7 @@ export default {
|
||||
projectDetail: 'Project Detail',
|
||||
projectSet: 'Project Set',
|
||||
taskPending: 'Pending Task',
|
||||
taskStarted: 'Started Task',
|
||||
taskCompleted: 'Completed Task',
|
||||
flowGroup: 'Flow List',
|
||||
formTemplateList: 'Form Template List',
|
||||
|
||||
@@ -159,6 +159,7 @@ export default {
|
||||
projectDetail: '项目详情',
|
||||
projectSet: '项目设置',
|
||||
taskPending: '待办任务',
|
||||
taskStarted: '发起任务',
|
||||
taskCompleted: '已完成任务',
|
||||
flowGroup: '流程模板管理',
|
||||
formTemplateList: '表单列表',
|
||||
|
||||
@@ -480,6 +480,14 @@ export default [
|
||||
"code": "task_view"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "/task/started",
|
||||
"name": "moduleRoutes.taskStarted",
|
||||
"meta": {
|
||||
"icon": "fa fa-plane",
|
||||
"code": "task_view"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "/task/completed",
|
||||
"name": "moduleRoutes.taskCompleted",
|
||||
|
||||
@@ -203,6 +203,12 @@ export default [
|
||||
component: () => import('/@/views/flow/task/pending.vue'),
|
||||
meta: {"icon":"fa fa-flag-checkered","code":"task_view"},
|
||||
},
|
||||
{
|
||||
path: '/task/started',
|
||||
name: 'moduleRoutes.taskStarted',
|
||||
component: () => import('/@/views/flow/task/started.vue'),
|
||||
meta: {"icon":"fa fa-plane","code":"task_view"},
|
||||
},
|
||||
{
|
||||
path: '/task/completed',
|
||||
name: 'moduleRoutes.taskCompleted',
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
<template>
|
||||
<div class="task-wrap">
|
||||
<div class="task-tool">
|
||||
<!-- SPDM CODE -->
|
||||
<!-- <div class="task-tool">
|
||||
<div class="flex items-center" id="search-container"></div>
|
||||
<el-radio-group size="large" v-model="taskType">
|
||||
<el-radio-button label="project">{{ $t('task.projectTask') }}</el-radio-button>
|
||||
<el-radio-button label="flow">{{ $t('task.flowTask') }}</el-radio-button>
|
||||
</el-radio-group>
|
||||
</div>
|
||||
</div> -->
|
||||
<div class="task-tool">
|
||||
<section>
|
||||
<BtnSelect class="mr-5" :options="statusOptions" v-model="taskStatus" />
|
||||
@@ -51,7 +52,7 @@ import { queryProjectMineCreateTask } from '/@/api/flow/task';
|
||||
import dayjs from '/@/utils/dayjs';
|
||||
import { dateStr } from '/@/utils/formatTime';
|
||||
|
||||
const taskType = ref('project');
|
||||
const taskType = ref('flow');
|
||||
enum EnumTaskStatus {
|
||||
all = 1,
|
||||
planStart = 2,
|
||||
|
||||
@@ -82,21 +82,29 @@
|
||||
|
||||
<pagination @current-change="currentChangeHandle" @size-change="sizeChangeHandle" v-bind="state.pagination"></pagination>
|
||||
<!-- 右侧抽屉-->
|
||||
<el-drawer v-model="rightDrawerVisible" direction="rtl" size="400px">
|
||||
<el-drawer v-model="rightDrawerVisible" direction="rtl" :size="processRreview ? processRreviewWidth : '400px'">
|
||||
<template #header>
|
||||
<h3>{{ currentData?.name }}</h3>
|
||||
</template>
|
||||
<template #default>
|
||||
<el-card class="box-card">
|
||||
<form-render ref="formRenderRef" :form-list="currentOpenFlowForm"></form-render>
|
||||
</el-card>
|
||||
<flow-node-format
|
||||
:disableSelect="true"
|
||||
:formData="formValue"
|
||||
:processInstanceId="currentData.processInstanceId"
|
||||
:flow-id="currentData.flowId"
|
||||
ref="flowNodeFormatRef"
|
||||
></flow-node-format>
|
||||
<!-- SPDM CODE -->
|
||||
<div class="spdm-approve-preview">
|
||||
<div v-show="processRreview" class="spdm-content">
|
||||
<SpdmView :processId="processInstanceId" @load="previewLoadFun" />
|
||||
</div>
|
||||
<div class="spdm-default">
|
||||
<el-card class="box-card">
|
||||
<form-render ref="formRenderRef" :form-list="currentOpenFlowForm"></form-render>
|
||||
</el-card>
|
||||
<flow-node-format
|
||||
:disableSelect="true"
|
||||
:formData="formValue"
|
||||
:processInstanceId="currentData.processInstanceId"
|
||||
:flow-id="currentData.flowId"
|
||||
ref="flowNodeFormatRef"
|
||||
></flow-node-format>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-drawer>
|
||||
</div>
|
||||
@@ -109,6 +117,7 @@ import {queryMineStarted, stopProcessInstance} from '/@/api/flow/task';
|
||||
import {detail} from '/@/api/flow/processInstance';
|
||||
import {BasicTableProps, useTable} from '/@/hooks/table';
|
||||
import { useTagName } from './useTagName';
|
||||
import SpdmView from '/@/spdm/views/preview.vue'; // SPDM CODE
|
||||
|
||||
const { tagName } = useTagName()
|
||||
|
||||
@@ -116,6 +125,10 @@ const rightDrawerVisible = ref(false);
|
||||
|
||||
const loading = ref(false);
|
||||
|
||||
const processInstanceId = ref('');
|
||||
const processRreview = ref(false);
|
||||
const processRreviewWidth = ref(0)
|
||||
|
||||
const queryRef = ref();
|
||||
const state: BasicTableProps = reactive<BasicTableProps>({
|
||||
pageList: queryMineStarted,
|
||||
@@ -145,6 +158,7 @@ const deal = (row) => {
|
||||
processInstanceId: row.processInstanceId,
|
||||
}).then((res) => {
|
||||
currentOpenFlowForm.value = res.data.formItems;
|
||||
processInstanceId.value = res.data.processInstanceId;
|
||||
rightDrawerVisible.value = true;
|
||||
});
|
||||
};
|
||||
@@ -167,4 +181,9 @@ const formValue = computed(() => {
|
||||
}
|
||||
return obj;
|
||||
});
|
||||
|
||||
const previewLoadFun = (width: any) => {
|
||||
processRreview.value = true;
|
||||
processRreviewWidth.value = width;
|
||||
}
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user