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

Merge branch 'dev-zn' into 'dev'

Browse Source 
调整：草稿箱提交审批删除原流程

See merge request itc-framework/ma/2024/front!28
This commit is contained in:
890147
2025-01-26 08:55:09 +00:00
parent cc8de75eb4 414d3e2299
commit 4969728bfa
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@
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 { deleteDraft, 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';
@ -290,7 +290,8 @@
/*stampId: values.stampId, /*stampId: values.stampId,
stampPassword: values.password,*/ stampPassword: values.password,*/
isOldSystem: system, isOldSystem: system,
nextTaskUser: approvalData.nextTaskUser nextTaskUser: approvalData.nextTaskUser,
draftId: rDraftsId,
}; };
} }

18
src/views/workflow/task/components/processTasks/DraftsV2.vue
View File

@ -15,11 +15,13 @@ import userTaskTable from './../../hooks/userTaskTable';
import LaunchProcess from './../LaunchProcess.vue'; import LaunchProcess from './../LaunchProcess.vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { deleteDraft, getDraftInfo, getSchemaTask } from '/@/api/workflow/process'; import { deleteDraft, getDraftInfo, getSchemaTask } from '/@/api/workflow/process';
import { reactive } from 'vue'; import { reactive, onMounted } from 'vue';
import { notification } from 'ant-design-vue'; import { notification } from 'ant-design-vue';
import { TaskTypeUrl } from '/@/enums/workflowEnum'; import { TaskTypeUrl } from '/@/enums/workflowEnum';
import { useI18n } from '/@/hooks/web/useI18n'; import { useI18n } from '/@/hooks/web/useI18n';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import useEventBus from '/@/hooks/event/useEventBus';
const { bus, CREATE_FLOW } = useEventBus();
const { t } = useI18n(); const { t } = useI18n();
const router = useRouter(); const router = useRouter();
@ -72,6 +74,10 @@ const [registerTable, { reload }] = useTable({
} }
}); });
onMounted(() => {
bus.on(CREATE_FLOW, handleRefresh);
});
function tableActions(record) { function tableActions(record) {
return [ return [
{ {
@ -98,7 +104,10 @@ async function handleEdit(record) {
processData.visible = true;*/ processData.visible = true;*/
localStorage.setItem('draftsJsonStr', res.formData); localStorage.setItem('draftsJsonStr', res.formData);
router.push({ router.push({
path: `/flow/${res.schemaId}/${record.id}/createFlow` path: `/flow/${res.schemaId}/${record.id}/createFlow`,
query: {
createType: 'drafts'
}
}); });
} catch (error) { } } catch (error) { }
} }
@ -122,6 +131,11 @@ async function handleDelete(record) {
} }
} catch (error) { } } catch (error) { }
} }
function handleRefresh() {
reload();
}
</script> </script>
<style scoped></style> <style scoped></style>