diff --git a/src/components/NameCircle.vue b/src/components/NameCircle.vue new file mode 100644 index 0000000..11bc4af --- /dev/null +++ b/src/components/NameCircle.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/components/Tooltip.vue b/src/components/Tooltip.vue index 3d50dc8..b06b081 100644 --- a/src/components/Tooltip.vue +++ b/src/components/Tooltip.vue @@ -35,6 +35,5 @@ const isShowTooltip = () => { text-overflow: ellipsis; white-space: nowrap; overflow: hidden; - padding-top: 3px; } diff --git a/src/views/project-demand/collection/add.vue b/src/views/project-demand/collection/add.vue index 4b0d852..03f594e 100644 --- a/src/views/project-demand/collection/add.vue +++ b/src/views/project-demand/collection/add.vue @@ -64,7 +64,7 @@ import {useProcessStore} from '@/stores/processStore.js'; import {getWorkflowInfo, addRequirement, getFormInfo, resubmit, deleteFile,downloadFile} from "@/api/project-demand/index.js"; import FileUpload from "@/components/FileUpload.vue"; import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'; -import {ElMessage, ElMessageBox} from "element-plus"; +import {ElMessage, ElMessageBox,ElNotification} from "element-plus"; import {useRoute, useRouter} from 'vue-router' import {getSubCompOpt} from '@/api/user/user.js' import {useTagsView} from '@/stores/tagsview.js' @@ -186,17 +186,25 @@ const init = async () => { const res = await getSubCompOpt() companyOption.value = res.data getWorkflowInfo().then(res => { - let data = res.data - processInstanceData.value = data - processStore.setDesign(data) - processStore.runningList.value = data.runningList; - processStore.endList.value = data.endList; - processStore.noTakeList.value = data.noTakeList; - processStore.refuseList.value = data.refuseList; - processStore.passList.value = data.passList; - nextTick(() => { - processDiagramViewer.value = true + ElNotification({ + title: '提示', + message: res.msg, + type: res.code === 1000 ? 'success' : 'error' }) + if(res.code === 1000){ + let data = res.data + processInstanceData.value = data + processStore.setDesign(data) + processStore.runningList.value = data.runningList; + processStore.endList.value = data.endList; + processStore.noTakeList.value = data.noTakeList; + processStore.refuseList.value = data.refuseList; + processStore.passList.value = data.passList; + nextTick(() => { + processDiagramViewer.value = true + }) + }else { + } }) } const submitParam=(item)=>{ diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index 9591b33..e475340 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -1,4 +1,5 @@