diff --git a/src/router/index.js b/src/router/index.js index 5403bd5..39d999e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -80,7 +80,7 @@ const router = createRouter({ } }, { - path: '/workflow/process/edit', + path: '/workflow/process/add', name: 'processAdd', component: () => import('@/views/workflow/process/ProcessEdit.vue'), meta: { diff --git a/src/views/expense-management/share/index.vue b/src/views/expense-management/share/index.vue index 6e46834..91565a4 100644 --- a/src/views/expense-management/share/index.vue +++ b/src/views/expense-management/share/index.vue @@ -39,6 +39,7 @@ const searchConfig = reactive([ props: { placeholder: '请选择生成时间', clearable: true, + valueFormat: 'YYYY-MM-DD', }, colProps: {} }, { diff --git a/src/views/workflow/process/ProcessEdit.vue b/src/views/workflow/process/ProcessEdit.vue index 452d34a..e86c471 100644 --- a/src/views/workflow/process/ProcessEdit.vue +++ b/src/views/workflow/process/ProcessEdit.vue @@ -58,6 +58,10 @@ import ProcessDesign from '@/views/workflow/process/ProcessDesign.vue' import ProcessSetting from "./ProcessSetting.vue"; import Ellipsis from '@/views/workflow/process/common/Ellipsis.vue' import {getCurrentInstance} from '@vue/runtime-core'; +import {useTagsView} from '@/stores/tagsview.js' +import {ElMessageBox,ElNotification} from "element-plus"; + +const tagsViewStore = useTagsView() let {proxy} = getCurrentInstance(); import {Loading, WarningFilled, CircleCheckFilled} from '@element-plus/icons-vue' @@ -67,7 +71,6 @@ const params = reactive(router.currentRoute.value.params) import {useProcessStore} from '@/stores/processStore.js' const processStore = useProcessStore() -import {ElMessage, ElMessageBox} from "element-plus"; const processDesign = ref() const visible = ref(false) @@ -196,14 +199,17 @@ const getRandomId = () => { const getProcessInfo = async () => { getProcessDefinitionInfo(params.deploymentId).then(res => { + ElNotification({ + title: '提示', + message: res.msg, + type: res.code === 1000 ? 'success' : 'error' + }) if (res.code === 1000) { processStore.setDesign(res.data) visible.value = true nextTick(() => { processDesign.value.initRender() }) - } else { - ElMessage.error(res.msg) } }) } @@ -311,14 +317,21 @@ const doPublish = () => { } console.log(template) addProcessDefinition(template).then(res => { + ElNotification({ + title: '提示', + message: res.msg, + type: res.code === 1000 ? 'success' : 'error' + }) if (res.code === 1000) { - ElMessage.success(res.msg) + tagsViewStore.delVisitedViews(router.currentRoute.value.path) router.push("/workflow/process") - } else { - ElMessage.error(res.msg) } }).catch(err => { - ElMessage.error(err) + ElNotification({ + title: '提示', + message: err, + type:'error' + }) }) }) } diff --git a/src/views/workflow/process/ProcessSetting.vue b/src/views/workflow/process/ProcessSetting.vue index 13f8852..2b53d68 100644 --- a/src/views/workflow/process/ProcessSetting.vue +++ b/src/views/workflow/process/ProcessSetting.vue @@ -18,6 +18,8 @@ import {computed, defineExpose} from "vue"; import { ElNotification} from "element-plus"; import {getTypeOption, getFromPerm} from "@/api/workflow/process-definition"; +const router = useRouter() +const path = reactive(router.currentRoute.value.path) const processStore = useProcessStore() const optionList = ref([]) diff --git a/src/views/workflow/process/common/InsertButton.vue b/src/views/workflow/process/common/InsertButton.vue index fbaa62a..c9344e9 100644 --- a/src/views/workflow/process/common/InsertButton.vue +++ b/src/views/workflow/process/common/InsertButton.vue @@ -47,6 +47,7 @@