From 1d772e14143dd19de5ea897cff2409a1c787c956 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Mon, 20 May 2024 11:05:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E4=B8=8A=E6=8A=A5/=E8=AF=A6=E6=83=85=E4=B8=8B?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DetailComponent/CollectionDetail.vue | 140 ++++++++---------- .../DetailComponent/SummaryDetail.vue | 93 +++++++++++- src/views/project-demand/summary/add.vue | 21 ++- src/views/project-demand/summary/detail.vue | 1 + 4 files changed, 171 insertions(+), 84 deletions(-) diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue index 5bda21d..7feb567 100644 --- a/src/components/DetailComponent/CollectionDetail.vue +++ b/src/components/DetailComponent/CollectionDetail.vue @@ -1,71 +1,69 @@ diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index 1607123..7429fdf 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -223,6 +223,13 @@ @getAttachment="getAttachment" @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="router.currentRoute.value.name === 'Summary/edit'"/> +
+ + + + + +
存为草稿 发布 @@ -236,12 +243,15 @@ import {getDetail, getProcessInfo, requirementReported, resubmitReported} from " import {ElMessage, ElNotification} from "element-plus"; import {useTagsView} from '@/stores/tagsview.js' import {useCacheStore} from '@/stores/cache.js' +import {useProcessStore} from '@/stores/processStore.js'; import {getSubCompOpt} from "@/api/user/user"; - +import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'; const cacheStore = useCacheStore() +const processStore = useProcessStore() const router = useRouter() const route = useRoute() const name=ref(router.currentRoute.value.name) +const processDiagramViewer = ref(false) const tagsViewStore = useTagsView() const companyOption = ref([]) const summaryForm = ref() @@ -445,6 +455,15 @@ const init = async () => { if (res.code === 1000) { let data = res.data deploymentId.value = data.deploymentId + 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 + }) } }) } diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue index a4f971c..ae3bdbc 100644 --- a/src/views/project-demand/summary/detail.vue +++ b/src/views/project-demand/summary/detail.vue @@ -33,6 +33,7 @@ const getInfo = async (state) => { summaryProcessViewer.value = false const {code, data} = await getMapProjectStateInfo(projectId, state) summaryData.value = data; + console.log('data',data) processStore.setDesign(data) processStore.runningList.value = data.runningList; processStore.endList.value = data.endList; From f83ae8df514d552fbaaef86ebf9f7beb394f9d89 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Mon, 20 May 2024 11:45:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=89=80?= =?UTF-8?q?=E5=B1=9E=E5=85=AC=E5=8F=B8=E5=8F=8A=E8=AF=A6=E6=83=85loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DetailComponent/CollectionDetail.vue | 151 ++++---- .../DetailComponent/SummaryDetail.vue | 350 +++++++++--------- src/views/project-demand/summary/add.vue | 7 +- src/views/project-demand/summary/detail.vue | 8 +- 4 files changed, 268 insertions(+), 248 deletions(-) diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue index 7feb567..bbc1e2f 100644 --- a/src/components/DetailComponent/CollectionDetail.vue +++ b/src/components/DetailComponent/CollectionDetail.vue @@ -1,69 +1,71 @@ @@ -304,7 +313,8 @@ watchEffect(()=>{ :deep(.el-table--fit) { height: auto !important; } -.detail-block{ + +.detail-block { overflow-x: hidden; overflow-y: auto; padding-bottom: 20px; diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index 7429fdf..f8f0ebf 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -1,5 +1,5 @@