diff --git a/src/views/secondDev/createFlow.vue b/src/views/secondDev/createFlow.vue
index 44b9cd7..8919934 100644
--- a/src/views/secondDev/createFlow.vue
+++ b/src/views/secondDev/createFlow.vue
@@ -60,7 +60,7 @@
import { useMultipleTabStore } from '/@/store/modules/multipleTab';
import { CloseOutlined, SendOutlined, ClockCircleOutlined, PrinterOutlined, ApartmentOutlined } from '@ant-design/icons-vue';
import { nextTick, onMounted, ref, toRaw, reactive } from 'vue';
- import { postDraft, putDraft } from '/@/api/workflow/process';
+ import { deleteDraft, postDraft, putDraft } from '/@/api/workflow/process';
import { useI18n } from '/@/hooks/web/useI18n';
import { separator } from '/@bpmn/config/info';
import { message } from 'ant-design-vue';
@@ -290,7 +290,8 @@
/*stampId: values.stampId,
stampPassword: values.password,*/
isOldSystem: system,
- nextTaskUser: approvalData.nextTaskUser
+ nextTaskUser: approvalData.nextTaskUser,
+ draftId: rDraftsId,
};
}
diff --git a/src/views/workflow/task/components/flow/FormInformation.vue b/src/views/workflow/task/components/flow/FormInformation.vue
index 91d8038..9b29162 100644
--- a/src/views/workflow/task/components/flow/FormInformation.vue
+++ b/src/views/workflow/task/components/flow/FormInformation.vue
@@ -27,23 +27,27 @@
@@ -469,4 +473,14 @@
padding-top: 20px;
}
}
+
+ .page-bg-wrap {
+ background-color: #fff;
+ }
+
+ .top-toolbar {
+ min-height: 44px;
+ margin-bottom: 12px;
+ border-bottom: 1px solid #eee;
+ }
diff --git a/src/views/workflow/task/components/flow/ProcessInformation.vue b/src/views/workflow/task/components/flow/ProcessInformation.vue
index 60b4e92..1c0082d 100644
--- a/src/views/workflow/task/components/flow/ProcessInformation.vue
+++ b/src/views/workflow/task/components/flow/ProcessInformation.vue
@@ -2,7 +2,7 @@
当前流程审批人:{{currentTaskAssigneeNames.replaceAll(",","、")}}
-
+
节点审批人:
{{assignees[0].taskName}}{{currentTaskInfo?.taskDefinitionKey==taskKey?'(当前审批节点)':''}}:
diff --git a/src/views/workflow/task/components/processTasks/DraftsV2.vue b/src/views/workflow/task/components/processTasks/DraftsV2.vue
index 5ee58ba..47c66f9 100644
--- a/src/views/workflow/task/components/processTasks/DraftsV2.vue
+++ b/src/views/workflow/task/components/processTasks/DraftsV2.vue
@@ -15,11 +15,13 @@ import userTaskTable from './../../hooks/userTaskTable';
import LaunchProcess from './../LaunchProcess.vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { deleteDraft, getDraftInfo, getSchemaTask } from '/@/api/workflow/process';
-import { reactive } from 'vue';
+import { reactive, onMounted } from 'vue';
import { notification } from 'ant-design-vue';
import { TaskTypeUrl } from '/@/enums/workflowEnum';
import { useI18n } from '/@/hooks/web/useI18n';
import { useRouter } from 'vue-router';
+import useEventBus from '/@/hooks/event/useEventBus';
+const { bus, CREATE_FLOW } = useEventBus();
const { t } = useI18n();
const router = useRouter();
@@ -72,6 +74,10 @@ const [registerTable, { reload }] = useTable({
}
});
+onMounted(() => {
+ bus.on(CREATE_FLOW, handleRefresh);
+});
+
function tableActions(record) {
return [
{
@@ -98,7 +104,10 @@ async function handleEdit(record) {
processData.visible = true;*/
localStorage.setItem('draftsJsonStr', res.formData);
router.push({
- path: `/flow/${res.schemaId}/${record.id}/createFlow`
+ path: `/flow/${res.schemaId}/${record.id}/createFlow`,
+ query: {
+ createType: 'drafts'
+ }
});
} catch (error) { }
}
@@ -122,6 +131,11 @@ async function handleDelete(record) {
}
} catch (error) { }
}
+
+function handleRefresh() {
+ reload();
+}
+