geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复新建流程页面，用户取消后无法再次提交的bug

Browse Source
This commit is contained in:
gaoyunqi
2024-05-15 18:11:08 +08:00
parent b5a41d62b1
commit 2e07279924
4 changed files with 294 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/SystemForm/src/Form.vue
View File

@ -169,13 +169,13 @@
async function setFieldsValue(record) { async function setFieldsValue(record) {
flowConfig.draftsFormData = record; flowConfig.draftsFormData = record;
} }
async function workflowSubmit() { async function workflowSubmit(saveRowKey) {
let values = {}; let values = {};
try { try {
values = await SystemFormRef.value.validate(); values = await SystemFormRef.value.validate();
// 提交表单 // 提交表单
if (visible.value) { if (visible.value) {
let id = await submit(); let id = await submit(saveRowKey);
let rowKey = getRowKey(); let rowKey = getRowKey();
values[rowKey] = id; values[rowKey] = id;
values['_id'] = id values['_id'] = id
@ -184,7 +184,7 @@
return values; return values;
} catch (error) {} } catch (error) {}
} }
async function submit() { async function submit(saveRowKey) {
let saveValId = ''; let saveValId = '';
let values = await SystemFormRef.value.validate(); let values = await SystemFormRef.value.validate();
let rowKey = getRowKey(); let rowKey = getRowKey();
@ -198,6 +198,10 @@
} else { } else {
// 新增 // 新增
saveValId = await SystemFormRef.value.add(values); saveValId = await SystemFormRef.value.add(values);
if (saveRowKey) {
// 把rowKey写回去，新建流程的时候防止取消了重复提交
props.workflowConfig.formModel[rowKey] = saveValId;
}
} }
return saveValId; return saveValId;
} }

4
src/views/secondDev/FormInformation.vue
View File

@ -239,13 +239,13 @@
return formModes; return formModes;
} }
async function getFormModels() { async function getFormModels(saveRowKey) {
let formModes = {}; let formModes = {};
for (let index = 0; index < forms.configs.length; index++) { for (let index = 0; index < forms.configs.length; index++) {
const ele = forms.configs[index]; const ele = forms.configs[index];
if (ele.formType == FormType.SYSTEM) { if (ele.formType == FormType.SYSTEM) {
let values = await itemRefs.value[index].workflowSubmit(); let values = await itemRefs.value[index].workflowSubmit(saveRowKey);
formModes[ele.formKey] = values; formModes[ele.formKey] = values;
} else { } else {
formModes[ele.formKey] = ele.formModel; formModes[ele.formKey] = ele.formModel;

184
src/views/secondDev/createFlow.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="page-bg-wrap"> <div class="page-bg-wrap">
<a-spin tip="Loading..." :spinning="loading"> <a-spin :spinning="loading" tip="加载中...">
<div class="geg-flow-page"> <div class="geg-flow-page">
<div class="top-toolbar"> <div class="top-toolbar">
<a-space :size="10" wrap> <a-space :size="10" wrap>
@ -10,7 +10,7 @@
</slot> </slot>
关闭 关闭
</a-button> </a-button>
<a-button type="primary" :disabled="data.submitLoading" @click="saveLaunch"> <a-button :disabled="data.submitLoading" type="primary" @click="saveLaunch">
<slot name="icon"> <slot name="icon">
<send-outlined /> <send-outlined />
</slot> </slot>
@ -37,9 +37,7 @@
</a-space> </a-space>
</div> </div>
<div class="flow-content"> <div class="flow-content">
<FormInformation :key="randKey" ref="formInformation" :disabled="false" <FormInformation :key="randKey" ref="formInformation" :disabled="false" :formAssignmentData="data.formAssignmentData" :formInfos="data.formInfos" :opinions="data.opinions" :opinionsComponents="data.opinionsComponents" />
:formAssignmentData="data.formAssignmentData" :formInfos="data.formInfos"
:opinions="data.opinions" :opinionsComponents="data.opinionsComponents" />
</div> </div>
</div> </div>
<a-modal :visible="showFlowChart" centered class="geg" closable title="流程图" width="1200px"> <a-modal :visible="showFlowChart" centered class="geg" closable title="流程图" width="1200px">
@ -54,45 +52,45 @@
</template> </template>
<script setup> <script setup>
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import userTaskItem from '/@/views/workflow/task/hooks/userTaskItem'; import userTaskItem from '/@/views/workflow/task/hooks/userTaskItem';
import FormInformation from '/@/views/secondDev/FormInformation.vue'; import FormInformation from '/@/views/secondDev/FormInformation.vue';
import ProcessInformation from '/@/views/workflow/task/components/flow/ProcessInformation.vue'; import ProcessInformation from '/@/views/workflow/task/components/flow/ProcessInformation.vue';
import { getStartProcessInfo, getReStartProcessInfo, reLaunch, postLaunch, postApproval, postGetNextTaskMaybeArrival } from '/@/api/workflow/task'; import { getStartProcessInfo, getReStartProcessInfo, reLaunch, postLaunch, postApproval, postGetNextTaskMaybeArrival } from '/@/api/workflow/task';
import { useMultipleTabStore } from '/@/store/modules/multipleTab'; import { useMultipleTabStore } from '/@/store/modules/multipleTab';
import { CloseOutlined, SendOutlined, ClockCircleOutlined, PrinterOutlined, ApartmentOutlined } from '@ant-design/icons-vue'; import { CloseOutlined, SendOutlined, ClockCircleOutlined, PrinterOutlined, ApartmentOutlined } from '@ant-design/icons-vue';
import { nextTick, onMounted, ref, toRaw, reactive } from 'vue'; import { nextTick, onMounted, ref, toRaw, reactive } from 'vue';
import { postDraft, putDraft } from '/@/api/workflow/process'; import { postDraft, putDraft } from '/@/api/workflow/process';
import { useI18n } from '/@/hooks/web/useI18n'; import { useI18n } from '/@/hooks/web/useI18n';
import { separator } from '/@bpmn/config/info'; import { separator } from '/@bpmn/config/info';
import { message } from 'ant-design-vue'; import { message } from 'ant-design-vue';
import OpinionDialog from '/@/components/SecondDev/OpinionDialog.vue'; import OpinionDialog from '/@/components/SecondDev/OpinionDialog.vue';
import { ApproveCode, ApproveType } from '/@/enums/workflowEnum'; import { ApproveCode, ApproveType } from '/@/enums/workflowEnum';
import useEventBus from '/@/hooks/event/useEventBus'; import useEventBus from '/@/hooks/event/useEventBus';
const { bus, CREATE_FLOW } = useEventBus(); const { bus, CREATE_FLOW } = useEventBus();
const router = useRouter(); const router = useRouter();
const tabStore = useMultipleTabStore(); const tabStore = useMultipleTabStore();
const { t } = useI18n(); const { t } = useI18n();
const { data, approveUserData, initProcessData, notificationSuccess, notificationError } = userTaskItem(); const { data, approveUserData, initProcessData, notificationSuccess, notificationError } = userTaskItem();
const currentRoute = router.currentRoute.value; const currentRoute = router.currentRoute.value;
const rParams = currentRoute.params; const rParams = currentRoute.params;
const fullPath = currentRoute.fullPath;; const fullPath = currentRoute.fullPath;
const rSchemaId = rParams.arg1; const rSchemaId = rParams.arg1;
const rDraftsId = rParams.arg2; const rDraftsId = rParams.arg2;
const taskId = ref(); const taskId = ref();
const loading = ref(false) const loading = ref(false);
const draftsJsonStr = localStorage.getItem('draftsJsonStr'); const draftsJsonStr = localStorage.getItem('draftsJsonStr');
let formInformation = ref(); let formInformation = ref();
const opinionDlg = ref(); const opinionDlg = ref();
let pageMode = 'new'; let pageMode = 'new';
const showFlowChart = ref(false); const showFlowChart = ref(false);
const disableSubmit = ref(false); const disableSubmit = ref(false);
const mainFormModels = ref(); const mainFormModels = ref();
let randKey = ref('randkey'); // 强制表单重新渲染 let randKey = ref('randkey'); // 强制表单重新渲染
let approvalData = reactive({ let approvalData = reactive({
isCountersign: false, isCountersign: false,
isAddOrSubSign: false, isAddOrSubSign: false,
stampInfo: { stampInfo: {
@ -107,32 +105,32 @@ let approvalData = reactive({
rejectNodeActivityIds: [], rejectNodeActivityIds: [],
circulateConfigs: [], circulateConfigs: [],
nextTaskUser: {} // 格式为taskKey: 用户id（逗号分隔） nextTaskUser: {} // 格式为taskKey: 用户id（逗号分隔）
}); });
if (draftsJsonStr) { if (draftsJsonStr) {
localStorage.removeItem('draftsJsonStr'); localStorage.removeItem('draftsJsonStr');
pageMode = 'draft'; pageMode = 'draft';
} }
function closeFlowChart() { function closeFlowChart() {
showFlowChart.value = false; showFlowChart.value = false;
} }
function openFlowChart() { function openFlowChart() {
showFlowChart.value = true; showFlowChart.value = true;
} }
function close() { function close() {
tabStore.closeTab(currentRoute, router); tabStore.closeTab(currentRoute, router);
} }
const props = defineProps({ const props = defineProps({
rowKeyData: { rowKeyData: {
type: String type: String
} }
}); });
onMounted(async () => { onMounted(async () => {
try { try {
// 发起流程 // 发起流程
let res = await getStartProcessInfo(rSchemaId); let res = await getStartProcessInfo(rSchemaId);
@ -142,14 +140,14 @@ onMounted(async () => {
tabStore.changeTitle(fullPath, `${tabPrefix}：${title}`); tabStore.changeTitle(fullPath, `${tabPrefix}：${title}`);
} }
initProcessData(res); initProcessData(res);
} catch (error) { } } catch (error) {}
randKey.value = Math.random() + ''; randKey.value = Math.random() + '';
// 这里的顺序不能变 表单不渲染的时候 设置表单初值没用 // 这里的顺序不能变 表单不渲染的时候 设置表单初值没用
await nextTick(); await nextTick();
await initDraftsFormData(); await initDraftsFormData();
}); });
async function initDraftsFormData() { async function initDraftsFormData() {
//isPublish.value = Object.keys(data.formInfos).length > 0 ? false : true; //isPublish.value = Object.keys(data.formInfos).length > 0 ? false : true;
if (draftsJsonStr) { if (draftsJsonStr) {
let formDataJson = JSON.parse(draftsJsonStr); let formDataJson = JSON.parse(draftsJsonStr);
@ -162,9 +160,9 @@ async function initDraftsFormData() {
}); });
await formInformation.value.setFormData(formData); await formInformation.value.setFormData(formData);
} }
} }
async function saveDraft() { async function saveDraft() {
try { try {
disableSubmit.value = true; disableSubmit.value = true;
let formModels = await formInformation.value.saveDraftData(); let formModels = await formInformation.value.saveDraftData();
@ -178,18 +176,17 @@ async function saveDraft() {
} catch (error) { } catch (error) {
notificationError('保存草稿'); notificationError('保存草稿');
} }
} }
function showResult(res, title) { function showResult(res, title) {
if (res) { if (res) {
notificationSuccess(title); notificationSuccess(title);
} else { } else {
notificationError(title); notificationError(title);
} }
} }
function createFlowSuccess(taskList) {
function createFlowSuccess(taskList) {
/*opinionDlg.value.toggleDialog({ /*opinionDlg.value.toggleDialog({
isClose: true isClose: true
});*/ });*/
@ -199,24 +196,23 @@ function createFlowSuccess(taskList) {
message.success('流程发起成功'); message.success('流程发起成功');
data.submitLoading = false; data.submitLoading = false;
loading.value = false loading.value = false;
setTimeout(() => { setTimeout(() => {
bus.emit(CREATE_FLOW, {}); bus.emit(CREATE_FLOW, {});
close(); close();
}, 500); }, 500);
} }
}
} async function approvalCreate() {
async function approvalCreate() {
const params = await getApproveParams(); const params = await getApproveParams();
let fileFolderIds = getUploadFileFolderIds(mainFormModels.value);
let system = formInformation.value.getSystemType();
const nextNodes = await postGetNextTaskMaybeArrival(params); const nextNodes = await postGetNextTaskMaybeArrival(params);
opinionDlg.value.toggleDialog({ opinionDlg.value.toggleDialog({
action: 'agree', action: 'agree',
nextNodes, nextNodes,
rejectCancel: () => { rejectCancel: () => {
loading.value = false; loading.value = false;
data.submitLoading = false;
}, },
callback: (args) => { callback: (args) => {
approvalData.approvedContent = args.opinion; approvalData.approvedContent = args.opinion;
@ -224,8 +220,9 @@ async function approvalCreate() {
onFinish({}); onFinish({});
} }
}); });
} }
function flowSuccess() {
function flowSuccess() {
opinionDlg.value.toggleDialog({ opinionDlg.value.toggleDialog({
isClose: true isClose: true
}); });
@ -234,24 +231,27 @@ function flowSuccess() {
bus.emit(CREATE_FLOW, {}); bus.emit(CREATE_FLOW, {});
close(); close();
}, 500); }, 500);
} }
function flowFail() {
function flowFail() {
opinionDlg.value.stopLoading(); opinionDlg.value.stopLoading();
} }
async function onFinish(values) {
async function onFinish(values) {
try { try {
if (/*validateSuccess.value*/ true) { if (/*validateSuccess.value*/ true) {
let params = await getApproveParams(); let params = await getApproveParams();
await postApproval(params); await postApproval(params);
flowSuccess(); flowSuccess();
data.submitLoading = false; data.submitLoading = false;
loading.value = false loading.value = false;
} }
} catch (error) { } catch (error) {
flowFail(); flowFail();
} }
} }
async function getApproveParams() {
async function getApproveParams() {
let formModels = mainFormModels.value; let formModels = mainFormModels.value;
let system = formInformation.value.getSystemType(); let system = formInformation.value.getSystemType();
let fileFolderIds = getUploadFileFolderIds(formModels); let fileFolderIds = getUploadFileFolderIds(formModels);
@ -269,11 +269,11 @@ async function getApproveParams() {
isOldSystem: system, isOldSystem: system,
nextTaskUser: approvalData.nextTaskUser nextTaskUser: approvalData.nextTaskUser
}; };
} }
async function saveLaunch() { async function saveLaunch() {
data.submitLoading = true; data.submitLoading = true;
loading.value = true loading.value = true;
try { try {
let validateForms = await formInformation.value.validateForm(); let validateForms = await formInformation.value.validateForm();
let system = formInformation.value.getSystemType(); let system = formInformation.value.getSystemType();
@ -283,13 +283,13 @@ async function saveLaunch() {
return ele.validate; return ele.validate;
}); });
if (successValidate.length == validateForms.length) { if (successValidate.length == validateForms.length) {
mainFormModels.value = await formInformation.value.getFormModels(); mainFormModels.value = await formInformation.value.getFormModels(true);
for (let i in mainFormModels.value) { for (let i in mainFormModels.value) {
const item = mainFormModels.value[i] const item = mainFormModels.value[i];
if (!item['_id']) { if (!item['_id']) {
throw new Error('发起失败'); throw new Error('发起失败');
} else { } else {
delete item['_id'] delete item['_id'];
} }
} }
let relationTasks = []; let relationTasks = [];
@ -299,6 +299,10 @@ async function saveLaunch() {
}); });
} }
let fileFolderIds = getUploadFileFolderIds(mainFormModels.value); let fileFolderIds = getUploadFileFolderIds(mainFormModels.value);
if (taskId.value) {
// 如果在草稿节点取消，重新从草稿开始走
return createFlowSuccess(true);
}
//如果传入了processId 代表是重新发起流程 //如果传入了processId 代表是重新发起流程
let res; let res;
res = await postLaunch(rSchemaId, mainFormModels.value, relationTasks, fileFolderIds, system); res = await postLaunch(rSchemaId, mainFormModels.value, relationTasks, fileFolderIds, system);
@ -306,7 +310,7 @@ async function saveLaunch() {
// 下一节点审批人 // 下一节点审批人
let taskList = []; let taskList = [];
if (res && res.length > 0) { if (res && res.length > 0) {
taskId.value = res[0].taskId taskId.value = res[0].taskId;
taskList = res taskList = res
.filter((ele) => { .filter((ele) => {
return ele.isMultiInstance == false && ele.isAppoint == true; return ele.isMultiInstance == false && ele.isAppoint == true;
@ -322,7 +326,7 @@ async function saveLaunch() {
if (taskList.length > 0) { if (taskList.length > 0) {
notificationError('提交失败', '流程设计错误，开始后的第一个节点必须是审批人为发起人的起草节点。'); notificationError('提交失败', '流程设计错误，开始后的第一个节点必须是审批人为发起人的起草节点。');
data.submitLoading = false; data.submitLoading = false;
loading.value = false loading.value = false;
} else { } else {
createFlowSuccess(taskList); createFlowSuccess(taskList);
} }
@ -332,17 +336,17 @@ async function saveLaunch() {
} else { } else {
data.submitLoading = false; data.submitLoading = false;
notificationError(t('发起流程'), t('表单校验未通过')); notificationError(t('发起流程'), t('表单校验未通过'));
loading.value = false loading.value = false;
} }
} }
} catch (error) { } catch (error) {
data.submitLoading = false; data.submitLoading = false;
loading.value = false loading.value = false;
notificationError(t('发起流程'), t('发起流程失败')); notificationError(t('发起流程'), t('发起流程失败'));
} }
} }
function getUploadFileFolderIds(formModels) { function getUploadFileFolderIds(formModels) {
let fileFolderIds = []; let fileFolderIds = [];
let uploadComponentIds = formInformation.value.getUploadComponentIds(); let uploadComponentIds = formInformation.value.getUploadComponentIds();
uploadComponentIds.forEach((ids) => { uploadComponentIds.forEach((ids) => {
@ -358,7 +362,7 @@ function getUploadFileFolderIds(formModels) {
} }
}); });
return fileFolderIds; return fileFolderIds;
} }
</script> </script>
<style lang="less"></style> <style lang="less"></style>

4
src/views/workflow/task/components/flow/FormInformation.vue
View File

@ -300,13 +300,13 @@
} }
return formModes; return formModes;
} }
async function getFormModels() { async function getFormModels(saveRowKey) {
let formModes = {}; let formModes = {};
for (let index = 0; index < forms.configs.length; index++) { for (let index = 0; index < forms.configs.length; index++) {
const ele = forms.configs[index]; const ele = forms.configs[index];
if (ele.formType == FormType.SYSTEM) { if (ele.formType == FormType.SYSTEM) {
let values = await itemRefs.value[index].workflowSubmit(); let values = await itemRefs.value[index].workflowSubmit(saveRowKey);
formModes[ele.formKey] = values; formModes[ele.formKey] = values;
} else { } else {
formModes[ele.formKey] = ele.formModel; formModes[ele.formKey] = ele.formModel;